[Qemu-devel] [PATCH 5/5] configure: stop trying to link non-existant bmp file from bios dir

Daniel P. Berrangé posted 5 patches 6 years, 9 months ago
Maintainers: Stefan Weil <sw@weilnetz.de>
[Qemu-devel] [PATCH 5/5] configure: stop trying to link non-existant bmp file from bios dir
Posted by Daniel P. Berrangé 6 years, 9 months ago
The icons were all moved from pci-bios to ui/icons with:

    commit a8260d3876389eb52ca5c62ed4d80cdb7e025c85
    Author: Daniel P. Berrangé <berrange@redhat.com>
    Date:   Thu Jan 10 12:00:45 2019 +0000

      ui: install logo icons to $prefix/share/icons

Adding symlinks from the source directory into the build directory
for the new source location will not help QEMU to locate them when
running uninstalled binaries, as we no longer search QEMU bios
directory to locate icon files.

Inability to find icons during startup when not having run a
"make install" is harmless, as frontends just continue without
error. So it is not worth trying to add code hacks to find icons
in non-installed directories.

Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---
 configure | 1 -
 1 file changed, 1 deletion(-)

diff --git a/configure b/configure
index b18281c61f..fb1f65958e 100755
--- a/configure
+++ b/configure
@@ -7617,7 +7617,6 @@ LINKS="$LINKS pc-bios/optionrom/Makefile pc-bios/keymaps"
 LINKS="$LINKS pc-bios/spapr-rtas/Makefile"
 LINKS="$LINKS pc-bios/s390-ccw/Makefile"
 LINKS="$LINKS roms/seabios/Makefile roms/vgabios/Makefile"
-LINKS="$LINKS pc-bios/qemu-icon.bmp"
 LINKS="$LINKS .gdbinit scripts" # scripts needed by relative path in .gdbinit
 LINKS="$LINKS tests/acceptance tests/data"
 LINKS="$LINKS tests/qemu-iotests/check"
-- 
2.20.1


Re: [Qemu-devel] [PATCH 5/5] configure: stop trying to link non-existant bmp file from bios dir
Posted by Peter Maydell 6 years, 9 months ago
On Tue, 29 Jan 2019 at 11:39, Daniel P. Berrangé <berrange@redhat.com> wrote:
> Inability to find icons during startup when not having run a
> "make install" is harmless, as frontends just continue without
> error. So it is not worth trying to add code hacks to find icons
> in non-installed directories.

I'm not hugely happy about this -- I think running from the
build directory should work the same as running installed
(it is how QEMU is often run as a developer and how it runs
when running tests).

thanks
-- PMM