From 815f7137739ff28805d750edb888aa996c3fecc5 Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Wed, 22 Mar 2017 11:39:13 +0000 Subject: [PATCH] systemd: bump version to 233 --disable-kdbus no longer exists, so remove everything related to it. Signed-off-by: Vicente Olivert Riera Signed-off-by: Thomas Petazzoni --- Config.in.legacy | 7 +++++++ package/systemd/Config.in | 5 ----- package/systemd/systemd.hash | 2 +- package/systemd/systemd.mk | 8 +------- 4 files changed, 9 insertions(+), 13 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index a45c4b3177..4e14a9809c 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -145,6 +145,13 @@ endif ############################################################################### comment "Legacy options removed in 2017.05" +config BR2_PACKAGE_SYSTEMD_KDBUS + bool "systemd-kdbus has been removed" + select BR2_LEGACY + help + --enable/disable-kdbus configure option has been removed since + systemd-231. + config BR2_PACKAGE_POLARSSL bool "polarssl has been removed" select BR2_LEGACY diff --git a/package/systemd/Config.in b/package/systemd/Config.in index aaed7dc020..0f546864bd 100644 --- a/package/systemd/Config.in +++ b/package/systemd/Config.in @@ -155,11 +155,6 @@ config BR2_PACKAGE_SYSTEMD_IMPORTD http://www.freedesktop.org/software/systemd/man/machinectl.html#Image%20Transfer%20Commands -config BR2_PACKAGE_SYSTEMD_KDBUS - bool "enable kdbus support" - help - Enable kdbus support for Systemd. - config BR2_PACKAGE_SYSTEMD_LOCALED bool "enable locale daemon" help diff --git a/package/systemd/systemd.hash b/package/systemd/systemd.hash index 0acaa3cdcd..17f4c0f890 100644 --- a/package/systemd/systemd.hash +++ b/package/systemd/systemd.hash @@ -1,2 +1,2 @@ # sha256 locally computed -sha256 1172c7c7d5d72fbded53186e7599d5272231f04cc8b72f9a0fb2c5c20dfc4880 systemd-232.tar.gz +sha256 8b3e99da3d4164b66581830a7f2436c0c8fe697b5fbdc3927bdb960646be0083 systemd-233.tar.gz diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index 0d2f416300..cfd885d4e4 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -4,7 +4,7 @@ # ################################################################################ -SYSTEMD_VERSION = 232 +SYSTEMD_VERSION = 233 SYSTEMD_SITE = $(call github,systemd,systemd,v$(SYSTEMD_VERSION)) SYSTEMD_LICENSE = LGPLv2.1+, GPLv2+ (udev), Public Domain (few source files, see README) SYSTEMD_LICENSE_FILES = LICENSE.GPL2 LICENSE.LGPL2.1 README @@ -87,12 +87,6 @@ else SYSTEMD_CONF_OPTS += --disable-xkbcommon endif -ifeq ($(BR2_PACKAGE_SYSTEMD_KDBUS),y) -SYSTEMD_CONF_OPTS += --enable-kdbus -else -SYSTEMD_CONF_OPTS += --disable-kdbus -endif - ifeq ($(BR2_PACKAGE_BZIP2),y) SYSTEMD_DEPENDENCIES += bzip2 SYSTEMD_CONF_OPTS += --enable-bzip2 -- 2.30.2