]> git.ipfire.org Git - pakfire.git/commitdiff
systemd.macro: Avoid declaring the directory for tmpfiles twice
authorStefan Schantl <stefan.schantl@ipfire.org>
Sat, 1 Apr 2023 08:10:17 +0000 (10:10 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Tue, 11 Apr 2023 12:24:48 +0000 (12:24 +0000)
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>
macros/systemd.macro

index 1453db95ab1d6992f84de024d93706f8c15968c3..c67b9f9cc916dc715224da7235fd9cc66df3e1bd 100644 (file)
@@ -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