[WR PATCH 0/2] Local WR patches -- sent for YP compliance

[WR PATCH 0/2] Local WR patches -- sent for YP compliance

[Mark Hatle]

Due to the requirements of the Yocto Project, we are required to send out all
of our patches to oe-core, even if we don't believe they are generally useful.

This patch set includes two such patches.  The first bumps the required git
version, before the system builds it's own...  The second slightly extends
the pkgdata recipe information.

If either of these look like they will resolve problems in oe-core, or add
additional functionality someone else might require, I'm happy for them to
go in.

diffstat:
 meta/classes/package.bbclass |    2 ++
 scripts/bitbake              |    3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

[WR PATCH 1/2] Require git 1.7.7

[Mark Hatle]

From: Jeff Polk <jeff.polk@windriver.com>

Due to some unique processes that we use, outside of OE-Core, we need
to mandate git 1.7.7 as the older allowed version.  This version contains
a fix that correctly handles reference clones which we use for our
RCPL updates.

Signed-off-by: Jeff Polk <jeff.polk@windriver.com>
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
---
 scripts/bitbake |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/scripts/bitbake b/scripts/bitbake
index 79a81ea..568a998 100755
--- a/scripts/bitbake
+++ b/scripts/bitbake
@@ -73,7 +73,8 @@ version_compare() {
 float_test "$TARVERSION > 1.23" && needtar="0"
 
 # Need git >= 1.7.5 for git-remote --mirror=xxx syntax
-version_compare $GITVERSION ">=" 1.7.5 && needgit="0"
+# WR: need git >= 1.7.7 for correct alternates handling
+version_compare $GITVERSION ">=" 1.7.7 && needgit="0"
 
 
 buildpseudo="1"
-- 
1.7.3.4

[WR PATCH 2/2] Add directory information to the pkgdata files

[Mark Hatle]

[ CQID: WIND00401773 ]

Add S(ource) and B(uild) directory information to the recipe pkgdata files.
This allows external tools to find the appropriate information, and be able
to easily access the corresponding sources and build directories.

Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
---
 meta/classes/package.bbclass |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass
index a1cd0c2..f26da28 100644
--- a/meta/classes/package.bbclass
+++ b/meta/classes/package.bbclass
@@ -1098,6 +1098,8 @@ python emit_pkgdata() {
 
     data_file = pkgdatadir + d.expand("/${PN}" )
     f = open(data_file, 'w')
+    f.write("S: %s\n" % d.expand("${S}"))
+    f.write("B: %s\n" % d.expand("${B}"))
     f.write("PACKAGES: %s\n" % packages)
     f.close()
 
-- 
1.7.3.4