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.

(From OE-Core rev: 416a8c241aff0dca6b8b123e52cf8e2d40c74c8d)

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

3 files changed, 13 insertions, 21 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"
diff --git a/meta/recipes-devtools/git/git_2.16.1.bb b/meta/recipes-devtools/git/git_2.16.1.bb
deleted file mode 100644
index 9dc4eba88c..0000000000
--- a/meta/recipes-devtools/git/git_2.16.1.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-require git.inc
-
-EXTRA_OECONF += "ac_cv_snprintf_returns_bogus=no \
-                 ac_cv_fread_reads_directories=${ac_cv_fread_reads_directories=yes} \
-                 "
-EXTRA_OEMAKE += "NO_GETTEXT=1"
-
-SRC_URI[tarball.md5sum] = "37467da8e79e72f28598d667f219f75e"
-SRC_URI[tarball.sha256sum] = "56cfa48af2b289bba172ca0a47c29f0083f5846cf4759978b70988e4f07fc9fd"
-SRC_URI[manpages.md5sum] = "5587407f3c28446af12fde3f3131ba34"
-SRC_URI[manpages.sha256sum] = "d499e825f429d76862be415f579c20cc26b046573a3a39237acaf9682cb71be7"
diff --git a/meta/recipes-devtools/git/git_2.18.0.bb b/meta/recipes-devtools/git/git_2.18.0.bb
new file mode 100644
index 0000000000..72b43a7d51
--- /dev/null
+++ b/meta/recipes-devtools/git/git_2.18.0.bb
@@ -0,0 +1,11 @@
+require git.inc
+
+EXTRA_OECONF += "ac_cv_snprintf_returns_bogus=no \
+                 ac_cv_fread_reads_directories=${ac_cv_fread_reads_directories=yes} \
+                 "
+EXTRA_OEMAKE += "NO_GETTEXT=1"
+
+SRC_URI[tarball.md5sum] = "3f210b2dd1613d90ded3b8732b052025"
+SRC_URI[tarball.sha256sum] = "94faf2c0b02a7920b0b46f4961d8e9cad08e81418614102898a55f980fa3e7e4"
+SRC_URI[manpages.md5sum] = "8251512320568a049192a8219c51e905"
+SRC_URI[manpages.sha256sum] = "6cf38ab3ad43ccdcd6a73ffdcf2a016d56ab6b4b240a574b0bb96f520a04ff55"