From: Stefan Schantl <stefan.schantl@ipfire.org>
Date: Sat, 1 Apr 2023 08:10:17 +0000 (+0200)
Subject: systemd.macro: Avoid declaring the directory for tmpfiles twice
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8b86d4592a9ff800f451ac619c4c2775c8bcbb55;p=people%2Fstevee%2Fpakfire.git

systemd.macro: Avoid declaring the directory for tmpfiles twice

We allready have declared this directory in the arch macro file,
so there is no need in doing this again.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/macros/systemd.macro b/macros/systemd.macro
index 1453db95..c67b9f9c 100644
--- a/macros/systemd.macro
+++ b/macros/systemd.macro
@@ -1,5 +1,3 @@
-
-SYSTEMD_TMPFILES_DIR = /usr/lib/tmpfiles.d
 SYSTEMD_SYSUSERS_DIR = /usr/lib/sysusers.d
 
 MACRO_INSTALL_SYSTEMD_FILES
@@ -15,8 +13,8 @@ end
 MACRO_INSTALL_SYSTEMD_TMPFILES
 	for file in %{DIR_SOURCE}/*.tmpfiles; do
 		[ -e "${file}" ] || continue
-		mkdir -p %{BUILDROOT}/%{SYSTEMD_TMPFILES_DIR}
-		cp -vf ${file} %{BUILDROOT}/%{SYSTEMD_TMPFILES_DIR}/$(basename ${file%*.tmpfiles}).conf
+		mkdir -p %{BUILDROOT}/%{tmpfilesdir}
+		cp -vf ${file} %{BUILDROOT}/%{tmpfilesdir}/$(basename ${file%*.tmpfiles}).conf
 	done
 	unset file
 end