Author: maks Date: Mon Nov 26 20:55:59 2007 New Revision: 9773 Log: rebase to 2.6.24-rc3 kill all the stable patches, my backports, comment the rest dfsg stuff need rebase too for orig tarball generation (dgrs gone, atm Kconfig changes)
Removed: dists/trunk/linux-2.6/debian/patches/bugfix/all/2.6.23.1 dists/trunk/linux-2.6/debian/patches/bugfix/all/git-ieee1394.patch dists/trunk/linux-2.6/debian/patches/bugfix/all/stable/2.6.23.2.patch dists/trunk/linux-2.6/debian/patches/bugfix/all/stable/2.6.23.3.patch dists/trunk/linux-2.6/debian/patches/bugfix/all/stable/2.6.23.4.patch dists/trunk/linux-2.6/debian/patches/bugfix/all/stable/2.6.23.5.patch dists/trunk/linux-2.6/debian/patches/bugfix/all/stable/2.6.23.6.patch dists/trunk/linux-2.6/debian/patches/bugfix/all/stable/2.6.23.7.patch dists/trunk/linux-2.6/debian/patches/bugfix/all/stable/2.6.23.8.patch dists/trunk/linux-2.6/debian/patches/features/all/e1000e-20070806.patch dists/trunk/linux-2.6/debian/patches/features/all/e1000e-fixes.patch dists/trunk/linux-2.6/debian/patches/features/all/v7-iwlwifi-add-iwlwifi-wireless-drivers.patch Modified: dists/trunk/linux-2.6/debian/changelog dists/trunk/linux-2.6/debian/patches/debian/dfsg/drivers-atm.patch dists/trunk/linux-2.6/debian/patches/debian/dfsg/files-1 dists/trunk/linux-2.6/debian/patches/debian/scripts-kconfig-reportoldconfig.patch dists/trunk/linux-2.6/debian/patches/series/1~experimental.1 dists/trunk/linux-2.6/debian/patches/series/orig-0 Modified: dists/trunk/linux-2.6/debian/changelog ============================================================================== --- dists/trunk/linux-2.6/debian/changelog (original) +++ dists/trunk/linux-2.6/debian/changelog Mon Nov 26 20:55:59 2007 @@ -1,3 +1,10 @@ +linux-2.6 (2.6.24~rc3-1~experimental.1) UNRELEASED; urgency=low + + * New upstream release, rebase dfsg stuff plus drivers-atm.patch, + scripts-kconfig-reportoldconfig.patch. + + -- maximilian attems <[EMAIL PROTECTED]> Mon, 26 Nov 2007 21:51:39 +0100 + linux-2.6 (2.6.23-1~experimental.1) UNRELEASED; urgency=low * New upstream release (closes: #447682). Modified: dists/trunk/linux-2.6/debian/patches/debian/dfsg/drivers-atm.patch ============================================================================== --- dists/trunk/linux-2.6/debian/patches/debian/dfsg/drivers-atm.patch (original) +++ dists/trunk/linux-2.6/debian/patches/debian/dfsg/drivers-atm.patch Mon Nov 26 20:55:59 2007 @@ -85,7 +85,7 @@ - # guess the target endianess to choose the right PCA-200E firmware image - ifeq ($(CONFIG_ATM_FORE200E_PCA_DEFAULT_FW),y) - byteorder.h := include$(if $(patsubst $(srctree),,$(objtree)),2)/asm/byteorder.h -- CONFIG_ATM_FORE200E_PCA_FW := $(obj)/pca200e$(if $(shell $(CC) $(CPPFLAGS) -E -dM $(byteorder.h) | grep ' __LITTLE_ENDIAN '),.bin,_ecd.bin2) +- CONFIG_ATM_FORE200E_PCA_FW := $(obj)/pca200e$(if $(shell $(CC) $(KBUILD_CPPFLAGS) -E -dM $(byteorder.h) | grep ' __LITTLE_ENDIAN '),.bin,_ecd.bin2) - endif -endif - Modified: dists/trunk/linux-2.6/debian/patches/debian/dfsg/files-1 ============================================================================== --- dists/trunk/linux-2.6/debian/patches/debian/dfsg/files-1 (original) +++ dists/trunk/linux-2.6/debian/patches/debian/dfsg/files-1 Mon Nov 26 20:55:59 2007 @@ -29,16 +29,6 @@ rm drivers/net/bnx2_fw.h rm drivers/net/bnx2_fw2.h -rm drivers/net/dgrs.c -rm drivers/net/dgrs.h -rm drivers/net/dgrs_asstruct.h -rm drivers/net/dgrs_bcomm.h -rm drivers/net/dgrs_es4h.h -rm drivers/net/dgrs_ether.h -rm drivers/net/dgrs_firmware.c -rm drivers/net/dgrs_i82596.h -rm drivers/net/dgrs_plx9060.h - rm drivers/net/hamradio/yam1200.h rm drivers/net/hamradio/yam9600.h Modified: dists/trunk/linux-2.6/debian/patches/debian/scripts-kconfig-reportoldconfig.patch ============================================================================== --- dists/trunk/linux-2.6/debian/patches/debian/scripts-kconfig-reportoldconfig.patch (original) +++ dists/trunk/linux-2.6/debian/patches/debian/scripts-kconfig-reportoldconfig.patch Mon Nov 26 20:55:59 2007 @@ -9,20 +9,20 @@ -PHONY += oldconfig xconfig gconfig menuconfig config silentoldconfig update-po-config +PHONY += oldconfig xconfig gconfig menuconfig config reportoldconfig silentoldconfig updateoldconfig update-po-config - xconfig: $(obj)/qconf - $< arch/$(ARCH)/Kconfig + Kconfig := arch/$(SRCARCH)/Kconfig + @@ -20,9 +20,15 @@ config: $(obj)/conf oldconfig: $(obj)/conf - $< -o arch/$(ARCH)/Kconfig + $< -o $(Kconfig) +reportoldconfig: $(obj)/conf -+ $< -R arch/$(ARCH)/Kconfig ++ $< -o $(Kconfig) + silentoldconfig: $(obj)/conf - $< -s arch/$(ARCH)/Kconfig + $< -s $(Kconfig) +updateoldconfig: $(obj)/conf -+ $< -U arch/$(ARCH)/Kconfig ++ $< -o $(Kconfig) + # Create new linux.po file # Adjust charset to UTF-8 in .po file to accept UTF-8 in Kconfig files Modified: dists/trunk/linux-2.6/debian/patches/series/1~experimental.1 ============================================================================== --- dists/trunk/linux-2.6/debian/patches/series/1~experimental.1 (original) +++ dists/trunk/linux-2.6/debian/patches/series/1~experimental.1 Mon Nov 26 20:55:59 2007 @@ -1,16 +1,16 @@ + debian/version.patch -+ debian/kernelvariables.patch +#+ debian/kernelvariables.patch + debian/doc-build-parallel.patch + debian/scripts-kconfig-reportoldconfig.patch + debian/powerpc-mkvmlinuz-support-ppc.patch + debian/powerpc-mkvmlinuz-support-powerpc.patch -+ debian/drivers-ata-ata_piix-postpone-pata.patch +#+ debian/drivers-ata-ata_piix-postpone-pata.patch -+ debian/dfsg/drivers-net-tg3-fix-simple.patch +#+ debian/dfsg/drivers-net-tg3-fix-simple.patch -+ bugfix/powerpc/build-links.patch -+ bugfix/powerpc/mv643xx-hotplug-support.patch +#+ bugfix/powerpc/build-links.patch +#+ bugfix/powerpc/mv643xx-hotplug-support.patch + bugfix/powerpc/oldworld-boot-fix.patch + bugfix/powerpc/prep-utah-ide-interrupt.patch + bugfix/powerpc/serial.patch @@ -18,7 +18,7 @@ + bugfix/mips/cobalt-ide-resources.patch + bugfix/mips/bcm1480-pci-build-fix.patch + bugfix/mips/ip22-disable-early-printk.patch -+ bugfix/mips/ip22-fix-eisa-interrupt-setup.patch +#+ bugfix/mips/ip22-fix-eisa-interrupt-setup.patch + bugfix/mips/ip22-fix-eprom-access.patch + features/arm/ixp4xx-npe-driver-0.3.1.patch + features/arm/ixp4xx-net-driver-improve-mac-handling.patch @@ -30,12 +30,12 @@ + features/arm/nas100d-setup-mac.patch #+ bugfix/drivers-bus_to_virt.patch + bugfix/sparc/drivers_net-broken.patch -+ bugfix/forcedeth-napi-broken.patch +#+ bugfix/forcedeth-napi-broken.patch #+ bugfix/powerpc/drivers_macintosh-broken.patch -+ bugfix/ia64/hardcode-arch-script-output.patch -+ features/fintek-f75375.patch -+ features/f75375-new-style-bindings.patch -+ features/f75375-set-fans-platform-data.patch +#+ bugfix/ia64/hardcode-arch-script-output.patch +#+ features/fintek-f75375.patch +#+ features/f75375-new-style-bindings.patch +#+ features/f75375-set-fans-platform-data.patch + features/arm/n2100-set-fan.patch #+ features/alpha/isa-mapping-support.patch + bugfix/powerpc/libgcc-__ucmpdi2.patch @@ -45,17 +45,5 @@ + bugfix/arm/disable-chelsio_t3.patch + bugfix/arm/disable-video_bt848.patch + bugfix/arm/disable-bcm43xx.patch -+ bugfix/arm/binutils-notes.patch -+ bugfix/all/git-ieee1394.patch -+ features/all/v7-iwlwifi-add-iwlwifi-wireless-drivers.patch -+ features/all/e1000e-20070806.patch -+ features/all/e1000e-fixes.patch -+ bugfix/all/2.6.23.1 +#+ bugfix/arm/binutils-notes.patch + bugfix/arm/disable-scsi_acard.patch -+ bugfix/all/stable/2.6.23.2.patch -+ bugfix/all/stable/2.6.23.3.patch -+ bugfix/all/stable/2.6.23.4.patch -+ bugfix/all/stable/2.6.23.5.patch -+ bugfix/all/stable/2.6.23.6.patch -+ bugfix/all/stable/2.6.23.7.patch -+ bugfix/all/stable/2.6.23.8.patch Modified: dists/trunk/linux-2.6/debian/patches/series/orig-0 ============================================================================== --- dists/trunk/linux-2.6/debian/patches/series/orig-0 (original) +++ dists/trunk/linux-2.6/debian/patches/series/orig-0 Mon Nov 26 20:55:59 2007 @@ -7,7 +7,6 @@ + debian/dfsg/drivers-net-acenic-remove.patch + debian/dfsg/drivers-net-bnx2-disable.patch + debian/dfsg/drivers-net-appletalk-cops.patch -+ debian/dfsg/drivers-net-dgrs.patch + debian/dfsg/drivers-net-hamradio-yam.patch + debian/dfsg/drivers-net-myri.patch + debian/dfsg/drivers-net-tg3-remove.patch _______________________________________________ Kernel-svn-changes mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes
