summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorElizabeth Flanagan <elizabeth.flanagan@intel.com>2012-12-06 12:01:10 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-12-07 16:13:46 +0000
commitf42e0ae8d743fed9c6e082c6bd767696f82de24d (patch)
tree947360e1b6c7794a0bd03478e8db754335f8006f
parent1d610990657789ac44d8a2fa09114f5a9326746a (diff)
downloadpoky-f42e0ae8d743fed9c6e082c6bd767696f82de24d.tar.gz
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 ] (From OE-Core rev: 4578b708ada1ffb99ab542da793977ffb90a9b50) 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 66cde1c03e..e1878956f8 100644
--- a/meta/classes/license.bbclass
+++ b/meta/classes/license.bbclass
@@ -13,7 +13,7 @@ do_populate_lic[cleandirs] = "${LICSSTATEDIR}"
13license_create_manifest() { 13license_create_manifest() {
14 mkdir -p ${LICENSE_DIRECTORY}/${IMAGE_NAME} 14 mkdir -p ${LICENSE_DIRECTORY}/${IMAGE_NAME}
15 # Get list of installed packages 15 # Get list of installed packages
16 list_installed_packages | grep -v "locale" | sort > ${LICENSE_DIRECTORY}/${IMAGE_NAME}/package.manifest 16 list_installed_packages |sort > ${LICENSE_DIRECTORY}/${IMAGE_NAME}/package.manifest
17 INSTALLED_PKGS=`cat ${LICENSE_DIRECTORY}/${IMAGE_NAME}/package.manifest` 17 INSTALLED_PKGS=`cat ${LICENSE_DIRECTORY}/${IMAGE_NAME}/package.manifest`
18 LICENSE_MANIFEST="${LICENSE_DIRECTORY}/${IMAGE_NAME}/license.manifest" 18 LICENSE_MANIFEST="${LICENSE_DIRECTORY}/${IMAGE_NAME}/license.manifest"
19 # remove existing license.manifest file 19 # remove existing license.manifest file
@@ -27,11 +27,6 @@ license_create_manifest() {
27 filename=`ls ${TMPDIR}/pkgdata/*/runtime-reverse/${pkg}| head -1` 27 filename=`ls ${TMPDIR}/pkgdata/*/runtime-reverse/${pkg}| head -1`
28 pkged_pn="$(sed -n 's/^PN: //p' ${filename})" 28 pkged_pn="$(sed -n 's/^PN: //p' ${filename})"
29 29
30 # exclude locale recipes
31 if [ "${pkged_pn}" = "*locale*" ]; then
32 continue
33 fi
34
35 # check to see if the package name exists in the manifest. if so, bail. 30 # check to see if the package name exists in the manifest. if so, bail.
36 if grep -q "^PACKAGE NAME: ${pkg}" ${LICENSE_MANIFEST}; then 31 if grep -q "^PACKAGE NAME: ${pkg}" ${LICENSE_MANIFEST}; then
37 continue 32 continue