From 8b86d4592a9ff800f451ac619c4c2775c8bcbb55 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 Signed-off-by: Michael Tremer --- macros/systemd.macro | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) 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 -- 2.47.3