summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorJun Zhang <jun.zhang@windriver.com>2015-10-19 17:41:55 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-11-16 11:39:29 +0000
commit0f516a55fa6c9139a51d6263a3185aed13c6455d (patch)
treee1903fda7cc8cee0b0d1e43de3b636df0e1f4027 /meta
parentbceb9cb5b42cde96302150a6e0c6bfa20a17486b (diff)
downloadpoky-0f516a55fa6c9139a51d6263a3185aed13c6455d.tar.gz
cpio: fix testcase symlink-bad-lengths [ LIN8-947 ]
* fix the output of stderr & stdout to meet latest cpio (From OE-Core rev: 80d12c734ad0c1d86ee5b0c6639c4e840dc6dfad) Signed-off-by: Jun Zhang <jun.zhang@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-extended/cpio/cpio-2.11/fix-testcase-symlink-bad-lengths.patch33
-rw-r--r--meta/recipes-extended/cpio/cpio_2.11.bb1
2 files changed, 34 insertions, 0 deletions
diff --git a/meta/recipes-extended/cpio/cpio-2.11/fix-testcase-symlink-bad-lengths.patch b/meta/recipes-extended/cpio/cpio-2.11/fix-testcase-symlink-bad-lengths.patch
new file mode 100644
index 0000000000..a325f4bac8
--- /dev/null
+++ b/meta/recipes-extended/cpio/cpio-2.11/fix-testcase-symlink-bad-lengths.patch
@@ -0,0 +1,33 @@
1From c213ffa2e0ba6677e0dfade9c67b91446c70c8bd Mon Sep 17 00:00:00 2001
2From: Jun Zhang <jun.zhang@windriver.com>
3Date: Fri, 16 Oct 2015 21:25:17 +0800
4Subject: [PATCH] cpio: fix testcase symlink-bad-lengths
5
6* fix the output of stderr & stdout to meet latest cpio
7
8Upstream-Status: Pending
9
10Signed-off-by: Jun Zhang <jun.zhang@windriver.com>
11---
12 tests/symlink-bad-length.at | 5 ++---
13 1 file changed, 2 insertions(+), 3 deletions(-)
14
15diff --git a/tests/symlink-bad-length.at b/tests/symlink-bad-length.at
16index 6f804b1..74208ce 100644
17--- a/tests/symlink-bad-length.at
18+++ b/tests/symlink-bad-length.at
19@@ -41,9 +41,8 @@ cpio -ntv < ARCHIVE
20 test $? -eq 2
21 ],
22 [0],
23-[-rw-rw-r-- 1 10029 10031 13 Nov 25 13:52 FILE
24-],[cpio: LINK: stored filename length too big
25-cpio: premature end of file
26+[-rw-rw-r-- 1 10029 10031 13 Nov 25 2014 FILE
27+],[cpio: premature end of file
28 ])
29
30 AT_CLEANUP
31--
321.9.1
33
diff --git a/meta/recipes-extended/cpio/cpio_2.11.bb b/meta/recipes-extended/cpio/cpio_2.11.bb
index 84e538f079..3df1cd5bed 100644
--- a/meta/recipes-extended/cpio/cpio_2.11.bb
+++ b/meta/recipes-extended/cpio/cpio_2.11.bb
@@ -10,6 +10,7 @@ SRC_URI += "file://remove-gets.patch \
10 file://cpio-CVE-2015-1197.patch \ 10 file://cpio-CVE-2015-1197.patch \
11 file://0001-Unset-need_charset_alias-when-building-for-musl.patch \ 11 file://0001-Unset-need_charset_alias-when-building-for-musl.patch \
12 file://Fix-symlink-bad-length-test-for-64-bit-architectures.patch \ 12 file://Fix-symlink-bad-length-test-for-64-bit-architectures.patch \
13 file://fix-testcase-symlink-bad-lengths.patch \
13 " 14 "
14 15
15SRC_URI[md5sum] = "1112bb6c45863468b5496ba128792f6c" 16SRC_URI[md5sum] = "1112bb6c45863468b5496ba128792f6c"