Patchwork [1/1] license.bbclass: Including locale packages

login
register
mail settings
Submitter Elizabeth Flanagan
Date Dec. 5, 2012, 11:37 p.m.
Message ID <18ff48823dac8258feb94958f9ebe3dcaab32815.1354748735.git.elizabeth.flanagan@intel.com>
Download mbox | patch
Permalink /patch/40529/
State New
Headers show

Comments

Elizabeth Flanagan - Dec. 5, 2012, 11:37 p.m.
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 file changed, 1 insertion(+), 6 deletions(-)
Otavio Salvador - Dec. 6, 2012, 12:01 p.m.
On Wed, Dec 5, 2012 at 9:37 PM, Elizabeth Flanagan <
elizabeth.flanagan@intel.com> wrote:

> 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>
>

Do you see any problem in it being add to danny as well?
Elizabeth Flanagan - Dec. 6, 2012, 6:43 p.m.
On Thu, Dec 6, 2012 at 4:01 AM, Otavio Salvador <otavio@ossystems.com.br> wrote:
>
>
>
> On Wed, Dec 5, 2012 at 9:37 PM, Elizabeth Flanagan
> <elizabeth.flanagan@intel.com> wrote:
>>
>> 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>
>
>
> 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

> --
> Otavio Salvador                             O.S. Systems
> E-mail: otavio@ossystems.com.br  http://www.ossystems.com.br
> Mobile: +55 53 9981-7854              http://projetos.ossystems.com.br
>

Patch

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