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:10 +0000
commit2d8e124adcf27af524eeeae61daf1b21a1c2f27c (patch)
tree835ccc122db8386c32b99ca98901da6ee65e69cd
parente67dbb638044b804738bdd589d64d45963a3297a (diff)
downloadopenembedded-core-contrib-2d8e124adcf27af524eeeae61daf1b21a1c2f27c.tar.gz
openembedded-core-contrib-2d8e124adcf27af524eeeae61daf1b21a1c2f27c.tar.bz2
openembedded-core-contrib-2d8e124adcf27af524eeeae61daf1b21a1c2f27c.zip
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. 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() {
# - Just copy the manifest
# - Copy the manifest and the license directories
# With both options set we see a .5 M increase in core-image-minimal
- if [ -n "${COPY_LIC_MANIFEST}" ]; then
+ if [ "${COPY_LIC_MANIFEST}" = "1" ]; then
mkdir -p ${IMAGE_ROOTFS}/usr/share/common-licenses/
cp ${LICENSE_MANIFEST} ${IMAGE_ROOTFS}/usr/share/common-licenses/license.manifest
- if [ -n "${COPY_LIC_DIRS}" ]; then
+ if [ "${COPY_LIC_DIRS}" = "1" ]; then
for pkg in ${INSTALLED_PKGS}; do
mkdir -p ${IMAGE_ROOTFS}/usr/share/common-licenses/${pkg}
for lic in `ls ${LICENSE_DIRECTORY}/${pkg}`; do