summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2014-03-26 22:29:20 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-03-27 09:42:07 +0000
commit3ae9225905093f5819cad5c95380be7c2f44b128 (patch)
treea275d19db880ca5050b214acd7eb1672074d83ee /meta/recipes-devtools
parentdc29d2abd233bc00983dad1b233e1651b1fbfaae (diff)
downloadpoky-3ae9225905093f5819cad5c95380be7c2f44b128.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] (From OE-Core rev: fd4a6b0cd275931e552cd23233c178e9ec54bdbb) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r--meta/recipes-devtools/git/git.inc31
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 () {
34 rmdir ${D}${exec_prefix}/lib || true 34 rmdir ${D}${exec_prefix}/lib || true
35} 35}
36 36
37PERLSEDFIXUP = " \
38 sed -i -e 's#${STAGING_BINDIR_NATIVE}/perl-native/#${bindir}/#' \
39 -e 's#${libdir}/perl-native/#${libdir}/#' \
40 ${@d.getVar("PERLTOOLS", True).replace(' /',d.getVar('D', True) + '/')} \
41"
42
43do_install_append_class-target () {
44 ${PERLSEDFIXUP}
45}
46
47do_install_append_class-nativesdk () {
48 ${PERLSEDFIXUP}
49}
50
37FILES_${PN} += "${datadir}/git-core ${libxecdir}/git-core/" 51FILES_${PN} += "${datadir}/git-core ${libxecdir}/git-core/"
38FILES_${PN}-dbg += "${libexecdir}/git-core/.debug" 52FILES_${PN}-dbg += "${libexecdir}/git-core/.debug"
39 53
40# Git tools requiring perl 54PERLTOOLS = " \
41PACKAGES =+ "${PN}-perltools"
42FILES_${PN}-perltools += " \
43 ${libexecdir}/git-core/git-add--interactive \ 55 ${libexecdir}/git-core/git-add--interactive \
44 ${libexecdir}/git-core/git-archimport \ 56 ${libexecdir}/git-core/git-archimport \
45 ${libexecdir}/git-core/git-cvsexportcommit \ 57 ${libexecdir}/git-core/git-cvsexportcommit \
@@ -50,6 +62,19 @@ FILES_${PN}-perltools += " \
50 ${libexecdir}/git-core/git-relink \ 62 ${libexecdir}/git-core/git-relink \
51 ${libexecdir}/git-core/git-send-email \ 63 ${libexecdir}/git-core/git-send-email \
52 ${libexecdir}/git-core/git-svn \ 64 ${libexecdir}/git-core/git-svn \
65 ${libexecdir}/git-core/git-instaweb \
66 ${libexecdir}/git-core/git-submodule \
67 ${libexecdir}/git-core/git-am \
68 ${libexecdir}/git-core/git-request-pull \
69 ${datadir}/gitweb/gitweb.cgi \
70 ${datadir}/git-core/templates/hooks/prepare-commit-msg.sample \
71 ${datadir}/git-core/templates/hooks/pre-rebase.sample \
72"
73
74# Git tools requiring perl
75PACKAGES =+ "${PN}-perltools"
76FILES_${PN}-perltools += " \
77 ${PERLTOOLS} \
53 ${datadir}/perl \ 78 ${datadir}/perl \
54" 79"
55RDEPENDS_${PN}-perltools = "${PN} perl perl-module-file-path findutils" 80RDEPENDS_${PN}-perltools = "${PN} perl perl-module-file-path findutils"