diff options
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/image.mk | 1 | ||||
| -rw-r--r-- | mk/kernel-build.mk | 11 |
2 files changed, 9 insertions, 3 deletions
diff --git a/mk/image.mk b/mk/image.mk index 43561b1c9..2273b4af7 100644 --- a/mk/image.mk +++ b/mk/image.mk @@ -95,6 +95,7 @@ ifeq ($(ADK_TARGET_ABI_N64),y) mv ${TARGET_DIR}/lib/* ${TARGET_DIR}/${ADK_TARGET_LIBC_PATH} rm -rf ${TARGET_DIR}/lib/ ln -sf /${ADK_TARGET_LIBC_PATH} ${TARGET_DIR}/lib + -mkdir ${TARGET_DIR}/usr/${ADK_TARGET_LIBC_PATH} 2>/dev/null mv ${TARGET_DIR}/usr/lib/* ${TARGET_DIR}/usr/${ADK_TARGET_LIBC_PATH} rm -rf ${TARGET_DIR}/usr/lib/ (cd ${TARGET_DIR}/usr ; ln -sf ${ADK_TARGET_LIBC_PATH} lib) 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 |