From ff09f5000d64d6ea5cc11a90d65e1d3f55d76290 Mon Sep 17 00:00:00 2001 From: Maximilian Attems Date: Wed, 30 Jul 2008 16:38:39 +0000 Subject: [PATCH] update to 2.6.27-rc1 first step orig tarball lots of firmwares moved to firmware dir some atm ones disappeared big exception stays drivers/net/ svn path=/dists/trunk/linux-2.6/; revision=11926 --- debian/changelog | 6 ++ .../debian/dfsg/drivers-net-tg3-remove.patch | 2 +- debian/patches/debian/dfsg/files-1 | 65 +++++++++---------- debian/patches/series/orig-0 | 7 -- 4 files changed, 36 insertions(+), 44 deletions(-) diff --git a/debian/changelog b/debian/changelog index 12dbc7420..3769010c8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +linux-2.6 (2.6.27~rc1-1~experimental.1) UNRELEASED; urgency=low + + * New upstream release + + -- maximilian attems Wed, 30 Jul 2008 18:23:09 +0200 + linux-2.6 (2.6.26-1~experimental.1) UNRELEASED; urgency=low * New upstream release see http://kernelnewbies.org/Linux_2_6_26 diff --git a/debian/patches/debian/dfsg/drivers-net-tg3-remove.patch b/debian/patches/debian/dfsg/drivers-net-tg3-remove.patch index bd9f5a67f..30b3ee677 100644 --- a/debian/patches/debian/dfsg/drivers-net-tg3-remove.patch +++ b/debian/patches/debian/dfsg/drivers-net-tg3-remove.patch @@ -6,8 +6,8 @@ tristate "Broadcom Tigon3 support" + depends on BROKEN depends on PCI + select PHYLIB help - This driver supports Broadcom Tigon3 based gigabit Ethernet cards. --- a/drivers/net/tg3.c +++ b/drivers/net/tg3.c @@ -5,14 +5,6 @@ diff --git a/debian/patches/debian/dfsg/files-1 b/debian/patches/debian/dfsg/files-1 index c67b96a83..539070a55 100644 --- a/debian/patches/debian/dfsg/files-1 +++ b/debian/patches/debian/dfsg/files-1 @@ -1,17 +1,10 @@ rm Documentation/netlabel/draft-ietf-cipso-ipsecurity-01.txt -rm drivers/atm/atmsar11.data -rm drivers/atm/atmsar11.regions -rm drivers/atm/atmsar11.start -rm drivers/atm/fore200e_firmware_copyright -rm drivers/atm/fore200e_mkfirm.c -rm drivers/atm/pca200e.data -rm drivers/atm/pca200e_ecd.data -rm drivers/atm/sba200e_ecd.data +rm firmware/atmsar11.HEX -rm drivers/char/ip2/fip_firm.h +rm firmware/intelliport2.bin.ihex -rm drivers/media/dvb/ttusb-budget/dvb-ttusb-dspbootcode.h +rm firmware/ttusb-budget/dspbootcode.bin.ihex rm drivers/net/acenic_firmware.h @@ -36,37 +29,37 @@ rm drivers/net/tokenring/3c359.c rm drivers/net/tokenring/3c359.h rm drivers/net/tokenring/3c359_microcode.h -rm drivers/net/tokenring/smctr.c -rm drivers/net/tokenring/smctr.h -rm drivers/net/tokenring/smctr_firmware.h +rm firmware/tr_smctr.bin.ihex rm drivers/scsi/qlogicpti_asm.c -rm drivers/usb/misc/emi26.c -rm drivers/usb/misc/emi26_fw.h +rm firmware/emi26/bitstream.HEX +rm firmware/emi26/firmware.HEX +rm firmware/emi26/loader.HEX -rm drivers/usb/misc/emi62.c -rm drivers/usb/misc/emi62_fw_m.h -rm drivers/usb/misc/emi62_fw_s.h +rm firmware/emi62/bitstream.HEX +rm firmware/emi62/loader.HEX +rm firmware/emi62/midi.HEX +rm firmware/emi62/spdif.HEX -rm drivers/usb/serial/keyspan_mpr_fw.h -rm drivers/usb/serial/keyspan_usa18x_fw.h -rm drivers/usb/serial/keyspan_usa19_fw.h -rm drivers/usb/serial/keyspan_usa19qi_fw.h -rm drivers/usb/serial/keyspan_usa19qw_fw.h -rm drivers/usb/serial/keyspan_usa19w_fw.h -rm drivers/usb/serial/keyspan_usa28_fw.h -rm drivers/usb/serial/keyspan_usa28xa_fw.h -rm drivers/usb/serial/keyspan_usa28xb_fw.h -rm drivers/usb/serial/keyspan_usa28x_fw.h -rm drivers/usb/serial/keyspan_usa49w_fw.h -rm drivers/usb/serial/keyspan_usa49wlc_fw.h +rm firmware/keyspan/mpr.HEX +rm firmware/keyspan/usa18x.HEX +rm firmware/keyspan/usa19.HEX +rm firmware/keyspan/usa19qi.HEX +rm firmware/keyspan/usa19qw.HEX +rm firmware/keyspan/usa19w.HEX +rm firmware/keyspan/usa28.HEX +rm firmware/keyspan/usa28xa.HEX +rm firmware/keyspan/usa28xb.HEX +rm firmware/keyspan/usa28x.HEX +rm firmware/keyspan/usa49w.HEX +rm firmware/keyspan/usa49wlc.HEX rm sound/pci/cs46xx/cs46xx_image.h rm sound/pci/cs46xx/imgs -unifdef sound/pci/korg1212/korg1212.c -UCONFIG_SND_KORG1212_FIRMWARE_IN_KERNEL -rm sound/pci/korg1212/korg1212-firmware.h -unifdef sound/pci/maestro3.c -UCONFIG_SND_MAESTRO3_FIRMWARE_IN_KERNEL -rm sound/pci/ymfpci/ymfpci_image.h -unifdef sound/pci/ymfpci/ymfpci_main.c -UCONFIG_SND_YMFPCI_FIRMWARE_IN_KERNEL - +rm firmware/korg/k1212.dsp.ihex +rm firmware/ess/maestro3_assp_kernel.fw.ihex +rm firmware/ess/maestro3_assp_minisrc.fw.ihex +rm firmware/yamaha/ds1_ctrl.fw.ihex +rm firmware/yamaha/ds1_dsp.fw.ihex +rm firmware/yamaha/ds1e_ctrl.fw.ihex diff --git a/debian/patches/series/orig-0 b/debian/patches/series/orig-0 index f2214a5eb..2c71dc007 100644 --- a/debian/patches/series/orig-0 +++ b/debian/patches/series/orig-0 @@ -1,8 +1,5 @@ + debian/dfsg/drivers-net-tg3-mark.patch X debian/dfsg/files-1 -+ debian/dfsg/drivers-atm.patch -+ debian/dfsg/drivers-char-computone.patch -+ debian/dfsg/drivers-media-dvb-ttusb-budget.patch + debian/dfsg/drivers-net-acenic-remove.patch + debian/dfsg/drivers-net-bnx2-disable.patch + debian/dfsg/drivers-net-bnx2x-disable.patch @@ -10,8 +7,4 @@ X debian/dfsg/files-1 + debian/dfsg/drivers-net-hamradio-yam.patch + debian/dfsg/drivers-net-myri.patch + debian/dfsg/drivers-net-tg3-remove.patch -+ debian/dfsg/drivers-net-tokenring-3c359-smctr.patch + debian/dfsg/drivers-scsi-qlogicpti.patch -+ debian/dfsg/drivers-usb-misc-emi62-emi26.patch -+ debian/dfsg/drivers-usb-serial-keyspan-remove.patch -+ debian/dfsg/sound-pci.patch