qemu: Specifically enable SLIRP support

Starting with kirkstone, SLIRP support must now be explicitly enabled in
the qemu build.  The default implementation supports the Qemu 6.2 configure
arguments, but in qemu-xilinx 6.1, the corresponding configuration is
slightly different.

  --enable-slirp=internal (6.2+)
    vs
  --enable-slirp=git (6.1)

When qemu-xilinx is updated to the newer version, the PACKAGECONFIG[slirp]
should revert back to the system default.

Signed-off-by: Mark Hatle <mark.hatle@amd.com>

3 files changed, 4 insertions, 7 deletions

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 f177872a..49faa73c 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
@@ -4,7 +4,7 @@ PROVIDES = "qemu-system-native"
 
 EXTRA_OECONF:append = " --target-list=${@get_qemu_system_target_list(d)}"
 
-PACKAGECONFIG ??= "fdt alsa kvm pie"
+PACKAGECONFIG ??= "fdt alsa kvm pie slirp"
 
 PACKAGECONFIG:remove = "${@'kvm' if not os.path.exists('/usr/include/linux/kvm.h') else ''}"
 
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 f177872a..49faa73c 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
@@ -4,7 +4,7 @@ PROVIDES = "qemu-system-native"
 
 EXTRA_OECONF:append = " --target-list=${@get_qemu_system_target_list(d)}"
 
-PACKAGECONFIG ??= "fdt alsa kvm pie"
+PACKAGECONFIG ??= "fdt alsa kvm pie slirp"
 
 PACKAGECONFIG:remove = "${@'kvm' if not os.path.exists('/usr/include/linux/kvm.h') else ''}"
 
diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx.inc b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx.inc
index 0dde8023..48b85f21 100644
--- a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx.inc
+++ b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx.inc
@@ -28,19 +28,16 @@ S = "${WORKDIR}/git"
 
 # Disable KVM completely
 PACKAGECONFIG:remove = "kvm"
-PACKAGECONFIG:append = " fdt sdl gcrypt pie"
+PACKAGECONFIG:append = " fdt sdl gcrypt pie slirp"
 
 
-PACKAGECONFIG[gcrypt] = "--enable-gcrypt,--disable-gcrypt,libgcrypt,"
-PACKAGECONFIG[sdl] = "--enable-sdl,--disable-sdl,libsdl2"
-PACKAGECONFIG[pie] = "--enable-pie,--disable-pie,,"
-
 # Remove when version is in sync with core oe-core
 PACKAGECONFIG:remove:class-nativesdk= "pulsedio"
 PACKAGECONFIG:remove:class-native = "pulsedio"
 PACKAGECONFIG[alsa] = "--audio-drv-list=alsa,,alsa-lib"
 PACKAGECONFIG[pulsedio] = "--audio-drv-list=pa,,pulseaudio"
 PACKAGECONFIG[selinux] = ""
+PACKAGECONFIG[slirp] = "--enable-slirp=git,--disable-slirp,,"
 
 DISABLE_STATIC:pn-${PN} = ""