summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core
diff options
context:
space:
mode:
authorKang Kai <kai.kang@windriver.com>2013-01-29 13:47:50 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-02-01 15:54:29 +0000
commit8f63fefa5617428b76fc37d2ba2099c872bbe57d (patch)
tree26b4ae48efe74550991769530b21d7c0b37330b6 /meta/recipes-core
parent9a9848d2156783ce65ad734e86fe0c212c26a6c8 (diff)
downloadpoky-8f63fefa5617428b76fc37d2ba2099c872bbe57d.tar.gz
busybox: update test case du-k-works
busybox test case du-k-work fails on ext3/4 image whose size less than 512M. Add patch testsuite-du-du-k-works-fix-false-positive.patch to fix it and it has been merged by upstream. [Yocto 2896] (From OE-Core rev: ffe4f8a859d5e71e3e33363d61f0470a32c48d66) (From OE-Core rev: 19eb2971c6e8c4a2847897919ec7a2cd9b1697b1) Signed-off-by: Kang Kai <kai.kang@windriver.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core')
-rw-r--r--meta/recipes-core/busybox/busybox-1.20.2/testsuite-du-du-k-works-fix-false-positive.patch35
-rw-r--r--meta/recipes-core/busybox/busybox_1.20.2.bb5
2 files changed, 38 insertions, 2 deletions
diff --git a/meta/recipes-core/busybox/busybox-1.20.2/testsuite-du-du-k-works-fix-false-positive.patch b/meta/recipes-core/busybox/busybox-1.20.2/testsuite-du-du-k-works-fix-false-positive.patch
new file mode 100644
index 0000000000..070c41be07
--- /dev/null
+++ b/meta/recipes-core/busybox/busybox-1.20.2/testsuite-du-du-k-works-fix-false-positive.patch
@@ -0,0 +1,35 @@
1Upstream-Status: Accepted
2
3[Yocto 2896]
4
5Signed-off-by: Kang Kai <kai.kang@windriver.com>
6---
7From 03b614739b923994ff0bef74622973ad18fefebd Mon Sep 17 00:00:00 2001
8From: Kang Kai <kai.kang@windriver.com>
9Date: Mon, 28 Jan 2013 14:02:51 +0100
10Subject: [PATCH] testsuite/du/du-k-works: fix false positive
11
12Signed-off-by: Kang Kai <kai.kang@windriver.com>
13Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
14---
15 testsuite/du/du-k-works | 4 ++++
16 1 files changed, 4 insertions(+), 0 deletions(-)
17
18diff --git a/testsuite/du/du-k-works b/testsuite/du/du-k-works
19index 36dcaa8..417b0da 100644
20--- a/testsuite/du/du-k-works
21+++ b/testsuite/du/du-k-works
22@@ -2,6 +2,10 @@ mkdir du.testdir
23 cd du.testdir
24 dd if=/dev/zero of=file1 bs=1k count=64 2>/dev/null
25 dd if=/dev/zero of=file2 bs=1k count=16 2>/dev/null
26+# ext4 on images <512M gives 81kb
27+# ext3 on images <512M gives 83kb
28 test x"`busybox du -k .`" = x"80 ." \
29+ -o x"`busybox du -k .`" = x"81 ." \
30+ -o x"`busybox du -k .`" = x"83 ." \
31 -o x"`busybox du -k .`" = x"84 ." \
32 -o x"`busybox du -k .`" = x"88 ."
33--
341.7.5.4
35
diff --git a/meta/recipes-core/busybox/busybox_1.20.2.bb b/meta/recipes-core/busybox/busybox_1.20.2.bb
index 3e628d239e..783261e4ea 100644
--- a/meta/recipes-core/busybox/busybox_1.20.2.bb
+++ b/meta/recipes-core/busybox/busybox_1.20.2.bb
@@ -1,5 +1,5 @@
1require busybox.inc 1require busybox.inc
2PR = "r4" 2PR = "r5"
3 3
4SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \ 4SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \
5 file://B921600.patch \ 5 file://B921600.patch \
@@ -27,7 +27,8 @@ SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \
27 file://busybox-mkfs-minix-tests_bigendian.patch \ 27 file://busybox-mkfs-minix-tests_bigendian.patch \
28 file://fix-for-spurious-testsuite-failure.patch \ 28 file://fix-for-spurious-testsuite-failure.patch \
29 file://busybox-1.20.2-kernel_ver.patch \ 29 file://busybox-1.20.2-kernel_ver.patch \
30 file://stat-usr-bin.patch" 30 file://stat-usr-bin.patch \
31 file://testsuite-du-du-k-works-fix-false-positive.patch"
31 32
32SRC_URI[tarball.md5sum] = "e025414bc6cd79579cc7a32a45d3ae1c" 33SRC_URI[tarball.md5sum] = "e025414bc6cd79579cc7a32a45d3ae1c"
33SRC_URI[tarball.sha256sum] = "eb13ff01dae5618ead2ef6f92ba879e9e0390f9583bd545d8789d27cf39b6882" 34SRC_URI[tarball.sha256sum] = "eb13ff01dae5618ead2ef6f92ba879e9e0390f9583bd545d8789d27cf39b6882"