From 726a9d299a7f6ce59e138363fda15900c92a2bbf Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Mon, 5 Sep 2011 16:37:04 +0100 Subject: git: fix sstate relocation for git-native 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] (From OE-Core rev: 9a3e25b5a3aa5e3b6ba543c4f789f66b240b38a7) Signed-off-by: Paul Eggleton Signed-off-by: Richard Purdie --- meta/recipes-devtools/git/git.inc | 6 ++++++ meta/recipes-devtools/git/git_1.7.5.1.bb | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) (limited to 'meta/recipes-devtools/git') diff --git a/meta/recipes-devtools/git/git.inc b/meta/recipes-devtools/git/git.inc index 56655f93be..ca13ffd704 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 04d1d5602c..b5eb01511b 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} \ -- cgit v1.2.3-54-g00ecf