Here's a patch which works for me to get the busybox-cvs package
building again. It also incorporates the previously submitted patch
for the S390 compile errors.
--
Daniel Schepler "Please don't disillusion me. I
[EMAIL PROTECTED] haven't had breakfast yet."
-- Orson Scott Card
diff -urN busybox-cvs-20030926.old/debian/changelog busybox-cvs-20030926/debian/changelog
--- busybox-cvs-20030926.old/debian/changelog 2003-12-18 02:08:25.000000000 -0800
+++ busybox-cvs-20030926/debian/changelog 2003-12-18 02:26:12.693398424 -0800
@@ -1,3 +1,14 @@
+busybox-cvs (20030926-2.2) unstable; urgency=low
+
+ * NMU
+ * Renamed the symbol R_390_GOTOFF to R_390_GOTOFF32 in
+ modutils/obj/obj_s390{,x}.c. Closes: #216528
+ Thanks to Roland Stigge <[EMAIL PROTECTED]>.
+ * Update _IOR invocation in util-linux/fdisk.c so that the package will
+ build with linux-kernel-headers.
+
+ -- Daniel Schepler <[EMAIL PROTECTED]> Thu, 18 Dec 2003 02:26:12 -0800
+
busybox-cvs (20030926-2.1) unstable; urgency=low
* NMU
diff -urN busybox-cvs-20030926.old/modutils/obj/obj_s390.c busybox-cvs-20030926/modutils/obj/obj_s390.c
--- busybox-cvs-20030926.old/modutils/obj/obj_s390.c 2003-12-18 02:08:25.000000000 -0800
+++ busybox-cvs-20030926/modutils/obj/obj_s390.c 2003-12-18 02:21:32.342146540 -0800
@@ -201,7 +201,7 @@
*(unsigned int *) loc += isym->gotent.offset;
break;
- case R_390_GOTOFF:
+ case R_390_GOTOFF32:
assert(got != 0);
*loc += v - got;
break;
@@ -261,7 +261,7 @@
/* The next three don't need got entries but the address
of the got itself. */
case R_390_GOTPC:
- case R_390_GOTOFF:
+ case R_390_GOTOFF32:
gotneeded = 1;
break;
diff -urN busybox-cvs-20030926.old/modutils/obj/obj_s390x.c busybox-cvs-20030926/modutils/obj/obj_s390x.c
--- busybox-cvs-20030926.old/modutils/obj/obj_s390x.c 2003-12-18 02:08:25.000000000 -0800
+++ busybox-cvs-20030926/modutils/obj/obj_s390x.c 2003-12-18 02:22:55.569095452 -0800
@@ -231,7 +231,7 @@
*(unsigned int *) loc += isym->gotent.offset >> 1;
break;
- case R_390_GOTOFF:
+ case R_390_GOTOFF32:
assert(got != 0);
*loc += v - got;
break;
@@ -294,7 +294,7 @@
of the got itself. */
case R_390_GOTPC:
case R_390_GOTPCDBL:
- case R_390_GOTOFF:
+ case R_390_GOTOFF32:
gotneeded = 1;
break;
diff -urN busybox-cvs-20030926.old/util-linux/fdisk.c busybox-cvs-20030926/util-linux/fdisk.c
--- busybox-cvs-20030926.old/util-linux/fdisk.c 2003-09-26 06:13:20.000000000 -0700
+++ busybox-cvs-20030926/util-linux/fdisk.c 2003-12-18 02:33:24.745061876 -0800
@@ -55,7 +55,7 @@
#define BLKGETSIZE _IO(0x12,96) /* return device size */
#define BLKFLSBUF _IO(0x12,97) /* flush buffer cache */
#define BLKSSZGET _IO(0x12,104) /* get block device sector size */
-#define BLKGETSIZE64 _IOR(0x12,114,8) /* 8 = sizeof(u64) */
+#define BLKGETSIZE64 _IOR(0x12,114,uint64_t) /* 8 = sizeof(u64) */
/*
fdisk.h
