summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2011-09-05 16:37:04 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-09-05 20:25:44 +0100
commit726a9d299a7f6ce59e138363fda15900c92a2bbf (patch)
treed1dc8f9bad4b6b26bd7a234a56ece9ecf8bce04d
parenta6994f8413fc8fb4ec1dc060eb1145d362a78701 (diff)
downloadpoky-726a9d299a7f6ce59e138363fda15900c92a2bbf.tar.gz
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 <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/git/git.inc6
-rw-r--r--meta/recipes-devtools/git/git_1.7.5.1.bb2
2 files changed, 7 insertions, 1 deletions
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 () {
18 GIT_PYTHON_DIR=${D}${datadir}/git-core/python 18 GIT_PYTHON_DIR=${D}${datadir}/git-core/python
19} 19}
20 20
21do_install_append_virtclass-native() {
22 create_wrapper ${D}/${bindir}/git \
23 GIT_EXEC_PATH=${libexecdir}/git-core \
24 GIT_TEMPLATE_DIR=${STAGING_DATADIR_NATIVE}/git-core/templates
25}
26
21FILES_${PN} += "${datadir}/git-core ${libxecdir}/git-core/" 27FILES_${PN} += "${datadir}/git-core ${libxecdir}/git-core/"
22FILES_${PN}-dbg += "${libexecdir}/git-core/.debug" 28FILES_${PN}-dbg += "${libexecdir}/git-core/.debug"
23 29
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 @@
1require git.inc 1require git.inc
2 2
3PR = "r2" 3PR = "r3"
4 4
5EXTRA_OECONF += "ac_cv_snprintf_returns_bogus=no ac_cv_c_c99_format=yes \ 5EXTRA_OECONF += "ac_cv_snprintf_returns_bogus=no ac_cv_c_c99_format=yes \
6 ac_cv_fread_reads_directories=${ac_cv_fread_reads_directories=yes} \ 6 ac_cv_fread_reads_directories=${ac_cv_fread_reads_directories=yes} \