From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1QnN0U-0003iS-He for garchives@archives.gentoo.org; Sun, 31 Jul 2011 03:48:03 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 095B021C137; Sun, 31 Jul 2011 03:47:53 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id A951721C137 for ; Sun, 31 Jul 2011 03:47:53 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 269871B4028 for ; Sun, 31 Jul 2011 03:47:53 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 8690B80044 for ; Sun, 31 Jul 2011 03:47:52 +0000 (UTC) From: "Sebastian Pipping" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sebastian Pipping" Message-ID: <7296be47b869ef3d86b1a1b6622092a925ae0faf.sping@gentoo> Subject: [gentoo-commits] proj/genkernel:master commit in: /, patches/busybox/1.7.4/ X-VCS-Repository: proj/genkernel X-VCS-Files: ChangeLog patches/busybox/1.7.4/1.7.4-ash-timeout.diff patches/busybox/1.7.4/1.7.4-make-3.82.diff patches/busybox/1.7.4/1.7.4-mdstart.diff patches/busybox/1.7.4/1.7.4-mount-umount-i-option.diff patches/busybox/1.7.4/1.7.4-openvt.diff patches/busybox/1.7.4/1.7.4-static-error.diff patches/busybox/1.7.4/README patches/busybox/1.7.4/busybox-1.7.4-signal-hack.patch X-VCS-Directories: / patches/busybox/1.7.4/ X-VCS-Committer: sping X-VCS-Committer-Name: Sebastian Pipping X-VCS-Revision: 7296be47b869ef3d86b1a1b6622092a925ae0faf Date: Sun, 31 Jul 2011 03:47:52 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 8472985d4927fcef431b935b98324028 commit: 7296be47b869ef3d86b1a1b6622092a925ae0faf Author: Sebastian Pipping pipping org> AuthorDate: Sun Jul 31 03:47:16 2011 +0000 Commit: Sebastian Pipping gentoo org> CommitDate: Sun Jul 31 03:47:16 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/genkernel.git= ;a=3Dcommit;h=3D7296be47 End support for 4 years old busybox 1.7.4 (bug #377133) --- ChangeLog | 10 ++ patches/busybox/1.7.4/1.7.4-ash-timeout.diff | 123 --------------= ------ patches/busybox/1.7.4/1.7.4-make-3.82.diff | 42 ------- patches/busybox/1.7.4/1.7.4-mdstart.diff | 122 --------------= ----- .../busybox/1.7.4/1.7.4-mount-umount-i-option.diff | 24 ---- patches/busybox/1.7.4/1.7.4-openvt.diff | 20 --- patches/busybox/1.7.4/1.7.4-static-error.diff | 23 ---- patches/busybox/1.7.4/README | 19 --- .../busybox/1.7.4/busybox-1.7.4-signal-hack.patch | 28 ----- 9 files changed, 10 insertions(+), 401 deletions(-) diff --git a/ChangeLog b/ChangeLog index bb75a15..a758762 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,16 @@ # Distributed under the GPL v2 # $Id$ =20 + 31 Jul 2011; Sebastian Pipping + -patches/busybox/1.7.4/1.7.4-ash-timeout.diff, + -patches/busybox/1.7.4/1.7.4-mdstart.diff, + -patches/busybox/1.7.4/1.7.4-mount-umount-i-option.diff, + -patches/busybox/1.7.4/1.7.4-openvt.diff, + -patches/busybox/1.7.4/1.7.4-static-error.diff, + -patches/busybox/1.7.4/1.7.4-make-3.82.diff, -patches/busybox/1.7.4/RE= ADME, + -patches/busybox/1.7.4/busybox-1.7.4-signal-hack.patch: + End support for 4 years old busybox 1.7.4 (bug #377133) + 31 Jul 2011; Sebastian Pipping doc/genkernel.8.txt: Improve doc on filing bugs =20 diff --git a/patches/busybox/1.7.4/1.7.4-ash-timeout.diff b/patches/busyb= ox/1.7.4/1.7.4-ash-timeout.diff deleted file mode 100644 index 25d5338..0000000 --- a/patches/busybox/1.7.4/1.7.4-ash-timeout.diff +++ /dev/null @@ -1,123 +0,0 @@ -'read -t' support, forward-ported from Gentoo Busybox 1.1.3. -Used during the LiveCD boot when prompting for a keymap. - -Signed-off-by: Robin H. Johnson - -diff -Nuar --exclude '*.orig' busybox-1.7.4/shell/ash.c busybox-1.7.4+ge= ntoo/shell/ash.c ---- busybox-1.7.4/shell/ash.c 2007-11-03 16:06:35.000000000 -0700 -+++ busybox-1.7.4+gentoo/shell/ash.c 2008-03-11 10:21:28.000000000 -0700 -@@ -11485,11 +11485,13 @@ - int startword; - int status; - int i; -+#if ENABLE_ASH_READ_NCHARS || ENABLE_ASH_READ_TIMEOUT -+ struct termios tty, old_tty; -+#endif - #if ENABLE_ASH_READ_NCHARS - int nch_flag =3D 0; - int nchars =3D 0; - int silent =3D 0; -- struct termios tty, old_tty; - #endif - #if ENABLE_ASH_READ_TIMEOUT - fd_set set; -@@ -11566,44 +11568,74 @@ - ifs =3D bltinlookup("IFS"); - if (ifs =3D=3D NULL) - ifs =3D defifs; --#if ENABLE_ASH_READ_NCHARS -+#if ENABLE_ASH_READ_NCHARS || ENABLE_ASH_READ_TIMEOUT -+#if ENABLE_ASH_READ_NCHARS && ENABLE_ASH_READ_TIMEOUT -+ if (nch_flag || silent || ts.tv_sec || ts.tv_usec) { -+#elif ENABLE_ASH_READ_TIMEOUT -+ if (ts.tv_sec || ts.tv_usec) { -+#elif ENABLE_ASH_READ_NCHARS - if (nch_flag || silent) { -+#endif - tcgetattr(0, &tty); - old_tty =3D tty; -- if (nch_flag) { -+#if ENABLE_ASH_READ_NCHARS && ENABLE_ASH_READ_TIMEOUT -+ if (nch_flag || ts.tv_sec || ts.tv_usec) -+#elif ENABLE_ASH_READ_TIMEOUT -+ if (ts.tv_sec || ts.tv_usec) -+#elif ENABLE_ASH_READ_NCHARS -+ if (nch_flag) -+#endif - tty.c_lflag &=3D ~ICANON; -- tty.c_cc[VMIN] =3D nchars; -- } -- if (silent) { -- tty.c_lflag &=3D ~(ECHO|ECHOK|ECHONL); -=20 -- } -+ -+#if ENABLE_ASH_READ_NCHARS -+ if (silent) -+ tty.c_lflag &=3D ~(ECHO|ECHOK|ECHONL); -+#endif - tcsetattr(0, TCSANOW, &tty); - } - #endif -+ i =3D 1; -+ STARTSTACKSTR(p); - #if ENABLE_ASH_READ_TIMEOUT - if (ts.tv_sec || ts.tv_usec) { - FD_ZERO(&set); - FD_SET(0, &set); -=20 - i =3D select(FD_SETSIZE, &set, NULL, NULL, &ts); -- if (!i) { -+ if (i =3D=3D 1) -+ { -+ read(0, &c, 1); -+ if(c =3D=3D '\n' || c =3D=3D 4) /* Handle newlines and EOF */ -+ i =3D 0; /* Don't read further... */ -+ else -+ STPUTC(c, p); /* Ok, keep reading... */ -+ } - #if ENABLE_ASH_READ_NCHARS -- if (nch_flag) -- tcsetattr(0, TCSANOW, &old_tty); -+ if (!silent && !nch_flag) - #endif -- return 1; -+ tcsetattr(0, TCSANOW, &old_tty); -+ -+#if ENABLE_ASH_READ_NCHARS -+ if(i =3D=3D 0) -+ { -+ nchars =3D 0; -+ nch_flag =3D 1; -+ } else -+ { -+ if (nch_flag) -+ nchars--; - } -+#endif - } - #endif - status =3D 0; - startword =3D 1; - backslash =3D 0; -- STARTSTACKSTR(p); - #if ENABLE_ASH_READ_NCHARS - while (!nch_flag || nchars--) - #else -- for (;;) -+ for (;i > 0;) - #endif - { - if (read(0, &c, 1) !=3D 1) { -@@ -11640,8 +11672,10 @@ - } - } - #if ENABLE_ASH_READ_NCHARS -- if (nch_flag || silent) -+ if (silent || nch_flag) - tcsetattr(0, TCSANOW, &old_tty); -+ if (!silent && nch_flag) -+ printf("\n"); - #endif -=20 - STACKSTRNUL(p); 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 deleted file mode 100644 index 0559761..0000000 --- a/patches/busybox/1.7.4/1.7.4-make-3.82.diff +++ /dev/null @@ -1,42 +0,0 @@ -From d508d972c7f808eec5139255f661d37817c79260 Mon Sep 17 00:00:00 2001 -From: Sebastian Pipping -Date: Mon, 29 Nov 2010 09:52:22 +0100 -Subject: [PATCH] Split implicit and normal rules for make 3.82 - ---- - Makefile | 12 ++++++++++-- - 1 files changed, 10 insertions(+), 2 deletions(-) - -diff --git a/Makefile b/Makefile -index c1fe21b..a2bfe4b 100644 ---- Makefile -+++ Makefile -@@ -402,7 +402,12 @@ ifeq ($(config-targets),1) - -include $(srctree)/arch/$(ARCH)/Makefile - export KBUILD_DEFCONFIG -=20 --config %config: scripts_basic outputmakefile FORCE -+config: scripts_basic outputmakefile FORCE -+ $(Q)mkdir -p include -+ $(Q)$(MAKE) $(build)=3Dscripts/kconfig $@ -+ $(Q)$(MAKE) -C $(srctree) KBUILD_SRC=3D .kernelrelease -+ -+%config: scripts_basic outputmakefile FORCE - $(Q)mkdir -p include - $(Q)$(MAKE) $(build)=3Dscripts/kconfig $@ - $(Q)$(MAKE) -C $(srctree) KBUILD_SRC=3D .kernelrelease -@@ -1239,7 +1244,10 @@ endif - $(Q)$(MAKE) $(build)=3D$(build-dir) $(target-dir)$(notdir $@) -=20 - # Modules --/ %/: prepare scripts FORCE -+/: prepare scripts FORCE -+ $(Q)$(MAKE) KBUILD_MODULES=3D$(if $(CONFIG_MODULES),1) \ -+ $(build)=3D$(build-dir) -+%/: prepare scripts FORCE - $(Q)$(MAKE) KBUILD_MODULES=3D$(if $(CONFIG_MODULES),1) \ - $(build)=3D$(build-dir) - %.ko: prepare scripts FORCE ---=20 -1.7.3.2 - diff --git a/patches/busybox/1.7.4/1.7.4-mdstart.diff b/patches/busybox/1= .7.4/1.7.4-mdstart.diff deleted file mode 100644 index c6a9d6d..0000000 --- a/patches/busybox/1.7.4/1.7.4-mdstart.diff +++ /dev/null @@ -1,122 +0,0 @@ -Forward-port the old mdstart tool from the Gentoo Busybox-1.1.3. -Only fires the RAID_AUTORUN ioctl on existing /dev/md nodes. - -Signed-off-by: Robin H. Johnson - -diff -Nuar --exclude '*.orig' busybox-1.7.4/include/applets.h busybox-1.= 7.4+gentoo/include/applets.h ---- busybox-1.7.4/include/applets.h 2007-09-03 04:48:46.000000000 -0700 -+++ busybox-1.7.4+gentoo/include/applets.h 2008-03-11 10:25:43.000000000= -0700 -@@ -222,6 +222,7 @@ - USE_MATCHPATHCON(APPLET(matchpathcon, _BB_DIR_USR_SBIN, _BB_SUID_NEVER)= ) - USE_MD5SUM(APPLET_ODDNAME(md5sum, md5_sha1_sum, _BB_DIR_USR_BIN, _BB_SU= ID_NEVER, md5sum)) - USE_MDEV(APPLET(mdev, _BB_DIR_SBIN, _BB_SUID_NEVER)) -+USE_MDSTART(APPLET(mdstart, _BB_DIR_SBIN, _BB_SUID_NEVER)) - USE_MESG(APPLET(mesg, _BB_DIR_USR_BIN, _BB_SUID_NEVER)) - USE_MKDIR(APPLET_NOFORK(mkdir, mkdir, _BB_DIR_BIN, _BB_SUID_NEVER, mkdi= r)) - //USE_MKE2FS(APPLET(mke2fs, _BB_DIR_SBIN, _BB_SUID_NEVER)) -diff -Nuar --exclude '*.orig' busybox-1.7.4/include/usage.h busybox-1.7.= 4+gentoo/include/usage.h ---- busybox-1.7.4/include/usage.h 2007-09-03 04:48:46.000000000 -0700 -+++ busybox-1.7.4+gentoo/include/usage.h 2008-03-11 10:19:04.000000000 -= 0700 -@@ -2072,6 +2072,11 @@ - "the last line match .* to override this.)\n\n" \ - ) -=20 -+#define mdstart_trivial_usage \ -+ "{[PARTITION] MD-NODE}..." -+#define mdstart_full_usage \ -+ "Run the RAID_AUTORUN ioctl on the given MD number" -+=09 - #define mesg_trivial_usage \ - "[y|n]" - #define mesg_full_usage \ -diff -Nuar --exclude '*.orig' busybox-1.7.4/util-linux/Config.in busybox= -1.7.4+gentoo/util-linux/Config.in ---- busybox-1.7.4/util-linux/Config.in 2007-09-03 04:48:56.000000000 -07= 00 -+++ busybox-1.7.4+gentoo/util-linux/Config.in 2008-03-11 10:26:20.000000= 000 -0700 -@@ -305,6 +305,13 @@ - /lib/firmware/ and if it exists, send it to the kernel for - loading into the hardware. -=20 -+config MDSTART -+ bool "mdstart" -+ default n -+ help -+ Allows you to autostart /dev/md devices if using an initramfs to -+ boot. -+ - config MKSWAP - bool "mkswap" - default n -diff -Nuar --exclude '*.orig' busybox-1.7.4/util-linux/Kbuild busybox-1.= 7.4+gentoo/util-linux/Kbuild ---- busybox-1.7.4/util-linux/Kbuild 2007-09-03 04:48:56.000000000 -0700 -+++ busybox-1.7.4+gentoo/util-linux/Kbuild 2008-03-11 10:28:47.000000000= -0700 -@@ -18,6 +18,7 @@ - lib-$(CONFIG_IPCRM) +=3Dipcrm.o - lib-$(CONFIG_IPCS) +=3Dipcs.o - lib-$(CONFIG_LOSETUP) +=3Dlosetup.o -+lib-$(CONFIG_MDSTART) +=3DmdStart.o - lib-$(CONFIG_MDEV) +=3Dmdev.o - lib-$(CONFIG_MKFS_MINIX) +=3Dmkfs_minix.o - lib-$(CONFIG_MKSWAP) +=3Dmkswap.o -diff -Nuar --exclude '*.orig' busybox-1.7.4/util-linux/mdStart.c busybox= -1.7.4+gentoo/util-linux/mdStart.c ---- busybox-1.7.4/util-linux/mdStart.c 1969-12-31 16:00:00.000000000 -08= 00 -+++ busybox-1.7.4+gentoo/util-linux/mdStart.c 2008-03-11 10:19:04.000000= 000 -0700 -@@ -0,0 +1,59 @@ -+/* -+ * Linux 2.6(+) RAID Autostarter -+ * -+ * Copyright (C) 2005 by Tim Yamin -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License as published by -+ * the Free Software Foundation; either version 2 of the License, or -+ * (at your option) any later version. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ * General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software -+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 = USA -+ * -+ */ -+ -+#include -+#include -+#include -+#include -+#include -+#include -+ -+extern int -+mdstart_main(int argc, char *argv[]) -+{ -+ int i, fd, part =3D 0, retval =3D 0; -+ -+ if(argc < 2) -+ { -+ bb_show_usage(); -+ } -+ -+ for(i =3D 1; i < argc; i++) -+ { -+ if(sscanf(argv[i], "%d", &part) =3D=3D 1) -+ continue; -+ -+ fd =3D open(argv[i], 0, 0); -+ if (fd >=3D 0) -+ { -+ ioctl(fd, RAID_AUTORUN, part); -+ close(fd); -+ } else -+ { -+ printf("Error: Failed to open %s!\n", argv[i]); -+ retval=3D1; -+ } -+ -+ part =3D 0; -+ } -+ -+ return retval; -+} diff --git a/patches/busybox/1.7.4/1.7.4-mount-umount-i-option.diff b/pat= ches/busybox/1.7.4/1.7.4-mount-umount-i-option.diff deleted file mode 100644 index 1c4029e..0000000 --- a/patches/busybox/1.7.4/1.7.4-mount-umount-i-option.diff +++ /dev/null @@ -1,24 +0,0 @@ -diff -ru busybox-1.7.4.orig/util-linux/mount.c busybox-1.7.4/util-linux/= mount.c ---- busybox-1.7.4.orig/util-linux/mount.c 2007-09-03 06:48:56.000000000 = -0500 -+++ busybox-1.7.4/util-linux/mount.c 2008-11-13 21:12:06.000000000 -0600 -@@ -1554,7 +1554,7 @@ -=20 - // Parse remaining options -=20 -- opt =3D getopt32(argv, "o:t:rwanfvs", &opt_o, &fstype); -+ opt =3D getopt32(argv, "o:t:rwanfvsi", &opt_o, &fstype); - if (opt & 0x1) append_mount_options(&cmdopts, opt_o); // -o - //if (opt & 0x2) // -t - if (opt & 0x4) append_mount_options(&cmdopts, "ro"); // -r -diff -ru busybox-1.7.4.orig/util-linux/umount.c busybox-1.7.4/util-linux= /umount.c ---- busybox-1.7.4.orig/util-linux/umount.c 2007-09-03 06:48:56.000000000= -0500 -+++ busybox-1.7.4/util-linux/umount.c 2008-11-13 16:13:03.000000000 -060= 0 -@@ -12,7 +12,7 @@ - #include - #include "libbb.h" -=20 --#define OPTION_STRING "flDnravdt:" -+#define OPTION_STRING "flDnravdt:i" - #define OPT_FORCE 1 - #define OPT_LAZY 2 - #define OPT_DONTFREELOOP 4 diff --git a/patches/busybox/1.7.4/1.7.4-openvt.diff b/patches/busybox/1.= 7.4/1.7.4-openvt.diff deleted file mode 100644 index aa9e77f..0000000 --- a/patches/busybox/1.7.4/1.7.4-openvt.diff +++ /dev/null @@ -1,20 +0,0 @@ -Allow a slightly wider range of valid vt numbers. Forward-ported from Ge= ntoo -Busybox 1.1.3. - -The previous spin of this patch on 1.1.3 had a 'wait(NULL);' right befor= e -return EXIT_SUCCESS. I don't think it's needed anymore, so I left it out= . - -Signed-off-by: Robin H. Johnson - -diff -Nuar --exclude '*.orig' busybox-1.7.4/console-tools/openvt.c busyb= ox-1.7.4+gentoo/console-tools/openvt.c ---- busybox-1.7.4/console-tools/openvt.c 2007-09-03 04:48:35.000000000 -= 0700 -+++ busybox-1.7.4+gentoo/console-tools/openvt.c 2008-03-10 10:00:55.0000= 00000 -0700 -@@ -21,7 +21,7 @@ - bb_show_usage(); -=20 - /* check for illegal vt number: < 1 or > 63 */ -- sprintf(vtname, VC_FORMAT, (int)xatou_range(argv[1], 1, 63)); -+ sprintf(vtname, VC_FORMAT, (int)xatou_range(argv[1], 0, 63)); -=20 - bb_daemonize_or_rexec(DAEMON_CLOSE_EXTRA_FDS, argv); - /* grab new one */ diff --git a/patches/busybox/1.7.4/1.7.4-static-error.diff b/patches/busy= box/1.7.4/1.7.4-static-error.diff deleted file mode 100644 index 1e3b59c..0000000 --- a/patches/busybox/1.7.4/1.7.4-static-error.diff +++ /dev/null @@ -1,23 +0,0 @@ -diff -ur busybox-1.7.4.orig/applets/applets.c busybox-1.7.4/applets/appl= ets.c ---- busybox-1.7.4.orig/applets/applets.c 2007-09-16 13:48:10.000000000 -= 0500 -+++ busybox-1.7.4/applets/applets.c 2008-03-11 13:53:18.000000000 -0500 -@@ -23,7 +23,6 @@ - #warning Note that glibc is unsuitable for static linking anyway. - #warning If you still want to do it, remove -Wl,--gc-sections - #warning from top-level Makefile and remove this warning. --#error Aborting compilation. - #endif -=20 -=20 -diff -ur busybox-1.7.4.orig/Makefile busybox-1.7.4/Makefile ---- busybox-1.7.4.orig/Makefile 2007-11-23 22:34:41.000000000 -0600 -+++ busybox-1.7.4/Makefile 2008-03-12 06:35:25.000000000 -0500 -@@ -570,7 +570,7 @@ - quiet_cmd_busybox__ ?=3D LINK $@ - cmd_busybox__ ?=3D $(srctree)/scripts/trylink $(CC) $(LDFLAGS) \ - -o $@ -Wl,-Map -Wl,$@.map \ -- -Wl,--warn-common -Wl,--sort-common -Wl,--gc-sections \ -+ -Wl,--warn-common -Wl,--sort-common \ - -Wl,--start-group $(busybox-all) -Wl,--end-group \ - $(LDLIBS) -=20 diff --git a/patches/busybox/1.7.4/README b/patches/busybox/1.7.4/README deleted file mode 100644 index 6061dc7..0000000 --- a/patches/busybox/1.7.4/README +++ /dev/null @@ -1,19 +0,0 @@ -1.7.4-ash-timeout.diff: -This patch adds support for the -t option to the 'read' command in ash. = It's -used for prompting for the keymap. It originated with 1.1.3+gentoo or ea= rlier. - -1.7.4-mdstart.diff: -This adds a 'mdstart' command to busybox, which is used for the activati= on of -individual mdraid arrays. It originated with 1.1.3+gentoo or earlier. - -1.7.4-openvt.diff: -It is unknown what problem this patch fixes. It may no longer be needed. - -1.7.4-static-error.diff: -This allows us to build busybox statically, even though upstream frowns = upon it. -It's important that the removal of -Wl,--gc-sections remains, or ash wil= l be -broken in the resulting busybox. This patch is based on the busybox ebui= ld. - -busybox-1.7.4-signal-hack.patch: -It is unknown what this patch does. It may no longer be needed. - diff --git a/patches/busybox/1.7.4/busybox-1.7.4-signal-hack.patch b/patc= hes/busybox/1.7.4/busybox-1.7.4-signal-hack.patch deleted file mode 100644 index ba11830..0000000 --- a/patches/busybox/1.7.4/busybox-1.7.4-signal-hack.patch +++ /dev/null @@ -1,28 +0,0 @@ -workaround while we get it fixed upstream - -http://bugs.gentoo.org/201114 - ---- libbb/u_signal_names.c -+++ libbb/u_signal_names.c -@@ -66,7 +66,7 @@ - #ifdef SIGTERM - [SIGTERM ] =3D "TERM", - #endif --#ifdef SIGSTKFLT -+#if defined(SIGSTKFLT) && SIGSTKFLT < 32 - [SIGSTKFLT] =3D "STKFLT", - #endif - #ifdef SIGCHLD -@@ -90,10 +90,10 @ - #ifdef SIGURG - [SIGURG ] =3D "URG", - #endif --#ifdef SIGXCPU -+#if defined(SIGXCPU) && SIGXCPU < 32 - [SIGXCPU ] =3D "XCPU", - #endif --#ifdef SIGXFSZ -+#if defined(SIGXFSZ) && SIGXFSZ < 32 - [SIGXFSZ ] =3D "XFSZ", - #endif - #ifdef SIGVTALRM