From: Thomas De Schampheleire Date: Wed, 18 Mar 2020 15:58:13 +0000 (+0100) Subject: Makefile: assemble package file lists before calling post-build scripts X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=d4d52d907b9e6651be4f3ecfec5631122073f3cc;p=buildroot.git Makefile: assemble package file lists before calling post-build scripts Post-build scripts may want to do something based on the list of files installed by a package. However, since commit 0e2be4db8ab01d479177a3a187c22525752195ae the final packages-file-lists.txt file is only created _after_ the post-build scripts. Move the assembly of the file lists upwards, before the post-build scripts. Signed-off-by: Thomas De Schampheleire Signed-off-by: Yann E. MORIN --- diff --git a/Makefile b/Makefile index 156ceb9aae..ae29b042ec 100644 --- a/Makefile +++ b/Makefile @@ -806,12 +806,6 @@ endif # merged /usr $(call MESSAGE,"Copying overlay $(d)"); \ $(call SYSTEM_RSYNC,$(d),$(TARGET_DIR))$(sep)) - @$(foreach s, $(call qstrip,$(BR2_ROOTFS_POST_BUILD_SCRIPT)), \ - $(call MESSAGE,"Executing post-build script $(s)"); \ - $(EXTRA_ENV) $(s) $(TARGET_DIR) $(call qstrip,$(BR2_ROOTFS_POST_SCRIPT_ARGS))$(sep)) - - touch $(TARGET_DIR)/usr - $(if $(TARGET_DIR_FILES_LISTS), \ cat $(TARGET_DIR_FILES_LISTS)) > $(BUILD_DIR)/packages-file-list.txt $(if $(HOST_DIR_FILES_LISTS), \ @@ -819,6 +813,12 @@ endif # merged /usr $(if $(STAGING_DIR_FILES_LISTS), \ cat $(STAGING_DIR_FILES_LISTS)) > $(BUILD_DIR)/packages-file-list-staging.txt + @$(foreach s, $(call qstrip,$(BR2_ROOTFS_POST_BUILD_SCRIPT)), \ + $(call MESSAGE,"Executing post-build script $(s)"); \ + $(EXTRA_ENV) $(s) $(TARGET_DIR) $(call qstrip,$(BR2_ROOTFS_POST_SCRIPT_ARGS))$(sep)) + + touch $(TARGET_DIR)/usr + .PHONY: target-post-image target-post-image: $(TARGETS_ROOTFS) target-finalize staging-finalize @rm -f $(ROOTFS_COMMON_TAR)