Skip to contentSkip to conversation

Local WR patches -- sent for YP compliance

PATCH New Mark Hatle 1 participant 3 messages Feb 7, 2013

lore
Share & tools
lore

Mark Hatle

author
#0 lore raw

cover Local WR patches -- sent for YP compliance

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(-)
author
#1 lore raw

PATCH 1/2 Require git 1.7.7

From: Jeff Polk <[email protected]>

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.

---
 scripts/bitbake |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
scripts/bitbake +2 -1
index 79a81ea..568a998 100755
@@ -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"
Signature · 1 line
1.7.3.4
author
#2 lore raw

PATCH 2/2 Add directory information to the pkgdata files

In reply to 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.

---
 meta/classes/package.bbclass |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)
meta/classes/package.bbclass +2 -0
index a1cd0c2..f26da28 100644
@@ -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()
 
Signature · 1 line
1.7.3.4