[Glibc-bsd-commits] r4219 - in trunk/kfreebsd-kernel-headers/debian: . patches

Robert Millan rmh at alioth.debian.org
Sat Apr 21 13:39:40 UTC 2012 

Author: rmh
Date: 2012-04-21 13:39:40 +0000 (Sat, 21 Apr 2012)
New Revision: 4219

Modified:
   trunk/kfreebsd-kernel-headers/debian/changelog
   trunk/kfreebsd-kernel-headers/debian/install
   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/rules
Log:
Likewise for <sys/queue.h>.

Modified: trunk/kfreebsd-kernel-headers/debian/changelog
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/changelog	2012-04-21 13:28:26 UTC (rev 4218)
+++ trunk/kfreebsd-kernel-headers/debian/changelog	2012-04-21 13:39:40 UTC (rev 4219)
@@ -6,7 +6,7 @@
     - type_collision.c: Verify there is no collision with the GNU version
       of <sys/types.h>.
     - uintXX_t.c: Check for uintXX_t type availability (for kernel users).
-  * Likewise for <sys/time.h> and <sys/param.h>.
+  * Likewise for <sys/time.h>, <sys/param.h> and <sys/queue.h>.
 
  -- Robert Millan <rmh at debian.org>  Sat, 21 Apr 2012 15:10:17 +0200
 

Modified: trunk/kfreebsd-kernel-headers/debian/install
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/install	2012-04-21 13:28:26 UTC (rev 4218)
+++ trunk/kfreebsd-kernel-headers/debian/install	2012-04-21 13:39:40 UTC (rev 4219)
@@ -279,6 +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/sys/kern
 sys/sys/random.h                        usr/include/sys
 sys/sys/refcount.h                      usr/include/sys
 sys/sys/resourcevar.h                   usr/include/sys

Modified: trunk/kfreebsd-kernel-headers/debian/patches/000_bruno_haible.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/000_bruno_haible.diff	2012-04-21 13:28:26 UTC (rev 4218)
+++ trunk/kfreebsd-kernel-headers/debian/patches/000_bruno_haible.diff	2012-04-21 13:39:40 UTC (rev 4219)
@@ -244,7 +244,7 @@
  #define	_SYS_FILEDESC_H_
  
 +#include <sys/types.h>
- #include <sys/queue.h>
+ #include <sys/kern/queue.h>
  #include <sys/event.h>
  #include <sys/lock.h>
 --- a/sys/sys/jail.h
@@ -324,7 +324,7 @@
  #define _SYS_LOCK_H_
  
 +#include <sys/types.h>
- #include <sys/queue.h>
+ #include <sys/kern/queue.h>
  #include <sys/_lock.h>
  
 --- a/sys/sys/memrange.h
@@ -365,7 +365,7 @@
 @@ -35,6 +35,8 @@
  
  #include <sys/resource.h>
- #include <sys/queue.h>
+ #include <sys/kern/queue.h>
 +#include <sys/time.h>
 +#include <sys/types.h>
  #ifdef _KERNEL
@@ -464,7 +464,7 @@
  #ifndef _SYS_SYSCTL_H_
  #define	_SYS_SYSCTL_H_
  
--#include <sys/queue.h>
+-#include <sys/kern/queue.h>
 +#include <features.h>
 +#define __need_size_t
 +#include <stddef.h>
@@ -596,7 +596,7 @@
 +#include <stddef.h>
 +#include <sys/time.h>
  #include <sys/ioccom.h>
- #include <sys/time.h>
+ #include <sys/kern/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	2012-04-21 13:28:26 UTC (rev 4218)
+++ trunk/kfreebsd-kernel-headers/debian/patches/002_gdb.diff	2012-04-21 13:39:40 UTC (rev 4219)
@@ -6,7 +6,7 @@
 +++ b/sys/sys/event.h
 @@ -31,6 +31,8 @@
  
- #include <sys/queue.h> 
+ #include <sys/kern/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	2012-04-21 13:28:26 UTC (rev 4218)
+++ trunk/kfreebsd-kernel-headers/debian/patches/004_stdint_h.diff	2012-04-21 13:39:40 UTC (rev 4219)
@@ -119,7 +119,7 @@
 @@ -39,6 +39,7 @@
  #define	_SYS_BIO_H_
  
- #include <sys/queue.h>
+ #include <sys/kern/queue.h>
 +#include <stdint.h>
  
  /* bio_cmd */
@@ -128,7 +128,7 @@
 +++ b/sys/sys/devicestat.h
 @@ -33,6 +33,7 @@
  
