diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-07-13 11:45:06 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-07-14 23:22:09 +0100 |
commit | 0641f17c282fee04d3b53bb2cd5b3cc1eb59a4d0 (patch) | |
tree | 37de4d92b0465aa59aea0aac90cd5e12c1e4c3d2 /meta/recipes-devtools | |
parent | e589b3e6ef661fe6a2c82ddf7fa9c1bbf3183bf9 (diff) | |
download | poky-0641f17c282fee04d3b53bb2cd5b3cc1eb59a4d0.tar.gz |
qemu: Fix slirp determinism issue
Add a PACKAGECONFIG option for slirp, defaulting to internal. This avoids
the presence of libslirp on the host causing qemu to link against that
instead breaking reproducibility and usability of the binary on hosts
where the library isn't present.
We need to add it to PACKAGECONFIG by default since users do expect slirp
to be enabled in the wider community.
(From OE-Core rev: 5a9a64132bf5ecac9d611d29751226a466c4a2c1)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r-- | meta/recipes-devtools/qemu/qemu-system-native_7.0.0.bb | 2 | ||||
-rw-r--r-- | meta/recipes-devtools/qemu/qemu.inc | 1 | ||||
-rw-r--r-- | meta/recipes-devtools/qemu/qemu_7.0.0.bb | 4 |
3 files changed, 4 insertions, 3 deletions
diff --git a/meta/recipes-devtools/qemu/qemu-system-native_7.0.0.bb b/meta/recipes-devtools/qemu/qemu-system-native_7.0.0.bb index bc5384d472..5ccede5095 100644 --- a/meta/recipes-devtools/qemu/qemu-system-native_7.0.0.bb +++ b/meta/recipes-devtools/qemu/qemu-system-native_7.0.0.bb | |||
@@ -11,7 +11,7 @@ DEPENDS = "glib-2.0-native zlib-native pixman-native qemu-native bison-native me | |||
11 | 11 | ||
12 | EXTRA_OECONF:append = " --target-list=${@get_qemu_system_target_list(d)}" | 12 | EXTRA_OECONF:append = " --target-list=${@get_qemu_system_target_list(d)}" |
13 | 13 | ||
14 | PACKAGECONFIG ??= "fdt alsa kvm pie \ | 14 | PACKAGECONFIG ??= "fdt alsa kvm pie slirp \ |
15 | ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'virglrenderer epoxy', '', d)} \ | 15 | ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'virglrenderer epoxy', '', d)} \ |
16 | " | 16 | " |
17 | 17 | ||
diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc index 16674eb5ad..c412d416d5 100644 --- a/meta/recipes-devtools/qemu/qemu.inc +++ b/meta/recipes-devtools/qemu/qemu.inc | |||
@@ -188,6 +188,7 @@ PACKAGECONFIG[bpf] = "--enable-bpf,--disable-bpf,libbpf" | |||
188 | PACKAGECONFIG[capstone] = "--enable-capstone,--disable-capstone" | 188 | PACKAGECONFIG[capstone] = "--enable-capstone,--disable-capstone" |
189 | PACKAGECONFIG[rdma] = "--enable-rdma,--disable-rdma" | 189 | PACKAGECONFIG[rdma] = "--enable-rdma,--disable-rdma" |
190 | PACKAGECONFIG[vde] = "--enable-vde,--disable-vde" | 190 | PACKAGECONFIG[vde] = "--enable-vde,--disable-vde" |
191 | PACKAGECONFIG[slirp] = "--enable-slirp=internal,--disable-slirp" | ||
191 | 192 | ||
192 | INSANE_SKIP:${PN} = "arch" | 193 | INSANE_SKIP:${PN} = "arch" |
193 | 194 | ||
diff --git a/meta/recipes-devtools/qemu/qemu_7.0.0.bb b/meta/recipes-devtools/qemu/qemu_7.0.0.bb index 9f7fad9886..42e133967e 100644 --- a/meta/recipes-devtools/qemu/qemu_7.0.0.bb +++ b/meta/recipes-devtools/qemu/qemu_7.0.0.bb | |||
@@ -15,12 +15,12 @@ EXTRA_OECONF:append:class-target:mipsarcho32 = "${@bb.utils.contains('BBEXTENDCU | |||
15 | EXTRA_OECONF:append:class-nativesdk = " --target-list=${@get_qemu_target_list(d)}" | 15 | EXTRA_OECONF:append:class-nativesdk = " --target-list=${@get_qemu_target_list(d)}" |
16 | 16 | ||
17 | PACKAGECONFIG ??= " \ | 17 | PACKAGECONFIG ??= " \ |
18 | fdt sdl kvm pie \ | 18 | fdt sdl kvm pie slirp \ |
19 | ${@bb.utils.filter('DISTRO_FEATURES', 'alsa xen', d)} \ | 19 | ${@bb.utils.filter('DISTRO_FEATURES', 'alsa xen', d)} \ |
20 | ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'virglrenderer epoxy', '', d)} \ | 20 | ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'virglrenderer epoxy', '', d)} \ |
21 | ${@bb.utils.filter('DISTRO_FEATURES', 'seccomp', d)} \ | 21 | ${@bb.utils.filter('DISTRO_FEATURES', 'seccomp', d)} \ |
22 | " | 22 | " |
23 | PACKAGECONFIG:class-nativesdk ??= "fdt sdl kvm pie \ | 23 | PACKAGECONFIG:class-nativesdk ??= "fdt sdl kvm pie slirp \ |
24 | ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'virglrenderer epoxy', '', d)} \ | 24 | ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'virglrenderer epoxy', '', d)} \ |
25 | " | 25 | " |
26 | # ppc32 hosts are no longer supported in qemu | 26 | # ppc32 hosts are no longer supported in qemu |