From 3165260921f25826ee89196b8710884af145fd97 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sat, 18 Apr 2009 14:13:53 +0000 Subject: busybox: 1.14.0 fixes --- package/busybox/busybox-1.14.0-acpid.patch | 13 ++++++++++ package/busybox/busybox-1.14.0-defconfig.patch | 11 +++++++++ package/busybox/busybox-1.14.0-unaligned-fix.patch | 28 ---------------------- package/busybox/busybox-1.14.0-unaligned.patch | 14 +++++++++++ 4 files changed, 38 insertions(+), 28 deletions(-) create mode 100644 package/busybox/busybox-1.14.0-acpid.patch create mode 100644 package/busybox/busybox-1.14.0-defconfig.patch delete mode 100644 package/busybox/busybox-1.14.0-unaligned-fix.patch create mode 100644 package/busybox/busybox-1.14.0-unaligned.patch (limited to 'package') diff --git a/package/busybox/busybox-1.14.0-acpid.patch b/package/busybox/busybox-1.14.0-acpid.patch new file mode 100644 index 000000000..7c723d483 --- /dev/null +++ b/package/busybox/busybox-1.14.0-acpid.patch @@ -0,0 +1,13 @@ +--- busybox-1.14.0/util-linux/acpid.c Tue Apr 14 01:43:11 2009 ++++ busybox-1.14.0-acpid/util-linux/acpid.c Sat Apr 18 13:33:19 2009 +@@ -78,8 +78,8 @@ + // goto configuration directory + xchdir(opt_conf); + +-// // setup signals +-// bb_signals(BB_FATAL_SIGS, record_signo); ++ // prevent zombies ++ signal(SIGCHLD, SIG_IGN); + + // no explicit evdev files given? -> use proc event interface + if (!*argv) { diff --git a/package/busybox/busybox-1.14.0-defconfig.patch b/package/busybox/busybox-1.14.0-defconfig.patch new file mode 100644 index 000000000..33d499e77 --- /dev/null +++ b/package/busybox/busybox-1.14.0-defconfig.patch @@ -0,0 +1,11 @@ +--- busybox-1.14.0/scripts/defconfig Tue Apr 14 01:42:52 2009 ++++ busybox-1.14.0-defconfig/scripts/defconfig Fri Apr 17 01:08:24 2009 +@@ -579,7 +579,7 @@ + CONFIG_EJECT=y + CONFIG_FEATURE_EJECT_SCSI=y + CONFIG_FBSPLASH=y +-CONFIG_FLASH_ERASEALL=y ++# CONFIG_FLASH_ERASEALL is not set + CONFIG_IONICE=y + # CONFIG_INOTIFYD is not set + CONFIG_LAST=y diff --git a/package/busybox/busybox-1.14.0-unaligned-fix.patch b/package/busybox/busybox-1.14.0-unaligned-fix.patch deleted file mode 100644 index 33ebd4a4a..000000000 --- a/package/busybox/busybox-1.14.0-unaligned-fix.patch +++ /dev/null @@ -1,28 +0,0 @@ -[PATCH] fix move_to_unaligned32() for !x86 - -get_unaligned() got changed into move_{from,to}_unaligned() in r24334, but -the temporary variabled used to make sure we can take the address of the -source argument for memcpy() got removed. Later on in r26068 dnsd.c got -changed to call move_to_unaligned with htons/htonl as source breaking -the build for !x86. - -Fix it by reintroducing the temporary variable. - -Signed-off-by: Peter Korsgaard ---- - include/platform.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -Index: busybox-1.14.0/include/platform.h -=================================================================== ---- busybox-1.14.0.orig/include/platform.h -+++ busybox-1.14.0/include/platform.h -@@ -173,7 +173,7 @@ - /* performs reasonably well (gcc usually inlines memcpy here) */ - #define move_from_unaligned16(v, u16p) (memcpy(&(v), (u16p), 2)) - #define move_from_unaligned32(v, u32p) (memcpy(&(v), (u32p), 4)) --#define move_to_unaligned32(u32p, v) (memcpy((u32p), &(v), 4)) -+#define move_to_unaligned32(u32p, v) do { uint32_t __t = (v); memcpy((u32p), &__t, 4); } while (0) - #endif - - /* ---- Networking ------------------------------------------ */ diff --git a/package/busybox/busybox-1.14.0-unaligned.patch b/package/busybox/busybox-1.14.0-unaligned.patch new file mode 100644 index 000000000..1306e2121 --- /dev/null +++ b/package/busybox/busybox-1.14.0-unaligned.patch @@ -0,0 +1,14 @@ +--- busybox-1.14.0/include/platform.h Tue Apr 14 01:43:05 2009 ++++ busybox-1.14.0-unaligned/include/platform.h Sat Apr 18 00:14:34 2009 +@@ -173,7 +173,10 @@ + /* performs reasonably well (gcc usually inlines memcpy here) */ + #define move_from_unaligned16(v, u16p) (memcpy(&(v), (u16p), 2)) + #define move_from_unaligned32(v, u32p) (memcpy(&(v), (u32p), 4)) +-#define move_to_unaligned32(u32p, v) (memcpy((u32p), &(v), 4)) ++#define move_to_unaligned32(u32p, v) do { \ ++ uint32_t __t = (v); \ ++ memcpy((u32p), &__t, 4); \ ++} while (0) + #endif + + /* ---- Networking ------------------------------------------ */ -- cgit v1.2.3