From 11d42612ddcfab2c9ff1c5096da9a11c43d557233e47a2860e06255f69bbe93c Mon Sep 17 00:00:00 2001
From: Franck Bui <fbui@suse.com>
Date: Wed, 6 Mar 2019 15:22:13 +0000
Subject: [PATCH] Accepting request 682234 from home:fbui:branches:Base:System

- systemd-mini: explicitly disable some of the systemd components

OBS-URL: https://build.opensuse.org/request/show/682234
OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1054
---
 systemd-mini.changes |  9 +++++++++
 systemd-mini.spec    | 17 +++++++++++++----
 systemd.changes      |  9 +++++++++
 systemd.spec         | 17 +++++++++++++----
 4 files changed, 44 insertions(+), 8 deletions(-)

diff --git a/systemd-mini.changes b/systemd-mini.changes
index 7ae5e08b..3f323ca5 100644
--- a/systemd-mini.changes
+++ b/systemd-mini.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Wed Mar  6 14:59:22 UTC 2019 - Franck Bui <fbui@suse.com>
+
+- systemd-mini: explicitly disable some of the systemd components
+
+  For some reasons, some build requirements get pulled in for the mini
+  variant now, enabling some parts of the code that were expected to
+  be turned OFF.
+
 -------------------------------------------------------------------
 Tue Mar  5 17:51:02 UTC 2019 - Franck Bui <fbui@suse.com>
 
diff --git a/systemd-mini.spec b/systemd-mini.spec
index 61198a9c..ab6669e4 100644
--- a/systemd-mini.spec
+++ b/systemd-mini.spec
@@ -456,20 +456,29 @@ opensuse_ntp_servers=({0..3}.opensuse.pool.ntp.org)
 %if 0%{?bootstrap}
         -Dman=false \
         -Dhtml=false \
-        -Dmyhostname=false \
+        -Dnss-myhostname=false \
 %endif
 %if %{without coredump}
         -Dcoredump=false \
 %endif
+%if %{without gnuefi}
+        -Dgnu-efi=false \
+%endif
+%if %{without importd}
+        -Dimportd=false \
+%endif
+%if %{without journal_remote}
+        -Dremote=false \
+%endif
+%if %{without machined}
+        -Dmachined=false \
+%endif
 %if %{without networkd}
         -Dnetworkd=false \
 %endif
 %if %{without resolved}
         -Dresolve=false \
 %endif
-%if %{without machined}
-        -Dmachined=false \
-%endif
 %if %{without sysvcompat}
         -Dsysvinit-path= \
         -Dsysvrcnd-path= \
diff --git a/systemd.changes b/systemd.changes
index 7ae5e08b..3f323ca5 100644
--- a/systemd.changes
+++ b/systemd.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Wed Mar  6 14:59:22 UTC 2019 - Franck Bui <fbui@suse.com>
+
+- systemd-mini: explicitly disable some of the systemd components
+
+  For some reasons, some build requirements get pulled in for the mini
+  variant now, enabling some parts of the code that were expected to
+  be turned OFF.
+
 -------------------------------------------------------------------
 Tue Mar  5 17:51:02 UTC 2019 - Franck Bui <fbui@suse.com>
 
diff --git a/systemd.spec b/systemd.spec
index aabd09bf..ca20d5a3 100644
--- a/systemd.spec
+++ b/systemd.spec
@@ -454,20 +454,29 @@ opensuse_ntp_servers=({0..3}.opensuse.pool.ntp.org)
 %if 0%{?bootstrap}
         -Dman=false \
         -Dhtml=false \
-        -Dmyhostname=false \
+        -Dnss-myhostname=false \
 %endif
 %if %{without coredump}
         -Dcoredump=false \
 %endif
+%if %{without gnuefi}
+        -Dgnu-efi=false \
+%endif
+%if %{without importd}
+        -Dimportd=false \
+%endif
+%if %{without journal_remote}
+        -Dremote=false \
+%endif
+%if %{without machined}
+        -Dmachined=false \
+%endif
 %if %{without networkd}
         -Dnetworkd=false \
 %endif
 %if %{without resolved}
         -Dresolve=false \
 %endif
-%if %{without machined}
-        -Dmachined=false \
-%endif
 %if %{without sysvcompat}
         -Dsysvinit-path= \
         -Dsysvrcnd-path= \