busybox: 1.21.0 platform fix-on-fix
authorPeter Korsgaard <jacmet@sunsite.dk>
Wed, 27 Feb 2013 18:23:58 +0000 (19:23 +0100)
committerPeter Korsgaard <jacmet@sunsite.dk>
Wed, 27 Feb 2013 18:23:58 +0000 (19:23 +0100)
The unxz hunk was missing.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
package/busybox/busybox-1.21.0/busybox-1.21.0-platform.patch

index 2401b86af5d1e5d877eebfa97d37cbc4a2274c9b..9be6cb8f21d9e45fc9685c12c62625ecbb1e0404 100644 (file)
@@ -1,3 +1,16 @@
+--- busybox-1.21.0/archival/libarchive/decompress_unxz.c
++++ busybox-1.21.0-platform/archival/libarchive/decompress_unxz.c
+@@ -30,8 +30,8 @@ static uint32_t xz_crc32(const uint8_t *
+ /* We use arch-optimized unaligned accessors */
+ #define get_unaligned_le32(buf) ({ uint32_t v; move_from_unaligned32(v, buf); SWAP_LE32(v); })
+ #define get_unaligned_be32(buf) ({ uint32_t v; move_from_unaligned32(v, buf); SWAP_BE32(v); })
+-#define put_unaligned_le32(val, buf) move_to_unaligned16(buf, SWAP_LE32(val))
+-#define put_unaligned_be32(val, buf) move_to_unaligned16(buf, SWAP_BE32(val))
++#define put_unaligned_le32(val, buf) move_to_unaligned32(buf, SWAP_LE32(val))
++#define put_unaligned_be32(val, buf) move_to_unaligned32(buf, SWAP_BE32(val))
+ #include "unxz/xz_dec_bcj.c"
+ #include "unxz/xz_dec_lzma2.c"
 --- busybox-1.21.0/include/platform.h
 +++ busybox-1.21.0-platform/include/platform.h
 @@ -228,7 +228,7 @@ typedef uint32_t bb__aliased_uint32_t FI