qemu-ga: resolve conflict by using binary from qemu built

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
This commit is contained in:
Arne Fitzenreiter
2022-01-21 16:23:00 +00:00
parent 0aec7cbf41
commit 48ec07649f
3 changed files with 8 additions and 50 deletions

View File

@@ -3,7 +3,7 @@ usr/bin/elf2dmp
usr/bin/qemu
usr/bin/qemu-arm
usr/bin/qemu-edid
usr/bin/qemu-ga
#usr/bin/qemu-ga
usr/bin/qemu-i386
usr/bin/qemu-img
usr/bin/qemu-io

View File

@@ -24,6 +24,7 @@
include Config
# If you update the version also qemu-ga !!!
VER = 6.1.0
THISAPP = qemu-$(VER)

View File

@@ -24,77 +24,34 @@
include Config
VER = 6.0.1
THISAPP = qemu-$(VER)
DL_FILE = $(THISAPP).tar.xz
DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
VER = 6.1.0
THISAPP = qemu-ga-$(VER)
TARGET = $(DIR_INFO)/$(THISAPP)
SUP_ARCH = x86_64 aarch64
SUP_ARCH = x86_64
PROG = qemu-ga
PAK_VER = 1
DEPS =
TARGETS =
###############################################################################
# Top-level Rules
###############################################################################
objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = 10c651469e07844523995e2c980a4fdb
install : $(TARGET)
check : $(patsubst %,$(DIR_CHK)/%,$(objects))
download :
download :$(patsubst %,$(DIR_DL)/%,$(objects))
md5 : $(subst %,%_MD5,$(objects))
md5 :
dist:
@$(PAK)
###############################################################################
# Downloading, checking, md5sum
###############################################################################
$(patsubst %,$(DIR_CHK)/%,$(objects)) :
@$(CHECK)
$(patsubst %,$(DIR_DL)/%,$(objects)) :
@$(LOAD)
$(subst %,%_MD5,$(objects)) :
@$(MD5)
###############################################################################
# Installation Details
###############################################################################
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
$(TARGET) :
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && ./configure \
--prefix=/usr \
--sysconfdir=/etc \
--localstatedir=/var \
--enable-kvm \
--disable-attr \
--extra-cflags="$(CFLAGS)" \
--enable-spice \
--enable-usb-redir \
--enable-seccomp \
--disable-docs \
--disable-sdl
cd $(DIR_APP) && make qemu-ga $(MAKETUNING)
cd $(DIR_APP) && cp build/qga/qemu-ga /usr/bin
#install initscripts
$(call INSTALL_INITSCRIPT,qemu-ga)