[kernel] r17068 - in dists/trunk/linux-2.6/debian/patches: debian/dfsg series

[Ben Hutchings]

Author: benh
Date: Tue Mar 15 04:48:15 2011
New Revision: 17068

Log:
Remove the entire firmware directory

Some of this is DFSG-free, but it has been moved to firmware-free so
we don't need it in linux-2.6 as well.

Replaced:
   dists/trunk/linux-2.6/debian/patches/debian/dfsg/firmware-cleanup.patch
Deleted:
   dists/trunk/linux-2.6/debian/patches/debian/dfsg/firmware-Sierra-Wireless-CIS-copyright.patch
   dists/trunk/linux-2.6/debian/patches/debian/dfsg/firmware-pcmcia-cs-CIS-source-and-copyright.patch
Modified:
   dists/trunk/linux-2.6/debian/patches/debian/dfsg/files-1
   dists/trunk/linux-2.6/debian/patches/series/orig-0

Modified: dists/trunk/linux-2.6/debian/patches/debian/dfsg/files-1
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/debian/dfsg/files-1	Tue Mar 15 04:05:39 2011	(r17067)
+++ dists/trunk/linux-2.6/debian/patches/debian/dfsg/files-1	Tue Mar 15 04:48:15 2011	(r17068)
@@ -1,38 +1,8 @@
 rm Documentation/netlabel/draft-ietf-cipso-ipsecurity-01.txt
 
-rm firmware/*.HEX
-rm firmware/*.ihex
-rm firmware/3com
-rm firmware/acenic
-rm firmware/adaptec
-rm firmware/advansys
-rm firmware/bnx2
-rm firmware/bnx2x
-rm firmware/cpia2
-rm firmware/cxgb3
-rm firmware/dabusb
-rm firmware/e100
-rm firmware/edgeport
-rm firmware/emi26
-rm firmware/emi62
-rm firmware/ess
-rm firmware/kaweth
-rm firmware/keyspan
-rm firmware/korg
-rm firmware/matrox
-rm firmware/myricom
-rm firmware/ositech
-rm firmware/qlogic
-rm firmware/r128
-rm firmware/radeon
-rm firmware/sb16
-rm firmware/sun
-rm firmware/tehuti
-rm firmware/tigon
-rm firmware/ttusb-budget
-rm firmware/vicam
-rm firmware/yam
-rm firmware/yamaha
+# Some of this is DFSG-free, but it has been moved to firmware-free so
+# we don't need it in linux-2.6 as well.
+rm firmware
 
 rm arch/powerpc/sysdev/micropatch.c
 

Added: dists/trunk/linux-2.6/debian/patches/debian/dfsg/firmware-cleanup.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/trunk/linux-2.6/debian/patches/debian/dfsg/firmware-cleanup.patch	Tue Mar 15 04:48:15 2011	(r17068)
@@ -0,0 +1,26 @@
+diff --git a/Makefile b/Makefile
+index d6592b6..9afac11 100644
+--- a/Makefile
++++ b/Makefile
+@@ -487,7 +487,7 @@ scripts: scripts_basic include/config/auto.conf include/config/tristate.conf
+ 
+ # Objects we will link into vmlinux / subdirs we need to visit
+ init-y		:= init/
+-drivers-y	:= drivers/ sound/ firmware/
++drivers-y	:= drivers/ sound/
+ net-y		:= net/
+ libs-y		:= lib/
+ core-y		:= usr/
+diff --git a/scripts/Makefile.fwinst b/scripts/Makefile.fwinst
+index 6bf8e87..2f6db83 100644
+--- a/scripts/Makefile.fwinst
++++ b/scripts/Makefile.fwinst
+@@ -13,7 +13,7 @@ src := $(obj)
+ -include $(objtree)/.config
+ 
+ include scripts/Kbuild.include
+-include $(srctree)/$(obj)/Makefile
++-include $(srctree)/$(obj)/Makefile
+ 
+ include scripts/Makefile.host
+ 

Modified: dists/trunk/linux-2.6/debian/patches/series/orig-0
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/series/orig-0	Tue Mar 15 04:05:39 2011	(r17067)
+++ dists/trunk/linux-2.6/debian/patches/series/orig-0	Tue Mar 15 04:48:15 2011	(r17068)
@@ -7,5 +7,3 @@
 + debian/dfsg/firmware-cleanup.patch
 + debian/dfsg/sound-pci.patch
 X debian/dfsg/files-1
-+ debian/dfsg/firmware-Sierra-Wireless-CIS-copyright.patch
-+ debian/dfsg/firmware-pcmcia-cs-CIS-source-and-copyright.patch