diff options
| author | Bruce Ashfield <bruce.ashfield@windriver.com> | 2013-01-18 00:19:32 -0500 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-01-18 13:28:10 +0000 |
| commit | 349e5bea53b02cabf836b8943541a002ce9ba682 (patch) | |
| tree | e06a2ab7df7f75b2bbfdcda6ae5c90d10c88046c /meta/recipes-devtools/guilt | |
| parent | 09d0bc521ad34473acf2ec4a00a69c3e3183f7d9 (diff) | |
| download | ast2050-yocto-poky-349e5bea53b02cabf836b8943541a002ce9ba682.zip ast2050-yocto-poky-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/recipes-devtools/guilt')
| -rw-r--r-- | meta/recipes-devtools/guilt/files/guilt-update-supported-git-versions-to-1.8.x.patch | 28 | ||||
| -rw-r--r-- | meta/recipes-devtools/guilt/guilt-native_0.33.bb | 3 |
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 0000000..579d9bc --- /dev/null +++ b/meta/recipes-devtools/guilt/files/guilt-update-supported-git-versions-to-1.8.x.patch @@ -0,0 +1,28 @@ +From d7fb5d4e159071b6255181fcf436300038fe9e6c Mon Sep 17 00:00:00 2001 +From: Bruce Ashfield <bruce.ashfield@windriver.com> +Date: Wed, 16 Jan 2013 20:48:11 -0500 +Subject: [PATCH] guilt: update supported git versions to 1.8.x + +guilt errors on the new 1.8.x git series, when it shouldn't, since +1.8.x works fine with the existing guilt version. + +Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> +--- + guilt | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/guilt b/guilt +index 346f929..6505653 100755 +--- a/guilt ++++ b/guilt +@@ -37,6 +37,7 @@ case "$gitver" in + 1.5.*) ;; # git config + 1.6.*) ;; # git config + 1.7.*) ;; # git config ++ 1.8.*) ;; # git config + *) die "Unsupported version of git ($gitver)" ;; + esac + +-- +1.7.10.4 + diff --git a/meta/recipes-devtools/guilt/guilt-native_0.33.bb b/meta/recipes-devtools/guilt/guilt-native_0.33.bb index 754b528..6652ab6 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" LIC_FILES_CHKSUM = "file://COPYING;md5=b6f3400dc1a01cebafe8a52b3f344135" PV = "0.33" -PR = "r2" +PR = "r3" inherit native @@ -20,6 +20,7 @@ SRC_URI = "http://ftp.de.debian.org/debian/pool/main/g/guilt/guilt_${PV}.orig.ta file://improve_auto_header_gen.patch \ file://guilt-set-git_exec_path.patch \ file://guilt-bash.patch \ + file://guilt-update-supported-git-versions-to-1.8.x.patch \ file://optional_head_check.patch" SRC_URI[md5sum] = "d800c5e0743d90543ef51d797a626e09" |
