[Buildroot] [PATCH] legal-info: extract even no-redistribute packages
Yann E. MORIN
yann.morin.1998 at free.fr
Fri Feb 28 16:45:56 UTC 2014
From: "Yann E. MORIN" <yann.morin.1998 at free.fr>
If a package is marked _REDISTRIBUTE = NO, then legal-info will not
try to extract it first.
If that package also declares some _LICENSE_FILES, legal-info fails
if it is the only action we're trying to run:
$ cat defconfig
BR2_INIT_NONE=y
BR2_PACKAGE_LIBFSLCODEC=y
$ make BR2_DEFCONFIG=$(pwd)/defconfig defconfig
$ make libfslcodec-legal-info
/bin/sh: /home/ymorin/dev/buildroot/O/legal-info/licenses.txt: No such file or directory
make[1]: *** [libfslcodec-legal-info] Error 1
Fix this by always having legal-info extract the archives if one or
more _LICENSE_FILES are specified.
Fixes:
http://autobuild.buildroot.net/results/884/884ba13bb024fd9a4818f3184495b2cccc3f595e/
http://autobuild.buildroot.net/results/b6e/b6e152ce117764337c243a9f356b32064106f5c3/
http://autobuild.buildroot.net/results/a58/a588b3b535a1259f7bc110a6323e5f33830bcd94/
http://autobuild.buildroot.net/results/6d5/6d5da7fe5aee871d98fd5503875453556ccbf854/
[...]
Signed-off-by: "Yann E. MORIN" <yann.morin.1998 at free.fr>
Cc: Thomas De Schampheleire <patrickdepinguin at gmail.com>
---
package/pkg-generic.mk | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk
index 339c3eb..7b4d04e 100644
--- a/package/pkg-generic.mk
+++ b/package/pkg-generic.mk
@@ -555,7 +555,8 @@ $(2)_MANIFEST_LICENSE_FILES = $$($(2)_LICENSE_FILES)
endif
$(2)_MANIFEST_LICENSE_FILES ?= not saved
-ifeq ($$($(2)_REDISTRIBUTE),YES)
+# If the package declares _LICENSE_FILES, we need to extract it
+ifneq ($$($(2)_LICENSE_FILES),)
ifneq ($$($(2)_SITE_METHOD),local)
ifneq ($$($(2)_SITE_METHOD),override)
# Packages that have a tarball need it downloaded and extracted beforehand
--
1.8.3.2
More information about the buildroot
mailing list