summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorHe Zhe <zhe.he@windriver.com>2019-01-07 09:33:45 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-01-08 11:16:44 +0000
commit7abac94d38579c13173abc64242e2458f4f0b855 (patch)
tree3c306c8e833aa50f0833f41b506292511b0c62eb /meta
parentadc37721a86ce44c0223b7b03aabd7deceefe57d (diff)
downloadpoky-7abac94d38579c13173abc64242e2458f4f0b855.tar.gz
linux-libc-headers: Fix build failure with fixed input and output files instead of pipe
This is an amendment for 2322dc4 "linux-libc-headers: Fix build failure by using fixed temporary file instead of pipe" which moves just the temporary input file from /tmp to build directory. But the build directory may not in the same file system with the output file, /dev/null, either and thus make it possible to trigger that bug, 67f846b, in binutil v2.31. This patch puts both the input and output files into build directory for good. (From OE-Core rev: 0d836013e43f29cb7d4a1f8bb9ef04dd8d9132df) Signed-off-by: He Zhe <zhe.he@windriver.com> Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-scripts-Use-fixed-input-and-output-files-instead-of-.patch (renamed from meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-scripts-Use-fixed-temporary-file-instead-of-pipe-for.patch)22
-rw-r--r--meta/recipes-kernel/linux-libc-headers/linux-libc-headers_4.18.bb2
2 files changed, 11 insertions, 13 deletions
diff --git a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-scripts-Use-fixed-temporary-file-instead-of-pipe-for.patch b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-scripts-Use-fixed-input-and-output-files-instead-of-.patch
index 0d8fa80939..9ba1c076e8 100644
--- a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-scripts-Use-fixed-temporary-file-instead-of-pipe-for.patch
+++ b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-scripts-Use-fixed-input-and-output-files-instead-of-.patch
@@ -1,7 +1,7 @@
1From 3bbea65e11918f8753e8006a2198b999cdb0af58 Mon Sep 17 00:00:00 2001 1From 694eba7bb974f6b8bd308804cb24350150108b2b Mon Sep 17 00:00:00 2001
2From: He Zhe <zhe.he@windriver.com> 2From: He Zhe <zhe.he@windriver.com>
3Date: Wed, 21 Nov 2018 15:12:43 +0800 3Date: Wed, 21 Nov 2018 15:12:43 +0800
4Subject: [PATCH] scripts: Use fixed temporary file instead of pipe for 4Subject: [PATCH] scripts: Use fixed input and output files instead of pipe for
5 here-doc 5 here-doc
6 6
7There was a bug of "as" in binutils that when it checks if the input file and 7There was a bug of "as" in binutils that when it checks if the input file and
@@ -40,31 +40,29 @@ Upstream-Status: Inappropriate [A work around for binutils v2.31]
40 40
41Signed-off-by: He Zhe <zhe.he@windriver.com> 41Signed-off-by: He Zhe <zhe.he@windriver.com>
42--- 42---
43 scripts/gcc-goto.sh | 7 ++++++- 43 scripts/gcc-goto.sh | 5 ++++-
44 1 file changed, 6 insertions(+), 1 deletion(-) 44 1 file changed, 4 insertions(+), 1 deletion(-)
45 45
46diff --git a/scripts/gcc-goto.sh b/scripts/gcc-goto.sh 46diff --git a/scripts/gcc-goto.sh b/scripts/gcc-goto.sh
47index 083c526..0aaf1b4 100755 47index 083c526..8dfac55 100755
48--- a/scripts/gcc-goto.sh 48--- a/scripts/gcc-goto.sh
49+++ b/scripts/gcc-goto.sh 49+++ b/scripts/gcc-goto.sh
50@@ -3,7 +3,9 @@ 50@@ -3,7 +3,7 @@
51 # Test for gcc 'asm goto' support 51 # Test for gcc 'asm goto' support
52 # Copyright (C) 2010, Jason Baron <jbaron@redhat.com> 52 # Copyright (C) 2010, Jason Baron <jbaron@redhat.com>
53 53
54-cat << "END" | $@ -x c - -c -o /dev/null >/dev/null 2>&1 && echo "y" 54-cat << "END" | $@ -x c - -c -o /dev/null >/dev/null 2>&1 && echo "y"
55+TMPFILE=`mktemp -p .` 55+cat << "END" > ./input
56+
57+cat << "END" > ${TMPFILE}
58 int main(void) 56 int main(void)
59 { 57 {
60 #if defined(__arm__) || defined(__aarch64__) 58 #if defined(__arm__) || defined(__aarch64__)
61@@ -20,3 +22,6 @@ entry: 59@@ -20,3 +20,6 @@ entry:
62 return 0; 60 return 0;
63 } 61 }
64 END 62 END
65+ 63+
66+$@ -x c ${TMPFILE} -c -o /dev/null && echo "y" 64+$@ -x c ./input -c -o ./output && echo "y"
67+rm ${TMPFILE} 65+rm ./input ./output
68-- 66--
692.7.4 672.7.4
70 68
diff --git a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_4.18.bb b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_4.18.bb
index 00420aa6f7..229a0027d7 100644
--- a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_4.18.bb
+++ b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_4.18.bb
@@ -10,7 +10,7 @@ SRC_URI_append_libc-musl = "\
10 " 10 "
11 11
12SRC_URI_append = "\ 12SRC_URI_append = "\
13 file://0001-scripts-Use-fixed-temporary-file-instead-of-pipe-for.patch \ 13 file://0001-scripts-Use-fixed-input-and-output-files-instead-of-.patch \
14" 14"
15 15
16SRC_URI[md5sum] = "bee5fe53ee1c3142b8f0c12c0d3348f9" 16SRC_URI[md5sum] = "bee5fe53ee1c3142b8f0c12c0d3348f9"