Author: waldi Date: Thu Nov 29 11:12:14 2007 New Revision: 9832 Log: * debian/patches/debian/kernelvariables.patch: Fix. * debian/patches/series/1~experimental.1: Reenable patches.
Modified: 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/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 Thu Nov 29 11:12:14 2007 @@ -1,26 +1,48 @@ diff --git a/Makefile b/Makefile -index 1c018c4..a6583cc 100644 +index 7f96930..d3d474b 100644 --- a/Makefile +++ b/Makefile -@@ -185,9 +185,6 @@ SUBARCH := $(shell uname -m | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ \ +@@ -193,20 +193,6 @@ SUBARCH := $(shell uname -m | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ \ ARCH ?= $(SUBARCH) CROSS_COMPILE ?= -# Architecture as present in compile.h --UTS_MACHINE := $(ARCH) +-UTS_MACHINE := $(ARCH) +-SRCARCH := $(ARCH) +- +-# 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 -@@ -320,6 +317,11 @@ AFLAGS := -D__ASSEMBLY__ +@@ -340,6 +326,22 @@ KBUILD_AFLAGS := -D__ASSEMBLY__ KERNELRELEASE = $(shell cat include/config/kernel.release 2> /dev/null) KERNELVERSION = $(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION) +-include .kernelvariables + +# Architecture as present in compile.h -+UTS_MACHINE := $(ARCH) ++UTS_MACHINE := $(ARCH) ++SRCARCH := $(ARCH) ++ ++# 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 CONFIG_SHELL HOSTCC HOSTCFLAGS CROSS_COMPILE AS LD CC + export ARCH SRCARCH K64BIT 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 Thu Nov 29 11:12:14 2007 @@ -1,5 +1,5 @@ + 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 @@ -7,7 +7,7 @@ #+ 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 _______________________________________________ Kernel-svn-changes mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes
