From 542c93f90cb761fcb53c74c99ce785c66a56cea8 Mon Sep 17 00:00:00 2001 From: Nitin A Kamble Date: Mon, 23 May 2011 15:41:33 -0700 Subject: 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. (From OE-Core rev: 07c4246e107af50d6a9333445259b083f98ebdc0) Signed-off-by: Nitin A Kamble Signed-off-by: Richard Purdie --- meta/recipes-devtools/git/files/autotools.patch | 16 ---------------- meta/recipes-devtools/git/git.inc | 3 +-- meta/recipes-devtools/git/git_1.7.4.3.bb | 10 ---------- meta/recipes-devtools/git/git_1.7.5.1.bb | 10 ++++++++++ 4 files changed, 11 insertions(+), 28 deletions(-) delete mode 100644 meta/recipes-devtools/git/files/autotools.patch delete mode 100644 meta/recipes-devtools/git/git_1.7.4.3.bb create mode 100644 meta/recipes-devtools/git/git_1.7.5.1.bb (limited to 'meta/recipes-devtools/git') diff --git a/meta/recipes-devtools/git/files/autotools.patch b/meta/recipes-devtools/git/files/autotools.patch deleted file mode 100644 index cb21193f35..0000000000 --- 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 49292fad13..c884f9ccc1 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.4.3.bb deleted file mode 100644 index 45ef61b5e5..0000000000 --- a/meta/recipes-devtools/git/git_1.7.4.3.bb +++ /dev/null @@ -1,10 +0,0 @@ -require git.inc - -PR = "r2" - -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" diff --git a/meta/recipes-devtools/git/git_1.7.5.1.bb b/meta/recipes-devtools/git/git_1.7.5.1.bb new file mode 100644 index 0000000000..bfdbf62954 --- /dev/null +++ b/meta/recipes-devtools/git/git_1.7.5.1.bb @@ -0,0 +1,10 @@ +require git.inc + +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] = "a49291116e3b0564e069ae989e4db6fb" +SRC_URI[sha256sum] = "a1d4a1c59300e68fbc493a2cbe9257048d4d6f4363924bf34f38c413a825f80c" -- cgit v1.2.3-54-g00ecf