Update to quadlet files

Base on make file split rebase with #701 Signed-off-by: Yariv Rachmani <[email protected]>
containers · Jan 14, 2025 · 66e11bb · 66e11bb
1 parent 6bde01c
commit 66e11bb
Show file tree

Hide file tree

Showing 9 changed files with 10 additions and 17 deletions.
diff --git a/rpm/video/video.spec b/rpm/video/video.spec
@@ -23,14 +23,8 @@ This subpackage installs a drop-in configuration for QM containers to mount bind
 install -d %{buildroot}%{_sysconfdir}/containers/systemd/qm.container.d
 install -d %{buildroot}%{rootfs_qm}%{_sysconfdir}/containers/systemd
 
-install -m 644 subsystems/audio/audio.container %{buildroot}%{rootfs_qm}%{_sysconfdir}/containers/systemd/audio.container
-# Install the sound drop-in configuration file
-install -m 644 %{_builddir}/qm-%{version}/etc/containers/systemd/qm.container.d/qm_dropin_mount_bind_snd.conf \
-    %{buildroot}%{_sysconfdir}/containers/systemd/qm.container.d/qm_dropin_mount_bind_snd.conf
-
-
-install -m 644 etc/qm/containers/containers.conf.d/qm_dropin_mount_bind_video.conf \
-    %{buildroot}%{_sysconfdir}/qm/containers/containers.conf.d/qm_dropin_mount_bind_video.conf
+install -m 644 etc/containers/systemd/qm.container.d/qm_dropin_mount_bind_video.conf \
+    %{buildroot}%{_sysconfdir}/containers/systemd/qm.container.d/qm_dropin_mount_bind_video.conf
 install -m 644 subsystems/video/etc/containers/systemd/rear-camera.container \
     %{buildroot}%{_sysconfdir}/containers/systemd/rear-camera.container
 

diff --git a/subsystems/dvb/Makefile b/subsystems/dvb/Makefile
@@ -11,7 +11,7 @@ dist: ##             - Creates the QM dvb package
 		../qm/SECURITY.md \
 		../qm/LICENSE \
 		../qm/ \
-		../qm/etc/qm/containers/containers.conf.d/qm_dropin_mount_bind_dvb.conf
+		../qm/etc/containers/systemd/qm.container.d/qm_dropin_mount_bind_dvb.conf
 	cd $(ROOTDIR) && mv /tmp/qm-dvb-${VERSION}.tar.gz ./rpm
 
 .PHONY: rpm

diff --git a/subsystems/input/Makefile b/subsystems/input/Makefile
@@ -11,7 +11,7 @@ dist: ##             - Creates the QM input package
 		../qm/SECURITY.md \
 		../qm/LICENSE \
 		../qm/ \
-		../qm/etc/qm/containers/containers.conf.d/qm_dropin_mount_bind_input.conf
+		../qm/etc/containers/systemd/qm.container.d/qm_dropin_mount_bind_input.conf
 	cd $(ROOTDIR) && mv /tmp/qm-input-${VERSION}.tar.gz ./rpm
 
 .PHONY: rpm

diff --git a/subsystems/radio/Makefile b/subsystems/radio/Makefile
@@ -11,7 +11,7 @@ dist: ##             - Creates the QM radio package
 		../qm/SECURITY.md \
 		../qm/LICENSE \
 		../qm/ \
-		../qm/etc/qm/containers/containers.conf.d/qm_dropin_mount_bind_radio.conf
+                ../qm/etc/containers/systemd/qm.container.d/qm_dropin_mount_bind_radio.conf
 	cd $(ROOTDIR) && mv /tmp/qm-radio-${VERSION}.tar.gz ./rpm
 
 

diff --git a/subsystems/sound/Makefile b/subsystems/sound/Makefile
@@ -11,7 +11,7 @@ dist: ##             - Creates the QM kvm package
 		../qm/SECURITY.md \
 		../qm/LICENSE \
 		../qm/ \
-		../qm/etc/qm/containers/containers.conf.d/qm_dropin_mount_bind_snd.conf \
+		../qm/etc/containers/systemd/qm.container.d/qm_dropin_mount_bind_snd.conf \
 		../qm/subsystems/sound/etc/containers/systemd/audio.container
 	cd $(ROOTDIR) && mv /tmp/qm-sound-${VERSION}.tar.gz ./rpm
 

diff --git a/subsystems/tty7/Makefile b/subsystems/tty7/Makefile
@@ -11,7 +11,7 @@ dist: ##             - Creates the QM tty7 package
 		../qm/SECURITY.md \
 		../qm/LICENSE \
 		../qm/ \
-		../qm/etc/qm/containers/containers.conf.d/qm_dropin_mount_bind_tty7.conf
+		../qm/etc/containers/systemd/qm.container.d/qm_dropin_mount_bind_tty7.conf
 	cd $(ROOTDIR) && mv /tmp/qm-tty7-${VERSION}.tar.gz ./rpm
 
 .PHONY: rpm

diff --git a/subsystems/ttyUSB0/Makefile b/subsystems/ttyUSB0/Makefile
@@ -11,7 +11,7 @@ dist: ##             - Creates the QM ttyUSB0 package
 		../qm/SECURITY.md \
 		../qm/LICENSE \
 		../qm/ \
-		../qm/etc/qm/containers/containers.conf.d/qm_dropin_mount_bind_ttyUSB0.conf
+		../qm/etc/containers/systemd/qm.container.d/qm_dropin_mount_bind_ttyUSB0.conf
 	cd $(ROOTDIR) && mv /tmp/qm-ttyUSB0-${VERSION}.tar.gz ./rpm
 
 .PHONY: rpm

diff --git a/subsystems/video/Makefile b/subsystems/video/Makefile
@@ -11,7 +11,7 @@ dist: ##             - Creates the QM video package
 		../qm/SECURITY.md \
 		../qm/LICENSE \
 		../qm/ \
-		../qm/etc/qm/containers/containers.conf.d/qm_dropin_mount_bind_video.conf \
+		../qm/etc/containers/systemd/qm.container.d/qm_dropin_mount_bind_video.conf \
 		../qm/subsystems/video/etc/containers/systemd/rear-camera.container
 	cd $(ROOTDIR) && mv /tmp/qm-video-${VERSION}.tar.gz ./rpm
 

diff --git a/subsystems/windowmanager/Makefile b/subsystems/windowmanager/Makefile
@@ -11,8 +11,7 @@ dist: ##             - Creates the QM windowmanager package
 		../qm/SECURITY.md \
 		../qm/LICENSE \
 		../qm/ \
-		../subsystems/windowmanager/etc/qm/containers/containers.conf.d/qm_dropin_mount_bind_window_manager.conf
-
+                ../qm/etc/containers/systemd/qm.container.d/qm_dropin_mount_bind_window_manager.conf
 	cd $(ROOTDIR) && mv /tmp/qm-windowmanager-${VERSION}.tar.gz ./rpm
 
 .PHONY: rpm