[PATCH 0/2] Couple of fixes

[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

[PATCH 1/2] eglibc: remove unnecessary FILESPATHPKG usage

[Paul Eggleton]

This was not doing anything (we don't even have the eglibc-svn directory).

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
 meta/recipes-core/eglibc/eglibc_2.13.bb |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-core/eglibc/eglibc_2.13.bb b/meta/recipes-core/eglibc/eglibc_2.13.bb
index 6076ab9..e88e266 100644
--- a/meta/recipes-core/eglibc/eglibc_2.13.bb
+++ b/meta/recipes-core/eglibc/eglibc_2.13.bb
@@ -3,8 +3,7 @@ require eglibc.inc
 SRCREV = "14157"
 
 DEPENDS += "gperf-native"
-FILESPATHPKG =. "eglibc-svn:"
-PR = "r8"
+PR = "r9"
 PR_append = "+svnr${SRCPV}"
 
 EGLIBC_BRANCH="eglibc-2_13"
-- 
1.7.4.1

[PATCH 2/2] scripts/combo-layer: keep carriage returns at the end of lines

[Paul Eggleton]

Use --keep-cr option to "git am" or otherwise we lose carriage returns
which can be important for patches against files that use CRs.

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
 scripts/combo-layer |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/scripts/combo-layer b/scripts/combo-layer
index 84cc48f..d129175 100755
--- a/scripts/combo-layer
+++ b/scripts/combo-layer
@@ -254,7 +254,7 @@ def action_apply_patch(conf, args):
         for line in open(repo['patchlist']):
             patchfile = line.split()[0]
             lastrev = line.split()[1]
-            cmd = "git am -s -p1 %s" % patchfile
+            cmd = "git am --keep-cr -s -p1 %s" % patchfile
             logger.info("Apply %s" % patchfile )
             try:
                 runcmd(cmd)
-- 
1.7.4.1

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

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