* [PATCH 0/1] Package version to package manifest
@ 2012-05-30 23:39 Elizabeth Flanagan
2012-05-30 23:39 ` [PATCH 1/1] license.bbclass: Adding PV to package.manifest Elizabeth Flanagan
2012-06-11 17:44 ` [PATCH 0/1] Package version to package manifest Flanagan, Elizabeth
0 siblings, 2 replies; 5+ messages in thread
From: Elizabeth Flanagan @ 2012-05-30 23:39 UTC (permalink / raw)
To: openembedded-core
[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(-)
--
1.7.5.4
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH 1/1] license.bbclass: Adding PV to package.manifest
2012-05-30 23:39 [PATCH 0/1] Package version to package manifest Elizabeth Flanagan
@ 2012-05-30 23:39 ` Elizabeth Flanagan
2012-06-01 7:12 ` Saul Wold
2012-06-11 17:44 ` [PATCH 0/1] Package version to package manifest Flanagan, Elizabeth
1 sibling, 1 reply; 5+ messages in thread
From: Elizabeth Flanagan @ 2012-05-30 23:39 UTC (permalink / raw)
To: openembedded-core
Per request, adding the package version to the package manifest
file.
Signed-off-by: Elizabeth Flanagan <elizabeth.flanagan@intel.com>
---
meta/classes/license.bbclass | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/meta/classes/license.bbclass b/meta/classes/license.bbclass
index 6c4a673..a537496 100644
--- a/meta/classes/license.bbclass
+++ b/meta/classes/license.bbclass
@@ -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
--
1.7.5.4
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH 1/1] license.bbclass: Adding PV to package.manifest
2012-05-30 23:39 ` [PATCH 1/1] license.bbclass: Adding PV to package.manifest Elizabeth Flanagan
@ 2012-06-01 7:12 ` Saul Wold
2012-06-01 18:09 ` Flanagan, Elizabeth
0 siblings, 1 reply; 5+ messages in thread
From: Saul Wold @ 2012-06-01 7:12 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On 05/30/2012 04:39 PM, Elizabeth Flanagan wrote:
> Per request, adding the package version to the package manifest
> file.
>
> Signed-off-by: Elizabeth Flanagan<elizabeth.flanagan@intel.com>
> ---
> meta/classes/license.bbclass | 2 ++
> 1 files changed, 2 insertions(+), 0 deletions(-)
>
> diff --git a/meta/classes/license.bbclass b/meta/classes/license.bbclass
> index 6c4a673..a537496 100644
> --- a/meta/classes/license.bbclass
> +++ b/meta/classes/license.bbclass
> @@ -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
Beth,
Your patches don't seem to apply together, if I apply one the other
fails or the reverse.
Can you rebase appropriately
Sau!
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 1/1] license.bbclass: Adding PV to package.manifest
2012-06-01 7:12 ` Saul Wold
@ 2012-06-01 18:09 ` Flanagan, Elizabeth
0 siblings, 0 replies; 5+ messages in thread
From: Flanagan, Elizabeth @ 2012-06-01 18:09 UTC (permalink / raw)
To: Saul Wold; +Cc: Patches and discussions about the oe-core layer
On Fri, Jun 1, 2012 at 12:12 AM, Saul Wold <sgw@linux.intel.com> wrote:
> On 05/30/2012 04:39 PM, Elizabeth Flanagan wrote:
>>
>> Per request, adding the package version to the package manifest
>> file.
>>
>> Signed-off-by: Elizabeth Flanagan<elizabeth.flanagan@intel.com>
>> ---
>> meta/classes/license.bbclass | 2 ++
>> 1 files changed, 2 insertions(+), 0 deletions(-)
>>
>> diff --git a/meta/classes/license.bbclass b/meta/classes/license.bbclass
>> index 6c4a673..a537496 100644
>> --- a/meta/classes/license.bbclass
>> +++ b/meta/classes/license.bbclass
>> @@ -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
>
> Beth,
>
> 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
>
> Sau!
--
Elizabeth Flanagan
Yocto Project
Build and Release
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 0/1] Package version to package manifest
2012-05-30 23:39 [PATCH 0/1] Package version to package manifest Elizabeth Flanagan
2012-05-30 23:39 ` [PATCH 1/1] license.bbclass: Adding PV to package.manifest Elizabeth Flanagan
@ 2012-06-11 17:44 ` Flanagan, Elizabeth
1 sibling, 0 replies; 5+ messages in thread
From: Flanagan, Elizabeth @ 2012-06-11 17:44 UTC (permalink / raw)
To: openembedded-core
On Wed, May 30, 2012 at 4:39 PM, Elizabeth Flanagan
<elizabeth.flanagan@intel.com> wrote:
> [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(-)
>
> --
> 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
--
Elizabeth Flanagan
Yocto Project
Build and Release
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2012-06-11 18:01 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-05-30 23:39 [PATCH 0/1] Package version to package manifest Elizabeth Flanagan
2012-05-30 23:39 ` [PATCH 1/1] license.bbclass: Adding PV to package.manifest Elizabeth Flanagan
2012-06-01 7:12 ` Saul Wold
2012-06-01 18:09 ` Flanagan, Elizabeth
2012-06-11 17:44 ` [PATCH 0/1] Package version to package manifest Flanagan, Elizabeth
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox