1 |
commit: 7296be47b869ef3d86b1a1b6622092a925ae0faf |
2 |
Author: Sebastian Pipping <sebastian <AT> pipping <DOT> org> |
3 |
AuthorDate: Sun Jul 31 03:47:16 2011 +0000 |
4 |
Commit: Sebastian Pipping <sping <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Jul 31 03:47:16 2011 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=7296be47 |
7 |
|
8 |
End support for 4 years old busybox 1.7.4 (bug #377133) |
9 |
|
10 |
--- |
11 |
ChangeLog | 10 ++ |
12 |
patches/busybox/1.7.4/1.7.4-ash-timeout.diff | 123 -------------------- |
13 |
patches/busybox/1.7.4/1.7.4-make-3.82.diff | 42 ------- |
14 |
patches/busybox/1.7.4/1.7.4-mdstart.diff | 122 ------------------- |
15 |
.../busybox/1.7.4/1.7.4-mount-umount-i-option.diff | 24 ---- |
16 |
patches/busybox/1.7.4/1.7.4-openvt.diff | 20 --- |
17 |
patches/busybox/1.7.4/1.7.4-static-error.diff | 23 ---- |
18 |
patches/busybox/1.7.4/README | 19 --- |
19 |
.../busybox/1.7.4/busybox-1.7.4-signal-hack.patch | 28 ----- |
20 |
9 files changed, 10 insertions(+), 401 deletions(-) |
21 |
|
22 |
diff --git a/ChangeLog b/ChangeLog |
23 |
index bb75a15..a758762 100644 |
24 |
--- a/ChangeLog |
25 |
+++ b/ChangeLog |
26 |
@@ -5,6 +5,16 @@ |
27 |
# Distributed under the GPL v2 |
28 |
# $Id$ |
29 |
|
30 |
+ 31 Jul 2011; Sebastian Pipping <sping@g.o> |
31 |
+ -patches/busybox/1.7.4/1.7.4-ash-timeout.diff, |
32 |
+ -patches/busybox/1.7.4/1.7.4-mdstart.diff, |
33 |
+ -patches/busybox/1.7.4/1.7.4-mount-umount-i-option.diff, |
34 |
+ -patches/busybox/1.7.4/1.7.4-openvt.diff, |
35 |
+ -patches/busybox/1.7.4/1.7.4-static-error.diff, |
36 |
+ -patches/busybox/1.7.4/1.7.4-make-3.82.diff, -patches/busybox/1.7.4/README, |
37 |
+ -patches/busybox/1.7.4/busybox-1.7.4-signal-hack.patch: |
38 |
+ End support for 4 years old busybox 1.7.4 (bug #377133) |
39 |
+ |
40 |
31 Jul 2011; Sebastian Pipping <sping@g.o> doc/genkernel.8.txt: |
41 |
Improve doc on filing bugs |
42 |
|
43 |
|
44 |
diff --git a/patches/busybox/1.7.4/1.7.4-ash-timeout.diff b/patches/busybox/1.7.4/1.7.4-ash-timeout.diff |
45 |
deleted file mode 100644 |
46 |
index 25d5338..0000000 |
47 |
--- a/patches/busybox/1.7.4/1.7.4-ash-timeout.diff |
48 |
+++ /dev/null |
49 |
@@ -1,123 +0,0 @@ |
50 |
-'read -t' support, forward-ported from Gentoo Busybox 1.1.3. |
51 |
-Used during the LiveCD boot when prompting for a keymap. |
52 |
- |
53 |
-Signed-off-by: Robin H. Johnson <robbat2@g.o> |
54 |
- |
55 |
-diff -Nuar --exclude '*.orig' busybox-1.7.4/shell/ash.c busybox-1.7.4+gentoo/shell/ash.c |
56 |
---- busybox-1.7.4/shell/ash.c 2007-11-03 16:06:35.000000000 -0700 |
57 |
-+++ busybox-1.7.4+gentoo/shell/ash.c 2008-03-11 10:21:28.000000000 -0700 |
58 |
-@@ -11485,11 +11485,13 @@ |
59 |
- int startword; |
60 |
- int status; |
61 |
- int i; |
62 |
-+#if ENABLE_ASH_READ_NCHARS || ENABLE_ASH_READ_TIMEOUT |
63 |
-+ struct termios tty, old_tty; |
64 |
-+#endif |
65 |
- #if ENABLE_ASH_READ_NCHARS |
66 |
- int nch_flag = 0; |
67 |
- int nchars = 0; |
68 |
- int silent = 0; |
69 |
-- struct termios tty, old_tty; |
70 |
- #endif |
71 |
- #if ENABLE_ASH_READ_TIMEOUT |
72 |
- fd_set set; |
73 |
-@@ -11566,44 +11568,74 @@ |
74 |
- ifs = bltinlookup("IFS"); |
75 |
- if (ifs == NULL) |
76 |
- ifs = defifs; |
77 |
--#if ENABLE_ASH_READ_NCHARS |
78 |
-+#if ENABLE_ASH_READ_NCHARS || ENABLE_ASH_READ_TIMEOUT |
79 |
-+#if ENABLE_ASH_READ_NCHARS && ENABLE_ASH_READ_TIMEOUT |
80 |
-+ if (nch_flag || silent || ts.tv_sec || ts.tv_usec) { |
81 |
-+#elif ENABLE_ASH_READ_TIMEOUT |
82 |
-+ if (ts.tv_sec || ts.tv_usec) { |
83 |
-+#elif ENABLE_ASH_READ_NCHARS |
84 |
- if (nch_flag || silent) { |
85 |
-+#endif |
86 |
- tcgetattr(0, &tty); |
87 |
- old_tty = tty; |
88 |
-- if (nch_flag) { |
89 |
-+#if ENABLE_ASH_READ_NCHARS && ENABLE_ASH_READ_TIMEOUT |
90 |
-+ if (nch_flag || ts.tv_sec || ts.tv_usec) |
91 |
-+#elif ENABLE_ASH_READ_TIMEOUT |
92 |
-+ if (ts.tv_sec || ts.tv_usec) |
93 |
-+#elif ENABLE_ASH_READ_NCHARS |
94 |
-+ if (nch_flag) |
95 |
-+#endif |
96 |
- tty.c_lflag &= ~ICANON; |
97 |
-- tty.c_cc[VMIN] = nchars; |
98 |
-- } |
99 |
-- if (silent) { |
100 |
-- tty.c_lflag &= ~(ECHO|ECHOK|ECHONL); |
101 |
- |
102 |
-- } |
103 |
-+ |
104 |
-+#if ENABLE_ASH_READ_NCHARS |
105 |
-+ if (silent) |
106 |
-+ tty.c_lflag &= ~(ECHO|ECHOK|ECHONL); |
107 |
-+#endif |
108 |
- tcsetattr(0, TCSANOW, &tty); |
109 |
- } |
110 |
- #endif |
111 |
-+ i = 1; |
112 |
-+ STARTSTACKSTR(p); |
113 |
- #if ENABLE_ASH_READ_TIMEOUT |
114 |
- if (ts.tv_sec || ts.tv_usec) { |
115 |
- FD_ZERO(&set); |
116 |
- FD_SET(0, &set); |
117 |
- |
118 |
- i = select(FD_SETSIZE, &set, NULL, NULL, &ts); |
119 |
-- if (!i) { |
120 |
-+ if (i == 1) |
121 |
-+ { |
122 |
-+ read(0, &c, 1); |
123 |
-+ if(c == '\n' || c == 4) /* Handle newlines and EOF */ |
124 |
-+ i = 0; /* Don't read further... */ |
125 |
-+ else |
126 |
-+ STPUTC(c, p); /* Ok, keep reading... */ |
127 |
-+ } |
128 |
- #if ENABLE_ASH_READ_NCHARS |
129 |
-- if (nch_flag) |
130 |
-- tcsetattr(0, TCSANOW, &old_tty); |
131 |
-+ if (!silent && !nch_flag) |
132 |
- #endif |
133 |
-- return 1; |
134 |
-+ tcsetattr(0, TCSANOW, &old_tty); |
135 |
-+ |
136 |
-+#if ENABLE_ASH_READ_NCHARS |
137 |
-+ if(i == 0) |
138 |
-+ { |
139 |
-+ nchars = 0; |
140 |
-+ nch_flag = 1; |
141 |
-+ } else |
142 |
-+ { |
143 |
-+ if (nch_flag) |
144 |
-+ nchars--; |
145 |
- } |
146 |
-+#endif |
147 |
- } |
148 |
- #endif |
149 |
- status = 0; |
150 |
- startword = 1; |
151 |
- backslash = 0; |
152 |
-- STARTSTACKSTR(p); |
153 |
- #if ENABLE_ASH_READ_NCHARS |
154 |
- while (!nch_flag || nchars--) |
155 |
- #else |
156 |
-- for (;;) |
157 |
-+ for (;i > 0;) |
158 |
- #endif |
159 |
- { |
160 |
- if (read(0, &c, 1) != 1) { |
161 |
-@@ -11640,8 +11672,10 @@ |
162 |
- } |
163 |
- } |
164 |
- #if ENABLE_ASH_READ_NCHARS |
165 |
-- if (nch_flag || silent) |
166 |
-+ if (silent || nch_flag) |
167 |
- tcsetattr(0, TCSANOW, &old_tty); |
168 |
-+ if (!silent && nch_flag) |
169 |
-+ printf("\n"); |
170 |
- #endif |
171 |
- |
172 |
- STACKSTRNUL(p); |
173 |
|
174 |
diff --git a/patches/busybox/1.7.4/1.7.4-make-3.82.diff b/patches/busybox/1.7.4/1.7.4-make-3.82.diff |
175 |
deleted file mode 100644 |
176 |
index 0559761..0000000 |
177 |
--- a/patches/busybox/1.7.4/1.7.4-make-3.82.diff |
178 |
+++ /dev/null |
179 |
@@ -1,42 +0,0 @@ |
180 |
-From d508d972c7f808eec5139255f661d37817c79260 Mon Sep 17 00:00:00 2001 |
181 |
-From: Sebastian Pipping <sebastian@×××××××.org> |
182 |
-Date: Mon, 29 Nov 2010 09:52:22 +0100 |
183 |
-Subject: [PATCH] Split implicit and normal rules for make 3.82 |
184 |
- |
185 |
---- |
186 |
- Makefile | 12 ++++++++++-- |
187 |
- 1 files changed, 10 insertions(+), 2 deletions(-) |
188 |
- |
189 |
-diff --git a/Makefile b/Makefile |
190 |
-index c1fe21b..a2bfe4b 100644 |
191 |
---- Makefile |
192 |
-+++ Makefile |
193 |
-@@ -402,7 +402,12 @@ ifeq ($(config-targets),1) |
194 |
- -include $(srctree)/arch/$(ARCH)/Makefile |
195 |
- export KBUILD_DEFCONFIG |
196 |
- |
197 |
--config %config: scripts_basic outputmakefile FORCE |
198 |
-+config: scripts_basic outputmakefile FORCE |
199 |
-+ $(Q)mkdir -p include |
200 |
-+ $(Q)$(MAKE) $(build)=scripts/kconfig $@ |
201 |
-+ $(Q)$(MAKE) -C $(srctree) KBUILD_SRC= .kernelrelease |
202 |
-+ |
203 |
-+%config: scripts_basic outputmakefile FORCE |
204 |
- $(Q)mkdir -p include |
205 |
- $(Q)$(MAKE) $(build)=scripts/kconfig $@ |
206 |
- $(Q)$(MAKE) -C $(srctree) KBUILD_SRC= .kernelrelease |
207 |
-@@ -1239,7 +1244,10 @@ endif |
208 |
- $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@) |
209 |
- |
210 |
- # Modules |
211 |
--/ %/: prepare scripts FORCE |
212 |
-+/: prepare scripts FORCE |
213 |
-+ $(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1) \ |
214 |
-+ $(build)=$(build-dir) |
215 |
-+%/: prepare scripts FORCE |
216 |
- $(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1) \ |
217 |
- $(build)=$(build-dir) |
218 |
- %.ko: prepare scripts FORCE |
219 |
--- |
220 |
-1.7.3.2 |
221 |
- |
222 |
|
223 |
diff --git a/patches/busybox/1.7.4/1.7.4-mdstart.diff b/patches/busybox/1.7.4/1.7.4-mdstart.diff |
224 |
deleted file mode 100644 |
225 |
index c6a9d6d..0000000 |
226 |
--- a/patches/busybox/1.7.4/1.7.4-mdstart.diff |
227 |
+++ /dev/null |
228 |
@@ -1,122 +0,0 @@ |
229 |
-Forward-port the old mdstart tool from the Gentoo Busybox-1.1.3. |
230 |
-Only fires the RAID_AUTORUN ioctl on existing /dev/md nodes. |
231 |
- |
232 |
-Signed-off-by: Robin H. Johnson <robbat2@g.o> |
233 |
- |
234 |
-diff -Nuar --exclude '*.orig' busybox-1.7.4/include/applets.h busybox-1.7.4+gentoo/include/applets.h |
235 |
---- busybox-1.7.4/include/applets.h 2007-09-03 04:48:46.000000000 -0700 |
236 |
-+++ busybox-1.7.4+gentoo/include/applets.h 2008-03-11 10:25:43.000000000 -0700 |
237 |
-@@ -222,6 +222,7 @@ |
238 |
- USE_MATCHPATHCON(APPLET(matchpathcon, _BB_DIR_USR_SBIN, _BB_SUID_NEVER)) |
239 |
- USE_MD5SUM(APPLET_ODDNAME(md5sum, md5_sha1_sum, _BB_DIR_USR_BIN, _BB_SUID_NEVER, md5sum)) |
240 |
- USE_MDEV(APPLET(mdev, _BB_DIR_SBIN, _BB_SUID_NEVER)) |
241 |
-+USE_MDSTART(APPLET(mdstart, _BB_DIR_SBIN, _BB_SUID_NEVER)) |
242 |
- USE_MESG(APPLET(mesg, _BB_DIR_USR_BIN, _BB_SUID_NEVER)) |
243 |
- USE_MKDIR(APPLET_NOFORK(mkdir, mkdir, _BB_DIR_BIN, _BB_SUID_NEVER, mkdir)) |
244 |
- //USE_MKE2FS(APPLET(mke2fs, _BB_DIR_SBIN, _BB_SUID_NEVER)) |
245 |
-diff -Nuar --exclude '*.orig' busybox-1.7.4/include/usage.h busybox-1.7.4+gentoo/include/usage.h |
246 |
---- busybox-1.7.4/include/usage.h 2007-09-03 04:48:46.000000000 -0700 |
247 |
-+++ busybox-1.7.4+gentoo/include/usage.h 2008-03-11 10:19:04.000000000 -0700 |
248 |
-@@ -2072,6 +2072,11 @@ |
249 |
- "the last line match .* to override this.)\n\n" \ |
250 |
- ) |
251 |
- |
252 |
-+#define mdstart_trivial_usage \ |
253 |
-+ "{[PARTITION] MD-NODE}..." |
254 |
-+#define mdstart_full_usage \ |
255 |
-+ "Run the RAID_AUTORUN ioctl on the given MD number" |
256 |
-+ |
257 |
- #define mesg_trivial_usage \ |
258 |
- "[y|n]" |
259 |
- #define mesg_full_usage \ |
260 |
-diff -Nuar --exclude '*.orig' busybox-1.7.4/util-linux/Config.in busybox-1.7.4+gentoo/util-linux/Config.in |
261 |
---- busybox-1.7.4/util-linux/Config.in 2007-09-03 04:48:56.000000000 -0700 |
262 |
-+++ busybox-1.7.4+gentoo/util-linux/Config.in 2008-03-11 10:26:20.000000000 -0700 |
263 |
-@@ -305,6 +305,13 @@ |
264 |
- /lib/firmware/ and if it exists, send it to the kernel for |
265 |
- loading into the hardware. |
266 |
- |
267 |
-+config MDSTART |
268 |
-+ bool "mdstart" |
269 |
-+ default n |
270 |
-+ help |
271 |
-+ Allows you to autostart /dev/md devices if using an initramfs to |
272 |
-+ boot. |
273 |
-+ |
274 |
- config MKSWAP |
275 |
- bool "mkswap" |
276 |
- default n |
277 |
-diff -Nuar --exclude '*.orig' busybox-1.7.4/util-linux/Kbuild busybox-1.7.4+gentoo/util-linux/Kbuild |
278 |
---- busybox-1.7.4/util-linux/Kbuild 2007-09-03 04:48:56.000000000 -0700 |
279 |
-+++ busybox-1.7.4+gentoo/util-linux/Kbuild 2008-03-11 10:28:47.000000000 -0700 |
280 |
-@@ -18,6 +18,7 @@ |
281 |
- lib-$(CONFIG_IPCRM) +=ipcrm.o |
282 |
- lib-$(CONFIG_IPCS) +=ipcs.o |
283 |
- lib-$(CONFIG_LOSETUP) +=losetup.o |
284 |
-+lib-$(CONFIG_MDSTART) +=mdStart.o |
285 |
- lib-$(CONFIG_MDEV) +=mdev.o |
286 |
- lib-$(CONFIG_MKFS_MINIX) +=mkfs_minix.o |
287 |
- lib-$(CONFIG_MKSWAP) +=mkswap.o |
288 |
-diff -Nuar --exclude '*.orig' busybox-1.7.4/util-linux/mdStart.c busybox-1.7.4+gentoo/util-linux/mdStart.c |
289 |
---- busybox-1.7.4/util-linux/mdStart.c 1969-12-31 16:00:00.000000000 -0800 |
290 |
-+++ busybox-1.7.4+gentoo/util-linux/mdStart.c 2008-03-11 10:19:04.000000000 -0700 |
291 |
-@@ -0,0 +1,59 @@ |
292 |
-+/* |
293 |
-+ * Linux 2.6(+) RAID Autostarter |
294 |
-+ * |
295 |
-+ * Copyright (C) 2005 by Tim Yamin <plasmaroo@g.o> <plasm@××××××.uk> |
296 |
-+ * |
297 |
-+ * This program is free software; you can redistribute it and/or modify |
298 |
-+ * it under the terms of the GNU General Public License as published by |
299 |
-+ * the Free Software Foundation; either version 2 of the License, or |
300 |
-+ * (at your option) any later version. |
301 |
-+ * |
302 |
-+ * This program is distributed in the hope that it will be useful, |
303 |
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of |
304 |
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
305 |
-+ * General Public License for more details. |
306 |
-+ * |
307 |
-+ * You should have received a copy of the GNU General Public License |
308 |
-+ * along with this program; if not, write to the Free Software |
309 |
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
310 |
-+ * |
311 |
-+ */ |
312 |
-+ |
313 |
-+#include <sys/types.h> |
314 |
-+#include <sys/stat.h> |
315 |
-+#include <fcntl.h> |
316 |
-+#include <sys/ioctl.h> |
317 |
-+#include <linux/major.h> |
318 |
-+#include <linux/raid/md_u.h> |
319 |
-+ |
320 |
-+extern int |
321 |
-+mdstart_main(int argc, char *argv[]) |
322 |
-+{ |
323 |
-+ int i, fd, part = 0, retval = 0; |
324 |
-+ |
325 |
-+ if(argc < 2) |
326 |
-+ { |
327 |
-+ bb_show_usage(); |
328 |
-+ } |
329 |
-+ |
330 |
-+ for(i = 1; i < argc; i++) |
331 |
-+ { |
332 |
-+ if(sscanf(argv[i], "%d", &part) == 1) |
333 |
-+ continue; |
334 |
-+ |
335 |
-+ fd = open(argv[i], 0, 0); |
336 |
-+ if (fd >= 0) |
337 |
-+ { |
338 |
-+ ioctl(fd, RAID_AUTORUN, part); |
339 |
-+ close(fd); |
340 |
-+ } else |
341 |
-+ { |
342 |
-+ printf("Error: Failed to open %s!\n", argv[i]); |
343 |
-+ retval=1; |
344 |
-+ } |
345 |
-+ |
346 |
-+ part = 0; |
347 |
-+ } |
348 |
-+ |
349 |
-+ return retval; |
350 |
-+} |
351 |
|
352 |
diff --git a/patches/busybox/1.7.4/1.7.4-mount-umount-i-option.diff b/patches/busybox/1.7.4/1.7.4-mount-umount-i-option.diff |
353 |
deleted file mode 100644 |
354 |
index 1c4029e..0000000 |
355 |
--- a/patches/busybox/1.7.4/1.7.4-mount-umount-i-option.diff |
356 |
+++ /dev/null |
357 |
@@ -1,24 +0,0 @@ |
358 |
-diff -ru busybox-1.7.4.orig/util-linux/mount.c busybox-1.7.4/util-linux/mount.c |
359 |
---- busybox-1.7.4.orig/util-linux/mount.c 2007-09-03 06:48:56.000000000 -0500 |
360 |
-+++ busybox-1.7.4/util-linux/mount.c 2008-11-13 21:12:06.000000000 -0600 |
361 |
-@@ -1554,7 +1554,7 @@ |
362 |
- |
363 |
- // Parse remaining options |
364 |
- |
365 |
-- opt = getopt32(argv, "o:t:rwanfvs", &opt_o, &fstype); |
366 |
-+ opt = getopt32(argv, "o:t:rwanfvsi", &opt_o, &fstype); |
367 |
- if (opt & 0x1) append_mount_options(&cmdopts, opt_o); // -o |
368 |
- //if (opt & 0x2) // -t |
369 |
- if (opt & 0x4) append_mount_options(&cmdopts, "ro"); // -r |
370 |
-diff -ru busybox-1.7.4.orig/util-linux/umount.c busybox-1.7.4/util-linux/umount.c |
371 |
---- busybox-1.7.4.orig/util-linux/umount.c 2007-09-03 06:48:56.000000000 -0500 |
372 |
-+++ busybox-1.7.4/util-linux/umount.c 2008-11-13 16:13:03.000000000 -0600 |
373 |
-@@ -12,7 +12,7 @@ |
374 |
- #include <getopt.h> |
375 |
- #include "libbb.h" |
376 |
- |
377 |
--#define OPTION_STRING "flDnravdt:" |
378 |
-+#define OPTION_STRING "flDnravdt:i" |
379 |
- #define OPT_FORCE 1 |
380 |
- #define OPT_LAZY 2 |
381 |
- #define OPT_DONTFREELOOP 4 |
382 |
|
383 |
diff --git a/patches/busybox/1.7.4/1.7.4-openvt.diff b/patches/busybox/1.7.4/1.7.4-openvt.diff |
384 |
deleted file mode 100644 |
385 |
index aa9e77f..0000000 |
386 |
--- a/patches/busybox/1.7.4/1.7.4-openvt.diff |
387 |
+++ /dev/null |
388 |
@@ -1,20 +0,0 @@ |
389 |
-Allow a slightly wider range of valid vt numbers. Forward-ported from Gentoo |
390 |
-Busybox 1.1.3. |
391 |
- |
392 |
-The previous spin of this patch on 1.1.3 had a 'wait(NULL);' right before |
393 |
-return EXIT_SUCCESS. I don't think it's needed anymore, so I left it out. |
394 |
- |
395 |
-Signed-off-by: Robin H. Johnson <robbat2@g.o> |
396 |
- |
397 |
-diff -Nuar --exclude '*.orig' busybox-1.7.4/console-tools/openvt.c busybox-1.7.4+gentoo/console-tools/openvt.c |
398 |
---- busybox-1.7.4/console-tools/openvt.c 2007-09-03 04:48:35.000000000 -0700 |
399 |
-+++ busybox-1.7.4+gentoo/console-tools/openvt.c 2008-03-10 10:00:55.000000000 -0700 |
400 |
-@@ -21,7 +21,7 @@ |
401 |
- bb_show_usage(); |
402 |
- |
403 |
- /* check for illegal vt number: < 1 or > 63 */ |
404 |
-- sprintf(vtname, VC_FORMAT, (int)xatou_range(argv[1], 1, 63)); |
405 |
-+ sprintf(vtname, VC_FORMAT, (int)xatou_range(argv[1], 0, 63)); |
406 |
- |
407 |
- bb_daemonize_or_rexec(DAEMON_CLOSE_EXTRA_FDS, argv); |
408 |
- /* grab new one */ |
409 |
|
410 |
diff --git a/patches/busybox/1.7.4/1.7.4-static-error.diff b/patches/busybox/1.7.4/1.7.4-static-error.diff |
411 |
deleted file mode 100644 |
412 |
index 1e3b59c..0000000 |
413 |
--- a/patches/busybox/1.7.4/1.7.4-static-error.diff |
414 |
+++ /dev/null |
415 |
@@ -1,23 +0,0 @@ |
416 |
-diff -ur busybox-1.7.4.orig/applets/applets.c busybox-1.7.4/applets/applets.c |
417 |
---- busybox-1.7.4.orig/applets/applets.c 2007-09-16 13:48:10.000000000 -0500 |
418 |
-+++ busybox-1.7.4/applets/applets.c 2008-03-11 13:53:18.000000000 -0500 |
419 |
-@@ -23,7 +23,6 @@ |
420 |
- #warning Note that glibc is unsuitable for static linking anyway. |
421 |
- #warning If you still want to do it, remove -Wl,--gc-sections |
422 |
- #warning from top-level Makefile and remove this warning. |
423 |
--#error Aborting compilation. |
424 |
- #endif |
425 |
- |
426 |
- |
427 |
-diff -ur busybox-1.7.4.orig/Makefile busybox-1.7.4/Makefile |
428 |
---- busybox-1.7.4.orig/Makefile 2007-11-23 22:34:41.000000000 -0600 |
429 |
-+++ busybox-1.7.4/Makefile 2008-03-12 06:35:25.000000000 -0500 |
430 |
-@@ -570,7 +570,7 @@ |
431 |
- quiet_cmd_busybox__ ?= LINK $@ |
432 |
- cmd_busybox__ ?= $(srctree)/scripts/trylink $(CC) $(LDFLAGS) \ |
433 |
- -o $@ -Wl,-Map -Wl,$@.map \ |
434 |
-- -Wl,--warn-common -Wl,--sort-common -Wl,--gc-sections \ |
435 |
-+ -Wl,--warn-common -Wl,--sort-common \ |
436 |
- -Wl,--start-group $(busybox-all) -Wl,--end-group \ |
437 |
- $(LDLIBS) |
438 |
- |
439 |
|
440 |
diff --git a/patches/busybox/1.7.4/README b/patches/busybox/1.7.4/README |
441 |
deleted file mode 100644 |
442 |
index 6061dc7..0000000 |
443 |
--- a/patches/busybox/1.7.4/README |
444 |
+++ /dev/null |
445 |
@@ -1,19 +0,0 @@ |
446 |
-1.7.4-ash-timeout.diff: |
447 |
-This patch adds support for the -t option to the 'read' command in ash. It's |
448 |
-used for prompting for the keymap. It originated with 1.1.3+gentoo or earlier. |
449 |
- |
450 |
-1.7.4-mdstart.diff: |
451 |
-This adds a 'mdstart' command to busybox, which is used for the activation of |
452 |
-individual mdraid arrays. It originated with 1.1.3+gentoo or earlier. |
453 |
- |
454 |
-1.7.4-openvt.diff: |
455 |
-It is unknown what problem this patch fixes. It may no longer be needed. |
456 |
- |
457 |
-1.7.4-static-error.diff: |
458 |
-This allows us to build busybox statically, even though upstream frowns upon it. |
459 |
-It's important that the removal of -Wl,--gc-sections remains, or ash will be |
460 |
-broken in the resulting busybox. This patch is based on the busybox ebuild. |
461 |
- |
462 |
-busybox-1.7.4-signal-hack.patch: |
463 |
-It is unknown what this patch does. It may no longer be needed. |
464 |
- |
465 |
|
466 |
diff --git a/patches/busybox/1.7.4/busybox-1.7.4-signal-hack.patch b/patches/busybox/1.7.4/busybox-1.7.4-signal-hack.patch |
467 |
deleted file mode 100644 |
468 |
index ba11830..0000000 |
469 |
--- a/patches/busybox/1.7.4/busybox-1.7.4-signal-hack.patch |
470 |
+++ /dev/null |
471 |
@@ -1,28 +0,0 @@ |
472 |
-workaround while we get it fixed upstream |
473 |
- |
474 |
-http://bugs.gentoo.org/201114 |
475 |
- |
476 |
---- libbb/u_signal_names.c |
477 |
-+++ libbb/u_signal_names.c |
478 |
-@@ -66,7 +66,7 @@ |
479 |
- #ifdef SIGTERM |
480 |
- [SIGTERM ] = "TERM", |
481 |
- #endif |
482 |
--#ifdef SIGSTKFLT |
483 |
-+#if defined(SIGSTKFLT) && SIGSTKFLT < 32 |
484 |
- [SIGSTKFLT] = "STKFLT", |
485 |
- #endif |
486 |
- #ifdef SIGCHLD |
487 |
-@@ -90,10 +90,10 @ |
488 |
- #ifdef SIGURG |
489 |
- [SIGURG ] = "URG", |
490 |
- #endif |
491 |
--#ifdef SIGXCPU |
492 |
-+#if defined(SIGXCPU) && SIGXCPU < 32 |
493 |
- [SIGXCPU ] = "XCPU", |
494 |
- #endif |
495 |
--#ifdef SIGXFSZ |
496 |
-+#if defined(SIGXFSZ) && SIGXFSZ < 32 |
497 |
- [SIGXFSZ ] = "XFSZ", |
498 |
- #endif |
499 |
- #ifdef SIGVTALRM |