Package: hwinfo
Version: 13.0-3
Severity: serious
Tags: patch
kbio.h no longer comes with Linux, and KIOCTYPE and KIOCLAYOUT are
no longer defined.
[...]
gcc -c -Wall -Wno-pointer-sign -O2 -pipe -g -fPIC -I../../src/hd -I
/usr/include/dbus-1.0 -I /usr/lib64/dbus-1.0/include -I
/usr/lib/dbus-1.0/include kbd.c
kbd.c:28:22: error: asm/kbio.h: No such file or directory
kbd.c: In function 'add_sun_console':
kbd.c:237: error: 'KIOCTYPE' undeclared (first use in this function)
kbd.c:237: error: (Each undeclared identifier is reported only once
kbd.c:237: error: for each function it appears in.)
kbd.c:238: error: 'KIOCLAYOUT' undeclared (first use in this function)
make[3]: *** [kbd.o] Error 1
make[3]: Leaving directory
`/build/buildd/hwinfo-13.0/build-tree/hwinfo-13.0/src/hd'
make[2]: *** [subdirs] Error 2
make[2]: Leaving directory
`/build/buildd/hwinfo-13.0/build-tree/hwinfo-13.0/src'
make[1]: *** [subdirs] Error 2
make[1]: Leaving directory `/build/buildd/hwinfo-13.0/build-tree/hwinfo-13.0'
make: *** [stampdir/build-stamp] Error 2
diff -u hwinfo-13.0/debian/changelog hwinfo-13.0/debian/changelog
--- hwinfo-13.0/debian/changelog
+++ hwinfo-13.0/debian/changelog
@@ -1,3 +1,11 @@
+hwinfo (13.0-3.1) unstable; urgency=low
+
+ * NMU
+ * Patch src/hd/kbd.c to not include asm/kbio.h or use KIOC*
+ defines.
+
+ -- Clint Adams <[EMAIL PROTECTED]> Mon, 17 Jul 2006 22:58:55 -0400
+
hwinfo (13.0-3) unstable; urgency=low
* Added separate Section-fileds for libhd13 and libhd13-dev in
only in patch2:
unchanged:
--- hwinfo-13.0.orig/debian/patches/92_sparc_kbio
+++ hwinfo-13.0/debian/patches/92_sparc_kbio
@@ -0,0 +1,20 @@
+diff -ruN hwinfo-13.0-old/src/hd/kbd.c hwinfo-13.0/src/hd/kbd.c
+--- hwinfo-13.0-old/src/hd/kbd.c 2006-07-17 22:57:03.000000000 -0400
++++ hwinfo-13.0/src/hd/kbd.c 2006-07-17 22:58:00.024642538 -0400
+@@ -25,7 +25,6 @@
+ typedef unsigned int u_int;
+ #endif
+
+-#include <asm/kbio.h>
+ #include <asm/openpromio.h>
+ #endif
+
+@@ -234,8 +233,6 @@
+
+ if((fd = open(DEV_KBD, O_RDWR | O_NONBLOCK | O_NOCTTY)) >= 0)
+ {
+- if(ioctl(fd, KIOCTYPE, &kid)) kid = -1;
+- if(ioctl(fd, KIOCLAYOUT, &klay)) klay = -1;
+ close(fd);
+
+ if(kid != -1)
