summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2013-11-13 14:32:44 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-11-14 13:39:49 +0000
commitde5f4ffeb662cfadab48e29a5f7d9b595c72184d (patch)
tree433855aa44739fb137183f2e90a1f227e9ad5253
parent152a1b5425a3fbf87114494ef9e286a16a2e29a8 (diff)
downloadpoky-de5f4ffeb662cfadab48e29a5f7d9b595c72184d.tar.gz
classes/license: use "1" to set boolean variables
The expected usage of COPY_LIC_MANIFEST and COPY_LIC_DIRS appears to be to set them to "1" to enable; however the test here is just testing whether they have a value at all, so setting them to "0" would also enable them which is somewhat disingenuous. Actually check if they are set to "1" instead in order to fix this. (From OE-Core rev: 2d8e124adcf27af524eeeae61daf1b21a1c2f27c) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/license.bbclass4
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/classes/license.bbclass b/meta/classes/license.bbclass
index c1483ac490..6d7ee94119 100644
--- a/meta/classes/license.bbclass
+++ b/meta/classes/license.bbclass
@@ -62,10 +62,10 @@ license_create_manifest() {
62 # - Just copy the manifest 62 # - Just copy the manifest
63 # - Copy the manifest and the license directories 63 # - Copy the manifest and the license directories
64 # With both options set we see a .5 M increase in core-image-minimal 64 # With both options set we see a .5 M increase in core-image-minimal
65 if [ -n "${COPY_LIC_MANIFEST}" ]; then 65 if [ "${COPY_LIC_MANIFEST}" = "1" ]; then
66 mkdir -p ${IMAGE_ROOTFS}/usr/share/common-licenses/ 66 mkdir -p ${IMAGE_ROOTFS}/usr/share/common-licenses/
67 cp ${LICENSE_MANIFEST} ${IMAGE_ROOTFS}/usr/share/common-licenses/license.manifest 67 cp ${LICENSE_MANIFEST} ${IMAGE_ROOTFS}/usr/share/common-licenses/license.manifest
68 if [ -n "${COPY_LIC_DIRS}" ]; then 68 if [ "${COPY_LIC_DIRS}" = "1" ]; then
69 for pkg in ${INSTALLED_PKGS}; do 69 for pkg in ${INSTALLED_PKGS}; do
70 mkdir -p ${IMAGE_ROOTFS}/usr/share/common-licenses/${pkg} 70 mkdir -p ${IMAGE_ROOTFS}/usr/share/common-licenses/${pkg}
71 for lic in `ls ${LICENSE_DIRECTORY}/${pkg}`; do 71 for lic in `ls ${LICENSE_DIRECTORY}/${pkg}`; do