rpms/busybox/devel busybox-1.9.0-hwclock.patch, NONE, 1.1 busybox.spec, 1.74, 1.75

[Ivana Varekova (varekova)]

Author: varekova

Update of /cvs/pkgs/rpms/busybox/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20826

Modified Files:
	busybox.spec 
Added Files:
	busybox-1.9.0-hwclock.patch 
Log Message:
- fix hwclock on ia64 machines


busybox-1.9.0-hwclock.patch:

--- NEW FILE busybox-1.9.0-hwclock.patch ---
diff -up busybox-1.9.0/util-linux/hwclock.c.pom busybox-1.9.0/util-linux/hwclock.c
--- busybox-1.9.0/util-linux/hwclock.c.pom	2007-12-21 23:00:33.000000000 +0100
+++ busybox-1.9.0/util-linux/hwclock.c	2008-02-08 13:07:43.000000000 +0100
@@ -40,6 +40,15 @@ static int xopen_rtc(int flags)
 	int rtc;
 
 	if (!rtcname) {
+#ifdef __ia64__ 
+		rtc = open("/dev/efirtc", flags);
+		if (rtc >= 0)
+			return rtc;
+		rtc = open("/dev/efirtc0", flags);
+		if (rtc >= 0)
+			return rtc;
+		rtcname = "/dev/misc/efirtc";
+#else 
 		rtc = open("/dev/rtc", flags);
 		if (rtc >= 0)
 			return rtc;
@@ -47,6 +56,7 @@ static int xopen_rtc(int flags)
 		if (rtc >= 0)
 			return rtc;
 		rtcname = "/dev/misc/rtc";
+#endif
 	}
 	return xopen(rtcname, flags);
 }


Index: busybox.spec
===================================================================
RCS file: /cvs/pkgs/rpms/busybox/devel/busybox.spec,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- busybox.spec	8 Jan 2008 08:11:52 -0000	1.74
+++ busybox.spec	8 Feb 2008 13:04:55 -0000	1.75
@@ -1,7 +1,7 @@
 Summary: Statically linked binary providing simplified versions of system commands
 Name: busybox
 Version: 1.9.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 Epoch: 1
 License: GPLv2
 Group: System Environment/Shells
@@ -15,6 +15,7 @@
 Patch13: busybox-1.5.1-clean.patch
 Patch14: busybox-1.9.0-msh.patch
 Patch15: busybox-1.9.0-gc-section.patch
+Patch16: busybox-1.9.0-hwclock.patch
 URL: http://www.busybox.net
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)  
 BuildRequires: libselinux-devel >= 1.27.7-2
@@ -58,6 +59,7 @@
 %patch12 -b .ls -p1
 %patch14 -b .msh -p1
 %patch15 -b .sect -p1
+%patch16 -b .ia64 -p1
 
 %build
 # create static busybox - the executable is kept as busybox-static
@@ -111,6 +113,9 @@
 /sbin/busybox.petitboot
 
 %changelog
+* Fri Feb  8 2008 Ivana Varekova <varekova at redhat.com> - 1:1.9.0-2
+- fix hwclock on ia64 machines
+
 * Mon Jan  7 2008 Ivana Varekova <varekova at redhat.com> - 1:1.9.0-1
 - update to 1.9.0