diff options
author | Bruce Ashfield <bruce.ashfield@windriver.com> | 2010-08-10 15:01:37 -0400 |
---|---|---|
committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-08-20 16:35:39 +0100 |
commit | 2cf104f7e09d620b9c04122d15ce347db34f9577 (patch) | |
tree | 173af7dc87afd8e96ef694807bb1080ab2718591 /meta/packages/guilt/files/guilt-bash.patch | |
parent | 15543017ec044b1b072a50335a6fd0a036def47e (diff) | |
download | poky-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-bash.patch')
-rw-r--r-- | meta/packages/guilt/files/guilt-bash.patch | 286 |
1 files changed, 286 insertions, 0 deletions
diff --git a/meta/packages/guilt/files/guilt-bash.patch b/meta/packages/guilt/files/guilt-bash.patch new file mode 100644 index 0000000000..d2058e8cf3 --- /dev/null +++ b/meta/packages/guilt/files/guilt-bash.patch | |||
@@ -0,0 +1,286 @@ | |||
1 | guilt: explicitly call for bash | ||
2 | |||
3 | Running complex guilt stacks of patches/commits can cause interesting | ||
4 | failures after ~20m of processing, with errors like "Bad substitution". | ||
5 | |||
6 | These have been traced back to having /bin/sh --> /bin/dash on Ubuntu | ||
7 | systems. Putting a shell that actually *works* (such as /bin/bash) | ||
8 | in as /bin/sh makes the problem go away. So here we change the guilt | ||
9 | scripts to explicitly call for bash to ensure we don't have a similar | ||
10 | issue after deployment. | ||
11 | |||
12 | Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> | ||
13 | |||
14 | --- | ||
15 | guilt | 2 +- | ||
16 | guilt-add | 2 +- | ||
17 | guilt-applied | 2 +- | ||
18 | guilt-branch | 2 +- | ||
19 | guilt-delete | 2 +- | ||
20 | guilt-diff | 2 +- | ||
21 | guilt-export | 2 +- | ||
22 | guilt-files | 2 +- | ||
23 | guilt-fold | 2 +- | ||
24 | guilt-fork | 2 +- | ||
25 | guilt-graph | 2 +- | ||
26 | guilt-header | 2 +- | ||
27 | guilt-help | 2 +- | ||
28 | guilt-import | 2 +- | ||
29 | guilt-import-commit | 2 +- | ||
30 | guilt-init | 4 ++-- | ||
31 | guilt-new | 2 +- | ||
32 | guilt-next | 2 +- | ||
33 | guilt-patchbomb | 2 +- | ||
34 | guilt-pop | 2 +- | ||
35 | guilt-prev | 2 +- | ||
36 | guilt-push | 2 +- | ||
37 | guilt-rebase | 2 +- | ||
38 | guilt-refresh | 2 +- | ||
39 | guilt-rm | 2 +- | ||
40 | guilt-series | 2 +- | ||
41 | guilt-status | 2 +- | ||
42 | guilt-top | 2 +- | ||
43 | guilt-unapplied | 2 +- | ||
44 | 29 files changed, 30 insertions(+), 30 deletions(-) | ||
45 | |||
46 | --- a/guilt | ||
47 | +++ b/guilt | ||
48 | @@ -1,4 +1,4 @@ | ||
49 | -#!/bin/sh | ||
50 | +#!/bin/bash | ||
51 | # | ||
52 | # Copyright (c) Josef "Jeff" Sipek, 2006-2010 | ||
53 | # | ||
54 | --- a/guilt-add | ||
55 | +++ b/guilt-add | ||
56 | @@ -1,4 +1,4 @@ | ||
57 | -#!/bin/sh | ||
58 | +#!/bin/bash | ||
59 | # | ||
60 | # Copyright (c) Josef "Jeff" Sipek, 2006, 2007 | ||
61 | # | ||
62 | --- a/guilt-applied | ||
63 | +++ b/guilt-applied | ||
64 | @@ -1,4 +1,4 @@ | ||
65 | -#!/bin/sh | ||
66 | +#!/bin/bash | ||
67 | # | ||
68 | # Copyright (c) Josef "Jeff" Sipek, 2006, 2007 | ||
69 | # | ||
70 | --- a/guilt-branch | ||
71 | +++ b/guilt-branch | ||
72 | @@ -1,4 +1,4 @@ | ||
73 | -#!/bin/sh | ||
74 | +#!/bin/bash | ||
75 | # | ||
76 | # Copyright (c) Josef "Jeff" Sipek, 2007-2008 | ||
77 | # | ||
78 | --- a/guilt-delete | ||
79 | +++ b/guilt-delete | ||
80 | @@ -1,4 +1,4 @@ | ||
81 | -#!/bin/sh | ||
82 | +#!/bin/bash | ||
83 | # | ||
84 | # Copyright (c) Josef "Jeff" Sipek, 2006, 2007 | ||
85 | # | ||
86 | --- a/guilt-diff | ||
87 | +++ b/guilt-diff | ||
88 | @@ -1,4 +1,4 @@ | ||
89 | -#!/bin/sh | ||
90 | +#!/bin/bash | ||
91 | # | ||
92 | # Copyright (C) 2007 Josef 'Jeff' Sipek <jeffpc@josefsipek.net> | ||
93 | # | ||
94 | --- a/guilt-export | ||
95 | +++ b/guilt-export | ||
96 | @@ -1,4 +1,4 @@ | ||
97 | -#!/bin/sh | ||
98 | +#!/bin/bash | ||
99 | # | ||
100 | # Copyright (c) Pierre Habouzit, 2007 | ||
101 | # | ||
102 | --- a/guilt-files | ||
103 | +++ b/guilt-files | ||
104 | @@ -1,4 +1,4 @@ | ||
105 | -#!/bin/sh | ||
106 | +#!/bin/bash | ||
107 | # | ||
108 | # Copyright (C) 2007 Yasushi SHOJI <yashi@atmark-techno.com> | ||
109 | # | ||
110 | --- a/guilt-fold | ||
111 | +++ b/guilt-fold | ||
112 | @@ -1,4 +1,4 @@ | ||
113 | -#!/bin/sh | ||
114 | +#!/bin/bash | ||
115 | # | ||
116 | # Copyright (c) Josef "Jeff" Sipek, 2006, 2007 | ||
117 | # | ||
118 | --- a/guilt-fork | ||
119 | +++ b/guilt-fork | ||
120 | @@ -1,4 +1,4 @@ | ||
121 | -#!/bin/sh | ||
122 | +#!/bin/bash | ||
123 | # | ||
124 | # Copyright (c) Josef "Jeff" Sipek, 2007 | ||
125 | # | ||
126 | --- a/guilt-graph | ||
127 | +++ b/guilt-graph | ||
128 | @@ -1,4 +1,4 @@ | ||
129 | -#!/bin/sh | ||
130 | +#!/bin/bash | ||
131 | # | ||
132 | # Copyright (c) Josef "Jeff" Sipek, 2007 | ||
133 | # | ||
134 | --- a/guilt-header | ||
135 | +++ b/guilt-header | ||
136 | @@ -1,4 +1,4 @@ | ||
137 | -#!/bin/sh | ||
138 | +#!/bin/bash | ||
139 | # | ||
140 | # Copyright (c) Josef "Jeff" Sipek, 2006-2010 | ||
141 | # | ||
142 | --- a/guilt-help | ||
143 | +++ b/guilt-help | ||
144 | @@ -1,4 +1,4 @@ | ||
145 | -#!/bin/sh | ||
146 | +#!/bin/bash | ||
147 | # | ||
148 | # Copyright (c) Josef "Jeff" Sipek, 2007 | ||
149 | # | ||
150 | --- a/guilt-import | ||
151 | +++ b/guilt-import | ||
152 | @@ -1,4 +1,4 @@ | ||
153 | -#!/bin/sh | ||
154 | +#!/bin/bash | ||
155 | # | ||
156 | # Copyright (c) Josef "Jeff" Sipek, 2007 | ||
157 | # | ||
158 | --- a/guilt-import-commit | ||
159 | +++ b/guilt-import-commit | ||
160 | @@ -1,4 +1,4 @@ | ||
161 | -#!/bin/sh | ||
162 | +#!/bin/bash | ||
163 | # | ||
164 | # Copyright (c) Josef "Jeff" Sipek, 2007 | ||
165 | # | ||
166 | --- a/guilt-init | ||
167 | +++ b/guilt-init | ||
168 | @@ -1,4 +1,4 @@ | ||
169 | -#!/bin/sh | ||
170 | +#!/bin/bash | ||
171 | # | ||
172 | # Copyright (c) Josef "Jeff" Sipek, 2006, 2007 | ||
173 | # | ||
174 | @@ -31,7 +31,7 @@ touch "$GUILT_DIR/$branch/status" | ||
175 | |||
176 | mkdir -p "$GIT_DIR/hooks/guilt" | ||
177 | cat > "$GIT_DIR/hooks/guilt/delete" <<EOF | ||
178 | -#!/bin/sh | ||
179 | +#!/bin/bash | ||
180 | # Usage: <script> <patch being removed> | ||
181 | |||
182 | echo "Removing patch '\$1'..." | ||
183 | --- a/guilt-new | ||
184 | +++ b/guilt-new | ||
185 | @@ -1,4 +1,4 @@ | ||
186 | -#!/bin/sh | ||
187 | +#!/bin/bash | ||
188 | # | ||
189 | # Copyright (c) Josef "Jeff" Sipek, 2006, 2007 | ||
190 | # | ||
191 | --- a/guilt-next | ||
192 | +++ b/guilt-next | ||
193 | @@ -1,4 +1,4 @@ | ||
194 | -#!/bin/sh | ||
195 | +#!/bin/bash | ||
196 | # | ||
197 | # Copyright (c) Josef "Jeff" Sipek, 2006, 2007 | ||
198 | # | ||
199 | --- a/guilt-patchbomb | ||
200 | +++ b/guilt-patchbomb | ||
201 | @@ -1,4 +1,4 @@ | ||
202 | -#!/bin/sh | ||
203 | +#!/bin/bash | ||
204 | # | ||
205 | # Copyright (c) Josef "Jeff" Sipek, 2007 | ||
206 | # | ||
207 | --- a/guilt-pop | ||
208 | +++ b/guilt-pop | ||
209 | @@ -1,4 +1,4 @@ | ||
210 | -#!/bin/sh | ||
211 | +#!/bin/bash | ||
212 | # | ||
213 | # Copyright (c) Josef "Jeff" Sipek, 2006, 2007 | ||
214 | # | ||
215 | --- a/guilt-prev | ||
216 | +++ b/guilt-prev | ||
217 | @@ -1,4 +1,4 @@ | ||
218 | -#!/bin/sh | ||
219 | +#!/bin/bash | ||
220 | # | ||
221 | # Copyright (c) Josef "Jeff" Sipek, 2006, 2007 | ||
222 | # | ||
223 | --- a/guilt-push | ||
224 | +++ b/guilt-push | ||
225 | @@ -1,4 +1,4 @@ | ||
226 | -#!/bin/sh | ||
227 | +#!/bin/bash | ||
228 | # | ||
229 | # Copyright (c) Josef "Jeff" Sipek, 2006, 2007 | ||
230 | # | ||
231 | --- a/guilt-rebase | ||
232 | +++ b/guilt-rebase | ||
233 | @@ -1,4 +1,4 @@ | ||
234 | -#!/bin/sh | ||
235 | +#!/bin/bash | ||
236 | # | ||
237 | # Copyright (c) Josef "Jeff" Sipek, 2007 | ||
238 | # | ||
239 | --- a/guilt-refresh | ||
240 | +++ b/guilt-refresh | ||
241 | @@ -1,4 +1,4 @@ | ||
242 | -#!/bin/sh | ||
243 | +#!/bin/bash | ||
244 | # | ||
245 | # Copyright (c) Josef "Jeff" Sipek, 2006, 2007 | ||
246 | # | ||
247 | --- a/guilt-rm | ||
248 | +++ b/guilt-rm | ||
249 | @@ -1,4 +1,4 @@ | ||
250 | -#!/bin/sh | ||
251 | +#!/bin/bash | ||
252 | # | ||
253 | # Copyright (c) Josef "Jeff" Sipek, 2006, 2007 | ||
254 | # | ||
255 | --- a/guilt-series | ||
256 | +++ b/guilt-series | ||
257 | @@ -1,4 +1,4 @@ | ||
258 | -#!/bin/sh | ||
259 | +#!/bin/bash | ||
260 | # | ||
261 | # Copyright (c) Josef "Jeff" Sipek, 2006, 2007 | ||
262 | # | ||
263 | --- a/guilt-status | ||
264 | +++ b/guilt-status | ||
265 | @@ -1,4 +1,4 @@ | ||
266 | -#!/bin/sh | ||
267 | +#!/bin/bash | ||
268 | # | ||
269 | # Copyright (c) Josef "Jeff" Sipek, 2006, 2007 | ||
270 | # | ||
271 | --- a/guilt-top | ||
272 | +++ b/guilt-top | ||
273 | @@ -1,4 +1,4 @@ | ||
274 | -#!/bin/sh | ||
275 | +#!/bin/bash | ||
276 | # | ||
277 | # Copyright (c) Josef "Jeff" Sipek, 2006, 2007 | ||
278 | # | ||
279 | --- a/guilt-unapplied | ||
280 | +++ b/guilt-unapplied | ||
281 | @@ -1,4 +1,4 @@ | ||
282 | -#!/bin/sh | ||
283 | +#!/bin/bash | ||
284 | # | ||
285 | # Copyright (c) Josef "Jeff" Sipek, 2006, 2007 | ||
286 | # | ||