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 <[email protected]>
---
 meta/classes/license.bbclass |    7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/meta/classes/license.bbclass b/meta/classes/license.bbclass
index c7ca4a6..8c03c42 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
@@ -26,11 +26,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
-- 
1.7.9.5


_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

Reply via email to