diff options
Diffstat (limited to 'meta/recipes-core')
-rw-r--r-- | meta/recipes-core/busybox/busybox-1.19.4/busybox-mkfs-minix-tests_bigendian.patch | 34 | ||||
-rw-r--r-- | meta/recipes-core/busybox/busybox_1.19.4.bb | 3 |
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 @@ | |||
1 | patch mkfs.minix.tests to have correct md5sum on big endian platform | ||
2 | |||
3 | Upstream-Status: Accepted, expected in next release | ||
4 | |||
5 | Signed-off-by: Yao Zhao <yao.zhao@windriver.com> | ||
6 | |||
7 | diff --git a/testsuite/mkfs.minix.tests b/testsuite/mkfs.minix.tests | ||
8 | index 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 | ||
29 | SRC_URI[tarball.md5sum] = "9c0cae5a0379228e7b55e5b29528df8e" | 30 | SRC_URI[tarball.md5sum] = "9c0cae5a0379228e7b55e5b29528df8e" |
30 | SRC_URI[tarball.sha256sum] = "9b853406da61ffb59eb488495fe99cbb7fb3dd29a31307fcfa9cf070543710ee" | 31 | SRC_URI[tarball.sha256sum] = "9b853406da61ffb59eb488495fe99cbb7fb3dd29a31307fcfa9cf070543710ee" |