summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNitin A Kamble <nitin.a.kamble@intel.com>2011-05-23 15:41:33 -0700
committerSaul Wold <sgw@linux.intel.com>2011-05-23 23:40:13 -0700
commit07c4246e107af50d6a9333445259b083f98ebdc0 (patch)
tree05cf07541848e4f7e2d01aa2cb9b03578257d146
parent861c288e353e917374de938c4e5e927e116cd56c (diff)
downloadopenembedded-core-07c4246e107af50d6a9333445259b083f98ebdc0.tar.gz
openembedded-core-07c4246e107af50d6a9333445259b083f98ebdc0.tar.bz2
openembedded-core-07c4246e107af50d6a9333445259b083f98ebdc0.tar.xz
openembedded-core-07c4246e107af50d6a9333445259b083f98ebdc0.zip
git: upgrade from 1.7.4.3 to 1.7.5.1
the autotools patch is not needed anymore. The code which the patch was patching is removed, and there is no use of the patch now. Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
-rw-r--r--meta/recipes-devtools/git/files/autotools.patch16
-rw-r--r--meta/recipes-devtools/git/git.inc3
-rw-r--r--meta/recipes-devtools/git/git_1.7.5.1.bb (renamed from meta/recipes-devtools/git/git_1.7.4.3.bb)6
3 files changed, 4 insertions, 21 deletions
diff --git a/meta/recipes-devtools/git/files/autotools.patch b/meta/recipes-devtools/git/files/autotools.patch
deleted file mode 100644
index cb21193f3..000000000
--- a/meta/recipes-devtools/git/files/autotools.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Upstream-Status:Inappropriate [configuration]
-
-Index: git-1.7.2.1/configure.ac
-===================================================================
---- git-1.7.2.1.orig/configure.ac 2010-07-28 18:03:43.000000000 +0100
-+++ git-1.7.2.1/configure.ac 2010-08-13 14:54:29.181971250 +0100
-@@ -697,7 +697,8 @@
- else if (strcmp(buf, "12345"))
- return 2;]])],
- [ac_cv_c_c99_format=yes],
-- [ac_cv_c_c99_format=no])
-+ [ac_cv_c_c99_format=no],
-+ [ac_cv_c_c99_format=yes])
- ])
- if test $ac_cv_c_c99_format = no; then
- NO_C99_FORMAT=YesPlease
diff --git a/meta/recipes-devtools/git/git.inc b/meta/recipes-devtools/git/git.inc
index 49292fad1..c884f9ccc 100644
--- a/meta/recipes-devtools/git/git.inc
+++ b/meta/recipes-devtools/git/git.inc
@@ -3,8 +3,7 @@ SECTION = "console/utils"
LICENSE = "GPLv2"
DEPENDS = "perl-native openssl curl zlib expat"
-SRC_URI = "${KERNELORG_MIRROR}/software/scm/git/git-${PV}.tar.bz2 \
- file://autotools.patch;patch=1"
+SRC_URI = "${KERNELORG_MIRROR}/software/scm/git/git-${PV}.tar.bz2 "
S = "${WORKDIR}/git-${PV}"
LIC_FILES_CHKSUM = "file://COPYING;md5=7c0d7ef03a7eb04ce795b0f60e68e7e1"
diff --git a/meta/recipes-devtools/git/git_1.7.4.3.bb b/meta/recipes-devtools/git/git_1.7.5.1.bb
index 45ef61b5e..bfdbf6295 100644
--- a/meta/recipes-devtools/git/git_1.7.4.3.bb
+++ b/meta/recipes-devtools/git/git_1.7.5.1.bb
@@ -1,10 +1,10 @@
require git.inc
-PR = "r2"
+PR = "r0"
EXTRA_OECONF += "ac_cv_snprintf_returns_bogus=no ac_cv_c_c99_format=yes \
ac_cv_fread_reads_directories=${ac_cv_fread_reads_directories=yes} \
"
-SRC_URI[md5sum] = "da6c8f4967393342a4397b955db72cb1"
-SRC_URI[sha256sum] = "44b3ebc87d83b34468718fb6fa424420877e1f66c190389d693d090662a3556d"
+SRC_URI[md5sum] = "a49291116e3b0564e069ae989e4db6fb"
+SRC_URI[sha256sum] = "a1d4a1c59300e68fbc493a2cbe9257048d4d6f4363924bf34f38c413a825f80c"