summaryrefslogtreecommitdiffstats
path: root/meta/packages/guilt/files/guilt-init.patch
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@windriver.com>2010-08-10 15:01:37 -0400
committerRichard Purdie <rpurdie@linux.intel.com>2010-08-20 16:35:39 +0100
commit2cf104f7e09d620b9c04122d15ce347db34f9577 (patch)
tree173af7dc87afd8e96ef694807bb1080ab2718591 /meta/packages/guilt/files/guilt-init.patch
parent15543017ec044b1b072a50335a6fd0a036def47e (diff)
downloadpoky-2cf104f7e09d620b9c04122d15ce347db34f9577.tar.gz
guilt: import guilt for kernel patch management
The Wind River kernel is "patched" via guilt to provide both git integration and quilt like patch management (if that is of interest). This is a modified 0.33 guilt with some changes to streamline interactions with the way that the Wind River kernel is constructed. That being said, the common semantics of guilt are not changed, and it can be used for other purposes. Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Diffstat (limited to 'meta/packages/guilt/files/guilt-init.patch')
-rw-r--r--meta/packages/guilt/files/guilt-init.patch23
1 files changed, 23 insertions, 0 deletions
diff --git a/meta/packages/guilt/files/guilt-init.patch b/meta/packages/guilt/files/guilt-init.patch
new file mode 100644
index 0000000000..a06da5bf74
--- /dev/null
+++ b/meta/packages/guilt/files/guilt-init.patch
@@ -0,0 +1,23 @@
1guilt: allow previously initialized branches to be re-initialized
2
3Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
4
5---
6 guilt-init | 6 +++---
7 1 file changed, 3 insertions(+), 3 deletions(-)
8
9--- a/guilt-init
10+++ b/guilt-init
11@@ -20,9 +20,9 @@ while case $# in 0) break ;; esac; do
12 shift
13 done
14
15-if [ -d "$GUILT_DIR/$branch" ]; then
16- die "Branch $branch appears to be already initialized (GIT_DIR=$GIT_DIR)"
17-fi
18+# if [ -d "$GUILT_DIR/$branch" ]; then
19+# die "Branch $branch appears to be already initialized (GIT_DIR=$GIT_DIR)"
20+# fi
21
22 [ ! -d "$GUILT_DIR" ] && mkdir "$GUILT_DIR"
23 mkdir -p "$GUILT_DIR/$branch"