[PATCH 0/1] Manifest inclusion on image fix.

[PATCH 0/1] Manifest inclusion on image fix.

[Beth Flanagan]

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.

The following changes since commit 45987c5135d22757ed2eb06b37e192d73309f59f:

  eglibc: Fixes for running regression tests (2011-12-19 09:29:18 +0000)

are available in the git repository at:
  git://git.yoctoproject.org/poky-contrib eflanagan/manifest
  http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=eflanagan/manifest

Beth Flanagan (1):
  license: Fix manifest conditional

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

[PATCH 1/1] license: Fix manifest conditional

[Beth Flanagan]

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>
---
 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
-- 
1.7.1

Re: [PATCH 1/1] license: Fix manifest conditional

[Richard Purdie]

On Mon, 2011-12-19 at 13:50 -0800, Beth Flanagan wrote:
> 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>
> ---
>  meta/classes/license.bbclass |    4 ++--
>  1 files changed, 2 insertions(+), 2 deletions(-)

Merged to master, thanks.

Richard