From: Yann E. MORIN <yann.morin.1998@free.fr>
To: buildroot@busybox.net
Subject: [Buildroot] [git commit] Makefile: fix package file list if FOO_SUBDIR is set
Date: Fri, 20 Mar 2020 22:15:08 +0100 [thread overview]
Message-ID: <20200320211449.05D7B82B50@busybox.osuosl.org> (raw)
commit: https://git.buildroot.net/buildroot/commit/?id=9f876c7f16a0aef8aa86ef5873b8db07aa00dce5
branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master
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>
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
---
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))
reply other threads:[~2020-03-20 21:15 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20200320211449.05D7B82B50@busybox.osuosl.org \
--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.