[oe-commits] Beth Flanagan : license: Fix manifest conditional

git at git.openembedded.org git at git.openembedded.org
Wed Dec 21 17:20:32 UTC 2011


Module: openembedded-core.git
Branch: master
Commit: dc751b9c637db0d442ef553f0b0568cb493f3cd3
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=dc751b9c637db0d442ef553f0b0568cb493f3cd3

Author: Beth Flanagan <elizabeth.flanagan at intel.com>
Date:   Wed Dec 21 01:02:54 2011 -0800

license: Fix manifest conditional

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 at intel.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

---

 meta/classes/license.bbclass |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/classes/license.bbclass b/meta/classes/license.bbclass
index 6e82bd9..d351b5a 100644
--- a/meta/classes/license.bbclass
+++ b/meta/classes/license.bbclass
@@ -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





More information about the Openembedded-commits mailing list