Couple of fixes

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

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

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

index 6076ab9..e88e266 100644
@@ -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

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

---
 scripts/combo-layer |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

index 84cc48f..d129175 100755
@@ -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

Merged into OE-Core

Thanks
Sau!