[systemd] update to version 197, integrated udev.

6 files changed, 93 insertions, 21 deletions

diff --git a/remote/tools/systemd/data/debug-shell.service b/remote/tools/systemd/data/etc/systemd/system/debug-shell.service
index 063d4995..063d4995 100644
--- a/remote/tools/systemd/data/debug-shell.service
+++ b/remote/tools/systemd/data/etc/systemd/system/debug-shell.service
diff --git a/remote/tools/systemd/data/network@.service b/remote/tools/systemd/data/etc/systemd/system/network@.service
index 01f3a526..01f3a526 100644
--- a/remote/tools/systemd/data/network@.service
+++ b/remote/tools/systemd/data/etc/systemd/system/network@.service
diff --git a/remote/tools/systemd/data/etc/systemd/system/sysinit.target.wants/debug-shell.service b/remote/tools/systemd/data/etc/systemd/system/sysinit.target.wants/debug-shell.service
new file mode 120000
index 00000000..699b56ac
--- /dev/null
+++ b/remote/tools/systemd/data/etc/systemd/system/sysinit.target.wants/debug-shell.service
@@ -0,0 +1 @@
+../debug-shell.service
\ No newline at end of file
diff --git a/remote/tools/systemd/data/usr/lib/udev/rules.d/99-systemd.rules b/remote/tools/systemd/data/usr/lib/udev/rules.d/99-systemd.rules
new file mode 100644
index 00000000..52377d1f
--- /dev/null
+++ b/remote/tools/systemd/data/usr/lib/udev/rules.d/99-systemd.rules
@@ -0,0 +1,55 @@
+#  This file is part of systemd.
+#
+#  systemd is free software; you can redistribute it and/or modify it
+#  under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2 of the License, or
+#  (at your option) any later version.
+
+ACTION=="remove", GOTO="systemd_end"
+
+SUBSYSTEM=="tty", KERNEL=="tty[0-9]|tty1[0-2]", TAG+="systemd"
+SUBSYSTEM=="tty", KERNEL=="tty[a-zA-Z]*|hvc*|xvc*|hvsi*", TAG+="systemd"
+
+KERNEL=="vport*", TAG+="systemd"
+
+SUBSYSTEM=="block", KERNEL!="ram*|loop*", TAG+="systemd"
+SUBSYSTEM=="block", KERNEL!="ram*|loop*", ENV{DM_UDEV_DISABLE_OTHER_RULES_FLAG}=="1", ENV{SYSTEMD_READY}="0"
+
+# Ignore encrypted devices with no identified superblock on it, since
+# we are probably still calling mke2fs or mkswap on it.
+
+SUBSYSTEM=="block", KERNEL!="ram*|loop*", ENV{DM_UUID}=="CRYPT-*", ENV{ID_PART_TABLE_TYPE}=="", ENV{ID_FS_USAGE}=="", ENV{SYSTEMD_READY}="0"
+
+# We need a hardware independent way to identify network devices. We
+# use the /sys/subsystem path for this. Current vanilla kernels don't
+# actually support that hierarchy right now, however upcoming kernels
+# will. HAL and udev internally support /sys/subsystem already, hence
+# it should be safe to use this here, too. This is mostly just an
+# identification string for systemd, so whether the path actually is
+# accessible or not does not matter as long as it is unique and in the
+# filesystem namespace.
+#
+# http://git.kernel.org/?p=linux/hotplug/udev.git;a=blob;f=libudev/libudev-enumerate.c;h=da831449dcaf5e936a14409e8e68ab12d30a98e2;hb=HEAD#l742
+
+SUBSYSTEM=="net", KERNEL!="lo", TAG+="systemd", ENV{SYSTEMD_ALIAS}="/sys/subsystem/net/devices/$name", ENV{SYSTEMD_WANTS}="network@$name.service"
+SUBSYSTEM=="bluetooth", TAG+="systemd", ENV{SYSTEMD_ALIAS}="/sys/subsystem/bluetooth/devices/%k"
+
+SUBSYSTEM=="bluetooth", TAG+="systemd", ENV{SYSTEMD_WANTS}="bluetooth.target"
+ENV{ID_SMARTCARD_READER}=="*?", TAG+="systemd", ENV{SYSTEMD_WANTS}="smartcard.target"
+SUBSYSTEM=="sound", KERNEL=="card*", TAG+="systemd", ENV{SYSTEMD_WANTS}="sound.target"
+
+SUBSYSTEM=="printer", TAG+="systemd", ENV{SYSTEMD_WANTS}="printer.target"
+SUBSYSTEM=="usb", KERNEL=="lp*", TAG+="systemd", ENV{SYSTEMD_WANTS}="printer.target"
+SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ENV{ID_USB_INTERFACES}=="*:0701??:*", TAG+="systemd", ENV{SYSTEMD_WANTS}="printer.target"
+
+# Apply sysctl variables to network devices (and only to those) as they appear.
+
+SUBSYSTEM=="net", KERNEL!="lo", RUN+="/usr/lib/systemd/systemd-sysctl --prefix=/proc/sys/net/ipv4/conf/$name --prefix=/proc/sys/net/ipv4/neigh/$name --prefix=/proc/sys/net/ipv6/conf/$name --prefix=/proc/sys/net/ipv6/neigh/$name"
+
+# Asynchronously mount file systems implemented by these modules as
+# soon as they are loaded.
+
+SUBSYSTEM=="module", KERNEL=="fuse", ACTION=="add", TAG+="systemd", ENV{SYSTEMD_WANTS}="sys-fs-fuse-connections.mount"
+SUBSYSTEM=="module", KERNEL=="configfs", ACTION=="add", TAG+="systemd", ENV{SYSTEMD_WANTS}="sys-kernel-config.mount"
+
+LABEL="systemd_end"
diff --git a/remote/tools/systemd/systemd.build b/remote/tools/systemd/systemd.build
index 14cef7e1..c77033ac 100644
--- a/remote/tools/systemd/systemd.build
+++ b/remote/tools/systemd/systemd.build
@@ -26,7 +26,7 @@ build () {
 	if [ ! -e .built ]; then
 		cd src/$VERSION
 		./configure --disable-manpages
-		make
+		make -j5
 		[ ! -d $TOOL_DIR/$TOOL/build ] && mkdir -p $TOOL_DIR/$TOOL/build
 		DESTDIR=$TOOL_DIR/$TOOL/build make install
 		cd -
@@ -35,14 +35,9 @@ build () {
 }
 
 post_copy() {
-	# debug shell on tty9
-	[ ! -d $INIT_DIR/etc/systemd/system/sysinit.target.wants ] && mkdir -p $INIT_DIR/etc/systemd/system/sysinit.target.wants
-	cp $TOOL_DIR/$TOOL/data/debug-shell.service $INIT_DIR/etc/systemd/system
-	ln -s ../debug-shell.service $INIT_DIR/etc/systemd/system/sysinit.target.wants
+	# copy static data files
+	cp -r $TOOL_DIR/$TOOL/data/* $INIT_DIR
 		
 	# dont clear systemd log at startup
 	sed -i.bak "s/TTYVTDisallocate=yes/TTYVTDisallocate=no/g" $INIT_DIR/usr/lib/systemd/system/getty@.service
-
-	# copy custom network@.service
-	cp $TOOL_DIR/$TOOL/data/network@.service $INIT_DIR/etc/systemd/system
 }
diff --git a/remote/tools/systemd/systemd.conf b/remote/tools/systemd/systemd.conf
index e4effae2..1ac80876 100644
--- a/remote/tools/systemd/systemd.conf
+++ b/remote/tools/systemd/systemd.conf
@@ -1,4 +1,4 @@
-VERSION=systemd-43
+VERSION=systemd-197
 URL=http://www.freedesktop.org/software/systemd/${VERSION}.tar.xz
 DEPS="			intltool
 			gperf
@@ -8,27 +8,34 @@ DEPS="			intltool
 			libudev-dev
 			libdbus-1-dev
 			libkmod-dev"
-REQUIRED_BINARIES="	systemd
+REQUIRED_BINARIES="	hostnamectl
+			journalctl
+			localectl
+			loginctl
 			systemctl
-			systemd-ask-password
 			systemd-analyze
+			systemd-ask-password
 			systemd-cat
 			systemd-cgls
 			systemd-cgtop
-			systemd-journalctl
-			systemd-loginctl
+			systemd-coredumpctl
+			systemd-delta
+			systemd-detect-virt
+			systemd-inhibit
 			systemd-machine-id-setup
 			systemd-notify
 			systemd-nspawn
 			systemd-stdio-bridge
 			systemd-tmpfiles
 			systemd-tty-ask-password-agent
+			timedatectl
+			udevadm
 			systemd
 			systemd-ac-power
 			systemd-binfmt
+			systemd-bootchart
 			systemd-cgroups-agent
 			systemd-coredump
-			systemd-detect-virt
 			systemd-fsck
 			systemd-hostnamed
 			systemd-initctl
@@ -39,24 +46,38 @@ REQUIRED_BINARIES="	systemd
 			systemd-multi-seat-x
 			systemd-quotacheck
 			systemd-random-seed
-			systemd-readahead-collect
-			systemd-readahead-replay
-			systemd-remount-api-vfs
+			systemd-readahead
+			systemd-remount-fs
 			systemd-reply-password
 			systemd-shutdown
 			systemd-shutdownd
+			systemd-sleep
 			systemd-sysctl
 			systemd-timedated
 			systemd-timestamp
-			systemd-uaccess
+			systemd-udevd
 			systemd-update-utmp
 			systemd-user-sessions
-			systemd-vconsole-setup"
+			systemd-vconsole-setup
+			systemd-fstab-generator
+			systemd-getty-generator
+			systemd-rc-local-generator
+			systemd-system-update-generator
+			accelerometer
+			ata_id
+			cdrom_id
+			collect
+			keymap
+			mtd_probe
+			scsi_id
+			v4l_id"
 REQUIRED_DIRECTORIES="	/usr/lib
 			/usr/etc
 			/usr/include
 			/usr/share/dbus-1
 			/usr/share/polkit-1
 			/etc/dbus-1/system.d
-			/lib/udev/rules.d"
-REQUIRED_FILES="	/usr/share/systemd/kbd-model-map"
+			/usr/lib/udev/rules.d"
+REQUIRED_FILES="	/usr/share/systemd/kbd-model-map
+			/usr/lib/udev/findkeyboards
+			/usr/lib/udev/keyboard-force-release.sh"