| Submitter | Elizabeth Flanagan |
|---|---|
| Date | Dec. 19, 2011, 9:50 p.m. |
| Message ID | <b680bbc0f8d2672fc03433c9e6911c0a04eb20c1.1324331298.git.elizabeth.flanagan@intel.com> |
| Download | mbox | patch |
| Permalink | /patch/17269/ |
| State | Accepted |
| Commit | dc751b9c637db0d442ef553f0b0568cb493f3cd3 |
| Headers | show |
Comments
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
Patch
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
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(-)