diff options
author | Ross Burton <ross.burton@intel.com> | 2016-11-02 12:31:14 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-11-06 23:35:36 +0000 |
commit | d02416e29302810ec3653d64108170aa27b60c48 (patch) | |
tree | 210cc0e56bb73489faa09b7b36ac26a6a6111e98 /meta/recipes-devtools | |
parent | cfe6f3e251240c9d9a70354be0501600357f0b87 (diff) | |
download | poky-d02416e29302810ec3653d64108170aa27b60c48.tar.gz |
guilt: remove
This was used by the kernel tooling but has since been replaced by kgit-s2q. As
there are no other users in oe-core, and this was just a native recipe, remove
it.
(From OE-Core rev: 3a52f2d3ef6bc85c68bf42f8e116a8065a67fdfe)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r-- | meta/recipes-devtools/guilt/files/guilt-bash.patch | 288 | ||||
-rw-r--r-- | meta/recipes-devtools/guilt/guilt-native_git.bb | 23 |
2 files changed, 0 insertions, 311 deletions
diff --git a/meta/recipes-devtools/guilt/files/guilt-bash.patch b/meta/recipes-devtools/guilt/files/guilt-bash.patch deleted file mode 100644 index 70a439e816..0000000000 --- a/meta/recipes-devtools/guilt/files/guilt-bash.patch +++ /dev/null | |||
@@ -1,288 +0,0 @@ | |||
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 | Upstream-Status: Inappropriate [oe-specific] | ||
13 | |||
14 | Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> | ||
15 | |||
16 | --- | ||
17 | guilt | 2 +- | ||
18 | guilt-add | 2 +- | ||
19 | guilt-applied | 2 +- | ||
20 | guilt-branch | 2 +- | ||
21 | guilt-delete | 2 +- | ||
22 | guilt-diff | 2 +- | ||
23 | guilt-export | 2 +- | ||
24 | guilt-files | 2 +- | ||
25 | guilt-fold | 2 +- | ||
26 | guilt-fork | 2 +- | ||
27 | guilt-graph | 2 +- | ||
28 | guilt-header | 2 +- | ||
29 | guilt-help | 2 +- | ||
30 | guilt-import | 2 +- | ||
31 | guilt-import-commit | 2 +- | ||
32 | guilt-init | 4 ++-- | ||
33 | guilt-new | 2 +- | ||
34 | guilt-next | 2 +- | ||
35 | guilt-patchbomb | 2 +- | ||
36 | guilt-pop | 2 +- | ||
37 | guilt-prev | 2 +- | ||
38 | guilt-push | 2 +- | ||
39 | guilt-rebase | 2 +- | ||
40 | guilt-refresh | 2 +- | ||
41 | guilt-rm | 2 +- | ||
42 | guilt-series | 2 +- | ||
43 | guilt-status | 2 +- | ||
44 | guilt-top | 2 +- | ||
45 | guilt-unapplied | 2 +- | ||
46 | 29 files changed, 30 insertions(+), 30 deletions(-) | ||
47 | |||
48 | --- a/guilt | ||
49 | +++ b/guilt | ||
50 | @@ -1,4 +1,4 @@ | ||
51 | -#!/bin/sh | ||
52 | +#!/bin/bash | ||
53 | # | ||
54 | # Copyright (c) Josef "Jeff" Sipek, 2006-2010 | ||
55 | # | ||
56 | --- a/guilt-add | ||
57 | +++ b/guilt-add | ||
58 | @@ -1,4 +1,4 @@ | ||
59 | -#!/bin/sh | ||
60 | +#!/bin/bash | ||
61 | # | ||
62 | # Copyright (c) Josef "Jeff" Sipek, 2006, 2007 | ||
63 | # | ||
64 | --- a/guilt-applied | ||
65 | +++ b/guilt-applied | ||
66 | @@ -1,4 +1,4 @@ | ||
67 | -#!/bin/sh | ||
68 | +#!/bin/bash | ||
69 | # | ||
70 | # Copyright (c) Josef "Jeff" Sipek, 2006, 2007 | ||
71 | # | ||
72 | --- a/guilt-branch | ||
73 | +++ b/guilt-branch | ||
74 | @@ -1,4 +1,4 @@ | ||
75 | -#!/bin/sh | ||
76 | +#!/bin/bash | ||
77 | # | ||
78 | # Copyright (c) Josef "Jeff" Sipek, 2007-2008 | ||
79 | # | ||
80 | --- a/guilt-delete | ||
81 | +++ b/guilt-delete | ||
82 | @@ -1,4 +1,4 @@ | ||
83 | -#!/bin/sh | ||
84 | +#!/bin/bash | ||
85 | # | ||
86 | # Copyright (c) Josef "Jeff" Sipek, 2006, 2007 | ||
87 | # | ||
88 | --- a/guilt-diff | ||
89 | +++ b/guilt-diff | ||
90 | @@ -1,4 +1,4 @@ | ||
91 | -#!/bin/sh | ||
92 | +#!/bin/bash | ||
93 | # | ||
94 | # Copyright (C) 2007 Josef 'Jeff' Sipek <jeffpc@josefsipek.net> | ||
95 | # | ||
96 | --- a/guilt-export | ||
97 | +++ b/guilt-export | ||
98 | @@ -1,4 +1,4 @@ | ||
99 | -#!/bin/sh | ||
100 | +#!/bin/bash | ||
101 | # | ||
102 | # Copyright (c) Pierre Habouzit, 2007 | ||
103 | # | ||
104 | --- a/guilt-files | ||
105 | +++ b/guilt-files | ||
106 | @@ -1,4 +1,4 @@ | ||
107 | -#!/bin/sh | ||
108 | +#!/bin/bash | ||
109 | # | ||
110 | # Copyright (C) 2007 Yasushi SHOJI <yashi@atmark-techno.com> | ||
111 | # | ||
112 | --- a/guilt-fold | ||
113 | +++ b/guilt-fold | ||
114 | @@ -1,4 +1,4 @@ | ||
115 | -#!/bin/sh | ||
116 | +#!/bin/bash | ||
117 | # | ||
118 | # Copyright (c) Josef "Jeff" Sipek, 2006, 2007 | ||
119 | # | ||
120 | --- a/guilt-fork | ||
121 | +++ b/guilt-fork | ||
122 | @@ -1,4 +1,4 @@ | ||
123 | -#!/bin/sh | ||
124 | +#!/bin/bash | ||
125 | # | ||
126 | # Copyright (c) Josef "Jeff" Sipek, 2007 | ||
127 | # | ||
128 | --- a/guilt-graph | ||
129 | +++ b/guilt-graph | ||
130 | @@ -1,4 +1,4 @@ | ||
131 | -#!/bin/sh | ||
132 | +#!/bin/bash | ||
133 | # | ||
134 | # Copyright (c) Josef "Jeff" Sipek, 2007 | ||
135 | # | ||
136 | --- a/guilt-header | ||
137 | +++ b/guilt-header | ||
138 | @@ -1,4 +1,4 @@ | ||
139 | -#!/bin/sh | ||
140 | +#!/bin/bash | ||
141 | # | ||
142 | # Copyright (c) Josef "Jeff" Sipek, 2006-2010 | ||
143 | # | ||
144 | --- a/guilt-help | ||
145 | +++ b/guilt-help | ||
146 | @@ -1,4 +1,4 @@ | ||
147 | -#!/bin/sh | ||
148 | +#!/bin/bash | ||
149 | # | ||
150 | # Copyright (c) Josef "Jeff" Sipek, 2007 | ||
151 | # | ||
152 | --- a/guilt-import | ||
153 | +++ b/guilt-import | ||
154 | @@ -1,4 +1,4 @@ | ||
155 | -#!/bin/sh | ||
156 | +#!/bin/bash | ||
157 | # | ||
158 | # Copyright (c) Josef "Jeff" Sipek, 2007 | ||
159 | # | ||
160 | --- a/guilt-import-commit | ||
161 | +++ b/guilt-import-commit | ||
162 | @@ -1,4 +1,4 @@ | ||
163 | -#!/bin/sh | ||
164 | +#!/bin/bash | ||
165 | # | ||
166 | # Copyright (c) Josef "Jeff" Sipek, 2007 | ||
167 | # | ||
168 | --- a/guilt-init | ||
169 | +++ b/guilt-init | ||
170 | @@ -1,4 +1,4 @@ | ||
171 | -#!/bin/sh | ||
172 | +#!/bin/bash | ||
173 | # | ||
174 | # Copyright (c) Josef "Jeff" Sipek, 2006, 2007 | ||
175 | # | ||
176 | @@ -31,7 +31,7 @@ touch "$GUILT_DIR/$branch/status" | ||
177 | |||
178 | mkdir -p "$GIT_DIR/hooks/guilt" | ||
179 | cat > "$GIT_DIR/hooks/guilt/delete" <<EOF | ||
180 | -#!/bin/sh | ||
181 | +#!/bin/bash | ||
182 | # Usage: <script> <patch being removed> | ||
183 | |||
184 | echo "Removing patch '\$1'..." | ||
185 | --- a/guilt-new | ||
186 | +++ b/guilt-new | ||
187 | @@ -1,4 +1,4 @@ | ||
188 | -#!/bin/sh | ||
189 | +#!/bin/bash | ||
190 | # | ||
191 | # Copyright (c) Josef "Jeff" Sipek, 2006, 2007 | ||
192 | # | ||
193 | --- a/guilt-next | ||
194 | +++ b/guilt-next | ||
195 | @@ -1,4 +1,4 @@ | ||
196 | -#!/bin/sh | ||
197 | +#!/bin/bash | ||
198 | # | ||
199 | # Copyright (c) Josef "Jeff" Sipek, 2006, 2007 | ||
200 | # | ||
201 | --- a/guilt-patchbomb | ||
202 | +++ b/guilt-patchbomb | ||
203 | @@ -1,4 +1,4 @@ | ||
204 | -#!/bin/sh | ||
205 | +#!/bin/bash | ||
206 | # | ||
207 | # Copyright (c) Josef "Jeff" Sipek, 2007 | ||
208 | # | ||
209 | --- a/guilt-pop | ||
210 | +++ b/guilt-pop | ||
211 | @@ -1,4 +1,4 @@ | ||
212 | -#!/bin/sh | ||
213 | +#!/bin/bash | ||
214 | # | ||
215 | # Copyright (c) Josef "Jeff" Sipek, 2006, 2007 | ||
216 | # | ||
217 | --- a/guilt-prev | ||
218 | +++ b/guilt-prev | ||
219 | @@ -1,4 +1,4 @@ | ||
220 | -#!/bin/sh | ||
221 | +#!/bin/bash | ||
222 | # | ||
223 | # Copyright (c) Josef "Jeff" Sipek, 2006, 2007 | ||
224 | # | ||
225 | --- a/guilt-push | ||
226 | +++ b/guilt-push | ||
227 | @@ -1,4 +1,4 @@ | ||
228 | -#!/bin/sh | ||
229 | +#!/bin/bash | ||
230 | # | ||
231 | # Copyright (c) Josef "Jeff" Sipek, 2006, 2007 | ||
232 | # | ||
233 | --- a/guilt-rebase | ||
234 | +++ b/guilt-rebase | ||
235 | @@ -1,4 +1,4 @@ | ||
236 | -#!/bin/sh | ||
237 | +#!/bin/bash | ||
238 | # | ||
239 | # Copyright (c) Josef "Jeff" Sipek, 2007 | ||
240 | # | ||
241 | --- a/guilt-refresh | ||
242 | +++ b/guilt-refresh | ||
243 | @@ -1,4 +1,4 @@ | ||
244 | -#!/bin/sh | ||
245 | +#!/bin/bash | ||
246 | # | ||
247 | # Copyright (c) Josef "Jeff" Sipek, 2006, 2007 | ||
248 | # | ||
249 | --- a/guilt-rm | ||
250 | +++ b/guilt-rm | ||
251 | @@ -1,4 +1,4 @@ | ||
252 | -#!/bin/sh | ||
253 | +#!/bin/bash | ||
254 | # | ||
255 | # Copyright (c) Josef "Jeff" Sipek, 2006, 2007 | ||
256 | # | ||
257 | --- a/guilt-series | ||
258 | +++ b/guilt-series | ||
259 | @@ -1,4 +1,4 @@ | ||
260 | -#!/bin/sh | ||
261 | +#!/bin/bash | ||
262 | # | ||
263 | # Copyright (c) Josef "Jeff" Sipek, 2006, 2007 | ||
264 | # | ||
265 | --- a/guilt-status | ||
266 | +++ b/guilt-status | ||
267 | @@ -1,4 +1,4 @@ | ||
268 | -#!/bin/sh | ||
269 | +#!/bin/bash | ||
270 | # | ||
271 | # Copyright (c) Josef "Jeff" Sipek, 2006, 2007 | ||
272 | # | ||
273 | --- a/guilt-top | ||
274 | +++ b/guilt-top | ||
275 | @@ -1,4 +1,4 @@ | ||
276 | -#!/bin/sh | ||
277 | +#!/bin/bash | ||
278 | # | ||
279 | # Copyright (c) Josef "Jeff" Sipek, 2006, 2007 | ||
280 | # | ||
281 | --- a/guilt-unapplied | ||
282 | +++ b/guilt-unapplied | ||
283 | @@ -1,4 +1,4 @@ | ||
284 | -#!/bin/sh | ||
285 | +#!/bin/bash | ||
286 | # | ||
287 | # Copyright (c) Josef "Jeff" Sipek, 2006, 2007 | ||
288 | # | ||
diff --git a/meta/recipes-devtools/guilt/guilt-native_git.bb b/meta/recipes-devtools/guilt/guilt-native_git.bb deleted file mode 100644 index b63c68c4d8..0000000000 --- a/meta/recipes-devtools/guilt/guilt-native_git.bb +++ /dev/null | |||
@@ -1,23 +0,0 @@ | |||
1 | SUMMARY = "quilt-like tool for Git" | ||
2 | LICENSE = "GPLv2" | ||
3 | |||
4 | LIC_FILES_CHKSUM = "file://COPYING;md5=b6f3400dc1a01cebafe8a52b3f344135" | ||
5 | |||
6 | inherit native | ||
7 | |||
8 | SRC_URI = "git://repo.or.cz/guilt.git \ | ||
9 | file://guilt-bash.patch \ | ||
10 | " | ||
11 | PV = "0.35+git${SRCPV}" | ||
12 | SRCREV = "c2a5bae511c6d5354aa4e1cb59069c31df2b8eeb" | ||
13 | |||
14 | S = "${WORKDIR}/git" | ||
15 | |||
16 | # we don't compile, we just install | ||
17 | do_compile() { | ||
18 | : | ||
19 | } | ||
20 | |||
21 | do_install() { | ||
22 | oe_runmake PREFIX=${D}/${prefix} install | ||
23 | } | ||