diff options
| author | Waldemar Brodkorb <wbx@uclibc-ng.org> | 2015-12-11 22:40:55 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@uclibc-ng.org> | 2015-12-11 22:40:55 +0100 |
| commit | 74663fdbbd1dc92dd91f6f88dbc4f972df12c404 (patch) | |
| tree | 284817a1c9ff266a6474ae9d441eb53e7c514e6c /mk/kernel-build.mk | |
| parent | 5847a9730ff284181c4087ed9ce85cf9955c47c3 (diff) | |
Revert "rework prereq check"
This reverts commit fba2ff31928b18364c1934654169806f5c800e23.
Diffstat (limited to 'mk/kernel-build.mk')
| -rw-r--r-- | mk/kernel-build.mk | 25 |
1 files changed, 7 insertions, 18 deletions
diff --git a/mk/kernel-build.mk b/mk/kernel-build.mk index a67b666cf..4649a78c5 100644 --- a/mk/kernel-build.mk +++ b/mk/kernel-build.mk @@ -34,12 +34,13 @@ ADK_DEPMOD:=true endif $(LINUX_DIR)/.prepared: $(TOOLCHAIN_BUILD_DIR)/w-$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)/linux-$(KERNEL_FILE_VER)/.patched + $(TRACE) target/kernel-prepare ln -sf $(TOOLCHAIN_BUILD_DIR)/w-$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)/linux-$(KERNEL_FILE_VER) $(LINUX_DIR) mkdir -p $(LINUX_BUILD_DIR)/kmod-control touch $@ $(LINUX_DIR)/.config: $(LINUX_DIR)/.prepared $(BUILD_DIR)/.kernelconfig - $(START_TRACE) "target/$(ADK_TARGET_ARCH)-kernel-configure.. " + $(TRACE) target/$(ADK_TARGET_ARCH)-kernel-configure -for f in $(TARGETS);do if [ -f $$f ];then rm $$f;fi;done ifeq ($(ADK_TARGET_KERNEL_USE_DEFCONFIG),y) ${KERNEL_MAKE_ENV} $(MAKE) -C "${LINUX_DIR}" ${KERNEL_MAKE_OPTS} $(ADK_TARGET_KERNEL_DEFCONFIG) $(MAKE_TRACE) @@ -49,31 +50,23 @@ else ${KERNEL_MAKE_ENV} $(MAKE) -C "${LINUX_DIR}" ${KERNEL_MAKE_OPTS} KCONFIG_ALLCONFIG=mini.config allnoconfig $(MAKE_TRACE) endif touch -c $(LINUX_DIR)/.config - $(CMD_TRACE) " done" - $(END_TRACE) $(LINUX_DIR)/$(KERNEL_FILE): $(LINUX_DIR)/.config - $(START_TRACE) "target/$(ADK_TARGET_ARCH)-kernel-compile.. " + $(TRACE) target/$(ADK_TARGET_ARCH)-kernel-compile ${KERNEL_MAKE_ENV} $(MAKE) -C "${LINUX_DIR}" ${KERNEL_MAKE_OPTS} -j${ADK_MAKE_JOBS} $(KERNEL_TARGET) $(MAKE_TRACE) touch -c $(LINUX_DIR)/$(KERNEL_FILE) - $(CMD_TRACE) " done" - $(END_TRACE) $(LINUX_BUILD_DIR)/modules: $(LINUX_DIR)/$(KERNEL_FILE) - $(START_TRACE) "target/$(ADK_TARGET_ARCH)-kernel-modules-compile.. " + $(TRACE) target/$(ADK_TARGET_ARCH)-kernel-modules-compile ${KERNEL_MAKE_ENV} $(MAKE) -C "${LINUX_DIR}" ${KERNEL_MAKE_OPTS} -j${ADK_MAKE_JOBS} modules $(MAKE_TRACE) - $(CMD_TRACE) " done" - $(END_TRACE) - $(START_TRACE) "target/$(ADK_TARGET_ARCH)-kernel-modules-install.. " + $(TRACE) target/$(ADK_TARGET_ARCH)-kernel-modules-install rm -rf $(LINUX_BUILD_DIR)/modules ${KERNEL_MAKE_ENV} $(MAKE) -C "${LINUX_DIR}" ${KERNEL_MAKE_OPTS} \ DEPMOD=$(ADK_DEPMOD) \ INSTALL_MOD_PATH=$(LINUX_BUILD_DIR)/modules \ modules_install $(MAKE_TRACE) - $(CMD_TRACE) " done" - $(END_TRACE) ifneq ($(ADK_RUNTIME_DEV_UDEV),y) - $(START_TRACE) "target/$(ADK_TARGET_ARCH)-create-packages.. " + $(TRACE) target/$(ADK_TARGET_ARCH)-create-packages @mkdir -p ${PACKAGE_DIR} PATH='${HOST_PATH}' ${BASH} ${SCRIPT_DIR}/make-module-ipkgs.sh \ "${ADK_TARGET_CPU_ARCH}" \ @@ -81,8 +74,6 @@ ifneq ($(ADK_RUNTIME_DEV_UDEV),y) "${LINUX_BUILD_DIR}" \ "${PKG_BUILD}" \ "${PACKAGE_DIR}" - $(CMD_TRACE) " done" - $(END_TRACE) endif prepare: @@ -92,14 +83,12 @@ else compile: $(LINUX_DIR)/$(KERNEL_FILE) endif install: compile - $(START_TRACE) "target/${ADK_TARGET_ARCH}-modules-install.. " + $(TRACE) target/${ADK_TARGET_ARCH}-modules-install ifeq ($(ADK_TARGET_PACKAGE_IPKG)$(ADK_TARGET_PACKAGE_OPKG),y) $(PKG_INSTALL) $(wildcard ${PACKAGE_DIR}/kmod-*) $(MAKE_TRACE) else $(foreach pkg,$(wildcard ${PACKAGE_DIR}/kmod-*),$(shell $(PKG_INSTALL) $(pkg))) endif - $(CMD_TRACE) " done" - $(END_TRACE) clean: rm -rf $(LINUX_BUILD_DIR) |