[oe-commits] Paul Eggleton : classes/license: use "1" to set boolean variables
git at git.openembedded.org
git at git.openembedded.org
Thu Nov 14 14:17:04 UTC 2013
Module: openembedded-core.git
Branch: master
Commit: 2d8e124adcf27af524eeeae61daf1b21a1c2f27c
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=2d8e124adcf27af524eeeae61daf1b21a1c2f27c
Author: Paul Eggleton <paul.eggleton at linux.intel.com>
Date: Wed Nov 13 14:32:44 2013 +0000
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 at linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
meta/classes/license.bbclass | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/classes/license.bbclass b/meta/classes/license.bbclass
index c1483ac..6d7ee94 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
More information about the Openembedded-commits
mailing list