[kernel] r9872 - in dists/trunk/linux-2.6/debian: . patches/debian patches/series

[Bastian Blank]

Author: waldi
Date: Tue Dec  4 14:08:29 2007
New Revision: 9872

Log:
* debian/changelog: Set version to 2.6.24~rc4-1~experimental.1.
* debian/patches/debian/kernelvariables.patch: Fix.
* debian/patches/series/1~experimental.1: Disable broken patches.


Modified:
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/patches/debian/kernelvariables.patch
   dists/trunk/linux-2.6/debian/patches/series/1~experimental.1

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	(original)
+++ dists/trunk/linux-2.6/debian/changelog	Tue Dec  4 14:08:29 2007
@@ -1,4 +1,4 @@
-linux-2.6 (2.6.24~rc3-1~experimental.1) UNRELEASED; urgency=low
+linux-2.6 (2.6.24~rc4-1~experimental.1) UNRELEASED; urgency=low
 
   [ maximilian attems ]
   * New upstream release, rebase dfsg stuff plus drivers-atm.patch,

Modified: dists/trunk/linux-2.6/debian/patches/debian/kernelvariables.patch
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/debian/kernelvariables.patch	(original)
+++ dists/trunk/linux-2.6/debian/patches/debian/kernelvariables.patch	Tue Dec  4 14:08:29 2007
@@ -2,7 +2,7 @@
 index 7f96930..d3d474b 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -193,20 +193,6 @@ SUBARCH := $(shell uname -m | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ \
+@@ -193,18 +193,6 @@ SUBARCH := $(shell uname -m | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ \
  ARCH		?= $(SUBARCH)
  CROSS_COMPILE	?=
  
@@ -13,17 +13,15 @@
 -# Additional ARCH settings for x86
 -ifeq ($(ARCH),i386)
 -        SRCARCH := x86
--        K64BIT  := n
 -endif
 -ifeq ($(ARCH),x86_64)
 -        SRCARCH := x86
--        K64BIT  := y
 -endif
 -
  KCONFIG_CONFIG	?= .config
  
  # SHELL used by kbuild
-@@ -340,6 +326,22 @@ KBUILD_AFLAGS   := -D__ASSEMBLY__
+@@ -340,6 +326,20 @@ KBUILD_AFLAGS   := -D__ASSEMBLY__
  KERNELRELEASE = $(shell cat include/config/kernel.release 2> /dev/null)
  KERNELVERSION = $(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
  
@@ -36,13 +34,11 @@
 +# Additional ARCH settings for x86
 +ifeq ($(ARCH),i386)
 +        SRCARCH := x86
-+        K64BIT  := n
 +endif
 +ifeq ($(ARCH),x86_64)
 +        SRCARCH := x86
-+        K64BIT  := y
 +endif
 +
  export VERSION PATCHLEVEL SUBLEVEL KERNELRELEASE KERNELVERSION
- export ARCH SRCARCH K64BIT CONFIG_SHELL HOSTCC HOSTCFLAGS CROSS_COMPILE AS LD CC
+ export ARCH SRCARCH CONFIG_SHELL HOSTCC HOSTCFLAGS CROSS_COMPILE AS LD CC
  export CPP AR NM STRIP OBJCOPY OBJDUMP MAKE AWK GENKSYMS PERL UTS_MACHINE

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	Tue Dec  4 14:08:29 2007
@@ -15,7 +15,7 @@
 + bugfix/powerpc/prep-utah-ide-interrupt.patch
 + bugfix/powerpc/serial.patch
 + bugfix/mips/tulip_mwi_fix.patch
-+ bugfix/mips/sb-pci-build-fix.patch
+#+ bugfix/mips/sb-pci-build-fix.patch
 + features/arm/ixp4xx-npe-driver-0.3.1.patch
 + features/arm/ixp4xx-net-driver-improve-mac-handling.patch
 + features/arm/nslu2-i2c-gpio-driver-support.patch