From e59f748fec7b509261adb0a42e57f837e9df370f Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Thu, 30 Apr 2020 11:52:43 +0200 Subject: [PATCH] package/pkg-generic.mk: exclude the staging sub-directory Now that we are checking the host directory changes throughout all installation steps and not just during the "host installation step", it means that changes done within the staging directory (which is a subdir of the host directory) are also visible in the .files-list-host.txt file. Note that this problem already potentially occurs if a host package is installing files in the staging directory: they would be listed in .files-list-host.txt even without the changes in this series. To fix this up, we simply exclude files that are beneath the $(STAGING_SUBDIR). Note that we do that in all cases, so when searching $(HOST_DIR), $(HOST_DIR)/$(STAGING_SUBDIR) is excluded, but when searching $(TARGET_DIR), $(TARGET_DIR)/$(STAGING_SUBDIR) is excluded, and when search $(STAGING_DIR), $(STAGING_DIR)/$(STAGING_SUBDIR) is excluded. This is not a problem in practice since $(TARGET_DIR)/$(STAGING_SUBDIR) and $(STAGING_DIR)/$(STAGING_SUBDIR) don't exist, but it's not very nice. However, it allows to keep the code simple. Signed-off-by: Thomas Petazzoni Signed-off-by: Yann E. MORIN --- package/pkg-generic.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk index 22e7e1b04f..659b8e5661 100644 --- a/package/pkg-generic.mk +++ b/package/pkg-generic.mk @@ -61,7 +61,7 @@ GLOBAL_INSTRUMENTATION_HOOKS += step_time # $(2): suffix of file (optional) define pkg_size_before cd $(1); \ - LC_ALL=C find . \( -type f -o -type l \) -printf '%T@:%i:%#m:%y:%s,%p\n' \ + LC_ALL=C find . -not -path './$(STAGING_SUBDIR)/*' \( -type f -o -type l \) -printf '%T@:%i:%#m:%y:%s,%p\n' \ | LC_ALL=C sort > $($(PKG)_DIR)/.files-list$(2).before endef @@ -69,7 +69,7 @@ endef # $(2): suffix of file (optional) define pkg_size_after cd $(1); \ - LC_ALL=C find . \( -type f -o -type l \) -printf '%T@:%i:%#m:%y:%s,%p\n' \ + LC_ALL=C find . -not -path './$(STAGING_SUBDIR)/*' \( -type f -o -type l \) -printf '%T@:%i:%#m:%y:%s,%p\n' \ | LC_ALL=C sort > $($(PKG)_DIR)/.files-list$(2).after LC_ALL=C comm -13 \ $($(PKG)_DIR)/.files-list$(2).before \ -- 2.30.2