systemd: version bump 195 -> 204

This also includes a host-systemd. udevadm is needed here to generate the
hardware database if enabled.

Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>

6 files changed, 122 insertions, 24 deletions

diff --git a/rules/host-systemd.in b/rules/host-systemd.in
new file mode 100644
index 000000000..c8f58dcc5
--- /dev/null
+++ b/rules/host-systemd.in
@@ -0,0 +1,8 @@
+## SECTION=hosttools_noprompt
+
+config HOST_SYSTEMD
+	bool
+	select HOST_INTLTOOL
+	select HOST_GPERF
+	select HOST_DBUS
+	select HOST_LIBCAP
diff --git a/rules/host-systemd.make b/rules/host-systemd.make
new file mode 100644
index 000000000..188c99d6e
--- /dev/null
+++ b/rules/host-systemd.make
@@ -0,0 +1,74 @@
+# -*-makefile-*-
+#
+# Copyright (C) 2013 by Michael Olbrich <m.olbrich@pengutronix.de>
+#
+# See CREDITS for details about who has contributed to this project.
+#
+# For further information about the PTXdist project and license conditions
+# see the README file.
+#
+
+#
+# We provide this package
+#
+HOST_PACKAGES-$(PTXCONF_HOST_SYSTEMD) += host-systemd
+
+# ----------------------------------------------------------------------------
+# Prepare
+# ----------------------------------------------------------------------------
+
+#
+# autoconf
+#
+HOST_SYSTEMD_CONF_TOOL	:= autoconf
+HOST_SYSTEMD_CONF_OPT	:= \
+	$(HOST_AUTOCONF) \
+	--disable-largefile \
+	--enable-silent-rules \
+	--disable-static \
+	--disable-nls \
+	--disable-gtk-doc \
+	--disable-gtk-doc-html \
+	--disable-gtk-doc-pdf \
+	--disable-introspection \
+	--disable-kmod \
+	--disable-blkid \
+	--disable-ima \
+	--disable-chkconfig \
+	--disable-selinux \
+	--disable-xz \
+	--disable-tcpwrap \
+	--disable-pam \
+	--disable-acl \
+	--disable-xattr \
+	--disable-gcrypt \
+	--disable-audit \
+	--disable-libcryptsetup \
+	--disable-qrencode \
+	--disable-microhttpd \
+	--disable-binfmt \
+	--disable-vconsole \
+	--disable-readahead \
+	--disable-bootchart \
+	--disable-quotacheck \
+	--disable-randomseed \
+	--disable-logind \
+	--disable-hostnamed \
+	--disable-timedated \
+	--disable-localed \
+	--disable-coredump \
+	--disable-polkit \
+	--disable-efi \
+	--disable-myhostname \
+	--disable-gudev \
+	--disable-keymap \
+	--disable-manpages \
+	--enable-split-usr \
+	--disable-tests \
+	--with-sysvinit-path="" \
+	--with-sysvrcnd-path="" \
+	--without-python \
+	--with-rootprefix= \
+	--with-rootlibdir=/lib
+
+# vim: syntax=make
diff --git a/rules/systemd.in b/rules/systemd.in
index a5d77e87b..d2a43e043 100644
--- a/rules/systemd.in
+++ b/rules/systemd.in
@@ -13,7 +13,6 @@ menuconfig SYSTEMD
 	select UDEV		if RUNTIME
 	select UDEV_LIBUDEV
 	select MACHINE_ID	if RUNTIME
-	select DBUS_PYTHON	if SYSTEMD_ANALYZE && RUNTIME
 	select TCPWRAPPER	if SYSTEMD_TCPWRAP
 	select XZ		if SYSTEMD_XZ
 	select LIBSELINUX	if GLOBAL_SELINUX
@@ -22,8 +21,7 @@ menuconfig SYSTEMD
 	select LIBKMOD
 	select LIBBLKID
 	select GLIB		if UDEV_LIBGUDEV
-	select PCIUTILS		if UDEV_PERSISTENT_PCI && RUNTIME
-	select USBUTILS		if UDEV_PERSISTENT_USB && RUNTIME
+	select HOST_SYSTEMD	if UDEV_HWDB
 	prompt "systemd                       "
 	help
 	  systemd is a system and session manager for Linux, compatible with SysV
@@ -61,11 +59,5 @@ config SYSTEMD_DISABLE_RANDOM_SEED
 	  the random seed is not possible.
 	  Warning: enabling this option may be insecure.
 
-config SYSTEMD_ANALYZE
-	bool
-	prompt "systemd-analyze"
-	help
-	  Install the systemd-analyze tool. This feature requires python.
-
 endif
 
diff --git a/rules/systemd.make b/rules/systemd.make
index 84ad633a6..2d2cfe92c 100644
--- a/rules/systemd.make
+++ b/rules/systemd.make
@@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_SYSTEMD) += systemd
 #
 # Paths and names
 #
