diff options
| author |   Robert Yang <liezhi.yang@windriver.com> | 2018-07-04 10:47:40 +0800 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-07-05 11:28:30 +0100 |
| commit | 416a8c241aff0dca6b8b123e52cf8e2d40c74c8d (patch) | |
| tree | 620a0472ee8e3fc6e2f11ce86da59b1025b40bbd /meta/recipes-devtools/git/git.inc | |
| parent | 8c00b32211f25e38c1601ec8de47e6d4729dd49e (diff) | |
| download | openembedded-core-contrib-416a8c241aff0dca6b8b123e52cf8e2d40c74c8d.tar.gz | |
git: 2.16.1 -> 2.18.0
* Removed code for "${D}${exec_prefix}/lib/perl-native/perl" since there is no
such a directory now.
* Fixed perl related code.
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/git/git.inc')
| -rw-r--r-- | meta/recipes-devtools/git/git.inc | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/meta/recipes-devtools/git/git.inc b/meta/recipes-devtools/git/git.inc index dd9d792c5c..26a22ac1e8 100644 --- a/meta/recipes-devtools/git/git.inc +++ b/meta/recipes-devtools/git/git.inc @@ -52,13 +52,6 @@ perl_native_fixup () { -e 's#${libdir}/perl-native/#${libdir}/#' \ ${@d.getVar("PERLTOOLS").replace(' /',d.getVar('D') + '/')} - # ${libdir} is not applicable here, perl-native files are always - # installed to /usr/lib on both 32/64 bits targets. - - mkdir -p ${D}${libdir} - mv ${D}${exec_prefix}/lib/perl-native/perl ${D}${libdir} - rmdir -p ${D}${exec_prefix}/lib/perl-native || true - if [ ! "${@bb.utils.filter('PACKAGECONFIG', 'cvsserver', d)}" ]; then # Only install the git cvsserver command if explicitly requested # as it requires the DBI Perl module, which does not exist in @@ -72,8 +65,7 @@ perl_native_fixup () { # if explicitly requested as they require the SVN::Core Perl # module, which does not exist in OE-Core. rm -r ${D}${libexecdir}/git-core/git-svn \ - ${D}${libdir}/perl/site_perl/*/Git/SVN* - sed -i -e '/SVN/d' ${D}${libdir}/perl/site_perl/*/auto/Git/.packlist + ${D}${datadir}/perl5/Git/SVN* fi } @@ -124,7 +116,7 @@ PACKAGES =+ "${PN}-perltools" FILES_${PN}-perltools += " \ ${PERLTOOLS} \ ${libdir}/perl \ - ${datadir}/perl \ + ${datadir}/perl5 \ " RDEPENDS_${PN}-perltools = "${PN} perl perl-module-file-path findutils" |