[OE-core] [PATCH] git: use DESTDIR=$D instead prefixing all variables by $D

[Saul Wold]

On 04/29/2011 03:13 AM, Koen Kooi wrote:
> From: Martin Jansa<martin.jansa at gmail.com>
>
> * 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 (that's why this
>    is just RFC)
>
Is this still just an RFC or has it been tested on the target?

Sau!


> Signed-off-by: Martin Jansa<Martin.Jansa at gmail.com>
> Signed-off-by: Koen Kooi<koen at dominion.thruhere.net>
> ---
>   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(-)
>
> diff --git a/meta/recipes-devtools/git/git.inc b/meta/recipes-devtools/git/git.inc
> index e1d1c71..843a1d3 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 603d2fd..2ff1ed5 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} \