diff options
| author |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-03-26 22:29:20 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-03-27 09:40:35 +0000 |
| commit | fd4a6b0cd275931e552cd23233c178e9ec54bdbb (patch) | |
| tree | a0318f94e772ad7e02d25a45e386879b39a744de /meta/recipes-devtools | |
| parent | ff919ed132b543f70e9635be7a31f799aafcf8d6 (diff) | |
| download | openembedded-core-contrib-fd4a6b0cd275931e552cd23233c178e9ec54bdbb.tar.gz | |
git: Fix perl paths in scripts and population of the perltools package
References to "perl-native" were slipping into the target packages. These
changes ensure those references are cleaned up and that tools using perl
are packaged in the correct perltools package. The same issues affected
the nativesdk-git output so are also applied there.
[YOCTO #5918]
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools')
| -rw-r--r-- | meta/recipes-devtools/git/git.inc | 31 |
1 files changed, 28 insertions, 3 deletions
diff --git a/meta/recipes-devtools/git/git.inc b/meta/recipes-devtools/git/git.inc index 5d02343e4b..f5013f1410 100644 --- a/meta/recipes-devtools/git/git.inc +++ b/meta/recipes-devtools/git/git.inc @@ -34,12 +34,24 @@ do_install () { rmdir ${D}${exec_prefix}/lib || true } +PERLSEDFIXUP = " \ + 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) + '/')} \ +" + +do_install_append_class-target () { + ${PERLSEDFIXUP} +} + +do_install_append_class-nativesdk () { + ${PERLSEDFIXUP} +} + FILES_${PN} += "${datadir}/git-core ${libxecdir}/git-core/" FILES_${PN}-dbg += "${libexecdir}/git-core/.debug" -# Git tools requiring perl -PACKAGES =+ "${PN}-perltools" -FILES_${PN}-perltools += " \ +PERLTOOLS = " \ ${libexecdir}/git-core/git-add--interactive \ ${libexecdir}/git-core/git-archimport \ ${libexecdir}/git-core/git-cvsexportcommit \ @@ -50,6 +62,19 @@ FILES_${PN}-perltools += " \ ${libexecdir}/git-core/git-relink \ ${libexecdir}/git-core/git-send-email \ ${libexecdir}/git-core/git-svn \ + ${libexecdir}/git-core/git-instaweb \ + ${libexecdir}/git-core/git-submodule \ + ${libexecdir}/git-core/git-am \ + ${libexecdir}/git-core/git-request-pull \ + ${datadir}/gitweb/gitweb.cgi \ + ${datadir}/git-core/templates/hooks/prepare-commit-msg.sample \ + ${datadir}/git-core/templates/hooks/pre-rebase.sample \ +" + +# Git tools requiring perl +PACKAGES =+ "${PN}-perltools" +FILES_${PN}-perltools += " \ + ${PERLTOOLS} \ ${datadir}/perl \ " RDEPENDS_${PN}-perltools = "${PN} perl perl-module-file-path findutils" |