From e9eb481b70b19c90cfc6b498017a94e43eb09c10276ae60616b209e649d076ca Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Wed, 1 Sep 2021 11:56:02 +0000 Subject: [PATCH] - Configure split-usr=true only when %usrmerged is not defined OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1180 --- systemd-mini.changes | 5 +++++ systemd-mini.spec | 2 ++ systemd.changes | 5 +++++ systemd.spec | 2 ++ 4 files changed, 14 insertions(+) diff --git a/systemd-mini.changes b/systemd-mini.changes index fb47af81..a93d76e2 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Sep 1 11:54:23 UTC 2021 - Franck Bui + +- Configure split-usr=true only when %usrmerged is not defined + ------------------------------------------------------------------- Wed Sep 1 09:56:55 UTC 2021 - Franck Bui diff --git a/systemd-mini.spec b/systemd-mini.spec index 58d2579d..1112b547 100644 --- a/systemd-mini.spec +++ b/systemd-mini.spec @@ -615,7 +615,9 @@ Have fun with these services at your own risk. -Dversion-tag=%{version}%{suse_version} \ -Ddocdir=%{_docdir}/systemd \ -Drootprefix=/usr \ +%if !0%{?usrmerged} -Dsplit-usr=true \ +%endif -Dsplit-bin=true \ -Dsystem-uid-max=499 \ -Dsystem-gid-max=499 \ diff --git a/systemd.changes b/systemd.changes index fb47af81..a93d76e2 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Sep 1 11:54:23 UTC 2021 - Franck Bui + +- Configure split-usr=true only when %usrmerged is not defined + ------------------------------------------------------------------- Wed Sep 1 09:56:55 UTC 2021 - Franck Bui diff --git a/systemd.spec b/systemd.spec index b2641ee4..af809ac7 100644 --- a/systemd.spec +++ b/systemd.spec @@ -613,7 +613,9 @@ Have fun with these services at your own risk. -Dversion-tag=%{version}%{suse_version} \ -Ddocdir=%{_docdir}/systemd \ -Drootprefix=/usr \ +%if !0%{?usrmerged} -Dsplit-usr=true \ +%endif -Dsplit-bin=true \ -Dsystem-uid-max=499 \ -Dsystem-gid-max=499 \