From: Yann E. MORIN <yann.morin.1998@free.fr>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH 07/11] package/pkg-generic.mk: move pkg_size_{before, after} and check_bin_arch functions
Date: Fri, 1 May 2020 23:01:34 +0200 [thread overview]
Message-ID: <20200501210134.GC15673@scaer> (raw)
In-Reply-To: <20200430095249.782597-8-thomas.petazzoni@bootlin.com>
Thomas, All,
On 2020-04-30 11:52 +0200, Thomas Petazzoni spake thusly:
> 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.
I think this would no longer be the case if you do as I suggested in
patch 5...
I'd like to keep the instrumentation, well, instrumentation...
Regards,
Yann E. MORIN.
> Move them to the "Helper functions" section.
>
> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
> ---
> package/pkg-generic.mk | 66 +++++++++++++++++++++---------------------
> 1 file changed, 33 insertions(+), 33 deletions(-)
>
> diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk
> index 2ae269bb3d..6e06d735ad 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
> ################################################################################
> --
> 2.25.4
>
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
next prev parent reply other threads:[~2020-05-01 21:01 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-30 9:52 [Buildroot] [PATCH 00/11] Overwritten file detection, improvements to file listing logic Thomas Petazzoni
2020-04-30 9:52 ` [Buildroot] [PATCH 01/11] package/pkg-generic.mk: use $(PKG)_NAME in step_pkg_size_after Thomas Petazzoni
2020-04-30 9:52 ` [Buildroot] [PATCH 02/11] package/pkg-generic.mk: drop useless $(1) argument in step_pkg_size_{before, after} Thomas Petazzoni
2020-04-30 9:52 ` [Buildroot] [PATCH 03/11] package/pkg-generic.mk: introduce final 'install' step Thomas Petazzoni
2020-04-30 9:52 ` [Buildroot] [PATCH 04/11] package/pkg-generic.mk: create directories upfront in the configure step Thomas Petazzoni
2020-04-30 9:52 ` [Buildroot] [PATCH 05/11] package/pkg-generic.mk: rework pkg_size logic with the "installed" step Thomas Petazzoni
2020-05-01 20:44 ` Yann E. MORIN
2020-05-02 9:52 ` Thomas Petazzoni
2020-04-30 9:52 ` [Buildroot] [PATCH 06/11] package/pkg-generic.mk: exclude the staging sub-directory Thomas Petazzoni
2020-05-01 20:57 ` Yann E. MORIN
2020-04-30 9:52 ` [Buildroot] [PATCH 07/11] package/pkg-generic.mk: move pkg_size_{before, after} and check_bin_arch functions Thomas Petazzoni
2020-05-01 21:01 ` Yann E. MORIN [this message]
2020-04-30 9:52 ` [Buildroot] [PATCH 08/11] package/pkg-generic.mk: detect files overwritten in TARGET_DIR and HOST_DIR Thomas Petazzoni
2020-05-01 21:23 ` Yann E. MORIN
2020-07-24 19:53 ` Yann E. MORIN
2020-07-25 5:58 ` Peter Korsgaard
2020-07-25 7:13 ` Yann E. MORIN
2020-07-25 8:12 ` Peter Korsgaard
2020-04-30 9:52 ` [Buildroot] [PATCH 09/11] support/testing/infra: add log_file_path() function Thomas Petazzoni
2020-07-24 20:11 ` Yann E. MORIN
2020-04-30 9:52 ` [Buildroot] [PATCH 10/11] support/testing/tests: add test for check_bin_arch Thomas Petazzoni
2020-07-25 11:59 ` Yann E. MORIN
2020-04-30 9:52 ` [Buildroot] [PATCH 11/11] support/testing/tests: add test for file overwrite detection Thomas Petazzoni
2020-07-25 12:05 ` Yann E. MORIN
2020-07-23 20:54 ` [Buildroot] [PATCH 00/11] Overwritten file detection, improvements to file listing logic Yann E. MORIN
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200501210134.GC15673@scaer \
--to=yann.morin.1998@free.fr \
--cc=buildroot@busybox.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.