[PATCH 0/2] Couple of fixes

[PATCH 0/2] Couple of fixes

[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

 meta/classes/base.bbclass           |    2 +-
 scripts/combo-layer-hook-default.sh |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

-- 
1.7.4.1

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

[Paul Eggleton]

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 <paul.eggleton@linux.intel.com>
---
 meta/classes/base.bbclass |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
index 4332d24..3501f4b 100644
--- a/meta/classes/base.bbclass
+++ b/meta/classes/base.bbclass
@@ -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
-- 
1.7.4.1

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

[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 <paul.eggleton@linux.intel.com>
---
 scripts/combo-layer-hook-default.sh |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/combo-layer-hook-default.sh b/scripts/combo-layer-hook-default.sh
index f03c4fa..e535d5f 100755
--- a/scripts/combo-layer-hook-default.sh
+++ b/scripts/combo-layer-hook-default.sh
@@ -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
-- 
1.7.4.1

Re: [PATCH 0/2] Couple of fixes

[Richard Purdie]

On Tue, 2011-08-23 at 23:32 +0100, Paul Eggleton wrote:
> 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

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

[Otavio Salvador]

Acked-by: Otavio Salvador <otavio@ossystems.com.br>

On Tue, Aug 23, 2011 at 19:32, Paul Eggleton
<paul.eggleton@linux.intel.com> wrote:
> 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 <paul.eggleton@linux.intel.com>
> ---
>  scripts/combo-layer-hook-default.sh |    4 ++--
>  1 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/scripts/combo-layer-hook-default.sh b/scripts/combo-layer-hook-default.sh
> index f03c4fa..e535d5f 100755
> --- a/scripts/combo-layer-hook-default.sh
> +++ b/scripts/combo-layer-hook-default.sh
> @@ -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
> --
> 1.7.4.1
>
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>



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

Re: [PATCH 0/2] Couple of fixes

[Saul Wold]

On 07/25/2011 07:44 AM, Paul Eggleton wrote:
> The following changes since commit f10a3457cdfbb4a94978da998d178d4254632fa7:
>
>    Move architecture specific TARGET_OS mangling into tune files (2011-07-25 14:19:54 +0100)
>
> are available in the git repository at:
>    git://git.openembedded.org/openembedded-core-contrib paule/fixes2
>    http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=paule/fixes2
>
> Paul Eggleton (2):
>    eglibc: remove unnecessary FILESPATHPKG usage
>    scripts/combo-layer: keep carriage returns at the end of lines
>
>   meta/recipes-core/eglibc/eglibc_2.13.bb |    3 +--
>   scripts/combo-layer                     |    2 +-
>   2 files changed, 2 insertions(+), 3 deletions(-)
>

Merged into OE-Core

Thanks
	Sau!

[PATCH 0/2] Couple of fixes

[Paul Eggleton]

The following changes since commit f10a3457cdfbb4a94978da998d178d4254632fa7:

  Move architecture specific TARGET_OS mangling into tune files (2011-07-25 14:19:54 +0100)

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

Paul Eggleton (2):
  eglibc: remove unnecessary FILESPATHPKG usage
  scripts/combo-layer: keep carriage returns at the end of lines

 meta/recipes-core/eglibc/eglibc_2.13.bb |    3 +--
 scripts/combo-layer                     |    2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

-- 
1.7.4.1