Skip to contentSkip to conversation

Include locale in the package manifest

PATCH Superseded Elizabeth Flanagan 2 participants 4 messages Dec 5, 2012 – Dec 6, 2012

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

cover Include locale in the package manifest

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 [email protected] '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 381c4b69c7e8b452f4d3de2f8214e6e5f6a9abe7:

sstate.bbclass: fix detection of owners matching sstate files (2012-12-05 15:34:07 +0000)

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 file changed, 1 insertion(+), 6 deletions(-)
Signature · 1 line
1.7.9.5
#1 lore raw

PATCH 1/1 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 ]

---
 meta/classes/license.bbclass |    7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)
meta/classes/license.bbclass +1 -6
index c7ca4a6..8c03c42 100644
@@ -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
Signature · 1 line
1.7.9.5
#2 lore raw

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

Quoted 9 lines · 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 ]

Do you see any problem in it being add to danny as well?

Signature · 3 lines
Otavio Salvador                             O.S. Systems
E-mail: [email protected]  http://www.ossystems.com.br
Mobile: +55 53 9981-7854              http://projetos.ossystems.com.br
#3 lore raw

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

Quoted 9 lines · Otavio Salvador
Quoted 4 lines · Elizabeth Flanagan

As locale packages are installed on the image, we should be including them in the package/license manifest.

Quoted 9 lines
Quoted 5 lines

This ensures that the manifests are accurate and complete.

[ YOCTO #2461 ]

Do you see any problem in it being add to danny as well?

If it applies cleanly, no, I don't see an issue. It may not apply clean though, so we may need to cherry-pick a few commits.

-b

Quoted 5 lines

--
Otavio Salvador O.S. Systems
E-mail: [email protected] http://www.ossystems.com.br
Mobile: +55 53 9981-7854 http://projetos.ossystems.com.br

Signature · 3 lines
Elizabeth Flanagan
Yocto Project
Build and Release