diff options
| author |   Chen Qi <Qi.Chen@windriver.com> | 2014-01-22 10:39:46 +0800 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-02-02 11:21:56 +0000 |
| commit | fa282186d82e8fe3c590d4ea79e464116e5ceea2 (patch) | |
| tree | eb19131a90c0d817bde9ff6f12057092a6df6493 /meta/recipes-core/busybox/busybox/testsuite-du-du-k-works-fix-false-positive.patch | |
| parent | ee4061b43522c4893b41c3be63d06be1ee7e3c70 (diff) | |
| download | openembedded-core-fa282186d82e8fe3c590d4ea79e464116e5ceea2.tar.gz | |
busybox: upgrade to stable 1.22.1
Upgrade busybox to the stable release 1.22.1.
During this upgrade, 9 patches are removed. Reasons are detailed below.
The following 6 patches are removed as they have been merged.
meta/recipes-core/busybox/busybox/busybox-lineedit-initialize-delptr.patch
meta/recipes-core/busybox/busybox/busybox-list-suid-and-non-suid-app-configs.patch
meta/recipes-core/busybox/busybox/busybox-sed-fix-sed-clusternewline-testcase.patch
meta/recipes-core/busybox/busybox/busybox-sulogin-empty-root-password.patch
meta/recipes-core/busybox/busybox/find-get-rid-of-nested-functions.patch
meta/recipes-core/busybox/busybox/testsuite-du-du-k-works-fix-false-positive.patch
The following three patches are removed because they are mainly about moving
binaries from /bin to /usr/bin to make the update-alternative work correctly
at rootfs time. We can easily solve this problem by changing recipes. There's
no compelling reason why such patches are needed.
meta/recipes-core/busybox/busybox/run-parts.in.usr-bin.patch
meta/recipes-core/busybox/busybox/stat-usr-bin.patch
meta/recipes-core/busybox/busybox/watch.in.usr-bin.patch
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'meta/recipes-core/busybox/busybox/testsuite-du-du-k-works-fix-false-positive.patch')
| -rw-r--r-- | meta/recipes-core/busybox/busybox/testsuite-du-du-k-works-fix-false-positive.patch | 35 |
1 files changed, 0 insertions, 35 deletions
diff --git a/meta/recipes-core/busybox/busybox/testsuite-du-du-k-works-fix-false-positive.patch b/meta/recipes-core/busybox/busybox/testsuite-du-du-k-works-fix-false-positive.patch deleted file mode 100644 index 070c41be07..0000000000 --- a/meta/recipes-core/busybox/busybox/testsuite-du-du-k-works-fix-false-positive.patch +++ /dev/null @@ -1,35 +0,0 @@ -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 - |