Commit aae3f1b6 authored by Peter Korsgaard's avatar Peter Korsgaard
Browse files

linux: always apply platform patches if available 

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

target/linux/Makefile.in

+1 −1
Original line number Diff line number Diff line
@@ -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

target/linux/Makefile.in.advanced

+2 −4
Original line number Diff line number Diff line
@@ -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 \

toolchain/kernel-headers/Config.in

+0 −7
Original line number Diff line number Diff line
@@ -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

toolchain/kernel-headers/kernel-headers-new.makefile

+2 −5
Original line number Diff line number Diff line
@@ -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 \