summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Korsgaard <jacmet@sunsite.dk>2009-02-25 14:28:35 +0000
committerPeter Korsgaard <jacmet@sunsite.dk>2009-02-25 14:28:35 +0000
commitaae3f1b6b3447ea5f38bfc821d71a0853e7caa46 (patch)
tree903c48bb48a8534d8555fe6497465b51dbd875be
parente95aedd05be8204ba3e7cd85eddf686024b8530c (diff)
linux: always apply platform patches if available
Get rid of BR2_KERNEL_HEADERS_PATCH_DIR config, and simply always apply platform patches if available.
-rw-r--r--target/linux/Makefile.in2
-rw-r--r--target/linux/Makefile.in.advanced6
-rw-r--r--toolchain/kernel-headers/Config.in7
-rw-r--r--toolchain/kernel-headers/kernel-headers-new.makefile7
4 files changed, 5 insertions, 17 deletions
diff --git a/target/linux/Makefile.in b/target/linux/Makefile.in
index 494de7f30..ff0b88e34 100644
--- a/target/linux/Makefile.in
+++ b/target/linux/Makefile.in
@@ -129,7 +129,7 @@ $(LINUX26_DIR)/.patched: $(LINUX26_DIR)/.unpacked $(LINUX_HEADERS_DEPENDS)
ifeq ($(BR2_KERNEL_HEADERS_RT),y)
toolchain/patch-kernel.sh $(LINUX26_DIR) $(DL_DIR) $(LINUX_RT_SOURCE)
endif
-ifeq ($(BR2_KERNEL_HEADERS_PATCH_DIR),y)
+ifneq ($(KERNEL_HEADERS_PATCH_DIR),)
toolchain/patch-kernel.sh $(LINUX26_DIR) $(KERNEL_HEADERS_PATCH_DIR) \
linux-$(LINUX26_VERSION)-\*.patch{,.gz,.bz2}
endif
diff --git a/target/linux/Makefile.in.advanced b/target/linux/Makefile.in.advanced
index 122358410..614346c89 100644
--- a/target/linux/Makefile.in.advanced
+++ b/target/linux/Makefile.in.advanced
@@ -263,11 +263,9 @@ endif
ifeq ($(BR2_KERNEL_HEADERS_RT),y)
toolchain/patch-kernel.sh $(LINUX26_DIR) $(DL_DIR) $(LINUX_RT_SOURCE)
endif
-ifeq ($(BR2_KERNEL_HEADERS_PATCH_DIR),y)
- if [ -d $(KERNEL_HEADERS_PATCH_DIR) ] ; then \
+ifneq ($(KERNEL_HEADERS_PATCH_DIR),)
toolchain/patch-kernel.sh $(LINUX26_DIR) $(KERNEL_HEADERS_PATCH_DIR) \
- linux-$(LINUX26_VERSION)\*.patch{,.gz,.bz2} ; \
- fi
+ linux-$(LINUX26_VERSION)\*.patch{,.gz,.bz2}
endif
ifeq ($(BR2_PACKAGE_OPENSWAN),y)
toolchain/patch-kernel.sh $(LINUX26_DIR) package/openswan \
diff --git a/toolchain/kernel-headers/Config.in b/toolchain/kernel-headers/Config.in
index 5ce4361d9..809fa55ab 100644
--- a/toolchain/kernel-headers/Config.in
+++ b/toolchain/kernel-headers/Config.in
@@ -54,13 +54,6 @@ config BR2_KERNEL_HEADERS_RT
help
Apply Ingo's realtime extensions to linux
-config BR2_KERNEL_HEADERS_PATCH_DIR
- bool "Add additional headers from $(KERNEL_HEADERS_PATCH_DIR)"
- depends on BR2_KERNEL_HEADERS_2_6_20_4 || BR2_KERNEL_HEADERS_2_6_21_5 || BR2_KERNEL_HEADERS_2_6_22_1 || BR2_KERNEL_HEADERS_2_6_22_10 || BR2_KERNEL_HEADERS_2_6_28
- help
- Apply additional kernel patches defined by KERNEL_HEADERS_PATCH_DIR
- in your board directory.
-
config BR2_DEFAULT_KERNEL_HEADERS
string
default "2.6.22.10" if BR2_KERNEL_HEADERS_2_6_22
diff --git a/toolchain/kernel-headers/kernel-headers-new.makefile b/toolchain/kernel-headers/kernel-headers-new.makefile
index 2264dd298..b12705f4a 100644
--- a/toolchain/kernel-headers/kernel-headers-new.makefile
+++ b/toolchain/kernel-headers/kernel-headers-new.makefile
@@ -30,9 +30,6 @@ ifeq ("$(DEFAULT_KERNEL_HEADERS)","2.6.26.8")
LINUX_RT_VERSION:=rt16
endif
-# Need to redefine KERNEL_HEADERS_PATCH_DIR if you want
-# board specific kernel headers
-KERNEL_HEADERS_PATCH_DIR:=toolchain/kernel-headers/empty
LINUX_HEADERS_DEPENDS:=
ifeq ($(BR2_KERNEL_HEADERS_RT),y)
@@ -56,9 +53,9 @@ $(LINUX_HEADERS_UNPACK_DIR)/.patched: $(LINUX_HEADERS_UNPACK_DIR)/.unpacked $(LI
ifeq ($(BR2_KERNEL_HEADERS_RT),y)
toolchain/patch-kernel.sh $(LINUX_HEADERS_UNPACK_DIR) $(DL_DIR) $(LINUX_RT_SOURCE)
endif
-ifeq ($(BR2_KERNEL_HEADERS_PATCH_DIR),y)
+ifneq ($(KERNEL_HEADERS_PATCH_DIR),)
toolchain/patch-kernel.sh $(LINUX_HEADERS_UNPACK_DIR) $(KERNEL_HEADERS_PATCH_DIR) \
- \*.patch{,.gz,.bz2}
+ linux-$(LINUX_HEADERS_VERSION)-\*.patch{,.gz,.bz2}
endif
ifeq ($(BR2_PACKAGE_OPENSWAN),y)
toolchain/patch-kernel.sh $(LINUX_HEADERS_UNPACK_DIR) package/openswan \