瀏覽代碼

systemd: bump version to 233

--disable-kdbus no longer exists, so remove everything related to it.

Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Vicente Olivert Riera 8 年之前
父節點
當前提交
815f713773
共有 4 個文件被更改,包括 9 次插入13 次删除
  1. 7 0
      Config.in.legacy
  2. 0 5
      package/systemd/Config.in
  3. 1 1
      package/systemd/systemd.hash
  4. 1 7
      package/systemd/systemd.mk

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

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

+ 1 - 1
package/systemd/systemd.hash

@@ -1,2 +1,2 @@
 # sha256 locally computed
-sha256 1172c7c7d5d72fbded53186e7599d5272231f04cc8b72f9a0fb2c5c20dfc4880  systemd-232.tar.gz
+sha256 8b3e99da3d4164b66581830a7f2436c0c8fe697b5fbdc3927bdb960646be0083  systemd-233.tar.gz

+ 1 - 7
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