diff options
| author | Thomas Orgis | 2021-09-27 18:34:28 +0200 |
|---|---|---|
| committer | Thomas Orgis | 2021-09-27 18:34:43 +0200 |
| commit | f9a72c6703ff8e8210ef2b3f07dbaf3414bdc6d4 (patch) | |
| tree | 239466a7aad254beb2f8fc6246abf0fc3e0dcce0 /utils | |
| parent | 89476a16af2a3090e725d327747f079f955aa7d6 (diff) | |
qemu: fix self-conflict
Diffstat (limited to 'utils')
| -rwxr-xr-x | utils/qemu/CONFLICTS | 3 | ||||
| -rw-r--r-- | utils/qemu/HISTORY | 4 | ||||
| -rwxr-xr-x | utils/qemu/PRE_BUILD | 4 |
3 files changed, 9 insertions, 2 deletions
diff --git a/utils/qemu/CONFLICTS b/utils/qemu/CONFLICTS index a5ac436a9a..45c9273031 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 0570948800..072f72cb00 100644 --- a/utils/qemu/HISTORY +++ b/utils/qemu/HISTORY @@ -1,3 +1,7 @@ +2021-09-23 Thomas Orgis <sobukus@sourcemage.org> + * PRE_BUILD: avoid using installed qemu + * CONFLICTS: remove self-conflict + 2021-09-16 Thomas Orgis <sobukus@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 1c08abd3af..a55d1e7a01 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 \ |