From 89fa7e5a9c9b24dcaafa2a3affde56f26945030e Mon Sep 17 00:00:00 2001
From: Manuel Bentele
Date: Thu, 30 Sep 2021 14:01:50 +0200
Subject: [qemu-src] Add module for QEMU source build

---
 core/modules/qemu/data/etc/systemd/system/qemu.service | 3 +++
 core/modules/qemu/module.build                         | 3 ---
 core/modules/qemu/module.conf                          | 1 +
 core/modules/qemu/module.conf.ubuntu                   | 8 --------
 4 files changed, 4 insertions(+), 11 deletions(-)

(limited to 'core/modules/qemu')

diff --git a/core/modules/qemu/data/etc/systemd/system/qemu.service b/core/modules/qemu/data/etc/systemd/system/qemu.service
index 4d0e7a19..1776d63c 100644
--- a/core/modules/qemu/data/etc/systemd/system/qemu.service
+++ b/core/modules/qemu/data/etc/systemd/system/qemu.service
@@ -11,3 +11,6 @@ After=qemu-kvm.service
 Type=oneshot
 RemainAfterExit=yes
 ExecStart=/opt/openslx/scripts/systemd-qemu_env start
+
+[Install]
+WantedBy=graphical.target
diff --git a/core/modules/qemu/module.build b/core/modules/qemu/module.build
index 801d1d4b..cc7eaee0 100644
--- a/core/modules/qemu/module.build
+++ b/core/modules/qemu/module.build
@@ -25,7 +25,4 @@ post_copy() {
 	# change access rights of the qemu bridge helper config
 	chown root:kvm /etc/qemu/bridge.conf
 	chmod 0664 /etc/qemu/bridge.conf
-
-	# set UID to avoid operation not permitted errors
-	chmod u+s /usr/lib/qemu/qemu-bridge-helper
 }
diff --git a/core/modules/qemu/module.conf b/core/modules/qemu/module.conf
index 1e272eb4..d4169c39 100644
--- a/core/modules/qemu/module.conf
+++ b/core/modules/qemu/module.conf
@@ -1,6 +1,7 @@
 #!/bin/bash
 
 REQUIRED_MODULES="
+	qemu-src
 	libvirt
 	openjdk-8-jre-headless
 	looking-glass-client
diff --git a/core/modules/qemu/module.conf.ubuntu b/core/modules/qemu/module.conf.ubuntu
index 8edc5df4..1853bdf8 100644
--- a/core/modules/qemu/module.conf.ubuntu
+++ b/core/modules/qemu/module.conf.ubuntu
@@ -6,13 +6,5 @@ REQUIRED_INSTALLED_PACKAGES="
 "
 
 REQUIRED_CONTENT_PACKAGES="
-	qemu
-	qemu-kvm
-	qemu-system-common
-	qemu-system-arm
-	qemu-system-x86
-	qemu-utils
-	seabios
-	ovmf
 	jq
 "
-- 
cgit v1.2.3-55-g7522