summaryrefslogtreecommitdiff
path: root/meta/packages/guilt/files/make_git_commands_conditional.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/make_git_commands_conditional.patch
parent15543017ec044b1b072a50335a6fd0a036def47e (diff)
downloadopenembedded-core-2cf104f7e09d620b9c04122d15ce347db34f9577.tar.gz
openembedded-core-2cf104f7e09d620b9c04122d15ce347db34f9577.tar.bz2
openembedded-core-2cf104f7e09d620b9c04122d15ce347db34f9577.tar.xz
openembedded-core-2cf104f7e09d620b9c04122d15ce347db34f9577.zip
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/make_git_commands_conditional.patch')
-rw-r--r--meta/packages/guilt/files/make_git_commands_conditional.patch46
1 files changed, 46 insertions, 0 deletions
diff --git a/meta/packages/guilt/files/make_git_commands_conditional.patch b/meta/packages/guilt/files/make_git_commands_conditional.patch
new file mode 100644
index 000000000..b6d40dbc9
--- /dev/null
+++ b/meta/packages/guilt/files/make_git_commands_conditional.patch
@@ -0,0 +1,46 @@
+guilt: allow operation outside of git repos
+
+Sometimes guilt is sourced when there isn't a containing git repository.
+Some of the git commands that are always called will report errors
+unecesarility in this scenario. This adds a variable that will inhibit
+those problematic calls
+
+Signed-off-by <bruce.ashfield@windriver.com>
+
+---
+
+ guilt | 9 ++++++---
+ 1 file changed, 6 insertions(+), 3 deletions(-)
+
+
+--- a/guilt
++++ b/guilt
+@@ -23,7 +23,9 @@ esac
+ # we change directories ourselves
+ SUBDIRECTORY_OK=1
+
+-. "$(git --exec-path)/git-sh-setup"
++if [ -z "$DO_NOT_USE_GITREPO_COMMANDS" ]; then
++ . "$(git --exec-path)/git-sh-setup"
++fi
+
+ #
+ # Git version check
+@@ -921,14 +923,15 @@ diffstat=`git config --bool guilt.diffst
+ # The following gets run every time this file is source'd
+ #
+
+-
+ # GUILT_DIR="$GIT_DIR/patches"
+ if [ -z "$GUILT_BASE" ]; then
+ GUILT_BASE=wrs
+ fi
+ GUILT_DIR="$GUILT_BASE/patches"
+
+-branch=`get_branch`
++if [ -z "$DO_NOT_USE_GITREPO_COMMANDS" ]; then
++ branch=`get_branch`
++fi
+
+ # most of the time we want to verify that the repo's branch has been
+ # initialized, but every once in a blue moon (e.g., we want to run guilt-init),