summaryrefslogtreecommitdiffstats
path: root/meta/packages
diff options
context:
space:
mode:
authorJoshua Lock <josh@linux.intel.com>2010-08-13 15:13:07 +0100
committerJoshua Lock <josh@linux.intel.com>2010-08-13 17:16:11 +0100
commit2e0d6df6c198c559db42a3b92b847555f46d1a35 (patch)
treeb248582b5fe4df98bc9689d4478f337fe35c235a /meta/packages
parentbdb9da484740e4f8eb20882377185e28f8b5623b (diff)
downloadpoky-2e0d6df6c198c559db42a3b92b847555f46d1a35.tar.gz
git: update to get features required for wr-kernel-tools
Update to 1.7.2.1, wr-kernel-tools requires --no-merged option for git branch which was introduced in git 1.5.6 Signed-off-by: Joshua Lock <josh@linux.intel.com>
Diffstat (limited to 'meta/packages')
-rw-r--r--meta/packages/git/files/autotools.patch22
-rw-r--r--meta/packages/git/git_1.7.2.1.bb (renamed from meta/packages/git/git_1.5.4.4.bb)0
2 files changed, 5 insertions, 17 deletions
diff --git a/meta/packages/git/files/autotools.patch b/meta/packages/git/files/autotools.patch
index 0666118cde..1c69c22817 100644
--- a/meta/packages/git/files/autotools.patch
+++ b/meta/packages/git/files/autotools.patch
@@ -1,10 +1,10 @@
1Index: git-1.5.2.3/configure.ac 1Index: git-1.7.2.1/configure.ac
2=================================================================== 2===================================================================
3--- git-1.5.2.3.orig/configure.ac 2007-07-02 10:11:39.000000000 +0200 3--- git-1.7.2.1.orig/configure.ac 2010-07-28 18:03:43.000000000 +0100
4+++ git-1.5.2.3/configure.ac 2007-08-04 00:02:13.000000000 +0200 4+++ git-1.7.2.1/configure.ac 2010-08-13 14:54:29.181971250 +0100
5@@ -235,7 +235,8 @@ 5@@ -697,7 +697,8 @@
6 else if (strcmp(buf, "12345")) 6 else if (strcmp(buf, "12345"))
7 exit(2);]])], 7 return 2;]])],
8 [ac_cv_c_c99_format=yes], 8 [ac_cv_c_c99_format=yes],
9- [ac_cv_c_c99_format=no]) 9- [ac_cv_c_c99_format=no])
10+ [ac_cv_c_c99_format=no], 10+ [ac_cv_c_c99_format=no],
@@ -12,15 +12,3 @@ Index: git-1.5.2.3/configure.ac
12 ]) 12 ])
13 if test $ac_cv_c_c99_format = no; then 13 if test $ac_cv_c_c99_format = no; then
14 NO_C99_FORMAT=YesPlease 14 NO_C99_FORMAT=YesPlease
15Index: git-1.5.2.3/config.mak.in
16===================================================================
17--- git-1.5.2.3.orig/config.mak.in 2007-07-02 10:11:39.000000000 +0200
18+++ git-1.5.2.3/config.mak.in 2007-08-04 00:07:04.000000000 +0200
19@@ -3,6 +3,7 @@
20
21 CC = @CC@
22 CFLAGS = @CFLAGS@
23+LDFLAGS = @LDFLAGS@
24 AR = @AR@
25 TAR = @TAR@
26 #INSTALL = @INSTALL@ # needs install-sh or install.sh in sources
diff --git a/meta/packages/git/git_1.5.4.4.bb b/meta/packages/git/git_1.7.2.1.bb
index 7f822f69b3..7f822f69b3 100644
--- a/meta/packages/git/git_1.5.4.4.bb
+++ b/meta/packages/git/git_1.7.2.1.bb