From bfba97076555f1e708b4fef08fdcfa43f35d2fcb Mon Sep 17 00:00:00 2001
From: Bruce Ashfield <bruce.ashfield@windriver.com>
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 <bruce.ashfield@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 .../guilt/files/improve_auto_header_gen.patch      | 71 ----------------------
 1 file changed, 71 deletions(-)
 delete mode 100644 meta/recipes-devtools/guilt/files/improve_auto_header_gen.patch

(limited to 'meta/recipes-devtools/guilt/files/improve_auto_header_gen.patch')

diff --git a/meta/recipes-devtools/guilt/files/improve_auto_header_gen.patch b/meta/recipes-devtools/guilt/files/improve_auto_header_gen.patch
deleted file mode 100644
index fa7dd8ae00..0000000000
--- a/meta/recipes-devtools/guilt/files/improve_auto_header_gen.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-guilt: improve the generation of an automatic header
-
-Patches that do not have a proper header are encountered when generating
-a tree. This improves the detection of these patches and generates a sane
-header so the eventual commit will be coherent
-
-Upstream-Status: Inappropriate [oe-specific]
-
-Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
-
----
-
- guilt |   24 ++++++++++++++++++------
- 1 file changed, 18 insertions(+), 6 deletions(-)
-
---- a/guilt
-+++ b/guilt
-@@ -591,7 +591,12 @@ commit()
- 		fi
- 
- 		# last try: make a default commit message if patch doesn't contain one
--		[ ! -s "$TMP_MSG" ] && echo "auto_msg: patch $pname" > "$TMP_MSG"
-+		if [ ! -s "$TMP_MSG" ]; then
-+		    echo "auto_msg: importing `basename $pname`" > "$TMP_MSG"
-+		    echo "" >> "$TMP_MSG"
-+		    echo "This is an automatic import of patch $pname, no headers were" >> "$TMP_MSG"
-+		    echo "detected and a default message was constructed" >>  "$TMP_MSG"
-+		fi
- 
- 
- 		if [ "$header_type" = "guilt" ]; then
-@@ -599,12 +604,14 @@ commit()
-   		    # extract a From line from the patch header, and set
- 	            # GIT_AUTHOR_{NAME,EMAIL}
- 		    author_str=`sed -n -e '/^From:/ { s/^From: //; p; q }; /^(diff |---)/ q' "$p"`
--		    if [ ! -z "$author_str" ]; then
--			GIT_AUTHOR_NAME=`echo $author_str | sed -e 's/ *<.*$//'`
--			export GIT_AUTHOR_NAME="${GIT_AUTHOR_NAME:-" "}"
--                        export GIT_AUTHOR_EMAIL="`echo $author_str | sed -e 's/[^<]*//'`"
-+		    if [ -z "$author_str" ]; then
-+			author_str="auto commit <unknown@unknown>"
- 		    fi
- 
-+		    GIT_AUTHOR_NAME=`echo $author_str | sed -e 's/ *<.*$//'`
-+		    export GIT_AUTHOR_NAME="${GIT_AUTHOR_NAME:-" "}"
-+                    export GIT_AUTHOR_EMAIL="`echo $author_str | sed -e 's/[^<]*//'`"
-+
- 
- 		    # check in the patch for a subject
- 		    SUBJECT="$(sed -n '/^Subject/ s/Subject: //p' "$p")"
-@@ -615,6 +622,11 @@ commit()
- 			if [ ${#SUBJECT} -gt 60 ]; then
- 			    SUBJECT=${SUBJECT: -60}
- 			fi
-+
-+			# remove the line from the tmp msg
-+			mv "$TMP_MSG" "$TMP_MSG.work"
-+			cat "$TMP_MSG.work" | grep -v -E ".*$SUBJECT.*" > "$TMP_MSG"
-+			rm "$TMP_MSG.work"
- 		    fi
- 
- 		    if [ -z "$SUBJECT" ]; then
-@@ -629,7 +641,7 @@ commit()
- 
- 		    SUBJECT=`echo $SUBJECT | sed s'%^ *%%'`
- 
--		    if [ ! -z "$SUBJECT" ]; then
-+		    if [ -n "$SUBJECT" ]; then
- 			echo "$SUBJECT" >> $TMP_MSG.subject
- 			echo "" >> $TMP_MSG.subject
- 			cat "$TMP_MSG" >> $TMP_MSG.subject
-- 
cgit v1.2.3-54-g00ecf