diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-01-10 11:03:58 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-01-10 11:03:58 +0100 |
| commit | 94c763109f74b446e4d5d31e55ef337c8c8d86cb (patch) | |
| tree | 22d1cd06809f5a5c11241e998d9ead4010ac3c91 /target/Makefile | |
| parent | a217fc80b29080dae963bb15051df023de36ce39 (diff) | |
| parent | 16d94117a716fc361d3db9a2a17cf4c45eab837d (diff) | |
resolve conflicts
Diffstat (limited to 'target/Makefile')
| -rw-r--r-- | target/Makefile | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/target/Makefile b/target/Makefile index 719817473..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 @@ -39,8 +40,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) @@ -76,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 |