From 2cf104f7e09d620b9c04122d15ce347db34f9577 Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Tue, 10 Aug 2010 15:01:37 -0400 Subject: 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 --- .../guilt/files/guilt-push-no-series.patch | 27 ++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 meta/packages/guilt/files/guilt-push-no-series.patch (limited to 'meta/packages/guilt/files/guilt-push-no-series.patch') diff --git a/meta/packages/guilt/files/guilt-push-no-series.patch b/meta/packages/guilt/files/guilt-push-no-series.patch new file mode 100644 index 000000000..d40119c71 --- /dev/null +++ b/meta/packages/guilt/files/guilt-push-no-series.patch @@ -0,0 +1,27 @@ +guilt-push: Avoid duplicate hits in a series + +If a series file becomes mangled and a patch name appears in there +more than once, then the guilt-push will fail a horrible and +incomprehensible death. Make it fail in a sensible way. + +Signed-off-by: Paul Gortmaker + +--- + + guilt-push | 5 +++++ + 1 file changed, 5 insertions(+) + +--- a/guilt-push ++++ b/guilt-push +@@ -90,6 +90,11 @@ else + if [ -z "$eidx" ]; then + die "Patch $patch is not in the series or is guarded." + fi ++ ++ matches=`echo $eidx | wc -w` ++ if [ $matches -gt 1 ]; then ++ die "Patch $patch is in the series multiple times" ++ fi + fi + + # make sure that there are no unapplied changes -- cgit v1.2.3