Package: util-linux
Version: 2.28-5
Tags: patch
util-linux fails to build on hppa due to a failing bsd disklabel testcase:
https://buildd.debian.org/status/fetch.php?pkg=util-linux&arch=hppa&ver=2.28-5&stamp=1462738670
================= O/E diff ===================
--- /<<PKGBUILDDIR>>/tests/output/fdisk/bsd 2016-05-08 20:07:28.874547654
+0000
+++ /<<PKGBUILDDIR>>/tests/expected/fdisk/bsd_1_0.BE 2016-03-16
12:59:26.611453813 +0000
@@ -97,20 +97,20 @@
*
-00200040 82 56 45 57 00 06 00 00 00 00 00 00 00 00 00 00 |.VEW............|
+00200200 82 56 45 57 00 06 00 00 00 00 00 00 00 00 00 00 |.VEW............|
The problem is, that BSD_LABELOFFSET needs to be 64 on hppa/parisc.
The header file include/pt-bsd.h is correct:
#if defined (__alpha__) || defined (__powerpc__) || \
defined (__ia64__) || defined (__hppa__)
# define BSD_LABELSECTOR 0
# define BSD_LABELOFFSET 64
#else
# define BSD_LABELSECTOR 1
# define BSD_LABELOFFSET 0
#endif
But the testcase shell script uses "uname -m", which
returns "parisc" (for 32bit kernel) or "parisc64" (for 64bit kernel)
on the hppa platform. "uname -m" never returns "hppa*".
diff -up ./tests/ts/fdisk/bsd.org ./tests/ts/fdisk/bsd
--- ./tests/ts/fdisk/bsd.org 2016-06-13 23:06:45.533452447 +0200
+++ ./tests/ts/fdisk/bsd 2016-06-13 23:07:03.969336894 +0200
@@ -48,7 +48,7 @@ BYTE_ORDER=$($TS_HELPER_SYSINFO byte-ord
ARCH=$(uname -m)
case $ARCH in
# see include/pt-bsd.h
- *alpha* | *ppc* | *ia64* | *hppa* )
+ *alpha* | *ppc* | *ia64* | *parisc* )
BSD_LABELSECTOR=0
BSD_LABELOFFSET=64
The attached patch fixes it.
Can you please apply it?
I tested it on hppa/parisc.
Thanks,
Helge
diff -up ./tests/ts/fdisk/bsd.org ./tests/ts/fdisk/bsd
--- ./tests/ts/fdisk/bsd.org 2016-06-13 23:06:45.533452447 +0200
+++ ./tests/ts/fdisk/bsd 2016-06-13 23:07:03.969336894 +0200
@@ -48,7 +48,7 @@ BYTE_ORDER=$($TS_HELPER_SYSINFO byte-ord
ARCH=$(uname -m)
case $ARCH in
# see include/pt-bsd.h
- *alpha* | *ppc* | *ia64* | *hppa* )
+ *alpha* | *ppc* | *ia64* | *parisc* )
BSD_LABELSECTOR=0
BSD_LABELOFFSET=64
;;
