Pakfire April 2023

pakfire@lists.ipfire.org

1 participants
2 discussions

[PATCH 1/2] macros: Add macro to automatically install all systemd sysusers files
by Stefan Schantl 02 Apr '23

02 Apr '23

This macros works very similar than the tmpfiles one but handles sysusers files. Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> --- macros/systemd.macro | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/macros/systemd.macro b/macros/systemd.macro index 9dc74ff0..1453db95 100644 --- a/macros/systemd.macro +++ b/macros/systemd.macro @@ -1,5 +1,6 @@ SYSTEMD_TMPFILES_DIR = /usr/lib/tmpfiles.d +SYSTEMD_SYSUSERS_DIR = /usr/lib/sysusers.d MACRO_INSTALL_SYSTEMD_FILES for file in %{DIR_SOURCE}/systemd/*; do @@ -19,3 +20,12 @@ MACRO_INSTALL_SYSTEMD_TMPFILES done unset file end + +MACRO_INSTALL_SYSTEMD_SYSUSERS + for file in %{DIR_SOURCE}/*.sysusers; do + [ -e "${file}" ] || continue + mkdir -p %{BUILDROOT}/%{SYSTEMD_SYSUSERS_DIR} + cp -vf ${file} %{BUILDROOT}/%{SYSTEMD_SYSUSERS_DIR}/$(basename ${file%*.sysusers}).conf + done + unset file +end -- 2.30.2

2 7

[PATCH] systemd.macro: Avoid declaring the directory for tmpfiles twice
by Stefan Schantl 02 Apr '23

02 Apr '23

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(a)ipfire.org> --- 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.30.2

1 0

2024

2023

2022

2021

2020

2019

2018

2017

Pakfire April 2023