NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Makefile: fix package file list if FOO_SUBDIR is set

Browse Source 
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>
(cherry picked from commit 9f876c7f16)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
Thomas De Schampheleire 2020-03-18 16:58:12 +01:00 committed by Peter Korsgaard
parent 8c4fc019ee
commit f283e56397
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
package/pkg-generic.mk
View File

@ -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))