[PATCH 0/1] git: fix do_install error

[PATCH 0/1] git: fix do_install error

[Robert Yang]

The following changes since commit 8e3e36bcafcb7a97006f8cc49e51c3a5b8e51a65:

  build-appliance-image: Update to dizzy head revision (2014-10-02 00:43:03 +0100)

are available in the git repository at:

  git://git.openembedded.org/openembedded-core-contrib rbt/git
  http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=rbt/git

Robert Yang (1):
  git: fix do_install error

 meta/recipes-devtools/git/git.inc |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

-- 
1.7.9.5

[PATCH 1/1] git: fix do_install error

[Robert Yang]

Fixed when MACHINE = qemux86-64 and libdir = /usr/lib64:
mv: cannot stat `/path/to/image/usr/lib64/perl-native/perl': No such file or directory

The perl-native files are always installed to /usr/lib on both 32/64
bits targets.

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 meta/recipes-devtools/git/git.inc |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-devtools/git/git.inc b/meta/recipes-devtools/git/git.inc
index 2515833..5396628 100644
--- a/meta/recipes-devtools/git/git.inc
+++ b/meta/recipes-devtools/git/git.inc
@@ -36,8 +36,11 @@ perl_native_fixup () {
 	sed -i -e 's#${STAGING_BINDIR_NATIVE}/perl-native/#${bindir}/#' \
 	       -e 's#${libdir}/perl-native/#${libdir}/#' \
 	    ${@d.getVar("PERLTOOLS", True).replace(' /',d.getVar('D', True) + '/')}
-	mv ${D}${libdir}/perl-native/perl ${D}${libdir}
-	rmdir ${D}${libdir}/perl-native || true
+
+	# ${libdir} is not applicable here, perl-native files are always
+	# installed to /usr/lib on both 32/64 bits targets.
+	mv ${D}${exec_prefix}/lib/perl-native/perl ${D}${libdir}
+	rmdir -p ${D}${exec_prefix}/lib/perl-native || true
 }
 
 REL_GIT_EXEC_PATH = "${@os.path.relpath(libexecdir, bindir)}/git-core"
-- 
1.7.9.5

Re: [PATCH 1/1] git: fix do_install error

[Saul Wold]

On 10/08/2014 01:04 AM, Robert Yang wrote:
> Fixed when MACHINE = qemux86-64 and libdir = /usr/lib64:
> mv: cannot stat `/path/to/image/usr/lib64/perl-native/perl': No such file or directory
>
> The perl-native files are always installed to /usr/lib on both 32/64
> bits targets.
>
> Signed-off-by: Robert Yang <liezhi.yang@windriver.com>

Tested-by: Saul Wold <sgw@linux.intel.com>

Richard,

This should get into rc4 if possible, I am surprised we did not see a 
failure on the autobuilder.

Sau!

> ---
>   meta/recipes-devtools/git/git.inc |    7 +++++--
>   1 file changed, 5 insertions(+), 2 deletions(-)
>
> diff --git a/meta/recipes-devtools/git/git.inc b/meta/recipes-devtools/git/git.inc
> index 2515833..5396628 100644
> --- a/meta/recipes-devtools/git/git.inc
> +++ b/meta/recipes-devtools/git/git.inc
> @@ -36,8 +36,11 @@ perl_native_fixup () {
>   	sed -i -e 's#${STAGING_BINDIR_NATIVE}/perl-native/#${bindir}/#' \
>   	       -e 's#${libdir}/perl-native/#${libdir}/#' \
>   	    ${@d.getVar("PERLTOOLS", True).replace(' /',d.getVar('D', True) + '/')}
> -	mv ${D}${libdir}/perl-native/perl ${D}${libdir}
> -	rmdir ${D}${libdir}/perl-native || true
> +
> +	# ${libdir} is not applicable here, perl-native files are always
> +	# installed to /usr/lib on both 32/64 bits targets.
> +	mv ${D}${exec_prefix}/lib/perl-native/perl ${D}${libdir}
> +	rmdir -p ${D}${exec_prefix}/lib/perl-native || true
>   }
>
>   REL_GIT_EXEC_PATH = "${@os.path.relpath(libexecdir, bindir)}/git-core"
>

Re: [PATCH 1/1] git: fix do_install error

[Peter A. Bigot]

On 10/08/2014 03:04 AM, Robert Yang wrote:
> Fixed when MACHINE = qemux86-64 and libdir = /usr/lib64:
> mv: cannot stat `/path/to/image/usr/lib64/perl-native/perl': No such file or directory
>
> The perl-native files are always installed to /usr/lib on both 32/64
> bits targets.
>
> Signed-off-by: Robert Yang <liezhi.yang@windriver.com>

Acked-by: Peter A. Bigot <pab@pabigot.com>

> ---
>   meta/recipes-devtools/git/git.inc |    7 +++++--
>   1 file changed, 5 insertions(+), 2 deletions(-)
>
> diff --git a/meta/recipes-devtools/git/git.inc b/meta/recipes-devtools/git/git.inc
> index 2515833..5396628 100644
> --- a/meta/recipes-devtools/git/git.inc
> +++ b/meta/recipes-devtools/git/git.inc
> @@ -36,8 +36,11 @@ perl_native_fixup () {
>   	sed -i -e 's#${STAGING_BINDIR_NATIVE}/perl-native/#${bindir}/#' \
>   	       -e 's#${libdir}/perl-native/#${libdir}/#' \
>   	    ${@d.getVar("PERLTOOLS", True).replace(' /',d.getVar('D', True) + '/')}
> -	mv ${D}${libdir}/perl-native/perl ${D}${libdir}
> -	rmdir ${D}${libdir}/perl-native || true
> +
> +	# ${libdir} is not applicable here, perl-native files are always
> +	# installed to /usr/lib on both 32/64 bits targets.
> +	mv ${D}${exec_prefix}/lib/perl-native/perl ${D}${libdir}
> +	rmdir -p ${D}${exec_prefix}/lib/perl-native || true
>   }
>   
>   REL_GIT_EXEC_PATH = "${@os.path.relpath(libexecdir, bindir)}/git-core"