From 2b583c8c50bb14e5782bb676a2776ee3f256d706 Mon Sep 17 00:00:00 2001 From: Stefan Schantl Date: Sat, 1 Apr 2023 10:10:17 +0200 Subject: [PATCH] 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 --- macros/systemd.macro | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/macros/systemd.macro b/macros/systemd.macro index 9dc74ff0..085fabbd 100644 --- a/macros/systemd.macro +++ b/macros/systemd.macro @@ -1,6 +1,3 @@ - -SYSTEMD_TMPFILES_DIR = /usr/lib/tmpfiles.d - MACRO_INSTALL_SYSTEMD_FILES for file in %{DIR_SOURCE}/systemd/*; do [ -e "${file}" ] || continue @@ -14,8 +11,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 -- 2.47.2