瀏覽代碼

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) <arnout@mind.be>
Arnout Vandecappelle (Essensium/Mind) 3 年之前
父節點
當前提交
83319384fd
共有 3 個文件被更改,包括 10 次插入7 次删除
  1. 9 0
      Config.in.legacy
  2. 1 3
      package/cryptsetup/cryptsetup.mk
  3. 0 4
      package/systemd/Config.in

+ 9 - 0
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

+ 1 - 3
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 = \

+ 0 - 4
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