Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Thomas Orgis (f9a72c6703ff8e8210ef2b3f07dbaf3414bdc6d4)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Thomas Orgis <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Thomas Orgis (f9a72c6703ff8e8210ef2b3f07dbaf3414bdc6d4)
  • Date: Mon, 27 Sep 2021 16:34:57 +0000

GIT changes to master grimoire by Thomas Orgis <sobukus AT sourcemage.org>:

utils/qemu/CONFLICTS | 3 +--
utils/qemu/HISTORY | 4 ++++
utils/qemu/PRE_BUILD | 4 ++++
3 files changed, 9 insertions(+), 2 deletions(-)

New commits:
commit f9a72c6703ff8e8210ef2b3f07dbaf3414bdc6d4
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

qemu: fix self-conflict

diff --git a/utils/qemu/CONFLICTS b/utils/qemu/CONFLICTS
index a5ac436..45c9273 100755
--- a/utils/qemu/CONFLICTS
+++ b/utils/qemu/CONFLICTS
@@ -1,2 +1 @@
-conflicts kvm &&
-conflicts $SPELL y
+conflicts kvm
diff --git a/utils/qemu/HISTORY b/utils/qemu/HISTORY
index 0570948..072f72c 100644
--- a/utils/qemu/HISTORY
+++ b/utils/qemu/HISTORY
@@ -1,3 +1,7 @@
+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
diff --git a/utils/qemu/PRE_BUILD b/utils/qemu/PRE_BUILD
index 1c08abd..a55d1e7 100755
--- a/utils/qemu/PRE_BUILD
+++ b/utils/qemu/PRE_BUILD
@@ -2,6 +2,10 @@ 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 \



  • [SM-Commit] GIT changes to master grimoire by Thomas Orgis (f9a72c6703ff8e8210ef2b3f07dbaf3414bdc6d4), Thomas Orgis, 09/27/2021

Archive powered by MHonArc 2.6.24.

Top of Page