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>

diff --git a/meta/classes/license.bbclass b/meta/classes/license.bbclass
index 66cde1c..e187895 100644 (file)
--- 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