From 2f9a1c621302c6cdf01dfff88f0343d7b03a6107 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sat, 22 Jan 2022 19:13:45 +0100 Subject: [PATCH] core/pkg-generic: apply post-prepare hooks before monitoring directories Monitoring the target/ and host/ directories and so on, will serve to generate lists of files installed by the packages. Those lists are then used to generate graphs of the size those package take on the target for example. With PPD, we will also want to use those lists to only copy those files actually installed by each dependencies of a package, recursively. Currently, those lists are not entirely reliable, as the starting points are established before we apply PPD fixup hooks. As such, at the end of a package installation, fixed up files will be found to belong to the current package, while they were in fact provided by one of its dependency. While this does no big harm, if at all, for the size graphs, it will trigger overwrite detection when we eventually gather packages together to aggregate a PPD or te final host and target. So, we better have the lists of files be reliable. So, we only start monitoring the directories after we apply the PPD fixups (or seen the other way around for a smaller diff: we apply the PPD fixups before we start monitoring the directories). Signed-off-by: Yann E. MORIN Cc: Thomas Petazzoni Cc: Herve Codina Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/pkg-generic.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk index 78226ee266..b3a7e1d60e 100644 --- a/package/pkg-generic.mk +++ b/package/pkg-generic.mk @@ -273,11 +273,11 @@ $(BUILD_DIR)/%/.stamp_configured: @$(call MESSAGE,"Configuring") $(Q)mkdir -p $(HOST_DIR) $(TARGET_DIR) $(STAGING_DIR) $(BINARIES_DIR) $(call prepare-per-package-directory,$($(PKG)_FINAL_DEPENDENCIES)) + $(foreach hook,$($(PKG)_POST_PREPARE_HOOKS),$(call $(hook))$(sep)) @$(call pkg_size_before,$(TARGET_DIR)) @$(call pkg_size_before,$(STAGING_DIR),-staging) @$(call pkg_size_before,$(BINARIES_DIR),-images) @$(call pkg_size_before,$(HOST_DIR),-host) - $(foreach hook,$($(PKG)_POST_PREPARE_HOOKS),$(call $(hook))$(sep)) $(foreach hook,$($(PKG)_PRE_CONFIGURE_HOOKS),$(call $(hook))$(sep)) $($(PKG)_CONFIGURE_CMDS) $(foreach hook,$($(PKG)_POST_CONFIGURE_HOOKS),$(call $(hook))$(sep))