-SYSTEMD_VERSION	:= 195
-SYSTEMD_MD5	:= 38e8c8144e7e6e5bc3ce32eb4260e680
+SYSTEMD_VERSION	:= 204
+SYSTEMD_MD5	:= a07619bb19f48164fbf0761d12fd39a8
 SYSTEMD		:= systemd-$(SYSTEMD_VERSION)
 SYSTEMD_SUFFIX	:= tar.xz
 SYSTEMD_URL	:= http://www.freedesktop.org/software/systemd/$(SYSTEMD).$(SYSTEMD_SUFFIX)
@@ -35,11 +35,6 @@ ifneq ($(PTXCONF_ARCH_X86)$(PTXCONF_ARCH_PPC),)
 SYSTEMD_WRAPPER_BLACKLIST := TARGET_HARDEN_PIE
 endif
 
-# python is used for the journal python bindings, which are not installed
-SYSTEMD_CONF_ENV := \
-	$(CROSS_ENV) \
-	ac_cv_path_PYTHON=:
-
 #
 # autoconf
 #
@@ -54,7 +49,10 @@ SYSTEMD_CONF_OPT := \
 	--disable-gtk-doc-html \
 	--disable-gtk-doc-pdf \
 	--disable-introspection \
+	--enable-kmod \
+	--enable-blkid \
 	--disable-ima \
+	--disable-chkconfig \
 	$(GLOBAL_SELINUX_OPTION) \
 	--$(call ptx/endis,PTXCONF_SYSTEMD_XZ)-xz \
 	--$(call ptx/endis,PTXCONF_SYSTEMD_TCPWRAP)-tcpwrap \
@@ -69,6 +67,7 @@ SYSTEMD_CONF_OPT := \
 	--enable-binfmt \
 	--$(call ptx/endis,PTXCONF_SYSTEMD_VCONSOLE)-vconsole \
 	--enable-readahead \
+	--enable-bootchart \
 	--enable-quotacheck \
 	--$(call ptx/disen,PTXCONF_SYSTEMD_DISABLE_RANDOM_SEED)-randomseed \
 	--enable-logind \
@@ -76,15 +75,17 @@ SYSTEMD_CONF_OPT := \
 	--enable-timedated \
 	--enable-localed \
 	--disable-coredump \
+	--enable-polkit \
+	--disable-efi \
+	--enable-myhostname \
 	--$(call ptx/endis,PTXCONF_UDEV_LIBGUDEV)-gudev \
 	--$(call ptx/endis,PTXCONF_UDEV_KEYMAPS)-keymap \
 	--disable-manpages \
 	--enable-split-usr \
-	--with-usb-ids-path=/usr/share/usb.ids \
-	--with-pci-ids-path=/usr/share/pci.ids$(call ptx/ifdef, PTXCONF_PCIUTILS_COMPRESS,.gz,) \
-	--with-distro=other \
+	--disable-tests \
 	--with-sysvinit-path="" \
-	--with-sysvrcd-path="" \
+	--with-sysvrcnd-path="" \
+	--without-python \
 	--with-dbuspolicydir=/etc/dbus-1/system.d \
 	--with-dbussessionservicedir=/usr/share/dbus-1/services \
 	--with-dbussystemservicedir=/usr/share/dbus-1/system-services \
@@ -111,6 +112,9 @@ $(STATEDIR)/systemd.install:
 	@$(call targetinfo)
 	@$(call world/install, SYSTEMD)
 	@ln -sf multi-user.target "$(SYSTEMD_PKGDIR)/lib/systemd/system/default.target"
+ifdef PTXCONF_UDEV_HWDB
+	@udevadm hwdb --update --root $(SYSTEMD_PKGDIR)
+endif
 	@$(call touch)
 
 # ----------------------------------------------------------------------------
@@ -120,7 +124,9 @@ $(STATEDIR)/systemd.install:
 SYSTEMD_HELPER := \
 	systemd \
 	systemd-ac-power \
+	systemd-activate \
 	systemd-binfmt \
+	systemd-bootchart \
 	systemd-cgroups-agent \
 	systemd-fsck \
 	systemd-hostnamed \
@@ -164,6 +170,8 @@ $(STATEDIR)/systemd.targetinstall:
 	@$(call install_lib, systemd, 0, 0, 0644, libsystemd-journal)
 	@$(call install_lib, systemd, 0, 0, 0644, libsystemd-login)
 
+	@$(call install_lib, systemd, 0, 0, 0644, libnss_myhostname)
+
 #	# daemon + tools
 	@$(call install_copy, systemd, 0, 0, 0755, -, /bin/systemctl)
 	@$(call install_copy, systemd, 0, 0, 0755, -, /bin/journalctl)
@@ -174,6 +182,9 @@ $(STATEDIR)/systemd.targetinstall:
 	@$(call install_copy, systemd, 0, 0, 0755, -, /bin/systemd-tmpfiles)
 	@$(call install_copy, systemd, 0, 0, 0755, -, /bin/systemd-notify)
 	@$(call install_copy, systemd, 0, 0, 0755, -, /bin/systemd-tty-ask-password-agent)
