summaryrefslogtreecommitdiffstats
path: root/meta
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:19:52 +0000
commit19f39c5d069a556c9b1c9af82cd9edd92772c0c5 (patch)
treeab38a2183f60b65ff54c13d4261ccb590a4ab876 /meta
parentba10b7ff18c17f6850c7ae64caa286c8fa55e73e (diff)
downloadpoky-19f39c5d069a556c9b1c9af82cd9edd92772c0c5.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: f03efceb8a529df944592ff9031639f4e2f7a97d) Signed-off-by: Elizabeth Flanagan <elizabeth.flanagan@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-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}"
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