diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-11 10:55:56 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-11 10:55:56 +0100 |
| commit | 8f148a08f29ccb6c21f108549e20aa8e0bb04b79 (patch) | |
| tree | d4ebb7075b5ac4b28f2ce76a289277298a0d9f5f /mk | |
| parent | ed83e039abc8ef969e8312c0d2eafc4791d46cd7 (diff) | |
finetune rebuild stuff
need to rebuild kmod-packages, when removed. f.e. by hudson.
fix kmod-soft-watchdog while there. Use bin directory for ldd
to avoid a cpio failure.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/kernel-build.mk | 16 | ||||
| -rw-r--r-- | mk/modules.mk | 4 | ||||
| -rw-r--r-- | mk/pkg-bottom.mk | 5 |
3 files changed, 11 insertions, 14 deletions
diff --git a/mk/kernel-build.mk b/mk/kernel-build.mk index 8fe0799a0..b2dc77d82 100644 --- a/mk/kernel-build.mk +++ b/mk/kernel-build.mk @@ -42,28 +42,30 @@ else $(CP) $(BUILD_DIR)/.kernelconfig $(LINUX_DIR)/.config echo N | ${KERNEL_MAKE_ENV} $(MAKE) ${KERNEL_MAKE_OPTS} oldconfig $(MAKE_TRACE) endif - ${KERNEL_MAKE_ENV} $(MAKE) ${KERNEL_MAKE_OPTS} prepare scripts $(MAKE_TRACE) touch -c $(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) + ${KERNEL_MAKE_ENV} $(MAKE) ${KERNEL_MAKE_OPTS} -j${ADK_MAKE_JOBS} LOCALVERSION="" $(KERNEL_TARGET) modules $(MAKE_TRACE) + touch -c $(LINUX_DIR)/$(KERNEL_FILE) + +$(LINUX_BUILD_DIR)/modules: $(LINUX_DIR)/$(KERNEL_FILE) $(TRACE) target/$(ADK_TARGET_ARCH)-kernel-modules-install rm -rf $(LINUX_BUILD_DIR)/modules ${KERNEL_MAKE_ENV} $(MAKE) ${KERNEL_MAKE_OPTS} DEPMOD=true \ INSTALL_MOD_PATH=$(LINUX_BUILD_DIR)/modules \ LOCALVERSION="" \ - modules modules_install $(MAKE_TRACE) + modules_install $(MAKE_TRACE) $(TRACE) target/$(ADK_TARGET_ARCH)-create-packages ifneq ($(strip $(TARGETS)),) $(MAKE) $(TARGETS) endif - touch -c $(LINUX_DIR)/$(KERNEL_FILE) + +$(INSTALL_TARGETS): $(LINUX_BUILD_DIR)/modules prepare: -compile: $(LINUX_DIR)/$(KERNEL_FILE) -install: compile +compile: $(LINUX_BUILD_DIR)/modules +install: compile $(INSTALL_TARGETS) ifneq ($(strip $(INSTALL_TARGETS)),) $(TRACE) target/${ADK_TARGET_ARCH}-modules-install ifeq ($(ADK_TARGET_PACKAGE_IPKG),y) diff --git a/mk/modules.mk b/mk/modules.mk index 6015aadf0..428fe2700 100644 --- a/mk/modules.mk +++ b/mk/modules.mk @@ -1417,8 +1417,8 @@ $(eval $(call KMOD_template,BT_RFCOMM,bt-rfcomm,\ # Misc devices # -$(eval $(call KMOD_template,SOFTDOG,softdog,\ - $(MODULES_DIR)/kernel/drivers/char/watchdog/softdog \ +$(eval $(call KMOD_template,SOFT_WATCHDOG,soft-watchdog,\ + $(MODULES_DIR)/kernel/drivers/watchdog/softdog \ ,95)) $(eval $(call KMOD_template,FW_LOADER,fw-loader,\ diff --git a/mk/pkg-bottom.mk b/mk/pkg-bottom.mk index 941970cbc..3e454ee5a 100644 --- a/mk/pkg-bottom.mk +++ b/mk/pkg-bottom.mk @@ -213,11 +213,6 @@ endif touch $@ ${_IPKGS_COOKIE}: - @clean=0; \ - for f in ${ALL_IPKGS}; do \ - [[ -e $$f ]] && clean=1; \ - done; \ - [[ $$clean = 0 ]] || ${MAKE} clean exec ${MAKE} package package: ${ALL_IPKGS} |