[PATCH v2 0/1] Include locale in the package manifest

[PATCH v2 0/1] Include locale in the package manifest

[Elizabeth Flanagan]

Resending patch as it did not apply clean to master.

This patch is removes the exclusion of *locale* from the package and license
manifests. Doing so, allows us to accurately audit the packages installed
on an image with what the manifests contain.

This was tested by:

ssh root@192.168.7.4 'rpm -qa|sort' >> pkg_list
pr -m -t -s package.manifest pkg_list | gawk '{print $2 " " $1}'

and then manually comparing the results.

The following changes since commit 9b003c95fc916c163b8858728c1e7e06f162898e:

  license.bbclass: Including locale packages (2012-12-06 11:58:48 -0800)

are available in the git repository at:
  git://git.yoctoproject.org/poky-contrib eflanagan/locale_license
  http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=eflanagan/locale_license

Elizabeth Flanagan (1):
  license.bbclass: Including locale packages

 meta/classes/license.bbclass |    7 +------
 1 files changed, 1 insertions(+), 6 deletions(-)

-- 
1.7.5.4

[PATCH v2 1/1] license.bbclass: Including locale packages

[Elizabeth Flanagan]

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 <elizabeth.flanagan@intel.com>
---
 meta/classes/license.bbclass |    7 +------
 1 files changed, 1 insertions(+), 6 deletions(-)

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