From 5ce6cc445a4e28b9afbc4d2b4697792294bcdf66 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Fri, 29 Apr 2011 12:13:46 +0200 Subject: git: use DESTDIR=$D instead prefixing all variables by $D * with git-native and rm_work enabled I've noticed git fetcher errors like: warning: templates not found /OE/shr-core/tmp/work/x86_64-linux/git-native-1.7.3.4-r0/image/OE/shr-core/tmp/sysroots/x86_64-linux/usr/share/git-core/templates fatal: Unable to find remote helper for 'http' for every recipe using http:// for git repo * after this change template_dir points to /OE/shr-core/tmp/sysroots/x86_64-linux/usr/share/git-core/templates without that workdir prefix * haven't tested target recipe, but I guess it needs different fix or maybe it worked before and gets broken by this change [sgw: removed RFC comment, target patch to follow] (From OE-Core rev: 4b2a6fa780567c0876540bb89af78d5c778985cb) Signed-off-by: Martin Jansa Signed-off-by: Koen Kooi Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- meta/recipes-devtools/git/git.inc | 4 ++-- meta/recipes-devtools/git/git_1.7.4.3.bb | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'meta/recipes-devtools/git') diff --git a/meta/recipes-devtools/git/git.inc b/meta/recipes-devtools/git/git.inc index e1d1c71c48..843a1d3511 100644 --- a/meta/recipes-devtools/git/git.inc +++ b/meta/recipes-devtools/git/git.inc @@ -14,8 +14,8 @@ EXTRA_OECONF = "--with-perl=${STAGING_BINDIR_NATIVE}/perl --without-tcltk" inherit autotools do_install () { - oe_runmake install prefix=${D} bindir=${D}${bindir} gitexecdir=${D}${gitexecdir} \ - template_dir=${D}${datadir}/git-core/templates \ + oe_runmake install DESTDIR="${D}" bindir=${bindir} gitexecdir=${gitexecdir} \ + template_dir=${datadir}/git-core/templates \ GIT_PYTHON_DIR=${D}${datadir}/git-core/python } diff --git a/meta/recipes-devtools/git/git_1.7.4.3.bb b/meta/recipes-devtools/git/git_1.7.4.3.bb index 603d2fdec0..2ff1ed512e 100644 --- a/meta/recipes-devtools/git/git_1.7.4.3.bb +++ b/meta/recipes-devtools/git/git_1.7.4.3.bb @@ -1,6 +1,6 @@ require git.inc -PR = "r0" +PR = "r1" 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