diff options
| author | Bastian Blank <waldi@debian.org> | 2007-05-24 13:08:20 +0000 |
|---|---|---|
| committer | Bastian Blank <waldi@debian.org> | 2007-05-24 13:08:20 +0000 |
| commit | e20c60b3a0d10fcc760fbc8870fc7deb6cd8b3be (patch) | |
| tree | 08d85dc6850aa12feb2c775e8262638d6755db37 | |
| parent | dee2b1828260da58dd1eb4966a9d696b76343073 (diff) | |
| download | kernel_replicant_linux-e20c60b3a0d10fcc760fbc8870fc7deb6cd8b3be.tar.gz kernel_replicant_linux-e20c60b3a0d10fcc760fbc8870fc7deb6cd8b3be.tar.bz2 kernel_replicant_linux-e20c60b3a0d10fcc760fbc8870fc7deb6cd8b3be.zip | |
* debian/patches/debian/kernelvariables-1.patch: Add.
* debian/patches/series/3: Update.
svn path=/dists/sid/linux-2.6/; revision=8750
| -rw-r--r-- | debian/patches/debian/kernelvariables-1.patch | 26 | ||||
| -rw-r--r-- | debian/patches/series/3 | 2 |
2 files changed, 28 insertions, 0 deletions
diff --git a/debian/patches/debian/kernelvariables-1.patch b/debian/patches/debian/kernelvariables-1.patch new file mode 100644 index 000000000000..9a045fdcf58d --- /dev/null +++ b/debian/patches/debian/kernelvariables-1.patch @@ -0,0 +1,26 @@ +diff --git a/Makefile b/Makefile +index 1c018c4..a6583cc 100644 +--- a/Makefile ++++ b/Makefile +@@ -185,9 +185,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) +- + KCONFIG_CONFIG ?= .config + + # SHELL used by kbuild +@@ -320,6 +317,11 @@ 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) ++ + export VERSION PATCHLEVEL SUBLEVEL KERNELRELEASE KERNELVERSION + export ARCH CONFIG_SHELL HOSTCC HOSTCFLAGS CROSS_COMPILE AS LD CC + export CPP AR NM STRIP OBJCOPY OBJDUMP MAKE AWK GENKSYMS PERL UTS_MACHINE diff --git a/debian/patches/series/3 b/debian/patches/series/3 index b087004db7af..0aa112d5df92 100644 --- a/debian/patches/series/3 +++ b/debian/patches/series/3 @@ -1,3 +1,5 @@ + features/arm/nslu2-freq-fixup.patch + bugfix/2.6.21.1 + bugfix/2.6.21.2 +- debian/kernelvariables.patch ++ debian/kernelvariables-1.patch |