summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorYao Zhao <yao.zhao@windriver.com>2012-07-24 10:28:00 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-07-26 14:40:48 +0100
commit30c618a3f5f6701b9a512b76c6ae3e85209fd4e2 (patch)
treeaa876bc0077f29ffc1a403f4d77c8714fca00b63 /meta
parent39c9b208e4beed70373eb8e4454862b4db3995c7 (diff)
downloadpoky-30c618a3f5f6701b9a512b76c6ae3e85209fd4e2.tar.gz
busybox: fix the problem that mkfs.minix.tests fails on big endian platform
patch mkfs.minix.tests to have correct md5sum on big endian platform. (From OE-Core rev: b37e1ea5f29d03efbe136ee7f4fa261a1936ac8f) Signed-off-by: Yao Zhao <yao.zhao@windriver.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-core/busybox/busybox-1.19.4/busybox-mkfs-minix-tests_bigendian.patch34
-rw-r--r--meta/recipes-core/busybox/busybox_1.19.4.bb3
2 files changed, 36 insertions, 1 deletions
diff --git a/meta/recipes-core/busybox/busybox-1.19.4/busybox-mkfs-minix-tests_bigendian.patch b/meta/recipes-core/busybox/busybox-1.19.4/busybox-mkfs-minix-tests_bigendian.patch
new file mode 100644
index 0000000000..089c5e039c
--- /dev/null
+++ b/meta/recipes-core/busybox/busybox-1.19.4/busybox-mkfs-minix-tests_bigendian.patch
@@ -0,0 +1,34 @@
1patch mkfs.minix.tests to have correct md5sum on big endian platform
2
3Upstream-Status: Accepted, expected in next release
4
5Signed-off-by: Yao Zhao <yao.zhao@windriver.com>
6
7diff --git a/testsuite/mkfs.minix.tests b/testsuite/mkfs.minix.tests
8index 8a33c16..7eecaf2 100755
9--- a/testsuite/mkfs.minix.tests
10+++ b/testsuite/mkfs.minix.tests
11@@ -8,6 +8,14 @@
12
13 # testing "test name" "options" "expected result" "file input" "stdin"
14
15+# '\n' produces 10 on little endian, but not on big endian
16+cr=`echo | od -i | sed 's/.* //g;2d'`
17+if [ x"$cr" = x"10" ]; then
18+ hash=4f35f7afeba07d56055bed1f29ae20b7
19+else
20+ hash=5adbc1b3ccd20ca5d0ab5bc1e13ac3fc
21+fi
22+
23 testing "mkfs.minix" \
24 "dd if=/dev/zero of=input bs=1k count=1024 2>/dev/null; mkfs.minix input; md5sum <input" \
25 "352 inodes\n"\
26@@ -15,7 +23,7 @@ testing "mkfs.minix" \
27 "Firstdatazone=15 (15)\n"\
28 "Zonesize=1024\n"\
29 "Maxsize=268966912\n"\
30-"4f35f7afeba07d56055bed1f29ae20b7 -\n" \
31+"$hash -\n" \
32 "" \
33 ""
34
diff --git a/meta/recipes-core/busybox/busybox_1.19.4.bb b/meta/recipes-core/busybox/busybox_1.19.4.bb
index 6e69d22598..cc97e2a853 100644
--- a/meta/recipes-core/busybox/busybox_1.19.4.bb
+++ b/meta/recipes-core/busybox/busybox_1.19.4.bb
@@ -24,7 +24,8 @@ SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \
24 file://mdev \ 24 file://mdev \
25 file://mdev.conf \ 25 file://mdev.conf \
26 file://umount.busybox \ 26 file://umount.busybox \
27 file://defconfig" 27 file://defconfig \
28 file://busybox-mkfs-minix-tests_bigendian.patch"
28 29
29SRC_URI[tarball.md5sum] = "9c0cae5a0379228e7b55e5b29528df8e" 30SRC_URI[tarball.md5sum] = "9c0cae5a0379228e7b55e5b29528df8e"
30SRC_URI[tarball.sha256sum] = "9b853406da61ffb59eb488495fe99cbb7fb3dd29a31307fcfa9cf070543710ee" 31SRC_URI[tarball.sha256sum] = "9b853406da61ffb59eb488495fe99cbb7fb3dd29a31307fcfa9cf070543710ee"