diff options
13 files changed, 46 insertions, 62 deletions
diff --git a/meta-xilinx-core/conf/layer.conf b/meta-xilinx-core/conf/layer.conf index 83f4131b..616530d9 100644 --- a/meta-xilinx-core/conf/layer.conf +++ b/meta-xilinx-core/conf/layer.conf | |||
@@ -48,8 +48,8 @@ XILINX_RELEASE_VERSION ??= "v2022.2" | |||
48 | 48 | ||
49 | BUILDCFG_VARS:append = " SOC_VARIANT XILINX_RELEASE_VERSION" | 49 | BUILDCFG_VARS:append = " SOC_VARIANT XILINX_RELEASE_VERSION" |
50 | 50 | ||
51 | XILINX_QEMU_VERSION[v2022.1] = "v6.1.0-xilinx-v2022.1%" | 51 | XILINX_QEMU_VERSION[v2022.1] = "v7.1.0-xilinx-v2022.1%" |
52 | XILINX_QEMU_VERSION[v2022.2] = "v6.1.0-xilinx-v2022.2%" | 52 | XILINX_QEMU_VERSION[v2022.2] = "v7.1.0-xilinx-v2022.2%" |
53 | PREFERRED_VERSION_qemu-xilinx ?= "${@d.getVarFlag('XILINX_QEMU_VERSION', d.getVar('XILINX_RELEASE_VERSION')) or 'undefined'}" | 53 | PREFERRED_VERSION_qemu-xilinx ?= "${@d.getVarFlag('XILINX_QEMU_VERSION', d.getVar('XILINX_RELEASE_VERSION')) or 'undefined'}" |
54 | PREFERRED_VERSION_qemu-xilinx-native ?= "${@d.getVarFlag('XILINX_QEMU_VERSION', d.getVar('XILINX_RELEASE_VERSION')) or 'undefined'}" | 54 | PREFERRED_VERSION_qemu-xilinx-native ?= "${@d.getVarFlag('XILINX_QEMU_VERSION', d.getVar('XILINX_RELEASE_VERSION')) or 'undefined'}" |
55 | PREFERRED_VERSION_qemu-xilinx-system-native ?= "${@d.getVarFlag('XILINX_QEMU_VERSION', d.getVar('XILINX_RELEASE_VERSION')) or 'undefined'}" | 55 | PREFERRED_VERSION_qemu-xilinx-system-native ?= "${@d.getVarFlag('XILINX_QEMU_VERSION', d.getVar('XILINX_RELEASE_VERSION')) or 'undefined'}" |
diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-2022.1.inc b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-2022.1.inc index 62a221f4..bb8fac70 100644 --- a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-2022.1.inc +++ b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-2022.1.inc | |||
@@ -1,4 +1,8 @@ | |||
1 | XILINX_QEMU_VERSION = "v6.1.0" | 1 | # Note this isn't really the 2022.1 or 2022.2 version of qemu-xilinx |
2 | BRANCH = "xlnx_rel_v2022.2" | 2 | # Instead it's the current master version, as qemu 6.1.0 doesn't |
3 | SRCREV = "74d70f8008bfbd1566c2eed3496a077a974de0d0" | 3 | # work reliabily anymore. |
4 | |||
5 | XILINX_QEMU_VERSION = "v7.1.0" | ||
6 | BRANCH = "master" | ||
7 | SRCREV = "21adc9f99e813fb24fb65421259b5b0614938376" | ||
4 | 8 | ||
diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-2022.2.inc b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-2022.2.inc index 62a221f4..bb8fac70 100644 --- a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-2022.2.inc +++ b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-2022.2.inc | |||
@@ -1,4 +1,8 @@ | |||
1 | XILINX_QEMU_VERSION = "v6.1.0" | 1 | # Note this isn't really the 2022.1 or 2022.2 version of qemu-xilinx |
2 | BRANCH = "xlnx_rel_v2022.2" | 2 | # Instead it's the current master version, as qemu 6.1.0 doesn't |
3 | SRCREV = "74d70f8008bfbd1566c2eed3496a077a974de0d0" | 3 | # work reliabily anymore. |
4 | |||
5 | XILINX_QEMU_VERSION = "v7.1.0" | ||
6 | BRANCH = "master" | ||
7 | SRCREV = "21adc9f99e813fb24fb65421259b5b0614938376" | ||
4 | 8 | ||
diff --git a/meta-xilinx-core/recipes-devtools/qemu/files/cross.patch b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-7.1.0/cross.patch index bdb77ec7..ca2ad361 100644 --- a/meta-xilinx-core/recipes-devtools/qemu/files/cross.patch +++ b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-7.1.0/cross.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From f51ece86f84c877f255746cba22a6745f37d2b7f Mon Sep 17 00:00:00 2001 | 1 | From 76c3fc4c87231bed32974ebbbdb5079cff45a6b7 Mon Sep 17 00:00:00 2001 |
2 | From: Richard Purdie <richard.purdie@linuxfoundation.org> | 2 | From: Richard Purdie <richard.purdie@linuxfoundation.org> |
3 | Date: Tue, 5 Jan 2021 23:00:14 +0000 | 3 | Date: Tue, 5 Jan 2021 23:00:14 +0000 |
4 | Subject: [PATCH] qemu: Upgrade 5.1.0->5.2.0 | 4 | Subject: [PATCH 12/12] qemu: Upgrade 5.1.0->5.2.0 |
5 | 5 | ||
6 | We need to be able to trigger configure's cross code but we don't want | 6 | We need to be able to trigger configure's cross code but we don't want |
7 | to set cross_prefix as it does other things we don't want. Patch things | 7 | to set cross_prefix as it does other things we don't want. Patch things |
@@ -9,23 +9,24 @@ so we can do what we need in the target config case. | |||
9 | 9 | ||
10 | Upstream-Status: Inappropriate [may be rewritten in a way upstream may accept?] | 10 | Upstream-Status: Inappropriate [may be rewritten in a way upstream may accept?] |
11 | Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> | 11 | Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> |
12 | |||
12 | --- | 13 | --- |
13 | configure | 4 ---- | 14 | configure | 4 ---- |
14 | 1 file changed, 4 deletions(-) | 15 | 1 file changed, 4 deletions(-) |
15 | 16 | ||
16 | diff --git a/configure b/configure | 17 | Index: qemu-7.1.0/configure |
17 | index 9a79a004d..563b7827f 100755 | 18 | =================================================================== |
18 | --- a/configure | 19 | --- qemu-7.1.0.orig/configure |
19 | +++ b/configure | 20 | +++ qemu-7.1.0/configure |
20 | @@ -5128,7 +5128,6 @@ if test "$skip_meson" = no; then | 21 | @@ -2710,7 +2710,6 @@ if test "$skip_meson" = no; then |
21 | fi | ||
22 | echo "strip = [$(meson_quote $strip)]" >> $cross | 22 | echo "strip = [$(meson_quote $strip)]" >> $cross |
23 | echo "widl = [$(meson_quote $widl)]" >> $cross | ||
23 | echo "windres = [$(meson_quote $windres)]" >> $cross | 24 | echo "windres = [$(meson_quote $windres)]" >> $cross |
24 | - if test "$cross_compile" = "yes"; then | 25 | - if test "$cross_compile" = "yes"; then |
25 | cross_arg="--cross-file config-meson.cross" | 26 | cross_arg="--cross-file config-meson.cross" |
26 | echo "[host_machine]" >> $cross | 27 | echo "[host_machine]" >> $cross |
27 | if test "$mingw32" = "yes" ; then | 28 | echo "system = '$targetos'" >> $cross |
28 | @@ -5160,9 +5159,6 @@ if test "$skip_meson" = no; then | 29 | @@ -2728,9 +2727,6 @@ if test "$skip_meson" = no; then |
29 | else | 30 | else |
30 | echo "endian = 'little'" >> $cross | 31 | echo "endian = 'little'" >> $cross |
31 | fi | 32 | fi |
@@ -35,6 +36,3 @@ index 9a79a004d..563b7827f 100755 | |||
35 | mv $cross config-meson.cross | 36 | mv $cross config-meson.cross |
36 | 37 | ||
37 | rm -rf meson-private meson-info meson-logs | 38 | rm -rf meson-private meson-info meson-logs |
38 | -- | ||
39 | 2.17.1 | ||
40 | |||
diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx.inc b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-7.1.inc index 7dc0b84b..595b988d 100644 --- a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx.inc +++ b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-7.1.inc | |||
@@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = " \ | |||
10 | " | 10 | " |
11 | DEPENDS = "glib-2.0 zlib pixman bison-native ninja-native meson-native" | 11 | DEPENDS = "glib-2.0 zlib pixman bison-native ninja-native meson-native" |
12 | 12 | ||
13 | FILESEXTRAPATHS:prepend := "${THISDIR}/files:" | 13 | FILESEXTRAPATHS:prepend := "${THISDIR}/qemu-xilinx-7.1.0:" |
14 | 14 | ||
15 | PV = "${XILINX_QEMU_VERSION}-xilinx-v${@bb.parse.vars_from_file(d.getVar('FILE', False),d)[1] or ''}+git${SRCPV}" | 15 | PV = "${XILINX_QEMU_VERSION}-xilinx-v${@bb.parse.vars_from_file(d.getVar('FILE', False),d)[1] or ''}+git${SRCPV}" |
16 | REPO ?= "gitsm://github.com/Xilinx/qemu.git;protocol=https" | 16 | REPO ?= "gitsm://github.com/Xilinx/qemu.git;protocol=https" |
@@ -22,26 +22,11 @@ SRC_URI:append = " file://0010-configure-Add-pkg-config-handling-for-libgcrypt.p | |||
22 | 22 | ||
23 | S = "${WORKDIR}/git" | 23 | S = "${WORKDIR}/git" |
24 | 24 | ||
25 | # Disable KVM completely | 25 | PACKAGECONFIG ??= " \ |
26 | PACKAGECONFIG:remove = "kvm" | 26 | fdt sdl kvm gcrypt pie slirp \ |
27 | PACKAGECONFIG:append = " fdt sdl gcrypt pie slirp" | 27 | ${@bb.utils.filter('DISTRO_FEATURES', 'alsa xen', d)} \ |
28 | 28 | ${@bb.utils.filter('DISTRO_FEATURES', 'seccomp', d)} \ | |
29 | 29 | " | |
30 | # Remove when version is in sync with core oe-core | 30 | PACKAGECONFIG:class-nativesdk ??= "fdt sdl kvm gcrypt pie slirp" |
31 | PACKAGECONFIG:remove:class-nativesdk= "pulsedio" | ||
32 | PACKAGECONFIG:remove:class-native = "pulsedio" | ||
33 | PACKAGECONFIG[alsa] = "--audio-drv-list=alsa,,alsa-lib" | ||
34 | PACKAGECONFIG[pulsedio] = "--audio-drv-list=pa,,pulseaudio" | ||
35 | PACKAGECONFIG[selinux] = "" | ||
36 | PACKAGECONFIG[slirp] = "--enable-slirp=git,--disable-slirp,," | ||
37 | PACKAGECONFIG[jack] = "" | ||
38 | 31 | ||
39 | DISABLE_STATIC:pn-${PN} = "" | 32 | DISABLE_STATIC:pn-${PN} = "" |
40 | |||
41 | do_install:append() { | ||
42 | # Prevent QA warnings about installed ${localstatedir}/run | ||
43 | if [ -d ${D}${localstatedir}/run ]; then rmdir ${D}${localstatedir}/run; fi | ||
44 | } | ||
45 | |||
46 | FILES:${PN} += "${datadir}/qemu/" | ||
47 | FILES:${PN}:append:class-nativesdk:mingw32 = " ${SDKPATHNATIVE}" | ||
diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-native-7.1.inc b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-native-7.1.inc new file mode 100644 index 00000000..e664a580 --- /dev/null +++ b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-native-7.1.inc | |||
@@ -0,0 +1,4 @@ | |||
1 | require recipes-devtools/qemu/qemu-native.inc | ||
2 | require qemu-xilinx-7.1.inc | ||
3 | |||
4 | DEPENDS = "glib-2.0-native zlib-native ninja-native meson-native" | ||
diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-native.inc b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-native.inc deleted file mode 100644 index b22ab432..00000000 --- a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-native.inc +++ /dev/null | |||
@@ -1,11 +0,0 @@ | |||
1 | require recipes-devtools/qemu/qemu-native.inc | ||
2 | require qemu-xilinx.inc | ||
3 | |||
4 | DEPENDS = "glib-2.0-native zlib-native ninja-native meson-native" | ||
5 | |||
6 | SRC_URI:remove = "file://0012-fix-libcap-header-issue-on-some-distro.patch" | ||
7 | SRC_URI:remove = "file://0013-cpus.c-Add-error-messages-when-qemi_cpu_kick_thread-.patch" | ||
8 | |||
9 | do_install:append(){ | ||
10 | rm -rf ${D}${datadir}/icons | ||
11 | } | ||
diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-native_2022.1.bb b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-native_2022.1.bb index e0edd965..42794f55 100644 --- a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-native_2022.1.bb +++ b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-native_2022.1.bb | |||
@@ -1,5 +1,5 @@ | |||
1 | require qemu-xilinx-2022.1.inc | 1 | require qemu-xilinx-2022.1.inc |
2 | require qemu-xilinx-native.inc | 2 | require qemu-xilinx-native-7.1.inc |
3 | require qemu-native-alt.inc | 3 | require qemu-native-alt.inc |
4 | 4 | ||
5 | BPN = "qemu-xilinx" | 5 | BPN = "qemu-xilinx" |
diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-native_2022.2.bb b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-native_2022.2.bb index 21b9e9bf..e6a69f3a 100644 --- a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-native_2022.2.bb +++ b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-native_2022.2.bb | |||
@@ -1,5 +1,5 @@ | |||
1 | require qemu-xilinx-2022.2.inc | 1 | require qemu-xilinx-2022.2.inc |
2 | require qemu-xilinx-native.inc | 2 | require qemu-xilinx-native-7.1.inc |
3 | require qemu-native-alt.inc | 3 | require qemu-native-alt.inc |
4 | 4 | ||
5 | BPN = "qemu-xilinx" | 5 | BPN = "qemu-xilinx" |
diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-system-native_2022.1.bb b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-system-native_2022.1.bb index ea7d6830..6a2742bf 100644 --- a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-system-native_2022.1.bb +++ b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-system-native_2022.1.bb | |||
@@ -1,12 +1,12 @@ | |||
1 | require qemu-system-native-alt.inc | 1 | require qemu-system-native-alt.inc |
2 | require qemu-xilinx-2022.1.inc | 2 | require qemu-xilinx-2022.1.inc |
3 | require qemu-xilinx-native.inc | 3 | require qemu-xilinx-native-7.1.inc |
4 | 4 | ||
5 | PROVIDES = "qemu-system-native" | 5 | PROVIDES = "qemu-system-native" |
6 | 6 | ||
7 | EXTRA_OECONF:append = " --target-list=${@get_qemu_system_target_list(d)}" | 7 | EXTRA_OECONF:append = " --target-list=${@get_qemu_system_target_list(d)}" |
8 | 8 | ||
9 | PACKAGECONFIG ??= "fdt alsa kvm pie slirp" | 9 | PACKAGECONFIG ??= "fdt alsa kvm gcrypt pie slirp" |
10 | 10 | ||
11 | PACKAGECONFIG:remove = "${@'kvm' if not os.path.exists('/usr/include/linux/kvm.h') else ''}" | 11 | PACKAGECONFIG:remove = "${@'kvm' if not os.path.exists('/usr/include/linux/kvm.h') else ''}" |
12 | 12 | ||
diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-system-native_2022.2.bb b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-system-native_2022.2.bb index 540ec51a..1f02812d 100644 --- a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-system-native_2022.2.bb +++ b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-system-native_2022.2.bb | |||
@@ -1,12 +1,12 @@ | |||
1 | require qemu-system-native-alt.inc | 1 | require qemu-system-native-alt.inc |
2 | require qemu-xilinx-2022.2.inc | 2 | require qemu-xilinx-2022.2.inc |
3 | require qemu-xilinx-native.inc | 3 | require qemu-xilinx-native-7.1.inc |
4 | 4 | ||
5 | PROVIDES = "qemu-system-native" | 5 | PROVIDES = "qemu-system-native" |
6 | 6 | ||
7 | EXTRA_OECONF:append = " --target-list=${@get_qemu_system_target_list(d)}" | 7 | EXTRA_OECONF:append = " --target-list=${@get_qemu_system_target_list(d)}" |
8 | 8 | ||
9 | PACKAGECONFIG ??= "fdt alsa kvm pie slirp" | 9 | PACKAGECONFIG ??= "fdt alsa kvm gcrypt pie slirp" |
10 | 10 | ||
11 | PACKAGECONFIG:remove = "${@'kvm' if not os.path.exists('/usr/include/linux/kvm.h') else ''}" | 11 | PACKAGECONFIG:remove = "${@'kvm' if not os.path.exists('/usr/include/linux/kvm.h') else ''}" |
12 | 12 | ||
diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx_2022.1.bb b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx_2022.1.bb index 3503e2f4..b027d363 100644 --- a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx_2022.1.bb +++ b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx_2022.1.bb | |||
@@ -1,6 +1,6 @@ | |||
1 | require qemu-xilinx-2022.1.inc | 1 | require qemu-xilinx-2022.1.inc |
2 | require recipes-devtools/qemu/qemu.inc | 2 | require recipes-devtools/qemu/qemu.inc |
3 | require qemu-xilinx.inc | 3 | require qemu-xilinx-7.1.inc |
4 | require qemu-alt.inc | 4 | require qemu-alt.inc |
5 | 5 | ||
6 | BBCLASSEXTEND = "nativesdk" | 6 | BBCLASSEXTEND = "nativesdk" |
diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx_2022.2.bb b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx_2022.2.bb index 31b9c41d..fb35fea9 100644 --- a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx_2022.2.bb +++ b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx_2022.2.bb | |||
@@ -1,6 +1,6 @@ | |||
1 | require qemu-xilinx-2022.2.inc | 1 | require qemu-xilinx-2022.2.inc |
2 | require recipes-devtools/qemu/qemu.inc | 2 | require recipes-devtools/qemu/qemu.inc |
3 | require qemu-xilinx.inc | 3 | require qemu-xilinx-7.1.inc |
4 | require qemu-alt.inc | 4 | require qemu-alt.inc |
5 | 5 | ||
6 | BBCLASSEXTEND = "nativesdk" | 6 | BBCLASSEXTEND = "nativesdk" |