linux: always apply platform patches if available

Get rid of BR2_KERNEL_HEADERS_PATCH_DIR config, and simply always apply
platform patches if available.

diff --git a/target/linux/Makefile.in b/target/linux/Makefile.in
index 494de7f30fd906d02a4e5b777adb8b9a66a3f556..ff0b88e3498deea1a664c35985423dc590849495 100644 (file)
--- 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 122358410d8e1dde10f06d84e9e1e9202763624a..614346c895cac470ecdff6f824398f4b633ffe7d 100644 (file)
--- 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 5ce4361d92e8598fbb4f4ab82a71e135a24b13d0..809fa55abb65543206c31f775a04c04c45ef6ddc 100644 (file)
--- 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 2264dd298b24f9b4a63d08f4c2c2799961f2537b..b12705f4a12ccd382f8894f5ef0d7e8ca5902ad5 100644 (file)
--- 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 \