From c03c4742e6bd077a7e4d4ce803a27e6e0333306a Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Wed, 5 Jan 2011 00:20:48 +0100 Subject: cleanup duplicate kernel module feature --- target/Makefile | 2 -- 1 file changed, 2 deletions(-) (limited to 'target/Makefile') diff --git a/target/Makefile b/target/Makefile index 719817473..3a5445890 100644 --- a/target/Makefile +++ b/target/Makefile @@ -39,8 +39,6 @@ config-prepare: $(TOPDIR)/.config sed 's/=y/=m/' >>${BUILD_DIR}/.kernelconfig.modules @sed -n '/^ADK_KERNEL/s//CONFIG/p' ${TOPDIR}/.config \ >${BUILD_DIR}/.kernelconfig.kernel - @sed -n '/^ADK_MOD_KERNEL/s//CONFIG/p' ${TOPDIR}/.config | \ - sed 's/=y/=m/' >${BUILD_DIR}/.kernelconfig.modkernel @sed -n '/^# ADK_KERNEL/s//# CONFIG/p' ${TOPDIR}/.config \ >${BUILD_DIR}/.kernelconfig.nokernel ifeq ($(ADK_NATIVE),y) -- cgit v1.2.3 From eebde77970ce3476e24d11e4adad992f5b670784 Mon Sep 17 00:00:00 2001 From: Phil Sutter Date: Fri, 7 Jan 2011 18:21:52 +0100 Subject: allow disabling kernel customisation completely Signed-off-by: Phil Sutter --- target/Makefile | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'target/Makefile') diff --git a/target/Makefile b/target/Makefile index 3a5445890..184aaad45 100644 --- a/target/Makefile +++ b/target/Makefile @@ -32,6 +32,7 @@ all: install # only if it does (so the timestamp stays intact) # 8) remove the temporary .kernelconfig.tmp ### +ifeq (${ADK_TARGET_KERNEL_CUSTOMISING},y) config-prepare: $(TOPDIR)/.config @sed -n '/^ADK_KPACKAGE_KMOD/s//CONFIG/p' ${TOPDIR}/.config | \ sed 's/=y/=m/' >${BUILD_DIR}/.kernelconfig.modules @@ -74,6 +75,10 @@ endif @cd ${BUILD_DIR} && cmp -s .kernelconfig.tmp .kernelconfig || \ cp .kernelconfig.tmp .kernelconfig @-rm -f ${BUILD_DIR}/.kernelconfig.tmp +else +config-prepare: $(TOPDIR)/.config + @cp ${ADK_TARGET_ARCH}/kernel.config ${BUILD_DIR}/.kernelconfig +endif prepare: $(ADK_TARGET_ARCH)-prepare compile: $(ADK_TARGET_ARCH)-compile -- cgit v1.2.3