- #include <sys/queue.h>
+ #include <sys/kern/queue.h>
  #include <sys/kern/time.h>
 +#include <stdint.h>
  
@@ -158,16 +158,6 @@
  } Elf_Note;
  
  /*
---- a/sys/sys/event.h
-+++ b/sys/sys/event.h
-@@ -30,7 +30,6 @@
- #define _SYS_EVENT_H_
- 
- #include <sys/queue.h> 
--
- #include <stdint.h>
- 
- #define EVFILT_READ		(-1)
 --- a/sys/sys/pcpu.h
 +++ b/sys/sys/pcpu.h
 @@ -48,6 +48,8 @@

Modified: trunk/kfreebsd-kernel-headers/debian/patches/006_sys_tty_h.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/006_sys_tty_h.diff	2012-04-21 13:28:26 UTC (rev 4218)
+++ trunk/kfreebsd-kernel-headers/debian/patches/006_sys_tty_h.diff	2012-04-21 13:39:40 UTC (rev 4219)
@@ -6,8 +6,8 @@
 +++ b/sys/sys/tty.h
 @@ -34,6 +34,8 @@
  
- #include <sys/param.h>
- #include <sys/queue.h>
+ #include <sys/kern/param.h>
+ #include <sys/kern/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	2012-04-21 13:28:26 UTC (rev 4218)
+++ trunk/kfreebsd-kernel-headers/debian/patches/008_vm_vm_param_h.diff	2012-04-21 13:39:40 UTC (rev 4219)
@@ -15,7 +15,7 @@
  #define	_VM_SWAP_PAGER_H_ 1
  
 +
-+#include <sys/queue.h>
++#include <sys/kern/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	2012-04-21 13:28:26 UTC (rev 4218)
+++ trunk/kfreebsd-kernel-headers/debian/patches/009_inetutils.diff	2012-04-21 13:39:40 UTC (rev 4219)
@@ -57,7 +57,7 @@
 @@ -34,7 +34,9 @@
  #define _NETINET_IN_VAR_H_
  
- #include <sys/queue.h>
+ #include <sys/kern/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 <sys/queue.h>
+ #include <sys/kern/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	2012-04-21 13:28:26 UTC (rev 4218)
+++ trunk/kfreebsd-kernel-headers/debian/patches/015_cam.diff	2012-04-21 13:39:40 UTC (rev 4219)
@@ -58,7 +58,7 @@
 +++ b/sys/sys/devicestat.h
 @@ -33,6 +33,8 @@
  
- #include <sys/queue.h>
+ #include <sys/kern/queue.h>
  #include <sys/kern/time.h>
 +#include <sys/_types.h>
 +#include <sys/resource.h>

Modified: trunk/kfreebsd-kernel-headers/debian/patches/022_sys_buf_h.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/022_sys_buf_h.diff	2012-04-21 13:28:26 UTC (rev 4218)
+++ trunk/kfreebsd-kernel-headers/debian/patches/022_sys_buf_h.diff	2012-04-21 13:39:40 UTC (rev 4219)
@@ -10,6 +10,6 @@
  
 -#include <sys/bufobj.h>
 +#include <sys/_types.h>
- #include <sys/queue.h>
+ #include <sys/kern/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	2012-04-21 13:28:26 UTC (rev 4218)
+++ trunk/kfreebsd-kernel-headers/debian/patches/029_conf.diff	2012-04-21 13:39:40 UTC (rev 4219)
@@ -5,6 +5,6 @@
  #include <sys/eventhandler.h>
  #else
 +#include <sys/param.h>		/* SPECNAMELEN */
- #include <sys/queue.h>
+ #include <sys/kern/queue.h>
  #endif
  

Modified: trunk/kfreebsd-kernel-headers/debian/rules
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/rules	2012-04-21 13:28:26 UTC (rev 4218)
+++ trunk/kfreebsd-kernel-headers/debian/rules	2012-04-21 13:39:40 UTC (rev 4219)
@@ -74,6 +74,7 @@
 		-e 's/#\s*include\s\+<sys\/types\.h>\s*/#include <sys\/kern\/types.h>/g' \
 		-e 's/#\s*include\s\+<sys\/time\.h>\s*/#include <sys\/kern\/time.h>/g' \
 		-e 's/#\s*include\s\+<sys\/param\.h>\s*/#include <sys\/kern\/param.h>/g' \
+		-e 's/#\s*include\s\+<sys\/queue\.h>\s*/#include <sys\/kern\/queue.h>/g' \
 		\
 		-e 's/__size_t/size_t/g' \
 	; done) ; \

More information about the Glibc-bsd-commits mailing list