diff options
Diffstat (limited to 'meta/recipes-core/busybox')
| -rw-r--r-- | meta/recipes-core/busybox/busybox-1.20.2/testsuite-du-du-k-works-fix-false-positive.patch | 35 | ||||
| -rw-r--r-- | meta/recipes-core/busybox/busybox_1.20.2.bb | 5 |
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 @@ +Upstream-Status: Accepted + +[Yocto 2896] + +Signed-off-by: Kang Kai <kai.kang@windriver.com> +--- +From 03b614739b923994ff0bef74622973ad18fefebd Mon Sep 17 00:00:00 2001 +From: Kang Kai <kai.kang@windriver.com> +Date: Mon, 28 Jan 2013 14:02:51 +0100 +Subject: [PATCH] testsuite/du/du-k-works: fix false positive + +Signed-off-by: Kang Kai <kai.kang@windriver.com> +Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com> +--- + testsuite/du/du-k-works | 4 ++++ + 1 files changed, 4 insertions(+), 0 deletions(-) + +diff --git a/testsuite/du/du-k-works b/testsuite/du/du-k-works +index 36dcaa8..417b0da 100644 +--- a/testsuite/du/du-k-works ++++ b/testsuite/du/du-k-works +@@ -2,6 +2,10 @@ mkdir du.testdir + cd du.testdir + dd if=/dev/zero of=file1 bs=1k count=64 2>/dev/null + dd if=/dev/zero of=file2 bs=1k count=16 2>/dev/null ++# ext4 on images <512M gives 81kb ++# ext3 on images <512M gives 83kb + test x"`busybox du -k .`" = x"80 ." \ ++ -o x"`busybox du -k .`" = x"81 ." \ ++ -o x"`busybox du -k .`" = x"83 ." \ + -o x"`busybox du -k .`" = x"84 ." \ + -o x"`busybox du -k .`" = x"88 ." +-- +1.7.5.4 + 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 @@ require busybox.inc -PR = "r4" +PR = "r5" SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \ file://B921600.patch \ @@ -27,7 +27,8 @@ SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \ file://busybox-mkfs-minix-tests_bigendian.patch \ file://fix-for-spurious-testsuite-failure.patch \ file://busybox-1.20.2-kernel_ver.patch \ - file://stat-usr-bin.patch" + file://stat-usr-bin.patch \ + file://testsuite-du-du-k-works-fix-false-positive.patch" SRC_URI[tarball.md5sum] = "e025414bc6cd79579cc7a32a45d3ae1c" SRC_URI[tarball.sha256sum] = "eb13ff01dae5618ead2ef6f92ba879e9e0390f9583bd545d8789d27cf39b6882" |