Browse Source

package/systemd: Remove SYSTEMD_COMPAT option

Since v230 of systemd, the compat libraries have been fully removed.
https://github.com/systemd/systemd/commit/4de282cf9324ab13d17ac334244d0d7cae2df37d

Signed-off-by: Maxime Hadjinlian <maxime.hadjinlian@gmail.com>
[Thomas: rewrap Config.in help text in Config.in.legacy and put the
option at the right place.]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Maxime Hadjinlian 9 years ago
parent
commit
638cfb5e0e

+ 8 - 0
Config.in.legacy

@@ -145,6 +145,14 @@ endif
 ###############################################################################
 ###############################################################################
 comment "Legacy options removed in 2016.08"
 comment "Legacy options removed in 2016.08"
 
 
+config BR2_PACKAGE_SYSTEMD_COMPAT
+	bool "systemd compatibility libraries have been removed"
+	help
+	  The systemd option te enable the compatibility libraries has
+	  been removed. Theses libraries have been useless since a few
+	  version, and have been fully dropped from the source since
+	  v230.
+
 config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_LIVEADDER
 config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_LIVEADDER
 	bool "gst1-plugins-bad liveadder plugin removed"
 	bool "gst1-plugins-bad liveadder plugin removed"
 	select BR2_LEGACY
 	select BR2_LEGACY

+ 0 - 1
package/dbus/Config.in

@@ -4,7 +4,6 @@ config BR2_PACKAGE_DBUS
 	# uses fork()
 	# uses fork()
 	depends on BR2_USE_MMU
 	depends on BR2_USE_MMU
 	select BR2_PACKAGE_EXPAT
 	select BR2_PACKAGE_EXPAT
-	select BR2_PACKAGE_SYSTEMD_COMPAT if BR2_INIT_SYSTEMD
 	help
 	help
 	  The D-Bus message bus system.
 	  The D-Bus message bus system.
 
 

+ 0 - 1
package/liblogging/Config.in

@@ -1,6 +1,5 @@
 config BR2_PACKAGE_LIBLOGGING
 config BR2_PACKAGE_LIBLOGGING
 	bool "liblogging"
 	bool "liblogging"
-	select BR2_PACKAGE_SYSTEMD_COMPAT if BR2_INIT_SYSTEMD
 	help
 	help
 	  Liblogging is an easy to use library for
 	  Liblogging is an easy to use library for
 	  logging. It offers an enhanced replacement
 	  logging. It offers an enhanced replacement

+ 0 - 13
package/systemd/Config.in

@@ -311,19 +311,6 @@ config BR2_PACKAGE_SYSTEMD_TIMESYNCD
 
 
 	  http://www.freedesktop.org/software/systemd/man/systemd-timesyncd.html
 	  http://www.freedesktop.org/software/systemd/man/systemd-timesyncd.html
 
 
-config BR2_PACKAGE_SYSTEMD_COMPAT
-	bool "enable compatibility libraries"
-	help
-	  Since systemd 209, the following libraries have been merged into
-	  libsystemd.so:
-
-	  - libsystemd-daemon
-	  - libsystemd-id128
-	  - libsystemd-journal
-	  - libsystemd-login
-
-	  This option enables the installation of compatibility *.pc files.
-
 config BR2_PACKAGE_SYSTEMD_SMACK_SUPPORT
 config BR2_PACKAGE_SYSTEMD_SMACK_SUPPORT
 	bool "enable SMACK support"
 	bool "enable SMACK support"
 	select BR2_PACKAGE_ATTR
 	select BR2_PACKAGE_ATTR

+ 0 - 6
package/systemd/systemd.mk

@@ -54,12 +54,6 @@ define SYSTEMD_RUN_INTLTOOLIZE
 endef
 endef
 SYSTEMD_PRE_CONFIGURE_HOOKS += SYSTEMD_RUN_INTLTOOLIZE
 SYSTEMD_PRE_CONFIGURE_HOOKS += SYSTEMD_RUN_INTLTOOLIZE
 
 
-ifeq ($(BR2_PACKAGE_SYSTEMD_COMPAT),y)
-SYSTEMD_CONF_OPTS += --enable-compat-libs
-else
-SYSTEMD_CONF_OPTS += --disable-compat-libs
-endif
-
 ifeq ($(BR2_PACKAGE_ACL),y)
 ifeq ($(BR2_PACKAGE_ACL),y)
 SYSTEMD_CONF_OPTS += --enable-acl
 SYSTEMD_CONF_OPTS += --enable-acl
 SYSTEMD_DEPENDENCIES += acl
 SYSTEMD_DEPENDENCIES += acl