diff options
Diffstat (limited to 'poky/meta/recipes-devtools/git/git.inc')
| -rw-r--r-- | poky/meta/recipes-devtools/git/git.inc | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/poky/meta/recipes-devtools/git/git.inc b/poky/meta/recipes-devtools/git/git.inc index 8603c045c..26a22ac1e 100644 --- a/poky/meta/recipes-devtools/git/git.inc +++ b/poky/meta/recipes-devtools/git/git.inc @@ -7,9 +7,7 @@ DEPENDS = "openssl curl zlib expat" PROVIDES_append_class-native = " git-replacement-native" SRC_URI = "${KERNELORG_MIRROR}/software/scm/git/git-${PV}.tar.gz;name=tarball \ - ${KERNELORG_MIRROR}/software/scm/git/git-manpages-${PV}.tar.gz;name=manpages \ - file://CVE-2018-11235.patch \ - file://CVE-2018-11233.patch" + ${KERNELORG_MIRROR}/software/scm/git/git-manpages-${PV}.tar.gz;name=manpages" S = "${WORKDIR}/git-${PV}" @@ -54,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 @@ -74,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 } @@ -126,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" |
