summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorChristopher Larson <kergoth@gmail.com>2014-06-13 17:46:41 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-06-14 08:43:55 +0100
commit62cf222de25848bb984581170e79fbc461fbe2dd (patch)
tree3981d022e9a6b0514947e303cc57f88068b36391 /meta
parent5d6ffdc47565cb7405edabcf8cb8ba1fe3c84f31 (diff)
downloadpoky-62cf222de25848bb984581170e79fbc461fbe2dd.tar.gz
git: revert to wrapper based relocation
It seems that there are multiple problems with the upstream RUNTIME_PREFIX mechanism at this time. It doesn't canonicalize argv[0] to an absolute path, breaking calls via the PATH, for example. In addition, it doesn't seem to locate template_dir via the runtime prefix even when specified as relative. Revert this for now to the previous wrapper-based mechanism, but tweaked slightly to avoid hardcoding the sysroot path into the wrapper (based on the bits in the rpm recipe). [YOCTO #6211] [Pulled from meta-mentor by RP] (From OE-Core rev: 85ce11e7b5402cc443adb8007c0e5d01f914fa74) Signed-off-by: Christopher Larson <kergoth@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-devtools/git/git.inc16
1 files changed, 14 insertions, 2 deletions
diff --git a/meta/recipes-devtools/git/git.inc b/meta/recipes-devtools/git/git.inc
index 8c85adeda6..9ed13dba39 100644
--- a/meta/recipes-devtools/git/git.inc
+++ b/meta/recipes-devtools/git/git.inc
@@ -15,7 +15,7 @@ EXTRA_OECONF = "--with-perl=${STAGING_BINDIR_NATIVE}/perl-native/perl \
15 15
16inherit autotools-brokensep perlnative 16inherit autotools-brokensep perlnative
17 17
18EXTRA_OEMAKE = "NO_PYTHON=1 RUNTIME_PREFIX=1 CFLAGS='${CFLAGS}' LDFLAGS='${LDFLAGS}'" 18EXTRA_OEMAKE = "NO_PYTHON=1 CFLAGS='${CFLAGS}' LDFLAGS='${LDFLAGS}'"
19EXTRA_OEMAKE_append_class-native = " NO_CROSS_DIRECTORY_HARDLINKS=1" 19EXTRA_OEMAKE_append_class-native = " NO_CROSS_DIRECTORY_HARDLINKS=1"
20 20
21do_compile_prepend () { 21do_compile_prepend () {
@@ -41,11 +41,23 @@ PERLSEDFIXUP = " \
41 ${@d.getVar("PERLTOOLS", True).replace(' /',d.getVar('D', True) + '/')} \ 41 ${@d.getVar("PERLTOOLS", True).replace(' /',d.getVar('D', True) + '/')} \
42" 42"
43 43
44REL_GIT_EXEC_PATH = "${@os.path.relpath(libexecdir, bindir)}/git-core"
45REL_GIT_TEMPLATE_DIR = "${@os.path.relpath(datadir, bindir)}/git-core/templates"
46
44do_install_append_class-target () { 47do_install_append_class-target () {
45 ${PERLSEDFIXUP} 48 ${PERLSEDFIXUP}
46} 49}
47 50
48do_install_append_class-nativesdk () { 51do_install_append_class-native() {
52 create_wrapper ${D}${bindir}/git \
53 GIT_EXEC_PATH='`dirname $''realpath`'/${REL_GIT_EXEC_PATH} \
54 GIT_TEMPLATE_DIR='`dirname $''realpath`'/${REL_GIT_TEMPLATE_DIR}
55}
56
57do_install_append_class-nativesdk() {
58 create_wrapper ${D}${bindir}/git \
59 GIT_EXEC_PATH='`dirname $''realpath`'/${REL_GIT_EXEC_PATH} \
60 GIT_TEMPLATE_DIR='`dirname $''realpath`'/${REL_GIT_TEMPLATE_DIR}
49 ${PERLSEDFIXUP} 61 ${PERLSEDFIXUP}
50} 62}
51 63