Skip to Content.
Sympa Menu

sm-commit - [[SM-Commit] ] GIT changes to master grimoire by Ismael Luceno (515368e2df3589d19a0a59d8096e1e6e44aeb707)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Ismael Luceno <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [[SM-Commit] ] GIT changes to master grimoire by Ismael Luceno (515368e2df3589d19a0a59d8096e1e6e44aeb707)
  • Date: Fri, 12 Apr 2024 15:08:54 +0000

GIT changes to master grimoire by Ismael Luceno <ismael AT sourcemage.org>:

dev/null
|binary
emulators/qemu/BUILD
| 28
emulators/qemu/CONFIGURE
| 59 +
emulators/qemu/CONFLICTS
| 1
emulators/qemu/DEPENDS
| 192 ++++
emulators/qemu/DETAILS
| 31
emulators/qemu/HISTORY
| 434 ++++++++++
emulators/qemu/INSTALL
| 23
emulators/qemu/PREPARE
| 1
emulators/qemu/PRE_BUILD
| 13
emulators/qemu/PRE_SUB_DEPENDS
| 6
emulators/qemu/PROVIDES
| 1
emulators/qemu/REPAIR^35e01f923e4981c9151fa98a1e228423^PRE_SUB_DEPENDS
| 6
emulators/qemu/REPAIR^none^PRE_SUB_DEPENDS
| 6
emulators/qemu/SUB_DEPENDS
| 6
emulators/qemu/archs
| 63 +

emulators/qemu/patches/0006-linux-user-signal.c-define-__SIGRTMIN-MAX-for-non-GN.patch
| 38
emulators/qemu/patches/CVE-2021-20255.patch
| 44 +
emulators/qemu/patches/musl-9p-limits_h.patch
| 12
emulators/qemu/patches/musl-fix-SIOCGSTAMPNS.patch
| 12
emulators/qemu/patches/musl-fix-duplicated-sysinfo.patch
| 13
emulators/qemu/patches/musl-initialize-msghdr.patch
| 15
emulators/qemu/qemu.gpg
|binary
utils/qemu/BUILD
| 28
utils/qemu/CONFIGURE
| 59 -
utils/qemu/CONFLICTS
| 1
utils/qemu/DEPENDS
| 179 ----
utils/qemu/DETAILS
| 31
utils/qemu/HISTORY
| 434 ----------
utils/qemu/INSTALL
| 23
utils/qemu/PREPARE
| 1
utils/qemu/PRE_BUILD
| 13
utils/qemu/PRE_SUB_DEPENDS
| 6
utils/qemu/PROVIDES
| 1
utils/qemu/REPAIR^35e01f923e4981c9151fa98a1e228423^PRE_SUB_DEPENDS
| 6
utils/qemu/REPAIR^none^PRE_SUB_DEPENDS
| 6
utils/qemu/SUB_DEPENDS
| 6
utils/qemu/archs
| 63 -

utils/qemu/patches/0006-linux-user-signal.c-define-__SIGRTMIN-MAX-for-non-GN.patch
| 38
utils/qemu/patches/CVE-2021-20255.patch
| 44 -
utils/qemu/patches/musl-9p-limits_h.patch
| 12
utils/qemu/patches/musl-fix-SIOCGSTAMPNS.patch
| 12
utils/qemu/patches/musl-fix-duplicated-sysinfo.patch
| 13
utils/qemu/patches/musl-initialize-msghdr.patch
| 15
44 files changed, 1004 insertions(+), 991 deletions(-)

New commits:
commit 515368e2df3589d19a0a59d8096e1e6e44aeb707
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

qemu: Move into emulators section

commit f4ba78777690b7a896db3378dc3f6189ee75653b
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

qemu: Normalise DEPENDS

