diff options
author | Martin Jansa <martin.jansa@gmail.com> | 2011-04-29 12:13:46 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-05-04 00:54:46 +0100 |
commit | 5ce6cc445a4e28b9afbc4d2b4697792294bcdf66 (patch) | |
tree | a1c98e05614aad4dc223030b7e3dada03fac8ae8 /meta/recipes-devtools | |
parent | 6add850c2f258083ac69ca175bc4431b2ae834c3 (diff) | |
download | poky-5ce6cc445a4e28b9afbc4d2b4697792294bcdf66.tar.gz |
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 <Martin.Jansa@gmail.com>
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r-- | meta/recipes-devtools/git/git.inc | 4 | ||||
-rw-r--r-- | meta/recipes-devtools/git/git_1.7.4.3.bb | 2 |
2 files changed, 3 insertions, 3 deletions
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" | |||
14 | inherit autotools | 14 | inherit autotools |
15 | 15 | ||
16 | do_install () { | 16 | do_install () { |
17 | oe_runmake install prefix=${D} bindir=${D}${bindir} gitexecdir=${D}${gitexecdir} \ | 17 | oe_runmake install DESTDIR="${D}" bindir=${bindir} gitexecdir=${gitexecdir} \ |
18 | template_dir=${D}${datadir}/git-core/templates \ | 18 | template_dir=${datadir}/git-core/templates \ |
19 | GIT_PYTHON_DIR=${D}${datadir}/git-core/python | 19 | GIT_PYTHON_DIR=${D}${datadir}/git-core/python |
20 | } | 20 | } |
21 | 21 | ||
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 @@ | |||
1 | require git.inc | 1 | require git.inc |
2 | 2 | ||
3 | PR = "r0" | 3 | PR = "r1" |
4 | 4 | ||
5 | EXTRA_OECONF += "ac_cv_snprintf_returns_bogus=no ac_cv_c_c99_format=yes \ | 5 | EXTRA_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} \ |