From: Elizabeth Flanagan Date: Thu, 6 Dec 2012 20:01:10 +0000 (-0800) Subject: license.bbclass: Including locale packages X-Git-Tag: 2015-4~8399 X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=4578b708ada1ffb99ab542da793977ffb90a9b50;p=openembedded-core.git 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 Signed-off-by: Richard Purdie --- 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}" 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