diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2023-01-05 15:29:55 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-01-09 10:07:38 +0000 |
commit | 719998024f7ae657a95aa0ddd4e0737aa8ab202f (patch) | |
tree | 242ede79abc34c694ba54fb6623a7706b5a07579 /meta/recipes-devtools/qemu | |
parent | 7f556c68619377224560066e92a88469919b335b (diff) | |
download | poky-719998024f7ae657a95aa0ddd4e0737aa8ab202f.tar.gz |
qemu: fix recent reproducibility issues
Not only break when not in a loop is undefined, different
shells do different things when they see it.
(From OE-Core rev: 11c034b427c4d44f4013fa4ddf7c3d1264bab219)
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/qemu')
-rw-r--r-- | meta/recipes-devtools/qemu/qemu.inc | 1 | ||||
-rw-r--r-- | meta/recipes-devtools/qemu/qemu/0001-configure-Fix-check-tcg-not-executing-any-tests.patch | 56 |
2 files changed, 57 insertions, 0 deletions
diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc index b58719affd..80f6edd2b9 100644 --- a/meta/recipes-devtools/qemu/qemu.inc +++ b/meta/recipes-devtools/qemu/qemu.inc | |||
@@ -29,6 +29,7 @@ SRC_URI = "https://download.qemu.org/${BPN}-${PV}.tar.xz \ | |||
29 | file://0010-hw-pvrdma-Protect-against-buggy-or-malicious-guest-d.patch \ | 29 | file://0010-hw-pvrdma-Protect-against-buggy-or-malicious-guest-d.patch \ |
30 | file://0001-contrib-vhost-user-blk-Replace-lseek64-with-lseek.patch \ | 30 | file://0001-contrib-vhost-user-blk-Replace-lseek64-with-lseek.patch \ |
31 | file://0002-linux-user-Replace-use-of-lfs64-related-functions-an.patch \ | 31 | file://0002-linux-user-Replace-use-of-lfs64-related-functions-an.patch \ |
32 | file://0001-configure-Fix-check-tcg-not-executing-any-tests.patch \ | ||
32 | " | 33 | " |
33 | UPSTREAM_CHECK_REGEX = "qemu-(?P<pver>\d+(\.\d+)+)\.tar" | 34 | UPSTREAM_CHECK_REGEX = "qemu-(?P<pver>\d+(\.\d+)+)\.tar" |
34 | 35 | ||
diff --git a/meta/recipes-devtools/qemu/qemu/0001-configure-Fix-check-tcg-not-executing-any-tests.patch b/meta/recipes-devtools/qemu/qemu/0001-configure-Fix-check-tcg-not-executing-any-tests.patch new file mode 100644 index 0000000000..66ae4deae1 --- /dev/null +++ b/meta/recipes-devtools/qemu/qemu/0001-configure-Fix-check-tcg-not-executing-any-tests.patch | |||
@@ -0,0 +1,56 @@ | |||
1 | From f295491361ed7fbe729ef6f029d83f68b8e2bee3 Mon Sep 17 00:00:00 2001 | ||
2 | From: Mukilan Thiyagarajan <quic_mthiyaga@quicinc.com> | ||
3 | Date: Wed, 21 Dec 2022 09:04:06 +0000 | ||
4 | Subject: [PATCH] configure: Fix check-tcg not executing any tests | ||
5 | MIME-Version: 1.0 | ||
6 | Content-Type: text/plain; charset=UTF-8 | ||
7 | Content-Transfer-Encoding: 8bit | ||
8 | |||
9 | After configuring with --target-list=hexagon-linux-user | ||
10 | running `make check-tcg` just prints the following: | ||
11 | |||
12 | ``` | ||
13 | make: Nothing to be done for 'check-tcg' | ||
14 | ``` | ||
15 | |||
16 | In the probe_target_compiler function, the 'break' | ||
17 | command is used incorrectly. There are no lexically | ||
18 | enclosing loops associated with that break command which | ||
19 | is an unspecfied behaviour in the POSIX standard. | ||
20 | |||
21 | The dash shell implementation aborts the currently executing | ||
22 | loop, in this case, causing the rest of the logic for the loop | ||
23 | in line 2490 to be skipped, which means no Makefiles are | ||
24 | generated for the tcg target tests. | ||
25 | |||
26 | Fixes: c3b570b5a9a24d25 (configure: don't enable | ||
27 | cross compilers unless in target_list) | ||
28 | |||
29 | Signed-off-by: Mukilan Thiyagarajan <quic_mthiyaga@quicinc.com> | ||
30 | Reviewed-by: Richard Henderson <richard.henderson@linaro.org> | ||
31 | Link: https://patchew.org/QEMU/20221207082309.9966-1-quic._5Fmthiyaga@quicinc.com/ | ||
32 | Message-Id: <20221207082309.9966-1-quic_mthiyaga@quicinc.com> | ||
33 | Signed-off-by: Alex Bennée <alex.bennee@linaro.org> | ||
34 | Message-Id: <20221221090411.1995037-2-alex.bennee@linaro.org> | ||
35 | |||
36 | Upstream-Status: Backport [https://github.com/qemu/qemu/commit/73acb87be536d23e42db73a306104d8fd316ff20] | ||
37 | Signed-off-by: Alexander Kanavin <alex@linutronix.de> | ||
38 | --- | ||
39 | configure | 4 +--- | ||
40 | 1 file changed, 1 insertion(+), 3 deletions(-) | ||
41 | |||
42 | diff --git a/configure b/configure | ||
43 | index 0c1db72b8..6b4589273 100755 | ||
44 | --- a/configure | ||
45 | +++ b/configure | ||
46 | @@ -1881,9 +1881,7 @@ probe_target_compiler() { | ||
47 | # We shall skip configuring the target compiler if the user didn't | ||
48 | # bother enabling an appropriate guest. This avoids building | ||
49 | # extraneous firmware images and tests. | ||
50 | - if test "${target_list#*$1}" != "$1"; then | ||
51 | - break; | ||
52 | - else | ||
53 | + if test "${target_list#*$1}" = "$1"; then | ||
54 | return 1 | ||
55 | fi | ||
56 | |||