summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2013-12-30 18:02:30 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-01-02 12:56:28 +0000
commit19fc2ed0ce855ca00772657121f1f496dfdfe62d (patch)
treec71b0bf83abb0493bb39b685cc58c99f35fdfcec
parent52b9309b7ac9fe468f5f4f322accd76f11e563a5 (diff)
downloadpoky-19fc2ed0ce855ca00772657121f1f496dfdfe62d.tar.gz
git: upgrade to 1.8.5.2
* Upgrade to 1.8.5.2 * Remove the SRC_URI from the git.inc since we use the one in git_1.8.5.2.bb (From OE-Core rev: 89e721830f2b2840d62e613c4bc89eca1fffd03a) Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/git/git.inc1
-rw-r--r--meta/recipes-devtools/git/git_1.8.5.2.bb (renamed from meta/recipes-devtools/git/git_1.8.4.4.bb)5
2 files changed, 3 insertions, 3 deletions
diff --git a/meta/recipes-devtools/git/git.inc b/meta/recipes-devtools/git/git.inc
index 024bd9cc60..a0da027e42 100644
--- a/meta/recipes-devtools/git/git.inc
+++ b/meta/recipes-devtools/git/git.inc
@@ -5,7 +5,6 @@ DEPENDS = "openssl curl zlib expat"
5 5
6PROVIDES_append_class-native = " git-replacement-native" 6PROVIDES_append_class-native = " git-replacement-native"
7 7
8SRC_URI = "${KERNELORG_MIRROR}/software/scm/git/git-${PV}.tar.bz2 "
9S = "${WORKDIR}/git-${PV}" 8S = "${WORKDIR}/git-${PV}"
10 9
11LIC_FILES_CHKSUM = "file://COPYING;md5=7c0d7ef03a7eb04ce795b0f60e68e7e1" 10LIC_FILES_CHKSUM = "file://COPYING;md5=7c0d7ef03a7eb04ce795b0f60e68e7e1"
diff --git a/meta/recipes-devtools/git/git_1.8.4.4.bb b/meta/recipes-devtools/git/git_1.8.5.2.bb
index cdcd894eaf..4777c46039 100644
--- a/meta/recipes-devtools/git/git_1.8.4.4.bb
+++ b/meta/recipes-devtools/git/git_1.8.5.2.bb
@@ -1,8 +1,9 @@
1require git.inc 1require git.inc
2 2
3SRC_URI = "http://git-core.googlecode.com/files/git-${PV}.tar.gz" 3SRC_URI = "http://git-core.googlecode.com/files/git-${PV}.tar.gz"
4SRC_URI[md5sum] = "c07ea15d5d0c31544de265f567d6e5ef" 4
5SRC_URI[sha256sum] = "44392f5bfcb17aa943338469ddafd94a9091f8b33eb5d3a2abb60f2bb61d1a73" 5SRC_URI[md5sum] = "df8519044f9880f3687d863d99245282"
6SRC_URI[sha256sum] = "024694524b8be91fe29afca65bc3a9e40de1322dd5ef2b2c0babb6849c913e8a"
6 7
7EXTRA_OECONF += "ac_cv_snprintf_returns_bogus=no ac_cv_c_c99_format=yes \ 8EXTRA_OECONF += "ac_cv_snprintf_returns_bogus=no ac_cv_c_c99_format=yes \
8 ac_cv_fread_reads_directories=${ac_cv_fread_reads_directories=yes} \ 9 ac_cv_fread_reads_directories=${ac_cv_fread_reads_directories=yes} \