From 19f39c5d069a556c9b1c9af82cd9edd92772c0c5 Mon Sep 17 00:00:00 2001 From: Elizabeth Flanagan Date: Thu, 6 Dec 2012 12:01:10 -0800 Subject: 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 Signed-off-by: Richard Purdie --- 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 64da8b07f7..800dcb9288 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 -- cgit v1.2.3-54-g00ecf