[Glibc-bsd-commits] r4965 - in trunk/kfreebsd-kernel-headers: debian debian/patches test
Robert Millan
rmh at alioth.debian.org
Wed Sep 25 12:42:44 UTC 2013
Author: rmh
Date: 2013-09-25 12:42:43 +0000 (Wed, 25 Sep 2013)
New Revision: 4965
Modified:
trunk/kfreebsd-kernel-headers/debian/changelog
trunk/kfreebsd-kernel-headers/debian/install
trunk/kfreebsd-kernel-headers/debian/links
trunk/kfreebsd-kernel-headers/debian/patches/000_bruno_haible.diff
trunk/kfreebsd-kernel-headers/debian/patches/002_gdb.diff
trunk/kfreebsd-kernel-headers/debian/patches/004_stdint_h.diff
trunk/kfreebsd-kernel-headers/debian/patches/006_sys_tty_h.diff
trunk/kfreebsd-kernel-headers/debian/patches/008_vm_vm_param_h.diff
trunk/kfreebsd-kernel-headers/debian/patches/009_inetutils.diff
trunk/kfreebsd-kernel-headers/debian/patches/015_cam.diff
trunk/kfreebsd-kernel-headers/debian/patches/022_sys_buf_h.diff
trunk/kfreebsd-kernel-headers/debian/patches/029_conf.diff
trunk/kfreebsd-kernel-headers/debian/patches/cpufunc.diff
trunk/kfreebsd-kernel-headers/debian/patches/type_collision.diff
trunk/kfreebsd-kernel-headers/debian/rules
trunk/kfreebsd-kernel-headers/test/sys_user.c
Log:
Fix eglibc build
Modified: trunk/kfreebsd-kernel-headers/debian/changelog
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/changelog 2013-09-25 11:43:41 UTC (rev 4964)
+++ trunk/kfreebsd-kernel-headers/debian/changelog 2013-09-25 12:42:43 UTC (rev 4965)
@@ -2,9 +2,9 @@
* Remove 026_acpiio.diff (redundant).
* sys_timex.c: Check <sys/timex.h> buildability.
- * Move <sys/kern> to <kglue/sys> to make its origin clearer and make
- room for <kglue/netinet>, etc.
- * Add <kglue/netinet/if_ether.h> using patch from original port.
+ * Move <sys/kern> to <sys/kglue/sys> to make its origin clearer and make
+ room for <sys/kglue/netinet>, etc.
+ * Add <sys/kglue/netinet/if_ether.h> using patch from original port.
* sys_user.c: Check <sys/user.h> buildability.
-- Robert Millan <rmh at debian.org> Sat, 21 Sep 2013 17:07:34 +0200
Modified: trunk/kfreebsd-kernel-headers/debian/install
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/install 2013-09-25 11:43:41 UTC (rev 4964)
+++ trunk/kfreebsd-kernel-headers/debian/install 2013-09-25 12:42:43 UTC (rev 4965)
@@ -122,7 +122,7 @@
sys/netgraph/netflow/*.h usr/include/netgraph/netflow
sys/netinet/icmp_var.h usr/include/netinet
sys/netinet/if_atm.h usr/include/netinet
-sys/netinet/if_ether.h usr/include/kglue/netinet
+sys/netinet/if_ether.h usr/include/sys/kglue/netinet
sys/netinet/igmp_var.h usr/include/netinet
sys/netinet/in_gif.h usr/include/netinet
sys/netinet/in_pcb.h usr/include/netinet
@@ -269,7 +269,7 @@
sys/sys/namei.h usr/include/sys
sys/sys/nlist_aout.h usr/include/sys
sys/sys/osd.h usr/include/sys
-sys/sys/param.h usr/include/kglue/sys
+sys/sys/param.h usr/include/sys/kglue/sys
sys/sys/pciio.h usr/include/sys
sys/sys/pcpu.h usr/include/sys
sys/sys/pioctl.h usr/include/sys
@@ -279,7 +279,7 @@
sys/sys/procfs.h usr/include/sys
sys/sys/protosw.h usr/include/sys
sys/sys/ptio.h usr/include/sys
-sys/sys/queue.h usr/include/kglue/sys
+sys/sys/queue.h usr/include/sys/kglue/sys
sys/sys/rangelock.h usr/include/sys
sys/sys/random.h usr/include/sys
sys/sys/refcount.h usr/include/sys
@@ -308,8 +308,8 @@
sys/sys/tty.h usr/include/sys
sys/sys/ttycom.h usr/include/sys
sys/sys/ttyqueue.h usr/include/sys
-sys/sys/time.h usr/include/kglue/sys
-sys/sys/types.h usr/include/kglue/sys
+sys/sys/time.h usr/include/sys/kglue/sys
+sys/sys/types.h usr/include/sys/kglue/sys
sys/sys/ucred.h usr/include/sys
sys/sys/unpcb.h usr/include/sys
sys/sys/user.h usr/include/sys
Modified: trunk/kfreebsd-kernel-headers/debian/links
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/links 2013-09-25 11:43:41 UTC (rev 4964)
+++ trunk/kfreebsd-kernel-headers/debian/links 2013-09-25 12:42:43 UTC (rev 4965)
@@ -1,3 +1,3 @@
usr/include/opencrypto usr/include/crypto
usr/include/fs/cd9660 usr/include/isofs/cd9660
-usr/include/kglue/sys usr/include/sys/kern
+usr/include/sys/kglue/sys usr/include/sys/kern
Modified: trunk/kfreebsd-kernel-headers/debian/patches/000_bruno_haible.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/000_bruno_haible.diff 2013-09-25 11:43:41 UTC (rev 4964)
+++ trunk/kfreebsd-kernel-headers/debian/patches/000_bruno_haible.diff 2013-09-25 12:42:43 UTC (rev 4965)
@@ -244,7 +244,7 @@
#define _SYS_FILEDESC_H_
+#include <sys/types.h>
- #include <kglue/sys/queue.h>
+ #include <sys/kglue/sys/queue.h>
#include <sys/event.h>
#include <sys/lock.h>
@@ -45,7 +46,7 @@
@@ -334,7 +334,7 @@
#define _SYS_LOCK_H_
+#include <sys/types.h>
- #include <kglue/sys/queue.h>
+ #include <sys/kglue/sys/queue.h>
#include <sys/_lock.h>
--- a/sys/sys/memrange.h
@@ -375,7 +375,7 @@
@@ -35,6 +35,8 @@
#include <sys/resource.h>
- #include <kglue/sys/queue.h>
+ #include <sys/kglue/sys/queue.h>
+#include <sys/time.h>
+#include <sys/types.h>
#ifdef _KERNEL
@@ -474,11 +474,11 @@
#ifndef _SYS_SYSCTL_H_
#define _SYS_SYSCTL_H_
--#include <kglue/sys/queue.h>
+-#include <sys/kglue/sys/queue.h>
+#include <features.h>
+#define __need_size_t
+#include <stddef.h>
-+#include <kglue/sys/types.h> /* required by <vm/vm_param.h> */
++#include <sys/kglue/sys/types.h> /* required by <vm/vm_param.h> */
+#include <vm/vm_param.h>
+
+/**************************************** Stolen from sys/mount.h */
@@ -606,7 +606,7 @@
+#include <stddef.h>
+#include <sys/time.h>
#include <sys/ioccom.h>
- #include <kglue/sys/time.h>
+ #include <sys/kglue/sys/time.h>
--- a/sys/sys/timex.h
+++ b/sys/sys/timex.h
Modified: trunk/kfreebsd-kernel-headers/debian/patches/002_gdb.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/002_gdb.diff 2013-09-25 11:43:41 UTC (rev 4964)
+++ trunk/kfreebsd-kernel-headers/debian/patches/002_gdb.diff 2013-09-25 12:42:43 UTC (rev 4965)
@@ -6,7 +6,7 @@
+++ b/sys/sys/event.h
@@ -31,6 +31,8 @@
- #include <kglue/sys/queue.h>
+ #include <sys/kglue/sys/queue.h>
+#include <stdint.h>
+
Modified: trunk/kfreebsd-kernel-headers/debian/patches/004_stdint_h.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/004_stdint_h.diff 2013-09-25 11:43:41 UTC (rev 4964)
+++ trunk/kfreebsd-kernel-headers/debian/patches/004_stdint_h.diff 2013-09-25 12:42:43 UTC (rev 4965)
@@ -119,7 +119,7 @@
@@ -39,6 +39,7 @@
#define _SYS_BIO_H_
- #include <kglue/sys/queue.h>
+ #include <sys/kglue/sys/queue.h>
+#include <stdint.h>
/* bio_cmd */
@@ -128,8 +128,8 @@
+++ b/sys/sys/devicestat.h
@@ -33,6 +33,7 @@
- #include <kglue/sys/queue.h>
- #include <kglue/sys/time.h>
+ #include <sys/kglue/sys/queue.h>
+ #include <sys/kglue/sys/time.h>
+#include <stdint.h>
/*
@@ -174,7 +174,7 @@
@@ -20,6 +20,7 @@
#ifndef _KERNEL
- #include <kglue/sys/types.h>
+ #include <sys/kglue/sys/types.h>
+#include <stdint.h>
#endif
#include <sys/ioccom.h>
Modified: trunk/kfreebsd-kernel-headers/debian/patches/006_sys_tty_h.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/006_sys_tty_h.diff 2013-09-25 11:43:41 UTC (rev 4964)
+++ trunk/kfreebsd-kernel-headers/debian/patches/006_sys_tty_h.diff 2013-09-25 12:42:43 UTC (rev 4965)
@@ -6,8 +6,8 @@
+++ b/sys/sys/tty.h
@@ -34,6 +34,8 @@
- #include <kglue/sys/param.h>
- #include <kglue/sys/queue.h>
+ #include <sys/kglue/sys/param.h>
+ #include <sys/kglue/sys/queue.h>
+#include <sys/types.h>
+#include <sys/ioctl.h> /* winsize struct */
#include <sys/lock.h>
Modified: trunk/kfreebsd-kernel-headers/debian/patches/008_vm_vm_param_h.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/008_vm_vm_param_h.diff 2013-09-25 11:43:41 UTC (rev 4964)
+++ trunk/kfreebsd-kernel-headers/debian/patches/008_vm_vm_param_h.diff 2013-09-25 12:42:43 UTC (rev 4965)
@@ -15,7 +15,7 @@
#define _VM_SWAP_PAGER_H_ 1
+
-+#include <kglue/sys/queue.h>
++#include <sys/kglue/sys/queue.h>
+
typedef int32_t swblk_t; /*
* swap offset. This is the type used to
Modified: trunk/kfreebsd-kernel-headers/debian/patches/009_inetutils.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/009_inetutils.diff 2013-09-25 11:43:41 UTC (rev 4964)
+++ trunk/kfreebsd-kernel-headers/debian/patches/009_inetutils.diff 2013-09-25 12:42:43 UTC (rev 4965)
@@ -57,7 +57,7 @@
@@ -34,7 +34,9 @@
#define _NETINET_IN_VAR_H_
- #include <kglue/sys/queue.h>
+ #include <sys/kglue/sys/queue.h>
+#include <net/if_var.h> /* ifaddr */
#include <sys/fnv_hash.h>
+#include <netinet/in.h> /* in_addr */
@@ -69,7 +69,7 @@
@@ -34,6 +34,8 @@
#define _NETINET_IP_VAR_H_
- #include <kglue/sys/queue.h>
+ #include <sys/kglue/sys/queue.h>
+#include <sys/types.h> /* u_char, u_short */
+#include <netinet/in.h> /* in_addr */
Modified: trunk/kfreebsd-kernel-headers/debian/patches/015_cam.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/015_cam.diff 2013-09-25 11:43:41 UTC (rev 4964)
+++ trunk/kfreebsd-kernel-headers/debian/patches/015_cam.diff 2013-09-25 12:42:43 UTC (rev 4965)
@@ -58,8 +58,8 @@
+++ b/sys/sys/devicestat.h
@@ -33,6 +33,8 @@
- #include <kglue/sys/queue.h>
- #include <kglue/sys/time.h>
+ #include <sys/kglue/sys/queue.h>
+ #include <sys/kglue/sys/time.h>
+#include <sys/_types.h>
+#include <sys/resource.h>
#include <stdint.h>
Modified: trunk/kfreebsd-kernel-headers/debian/patches/022_sys_buf_h.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/022_sys_buf_h.diff 2013-09-25 11:43:41 UTC (rev 4964)
+++ trunk/kfreebsd-kernel-headers/debian/patches/022_sys_buf_h.diff 2013-09-25 12:42:43 UTC (rev 4965)
@@ -10,6 +10,6 @@
-#include <sys/bufobj.h>
+#include <sys/_types.h>
- #include <kglue/sys/queue.h>
+ #include <sys/kglue/sys/queue.h>
#include <sys/lock.h>
#include <sys/lockmgr.h>
Modified: trunk/kfreebsd-kernel-headers/debian/patches/029_conf.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/029_conf.diff 2013-09-25 11:43:41 UTC (rev 4964)
+++ trunk/kfreebsd-kernel-headers/debian/patches/029_conf.diff 2013-09-25 12:42:43 UTC (rev 4965)
@@ -5,6 +5,6 @@
#include <sys/eventhandler.h>
#else
+#include <sys/param.h> /* SPECNAMELEN */
- #include <kglue/sys/queue.h>
+ #include <sys/kglue/sys/queue.h>
#endif
Modified: trunk/kfreebsd-kernel-headers/debian/patches/cpufunc.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/cpufunc.diff 2013-09-25 11:43:41 UTC (rev 4964)
+++ trunk/kfreebsd-kernel-headers/debian/patches/cpufunc.diff 2013-09-25 12:42:43 UTC (rev 4965)
@@ -24,7 +24,7 @@
@@ -60,6 +60,7 @@
#define _MACHINE_CPUFUNC_H_
- #include <kglue/sys/types.h>
+ #include <sys/kglue/sys/types.h>
+#include <stdint.h>
#include <machine/cpuregs.h>
Modified: trunk/kfreebsd-kernel-headers/debian/patches/type_collision.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/type_collision.diff 2013-09-25 11:43:41 UTC (rev 4964)
+++ trunk/kfreebsd-kernel-headers/debian/patches/type_collision.diff 2013-09-25 12:42:43 UTC (rev 4965)
@@ -206,7 +206,7 @@
+++ b/sys/sys/time.h
@@ -36,11 +36,14 @@
#include <sys/_timeval.h>
- #include <kglue/sys/types.h>
+ #include <sys/kglue/sys/types.h>
#include <sys/timespec.h>
+#include <sys/time.h>
Modified: trunk/kfreebsd-kernel-headers/debian/rules
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/rules 2013-09-25 11:43:41 UTC (rev 4964)
+++ trunk/kfreebsd-kernel-headers/debian/rules 2013-09-25 12:42:43 UTC (rev 4965)
@@ -72,11 +72,11 @@
-e 's/#\s*ifdef\s*_SYS_CDEFS_H_\(\s\|$$\)/#ifdef _SYS_CDEFS_H/g' \
-e 's/#\s*ifndef\s*_SYS_CDEFS_H_\(\s\|$$\)/#ifndef _SYS_CDEFS_H/g' \
\
- -e 's/#\s*include\s\+<sys\/types\.h>\s*/#include <kglue\/sys\/types.h>/g' \
- -e 's/#\s*include\s\+<sys\/time\.h>\s*/#include <kglue\/sys\/time.h>/g' \
- -e 's/#\s*include\s\+<sys\/param\.h>\s*/#include <kglue\/sys\/param.h>/g' \
- -e 's/#\s*include\s\+<sys\/queue\.h>\s*/#include <kglue\/sys\/queue.h>/g' \
- -e 's/#\s*include\s\+<netinet\/if_ether\.h>\s*/#include <kglue\/netinet\/if_ether.h>/g' \
+ -e 's/#\s*include\s\+<sys\/types\.h>\s*/#include <sys\/kglue\/sys\/types.h>/g' \
+ -e 's/#\s*include\s\+<sys\/time\.h>\s*/#include <sys\/kglue\/sys\/time.h>/g' \
+ -e 's/#\s*include\s\+<sys\/param\.h>\s*/#include <sys\/kglue\/sys\/param.h>/g' \
+ -e 's/#\s*include\s\+<sys\/queue\.h>\s*/#include <sys\/kglue\/sys\/queue.h>/g' \
+ -e 's/#\s*include\s\+<netinet\/if_ether\.h>\s*/#include <sys\/kglue\/netinet\/if_ether.h>/g' \
-e 's/#\s*include\s\+<sys\/_termios\.h>\s*/#include <sys\/termios.h>/g' \
\
-e 's/__size_t/__this_is_a_temporary_kludge__size_t/g' $(shell ## see rev 184135 in GCC SVN ##) \
Modified: trunk/kfreebsd-kernel-headers/test/sys_user.c
===================================================================
--- trunk/kfreebsd-kernel-headers/test/sys_user.c 2013-09-25 11:43:41 UTC (rev 4964)
+++ trunk/kfreebsd-kernel-headers/test/sys_user.c 2013-09-25 12:42:43 UTC (rev 4965)
@@ -1,2 +1,2 @@
-#include <kglue/sys/types.h>
+#include <sys/kglue/sys/types.h>
#include <sys/user.h>
More information about the Glibc-bsd-commits
mailing list