git: fix do_install error

PATCH In review Robert Yang 3 participants 4 messages Oct 8, 2014 – Oct 9, 2014

lore

Share & tools

lore

Robert Yang

author

2014-10-08 08:04 UTC #0 lore raw

cover git: fix do_install error

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(-)

Signature · 1 line

1.7.9.5

Robert Yang

author

2014-10-08 08:04 UTC #1 lore raw

PATCH 1/1 git: fix do_install error

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 <[email protected]>

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

meta/recipes-devtools/git/git.inc +5 -2

index 2515833..5396628 100644
@@ -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"

Signature · 1 line

1.7.9.5

Saul Wold

Tested-by on v1 1/1

2014-10-08 23:11 UTC #2 lore raw

Quoted 7 lines · 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 <[email protected]>

Tested-by Saul Wold <[email protected]>

Richard,

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

Sau!

Quoted 23 lines

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

meta/recipes-devtools/git/git.inc +5 -2

index 2515833..5396628 100644
@@ -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"

Peter A. Bigot

Acked-by on v1 1/1

2014-10-09 00:03 UTC #3 lore raw

In reply to Robert Yang

Quoted 7 lines · 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 <[email protected]>

Acked-by Peter A. Bigot <[email protected]>

Quoted 22 lines

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

meta/recipes-devtools/git/git.inc +5 -2

index 2515833..5396628 100644
@@ -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"