From 83319384fdb5d6666cb21ad915576385f232efb7 Mon Sep 17 00:00:00 2001 From: "Arnout Vandecappelle (Essensium/Mind)" Date: Sun, 9 Jan 2022 12:34:36 +0100 Subject: [PATCH] package/systemd: remove BR2_PACKAGE_SYSTEMD_TMPFILES completely Since tmpfiles is no longer optional, the Config.in symbol serves no purpose. It was only used in cryptsetup.mk, where we replace it with BR2_PACKAGE_SYSTEMD. Advise to do the same in Config.in.legacy. Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- Config.in.legacy | 9 +++++++++ package/cryptsetup/cryptsetup.mk | 4 +--- package/systemd/Config.in | 4 ---- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index 75873ff74b..a9e95d6f58 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,15 @@ endif comment "Legacy options removed in 2022.02" +config BR2_PACKAGE_SYSTEMD_TMPFILES + bool "systemd tmpfiles support always enabled" + select BR2_LEGACY + help + The systemd tmpfiles support is always enabled, so the symbol + to make it optional has been removed. You need to update any + external packages that use this symbol to use + BR2_PACKAGE_SYSTEMD instead. + config BR2_PACKAGE_CIVETWEB_WITH_LUA bool "civetweb lua support option removed" select BR2_LEGACY diff --git a/package/cryptsetup/cryptsetup.mk b/package/cryptsetup/cryptsetup.mk index 676cd25be4..9cfd647ac6 100644 --- a/package/cryptsetup/cryptsetup.mk +++ b/package/cryptsetup/cryptsetup.mk @@ -42,10 +42,8 @@ else CRYPTSETUP_CONF_OPTS += --disable-ssh-token endif -ifeq ($(BR2_PACKAGE_SYSTEMD_TMPFILES),y) +ifeq ($(BR2_PACKAGE_SYSTEMD),y) CRYPTSETUP_CONF_OPTS += --with-tmpfilesdir=/usr/lib/tmpfiles.d -else -CRYPTSETUP_CONF_OPTS += --without-tmpfilesdir endif HOST_CRYPTSETUP_DEPENDENCIES = \ diff --git a/package/systemd/Config.in b/package/systemd/Config.in index 833c89eaa2..cc0736561e 100644 --- a/package/systemd/Config.in +++ b/package/systemd/Config.in @@ -500,10 +500,6 @@ config BR2_PACKAGE_SYSTEMD_TIMESYNCD http://www.freedesktop.org/software/systemd/man/systemd-timesyncd.html -config BR2_PACKAGE_SYSTEMD_TMPFILES - bool - default y - config BR2_PACKAGE_SYSTEMD_USERDB bool "enable userdb daemon" help