[PATCH 0/1] fix sstate relocation for git-native

[PATCH 0/1] fix sstate relocation for git-native

[Paul Eggleton]

The following changes since commit 0616557a8c29b42bae0ffd5fd665a046810047e4:

  populate_sdk: We need to ensure that the SDK sysroot reflects PACKAGE_ARCH (2011-09-02 23:38:00 +0100)

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

Paul Eggleton (1):
  git: fix sstate relocation for git-native

 meta/recipes-devtools/git/git.inc        |    6 ++++++
 meta/recipes-devtools/git/git_1.7.5.1.bb |    2 +-
 2 files changed, 7 insertions(+), 1 deletions(-)

-- 
1.7.4.1

[PATCH 1/1] git: fix sstate relocation for git-native

[Paul Eggleton]

Create a wrapper for git to set GIT_EXEC_PATH and GIT_TEMPLATE_DIR so
that git-native is relocatable.

Fixes specific example given in [YOCTO #1137]

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
 meta/recipes-devtools/git/git.inc        |    6 ++++++
 meta/recipes-devtools/git/git_1.7.5.1.bb |    2 +-
 2 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/meta/recipes-devtools/git/git.inc b/meta/recipes-devtools/git/git.inc
index 56655f9..ca13ffd 100644
--- a/meta/recipes-devtools/git/git.inc
+++ b/meta/recipes-devtools/git/git.inc
@@ -18,6 +18,12 @@ do_install () {
 		GIT_PYTHON_DIR=${D}${datadir}/git-core/python
 }
 
+do_install_append_virtclass-native() {
+	create_wrapper ${D}/${bindir}/git \
+		GIT_EXEC_PATH=${libexecdir}/git-core \
+		GIT_TEMPLATE_DIR=${STAGING_DATADIR_NATIVE}/git-core/templates
+}
+
 FILES_${PN} += "${datadir}/git-core ${libxecdir}/git-core/"
 FILES_${PN}-dbg += "${libexecdir}/git-core/.debug"
 
diff --git a/meta/recipes-devtools/git/git_1.7.5.1.bb b/meta/recipes-devtools/git/git_1.7.5.1.bb
index 04d1d56..b5eb015 100644
--- a/meta/recipes-devtools/git/git_1.7.5.1.bb
+++ b/meta/recipes-devtools/git/git_1.7.5.1.bb
@@ -1,6 +1,6 @@
 require git.inc
 
-PR = "r2"
+PR = "r3"
 
 EXTRA_OECONF += "ac_cv_snprintf_returns_bogus=no ac_cv_c_c99_format=yes \
                  ac_cv_fread_reads_directories=${ac_cv_fread_reads_directories=yes} \
-- 
1.7.4.1

Re: [PATCH 1/1] git: fix sstate relocation for git-native

[Richard Purdie]

On Mon, 2011-09-05 at 16:47 +0100, Paul Eggleton wrote:
> Create a wrapper for git to set GIT_EXEC_PATH and GIT_TEMPLATE_DIR so
> that git-native is relocatable.
> 
> Fixes specific example given in [YOCTO #1137]
> 
> Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
> ---
>  meta/recipes-devtools/git/git.inc        |    6 ++++++
>  meta/recipes-devtools/git/git_1.7.5.1.bb |    2 +-
>  2 files changed, 7 insertions(+), 1 deletions(-)

Merged to master, thanks.

Richard