diff options
| author | Christopher Larson <kergoth@gmail.com> | 2014-06-13 17:46:41 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-06-14 08:43:40 +0100 |
| commit | 85ce11e7b5402cc443adb8007c0e5d01f914fa74 (patch) | |
| tree | e5b04e4a9738baf8e8f7785f7306a755aa790cec | |
| parent | b44e291a87539fbb8e6da1a16c56f425a417e7bd (diff) | |
| download | openembedded-core-85ce11e7b5402cc443adb8007c0e5d01f914fa74.tar.gz openembedded-core-85ce11e7b5402cc443adb8007c0e5d01f914fa74.tar.bz2 openembedded-core-85ce11e7b5402cc443adb8007c0e5d01f914fa74.zip | |
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]
Signed-off-by: Christopher Larson <kergoth@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-devtools/git/git.inc | 16 |
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 \ inherit autotools-brokensep perlnative -EXTRA_OEMAKE = "NO_PYTHON=1 RUNTIME_PREFIX=1 CFLAGS='${CFLAGS}' LDFLAGS='${LDFLAGS}'" +EXTRA_OEMAKE = "NO_PYTHON=1 CFLAGS='${CFLAGS}' LDFLAGS='${LDFLAGS}'" EXTRA_OEMAKE_append_class-native = " NO_CROSS_DIRECTORY_HARDLINKS=1" do_compile_prepend () { @@ -41,11 +41,23 @@ PERLSEDFIXUP = " \ ${@d.getVar("PERLTOOLS", True).replace(' /',d.getVar('D', True) + '/')} \ " +REL_GIT_EXEC_PATH = "${@os.path.relpath(libexecdir, bindir)}/git-core" +REL_GIT_TEMPLATE_DIR = "${@os.path.relpath(datadir, bindir)}/git-core/templates" + do_install_append_class-target () { ${PERLSEDFIXUP} } -do_install_append_class-nativesdk () { +do_install_append_class-native() { + create_wrapper ${D}${bindir}/git \ + GIT_EXEC_PATH='`dirname $''realpath`'/${REL_GIT_EXEC_PATH} \ + GIT_TEMPLATE_DIR='`dirname $''realpath`'/${REL_GIT_TEMPLATE_DIR} +} + +do_install_append_class-nativesdk() { + create_wrapper ${D}${bindir}/git \ + GIT_EXEC_PATH='`dirname $''realpath`'/${REL_GIT_EXEC_PATH} \ + GIT_TEMPLATE_DIR='`dirname $''realpath`'/${REL_GIT_TEMPLATE_DIR} ${PERLSEDFIXUP} } |