Skip to contentSkip to conversation

Couple of fixes

PATCH Applied Paul Eggleton 3 participants 5 messages Aug 23, 2011 – Aug 24, 2011

lore
Share & tools
lore

Paul Eggleton

author
#0 lore raw

cover Couple of fixes

The following changes since commit 9134800548a03bfe3a7e351a15f2129bcb3cc680:

xcb/libpthreads: Add BBCLASSEXTEND to resolve missing providers in world builds (2011-08-19 16:27:29 -0700)

are available in the git repository at:
git://git.openembedded.org/openembedded-core-contrib paule/combo-layer-hook-fix
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=paule/combo-layer-hook-fix

Paul Eggleton (2):
base.bbclass: clarify COMMERCIAL_LICENSE skip reason scripts/combo-layer: fix overzealous regex in default hook script

 meta/classes/base.bbclass           |    2 +-
 scripts/combo-layer-hook-default.sh |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
Signature · 1 line
1.7.4.1
author
#1 lore raw

PATCH 1/2 base.bbclass: clarify COMMERCIAL_LICENSE skip reason

Change to a proper sentence and add a reference to the COMMERCIAL_LICENSE variable so that the user knows where this can be controlled.

Addresses remainder of [YOCTO #846]

Signed-off-by Paul Eggleton <[email protected]>
---
 meta/classes/base.bbclass |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
meta/classes/base.bbclass +1 -1
index 4332d24..3501f4b 100644
@@ -345,7 +345,7 @@ python () {
     pnr = pn.replace('+', "\+")
     if commercial_license and re.search(pnr, commercial_license):
         bb.debug(1, "Skipping %s because it's commercially licensed" % pn)
-        raise bb.parse.SkipPackage("because it requires commercial license to ship product")
+        raise bb.parse.SkipPackage("because it may require a commercial license to ship in a product (listed in COMMERCIAL_LICENSE)")
 
     # If we're building a target package we need to use fakeroot (pseudo)
     # in order to capture permissions, owners, groups and special files
Signature · 1 line
1.7.4.1
author
#2 lore raw

PATCH 2/2 scripts/combo-layer: fix overzealous regex in default hook script

In reply to Paul Eggleton

combo-layer's hook scripts are intended to modify patches as they pass through; the default one adds a prefix with the component name and a line with the component repo revision before the Signed-off-by; however the script was also unintentionally modifying the contents of patches *within* the patches passing through it, which resulted in unexpected failures when the combo-layer script attempted to use "git am" to apply them.

Signed-off-by Paul Eggleton <[email protected]>
---
 scripts/combo-layer-hook-default.sh |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
scripts/combo-layer-hook-default.sh +2 -2
index f03c4fa..e535d5f 100755
@@ -9,5 +9,5 @@ patchfile=$1
 rev=$2
 reponame=$3
 
-sed -i -e "s#Subject: \[PATCH\] \(.*\)#Subject: \[PATCH\] $reponame: \1#" $patchfile
-sed -i -e "0,/Signed-off-by:/s#\(Signed-off-by:.*\)#\($reponame rev: $rev\)\n\n\1#" $patchfile
+sed -i -e "s#^Subject: \[PATCH\] \(.*\)#Subject: \[PATCH\] $reponame: \1#" $patchfile
+sed -i -e "0,/^Signed-off-by:/s#\(Signed-off-by:.*\)#\($reponame rev: $rev\)\n\n\1#" $patchfile
Signature · 1 line
1.7.4.1
Applied
#4 lore raw
In reply to Paul Eggleton
Quoted 11 lines · Paul Eggleton

The following changes since commit 9134800548a03bfe3a7e351a15f2129bcb3cc680:

xcb/libpthreads: Add BBCLASSEXTEND to resolve missing providers in world builds (2011-08-19 16:27:29 -0700)

are available in the git repository at:
git://git.openembedded.org/openembedded-core-contrib paule/combo-layer-hook-fix
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=paule/combo-layer-hook-fix

Paul Eggleton (2):
base.bbclass: clarify COMMERCIAL_LICENSE skip reason scripts/combo-layer: fix overzealous regex in default hook script

Merged to master, thanks.

Richard

Acked-by on v1 2/2
#3 lore raw

Re: [PATCH 2/2] scripts/combo-layer: fix overzealous regex in default hook script

In reply to Paul Eggleton
Acked-by Otavio Salvador <[email protected]>
Quoted 34 lines · Paul Eggleton

combo-layer's hook scripts are intended to modify patches as they pass through; the default one adds a prefix with the component name and a line with the component repo revision before the Signed-off-by; however the script was also unintentionally modifying the contents of patches *within* the patches passing through it, which resulted in unexpected failures when the combo-layer script attempted to use "git am" to apply them.

Signed-off-by Paul Eggleton <[email protected]>

---
 scripts/combo-layer-hook-default.sh |    4 ++--

 1 files changed, 2 insertions(+), 2 deletions(-)
scripts/combo-layer-hook-default.sh +0 -0
index f03c4fa..e535d5f 100755
@@ -9,5 +9,5 @@ patchfile=$1

 rev=$2
 reponame=$3

scripts/combo-layer-hook-default.sh +2 -3
-sed -i -e "s#Subject: \[PATCH\] \(.*\)#Subject: \[PATCH\] $reponame: \1#" $patchfile
-sed -i -e "0,/Signed-off-by:/s#\(Signed-off-by:.*\)#\($reponame rev: $rev\)\n\n\1#" $patchfile
+sed -i -e "s#^Subject: \[PATCH\] \(.*\)#Subject: \[PATCH\] $reponame: \1#" $patchfile
+sed -i -e "0,/^Signed-off-by:/s#\(Signed-off-by:.*\)#\($reponame rev: $rev\)\n\n\1#" $patchfile
--

1.7.4.1

_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

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