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>

diff --git a/Config.in.legacy b/Config.in.legacy
index 34bdaf0f8124c88ec6e33aa61e32b7a4d4075286..a135d3d0ecf28344bb5f189147a659f5e2f7d8b4 100644 (file)
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -145,6 +145,14 @@ endif
 ###############################################################################
 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
        bool "gst1-plugins-bad liveadder plugin removed"
        select BR2_LEGACY

diff --git a/package/dbus/Config.in b/package/dbus/Config.in
index 7d49ce5047bc18c94c5f95235c70a345b80e0883..653f7482f6931c6fe0219eda6654a6e85f90e9be 100644 (file)
--- a/package/dbus/Config.in
+++ b/package/dbus/Config.in
@@ -4,7 +4,6 @@ config BR2_PACKAGE_DBUS
        # uses fork()
        depends on BR2_USE_MMU
        select BR2_PACKAGE_EXPAT
-       select BR2_PACKAGE_SYSTEMD_COMPAT if BR2_INIT_SYSTEMD
        help
          The D-Bus message bus system.
 

diff --git a/package/liblogging/Config.in b/package/liblogging/Config.in
index 12ee950dc87f633a96b70cdd3bed5989987b0af5..23c3c1ad2dd5b4e62c6dd4b9c0f524d8ca889436 100644 (file)
--- a/package/liblogging/Config.in
+++ b/package/liblogging/Config.in
@@ -1,6 +1,5 @@
 config BR2_PACKAGE_LIBLOGGING
        bool "liblogging"
-       select BR2_PACKAGE_SYSTEMD_COMPAT if BR2_INIT_SYSTEMD
        help
          Liblogging is an easy to use library for
          logging. It offers an enhanced replacement

diff --git a/package/systemd/Config.in b/package/systemd/Config.in
index 34c00ad57c92b71ebb21e93a4c49869e9fd170e3..f064c1221c41378558e6c91ddb6555c08bdd55fd 100644 (file)
--- a/package/systemd/Config.in
+++ b/package/systemd/Config.in
@@ -311,19 +311,6 @@ config BR2_PACKAGE_SYSTEMD_TIMESYNCD
 
          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
        bool "enable SMACK support"
        select BR2_PACKAGE_ATTR

diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk
index 2f5019cf2db937c5419bc8e2f68b8457c1313d2d..835fc26a3385a1b36210993c37ccb4ae56be7926 100644 (file)
--- a/package/systemd/systemd.mk
+++ b/package/systemd/systemd.mk
@@ -54,12 +54,6 @@ define SYSTEMD_RUN_INTLTOOLIZE
 endef
 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)
 SYSTEMD_CONF_OPTS += --enable-acl
 SYSTEMD_DEPENDENCIES += acl