summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@windriver.com>2013-01-18 00:19:32 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-01-18 13:28:10 +0000
commit349e5bea53b02cabf836b8943541a002ce9ba682 (patch)
treee06a2ab7df7f75b2bbfdcda6ae5c90d10c88046c /meta
parent09d0bc521ad34473acf2ec4a00a69c3e3183f7d9 (diff)
downloadpoky-349e5bea53b02cabf836b8943541a002ce9ba682.tar.gz
guilt: add git 1.8.x support
Updating guilt to allow git 1.8.x as a supported version. This version has no impact on other functionality within the scripts, so no other adjustments are necessary. [YOCTO #3275] (From OE-Core rev: 18bc7b44ef58cbcbe32d45504d71eed54ef695a4) Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-devtools/guilt/files/guilt-update-supported-git-versions-to-1.8.x.patch28
-rw-r--r--meta/recipes-devtools/guilt/guilt-native_0.33.bb3
2 files changed, 30 insertions, 1 deletions
diff --git a/meta/recipes-devtools/guilt/files/guilt-update-supported-git-versions-to-1.8.x.patch b/meta/recipes-devtools/guilt/files/guilt-update-supported-git-versions-to-1.8.x.patch
new file mode 100644
index 0000000000..579d9bc6fa
--- /dev/null
+++ b/meta/recipes-devtools/guilt/files/guilt-update-supported-git-versions-to-1.8.x.patch
@@ -0,0 +1,28 @@
1From d7fb5d4e159071b6255181fcf436300038fe9e6c Mon Sep 17 00:00:00 2001
2From: Bruce Ashfield <bruce.ashfield@windriver.com>
3Date: Wed, 16 Jan 2013 20:48:11 -0500
4Subject: [PATCH] guilt: update supported git versions to 1.8.x
5
6guilt errors on the new 1.8.x git series, when it shouldn't, since
71.8.x works fine with the existing guilt version.
8
9Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
10---
11 guilt | 1 +
12 1 file changed, 1 insertion(+)
13
14diff --git a/guilt b/guilt
15index 346f929..6505653 100755
16--- a/guilt
17+++ b/guilt
18@@ -37,6 +37,7 @@ case "$gitver" in
19 1.5.*) ;; # git config
20 1.6.*) ;; # git config
21 1.7.*) ;; # git config
22+ 1.8.*) ;; # git config
23 *) die "Unsupported version of git ($gitver)" ;;
24 esac
25
26--
271.7.10.4
28
diff --git a/meta/recipes-devtools/guilt/guilt-native_0.33.bb b/meta/recipes-devtools/guilt/guilt-native_0.33.bb
index 754b528271..6652ab6e0a 100644
--- a/meta/recipes-devtools/guilt/guilt-native_0.33.bb
+++ b/meta/recipes-devtools/guilt/guilt-native_0.33.bb
@@ -4,7 +4,7 @@ LICENSE = "GPLv2"
4LIC_FILES_CHKSUM = "file://COPYING;md5=b6f3400dc1a01cebafe8a52b3f344135" 4LIC_FILES_CHKSUM = "file://COPYING;md5=b6f3400dc1a01cebafe8a52b3f344135"
5 5
6PV = "0.33" 6PV = "0.33"
7PR = "r2" 7PR = "r3"
8 8
9inherit native 9inherit native
10 10
@@ -20,6 +20,7 @@ SRC_URI = "http://ftp.de.debian.org/debian/pool/main/g/guilt/guilt_${PV}.orig.ta
20 file://improve_auto_header_gen.patch \ 20 file://improve_auto_header_gen.patch \
21 file://guilt-set-git_exec_path.patch \ 21 file://guilt-set-git_exec_path.patch \
22 file://guilt-bash.patch \ 22 file://guilt-bash.patch \
23 file://guilt-update-supported-git-versions-to-1.8.x.patch \
23 file://optional_head_check.patch" 24 file://optional_head_check.patch"
24 25
25SRC_URI[md5sum] = "d800c5e0743d90543ef51d797a626e09" 26SRC_URI[md5sum] = "d800c5e0743d90543ef51d797a626e09"