[pve-devel] [PATCH qemu-server] dbus-vmstate: fix installation

["Fabian Grünbichler" <f.gruenbichler@proxmox.com>]

there's no need to have a separate Makefile and directory for these, it's just
files being copied. the missing handling of $PACKAGE in the old Makefile
resulted in the files being installed in the wrong place when building the
source package..

Reported-by: Fiona Ebner <f.ebner@proxmox.com>
Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
---
 src/Makefile                                        |  1 -
 src/dbus-vmstate/Makefile                           | 11 -----------
 src/usr/Makefile                                    |  7 +++++++
 src/{dbus-vmstate => usr}/dbus-vmstate              |  0
 src/{dbus-vmstate => usr}/org.qemu.VMState1.conf    |  0
 src/{dbus-vmstate => usr}/pve-dbus-vmstate@.service |  0
 6 files changed, 7 insertions(+), 12 deletions(-)
 delete mode 100644 src/dbus-vmstate/Makefile
 rename src/{dbus-vmstate => usr}/dbus-vmstate (100%)
 rename src/{dbus-vmstate => usr}/org.qemu.VMState1.conf (100%)
 rename src/{dbus-vmstate => usr}/pve-dbus-vmstate@.service (100%)

diff --git a/src/Makefile b/src/Makefile
index 3f9b8c6f..f8e9a2d9 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -6,7 +6,6 @@ install:
 	$(MAKE) -C bin install
 	$(MAKE) -C qmeventd install
 	$(MAKE) -C query-machine-capabilities install
-	$(MAKE) -C dbus-vmstate install
 	$(MAKE) -C usr install
 
 .PHONY: test
diff --git a/src/dbus-vmstate/Makefile b/src/dbus-vmstate/Makefile
deleted file mode 100644
index ced00264..00000000
--- a/src/dbus-vmstate/Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
-export LIBEXECDIR := $(DESTDIR)/usr/libexec/$(PACKAGE)
-export LIBSYSTEMDDIR := $(DESTDIR)/usr/lib/systemd
-export DBUSDIR := $(DESTDIR)/usr/share/dbus-1
-
-all:
-
-.PHONY: install
-install:
-	install -D -m 0755 dbus-vmstate $(LIBEXECDIR)/dbus-vmstate
-	install -D -m 0644 pve-dbus-vmstate@.service $(LIBSYSTEMDDIR)/system/pve-dbus-vmstate@.service
-	install -D -m 0644 org.qemu.VMState1.conf $(DBUSDIR)/system.d/org.qemu.VMState1.conf
diff --git a/src/usr/Makefile b/src/usr/Makefile
index 321e44c4..1365544b 100644
--- a/src/usr/Makefile
+++ b/src/usr/Makefile
@@ -3,6 +3,8 @@ DESTDIR=
 PREFIX=/usr
 LIBDIR=$(DESTDIR)/$(PREFIX)/lib
 LIBEXECDIR=$(DESTDIR)/$(PREFIX)/libexec/$(PACKAGE)
+LIBSYSTEMDDIR := $(DESTDIR)/usr/lib/systemd
+DBUSDIR := $(DESTDIR)/usr/share/dbus-1
 SHAREDIR=$(DESTDIR)/$(PREFIX)/share/$(PACKAGE)
 
 .PHONY: install
@@ -17,6 +19,11 @@ install: pve-usb.cfg pve-q35.cfg pve-q35-4.0.cfg bootsplash.jpg modules-load.con
 	install -m 0755 pve-bridge $(LIBEXECDIR)/pve-bridge
 	install -m 0755 pve-bridge-hotplug $(LIBEXECDIR)/pve-bridge-hotplug
 	install -m 0755 pve-bridgedown $(LIBEXECDIR)/pve-bridgedown
+	install -D -m 0755 dbus-vmstate $(LIBEXECDIR)/dbus-vmstate
+	install -d $(LIBSYSTEMDDIR)
+	install -D -m 0644 pve-dbus-vmstate@.service $(LIBSYSTEMDDIR)/system/pve-dbus-vmstate@.service
+	install -d $(DBUSDIR)
+	install -D -m 0644 org.qemu.VMState1.conf $(DBUSDIR)/system.d/org.qemu.VMState1.conf
 
 .PHONY: clean
 clean:
diff --git a/src/dbus-vmstate/dbus-vmstate b/src/usr/dbus-vmstate
similarity index 100%
rename from src/dbus-vmstate/dbus-vmstate
rename to src/usr/dbus-vmstate
diff --git a/src/dbus-vmstate/org.qemu.VMState1.conf b/src/usr/org.qemu.VMState1.conf
similarity index 100%
rename from src/dbus-vmstate/org.qemu.VMState1.conf
rename to src/usr/org.qemu.VMState1.conf
diff --git a/src/dbus-vmstate/pve-dbus-vmstate@.service b/src/usr/pve-dbus-vmstate@.service
similarity index 100%
rename from src/dbus-vmstate/pve-dbus-vmstate@.service
rename to src/usr/pve-dbus-vmstate@.service
-- 
2.47.2



_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel