Patchworkβ [oe,10/12] git: remove version specifics from generic inc

login
register
about
Submitter Bernhard Reutner-Fischer
Date 2010-02-08 21:14:31
Message ID <1265663673-16312-11-git-send-email-rep.dot.nop@gmail.com>
Download mbox | patch
Permalink /patch/1560/
State Applied, archived
Headers show

Comments

Bernhard Reutner-Fischer - 2010-02-08 21:14:31
Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
---
 recipes/git/git-native_1.6.0.4.bb |    1 +
 recipes/git/git.inc               |    5 ++---
 recipes/git/git_1.6.0.4.bb        |    3 ++-
 3 files changed, 5 insertions(+), 4 deletions(-)

Patch

diff --git a/recipes/git/git-native_1.6.0.4.bb b/recipes/git/git-native_1.6.0.4.bb
index 71b111b..c17ce6e 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 fb88fd4..644e159 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 e839ab9..c37e3d0 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"