[kernel] r13427 - in dists/trunk/linux-2.6/debian: . patches/bugfix/all patches/debian patches/debian/dfsg patches/series

[Maximilian Attems]

Author: maks
Date: Fri Apr 17 00:41:38 2009
New Revision: 13427

Log:
update to 2.6.30-rc2

* nuked merged compile fix
* update firmware dirs + firmware Makefile patch
* refresh kernelvariables.patch

Thanks to Ben Hutchings <ben at decadent.org.uk> for dfsg review + patches.

Deleted:
   dists/trunk/linux-2.6/debian/patches/bugfix/all/fix-befs-super-compilation.patch
Modified:
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/patches/debian/dfsg/files-1
   dists/trunk/linux-2.6/debian/patches/debian/dfsg/firmware-cleanup.patch
   dists/trunk/linux-2.6/debian/patches/debian/kernelvariables.patch
   dists/trunk/linux-2.6/debian/patches/series/base

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	Fri Apr 17 00:41:33 2009	(r13426)
+++ dists/trunk/linux-2.6/debian/changelog	Fri Apr 17 00:41:38 2009	(r13427)
@@ -1,4 +1,4 @@
-linux-2.6 (2.6.30~rc1-1~experimental.1) UNRELEASED; urgency=low
+linux-2.6 (2.6.30~rc2-1~experimental.1) UNRELEASED; urgency=low
 
   * New upstream release
     - radeonfb: suspend/resume for ATI Mobility Radeon RV350.

Modified: dists/trunk/linux-2.6/debian/patches/debian/dfsg/files-1
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/debian/dfsg/files-1	Fri Apr 17 00:41:33 2009	(r13426)
+++ dists/trunk/linux-2.6/debian/patches/debian/dfsg/files-1	Fri Apr 17 00:41:38 2009	(r13427)
@@ -5,6 +5,7 @@
 rm firmware/3com
 rm firmware/acenic
 rm firmware/adaptec
+rm firmware/av7110
 rm firmware/bnx2
 rm firmware/cpia2
 rm firmware/cxgb3
@@ -21,9 +22,7 @@
 rm firmware/ositech
 rm firmware/qlogic
 rm firmware/sb16
-rm firmware/slicoss
 rm firmware/sun
-rm firmware/sxg
 rm firmware/tehuti
 rm firmware/tigon
 rm firmware/ttusb-budget

Modified: dists/trunk/linux-2.6/debian/patches/debian/dfsg/firmware-cleanup.patch
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/debian/dfsg/firmware-cleanup.patch	Fri Apr 17 00:41:33 2009	(r13426)
+++ dists/trunk/linux-2.6/debian/patches/debian/dfsg/firmware-cleanup.patch	Fri Apr 17 00:41:38 2009	(r13427)
@@ -1,8 +1,8 @@
 diff --git a/firmware/Makefile b/firmware/Makefile
-index 1e7fd4d..fea3504 100644
+index 142c17a..1d41235 100644
 --- a/firmware/Makefile
 +++ b/firmware/Makefile
-@@ -20,96 +20,8 @@ fw-external-y := $(subst ",,$(CONFIG_EXTRA_FIRMWARE))
+@@ -20,92 +20,8 @@ fw-external-y := $(subst ",,$(CONFIG_EXTRA_FIRMWARE))
  # accurate. In the latter case it doesn't matter -- it'll use $(fw-shipped-all).
  # But be aware that the config file might not be included at all.
  
@@ -27,6 +27,7 @@
 -fw-shipped-$(CONFIG_CHELSIO_T3) += cxgb3/t3b_psram-1.1.0.bin \
 -				   cxgb3/t3c_psram-1.1.0.bin \
 -				   cxgb3/t3fw-7.1.0.bin
+-fw-shipped-$(CONFIG_DVB_AV7110) += av7110/bootcode.bin
 -fw-shipped-$(CONFIG_DVB_TTUSB_BUDGET) += ttusb-budget/dspbootcode.bin
 -fw-shipped-$(CONFIG_E100) += e100/d101m_ucode.bin e100/d101s_ucode.bin \
 -			     e100/d102e_ucode.bin
@@ -45,14 +46,9 @@
 -				     sb16/ima_adpcm_init.csp \
 -				     sb16/ima_adpcm_playback.csp \
 -				     sb16/ima_adpcm_capture.csp
--fw-shipped-$(CONFIG_SLICOSS) += slicoss/gbdownload.sys slicoss/gbrcvucode.sys \
--				slicoss/oasisdbgdownload.sys \
--				slicoss/oasisdownload.sys \
--				slicoss/oasisrcvucode.sys
--fw-shipped-$(CONFIG_SXG) += sxg/saharadownloadB.sys \
--				sxg/saharadbgdownloadB.sys
 -fw-shipped-$(CONFIG_SND_YMFPCI) += yamaha/ds1_ctrl.fw yamaha/ds1_dsp.fw \
 -				   yamaha/ds1e_ctrl.fw
+-fw-shipped-$(CONFIG_SND_WAVEFRONT) += yamaha/yss225_registers.bin
 -fw-shipped-$(CONFIG_TEHUTI) += tehuti/bdx.bin
 -fw-shipped-$(CONFIG_TIGON3) += tigon/tg3.bin tigon/tg3_tso.bin \
 -			       tigon/tg3_tso5.bin

Modified: dists/trunk/linux-2.6/debian/patches/debian/kernelvariables.patch
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/debian/kernelvariables.patch	Fri Apr 17 00:41:33 2009	(r13426)
+++ dists/trunk/linux-2.6/debian/patches/debian/kernelvariables.patch	Fri Apr 17 00:41:38 2009	(r13427)
@@ -2,7 +2,7 @@
 index 59cf6da..6e1e048 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -193,30 +193,6 @@ export KBUILD_BUILDHOST := $(SUBARCH)
+@@ -193,35 +193,6 @@ export KBUILD_BUILDHOST := $(SUBARCH)
  ARCH		?= $(SUBARCH)
  CROSS_COMPILE	?=
  
@@ -23,6 +23,11 @@
 -       SRCARCH := sparc
 -endif
 -
+-# Additional ARCH settings for sh
+-ifeq ($(ARCH),sh64)
+-       SRCARCH := sh
+-endif
+-
 -# Where to locate arch specific headers
 -hdr-arch  := $(SRCARCH)
 -
@@ -33,7 +38,7 @@
  KCONFIG_CONFIG	?= .config
  
  # SHELL used by kbuild
-@@ -334,6 +310,31 @@ LDFLAGS_MODULE  =
+@@ -339,6 +315,36 @@ LDFLAGS_MODULE  =
  CFLAGS_KERNEL	=
  AFLAGS_KERNEL	=
  
@@ -56,6 +61,11 @@
 +       SRCARCH := sparc
 +endif
 +
++# Additional ARCH settings for sh
++ifeq ($(ARCH),sh64)
++       SRCARCH := sh
++endif
++
 +# Where to locate arch specific headers
 +hdr-arch  := $(SRCARCH)
 +

Modified: dists/trunk/linux-2.6/debian/patches/series/base
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/series/base	Fri Apr 17 00:41:33 2009	(r13426)
+++ dists/trunk/linux-2.6/debian/patches/series/base	Fri Apr 17 00:41:38 2009	(r13427)
@@ -27,4 +27,3 @@
 #+ features/sparc/video-sunxvr500-intergraph.patch
 + features/arm/allow-alternative-copy-user.patch
 + features/arm/alternative-copy-user.patch
-+ bugfix/all/fix-befs-super-compilation.patch