summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorElizabeth Flanagan <elizabeth.flanagan@intel.com>2012-12-06 12:01:10 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-02-14 15:17:16 +0000
commitf03efceb8a529df944592ff9031639f4e2f7a97d (patch)
treee093a17f52ef31acc8691092f80fb3ece6699873
parent178f0d6abfb443ed5d4cc5dab51fc2b78ffade2b (diff)
downloadopenembedded-core-f03efceb8a529df944592ff9031639f4e2f7a97d.tar.gz
openembedded-core-f03efceb8a529df944592ff9031639f4e2f7a97d.tar.bz2
openembedded-core-f03efceb8a529df944592ff9031639f4e2f7a97d.zip
license.bbclass: Including locale packages
As locale packages are installed on the image, we should be including them in the package/license manifest. This ensures that the manifests are accurate and complete. [ YOCTO #2461 ] Signed-off-by: Elizabeth Flanagan <elizabeth.flanagan@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/license.bbclass7
1 files changed, 1 insertions, 6 deletions
diff --git a/meta/classes/license.bbclass b/meta/classes/license.bbclass
index 64da8b07f7..800dcb9288 100644
--- a/meta/classes/license.bbclass
+++ b/meta/classes/license.bbclass
@@ -13,7 +13,7 @@ do_populate_lic[cleandirs] = "${LICSSTATEDIR}"
license_create_manifest() {
mkdir -p ${LICENSE_DIRECTORY}/${IMAGE_NAME}
# Get list of installed packages
- list_installed_packages | grep -v "locale" | sort > ${LICENSE_DIRECTORY}/${IMAGE_NAME}/package.manifest
+ list_installed_packages |sort > ${LICENSE_DIRECTORY}/${IMAGE_NAME}/package.manifest
INSTALLED_PKGS=`cat ${LICENSE_DIRECTORY}/${IMAGE_NAME}/package.manifest`
LICENSE_MANIFEST="${LICENSE_DIRECTORY}/${IMAGE_NAME}/license.manifest"
# remove existing license.manifest file
@@ -27,11 +27,6 @@ license_create_manifest() {
filename=`ls ${TMPDIR}/pkgdata/*/runtime-reverse/${pkg}| head -1`
pkged_pn="$(sed -n 's/^PN: //p' ${filename})"
- # exclude locale recipes
- if [ "${pkged_pn}" = "*locale*" ]; then
- continue
- fi
-
# check to see if the package name exists in the manifest. if so, bail.
if grep -q "^PACKAGE NAME: ${pkg}" ${LICENSE_MANIFEST}; then
continue