From: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
Date: Mon, 8 Feb 2010 11:14:31 +0000 (+0000)
Subject: git: remove version specifics from generic inc
X-Git-Tag: Release-2010-05/1~517
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f8f2d16a61456f72642ca8b75874ac9ca4f4d410;p=openembedded.git

git: remove version specifics from generic inc

Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---

diff --git a/recipes/git/git-native_1.6.0.4.bb b/recipes/git/git-native_1.6.0.4.bb
index 71b111be53..c17ce6ec80 100644
--- a/recipes/git/git-native_1.6.0.4.bb
+++ b/recipes/git/git-native_1.6.0.4.bb
@@ -2,3 +2,4 @@ require git.inc
 inherit native
 DEPENDS = "openssl-native curl-native zlib-native expat-native"
 PR = "r4"
+SRC_URI += "file://autotools.patch;patch=1"
diff --git a/recipes/git/git.inc b/recipes/git/git.inc
index fb88fd4135..644e15931f 100644
--- a/recipes/git/git.inc
+++ b/recipes/git/git.inc
@@ -2,9 +2,8 @@ DESCRIPTION = "The git revision control system used by the Linux kernel develope
 SECTION = "console/utils"
 LICENSE = "GPL"
 
-SRC_URI = "http://www.kernel.org/pub/software/scm/git/git-${PV}.tar.bz2 \
-           file://autotools.patch;patch=1 \
-	   "
+SRC_URI = "http://www.kernel.org/pub/software/scm/git/git-${PV}.tar.bz2"
+
 S = "${WORKDIR}/git-${PV}"
 
 inherit autotools
diff --git a/recipes/git/git_1.6.0.4.bb b/recipes/git/git_1.6.0.4.bb
index e839ab960a..c37e3d0d52 100644
--- a/recipes/git/git_1.6.0.4.bb
+++ b/recipes/git/git_1.6.0.4.bb
@@ -1,6 +1,7 @@
 require git.inc
 
-SRC_URI += "file://snprintf-returns-bogus.patch;patch=1"
+SRC_URI += "file://autotools.patch;patch=1 \
+            file://snprintf-returns-bogus.patch;patch=1"
 
 DEPENDS = "openssl curl zlib expat"
 RDEPENDS = "perl perl-module-file-path cpio findutils sed"