diff --git a/emulators/qemu/BUILD b/emulators/qemu/BUILD
new file mode 100755
index 0000000..7dfd986
--- /dev/null
+++ b/emulators/qemu/BUILD
@@ -0,0 +1,28 @@
+# remove -ffast-math; hardfloat requires an exact IEEE implementation
+CFLAGS="${CFLAGS//-ffast-math}" &&
+
+message "${MESSAGE_COLOR}Target list: $QEMU_ARCHS${DEFAULT_COLOR}" &&
+
+cd "${SOURCE_DIRECTORY}" &&
+
+if [[ "x${QEMU_VNC_TLS}" == "xnone" ]]; then
+ OPTS="${OPTS} --disable-gcrypt --disable-nettle"
+fi &&
+
+case "$HOST" in
+ (*-musl)
+ OPTS+=' --disable-fuse'
+ ;;
+esac &&
+
+./configure --prefix="$INSTALL_ROOT/usr" \
+ --sysconfdir="$INSTALL_ROOT/etc" \
+ --localstatedir="$INSTALL_ROOT/var" \
+ --target-list="${QEMU_ARCHS// /,}" \
+ --audio-drv-list="${QEMU_AUDIO// /,}" \
+ --enable-fdt="internal" \
+ $QEMU_OPTS \
+ $OPTS &&
+
+# Pass down ARFLAGS to workaround a bug in QEMU's build system
+ARFLAGS=rv make
diff --git a/emulators/qemu/CONFIGURE b/emulators/qemu/CONFIGURE
new file mode 100755
index 0000000..c3a5b2a
--- /dev/null
+++ b/emulators/qemu/CONFIGURE
@@ -0,0 +1,59 @@
+. "$GRIMOIRE/FUNCTIONS" &&
+
+local QEMU_ARCH_FILE="$SPELL_DIRECTORY/archs"
+persistent_add QEMU_ARCHS &&
+
+# deliberately uses query, see locale CONFIGURE note
+if query "Handpick architectures to emulate (y/n)?" n; then
+ BACKTITLE="Qemu Archs Configuration" &&
+ TITLE="Arch Selection" &&
+ HELP="Select Arch you want to build qemu" &&
+
+ QEMU_ARCHS=`dialog --backtitle "$BACKTITLE" \
+ --title "$TITLE" \
+ --stdout \
+ --checklist "$HELP" \
+ 0 0 0 \
+ $(<"$QEMU_ARCH_FILE")`
+fi &&
+
+if [[ -z $QEMU_ARCHS ]]; then
+ QEMU_ARCHS=$(awk -vORS=' ' '{print $1}' "$QEMU_ARCH_FILE")
+else
+ # sanitize QEMU_ARCHS
+ QEMU_ARCHS=$(awk -F'[ "]+' -vORS=' ' -vtmp="$QEMU_ARCHS" '
+ BEGIN {
+ $0 = tmp
+ for (i = 1; i <= NF; i++) selected[$i]
+ FS = " "
+ }
+ $1 in selected {print $1; delete selected[$1]; next}
+ END {for (i in selected) printf "WARN: %s architecture removed\n", $1
>"/dev/stderr"}
+ ' "$QEMU_ARCH_FILE")
+fi
+
+. $GRIMOIRE/config_query_multi.function &&
+
+config_query_multi QEMU_AUDIO "Select sound system(s) to support" \
+ oss alsa sdl jack pa pipewire &&
+
+persistent_remove QEMU_CARDS &&
+
+config_query_option QEMU_OPTS "Enable KVM acceleration support" y \
+ "" "--disable-kvm" &&
+
+config_query_option QEMU_OPTS "Enable Trusted Platform Module (TPM)?" n \
+ '--enable-tpm' '' &&
+
+list_remove QEMU_OPTS "--disable-vnc-png" &&
+config_query_option QEMU_OPTS "Enable VNC support?" y \
+ '--enable-vnc' \
+ '--disable-vnc --disable-vnc-sasl --disable-vnc-jpeg' &&
+
+persistent_remove QEMU_VNC_TLS &&
+
+config_query_option QEMU_OPTS \
+ 'Build documentation? (requires: perl, python, texinfo)'
y \
+ '--enable-docs' \
+ '--disable-docs'
+
diff --git a/emulators/qemu/CONFLICTS b/emulators/qemu/CONFLICTS
new file mode 100755
index 0000000..45c9273
--- /dev/null
+++ b/emulators/qemu/CONFLICTS
@@ -0,0 +1 @@
+conflicts kvm
diff --git a/emulators/qemu/DEPENDS b/emulators/qemu/DEPENDS
new file mode 100755
index 0000000..2e4648b
--- /dev/null
+++ b/emulators/qemu/DEPENDS
@@ -0,0 +1,192 @@
+. "$GRIMOIRE"/MESON_DEPENDS &&
+. "$GRIMOIRE"/VDEPENDS &&
+
+case "$HOST" in
+ (*-musl)
+ vdepends <<< 'musl >= 1.2.2'
+ ;;
+ (*)
+ optional_depends fuse3 \
+ --enable-fuse \
+ --disable-fuse \
+ 'for FUSE block device export'
+ ;;
+esac &&
+
+for qaudio in ${QEMU_AUDIO}; do
+ case ${qaudio} in
+ alsa) depends alsa-lib ;;
+ sdl) depends sdl2 ;;
+ pa) depends pulseaudio ;;
+ jack) depends JACK-DRIVER ;;
+ oss) depends oss ;;
+pipewire) depends pipewire ;;
+ esac
+done &&
+
+if list_find '--enable-docs' ${QEMU_OPTS}; then
+ depends texinfo &&
+ depends python-sphinx &&
+ depends perl &&
+ depends podlators
+fi &&
+
+optional_depends gtk+3 \
+ '--enable-gtk' \
+ '--disable-gtk' \
+ 'for GTK+ 3.x UI' &&
+
+if is_depends_enabled $SPELL gtk+3; then
+ optional_depends vte3 '--enable-vte' '--disable-vte' \
+ 'VTE support for the GTK+ UI'
+fi &&
+
+optional_depends sdl2 \
+ '--enable-sdl' \
+ '--disable-sdl' \
+ 'for SDL 2.x UI (recommended)' &&
+if is_depends_enabled "$SPELL" sdl2; then
+ optional_depends sdl2_image \
+ --enable-sdl-image \
+ --disable-sdl-image \
+ 'for SDL Image support for icons'
+fi &&
+
+optional_depends ncurses \
+ "--enable-curses" \
+ "--disable-curses" \
+ "for curses UI" &&
+
+optional_depends curl \
+ "--enable-curl" \
+ "--disable-curl" \
+ "for curl connectivity support" &&
+
+optional_depends attr \
+ '--enable-attr' \
+ '--disable-attr' \
+ 'for attr/xattr support in XFS' &&
+
+optional_depends libcap-ng \
+ '--enable-cap-ng' \
+ '--disable-cap-ng' \
+ 'for expanded Linux POSIX API capabilities' &&
+
+optional_depends libaio \
+ '--enable-linux-aio' \
+ '--disable-linux-aio' \
+ 'for Linux native asynchronous I/O support' &&
+
+optional_depends spice \
+ '--enable-spice' \
+ '--disable-spice' \
+ 'for SPICE virtualized desktop support' &&
+
+optional_depends usbredir \
+ --enable-usb-redir \
+ --disable-usb-redir \
+ 'for USB network redirection support' &&
+
+optional_depends libusb \
+ '--enable-libusb' \
+ '--disable-libusb' \
+ 'for USB pass-through support' &&
+
+optional_depends libcacard \
+ '--enable-smartcard' \
+ '--disable-smartcard' \
+ 'for SmartCard support' &&
+
+optional_depends lzo \
+ --enable-lzo \
+ --disable-lzo \
+ 'for LZO compression support' &&
+
+optional_depends snappy \
+ --enable-snappy \
+ --disable-snappy \
+ 'for Snappy compression support' &&
+
+optional_depends bzip2 \
+ --enable-bzip2 \
+ --disable-bzip2 \
+ 'for reading bzip2-compressed DMG images' &&
+
+#optional_depends lzfse \
+# --enable-lzfse \
+# --disable-lzfse \
+# 'for reading lzfse-compressed DMG images' &&
+
+optional_depends zstd \
+ --enable-zstd \
+ --disable-zstd \
+ 'for migration and qcow2 cluster compression' &&
+
+optional_depends libxml2 \
+ '--enable-parallels' \
+ '--disable-parallels' \
+ 'for Parallels image format support' &&
+
+case "$QEMU_OPTS" in *--enable-vnc*)
+ # In QEMU's order of preference
+ optional_depends gnutls \
+ --enable-gnutls \
+ --disable-gnutls \
+ 'to enable TLS encryption for VNC server using GnuTLS' &&
+ if ! is_depends_enabled "$SPELL" gnutls; then
+ optional_depends libgcrypt \
+ --enable-gcrypt \
+ --disable-gcrypt \
+ 'to enable TLS encryption for VNC server using
libgcrypt' &&
+ if ! is_depends_enabled "$SPELL" libgcrypt; then
+ optional_depends nettle \
+ --enable-nettle \
+ --disable-nettle \
+ 'to enable TLS encryption for VNC server using Nettle'
+ fi
+ fi &&
+
+ suggest_depends LIBSASL \
+ "--enable-vnc-sasl" \
+ "--disable-vnc-sasl" \
+ "to enable SASL encryption for VNC server" &&
+
+ suggest_depends JPEG \
+ '--enable-vnc-jpeg' \
+ '--disable-vnc-jpeg' \
+ 'for JPEG lossy compression for VNC server' &&
+
+ suggest_depends libpng \
+ '--enable-png' \
+ '--disable-png' \
+ 'for PNG compression for VNC server'
+ ;;
+esac &&
+
+optional_depends capstone \
+ --enable-capstone \
+ --disable-capstone \
+ 'for capstone disassembler support' &&
+
+optional_depends jemalloc '--enable-malloc=jemalloc' '' \
+ 'for jemalloc support' &&
+
+optional_depends libssh \
+ --enable-libssh \
+ --disable-libssh \
+ 'for SSH block device support' &&
+
+optional_depends DEVICE-MANAGER \
+ --enable-libudev \
+ --disable-libudev \
+ 'to enumerate host devices with libudev' &&
+
+suggest_depends bridge-utils \
+ '' \
+ '' \
+ "for creating TUN/TAP bridges" &&
+
+suggest_depends iproute2 \
+ "" \
+ "" \
+ "for routing between TUN/TAP interfaces"
diff --git a/emulators/qemu/DETAILS b/emulators/qemu/DETAILS
new file mode 100755
index 0000000..5a8859c
--- /dev/null
+++ b/emulators/qemu/DETAILS
@@ -0,0 +1,31 @@
+ SPELL=qemu
+ VERSION=8.2.2
+ SOURCE=$SPELL-$VERSION.tar.xz
+ SOURCE2=$SOURCE.sig
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-${VERSION%-*}"
+ SOURCE_URL[0]=http://wiki.qemu.org/download/$SOURCE
+# Watch: https://download.qemu.org/ qemu-([0-9.]+)[.]tar
+ SOURCE2_URL[0]=$SOURCE_URL.sig
+ SOURCE2_IGNORE=signature
+ SOURCE_GPG="qemu.gpg:${SOURCE2}:UPSTREAM_KEY"
+ DISTCC_HOSTS=
+ LICENSE[0]=GPL
+ LICENSE[1]=LGPL
+ WEB_SITE=http://qemu.org/
+ KEYWORDS="emulator utils"
+ ENTERED=20051102
+ SECURITY_PATCH=2
+ TMPFS=OFF
+ SHORT="generic and open source processor emulator"
+cat << EOF
+QEMU achieves a good emulation speed by using dynamic translation.
+
+QEMU has two operating modes:
+
+* Full system emulation. In this mode, QEMU emulates a full system (for
example
+ a PC), including a processor and various peripherials. It can be used to
+ launch different Operating Systems without rebooting the PC or to debug
+ system code.
+* User mode emulation (Linux host only). In this mode, QEMU can launch Linux
+ processes compiled for one CPU on another CPU.
+EOF
diff --git a/emulators/qemu/HISTORY b/emulators/qemu/HISTORY
new file mode 100644
index 0000000..e5e0cc1
--- /dev/null
+++ b/emulators/qemu/HISTORY
@@ -0,0 +1,434 @@
+2024-03-05 Pavel Vinogradov <public AT sourcemage.org>
+ * DETAILS: version 8.2.2
+
+2024-01-30 Pavel Vinogradov <public AT sourcemage.org>
+ * DETAILS: version 8.2.1
+
+2023-12-20 Pavel Vinogradov <public AT sourcemage.org>
+ * DETAILS: version 8.2.0
+ * patches/mmap-mremap-efault.patch: removed, not needed anymore
+
+2023-11-22 Pavel Vinogradov <public AT sourcemage.org>
+ * DETAILS: version 8.1.3
+ * BUILD: use internal libfdt
+
+2023-10-17 Pavel Vinogradov <public AT sourcemage.org>
+ * DETAILS: version 8.1.2
+
+2023-09-22 Pavel Vinogradov <public AT sourcemage.org>
+ * DETAILS: version 8.1.1
+
+2023-08-23 Pavel Vinogradov <public AT sourcemage.org>
+ * DETAILS: version 8.1.0
+ * BUILD: removed --meson parameter
+ * CONFIGURE, DEPENDS: pipewire is now available as audio backend
+
+2023-08-11 Pavel Vinogradov <public AT sourcemage.org>
+ * DETAILS: version 8.0.4
+
+2023-06-01 Pavel Vinogradov <public AT sourcemage.org>
+ * DETAILS: version 8.0.2
+
+2023-04-06 Pavel Vinogradov <public AT sourcemage.org>
+ * DETAILS: version 7.2.1
+
+2022-08-31 Pavel Vinogradov <public AT sourcemage.org>
+ * DETAILS: version 7.1.0
+ * CONFIGURE, DEPENDS: updated libpng flags
+
+2022-08-24 Pavel Vinogradov <public AT sourcemage.org>
+ * DEPENDS: refactored audio backends code into for loop with case,
+ JACK -> JACK-DRIVER
+
+2022-08-08 Pavel Vinogradov <public AT sourcemage.org>
+ * DETAILS: version 7.0.0, bz2 -> xz
+ * BUILD: added possible muon build option, made target archs and audio
+ backends comma separated lists
+ * CONFIGURE: removed esound and fmod audio backend options, added JACK
+ * DEPENDS: removed python3 (MESON_DEPENDS should be enough), added
JACK and
+ oss, commented out lzfse (no such spell yet), corrected libxml2 and
+ jemalloc flags
+
+2022-04-23 Ismael Luceno <ismael AT sourcemage.org>
+ * DEPENDS: switched to MESON_DEPENDS
+
+2021-09-23 Thomas Orgis <sobukus AT sourcemage.org>
+ * PRE_BUILD: avoid using installed qemu
+ * CONFLICTS: remove self-conflict
+
+2021-09-16 Thomas Orgis <sobukus AT sourcemage.org>
+ * CONFIGURE, PRE_BUILD: drop sound card selection
+ * CONFLICTS: need to remove qemu from install until build system
+ is fixed not to pick it up
+
+2021-09-15 Thomas Orgis <sobukus AT sourcemage.org>
+ * patches/musl-fix-duplicated-sysinfo.patch: fix for glibc
+ * DEPENDS: needs libssh, not libssh2
+ * BUILD: remove python2 switch
+
+2021-09-10 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: updated spell to 6.1.0
+ * DEPENDS: on musl hosts request musl 1.2.2+ (sigevent API)
+ added meson and ninja-build-system
+ added optional deps on: DEVICE-MANAGER, capstone, fuse3, jemalloc,
+ libssh2, libxml2, lzfse, sdl2_image, and zstd
+ fixed flags for snappy
+ * CONFIGURE, DEPENDS: reworked TLS library dependencies
+ * BUILD: added removal of -ffast-math from CFLAGS
+ added --disable-fuse for musl
+ * archs: added avr; removed lm32, moxie, tilegx and unicore32
+ * patches/musl-F_SHLCK-and-F_EXLCK.patch,
+ patches/musl-fix-duplicated-sysinfo.patch,
+ patches/musl-fix-sigevent-and-sigval_t.patch: removed, no longer
needed
+ *
patches/0006-linux-user-signal.c-define-__SIGRTMIN-MAX-for-non-GN.patch,
+ patches/mmap-mremap-efault.patch: updated for 6.1.0
+ * patches/musl-initialize-msghdr.patch: added to fix sendmsg syscall
emulation
+ * patches/CVE-2021-20255.patch: added security fix
+ * DETAILS: SECURITY_PATCH++
+
+2021-09-09 Ismael Luceno <ismael AT sourcemage.org>
+ * patches/musl-fix-duplicated-sysinfo.patch: fixed for glibc
+ * CONFIGURE: added sanitization of QEMU_ARCHS
+
+2020-09-07 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: updated spell to 5.1.0
+ TMPFS=OFF
+ * DEPENDS: removed bluez (upstream removed the backend)
+ switched to python3
+ added dependency on usbredir
+ * PRE_BUILD: added fix for wrong include of sys/signal.h
+ *
patches/0006-linux-user-signal.c-define-__SIGRTMIN-MAX-for-non-GN.patch,
+ patches/mmap-mremap-efault.patch,
+ patches/musl-9p-limits_h.patch,
+ patches/musl-F_SHLCK-and-F_EXLCK.patch,
+ patches/musl-fix-SIOCGSTAMPNS.patch,
+ patches/musl-fix-duplicated-sysinfo.patch,
+ patches/musl-fix-sigevent-and-sigval_t.patch:
+ added patches to fix build against musl libc
+
+2019-08-09 Eric Sandall <sandalle AT sourcemage.org>
+ * These are quick fixes, I need this recompiled for the updated
nettle 3.5 that broke compatibility.
+ * DEPENDS: Dependencies changed since 2.11
+ Optionally uses gtk+3 >= 3.16 now. gtk+2 is not an option, there is
no gtkabi parameter anymore.
+ Use list_find instead of case to more reliably check for
"--enable-docs"
+ * PRE_BUILD: No pci.mak nor sound.mak, nor are they included, so just
write
+ the configs out for now instead of sed, but they do nothing.
+
+2019-05-30 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: updated spell to 4.0.0
+ * DEPENDS: removed SDL 1.x, not supported anymore
+ * patches/10-glibc-2.27.patch: removed, no longer needed
+ * BUILD, CONFIGURE, DEPENDS, INSTALL: Streamlined options
+ * archs: Updated supported targets
+
+2018-03-06 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Updated to latest stable 2.11.1
+ * patches/10-glibc-2.27.patch: Fix compilation against glibc 2.27
+ See https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=891375
+ Also affects qemu 2.10.x
+ * PRE_BUILD: Apply patches directory
+
+2017-09-25 Thomas Orgis <sobukus AT sourcemage.org>
+ * DETAILS: version 2.10.0
+
+2017-06-06 Thomas Orgis <sobukus AT sourcemage.org>
+ * DETAILS: version 2.9.0
+
+2017-05-19 Thomas Orgis <sobukus AT sourcemage.org>
+ * INSTALL: Do not replace an existing qemu-system-${ARCH} with the
+ symlink, just in case it was built and I would like to run a VM,
+ for a change.
+ * DETAILS: patchlevel for the above, version 2.8.1.1 and
+ SECURITY_PATCH++ for that
+
+2017-04-04 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Updated to 2.8.1
+ * INSTALL: Some packages (libguestfs) depend on the
qemu-system-${ARCH} file
+ qemu-system-${ARCH} is not made by default by qemu install (since
2.6.x)
+ * archs: Remove unicore32
+
+2016-06-29 Eric Sandall <sandalle AT sourcemage.org>
+ * SUB_DEPENDS, PRE_SUB_DEPENDS: nss dependency moved to libcacard in
2.6.0
+ * CONFIGURE, DEPENDS, BUILD: May only have one of nettle or libgcrypt
+
+2016-06-11 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: updated spell to 2.6.0
+ * DEPENDS, CONFIGURE: Updated dependencies and flags
+
+2015-05-07 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: updated spell to 2.3.0
+
+2015-04-24 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: PATCHLEVEL=1
+ * BUILD: fixed /var/run location
+
+2015-03-23 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: updated spell to 2.2.1
+
+2015-03-09 Ismael Luceno <ismael AT sourcemage.org>
+ * DEPENDS: Switch to libusb
+
+2014-12-25 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: updated spell to 2.2.0
+
+2014-12-24 Ismael Luceno <ismael AT sourcemage.org>
+ * BUILD, DEPENDS: Depends on python 2.x
+
+2014-12-04 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Updated to 2.1.2
+ * qemu.gpg: Add F108B584 (see
+
https://lists.nongnu.org/archive/html/qemu-devel/2014-04/msg03559.html)
+ * docs-Fix-generating-qemu-doc.html-with-texinfo-5.patch: Unused,
removed
+
+2014-04-14 Ismael Luceno <ismael AT sourcemage.org>
+ * BUILD: Pass down ARFLAGS=rv, to workaround buildsystem bug
+
+2013-09-04 Eric Sandall <sandalle AT sourcemage.org>
+ * DEPENDS: Optionally depends on nss
+ * *SUB_DEPENDS: Allow forcing dependency on nss
+
+2013-08-13 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Updated to 1.5.2
+ * CONFIGURE: sb16, cs4231a, adlib, and gus sound cards removed
+ Query for Trusted Platform Module (TPM) support
+ * DEPENDS: Optionally depends on vte, libaio, libusbx, and spice
+ * BUILD: --audio-card-list= removed, modify default-configs/pci.mak
(for
+ PCI) and default-configs/sound.mak (for ISA)
+ Pass QEMU_TPM to configure
+
+2013-08-12 Eric Sandall <sandalle AT sourcemage.org>
+ * DEPENDS: Optionally depends on texinfo for documentation
+ * PRE_BUILD: Apply
docs-Fix-generating-qemu-doc.html-with-texinfo-5.patch
+ * docs-Fix-generating-qemu-doc.html-with-texinfo-5.patch: from
https://bugs.launchpad.net/qemu/+bug/1130533
+
+2013-04-16 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Updated to 1.4.1
+ Removed branches, they no longer (even 1.1) compile without work.
+ * CONFIGURE: Query for enabling VNC
+ * DEPENDS: Optionally depends on libcap-ng
+ Move VNC-specific optional dependencies into a VNC enabled check
+ * BUILD: Pass $QEMU_VNC to ./configure
+ * PRE_BUILD, cflags.patch, archs-0.15: Removed
+ * archs: Updated to 1.4.1 architecture list
+
+2012-08-19 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 1.1.1-1 (branch 1.1); removed tabs
+
+2012-05-17 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: Fixed branch 1.1 VERSION and SOURCE
+ * DETAILS, PREPARE: Added branch 1.1, and renamed 1.00 to 1.0
+ * PREPARE: Cut $QEMU_VER at the last dot
+
+2012-02-18 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 1.0.1
+
+2011-11-02 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 1.0
+ * PREPARE: added 1.00 branch
+
+2011-10-25 Eric Sandall <sandalle AT sourcemage.org>
+ * PRE_BUILD: cflags.patch is only for 0.15+
+ * CONFIGURE: 0.15 adds new architectures not valid for earlier
versions
+ * archs,archs-0.15: Split into pre-0.15 and 0.15+ versions
+
+2011-10-13 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 0.15.1
+
+2011-08-30 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: PATCHLEVEL=1
+ * BUILD: added sysconfdir path
+ * archs: renewed supported archlist
+
+2011-08-17 Vlad Glagolev <stealth AT sourcemage.org>
+ * PRE_BUILD: added, to apply the patch
+ * cflags.patch: added, to fix compilation on i486 (missing space in
flags)
+
+2011-08-11 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: added 0.15 branch; dropped 0.10 and 0.11 support as per
+ offsite; corrected mirrors for different branches; use only upstream
+ gpg keycheck
+ * BUILD: removed deprecated limitations
+ * DEPENDS: keep case selector from 0.12 up to the latest branch
+ * PREPARE: made 0.15 default
+ * CONFIGURE: corrected sound card selection per branch
+
+2011-07-28 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 0.14.1
+
+2011-03-02 Julien "_kaze_" ROZO <julien AT rozo.org>
+ * PREPARE, DETAILS: added 0.14 branch, now used if nothing else is
selected
+ * CONFIGURE: added hda audio device for 0.14 branch
+
+2011-01-19 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: PATCHLEVEL++
+ * INSTALL: Install /usr/bin/qemu-kvm to allow virt-manager (and other
+ QEMU using apps) to "detect" that KVM hardware acceleration is
available
+
+2010-12-17 Bor Kraljič <pyrobor AT ver.si>
+ * PREPARE,CONFIGURE,DETAILS: added 0.13 branch
+
+2010-08-03 Eric Sandall <sandalle AT sourcemage.org>
+ * PROVIDES: qemu and kvm now provide QEMU functionality
+
+2010-07-23 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 0.12.5
+
+2010-07-10 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Use 0.12 (latest stable) if nothing selected
+ * PREPARE: List 0.12 first (default, latest stable)
+ * DEPENDS: Depend on alsa-lib if ALSA is selected in QEMU_AUDIO
+ Depend on sdl if SDL is selected in QEMU_AUDIO
+ Depend on pulseaudio if PulseAudio is selected in QEMU_AUDIO
+ Depend on esound if ESD is selected in QEMU_AUDIO
+
+2010-06-13 Donald Johnson <minozake AT codemages.net>
+ * DETAILS: Changed to mirror of qemu's sources, since all downloads
seem to
+ have moved.
+
+2010-06-03 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated 0.12 branch to 0.12.4; killed dead source url
+
+2010-03-21 Vasil Yonkov <spirtbrat AT sourcemage.org>
+ * DETAILS: updated QEMU_VER=0.12 to 0.12.3
+
+2010-02-10 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Check only the branch of QEMU_VER (at one point it was
+ 0.10.6, now it's 0.10)
+ * PREPARE: Fix old invalid value of QEMU_TEST
+
+2010-02-03 Vasil Yonkov <spirtbrat AT sourcemage.org>
+ * BUILD, DEPENDS, DETAILS, PREPARE: made QEMU_VER referring to
+ a branch, not to a concrete version
+ * DETAILS: added a default version
+
+2010-01-20 Vasil Yonkov <spirtbrat AT sourcemage.org>
+ * DETAILS, DEPENDS, PREPARE: added versions 0.11.1 and 0.12.2
+ * BUILD: the build fails only when kqemu support is enabled
+ * CONFIGURE: added queries for supported audio systems
+ and emulated audio cards, added option for KVM support
+ * DEPENDS: added options for ncurses, gnutls, curl, LIBSASL,
+ bridge-utils, iproute2
+
+2009-08-15 Arjan Bouter <abouter AT sourcemage.org>
+ * DEPENDS: use BLUEZ provider
+
+2009-07-31 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 0.10.6
+
+2009-05-22 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 0.10.5
+
+2009-05-13 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 0.10.4
+
+2009-05-02 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 0.10.3
+
+2009-04-07 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 0.10.2
+
+2009-03-22 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 0.10.1; added 1 mirror; fixed desc
+
+2009-03-10 Vlad Glagolev <stealth AT sourcemage.org>
+ * DEPENDS: changed configure flag for video output
+
+2009-03-07 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: 0.10.0; switched to upstream pgp key; cleaned up
+ * DEPENDS: sdl _is_ optional; gcc dep is useless; added missing deps;
+ cleaned up
+ * BUILD, CONFIGURE: cleaned up
+ * PRE_BUILD: removed
+ * archs: updated arch specs
+
+2008-06-15 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: new url & website
+
+2008-02-11 Thomas Orgis <sobukus AT sourcemage.org>
+ * DEPENDS: No --enable-kqemu! The custom configure script does only
know the disable.
+
+2008-01-19 Pol Vinogradov <vin.public AT gmail.com>
+ * DETAILS: updated to 0.9.1
+ * BUILD: fixed configure's options
+
+2007-04-11 Elisamuel Resto <ryuji AT mages.ath.cx>
+ * BUILD: prescott arch was added recently, wasn't getting filtered.
Related to bug 13596
+
+2007-04-07 David Brown <dmlb2000 AT gmail.com>
+ * CONFLICTS: added conflicts with kvm
+
+2007-03-24 Thomas Orgis <sobukus AT sourcemage.org>
+ * BUILD: a refinement: reduce athlons to k6-3 as that works, too, and
+ performs better than pentium-mmx for these cpus
+
+2007-03-17 Thomas Orgis <sobukus AT sourcemage.org>
+ * BUILD: more general CFLAGS fixup to reduce more stuff to
pentium-mmx and fix bug 13596
+
+2007-02-25 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * BUILD: also remove -march=athlon-xp from CFLAGS for MMU
+ use grep instead of list_find, the api was changed in devel sorcery
+
+2007-02-18 Eric Sandall <sandalle AT sourcemage.org>
+ * BUILD: Disable PIC (with disable_pic) if building soft MMU targets
+ pentium4 breaks soft MMU, downgrade to pentium-mmx if building MMU
+
+2007-02-16 Eric Sandall <sandalle AT sourcemage.org>
+ * DEPENDS: kqemu is no longer restricted to z-rejected
+
+2007-02-15 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Updated to 0.9.0
+ * DEPENDS: Pass disable/enable flags for kqemu
+ * BUILD: Use default_build, pass --target-list to OPTS
+ * archs: Alphabetize list
+ All *-user targets are now called *-linux-user
+ Added m68k-linux-user target
+ {i386,arm,mips,mipsel,ppc,sparc,x86_64}-softmmu fail to compile,
+ so removing from the list.
+
+2006-10-14 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * archs: added new targets #13159 and unified formatting
+ * DETAILS: ++PATCHLEVEL
+
+2006-09-13 Eric Sandall <sandalle AT sourcemage.org>
+ * DEPENDS: Optionally depends on kqemu for acceleration kernel module
+ Optionally depends on alsa-lib
+ * CONFLICTS: No longer conflicts with qemu
+ * BUILD: Use INSTALL_ROOT
+
+2006-08-19 Bearcat M. Sandor <sourcemage AT feline-soul.com>
+ * DETAILS: Updated to 0.8.2
+
+2006-06-28 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Removed BUILD_API=2, set grimoire-wide
+
+2006-06-23 David Brown <dmlb2000 AT gmail.com>
+ * BUILD: didn't have an escape char on the end of line
+ to include $OPTS with configure
+
+2006-06-21 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * DETAILS: added GCC_VERSION, updated spell to 0.8.1
+ * BUILD: removed invoke_gcc
+ * PRE_BUILD: created for invoke_gcc
+ * CONFIGURE: added query for unattended processing, #10732
+ thanks to Andreas van Ruth for the initial patch
+
+2006-03-12 Karsten Behrmann <BearPerson AT sourcemage.org>
+ * DETAILS: (automated) Add KEYWORDS
+
+2006-02-01 David Kowis <dkowis AT sourcemage.org>
+ * CONFLICTS: made it conflict with kqemu
+
+2006-01-10 anoxia <anoxia AT sourcemage.org>
+ * DETAILS: updated spell to 0.8.0
+
+2005-11-19 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * DETAILS: fixed wrong quoting in SHORT
+
+2005-11-05 George Sherwood <george AT beernabeer.com>
+ * DETAILS: Added SOURCE_HASH checking
+ * CONFIGURE: Change selection to dialog
+ * BUILD: Default_build won't work with the target-list
+
+2005-11-02 Andreas van Ruth <avr AT gnulinux.nl>
+ * BUILD, DEPENDS, DETAILS, HISTORY: created
+
diff --git a/emulators/qemu/INSTALL b/emulators/qemu/INSTALL
new file mode 100755
index 0000000..a26ee9f
--- /dev/null
+++ b/emulators/qemu/INSTALL
@@ -0,0 +1,23 @@
+default_install &&
+
+case "$QEMU_OPTS" in
+*--disable-kvm*) ;;
+*)
+ ARCH=$(uname -m)
+
+ if [[ "${ARCH}" == "i686" ]]; then
+ ARCH="x86_64"
+ fi &&
+
+ # Some packages (libguestfs) depend on the qemu-system-${ARCH} file
+ # But for sure overwriting qemu-system-${ARCH} with a link to the
+ # userspace emulator is a very bad idea?! Putting this check in here
+ # until someone explains that whole thing to me. --sobukus
+ if ! test -e "${INSTALL_ROOT}"/usr/bin/qemu-system-${ARCH}; then
+ ln -sf /usr/bin/qemu-${ARCH} \
+ "${INSTALL_ROOT}"/usr/bin/qemu-system-${ARCH}
+ fi &&
+
+ ln -sf /usr/bin/qemu-system-${ARCH} \
+ "${INSTALL_ROOT}"/usr/bin/qemu-kvm
+esac
diff --git a/emulators/qemu/PREPARE b/emulators/qemu/PREPARE
new file mode 100755
index 0000000..f2f6cf3
--- /dev/null
+++ b/emulators/qemu/PREPARE
@@ -0,0 +1 @@
+persistent_remove QEMU_VER
diff --git a/emulators/qemu/PRE_BUILD b/emulators/qemu/PRE_BUILD
new file mode 100755
index 0000000..a55d1e7
--- /dev/null
+++ b/emulators/qemu/PRE_BUILD
@@ -0,0 +1,13 @@
+default_pre_build &&
+
+cd "${SOURCE_DIRECTORY}" &&
+apply_patch_dir patches &&
+# Fix insistence on using qemu-keymap from host.
+# Upstream logic is warped. Fix there?
+sed -i "s:\(find_program('qemu-keymap\)':\1-do-not-find-this':" \
+ pc-bios/keymaps/meson.build &&
+# Fix wrong include
+sed -i '/^#include/{s@<sys/signal[.]@<signal.@}' \
+ include/qemu/osdep.h \
+ linux-user/syscall.c \
+ linux-user/fd-trans.c
diff --git a/emulators/qemu/PRE_SUB_DEPENDS b/emulators/qemu/PRE_SUB_DEPENDS
new file mode 100755
index 0000000..be9c910
--- /dev/null
+++ b/emulators/qemu/PRE_SUB_DEPENDS
@@ -0,0 +1,6 @@
+case $THIS_SUB_DEPENDS in
+ NSS) is_depends_enabled $SPELL libcacard && return 0;;
+ *) echo "unknown sub_depends!" ;;
+esac
+return 1
+
diff --git a/emulators/qemu/PROVIDES b/emulators/qemu/PROVIDES
new file mode 100755
index 0000000..a0b105b
--- /dev/null
+++ b/emulators/qemu/PROVIDES
@@ -0,0 +1 @@
+provides QEMU
diff --git
a/emulators/qemu/REPAIR^35e01f923e4981c9151fa98a1e228423^PRE_SUB_DEPENDS
b/emulators/qemu/REPAIR^35e01f923e4981c9151fa98a1e228423^PRE_SUB_DEPENDS
new file mode 100755
index 0000000..be9c910
--- /dev/null
+++ b/emulators/qemu/REPAIR^35e01f923e4981c9151fa98a1e228423^PRE_SUB_DEPENDS
@@ -0,0 +1,6 @@
+case $THIS_SUB_DEPENDS in
+ NSS) is_depends_enabled $SPELL libcacard && return 0;;
+ *) echo "unknown sub_depends!" ;;
+esac
+return 1
+
diff --git a/emulators/qemu/REPAIR^none^PRE_SUB_DEPENDS
b/emulators/qemu/REPAIR^none^PRE_SUB_DEPENDS
new file mode 100755
index 0000000..c19df56
--- /dev/null
+++ b/emulators/qemu/REPAIR^none^PRE_SUB_DEPENDS
@@ -0,0 +1,6 @@
+case $THIS_SUB_DEPENDS in
+ NSS) is_depends_enabled $SPELL nss && return 0;;
+ *) echo "unknown sub_depends!" ;;
+esac
+return 1
+
diff --git a/emulators/qemu/SUB_DEPENDS b/emulators/qemu/SUB_DEPENDS
new file mode 100755
index 0000000..dd6e029
--- /dev/null
+++ b/emulators/qemu/SUB_DEPENDS
@@ -0,0 +1,6 @@
+case $THIS_SUB_DEPENDS in
+ NSS) echo "nss/smartcard support requested, forcing libcacard dependency."
&&
+ depends libcacard '--enable-smartcard'
+ ;;
+ *) echo "unknown sub_depends $THIS_SUB_DEPENDS"; return 1 ;;
+esac
diff --git a/emulators/qemu/archs b/emulators/qemu/archs
new file mode 100644
index 0000000..c6c70fa
--- /dev/null
+++ b/emulators/qemu/archs
@@ -0,0 +1,63 @@
+aarch64-linux-user aarch64-user on
+aarch64-softmmu aarch64 on
+aarch64_be-linux-user aarch64_be-user on
+alpha-linux-user alpha-user on
+alpha-softmmu alpha on
+arm-linux-user arm-user on
+arm-softmmu arm on
+armeb-linux-user armeb-user on
+avr-softmmu avr on
+cris-linux-user cris-user on
+cris-softmmu cris on
+hppa-linux-user hppa-user on
+hppa-softmmu hppa on
+i386-linux-user i386-user on
+i386-softmmu i386 on
+m68k-linux-user m68k-user on
+m68k-softmmu m68k on
+microblaze-linux-user microblaze-user on
+microblaze-softmmu microblaze on
+microblazeel-linux-user microblazeel-user on
+microblazeel-softmmu microblazeel on
+mips-linux-user mips-user on
+mips-softmmu mips on
+mips64-linux-user mips64-user on
+mips64-softmmu mips64 on
+mips64el-linux-user mips64el-user on
+mips64el-softmmu mips64el on
+mipsel-linux-user mipsel-user on
+mipsel-softmmu mipsel on
+mipsn32-linux-user mipsn32-user on
+mipsn32el-linux-user mipsn32el-user on
+nios2-linux-user nios2-user on
+nios2-softmmu nios2 on
+or1k-linux-user or1k-user on
+or1k-softmmu or1k on
+ppc-linux-user ppc-user on
+ppc-softmmu ppc on
+ppc64-linux-user ppc64-user on
+ppc64-softmmu ppc64 on
+ppc64abi32-linux-user ppc64abi32-user on
+ppc64le-linux-user ppc64le-user on
+riscv32-linux-user riscv32-user on
+riscv32-softmmu riscv32 on
+riscv64-linux-user riscv64-user on
+riscv64-softmmu riscv64 on
+s390x-linux-user s390x-user on
+s390x-softmmu s390x on
+sh4-linux-user sh4-user on
+sh4-softmmu sh4 on
+sh4eb-linux-user sh4eb-user on
+sh4eb-softmmu sh4eb on
+sparc-linux-user sparc-user on
+sparc-softmmu sparc on
+sparc32plus-linux-user sparc32plus-user on
+sparc64-linux-user sparc64-user on
+sparc64-softmmu sparc64 on
+tricore-softmmu tricore on
+x86_64-linux-user x86_64-user on
+x86_64-softmmu x86_64 on
+xtensa-linux-user xtensa-user on
+xtensa-softmmu xtensa on
+xtensaeb-linux-user xtensaeb-user on
+xtensaeb-softmmu xtensaeb on
diff --git
a/emulators/qemu/patches/0006-linux-user-signal.c-define-__SIGRTMIN-MAX-for-non-GN.patch