+	@$(call install_copy, systemd, 0, 0, 0755, -, /usr/bin/hostnamectl)
+	@$(call install_copy, systemd, 0, 0, 0755, -, /usr/bin/localectl)
+	@$(call install_copy, systemd, 0, 0, 0755, -, /usr/bin/timedatectl)
 	@$(call install_copy, systemd, 0, 0, 0755, -, /usr/bin/systemd-cat)
 	@$(call install_copy, systemd, 0, 0, 0755, -, /usr/bin/systemd-cgls)
 	@$(call install_copy, systemd, 0, 0, 0755, -, /usr/bin/systemd-cgtop)
@@ -181,9 +192,7 @@ $(STATEDIR)/systemd.targetinstall:
 	@$(call install_copy, systemd, 0, 0, 0755, -, /usr/bin/systemd-detect-virt)
 	@$(call install_copy, systemd, 0, 0, 0755, -, /usr/bin/systemd-nspawn)
 	@$(call install_copy, systemd, 0, 0, 0755, -, /usr/bin/systemd-stdio-bridge)
-ifdef PTXCONF_SYSTEMD_ANALYZE
 	@$(call install_copy, systemd, 0, 0, 0755, -, /usr/bin/systemd-analyze)
-endif
 
 	@$(call install_tree, systemd, 0, 0, -, /lib/systemd/system-generators/)
 	@$(foreach helper, $(SYSTEMD_HELPER), \
@@ -202,6 +211,8 @@ endif
 	@$(call install_alternative, systemd, 0, 0, 0644, \
 		/etc/systemd/system.conf)
 	@$(call install_alternative, systemd, 0, 0, 0644, \
+		/etc/systemd/bootchart.conf)
+	@$(call install_alternative, systemd, 0, 0, 0644, \
 		/etc/systemd/journald.conf)
 	@$(call install_alternative, systemd, 0, 0, 0644, \
 		/etc/systemd/logind.conf)
@@ -213,6 +224,7 @@ endif
 	@$(call install_tree, systemd, 0, 0, -, /usr/share/dbus-1/services/)
 	@$(call install_tree, systemd, 0, 0, -, /usr/share/dbus-1/system-services/)
 	@$(call install_copy, systemd, 0, 0, 0644, -, /usr/share/systemd/kbd-model-map)
+	@$(call install_copy, systemd, 0, 0, 0644, -, /usr/lib/sysctl.d/50-default.conf)
 
 #	# units
 	@$(call install_tree, systemd, 0, 0, -, /lib/systemd/system/)
diff --git a/rules/udev.in b/rules/udev.in
index 0e39cb04d..0cc686f7a 100644
--- a/rules/udev.in
+++ b/rules/udev.in
@@ -90,6 +90,11 @@ config UDEV_KEYMAPS
 	  This will install the keymaps shipped with udev. These are mostly
 	  to map custom hardware's multimedia keys of various laptops
 
+config UDEV_HWDB
+	bool
+	depends on SYSTEMD
+	prompt "install hardware database"
+
 config UDEV_CUST_RULES
 	bool
 	prompt "install customized udev rules"
@@ -146,10 +151,12 @@ config UDEV_PERSISTENT_GENERATOR
 
 config UDEV_PERSISTENT_PCI
 	bool
+	depends on SYSTEMD = n
 	prompt "pci"
 
 config UDEV_PERSISTENT_USB
 	bool
+	depends on SYSTEMD = n
 	prompt "usb"
 
 config UDEV_PERSISTENT_SCSI
diff --git a/rules/udev.make b/rules/udev.make
index 80c703f19..dcdf79cd8 100644
--- a/rules/udev.make
+++ b/rules/udev.make
@@ -104,10 +104,12 @@ endif
 ifdef PTXCONF_SYSTEMD
 
 UDEV_RULES-y += \
+	64-btrfs.rules \
 	70-power-switch.rules \
 	70-uaccess.rules \
 	71-seat.rules \
-	73-seat-late.rules
+	73-seat-late.rules \
+	80-net-name-slot.rules
 
 endif
 
@@ -173,6 +175,9 @@ $(STATEDIR)/udev.targetinstall:
 ifdef PTXCONF_UDEV_ETC_CONF
 	@$(call install_alternative, udev, 0, 0, 0644, /etc/udev/udev.conf)
 endif
+ifdef PTXCONF_UDEV_HWDB
+	@$(call install_copy, udev, 0, 0, 0644, -, /etc/udev/hwdb.bin)
+endif
 
 ifdef PTXCONF_UDEV_LEGACY
 	@$(call install_copy, udev, 0, 0, 0755, -, /sbin/udevd)
@@ -180,7 +185,7 @@ ifdef PTXCONF_UDEV_LEGACY
 else
 ifdef PTXCONF_SYSTEMD
 	@$(call install_copy, udev, 0, 0, 0755, -, /lib/systemd/systemd-udevd)
-	@$(call install_copy, udev, 0, 0, 0755, -, /usr/bin/udevadm)
+	@$(call install_copy, udev, 0, 0, 0755, -, /bin/udevadm)
 else
 	@$(call install_copy, udev, 0, 0, 0755, -, /lib/udev/udevd)
 	@$(call install_copy, udev, 0, 0, 0755, -, /bin/udevadm)