From 7bb3768bbb924bb34267b12eab6a9ed6f26addbf Mon Sep 17 00:00:00 2001
From: Manuel Bentele
Date: Thu, 4 Feb 2021 14:26:53 +0100
Subject: [libvirt] Fix installation of package files

---
 core/modules/libvirt/module.build             |  3 ++-
 core/modules/libvirt/module.conf              |  1 +
 core/modules/libvirt/module.conf.ubuntu.18    | 12 ------------
 core/modules/libvirt/module.conf.ubuntu.18.04 | 12 ++++++++++++
 core/modules/libvirt/module.conf.ubuntu.20    | 16 ----------------
 core/modules/libvirt/module.conf.ubuntu.20.04 | 16 ++++++++++++++++
 6 files changed, 31 insertions(+), 29 deletions(-)
 create mode 100644 core/modules/libvirt/module.conf
 delete mode 100644 core/modules/libvirt/module.conf.ubuntu.18
 create mode 100644 core/modules/libvirt/module.conf.ubuntu.18.04
 delete mode 100644 core/modules/libvirt/module.conf.ubuntu.20
 create mode 100644 core/modules/libvirt/module.conf.ubuntu.20.04

diff --git a/core/modules/libvirt/module.build b/core/modules/libvirt/module.build
index 5fa3a36f..fc1bc074 100644
--- a/core/modules/libvirt/module.build
+++ b/core/modules/libvirt/module.build
@@ -5,7 +5,8 @@ fetch_source() {
 
 build() {
 	COPYLIST="list_dpkg_output"
-	list_packet_files > "$COPYLIST"
+	[ -e "${COPYLIST}" ] && rm "${COPYLIST}"
+	list_packet_files >> "${COPYLIST}"
 	tarcopy "$(cat "${COPYLIST}" | sort -u)" "${MODULE_BUILD_DIR}"
 }
 
diff --git a/core/modules/libvirt/module.conf b/core/modules/libvirt/module.conf
new file mode 100644
index 00000000..a9bf588e
--- /dev/null
+++ b/core/modules/libvirt/module.conf
@@ -0,0 +1 @@
+#!/bin/bash
diff --git a/core/modules/libvirt/module.conf.ubuntu.18 b/core/modules/libvirt/module.conf.ubuntu.18
deleted file mode 100644
index fbe60f37..00000000
--- a/core/modules/libvirt/module.conf.ubuntu.18
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/bash
-REQUIRED_INSTALLED_PACKAGES="
-	libvirt-bin
-	virt-manager
-	virt-viewer
-"
-
-REQUIRED_CONTENT_PACKAGES="
-	libvirt-bin
-	virt-manager
-	virt-viewer
-"
diff --git a/core/modules/libvirt/module.conf.ubuntu.18.04 b/core/modules/libvirt/module.conf.ubuntu.18.04
new file mode 100644
index 00000000..fbe60f37
--- /dev/null
+++ b/core/modules/libvirt/module.conf.ubuntu.18.04
@@ -0,0 +1,12 @@
+#!/bin/bash
+REQUIRED_INSTALLED_PACKAGES="
+	libvirt-bin
+	virt-manager
+	virt-viewer
+"
+
+REQUIRED_CONTENT_PACKAGES="
+	libvirt-bin
+	virt-manager
+	virt-viewer
+"
diff --git a/core/modules/libvirt/module.conf.ubuntu.20 b/core/modules/libvirt/module.conf.ubuntu.20
deleted file mode 100644
index a4ecd34a..00000000
--- a/core/modules/libvirt/module.conf.ubuntu.20
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/bash
-REQUIRED_INSTALLED_PACKAGES="
-	libvirt-daemon-system
-	libvirt-daemon
-	libvirt-clients
-	virt-manager
-	virt-viewer
-"
-
-REQUIRED_CONTENT_PACKAGES="
-	libvirt-daemon-system
-	libvirt-daemon
-	libvirt-clients
-	virt-manager
-	virt-viewer
-"
diff --git a/core/modules/libvirt/module.conf.ubuntu.20.04 b/core/modules/libvirt/module.conf.ubuntu.20.04
new file mode 100644
index 00000000..a4ecd34a
--- /dev/null
+++ b/core/modules/libvirt/module.conf.ubuntu.20.04
@@ -0,0 +1,16 @@
+#!/bin/bash
+REQUIRED_INSTALLED_PACKAGES="
+	libvirt-daemon-system
+	libvirt-daemon
+	libvirt-clients
+	virt-manager
+	virt-viewer
+"
+
+REQUIRED_CONTENT_PACKAGES="
+	libvirt-daemon-system
+	libvirt-daemon
+	libvirt-clients
+	virt-manager
+	virt-viewer
+"
-- 
cgit v1.2.3-55-g7522