b/emulators/qemu/patches/0006-linux-user-signal.c-define-__SIGRTMIN-MAX-for-non-GN.patch
new file mode 100644
index 0000000..4c792b0
--- /dev/null
+++
b/emulators/qemu/patches/0006-linux-user-signal.c-define-__SIGRTMIN-MAX-for-non-GN.patch
@@ -0,0 +1,38 @@
+From 8fbb4e6797ed67310b74cbaaa061269db45a5b71 Mon Sep 17 00:00:00 2001
+From: Natanael Copa <ncopa AT alpinelinux.org>
+Date: Tue, 29 Apr 2014 15:51:31 +0200
+Subject: [PATCH] linux-user/signal.c: define __SIGRTMIN/MAX for non-GNU
+ platforms
+
+The __SIGRTMIN and __SIGRTMAX are glibc internals and are not available
+on all platforms, so we define those if they are missing.
+
+This is needed for musl libc.
+
+Signed-off-by: Natanael Copa <ncopa AT alpinelinux.org>
+Origin: Alpine Linux
+---
+ linux-user/signal.c | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/linux-user/signal.c b/linux-user/signal.c
+index 5ca6d62b15..e917c16d91 100644
+--- a/linux-user/signal.c
++++ b/linux-user/signal.c
+@@ -25,6 +25,13 @@
+ #include "trace.h"
+ #include "signal-common.h"
+
++#ifndef __SIGRTMIN
++#define __SIGRTMIN 32
++#endif
++#ifndef __SIGRTMAX
++#define __SIGRTMAX (NSIG-1)
++#endif
++
+ static struct target_sigaction sigact_table[TARGET_NSIG];
+
+ static void host_signal_handler(int host_signum, siginfo_t *info,
+--
+2.23.0
+
diff --git a/emulators/qemu/patches/CVE-2021-20255.patch
b/emulators/qemu/patches/CVE-2021-20255.patch
new file mode 100644
index 0000000..9b9984d
--- /dev/null
+++ b/emulators/qemu/patches/CVE-2021-20255.patch
@@ -0,0 +1,44 @@
+CVE-2021-20255 patch adapted from QEMU patch by Stefan Weil
+
+Link: https://bugzilla.redhat.com/show_bug.cgi?id=1930646
+
+Signed-off-by: Neha Agarwal <nehaagarwal AT microsoft.com>
+Origin: Alpine Linux
+---
+diff --git a/hw/net/eepro100.c b/hw/net/eepro100.c
+index 16e95ef9cc..2474cf3dc2 100644
+--- a/hw/net/eepro100.c
++++ b/hw/net/eepro100.c
+@@ -279,6 +279,9 @@ typedef struct {
+ /* Quasi static device properties (no need to save them). */
+ uint16_t stats_size;
+ bool has_extended_tcb_support;
++
++ /* Flag to avoid recursions. */
++ bool busy;
+ } EEPRO100State;
+
+ /* Word indices in EEPROM. */
+@@ -837,6 +840,14 @@ static void action_command(EEPRO100State *s)
+ Therefore we limit the number of iterations. */
+ unsigned max_loop_count = 16;
+
++ if (s->busy) {
++ /* Prevent recursions. */
++ logout("recursion in %s:%u\n", __FILE__, __LINE__);
++ return;
++ }
++
++ s->busy = true;
++
+ for (;;) {
+ bool bit_el;
+ bool bit_s;
+@@ -933,6 +944,7 @@ static void action_command(EEPRO100State *s)
+ }
+ TRACE(OTHER, logout("CU list empty\n"));
+ /* List is empty. Now CU is idle or suspended. */
++ s->busy = false;
+ }
+
+ static void eepro100_cu_command(EEPRO100State * s, uint8_t val)
diff --git a/emulators/qemu/patches/musl-9p-limits_h.patch
b/emulators/qemu/patches/musl-9p-limits_h.patch
new file mode 100644
index 0000000..01e2b25
--- /dev/null
+++ b/emulators/qemu/patches/musl-9p-limits_h.patch
@@ -0,0 +1,12 @@
+Origin: Alpine Linux
+
+--- a/hw/9pfs/9p.c
++++ b/hw/9pfs/9p.c
+@@ -16,6 +16,7 @@
+ *
+ */
+
++#include <linux/limits.h>
+ #include "qemu/osdep.h"
+ #include <glib/gprintf.h>
+ #include "hw/virtio/virtio.h"
diff --git a/emulators/qemu/patches/musl-fix-SIOCGSTAMPNS.patch
b/emulators/qemu/patches/musl-fix-SIOCGSTAMPNS.patch
new file mode 100644
index 0000000..49c0959
--- /dev/null
+++ b/emulators/qemu/patches/musl-fix-SIOCGSTAMPNS.patch
@@ -0,0 +1,12 @@
+Origin: Alpine Linux
+
+--- a/linux-user/syscall.c
++++ b/linux-user/syscall.c
+@@ -36,6 +36,7 @@
+ #include <sys/resource.h>
+ #include <sys/swap.h>
+ #include <linux/capability.h>
++#include <linux/sockios.h>
+ #include <sched.h>
+ #include <sys/timex.h>
+ #ifdef __ia64__
diff --git a/emulators/qemu/patches/musl-fix-duplicated-sysinfo.patch
b/emulators/qemu/patches/musl-fix-duplicated-sysinfo.patch
new file mode 100644
index 0000000..ff63003
--- /dev/null
+++ b/emulators/qemu/patches/musl-fix-duplicated-sysinfo.patch
@@ -0,0 +1,13 @@
+--- a/linux-user/syscall.c
++++ b/linux-user/syscall.c
+@@ -16,6 +16,10 @@
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
+ */
+ #define _ATFILE_SOURCE
++#include <stdint.h> /* To possibly get __GLIBC__ definition. */
++#ifndef __GLIBC__
++#define _LINUX_SYSINFO_H /* to avoid duplicated sysinfo struct definition */
++#endif
+ #include "qemu/osdep.h"
+ #include "qemu/cutils.h"
+ #include "qemu/path.h"
diff --git a/emulators/qemu/patches/musl-initialize-msghdr.patch
b/emulators/qemu/patches/musl-initialize-msghdr.patch
new file mode 100644
index 0000000..aff916e
--- /dev/null
+++ b/emulators/qemu/patches/musl-initialize-msghdr.patch
@@ -0,0 +1,15 @@
+Source: https://github.com/void-linux/void-packages/issues/23557
+
+diff --git linux-user/syscall.c linux-user/syscall.c
+index 945fc25..8d8b68a 100644
+--- a/linux-user/syscall.c
++++ b/linux-user/syscall.c
+@@ -3209,7 +3209,7 @@ static abi_long do_sendrecvmsg_locked(int fd, struct
target_msghdr *msgp,
+ int flags, int send)
+ {
+ abi_long ret, len;
+- struct msghdr msg;
++ struct msghdr msg = {0};
+ abi_ulong count;
+ struct iovec *vec;
+ abi_ulong target_vec;
diff --git a/emulators/qemu/qemu.gpg b/emulators/qemu/qemu.gpg
new file mode 100644
index 0000000..8b7eccc
Binary files /dev/null and b/emulators/qemu/qemu.gpg differ
diff --git a/utils/qemu/BUILD b/utils/qemu/BUILD
deleted file mode 100755
index 7dfd986..0000000
--- a/utils/qemu/BUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# remove -ffast-math; hardfloat requires an exact IEEE implementation
-CFLAGS="${CFLAGS//-ffast-math}" &&
-
-message "${MESSAGE_COLOR}Target list: $QEMU_ARCHS${DEFAULT_COLOR}" &&
-
-cd "${SOURCE_DIRECTORY}" &&
-
-if [[ "x${QEMU_VNC_TLS}" == "xnone" ]]; then
- OPTS="${OPTS} --disable-gcrypt --disable-nettle"
-fi &&
-
-case "$HOST" in
- (*-musl)
- OPTS+=' --disable-fuse'
- ;;
-esac &&
-
-./configure --prefix="$INSTALL_ROOT/usr" \
- --sysconfdir="$INSTALL_ROOT/etc" \
- --localstatedir="$INSTALL_ROOT/var" \
- --target-list="${QEMU_ARCHS// /,}" \
- --audio-drv-list="${QEMU_AUDIO// /,}" \
- --enable-fdt="internal" \
- $QEMU_OPTS \
- $OPTS &&
-
-# Pass down ARFLAGS to workaround a bug in QEMU's build system
-ARFLAGS=rv make
diff --git a/utils/qemu/CONFIGURE b/utils/qemu/CONFIGURE
deleted file mode 100755
index c3a5b2a..0000000
--- a/utils/qemu/CONFIGURE
+++ /dev/null
@@ -1,59 +0,0 @@
-. "$GRIMOIRE/FUNCTIONS" &&
-
-local QEMU_ARCH_FILE="$SPELL_DIRECTORY/archs"
-persistent_add QEMU_ARCHS &&
-
-# deliberately uses query, see locale CONFIGURE note
-if query "Handpick architectures to emulate (y/n)?" n; then
- BACKTITLE="Qemu Archs Configuration" &&
- TITLE="Arch Selection" &&
- HELP="Select Arch you want to build qemu" &&
-
- QEMU_ARCHS=`dialog --backtitle "$BACKTITLE" \
- --title "$TITLE" \
- --stdout \
- --checklist "$HELP" \
- 0 0 0 \
- $(<"$QEMU_ARCH_FILE")`
-fi &&
-
-if [[ -z $QEMU_ARCHS ]]; then
- QEMU_ARCHS=$(awk -vORS=' ' '{print $1}' "$QEMU_ARCH_FILE")
-else
- # sanitize QEMU_ARCHS
- QEMU_ARCHS=$(awk -F'[ "]+' -vORS=' ' -vtmp="$QEMU_ARCHS" '
- BEGIN {
- $0 = tmp
- for (i = 1; i <= NF; i++) selected[$i]
- FS = " "
- }
- $1 in selected {print $1; delete selected[$1]; next}
- END {for (i in selected) printf "WARN: %s architecture removed\n", $1
>"/dev/stderr"}
- ' "$QEMU_ARCH_FILE")
-fi
-
-. $GRIMOIRE/config_query_multi.function &&
-
-config_query_multi QEMU_AUDIO "Select sound system(s) to support" \
- oss alsa sdl jack pa pipewire &&
-
-persistent_remove QEMU_CARDS &&
-
-config_query_option QEMU_OPTS "Enable KVM acceleration support" y \
- "" "--disable-kvm" &&
-
-config_query_option QEMU_OPTS "Enable Trusted Platform Module (TPM)?" n \
- '--enable-tpm' '' &&
-
-list_remove QEMU_OPTS "--disable-vnc-png" &&
-config_query_option QEMU_OPTS "Enable VNC support?" y \
- '--enable-vnc' \
- '--disable-vnc --disable-vnc-sasl --disable-vnc-jpeg' &&
-
-persistent_remove QEMU_VNC_TLS &&
-
-config_query_option QEMU_OPTS \
- 'Build documentation? (requires: perl, python, texinfo)'
y \
- '--enable-docs' \
- '--disable-docs'
-
diff --git a/utils/qemu/CONFLICTS b/utils/qemu/CONFLICTS
deleted file mode 100755
index 45c9273..0000000
--- a/utils/qemu/CONFLICTS
+++ /dev/null
@@ -1 +0,0 @@
-conflicts kvm
diff --git a/utils/qemu/DEPENDS b/utils/qemu/DEPENDS
deleted file mode 100755
index 3878860..0000000
--- a/utils/qemu/DEPENDS
+++ /dev/null
@@ -1,179 +0,0 @@
-. "$GRIMOIRE"/MESON_DEPENDS &&
-. "$GRIMOIRE"/VDEPENDS &&
-
-case "$HOST" in
- (*-musl)
- vdepends <<< 'musl >= 1.2.2'
- ;;
- (*)
- optional_depends fuse3 \
- --{enable,disable}-fuse \
- 'for FUSE block device export'
- ;;
-esac &&
-
-for qaudio in ${QEMU_AUDIO}; do
- case ${qaudio} in
- alsa) depends alsa-lib ;;
- sdl) depends sdl2 ;;
- pa) depends pulseaudio ;;
- jack) depends JACK-DRIVER ;;
- oss) depends oss ;;
-pipewire) depends pipewire ;;
- esac
-done &&
-
-if list_find '--enable-docs' ${QEMU_OPTS}; then
- depends texinfo &&
- depends python-sphinx &&
- depends perl &&
- depends podlators
-fi &&
-
-optional_depends gtk+3 \
- '--enable-gtk' \
- '--disable-gtk' \
- 'for GTK+ 3.x UI' &&
-
-if is_depends_enabled $SPELL gtk+3; then
- optional_depends vte3 '--enable-vte' '--disable-vte' \
- 'VTE support for the GTK+ UI'
-fi &&
-
-optional_depends sdl2 \
- '--enable-sdl' \
- '--disable-sdl' \
- 'for SDL 2.x UI (recommended)' &&
-if is_depends_enabled "$SPELL" sdl2; then
- optional_depends sdl2_image \
- --{enable,disable}-sdl-image \
- 'for SDL Image support for icons'
-fi &&
-
-optional_depends ncurses \
- "--enable-curses" \
- "--disable-curses" \
- "for curses UI" &&
-
-optional_depends curl \
- "--enable-curl" \
- "--disable-curl" \
- "for curl connectivity support" &&
-
-optional_depends attr \
- '--enable-attr' \
- '--disable-attr' \
- 'for attr/xattr support in XFS' &&
-
-optional_depends libcap-ng \
- '--enable-cap-ng' \
- '--disable-cap-ng' \
- 'for expanded Linux POSIX API capabilities' &&
-
-optional_depends libaio \
- '--enable-linux-aio' \
- '--disable-linux-aio' \
- 'for Linux native asynchronous I/O support' &&
-
-optional_depends spice \
- '--enable-spice' \
- '--disable-spice' \
- 'for SPICE virtualized desktop support' &&
-
-optional_depends usbredir \
- --enable-usb-redir \
- --disable-usb-redir \
- 'for USB network redirection support' &&
-
-optional_depends libusb \
- '--enable-libusb' \
- '--disable-libusb' \
- 'for USB pass-through support' &&
-
-optional_depends libcacard \
- '--enable-smartcard' \
- '--disable-smartcard' \
- 'for SmartCard support' &&
-
-optional_depends lzo \
- --{enable,disable}-lzo \
- 'for LZO compression support' &&
-
-optional_depends snappy \
- --{enable,disable}-snappy \
- 'for Snappy compression support' &&
-
-optional_depends bzip2 \
- --{enable,disable}-bzip2 \
- 'for reading bzip2-compressed DMG images' &&
-
-#optional_depends lzfse \
-# --{enable,disable}-lzfse \
-# 'for reading lzfse-compressed DMG images' &&
-
-optional_depends zstd \
- --{enable,disable}-zstd \
- 'for migration and qcow2 cluster compression' &&
-
-optional_depends libxml2 \
- '--enable-parallels' \
- '--disable-parallels' \
- 'for Parallels image format support' &&
-
-case "$QEMU_OPTS" in *--enable-vnc*)
- # In QEMU's order of preference
- optional_depends gnutls \
- --{enable,disable}-gnutls \
- 'to enable TLS encryption for VNC server using GnuTLS' &&
- if ! is_depends_enabled "$SPELL" gnutls; then
- optional_depends libgcrypt \
- --{enable,disable}-gcrypt \
- 'to enable TLS encryption for VNC server using
libgcrypt' &&
- if ! is_depends_enabled "$SPELL" libgcrypt; then
- optional_depends nettle \
- --{enable,disable}-nettle \
- 'to enable TLS encryption for VNC server using Nettle'
- fi
- fi &&
-
- suggest_depends LIBSASL \
- "--enable-vnc-sasl" \
- "--disable-vnc-sasl" \
- "to enable SASL encryption for VNC server" &&
-
- suggest_depends JPEG \
- '--enable-vnc-jpeg' \
- '--disable-vnc-jpeg' \
- 'for JPEG lossy compression for VNC server' &&
-
- suggest_depends libpng \
- '--enable-png' \
- '--disable-png' \
- 'for PNG compression for VNC server'
- ;;
-esac &&
-
-optional_depends capstone \
- --{enable,disable}-capstone \
- 'for capstone disassembler support' &&
-
-optional_depends jemalloc '--enable-malloc=jemalloc' '' \
- 'for jemalloc support' &&
-
-optional_depends libssh \
- --{enable,disable}-libssh \
- 'for SSH block device support' &&
-
-optional_depends DEVICE-MANAGER \
- --{enable,disable}-libudev \
- 'to enumerate host devices with libudev' &&
-
-suggest_depends bridge-utils \
- '' \
- '' \
- "for creating TUN/TAP bridges" &&
-
-suggest_depends iproute2 \
- "" \
- "" \
- "for routing between TUN/TAP interfaces"
diff --git a/utils/qemu/DETAILS b/utils/qemu/DETAILS
deleted file mode 100755
index 5a8859c..0000000
--- a/utils/qemu/DETAILS
+++ /dev/null
@@ -1,31 +0,0 @@
- SPELL=qemu
- VERSION=8.2.2
- SOURCE=$SPELL-$VERSION.tar.xz
- SOURCE2=$SOURCE.sig
-SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-${VERSION%-*}"
- SOURCE_URL[0]=http://wiki.qemu.org/download/$SOURCE
-# Watch: https://download.qemu.org/ qemu-([0-9.]+)[.]tar
- SOURCE2_URL[0]=$SOURCE_URL.sig
- SOURCE2_IGNORE=signature
- SOURCE_GPG="qemu.gpg:${SOURCE2}:UPSTREAM_KEY"
- DISTCC_HOSTS=
- LICENSE[0]=GPL
- LICENSE[1]=LGPL
- WEB_SITE=http://qemu.org/
- KEYWORDS="emulator utils"
- ENTERED=20051102
- SECURITY_PATCH=2
- TMPFS=OFF
- SHORT="generic and open source processor emulator"
-cat << EOF
-QEMU achieves a good emulation speed by using dynamic translation.
-
-QEMU has two operating modes:
-
-* Full system emulation. In this mode, QEMU emulates a full system (for
example
- a PC), including a processor and various peripherials. It can be used to
- launch different Operating Systems without rebooting the PC or to debug
- system code.
-* User mode emulation (Linux host only). In this mode, QEMU can launch Linux
- processes compiled for one CPU on another CPU.
-EOF
diff --git a/utils/qemu/HISTORY b/utils/qemu/HISTORY
deleted file mode 100644
index e5e0cc1..0000000
--- a/utils/qemu/HISTORY
+++ /dev/null
@@ -1,434 +0,0 @@
-2024-03-05 Pavel Vinogradov <public AT sourcemage.org>
- * DETAILS: version 8.2.2
-
-2024-01-30 Pavel Vinogradov <public AT sourcemage.org>
- * DETAILS: version 8.2.1
-
-2023-12-20 Pavel Vinogradov <public AT sourcemage.org>
- * DETAILS: version 8.2.0
- * patches/mmap-mremap-efault.patch: removed, not needed anymore
-
-2023-11-22 Pavel Vinogradov <public AT sourcemage.org>
- * DETAILS: version 8.1.3
- * BUILD: use internal libfdt
-
-2023-10-17 Pavel Vinogradov <public AT sourcemage.org>
- * DETAILS: version 8.1.2
-
-2023-09-22 Pavel Vinogradov <public AT sourcemage.org>
- * DETAILS: version 8.1.1
-
-2023-08-23 Pavel Vinogradov <public AT sourcemage.org>
- * DETAILS: version 8.1.0
- * BUILD: removed --meson parameter
- * CONFIGURE, DEPENDS: pipewire is now available as audio backend
-
-2023-08-11 Pavel Vinogradov <public AT sourcemage.org>
- * DETAILS: version 8.0.4
-
-2023-06-01 Pavel Vinogradov <public AT sourcemage.org>
- * DETAILS: version 8.0.2
-
-2023-04-06 Pavel Vinogradov <public AT sourcemage.org>
- * DETAILS: version 7.2.1
-
-2022-08-31 Pavel Vinogradov <public AT sourcemage.org>
- * DETAILS: version 7.1.0
- * CONFIGURE, DEPENDS: updated libpng flags
-
-2022-08-24 Pavel Vinogradov <public AT sourcemage.org>
- * DEPENDS: refactored audio backends code into for loop with case,
- JACK -> JACK-DRIVER
-
-2022-08-08 Pavel Vinogradov <public AT sourcemage.org>
- * DETAILS: version 7.0.0, bz2 -> xz
- * BUILD: added possible muon build option, made target archs and audio
- backends comma separated lists
- * CONFIGURE: removed esound and fmod audio backend options, added JACK
- * DEPENDS: removed python3 (MESON_DEPENDS should be enough), added
JACK and
- oss, commented out lzfse (no such spell yet), corrected libxml2 and
- jemalloc flags
-
-2022-04-23 Ismael Luceno <ismael AT sourcemage.org>
- * DEPENDS: switched to MESON_DEPENDS
-
-2021-09-23 Thomas Orgis <sobukus AT sourcemage.org>
- * PRE_BUILD: avoid using installed qemu
- * CONFLICTS: remove self-conflict
-
-2021-09-16 Thomas Orgis <sobukus AT sourcemage.org>
- * CONFIGURE, PRE_BUILD: drop sound card selection
- * CONFLICTS: need to remove qemu from install until build system
- is fixed not to pick it up
-
-2021-09-15 Thomas Orgis <sobukus AT sourcemage.org>
- * patches/musl-fix-duplicated-sysinfo.patch: fix for glibc
- * DEPENDS: needs libssh, not libssh2
- * BUILD: remove python2 switch
-
-2021-09-10 Ismael Luceno <ismael AT sourcemage.org>
- * DETAILS: updated spell to 6.1.0
- * DEPENDS: on musl hosts request musl 1.2.2+ (sigevent API)
- added meson and ninja-build-system
- added optional deps on: DEVICE-MANAGER, capstone, fuse3, jemalloc,
- libssh2, libxml2, lzfse, sdl2_image, and zstd
- fixed flags for snappy
- * CONFIGURE, DEPENDS: reworked TLS library dependencies
- * BUILD: added removal of -ffast-math from CFLAGS
- added --disable-fuse for musl
- * archs: added avr; removed lm32, moxie, tilegx and unicore32
- * patches/musl-F_SHLCK-and-F_EXLCK.patch,
- patches/musl-fix-duplicated-sysinfo.patch,
- patches/musl-fix-sigevent-and-sigval_t.patch: removed, no longer
needed
- *
patches/0006-linux-user-signal.c-define-__SIGRTMIN-MAX-for-non-GN.patch,
- patches/mmap-mremap-efault.patch: updated for 6.1.0
- * patches/musl-initialize-msghdr.patch: added to fix sendmsg syscall
emulation
- * patches/CVE-2021-20255.patch: added security fix
- * DETAILS: SECURITY_PATCH++
-
-2021-09-09 Ismael Luceno <ismael AT sourcemage.org>
- * patches/musl-fix-duplicated-sysinfo.patch: fixed for glibc
- * CONFIGURE: added sanitization of QEMU_ARCHS
-
-2020-09-07 Ismael Luceno <ismael AT sourcemage.org>
- * DETAILS: updated spell to 5.1.0
- TMPFS=OFF
- * DEPENDS: removed bluez (upstream removed the backend)
- switched to python3
- added dependency on usbredir
- * PRE_BUILD: added fix for wrong include of sys/signal.h
- *
patches/0006-linux-user-signal.c-define-__SIGRTMIN-MAX-for-non-GN.patch,
- patches/mmap-mremap-efault.patch,
- patches/musl-9p-limits_h.patch,
- patches/musl-F_SHLCK-and-F_EXLCK.patch,
- patches/musl-fix-SIOCGSTAMPNS.patch,
- patches/musl-fix-duplicated-sysinfo.patch,
- patches/musl-fix-sigevent-and-sigval_t.patch:
- added patches to fix build against musl libc
-
-2019-08-09 Eric Sandall <sandalle AT sourcemage.org>
- * These are quick fixes, I need this recompiled for the updated
nettle 3.5 that broke compatibility.
- * DEPENDS: Dependencies changed since 2.11
- Optionally uses gtk+3 >= 3.16 now. gtk+2 is not an option, there is
no gtkabi parameter anymore.
- Use list_find instead of case to more reliably check for
"--enable-docs"
- * PRE_BUILD: No pci.mak nor sound.mak, nor are they included, so just
write
- the configs out for now instead of sed, but they do nothing.
-
-2019-05-30 Ismael Luceno <ismael AT sourcemage.org>
- * DETAILS: updated spell to 4.0.0
- * DEPENDS: removed SDL 1.x, not supported anymore
- * patches/10-glibc-2.27.patch: removed, no longer needed
- * BUILD, CONFIGURE, DEPENDS, INSTALL: Streamlined options
- * archs: Updated supported targets
-
-2018-03-06 Eric Sandall <sandalle AT sourcemage.org>
- * DETAILS: Updated to latest stable 2.11.1
- * patches/10-glibc-2.27.patch: Fix compilation against glibc 2.27
- See https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=891375
- Also affects qemu 2.10.x
- * PRE_BUILD: Apply patches directory
-
-2017-09-25 Thomas Orgis <sobukus AT sourcemage.org>
- * DETAILS: version 2.10.0
-
-2017-06-06 Thomas Orgis <sobukus AT sourcemage.org>
- * DETAILS: version 2.9.0
-
-2017-05-19 Thomas Orgis <sobukus AT sourcemage.org>
- * INSTALL: Do not replace an existing qemu-system-${ARCH} with the
- symlink, just in case it was built and I would like to run a VM,
- for a change.
- * DETAILS: patchlevel for the above, version 2.8.1.1 and
- SECURITY_PATCH++ for that
-
-2017-04-04 Eric Sandall <sandalle AT sourcemage.org>
- * DETAILS: Updated to 2.8.1
- * INSTALL: Some packages (libguestfs) depend on the
qemu-system-${ARCH} file
- qemu-system-${ARCH} is not made by default by qemu install (since
2.6.x)
- * archs: Remove unicore32
-
-2016-06-29 Eric Sandall <sandalle AT sourcemage.org>
- * SUB_DEPENDS, PRE_SUB_DEPENDS: nss dependency moved to libcacard in
2.6.0
- * CONFIGURE, DEPENDS, BUILD: May only have one of nettle or libgcrypt
-
-2016-06-11 Ismael Luceno <ismael AT sourcemage.org>
- * DETAILS: updated spell to 2.6.0
- * DEPENDS, CONFIGURE: Updated dependencies and flags
-
-2015-05-07 Ismael Luceno <ismael AT sourcemage.org>
- * DETAILS: updated spell to 2.3.0
-
-2015-04-24 Vlad Glagolev <stealth AT sourcemage.org>
- * DETAILS: PATCHLEVEL=1
- * BUILD: fixed /var/run location
-
-2015-03-23 Ismael Luceno <ismael AT sourcemage.org>
- * DETAILS: updated spell to 2.2.1
-
-2015-03-09 Ismael Luceno <ismael AT sourcemage.org>
- * DEPENDS: Switch to libusb
-
-2014-12-25 Ismael Luceno <ismael AT sourcemage.org>
- * DETAILS: updated spell to 2.2.0
-
-2014-12-24 Ismael Luceno <ismael AT sourcemage.org>
- * BUILD, DEPENDS: Depends on python 2.x
-
-2014-12-04 Eric Sandall <sandalle AT sourcemage.org>
- * DETAILS: Updated to 2.1.2
- * qemu.gpg: Add F108B584 (see
-
https://lists.nongnu.org/archive/html/qemu-devel/2014-04/msg03559.html)
- * docs-Fix-generating-qemu-doc.html-with-texinfo-5.patch: Unused,
removed
-
-2014-04-14 Ismael Luceno <ismael AT sourcemage.org>
- * BUILD: Pass down ARFLAGS=rv, to workaround buildsystem bug
-
-2013-09-04 Eric Sandall <sandalle AT sourcemage.org>
- * DEPENDS: Optionally depends on nss
- * *SUB_DEPENDS: Allow forcing dependency on nss
-
-2013-08-13 Eric Sandall <sandalle AT sourcemage.org>
- * DETAILS: Updated to 1.5.2
- * CONFIGURE: sb16, cs4231a, adlib, and gus sound cards removed
- Query for Trusted Platform Module (TPM) support
- * DEPENDS: Optionally depends on vte, libaio, libusbx, and spice
- * BUILD: --audio-card-list= removed, modify default-configs/pci.mak
(for
- PCI) and default-configs/sound.mak (for ISA)
- Pass QEMU_TPM to configure
-
-2013-08-12 Eric Sandall <sandalle AT sourcemage.org>
- * DEPENDS: Optionally depends on texinfo for documentation
- * PRE_BUILD: Apply
docs-Fix-generating-qemu-doc.html-with-texinfo-5.patch
- * docs-Fix-generating-qemu-doc.html-with-texinfo-5.patch: from
https://bugs.launchpad.net/qemu/+bug/1130533
-
-2013-04-16 Eric Sandall <sandalle AT sourcemage.org>
- * DETAILS: Updated to 1.4.1
- Removed branches, they no longer (even 1.1) compile without work.
- * CONFIGURE: Query for enabling VNC
- * DEPENDS: Optionally depends on libcap-ng
- Move VNC-specific optional dependencies into a VNC enabled check
- * BUILD: Pass $QEMU_VNC to ./configure
- * PRE_BUILD, cflags.patch, archs-0.15: Removed
- * archs: Updated to 1.4.1 architecture list
-
-2012-08-19 Vlad Glagolev <stealth AT sourcemage.org>
- * DETAILS: updated spell to 1.1.1-1 (branch 1.1); removed tabs
-
-2012-05-17 Ismael Luceno <ismael AT sourcemage.org>
- * DETAILS: Fixed branch 1.1 VERSION and SOURCE
- * DETAILS, PREPARE: Added branch 1.1, and renamed 1.00 to 1.0
- * PREPARE: Cut $QEMU_VER at the last dot
-
-2012-02-18 Vlad Glagolev <stealth AT sourcemage.org>
- * DETAILS: updated spell to 1.0.1
-
-2011-11-02 Vlad Glagolev <stealth AT sourcemage.org>
- * DETAILS: updated spell to 1.0
- * PREPARE: added 1.00 branch
-
-2011-10-25 Eric Sandall <sandalle AT sourcemage.org>
- * PRE_BUILD: cflags.patch is only for 0.15+
- * CONFIGURE: 0.15 adds new architectures not valid for earlier
versions
- * archs,archs-0.15: Split into pre-0.15 and 0.15+ versions
-
-2011-10-13 Vlad Glagolev <stealth AT sourcemage.org>
- * DETAILS: updated spell to 0.15.1
-
-2011-08-30 Vlad Glagolev <stealth AT sourcemage.org>
- * DETAILS: PATCHLEVEL=1
- * BUILD: added sysconfdir path
- * archs: renewed supported archlist
-
-2011-08-17 Vlad Glagolev <stealth AT sourcemage.org>
- * PRE_BUILD: added, to apply the patch
- * cflags.patch: added, to fix compilation on i486 (missing space in
flags)
-
-2011-08-11 Vlad Glagolev <stealth AT sourcemage.org>
- * DETAILS: added 0.15 branch; dropped 0.10 and 0.11 support as per
- offsite; corrected mirrors for different branches; use only upstream
- gpg keycheck
- * BUILD: removed deprecated limitations
- * DEPENDS: keep case selector from 0.12 up to the latest branch
- * PREPARE: made 0.15 default
- * CONFIGURE: corrected sound card selection per branch
-
-2011-07-28 Ladislav Hagara <hgr AT vabo.cz>
- * DETAILS: 0.14.1
-
-2011-03-02 Julien "_kaze_" ROZO <julien AT rozo.org>
- * PREPARE, DETAILS: added 0.14 branch, now used if nothing else is
selected
- * CONFIGURE: added hda audio device for 0.14 branch
-
-2011-01-19 Eric Sandall <sandalle AT sourcemage.org>
- * DETAILS: PATCHLEVEL++
- * INSTALL: Install /usr/bin/qemu-kvm to allow virt-manager (and other
- QEMU using apps) to "detect" that KVM hardware acceleration is
available
-
-2010-12-17 Bor Kraljič <pyrobor AT ver.si>
- * PREPARE,CONFIGURE,DETAILS: added 0.13 branch
-
-2010-08-03 Eric Sandall <sandalle AT sourcemage.org>
- * PROVIDES: qemu and kvm now provide QEMU functionality
-
-2010-07-23 Vlad Glagolev <stealth AT sourcemage.org>
- * DETAILS: updated spell to 0.12.5
-
-2010-07-10 Eric Sandall <sandalle AT sourcemage.org>
- * DETAILS: Use 0.12 (latest stable) if nothing selected
- * PREPARE: List 0.12 first (default, latest stable)
- * DEPENDS: Depend on alsa-lib if ALSA is selected in QEMU_AUDIO
- Depend on sdl if SDL is selected in QEMU_AUDIO
- Depend on pulseaudio if PulseAudio is selected in QEMU_AUDIO
- Depend on esound if ESD is selected in QEMU_AUDIO
-
-2010-06-13 Donald Johnson <minozake AT codemages.net>
- * DETAILS: Changed to mirror of qemu's sources, since all downloads
seem to
- have moved.
-
-2010-06-03 Vlad Glagolev <stealth AT sourcemage.org>
- * DETAILS: updated 0.12 branch to 0.12.4; killed dead source url
-
-2010-03-21 Vasil Yonkov <spirtbrat AT sourcemage.org>
- * DETAILS: updated QEMU_VER=0.12 to 0.12.3
-
-2010-02-10 Eric Sandall <sandalle AT sourcemage.org>
- * DETAILS: Check only the branch of QEMU_VER (at one point it was
- 0.10.6, now it's 0.10)
- * PREPARE: Fix old invalid value of QEMU_TEST
-
-2010-02-03 Vasil Yonkov <spirtbrat AT sourcemage.org>
- * BUILD, DEPENDS, DETAILS, PREPARE: made QEMU_VER referring to
- a branch, not to a concrete version
- * DETAILS: added a default version
-
-2010-01-20 Vasil Yonkov <spirtbrat AT sourcemage.org>
- * DETAILS, DEPENDS, PREPARE: added versions 0.11.1 and 0.12.2
- * BUILD: the build fails only when kqemu support is enabled
- * CONFIGURE: added queries for supported audio systems
- and emulated audio cards, added option for KVM support
- * DEPENDS: added options for ncurses, gnutls, curl, LIBSASL,
- bridge-utils, iproute2
-
-2009-08-15 Arjan Bouter <abouter AT sourcemage.org>
- * DEPENDS: use BLUEZ provider
-
-2009-07-31 Vlad Glagolev <stealth AT sourcemage.org>
- * DETAILS: updated spell to 0.10.6
-
-2009-05-22 Vlad Glagolev <stealth AT sourcemage.org>
- * DETAILS: updated spell to 0.10.5
-
-2009-05-13 Vlad Glagolev <stealth AT sourcemage.org>
- * DETAILS: updated spell to 0.10.4
-
-2009-05-02 Vlad Glagolev <stealth AT sourcemage.org>
- * DETAILS: updated spell to 0.10.3
-
-2009-04-07 Vlad Glagolev <stealth AT sourcemage.org>
- * DETAILS: updated spell to 0.10.2
-
-2009-03-22 Vlad Glagolev <stealth AT sourcemage.org>
- * DETAILS: updated spell to 0.10.1; added 1 mirror; fixed desc
-
-2009-03-10 Vlad Glagolev <stealth AT sourcemage.org>
- * DEPENDS: changed configure flag for video output
-
-2009-03-07 Vlad Glagolev <stealth AT sourcemage.org>
- * DETAILS: 0.10.0; switched to upstream pgp key; cleaned up
- * DEPENDS: sdl _is_ optional; gcc dep is useless; added missing deps;
- cleaned up
- * BUILD, CONFIGURE: cleaned up
- * PRE_BUILD: removed
- * archs: updated arch specs
-
-2008-06-15 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: new url & website
-
-2008-02-11 Thomas Orgis <sobukus AT sourcemage.org>
- * DEPENDS: No --enable-kqemu! The custom configure script does only
know the disable.
-
-2008-01-19 Pol Vinogradov <vin.public AT gmail.com>
- * DETAILS: updated to 0.9.1
- * BUILD: fixed configure's options
-
-2007-04-11 Elisamuel Resto <ryuji AT mages.ath.cx>
- * BUILD: prescott arch was added recently, wasn't getting filtered.
Related to bug 13596
-
-2007-04-07 David Brown <dmlb2000 AT gmail.com>
- * CONFLICTS: added conflicts with kvm
-
-2007-03-24 Thomas Orgis <sobukus AT sourcemage.org>
- * BUILD: a refinement: reduce athlons to k6-3 as that works, too, and
- performs better than pentium-mmx for these cpus
-
-2007-03-17 Thomas Orgis <sobukus AT sourcemage.org>
- * BUILD: more general CFLAGS fixup to reduce more stuff to
pentium-mmx and fix bug 13596
-
-2007-02-25 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
- * BUILD: also remove -march=athlon-xp from CFLAGS for MMU
- use grep instead of list_find, the api was changed in devel sorcery
-
-2007-02-18 Eric Sandall <sandalle AT sourcemage.org>
- * BUILD: Disable PIC (with disable_pic) if building soft MMU targets
- pentium4 breaks soft MMU, downgrade to pentium-mmx if building MMU
-
-2007-02-16 Eric Sandall <sandalle AT sourcemage.org>
- * DEPENDS: kqemu is no longer restricted to z-rejected
-
-2007-02-15 Eric Sandall <sandalle AT sourcemage.org>
- * DETAILS: Updated to 0.9.0
- * DEPENDS: Pass disable/enable flags for kqemu
- * BUILD: Use default_build, pass --target-list to OPTS
- * archs: Alphabetize list
- All *-user targets are now called *-linux-user
- Added m68k-linux-user target
- {i386,arm,mips,mipsel,ppc,sparc,x86_64}-softmmu fail to compile,
- so removing from the list.
-
-2006-10-14 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
- * archs: added new targets #13159 and unified formatting
- * DETAILS: ++PATCHLEVEL
-
-2006-09-13 Eric Sandall <sandalle AT sourcemage.org>
- * DEPENDS: Optionally depends on kqemu for acceleration kernel module
- Optionally depends on alsa-lib
- * CONFLICTS: No longer conflicts with qemu
- * BUILD: Use INSTALL_ROOT
-
-2006-08-19 Bearcat M. Sandor <sourcemage AT feline-soul.com>
- * DETAILS: Updated to 0.8.2
-
-2006-06-28 Eric Sandall <sandalle AT sourcemage.org>
- * DETAILS: Removed BUILD_API=2, set grimoire-wide
-
-2006-06-23 David Brown <dmlb2000 AT gmail.com>
- * BUILD: didn't have an escape char on the end of line
- to include $OPTS with configure
-
-2006-06-21 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
- * DETAILS: added GCC_VERSION, updated spell to 0.8.1
- * BUILD: removed invoke_gcc
- * PRE_BUILD: created for invoke_gcc
- * CONFIGURE: added query for unattended processing, #10732
- thanks to Andreas van Ruth for the initial patch
-
-2006-03-12 Karsten Behrmann <BearPerson AT sourcemage.org>
- * DETAILS: (automated) Add KEYWORDS
-
-2006-02-01 David Kowis <dkowis AT sourcemage.org>
- * CONFLICTS: made it conflict with kqemu
-
-2006-01-10 anoxia <anoxia AT sourcemage.org>
- * DETAILS: updated spell to 0.8.0
-
-2005-11-19 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
- * DETAILS: fixed wrong quoting in SHORT
-
-2005-11-05 George Sherwood <george AT beernabeer.com>
- * DETAILS: Added SOURCE_HASH checking
- * CONFIGURE: Change selection to dialog
- * BUILD: Default_build won't work with the target-list
-
-2005-11-02 Andreas van Ruth <avr AT gnulinux.nl>
- * BUILD, DEPENDS, DETAILS, HISTORY: created
-
diff --git a/utils/qemu/INSTALL b/utils/qemu/INSTALL
deleted file mode 100755
index a26ee9f..0000000
--- a/utils/qemu/INSTALL
+++ /dev/null
@@ -1,23 +0,0 @@
-default_install &&
-
-case "$QEMU_OPTS" in
-*--disable-kvm*) ;;
-*)
- ARCH=$(uname -m)
-
- if [[ "${ARCH}" == "i686" ]]; then
- ARCH="x86_64"
- fi &&
-
- # Some packages (libguestfs) depend on the qemu-system-${ARCH} file
- # But for sure overwriting qemu-system-${ARCH} with a link to the
- # userspace emulator is a very bad idea?! Putting this check in here
- # until someone explains that whole thing to me. --sobukus
- if ! test -e "${INSTALL_ROOT}"/usr/bin/qemu-system-${ARCH}; then
- ln -sf /usr/bin/qemu-${ARCH} \
- "${INSTALL_ROOT}"/usr/bin/qemu-system-${ARCH}
- fi &&
-
- ln -sf /usr/bin/qemu-system-${ARCH} \
- "${INSTALL_ROOT}"/usr/bin/qemu-kvm
-esac
diff --git a/utils/qemu/PREPARE b/utils/qemu/PREPARE
deleted file mode 100755
index f2f6cf3..0000000
--- a/utils/qemu/PREPARE
+++ /dev/null
@@ -1 +0,0 @@
-persistent_remove QEMU_VER
diff --git a/utils/qemu/PRE_BUILD b/utils/qemu/PRE_BUILD
deleted file mode 100755
index a55d1e7..0000000
--- a/utils/qemu/PRE_BUILD
+++ /dev/null
@@ -1,13 +0,0 @@
-default_pre_build &&
-
-cd "${SOURCE_DIRECTORY}" &&
-apply_patch_dir patches &&
-# Fix insistence on using qemu-keymap from host.
-# Upstream logic is warped. Fix there?
-sed -i "s:\(find_program('qemu-keymap\)':\1-do-not-find-this':" \
- pc-bios/keymaps/meson.build &&
-# Fix wrong include
-sed -i '/^#include/{s@<sys/signal[.]@<signal.@}' \
- include/qemu/osdep.h \
- linux-user/syscall.c \
- linux-user/fd-trans.c
diff --git a/utils/qemu/PRE_SUB_DEPENDS b/utils/qemu/PRE_SUB_DEPENDS
deleted file mode 100755
index be9c910..0000000
--- a/utils/qemu/PRE_SUB_DEPENDS
+++ /dev/null
@@ -1,6 +0,0 @@
-case $THIS_SUB_DEPENDS in
- NSS) is_depends_enabled $SPELL libcacard && return 0;;
- *) echo "unknown sub_depends!" ;;
-esac
-return 1
-
diff --git a/utils/qemu/PROVIDES b/utils/qemu/PROVIDES
deleted file mode 100755
index a0b105b..0000000
--- a/utils/qemu/PROVIDES
+++ /dev/null
@@ -1 +0,0 @@
-provides QEMU
diff --git
a/utils/qemu/REPAIR^35e01f923e4981c9151fa98a1e228423^PRE_SUB_DEPENDS
b/utils/qemu/REPAIR^35e01f923e4981c9151fa98a1e228423^PRE_SUB_DEPENDS
deleted file mode 100755
index be9c910..0000000
--- a/utils/qemu/REPAIR^35e01f923e4981c9151fa98a1e228423^PRE_SUB_DEPENDS
+++ /dev/null
@@ -1,6 +0,0 @@
-case $THIS_SUB_DEPENDS in
- NSS) is_depends_enabled $SPELL libcacard && return 0;;
- *) echo "unknown sub_depends!" ;;
-esac
-return 1
-
diff --git a/utils/qemu/REPAIR^none^PRE_SUB_DEPENDS
b/utils/qemu/REPAIR^none^PRE_SUB_DEPENDS
deleted file mode 100755
index c19df56..0000000
--- a/utils/qemu/REPAIR^none^PRE_SUB_DEPENDS
+++ /dev/null
@@ -1,6 +0,0 @@
-case $THIS_SUB_DEPENDS in
- NSS) is_depends_enabled $SPELL nss && return 0;;
- *) echo "unknown sub_depends!" ;;
-esac
-return 1
-
diff --git a/utils/qemu/SUB_DEPENDS b/utils/qemu/SUB_DEPENDS
deleted file mode 100755
index dd6e029..0000000
--- a/utils/qemu/SUB_DEPENDS
+++ /dev/null
@@ -1,6 +0,0 @@
-case $THIS_SUB_DEPENDS in
- NSS) echo "nss/smartcard support requested, forcing libcacard dependency."
&&
- depends libcacard '--enable-smartcard'
- ;;
- *) echo "unknown sub_depends $THIS_SUB_DEPENDS"; return 1 ;;
-esac
diff --git a/utils/qemu/archs b/utils/qemu/archs
deleted file mode 100644
index c6c70fa..0000000
--- a/utils/qemu/archs
+++ /dev/null
@@ -1,63 +0,0 @@
-aarch64-linux-user aarch64-user on
-aarch64-softmmu aarch64 on
-aarch64_be-linux-user aarch64_be-user on
-alpha-linux-user alpha-user on
-alpha-softmmu alpha on
-arm-linux-user arm-user on
-arm-softmmu arm on
-armeb-linux-user armeb-user on
-avr-softmmu avr on
-cris-linux-user cris-user on
-cris-softmmu cris on
-hppa-linux-user hppa-user on
-hppa-softmmu hppa on
-i386-linux-user i386-user on
-i386-softmmu i386 on
-m68k-linux-user m68k-user on
-m68k-softmmu m68k on
-microblaze-linux-user microblaze-user on
-microblaze-softmmu microblaze on
-microblazeel-linux-user microblazeel-user on
-microblazeel-softmmu microblazeel on
-mips-linux-user mips-user on
-mips-softmmu mips on
-mips64-linux-user mips64-user on
-mips64-softmmu mips64 on
-mips64el-linux-user mips64el-user on
-mips64el-softmmu mips64el on
-mipsel-linux-user mipsel-user on
-mipsel-softmmu mipsel on
-mipsn32-linux-user mipsn32-user on
-mipsn32el-linux-user mipsn32el-user on
-nios2-linux-user nios2-user on
-nios2-softmmu nios2 on
-or1k-linux-user or1k-user on
-or1k-softmmu or1k on
-ppc-linux-user ppc-user on
-ppc-softmmu ppc on
-ppc64-linux-user ppc64-user on
-ppc64-softmmu ppc64 on
-ppc64abi32-linux-user ppc64abi32-user on
-ppc64le-linux-user ppc64le-user on
-riscv32-linux-user riscv32-user on
-riscv32-softmmu riscv32 on
-riscv64-linux-user riscv64-user on
-riscv64-softmmu riscv64 on
-s390x-linux-user s390x-user on
-s390x-softmmu s390x on
-sh4-linux-user sh4-user on
-sh4-softmmu sh4 on
-sh4eb-linux-user sh4eb-user on
-sh4eb-softmmu sh4eb on
-sparc-linux-user sparc-user on
-sparc-softmmu sparc on
-sparc32plus-linux-user sparc32plus-user on
-sparc64-linux-user sparc64-user on
-sparc64-softmmu sparc64 on
-tricore-softmmu tricore on
-x86_64-linux-user x86_64-user on
-x86_64-softmmu x86_64 on
-xtensa-linux-user xtensa-user on
-xtensa-softmmu xtensa on
-xtensaeb-linux-user xtensaeb-user on
-xtensaeb-softmmu xtensaeb on
diff --git
a/utils/qemu/patches/0006-linux-user-signal.c-define-__SIGRTMIN-MAX-for-non-GN.patch

