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

[Aurelien Jarno]

Author: aurel32
Date: 2009-04-07 16:25:41 +0000 (Tue, 07 Apr 2009)
New Revision: 2417

Modified:
   trunk/freebsd-libs/debian/patches/00_fbsdid.diff
   trunk/freebsd-libs/debian/rules
Log:
Remove sys/cam/scsi/scsi_ch.*, published in a 4-clause BSD license (ie GPL incompatible), but not used.



Modified: trunk/freebsd-libs/debian/patches/00_fbsdid.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/00_fbsdid.diff	2009-04-07 15:51:15 UTC (rev 2416)
+++ trunk/freebsd-libs/debian/patches/00_fbsdid.diff	2009-04-07 16:25:41 UTC (rev 2417)
@@ -31,7 +31,6 @@
  sys/cam/cam_xpt.c               |    1 -
  sys/cam/scsi/scsi_all.c         |    1 -
  sys/cam/scsi/scsi_cd.c          |    1 -
- sys/cam/scsi/scsi_ch.c          |    1 -
  sys/cam/scsi/scsi_da.c          |    1 -
  sys/cam/scsi/scsi_low.c         |    1 -
  sys/cam/scsi/scsi_low_pisa.c    |    1 -
@@ -43,7 +42,7 @@
  sys/cam/scsi/scsi_targ_bh.c     |    1 -
  sys/cam/scsi/scsi_target.c      |    1 -
  sys/kern/subr_sbuf.c            |    1 -
- 44 files changed, 44 deletions(-)
+ 43 files changed, 43 deletions(-)
 
 --- a/lib/libcam/camlib.c
 +++ b/lib/libcam/camlib.c
@@ -365,16 +364,6 @@
  
  #include "opt_cd.h"
  
---- a/sys/cam/scsi/scsi_ch.c
-+++ b/sys/cam/scsi/scsi_ch.c
-@@ -68,7 +68,6 @@
-  */
- 
- #include <sys/cdefs.h>
--__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_ch.c,v 1.46.6.1 2008/11/25 02:59:29 kensmith Exp $");
- 
- #include <sys/param.h>
- #include <sys/queue.h>
 --- a/sys/cam/scsi/scsi_da.c
 +++ b/sys/cam/scsi/scsi_da.c
 @@ -27,7 +27,6 @@

Modified: trunk/freebsd-libs/debian/rules
===================================================================
--- trunk/freebsd-libs/debian/rules	2009-04-07 15:51:15 UTC (rev 2416)
+++ trunk/freebsd-libs/debian/rules	2009-04-07 16:25:41 UTC (rev 2417)
@@ -36,6 +36,7 @@
 	done
 	mv freebsd-libs-$(VERSION)/src/* freebsd-libs-$(VERSION)
 	rmdir freebsd-libs-$(VERSION)/src
+	rm -f freebsd-libs-$(VERSION)/sys/cam/scsi/scsi_ch.*
 	tar -czf ../freebsd-libs_$(VERSION).orig.tar.gz freebsd-libs-$(VERSION)
 	rm -rf freebsd-libs-$(VERSION)