summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2014-04-13 15:57:34 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2014-04-13 15:57:34 +0200
commit53e3c236c30db083bebe4f1439d575eb219490b8 (patch)
treec2ad79f9c8b0519ca72039ee996368cebf923e25
parent8008dafc5a76b4c83f089fc487a59abfcb6dc268 (diff)
fix rebuild of initramfs list if package choice is changed
-rw-r--r--mk/build.mk1
-rw-r--r--mk/image.mk8
2 files changed, 5 insertions, 4 deletions
diff --git a/mk/build.mk b/mk/build.mk
index 04cd5e3ce..d1bf24c28 100644
--- a/mk/build.mk
+++ b/mk/build.mk
@@ -236,6 +236,7 @@ root_clean:
@$(TRACE) root_clean
rm -rf $(TARGET_DIR)
mkdir -p $(TARGET_DIR)
+ touch $(TARGET_DIR)/.adk
# Do a per-package clean here, too. This way stale headers and
# libraries from target_*/ get wiped away, which keeps
diff --git a/mk/image.mk b/mk/image.mk
index 9e755ad1a..9f3fd5eef 100644
--- a/mk/image.mk
+++ b/mk/image.mk
@@ -138,17 +138,17 @@ ROOTFSUSERTARBALL= ${ADK_TARGET_SYSTEM}-${ADK_TARGET_LIBC}-${ADK_TARGET_FS}.tar.
ROOTFSISO= ${ADK_TARGET_SYSTEM}-${ADK_TARGET_LIBC}.iso
endif
-${FW_DIR}/${ROOTFSTARBALL}: ${TARGET_DIR} kernel-package
+${FW_DIR}/${ROOTFSTARBALL}: ${TARGET_DIR}/.adk kernel-package
cd ${TARGET_DIR}; find . | sed -n '/^\.\//s///p' | \
sed "s#\(.*\)#:0:0::::::\1#" | sort | \
${STAGING_HOST_DIR}/usr/bin/cpio -o -Hustar -P | gzip -n9 >$@
-${FW_DIR}/${ROOTFSUSERTARBALL}: ${TARGET_DIR}
+${FW_DIR}/${ROOTFSUSERTARBALL}: ${TARGET_DIR}/.adk
cd ${TARGET_DIR}; find . | grep -v ./boot/ | sed -n '/^\.\//s///p' | \
sed "s#\(.*\)#:0:0::::::\1#" | sort | \
${STAGING_HOST_DIR}/usr/bin/cpio -o -Hustar -P | gzip -n9 >$@
-${STAGING_TARGET_DIR}/${INITRAMFS}_list: ${TARGET_DIR}
+${STAGING_TARGET_DIR}/${INITRAMFS}_list: ${TARGET_DIR}/.adk
env PATH='${HOST_PATH}' $(BASH) ${LINUX_DIR}/scripts/gen_initramfs_list.sh -u squash -g squash \
${TARGET_DIR}/ >$@
@@ -156,7 +156,7 @@ ${FW_DIR}/${INITRAMFS}: ${STAGING_TARGET_DIR}/${INITRAMFS}_list
${LINUX_DIR}/usr/gen_init_cpio ${STAGING_TARGET_DIR}/${INITRAMFS}_list | \
${ADK_COMPRESSION_TOOL} -c >$@
-${BUILD_DIR}/root.squashfs: ${TARGET_DIR}
+${BUILD_DIR}/root.squashfs: ${TARGET_DIR}/.adk
${STAGING_HOST_DIR}/usr/bin/mksquashfs ${TARGET_DIR} \
${BUILD_DIR}/root.squashfs -comp xz \
-nopad -noappend -root-owned $(MAKE_TRACE)