From ff363a45695e5828f26fd547018f7e00deb5e334 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Wed, 17 Dec 2014 19:19:17 +0100 Subject: convert dietnet patch to addon. should only be used with care --- toolchain/kernel-headers/Makefile | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) (limited to 'toolchain/kernel-headers') diff --git a/toolchain/kernel-headers/Makefile b/toolchain/kernel-headers/Makefile index d13822b6e..6abecf52a 100644 --- a/toolchain/kernel-headers/Makefile +++ b/toolchain/kernel-headers/Makefile @@ -3,10 +3,10 @@ include $(ADK_TOPDIR)/rules.mk include ../rules.mk -include ${ADK_TOPDIR}/mk/kernel-ver.mk +include $(ADK_TOPDIR)/mk/kernel-ver.mk include $(ADK_TOPDIR)/mk/linux.mk -include ${ADK_TOPDIR}/mk/kernel-vars.mk -include ${ADK_TOPDIR}/mk/buildhlp.mk +include $(ADK_TOPDIR)/mk/kernel-vars.mk +include $(ADK_TOPDIR)/mk/buildhlp.mk $(TOOLCHAIN_BUILD_DIR)/w-$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)/linux-$(KERNEL_VERSION)/.patched: ifeq ($(ADK_TARGET_SYSTEM_PCENGINES_APU),y) @@ -49,12 +49,17 @@ ifeq ($(ADK_KERNEL_ADDON_MPTCP),y) $(TRACE) mptcp-kernel-patch $(PATCH) $(TOOLCHAIN_BUILD_DIR)/w-$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)/linux-$(KERNEL_VERSION) \ $(ADK_TOPDIR)/target/linux/patches/$(KERNEL_VERSION) patch-mptcp $(MAKE_TRACE) +endif +ifeq ($(ADK_KERNEL_ADDON_DIETNET),y) + $(TRACE) dietnet-kernel-patch + $(PATCH) $(TOOLCHAIN_BUILD_DIR)/w-$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)/linux-$(KERNEL_VERSION) \ + $(ADK_TOPDIR)/target/linux/patches/$(KERNEL_VERSION) patch-dietnet $(MAKE_TRACE) endif touch $@ $(WRKBUILD)/.headers: $(TOOLCHAIN_BUILD_DIR)/w-$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)/linux-$(KERNEL_VERSION)/.patched - ${KERNEL_MAKE_ENV} $(MAKE) -C $(WRKBUILD) ${KERNEL_MAKE_OPTS} headers_check - ${KERNEL_MAKE_ENV} $(MAKE) -C $(WRKBUILD) ${KERNEL_MAKE_OPTS} \ + $(KERNEL_MAKE_ENV) $(MAKE) -C $(WRKBUILD) $(KERNEL_MAKE_OPTS) headers_check + $(KERNEL_MAKE_ENV) $(MAKE) -C $(WRKBUILD) $(KERNEL_MAKE_OPTS) \ INSTALL_HDR_PATH=$(STAGING_TARGET_DIR)/usr \ headers_install ifeq ($(ADK_TARGET_ARCH),cris) -- cgit v1.2.3