Package version to package manifest
cover Package version to package manifest
[YOCTO #2441]
This was requested and makes sense. Adds the PV to the package manifest.
The following changes since commit 348da93e283b2b8454fd9cde80d4b17378e2a168:
webkit-gtk: Use glib as unicode backend to avoid browser crash (2012-05-30 17:38:02 +0100)
are available in the git repository at:
git://git.yoctoproject.org/poky-contrib eflanagan/license_pkg
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=eflanagan/license_pkg
Elizabeth Flanagan (1):
license.bbclass: Adding PV to package.manifest
meta/classes/license.bbclass | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-)
Signature · 1 line
1.7.5.4
PATCH 1/1 license.bbclass: Adding PV to package.manifest
Per request, adding the package version to the package manifest file.
--- meta/classes/license.bbclass | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-)
meta/classes/license.bbclass +2 -0
@@ -90,11 +90,13 @@ license_create_manifest() { for filename in $files; do pkged_pn="$(sed -n 's/^PN: //p' ${filename})" pkged_lic="$(sed -n '/^LICENSE: /{ s/^LICENSE: //; s/[+|&()*]/ /g; s/ */ /g; p }' ${filename})" + pkged_pv="$(sed -n 's/^PV: //p' ${filename})" # check to see if the package name exists in the manifest. if so, bail. if ! grep -q "PACKAGE NAME: ${pkg}" ${filename}; then # exclude local recipes if [ ! "${pkged_pn}" = "*locale*" ]; then echo "PACKAGE NAME:" ${pkg} >> ${LICENSE_DIRECTORY}/${IMAGE_NAME}/license.manifest + echo "PACKAGE VERSION:" ${pkged_pv} >> ${LICENSE_DIRECTORY}/${IMAGE_NAME}/license.manifest echo "RECIPE NAME:" ${pkged_pn} >> ${LICENSE_DIRECTORY}/${IMAGE_NAME}/license.manifest echo "LICENSE: " >> ${LICENSE_DIRECTORY}/${IMAGE_NAME}/license.manifest for lic in ${pkged_lic}; do
Signature · 1 line
1.7.5.4
Re: [PATCH 1/1] license.bbclass: Adding PV to package.manifest
Quoted 16 lines · Elizabeth Flanagan
Per request, adding the package version to the package manifest file.
Signed-off-by Elizabeth Flanagan<[email protected]>--- meta/classes/license.bbclass | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-)meta/classes/license.bbclass +0
-0@@ -90,11 +90,13 @@ license_create_manifest() { for filename in $files; do pkged_pn="$(sed -n 's/^PN: //p' ${filename})" pkged_lic="$(sed -n '/^LICENSE: /{ s/^LICENSE: //; s/[+|&()*]/ /g; s/ */ /g; p }' ${filename})"
meta/classes/license.bbclass license_create_manifest() { · line 102
Quoted 10 lines
meta/classes/license.bbclass +2
-0+ pkged_pv="$(sed -n 's/^PV: //p' ${filename})" # check to see if the package name exists in the manifest. if so, bail. if ! grep -q "PACKAGE NAME: ${pkg}" ${filename}; then # exclude local recipes if [ ! "${pkged_pn}" = "*locale*" ]; then echo "PACKAGE NAME:" ${pkg}>> ${LICENSE_DIRECTORY}/${IMAGE_NAME}/license.manifest + echo "PACKAGE VERSION:" ${pkged_pv}>> ${LICENSE_DIRECTORY}/${IMAGE_NAME}/license.manifest echo "RECIPE NAME:" ${pkged_pn}>> ${LICENSE_DIRECTORY}/${IMAGE_NAME}/license.manifest echo "LICENSE: ">> ${LICENSE_DIRECTORY}/${IMAGE_NAME}/license.manifest for lic in ${pkged_lic}; do
Beth,
Your patches don't seem to apply together, if I apply one the other fails or the reverse.
Can you rebase appropriately
Sau!
Re: [PATCH 1/1] license.bbclass: Adding PV to package.manifest
Quoted 38 lines · Saul Wold
Quoted 19 lines · Elizabeth Flanagan
Per request, adding the package version to the package manifest file.
Signed-off-by Elizabeth Flanagan<[email protected]>---
meta/classes/license.bbclass | 2 ++1 files changed, 2 insertions(+), 0 deletions(-)meta/classes/license.bbclass +0
-0@@ -90,11 +90,13 @@ license_create_manifest() {for filename in $files; do
pkged_pn="$(sed -n 's/^PN: //p' ${filename})" pkged_lic="$(sed -n '/^LICENSE: /{ s/^LICENSE: //; s/[+|&()*]/ /g; s/ */ /g; p }' ${filename})"
+ pkged_pv="$(sed -n 's/^PV: //p' ${filename})"Quoted 15 lines
# check to see if the package name exists in the manifest. if so, bail. if ! grep -q "PACKAGE NAME: ${pkg}" ${filename}; then # exclude local recipes if [ ! "${pkged_pn}" = "*locale*" ]; then echo "PACKAGE NAME:" ${pkg}>> ${LICENSE_DIRECTORY}/${IMAGE_NAME}/license.manifest + echo "PACKAGE VERSION:" ${pkged_pv}>> ${LICENSE_DIRECTORY}/${IMAGE_NAME}/license.manifest echo "RECIPE NAME:" ${pkged_pn}>> ${LICENSE_DIRECTORY}/${IMAGE_NAME}/license.manifest echo "LICENSE: ">> ${LICENSE_DIRECTORY}/${IMAGE_NAME}/license.manifest for lic in ${pkged_lic}; doBeth,
Quoted 4 lines
Your patches don't seem to apply together, if I apply one the other fails or the reverse.
Can you rebase appropriately
In this case, I based both of them off of master as they're two different issues and are unrelated too each other. I'll rebase this as I pull together a mut for this afternoons AB run.
-b
Quoted 2 lines
Sau!
Signature · 3 lines
Elizabeth Flanagan Yocto Project Build and Release
Flanagan, Elizabeth
AppliedQuoted 12 lines · Elizabeth Flanagan
[YOCTO #2441]
This was requested and makes sense. Adds the PV to the package manifest.
The following changes since commit
348da93e283b2b8454fd9cde80d4b17378e2a168:webkit-gtk: Use glib as unicode backend to avoid browser crash (2012-05-30 17:38:02 +0100)
are available in the git repository at:
git://git.yoctoproject.org/poky-contrib eflanagan/license_pkg
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=eflanagan/license_pkg
Quoted 9 lines
Elizabeth Flanagan (1):
license.bbclass: Adding PV to package.manifestmeta/classes/license.bbclass | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)--
1.7.5.4
(I'm really not talking to myself here. This is part of Saul's patch management workflow :) )
Merged into OE-Core
Thanks
-b
Signature · 3 lines
Elizabeth Flanagan Yocto Project Build and Release