From: Thomas De Schampheleire <patrickdepinguin@gmail.com>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH 2/3] Makefile: fix package file list if FOO_SUBDIR is set
Date: Wed, 18 Mar 2020 16:58:12 +0100 [thread overview]
Message-ID: <20200318155814.567-2-patrickdepinguin@gmail.com> (raw)
In-Reply-To: <20200318155814.567-1-patrickdepinguin@gmail.com>
From: Thomas De Schampheleire <thomas.de_schampheleire@nokia.com>
If a package sets a FOO_SUBDIR (meaning its sources are not under
output/build/foo-123 but under output/build/foo-123/$(FOO_SUBDIR)), the
.files-list.txt file were also created under FOO_SUBDIR, due to which the
logic in the Makefile would not find it.
Change the instrumentation steps so that the file list is directly under the
package dir, ignoring the subdir.
Signed-off-by: Thomas De Schampheleire <thomas.de_schampheleire@nokia.com>
---
package/pkg-generic.mk | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk
index 47238f2649..20b07a7fa9 100644
--- a/package/pkg-generic.mk
+++ b/package/pkg-generic.mk
@@ -63,7 +63,7 @@ GLOBAL_INSTRUMENTATION_HOOKS += step_time
define step_pkg_size_before
cd $(2); \
LC_ALL=C find . \( -type f -o -type l \) -printf '%T@:%i:%#m:%y:%s,%p\n' \
- | LC_ALL=C sort > $($(PKG)_BUILDDIR)/.files-list$(3).before
+ | LC_ALL=C sort > $($(PKG)_DIR)/.files-list$(3).before
endef
# $(1): package name
@@ -72,14 +72,14 @@ endef
define step_pkg_size_after
cd $(2); \
LC_ALL=C find . \( -type f -o -type l \) -printf '%T@:%i:%#m:%y:%s,%p\n' \
- | LC_ALL=C sort > $($(PKG)_BUILDDIR)/.files-list$(3).after
+ | LC_ALL=C sort > $($(PKG)_DIR)/.files-list$(3).after
LC_ALL=C comm -13 \
- $($(PKG)_BUILDDIR)/.files-list$(3).before \
- $($(PKG)_BUILDDIR)/.files-list$(3).after \
+ $($(PKG)_DIR)/.files-list$(3).before \
+ $($(PKG)_DIR)/.files-list$(3).after \
| sed -r -e 's/^[^,]+/$(1)/' \
- > $($(PKG)_BUILDDIR)/.files-list$(3).txt
- rm -f $($(PKG)_BUILDDIR)/.files-list$(3).before
- rm -f $($(PKG)_BUILDDIR)/.files-list$(3).after
+ > $($(PKG)_DIR)/.files-list$(3).txt
+ rm -f $($(PKG)_DIR)/.files-list$(3).before
+ rm -f $($(PKG)_DIR)/.files-list$(3).after
endef
define step_pkg_size
@@ -103,7 +103,7 @@ GLOBAL_INSTRUMENTATION_HOOKS += step_pkg_size
define check_bin_arch
$(if $(filter end-install-target,$(1)-$(2)),\
support/scripts/check-bin-arch -p $(3) \
- -l $($(PKG)_BUILDDIR)/.files-list.txt \
+ -l $($(PKG)_DIR)/.files-list.txt \
$(foreach i,$($(PKG)_BIN_ARCH_EXCLUDE),-i "$(i)") \
-r $(TARGET_READELF) \
-a $(BR2_READELF_ARCH_NAME))
--
2.24.1
next prev parent reply other threads:[~2020-03-18 15:58 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-18 15:58 [Buildroot] [PATCH 1/3] Makefile: don't hang the build if there are no file lists Thomas De Schampheleire
2020-03-18 15:58 ` Thomas De Schampheleire [this message]
2020-03-28 7:39 ` [Buildroot] [PATCH 2/3] Makefile: fix package file list if FOO_SUBDIR is set Peter Korsgaard
2020-03-28 8:58 ` Thomas De Schampheleire
2020-03-28 11:06 ` Peter Korsgaard
2020-03-18 15:58 ` [Buildroot] [PATCH 3/3] Makefile: assemble package file lists before calling post-build scripts Thomas De Schampheleire
2020-03-28 7:39 ` Peter Korsgaard
2020-03-18 21:49 ` [Buildroot] [PATCH 1/3] Makefile: don't hang the build if there are no file lists Yann E. MORIN
2020-03-20 21:10 ` Thomas Petazzoni
2020-03-20 21:29 ` Yann E. MORIN
2020-03-28 7:37 ` Peter Korsgaard
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=20200318155814.567-2-patrickdepinguin@gmail.com \
--to=patrickdepinguin@gmail.com \
--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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox