diff options
author | Chen Qi <Qi.Chen@windriver.com> | 2018-11-23 10:16:29 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-11-23 23:35:19 +0000 |
commit | 4d7f14780f8371d082b7d788ee6cfb71aae5eca1 (patch) | |
tree | 0288ac2d41e7d807ad2ca40e88a66e6a105afbe4 /meta | |
parent | 34ea70924f6a99286bd99d8bca1700ba7fc555cd (diff) | |
download | poky-4d7f14780f8371d082b7d788ee6cfb71aae5eca1.tar.gz |
busybox: fix du-l-works test case
64 + 64 + 16 = 144K
144 + sizeof_a_directory >= 145
So fix to use 145 instead of 144.
(From OE-Core rev: 4818223ca4d64ee9501250cb866c23630eafa2fa)
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-core/busybox/busybox/0001-du-l-works-fix-to-use-145-instead-of-144.patch | 32 | ||||
-rw-r--r-- | meta/recipes-core/busybox/busybox_1.29.2.bb | 1 |
2 files changed, 33 insertions, 0 deletions
diff --git a/meta/recipes-core/busybox/busybox/0001-du-l-works-fix-to-use-145-instead-of-144.patch b/meta/recipes-core/busybox/busybox/0001-du-l-works-fix-to-use-145-instead-of-144.patch new file mode 100644 index 0000000000..bb5f7533ec --- /dev/null +++ b/meta/recipes-core/busybox/busybox/0001-du-l-works-fix-to-use-145-instead-of-144.patch | |||
@@ -0,0 +1,32 @@ | |||
1 | From c69feb2fdb755d6db34d0eb0a9e9994386c15e3a Mon Sep 17 00:00:00 2001 | ||
2 | From: Chen Qi <Qi.Chen@windriver.com> | ||
3 | Date: Wed, 14 Nov 2018 15:19:57 +0800 | ||
4 | Subject: [PATCH] du-l-works: fix to use 145 instead of 144 | ||
5 | |||
6 | 64 + 64 + 16 = 144 | ||
7 | 144 + size_of_directory >= 145 | ||
8 | So fix to use 145 instead of 144. | ||
9 | |||
10 | Upstream-Status: Submitted [http://lists.busybox.net/pipermail/busybox/2018-November/086836.html] | ||
11 | |||
12 | Signed-off-by: Chen Qi <Qi.Chen@windriver.com> | ||
13 | --- | ||
14 | testsuite/du/du-l-works | 2 +- | ||
15 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
16 | |||
17 | diff --git a/testsuite/du/du-l-works b/testsuite/du/du-l-works | ||
18 | index af87345..575064a 100644 | ||
19 | --- a/testsuite/du/du-l-works | ||
20 | +++ b/testsuite/du/du-l-works | ||
21 | @@ -5,7 +5,7 @@ cd du.testdir | ||
22 | dd if=/dev/zero of=file1 bs=1k count=64 2>/dev/null | ||
23 | ln file1 file1.1 | ||
24 | dd if=/dev/zero of=file2 bs=1k count=16 2>/dev/null | ||
25 | -test x"`busybox du -l .`" = x"144 ." \ | ||
26 | +test x"`busybox du -l .`" = x"145 ." \ | ||
27 | -o x"`busybox du -l .`" = x"146 ." \ | ||
28 | -o x"`busybox du -l .`" = x"148 ." \ | ||
29 | -o x"`busybox du -l .`" = x"152 ." \ | ||
30 | -- | ||
31 | 2.7.4 | ||
32 | |||
diff --git a/meta/recipes-core/busybox/busybox_1.29.2.bb b/meta/recipes-core/busybox/busybox_1.29.2.bb index 98767f0708..f38db2a35a 100644 --- a/meta/recipes-core/busybox/busybox_1.29.2.bb +++ b/meta/recipes-core/busybox/busybox_1.29.2.bb | |||
@@ -43,6 +43,7 @@ SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \ | |||
43 | file://makefile-libbb-race.patch \ | 43 | file://makefile-libbb-race.patch \ |
44 | file://0001-testsuite-check-uudecode-before-using-it.patch \ | 44 | file://0001-testsuite-check-uudecode-before-using-it.patch \ |
45 | file://0001-testsuite-use-www.example.org-for-wget-test-cases.patch \ | 45 | file://0001-testsuite-use-www.example.org-for-wget-test-cases.patch \ |
46 | file://0001-du-l-works-fix-to-use-145-instead-of-144.patch \ | ||
46 | " | 47 | " |
47 | SRC_URI_append_libc-musl = " file://musl.cfg " | 48 | SRC_URI_append_libc-musl = " file://musl.cfg " |
48 | 49 | ||