[Glibc-bsd-commits] r4094 - in trunk/freebsd-libs/debian: . patches

[Robert Millan]

Author: rmh
Date: 2012-02-15 21:15:55 +0000 (Wed, 15 Feb 2012)
New Revision: 4094

Modified:
   trunk/freebsd-libs/debian/changelog
   trunk/freebsd-libs/debian/patches/01_sys_cam.diff
   trunk/freebsd-libs/debian/rules
Log:
Remove all CAM kernel headers to ensure system-wide version is used instead.

Modified: trunk/freebsd-libs/debian/changelog
===================================================================
--- trunk/freebsd-libs/debian/changelog	2012-02-15 21:15:30 UTC (rev 4093)
+++ trunk/freebsd-libs/debian/changelog	2012-02-15 21:15:55 UTC (rev 4094)
@@ -6,8 +6,10 @@
   [ Robert Millan ]
   * libsbuf6.symbols: Remove sbuf_overflowed (it wasn't present in 9.0-
     1).
+  * Remove all CAM kernel headers to ensure system-wide version is used
+    instead.
 
- -- Robert Millan <rmh at debian.org>  Wed, 15 Feb 2012 22:14:44 +0100
+ -- Robert Millan <rmh at debian.org>  Wed, 15 Feb 2012 22:15:49 +0100
 
 freebsd-libs (9.0-1) unstable; urgency=low
 

Modified: trunk/freebsd-libs/debian/patches/01_sys_cam.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/01_sys_cam.diff	2012-02-15 21:15:30 UTC (rev 4093)
+++ trunk/freebsd-libs/debian/patches/01_sys_cam.diff	2012-02-15 21:15:55 UTC (rev 4094)
@@ -1,11 +1,3 @@
----
- sys/cam/ata/ata_all.c   |    2 +-
- sys/cam/cam.c           |    1 +
- sys/cam/cam_xpt.c       |    2 +-
- sys/cam/scsi/scsi_all.c |    1 +
- sys/cam/scsi/scsi_all.h |    2 ++
- 5 files changed, 6 insertions(+), 2 deletions(-)
-
 --- a/sys/cam/cam.c
 +++ b/sys/cam/cam.c
 @@ -36,6 +36,7 @@
@@ -16,17 +8,6 @@
  #include <stdio.h>
  #include <string.h>
  #include <camlib.h>
---- a/sys/cam/cam_xpt.c
-+++ b/sys/cam/cam_xpt.c
-@@ -230,7 +230,7 @@
- static void	 xpt_run_dev_allocq(struct cam_eb *bus);
- static void	 xpt_run_dev_sendq(struct cam_eb *bus);
- static timeout_t xpt_release_devq_timeout;
--static void	 xpt_release_simq_timeout(void *arg) __unused;
-+static void	 xpt_release_simq_timeout(void *arg);
- static void	 xpt_release_bus(struct cam_eb *bus);
- static void	 xpt_release_devq_device(struct cam_ed *dev, cam_rl rl,
- 		    u_int count, int run_queue);
 --- a/sys/cam/scsi/scsi_all.c
 +++ b/sys/cam/scsi/scsi_all.c
 @@ -43,6 +43,7 @@
@@ -37,14 +18,3 @@
  #include <stdio.h>
  #include <stdlib.h>
  #include <string.h>
---- a/sys/cam/scsi/scsi_all.h
-+++ b/sys/cam/scsi/scsi_all.h
-@@ -33,6 +33,8 @@
-  * bus reset.
-  */
- extern int scsi_delay;
-+#else
-+#include <stdint.h>
- #endif /* _KERNEL */
- 
- /*

Modified: trunk/freebsd-libs/debian/rules
===================================================================
--- trunk/freebsd-libs/debian/rules	2012-02-15 21:15:30 UTC (rev 4093)
+++ trunk/freebsd-libs/debian/rules	2012-02-15 21:15:55 UTC (rev 4094)
@@ -60,6 +60,10 @@
 	rm -f $(ORIGDIR)/sys/cam/scsi/scsi_ch.*
 	rm -f $(ORIGDIR)/lib/libkvm/kvm_ia64.c
 	rm -f $(ORIGDIR)/lib/libkvm/kvm_powerpc.c
+
+	# Remove all CAM kernel headers to ensure system-wide version is used instead
+	find $(ORIGDIR)/sys/cam -name \*.h | xargs rm -f
+
 	tar --numeric-owner --owner 0 --group 0 -czf ../$(TARNAME) $(ORIGDIR)
 	rm -rf $(ORIGDIR)