New commits:
commit 945dae2b63877c08fabd8815cdcd4808284db0aa
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>
qemu: drop broken sound card selection and fix build by self-conflict
diff --git a/utils/qemu/CONFIGURE b/utils/qemu/CONFIGURE
index 3f68472..c076da7 100755
--- a/utils/qemu/CONFIGURE
+++ b/utils/qemu/CONFIGURE
@@ -37,8 +37,7 @@ fi
config_query_multi QEMU_AUDIO "Select sound system(s) to support" \
oss alsa sdl esd pa fmod &&
config_query_option QEMU_OPTS "Enable KVM acceleration support" y \
"" "--disable-kvm" &&
diff --git a/utils/qemu/CONFLICTS b/utils/qemu/CONFLICTS
index 45c9273..a5ac436 100755
--- a/utils/qemu/CONFLICTS
+++ b/utils/qemu/CONFLICTS
@@ -1 +1,2 @@
-conflicts kvm
+conflicts kvm &&
+conflicts $SPELL y
diff --git a/utils/qemu/HISTORY b/utils/qemu/HISTORY
index 048a3dd..0570948 100644
--- a/utils/qemu/HISTORY
+++ b/utils/qemu/HISTORY
@@ -1,3 +1,8 @@
+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
diff --git a/utils/qemu/PRE_BUILD b/utils/qemu/PRE_BUILD
index 78ca645..1c08abd 100755
--- a/utils/qemu/PRE_BUILD
+++ b/utils/qemu/PRE_BUILD
@@ -1,44 +1,5 @@
default_pre_build &&
-# Configure selected sound cards
-# Defaults are enabled in the configs, so only disable if not selected
-# There are no pci.mak nor sound.mak files nor does any *.mak include them,
even though docs/devel/build-system.txt says x86_64-softmmu.mak does as an
example and running sed on a non-existent file returns an error.
-# So this really does nothing, but I just need QEMU to compile so I can run
some headless and soundless VMs. :)
-if ! list_find "${QEMU_CARDS}" "ac97"; then
- #sedit 's:CONFIG_AC97=y:CONFIG_AC97=n:'
"${SOURCE_DIRECTORY}"/default-configs/pci.mak
- echo 'CONFIG_AC97=n' >> "${SOURCE_DIRECTORY}"/default-configs/pci.mak
-fi &&
-
-if ! list_find "${QEMU_CARDS}" "adlib"; then
-# sedit 's:CONFIG_ADLIB=y:CONFIG_ADLIB=n:'
"${SOURCE_DIRECTORY}"/default-configs/sound.mak
- echo 'CONFIG_ADLIB=n' >> "${SOURCE_DIRECTORY}"/default-configs/pci.mak
-fi &&
-
-if ! list_find "${QEMU_CARDS}" "cs4231a"; then
-# sedit 's:CONFIG_CS4231A=y:CONFIG_CS4231A=n:'
"${SOURCE_DIRECTORY}"/default-configs/sound.mak
- echo 'CONFIG_CS4231A=n' >> "${SOURCE_DIRECTORY}"/default-configs/pci.mak
-fi &&
-
-if ! list_find "${QEMU_CARDS}" "es1370"; then
-# sedit 's:CONFIG_ES1370=y:CONFIG_ES1370=n:'
"${SOURCE_DIRECTORY}"/default-configs/pci.mak
- echo 'CONFIG_ES1370=n' >> "${SOURCE_DIRECTORY}"/default-configs/pci.mak
-fi &&
-
-if ! list_find "${QEMU_CARDS}" "gus"; then
-# sedit 's:CONFIG_GUS=y:CONFIG_GUS=n:'
"${SOURCE_DIRECTORY}"/default-configs/sound.mak
- echo 'CONFIG_GUS=n' >> "${SOURCE_DIRECTORY}"/default-configs/pci.mak
-fi &&
-
-if ! list_find "${QEMU_CARDS}" "hda"; then
-# sedit 's:CONFIG_HDA=y:CONFIG_HDA=n:'
"${SOURCE_DIRECTORY}"/default-configs/pci.mak
- echo 'CONFIG_HDA=n' >> "${SOURCE_DIRECTORY}"/default-configs/pci.mak
-fi &&
-
-if ! list_find "${QEMU_CARDS}" "sb16"; then
-# sedit 's:CONFIG_SB16=y:CONFIG_SB16=n:'
"${SOURCE_DIRECTORY}"/default-configs/sound.mak
- echo 'CONFIG_SB16=n' >> "${SOURCE_DIRECTORY}"/default-configs/pci.mak
-fi &&
-
cd "${SOURCE_DIRECTORY}" &&
apply_patch_dir patches &&
# Fix wrong include
[SM-Commit] GIT changes to master grimoire by Thomas Orgis (945dae2b63877c08fabd8815cdcd4808284db0aa),
Thomas Orgis, 09/21/2021