diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2013-11-09 16:40:19 +0100 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2013-11-09 16:40:19 +0100 |
commit | 09f305df8fb64ae1295d000f05e39342f76b4484 (patch) | |
tree | 7cd5857c65d3b0cf939d67739c1fbc69181205bf /mk | |
parent | 660e6fcdf88641708ee119c4ad4399694fe57270 (diff) |
kernel name and make target are different things, sometimes
Diffstat (limited to 'mk')
-rw-r--r-- | mk/kernel-build.mk | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/mk/kernel-build.mk b/mk/kernel-build.mk index 65c83c420..94749de5a 100644 --- a/mk/kernel-build.mk +++ b/mk/kernel-build.mk @@ -5,7 +5,12 @@ include $(TOPDIR)/rules.mk include $(TOPDIR)/mk/linux.mk include ${TOPDIR}/mk/kernel-vars.mk +KERNEL_FILE:=$(ADK_TARGET_KERNEL) KERNEL_TARGET:=$(ADK_TARGET_KERNEL) +ifeq ($(ADK_TARGET_KERNEL_BZIMAGE),y) +KERNEL_FILE:=vmlinux +KERNEL_TARGET:=all +endif $(TOOLCHAIN_BUILD_DIR)/w-$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)/linux-$(KERNEL_VERSION)/.patched: $(TRACE) target/kernel-patch @@ -27,7 +32,7 @@ $(LINUX_DIR)/.config: $(LINUX_DIR)/.prepared $(BUILD_DIR)/.kernelconfig $(TOPDIR ${KERNEL_MAKE_ENV} $(MAKE) ${KERNEL_MAKE_OPTS} prepare scripts $(MAKE_TRACE) touch -c $(LINUX_DIR)/.config -$(LINUX_DIR)/$(KERNEL_TARGET): $(LINUX_DIR)/.config +$(LINUX_DIR)/$(KERNEL_FILE): $(LINUX_DIR)/.config -rm $(LINUX_DIR)/$(KERNEL_TARGET) 2>/dev/null $(TRACE) target/$(ADK_TARGET_ARCH)-kernel-compile ${KERNEL_MAKE_ENV} $(MAKE) V=1 ${KERNEL_MAKE_OPTS} -j${ADK_MAKE_JOBS} LOCALVERSION="" $(KERNEL_TARGET) $(MAKE_TRACE) @@ -41,10 +46,10 @@ $(LINUX_DIR)/$(KERNEL_TARGET): $(LINUX_DIR)/.config ifneq ($(strip $(TARGETS)),) $(MAKE) $(TARGETS) endif - touch -c $(LINUX_DIR)/$(KERNEL_TARGET) + touch -c $(LINUX_DIR)/$(KERNEL_FILE) prepare: -compile: $(LINUX_DIR)/$(KERNEL_TARGET) +compile: $(LINUX_DIR)/$(KERNEL_FILE) install: compile ifneq ($(strip $(INSTALL_TARGETS)),) $(TRACE) target/${ADK_TARGET_ARCH}-modules-install |