diff options
author | Beth Flanagan <elizabeth.flanagan@intel.com> | 2011-12-21 01:02:54 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-12-21 17:16:29 +0000 |
commit | 2ee3156284a3941457c99e003ea5afc0f7af75aa (patch) | |
tree | b43a37ab3ea5fef163f6e3602723f64bc265ec63 | |
parent | e559160b8898b1f98ee158418c810ab5f1ee9e3f (diff) | |
download | poky-2ee3156284a3941457c99e003ea5afc0f7af75aa.tar.gz |
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.
(From OE-Core rev: dc751b9c637db0d442ef553f0b0568cb493f3cd3)
Signed-off-by: Beth Flanagan <elizabeth.flanagan@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | 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 6e82bd94ae..d351b5aaed 100644 --- a/meta/classes/license.bbclass +++ b/meta/classes/license.bbclass | |||
@@ -110,10 +110,10 @@ license_create_manifest() { | |||
110 | # if you are concerned about license compliance | 110 | # if you are concerned about license compliance |
111 | # and delivery this should cover all your bases | 111 | # and delivery this should cover all your bases |
112 | 112 | ||
113 | if [ -n ${COPY_LIC_MANIFEST} ]; then | 113 | if [ -n "${COPY_LIC_MANIFEST}" ]; then |
114 | mkdir -p ${IMAGE_ROOTFS}/usr/share/common-licenses/ | 114 | mkdir -p ${IMAGE_ROOTFS}/usr/share/common-licenses/ |
115 | cp ${LICENSE_DIRECTORY}/${IMAGE_NAME}/license.manifest ${IMAGE_ROOTFS}/usr/share/common-licenses/license.manifest | 115 | cp ${LICENSE_DIRECTORY}/${IMAGE_NAME}/license.manifest ${IMAGE_ROOTFS}/usr/share/common-licenses/license.manifest |
116 | if [ -n ${COPY_LIC_DIRS} ]; then | 116 | if [ -n "${COPY_LIC_DIRS}" ]; then |
117 | for pkg in ${INSTALLED_PKGS}; do | 117 | for pkg in ${INSTALLED_PKGS}; do |
118 | mkdir -p ${IMAGE_ROOTFS}/usr/share/common-licenses/${pkg} | 118 | mkdir -p ${IMAGE_ROOTFS}/usr/share/common-licenses/${pkg} |
119 | for lic in `ls ${LICENSE_DIRECTORY}/${pkged_pn}`; do | 119 | for lic in `ls ${LICENSE_DIRECTORY}/${pkged_pn}`; do |