From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Fri, 21 Jan 2022 16:23:00 +0000 (+0000)
Subject: qemu-ga: resolve conflict by using binary from qemu built
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=48ec07649f9fdb50fa852bae3eb95fc502b5b0e4;p=people%2Fstevee%2Fipfire-2.x.git

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

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
---

diff --git a/config/rootfiles/packages/qemu b/config/rootfiles/packages/qemu
index 4432643343..721c7f1db9 100644
--- a/config/rootfiles/packages/qemu
+++ b/config/rootfiles/packages/qemu
@@ -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
diff --git a/lfs/qemu b/lfs/qemu
index 9ece6ea7df..bc36bb4d7f 100644
--- a/lfs/qemu
+++ b/lfs/qemu
@@ -24,6 +24,7 @@
 
 include Config
 
+# If you update the version also qemu-ga !!!
 VER        = 6.1.0
 
 THISAPP    = qemu-$(VER)
diff --git a/lfs/qemu-ga b/lfs/qemu-ga
index 791c5b4c15..2130b57f37 100644
--- a/lfs/qemu-ga
+++ b/lfs/qemu-ga
@@ -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 :$(patsubst %,$(DIR_DL)/%,$(objects))
+download : 
 
-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)