]> code.ossystems Code Review - openembedded-core.git/commitdiff
license: Fix manifest conditional
authorBeth Flanagan <elizabeth.flanagan@intel.com>
Wed, 21 Dec 2011 09:02:54 +0000 (01:02 -0800)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Wed, 21 Dec 2011 17:11:29 +0000 (17:11 +0000)
The manifest conditionals COPY_LIC_MANIFEST and COPY_LIC_DIRS
were returning true due to missing quotes in the bash test. This
made images larger than expected.

Signed-off-by: Beth Flanagan <elizabeth.flanagan@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
meta/classes/license.bbclass

index 6e82bd94aed152f48066f27e6972e6c4e075015d..d351b5aaedd194cd28d2c6b257ce4ee1041cf2df 100644 (file)
@@ -110,10 +110,10 @@ license_create_manifest() {
     # if you are concerned about license compliance 
     # and delivery this should cover all your bases
 
-    if [ -n ${COPY_LIC_MANIFEST} ]; then
+    if [ -n "${COPY_LIC_MANIFEST}" ]; then
         mkdir -p ${IMAGE_ROOTFS}/usr/share/common-licenses/
         cp ${LICENSE_DIRECTORY}/${IMAGE_NAME}/license.manifest ${IMAGE_ROOTFS}/usr/share/common-licenses/license.manifest
-        if [ -n ${COPY_LIC_DIRS} ]; then
+        if [ -n "${COPY_LIC_DIRS}" ]; then
             for pkg in ${INSTALLED_PKGS}; do
                 mkdir -p ${IMAGE_ROOTFS}/usr/share/common-licenses/${pkg}
                 for lic in `ls ${LICENSE_DIRECTORY}/${pkged_pn}`; do