summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2018-07-04 10:47:40 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-07-05 11:39:06 +0100
commit5fef9fcd58e88f296606ae6780904345014e4d29 (patch)
treed8e3d1a1fdf8eae3588fafdce75308b3efd1fb05 /meta
parent27e886edbefd391b8a9dacd18264e28a5c2d9d2c (diff)
downloadpoky-5fef9fcd58e88f296606ae6780904345014e4d29.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. (From OE-Core rev: 416a8c241aff0dca6b8b123e52cf8e2d40c74c8d) Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-devtools/git/git.inc12
-rw-r--r--meta/recipes-devtools/git/git_2.16.1.bb11
-rw-r--r--meta/recipes-devtools/git/git_2.18.0.bb11
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 () {
52 -e 's#${libdir}/perl-native/#${libdir}/#' \ 52 -e 's#${libdir}/perl-native/#${libdir}/#' \
53 ${@d.getVar("PERLTOOLS").replace(' /',d.getVar('D') + '/')} 53 ${@d.getVar("PERLTOOLS").replace(' /',d.getVar('D') + '/')}
54 54
55 # ${libdir} is not applicable here, perl-native files are always
56 # installed to /usr/lib on both 32/64 bits targets.
57
58 mkdir -p ${D}${libdir}
59 mv ${D}${exec_prefix}/lib/perl-native/perl ${D}${libdir}
60 rmdir -p ${D}${exec_prefix}/lib/perl-native || true
61
62 if [ ! "${@bb.utils.filter('PACKAGECONFIG', 'cvsserver', d)}" ]; then 55 if [ ! "${@bb.utils.filter('PACKAGECONFIG', 'cvsserver', d)}" ]; then
63 # Only install the git cvsserver command if explicitly requested 56 # Only install the git cvsserver command if explicitly requested
64 # as it requires the DBI Perl module, which does not exist in 57 # as it requires the DBI Perl module, which does not exist in
@@ -72,8 +65,7 @@ perl_native_fixup () {
72 # if explicitly requested as they require the SVN::Core Perl 65 # if explicitly requested as they require the SVN::Core Perl
73 # module, which does not exist in OE-Core. 66 # module, which does not exist in OE-Core.
74 rm -r ${D}${libexecdir}/git-core/git-svn \ 67 rm -r ${D}${libexecdir}/git-core/git-svn \
75 ${D}${libdir}/perl/site_perl/*/Git/SVN* 68 ${D}${datadir}/perl5/Git/SVN*
76 sed -i -e '/SVN/d' ${D}${libdir}/perl/site_perl/*/auto/Git/.packlist
77 fi 69 fi
78} 70}
79 71
@@ -124,7 +116,7 @@ PACKAGES =+ "${PN}-perltools"
124FILES_${PN}-perltools += " \ 116FILES_${PN}-perltools += " \
125 ${PERLTOOLS} \ 117 ${PERLTOOLS} \
126 ${libdir}/perl \ 118 ${libdir}/perl \
127 ${datadir}/perl \ 119 ${datadir}/perl5 \
128" 120"
129 121
130RDEPENDS_${PN}-perltools = "${PN} perl perl-module-file-path findutils" 122RDEPENDS_${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 @@
1require git.inc
2
3EXTRA_OECONF += "ac_cv_snprintf_returns_bogus=no \
4 ac_cv_fread_reads_directories=${ac_cv_fread_reads_directories=yes} \
5 "
6EXTRA_OEMAKE += "NO_GETTEXT=1"
7
8SRC_URI[tarball.md5sum] = "37467da8e79e72f28598d667f219f75e"
9SRC_URI[tarball.sha256sum] = "56cfa48af2b289bba172ca0a47c29f0083f5846cf4759978b70988e4f07fc9fd"
10SRC_URI[manpages.md5sum] = "5587407f3c28446af12fde3f3131ba34"
11SRC_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 @@
1require git.inc
2
3EXTRA_OECONF += "ac_cv_snprintf_returns_bogus=no \
4 ac_cv_fread_reads_directories=${ac_cv_fread_reads_directories=yes} \
5 "
6EXTRA_OEMAKE += "NO_GETTEXT=1"
7
8SRC_URI[tarball.md5sum] = "3f210b2dd1613d90ded3b8732b052025"
9SRC_URI[tarball.sha256sum] = "94faf2c0b02a7920b0b46f4961d8e9cad08e81418614102898a55f980fa3e7e4"
10SRC_URI[manpages.md5sum] = "8251512320568a049192a8219c51e905"
11SRC_URI[manpages.sha256sum] = "6cf38ab3ad43ccdcd6a73ffdcf2a016d56ab6b4b240a574b0bb96f520a04ff55"