changeset 753:25adf2fe1f86

The unaligned32 fix is in busybox 1.14.1, so bump version in zap patch.
author Rob Landley <rob@landley.net>
date Sun, 21 Jun 2009 19:04:51 -0500
parents 9f6b0cad047c
children 89d64cd65563
files download.sh sources/patches/busybox-fixunaligned32.patch
diffstat 2 files changed, 2 insertions(+), 24 deletions(-) [+]
line wrap: on
line diff
--- a/download.sh	Sat Jun 20 01:57:35 2009 -0500
+++ b/download.sh	Sun Jun 21 19:04:51 2009 -0500
@@ -62,8 +62,8 @@
 # BusyBox.  Adding a native toolchain requires binutils and gcc (above) plus
 # make and bash.
 
-URL=http://www.busybox.net/downloads/busybox-1.14.0.tar.bz2 \
-SHA1=fa9789a9b104887a754ca2cff224b89f427b83cf \
+URL=http://www.busybox.net/downloads/busybox-1.14.1.tar.bz2 \
+SHA1=5399439c4e17b6995cf3634aa16b3cf2bbe47ec3 \
 UNSTABLE=http://busybox.net/downloads/busybox-snapshot.tar.bz2 \
 download || dienow
 
--- a/sources/patches/busybox-fixunaligned32.patch	Sat Jun 20 01:57:35 2009 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-commit 3be2308676607bdb0e901d439e288081c39011a4
-Author: Denis Vlasenko <vda.linux@googlemail.com>
-Date:   Fri Apr 17 22:20:44 2009 +0000
-
-    fix move_to_unaligned32
-
-diff --git a/include/platform.h b/include/platform.h
-index 47fd5f6..317349f 100644
---- a/include/platform.h
-+++ b/include/platform.h
-@@ -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 ------------------------------------------ */