From bfba97076555f1e708b4fef08fdcfa43f35d2fcb Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Fri, 23 Aug 2013 14:08:17 -0400 Subject: 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 Signed-off-by: Richard Purdie --- meta/recipes-devtools/guilt/files/guilt-init.patch | 25 ---------------------- 1 file changed, 25 deletions(-) delete mode 100644 meta/recipes-devtools/guilt/files/guilt-init.patch (limited to 'meta/recipes-devtools/guilt/files/guilt-init.patch') 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 @@ -guilt: allow previously initialized branches to be re-initialized - -Upstream-Status: Inappropriate [oe-specific] - -Signed-off-by: Bruce Ashfield - ---- - guilt-init | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - ---- a/guilt-init -+++ b/guilt-init -@@ -20,9 +20,9 @@ while case $# in 0) break ;; esac; do - shift - done - --if [ -d "$GUILT_DIR/$branch" ]; then -- die "Branch $branch appears to be already initialized (GIT_DIR=$GIT_DIR)" --fi -+# if [ -d "$GUILT_DIR/$branch" ]; then -+# die "Branch $branch appears to be already initialized (GIT_DIR=$GIT_DIR)" -+# fi - - [ ! -d "$GUILT_DIR" ] && mkdir "$GUILT_DIR" - mkdir -p "$GUILT_DIR/$branch" -- cgit v1.2.3-54-g00ecf