summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/guilt/files/guilt-init.patch
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@windriver.com>2013-08-23 14:08:17 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-08-26 11:29:45 +0100
commitbfba97076555f1e708b4fef08fdcfa43f35d2fcb (patch)
tree76c0c0a4a43a2b46642f7ceaa35cc04de2f9bbcb /meta/recipes-devtools/guilt/files/guilt-init.patch
parent3b2b4eef0fd06099342fcc2dfa35ecf37840c090 (diff)
downloadpoky-bfba97076555f1e708b4fef08fdcfa43f35d2fcb.tar.gz
guilt: update to latest git version
Uprev guilt to the latest guilt version from its upstream repository. As part of the uprev all of the previous changes required for the yocto kernel tools to use git to manipulate series files have been dropped. These changes were specific to circumventing parts of guilt's internal santiy checking to allow specific Yocto kernel manipluation of sub-series files. Since the kernel tools no longer need guilt, we can use an up to date and nearly pure upstream version of guilt. (From OE-Core rev: 595c4469adc36d88ba2403915fc6c1d355014a58) 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/files/guilt-init.patch')
-rw-r--r--meta/recipes-devtools/guilt/files/guilt-init.patch25
1 files changed, 0 insertions, 25 deletions
diff --git a/meta/recipes-devtools/guilt/files/guilt-init.patch b/meta/recipes-devtools/guilt/files/guilt-init.patch
deleted file mode 100644
index 1583346ed6..0000000000
--- a/meta/recipes-devtools/guilt/files/guilt-init.patch
+++ /dev/null
@@ -1,25 +0,0 @@
1guilt: allow previously initialized branches to be re-initialized
2
3Upstream-Status: Inappropriate [oe-specific]
4
5Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
6
7---
8 guilt-init | 6 +++---
9 1 file changed, 3 insertions(+), 3 deletions(-)
10
11--- a/guilt-init
12+++ b/guilt-init
13@@ -20,9 +20,9 @@ while case $# in 0) break ;; esac; do
14 shift
15 done
16
17-if [ -d "$GUILT_DIR/$branch" ]; then
18- die "Branch $branch appears to be already initialized (GIT_DIR=$GIT_DIR)"
19-fi
20+# if [ -d "$GUILT_DIR/$branch" ]; then
21+# die "Branch $branch appears to be already initialized (GIT_DIR=$GIT_DIR)"
22+# fi
23
24 [ ! -d "$GUILT_DIR" ] && mkdir "$GUILT_DIR"
25 mkdir -p "$GUILT_DIR/$branch"