b/utils/qemu/patches/0006-linux-user-signal.c-define-__SIGRTMIN-MAX-for-non-GN.patch
deleted file mode 100644
index 4c792b0..0000000
---
a/utils/qemu/patches/0006-linux-user-signal.c-define-__SIGRTMIN-MAX-for-non-GN.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 8fbb4e6797ed67310b74cbaaa061269db45a5b71 Mon Sep 17 00:00:00 2001
-From: Natanael Copa <ncopa AT alpinelinux.org>
-Date: Tue, 29 Apr 2014 15:51:31 +0200
-Subject: [PATCH] linux-user/signal.c: define __SIGRTMIN/MAX for non-GNU
- platforms
-
-The __SIGRTMIN and __SIGRTMAX are glibc internals and are not available
-on all platforms, so we define those if they are missing.
-
-This is needed for musl libc.
-
-Signed-off-by: Natanael Copa <ncopa AT alpinelinux.org>
-Origin: Alpine Linux
----
- linux-user/signal.c | 7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/linux-user/signal.c b/linux-user/signal.c
-index 5ca6d62b15..e917c16d91 100644
---- a/linux-user/signal.c
-+++ b/linux-user/signal.c
-@@ -25,6 +25,13 @@
- #include "trace.h"
- #include "signal-common.h"
-
-+#ifndef __SIGRTMIN
-+#define __SIGRTMIN 32
-+#endif
-+#ifndef __SIGRTMAX
-+#define __SIGRTMAX (NSIG-1)
-+#endif
-+
- static struct target_sigaction sigact_table[TARGET_NSIG];
-
- static void host_signal_handler(int host_signum, siginfo_t *info,
---
-2.23.0
-
diff --git a/utils/qemu/patches/CVE-2021-20255.patch
b/utils/qemu/patches/CVE-2021-20255.patch
deleted file mode 100644
index 9b9984d..0000000
--- a/utils/qemu/patches/CVE-2021-20255.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-CVE-2021-20255 patch adapted from QEMU patch by Stefan Weil
-
-Link: https://bugzilla.redhat.com/show_bug.cgi?id=1930646
-
-Signed-off-by: Neha Agarwal <nehaagarwal AT microsoft.com>
-Origin: Alpine Linux
----
-diff --git a/hw/net/eepro100.c b/hw/net/eepro100.c
-index 16e95ef9cc..2474cf3dc2 100644
---- a/hw/net/eepro100.c
-+++ b/hw/net/eepro100.c
-@@ -279,6 +279,9 @@ typedef struct {
- /* Quasi static device properties (no need to save them). */
- uint16_t stats_size;
- bool has_extended_tcb_support;
-+
-+ /* Flag to avoid recursions. */
-+ bool busy;
- } EEPRO100State;
-
- /* Word indices in EEPROM. */
-@@ -837,6 +840,14 @@ static void action_command(EEPRO100State *s)
- Therefore we limit the number of iterations. */
- unsigned max_loop_count = 16;
-
-+ if (s->busy) {
-+ /* Prevent recursions. */
-+ logout("recursion in %s:%u\n", __FILE__, __LINE__);
-+ return;
-+ }
-+
-+ s->busy = true;
-+
- for (;;) {
- bool bit_el;
- bool bit_s;
-@@ -933,6 +944,7 @@ static void action_command(EEPRO100State *s)
- }
- TRACE(OTHER, logout("CU list empty\n"));
- /* List is empty. Now CU is idle or suspended. */
-+ s->busy = false;
- }
-
- static void eepro100_cu_command(EEPRO100State * s, uint8_t val)
diff --git a/utils/qemu/patches/musl-9p-limits_h.patch
b/utils/qemu/patches/musl-9p-limits_h.patch
deleted file mode 100644
index 01e2b25..0000000
--- a/utils/qemu/patches/musl-9p-limits_h.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Origin: Alpine Linux
-
---- a/hw/9pfs/9p.c
-+++ b/hw/9pfs/9p.c
-@@ -16,6 +16,7 @@
- *
- */
-
-+#include <linux/limits.h>
- #include "qemu/osdep.h"
- #include <glib/gprintf.h>
- #include "hw/virtio/virtio.h"
diff --git a/utils/qemu/patches/musl-fix-SIOCGSTAMPNS.patch
b/utils/qemu/patches/musl-fix-SIOCGSTAMPNS.patch
deleted file mode 100644
index 49c0959..0000000
--- a/utils/qemu/patches/musl-fix-SIOCGSTAMPNS.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Origin: Alpine Linux
-
---- a/linux-user/syscall.c
-+++ b/linux-user/syscall.c
-@@ -36,6 +36,7 @@
- #include <sys/resource.h>
- #include <sys/swap.h>
- #include <linux/capability.h>
-+#include <linux/sockios.h>
- #include <sched.h>
- #include <sys/timex.h>
- #ifdef __ia64__
diff --git a/utils/qemu/patches/musl-fix-duplicated-sysinfo.patch
b/utils/qemu/patches/musl-fix-duplicated-sysinfo.patch
deleted file mode 100644
index ff63003..0000000
--- a/utils/qemu/patches/musl-fix-duplicated-sysinfo.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/linux-user/syscall.c
-+++ b/linux-user/syscall.c
-@@ -16,6 +16,10 @@
- * along with this program; if not, see <http://www.gnu.org/licenses/>.
- */
- #define _ATFILE_SOURCE
-+#include <stdint.h> /* To possibly get __GLIBC__ definition. */
-+#ifndef __GLIBC__
-+#define _LINUX_SYSINFO_H /* to avoid duplicated sysinfo struct definition */
-+#endif
- #include "qemu/osdep.h"
- #include "qemu/cutils.h"
- #include "qemu/path.h"
diff --git a/utils/qemu/patches/musl-initialize-msghdr.patch
b/utils/qemu/patches/musl-initialize-msghdr.patch
deleted file mode 100644
index aff916e..0000000
--- a/utils/qemu/patches/musl-initialize-msghdr.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Source: https://github.com/void-linux/void-packages/issues/23557
-
-diff --git linux-user/syscall.c linux-user/syscall.c
-index 945fc25..8d8b68a 100644
---- a/linux-user/syscall.c
-+++ b/linux-user/syscall.c
-@@ -3209,7 +3209,7 @@ static abi_long do_sendrecvmsg_locked(int fd, struct
target_msghdr *msgp,
- int flags, int send)
- {
- abi_long ret, len;
-- struct msghdr msg;
-+ struct msghdr msg = {0};
- abi_ulong count;
- struct iovec *vec;
- abi_ulong target_vec;
diff --git a/utils/qemu/qemu.gpg b/utils/qemu/qemu.gpg
deleted file mode 100644
index 8b7eccc..0000000
Binary files a/utils/qemu/qemu.gpg and /dev/null differ


  • [[SM-Commit] ] GIT changes to master grimoire by Ismael Luceno (515368e2df3589d19a0a59d8096e1e6e44aeb707), Ismael Luceno, 04/12/2024

Archive powered by MHonArc 2.6.24.

Top of Page