aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Thomas Petazzoni <thomas.petazzoni@bootlin.com>2020-04-30 11:52:44 +0200
committerGravatar Yann E. MORIN <yann.morin.1998@free.fr>2020-07-23 22:48:51 +0200
commit7f97fd4f15eb9c4268823980c4193ed9a2963a3e (patch)
treef61fe305795a95d8e0598b89346c0f78f251e97d
parente59f748fec7b509261adb0a42e57f837e9df370f (diff)
downloadbuildroot-7f97fd4f15eb9c4268823980c4193ed9a2963a3e.tar.gz
buildroot-7f97fd4f15eb9c4268823980c4193ed9a2963a3e.tar.bz2
package/pkg-generic.mk: move pkg_size_{before, after} and check_bin_arch functions
These functions are no longer using the GLOBAL_INSTRUMENTATION_HOOKS mechanism, so it doesn't make much sense for them to be in the section of pkg-generic.mk related to those hooks. Move them to the "Helper functions" section. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com> Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
-rw-r--r--package/pkg-generic.mk66
1 files changed, 33 insertions, 33 deletions
diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk
index 659b8e5661..c63807047b 100644
--- a/package/pkg-generic.mk
+++ b/package/pkg-generic.mk
@@ -55,39 +55,6 @@ define step_time
endef
GLOBAL_INSTRUMENTATION_HOOKS += step_time
-# Hooks to collect statistics about installed files
-
-# $(1): base directory to search in
-# $(2): suffix of file (optional)
-define pkg_size_before
- cd $(1); \
- 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
-
-# $(1): base directory to search in
-# $(2): suffix of file (optional)
-define pkg_size_after
- cd $(1); \
- 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 \
- $($(PKG)_DIR)/.files-list$(2).after \
- | sed -r -e 's/^[^,]+/$($(PKG)_NAME)/' \
- > $($(PKG)_DIR)/.files-list$(2).txt
- rm -f $($(PKG)_DIR)/.files-list$(2).before
- rm -f $($(PKG)_DIR)/.files-list$(2).after
-endef
-
-define check_bin_arch
- support/scripts/check-bin-arch -p $($(PKG)_NAME) \
- -l $($(PKG)_DIR)/.files-list.txt \
- $(foreach i,$($(PKG)_BIN_ARCH_EXCLUDE),-i "$(i)") \
- -r $(TARGET_READELF) \
- -a $(BR2_READELF_ARCH_NAME)
-endef
-
# This hook checks that host packages that need libraries that we build
# have a proper DT_RPATH or DT_RUNPATH tag
define check_host_rpath
@@ -135,6 +102,39 @@ define fixup-libtool-files
endef
endif
+# Functions to collect statistics about installed files
+
+# $(1): base directory to search in
+# $(2): suffix of file (optional)
+define pkg_size_before
+ cd $(1); \
+ 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
+
+# $(1): base directory to search in
+# $(2): suffix of file (optional)
+define pkg_size_after
+ cd $(1); \
+ 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 \
+ $($(PKG)_DIR)/.files-list$(2).after \
+ | sed -r -e 's/^[^,]+/$($(PKG)_NAME)/' \
+ > $($(PKG)_DIR)/.files-list$(2).txt
+ rm -f $($(PKG)_DIR)/.files-list$(2).before
+ rm -f $($(PKG)_DIR)/.files-list$(2).after
+endef
+
+define check_bin_arch
+ support/scripts/check-bin-arch -p $($(PKG)_NAME) \
+ -l $($(PKG)_DIR)/.files-list.txt \
+ $(foreach i,$($(PKG)_BIN_ARCH_EXCLUDE),-i "$(i)") \
+ -r $(TARGET_READELF) \
+ -a $(BR2_READELF_ARCH_NAME)
+endef
+
################################################################################
# Implicit targets -- produce a stamp file for each step of a package build
################################################################################