reworked setup-tools, generation of base dir structure of stage3.2 with tool named base

4 files changed, 135 insertions, 299 deletions

diff --git a/remote/tools/systemd/build.systemd b/remote/tools/systemd/build.systemd
deleted file mode 100644
index af57f8da..00000000
--- a/remote/tools/systemd/build.systemd
+++ /dev/null
@@ -1,33 +0,0 @@
-#tool/distro specific functions for fetching, building and installing dependencies
-
-fetch_source ()
-{
-  if [ ! -e .fetched_source ]; then
- 		[ ! -d src ] && mkdir src
-		wget $URL
-    tar xJf $VERSION.tar.xz -C src/
-    rm $VERSION.tar.xz
-    touch .fetched_source
-  fi
-}	
-
-install_dependencies()
-{
-	# quick fix for missing libkmod repo...
-	add-apt-repository --force-yes ppa:pitti/systemd
-	apt-get update --force-yes
-	apt-get install --force-yes $DEPS
-}
-
-build ()
-{
-	if [ ! -e .built ]; then
-		cd src/$VERSION
-		./configure --disable-manpages
-		make
-		[ ! -d $TOOL_DIR/$TOOL/build ] && mkdir -p $TOOL_DIR/$TOOL/build
-		DESTDIR=$TOOL_DIR/$TOOL/build make install
-		cd -
-    touch .built
-  fi
-}
diff --git a/remote/tools/systemd/data/debug-shell.service b/remote/tools/systemd/data/debug-shell.service
new file mode 100644
index 00000000..2aa98d3c
--- /dev/null
+++ b/remote/tools/systemd/data/debug-shell.service
@@ -0,0 +1,33 @@
+#  This file is part of systemd.
+#
+#  systemd is free software; you can redistribute it and/or modify it
+#  under the terms of the GNU Lesser General Public License as published by
+#  the Free Software Foundation; either version 2.1 of the License, or
+#  (at your option) any later version.
+
+[Unit]
+Description=Early root shell on tty9 FOR DEBUGGING ONLY
+Documentation=man:sushell(8)
+DefaultDependencies=no
+IgnoreOnIsolate=yes
+
+[Service]
+Environment=TERM=linux
+ExecStart=@sushell@
+Restart=always
+RestartSec=0
+StandardInput=tty
+TTYPath=/dev/tty9
+TTYReset=yes
+TTYVHangup=yes
+KillMode=process
+IgnoreSIGPIPE=no
+# bash ignores SIGTERM
+KillSignal=SIGHUP
+
+# Unset locale for the console getty since the console has problems
+# displaying some internationalized messages.
+Environment=LANG= LANGUAGE= LC_CTYPE= LC_NUMERIC= LC_TIME= LC_COLLATE= LC_MONETARY= LC_MESSAGES= LC_PAPER= LC_NAME= LC_ADDRESS= LC_TELEPHONE= LC_MEASUREMENT= LC_IDENTIFICATION=
+
+[Install]
+WantedBy=sysinit.target
diff --git a/remote/tools/systemd/systemd.build b/remote/tools/systemd/systemd.build
new file mode 100644
index 00000000..5b361472
--- /dev/null
+++ b/remote/tools/systemd/systemd.build
@@ -0,0 +1,42 @@
+#tool/distro specific functions for fetching, building and installing dependencies
+
+fetch_source () {
+	if [ ! -e .fetched_source ]; then
+ 		[ ! -d src ] && mkdir src
+		wget $URL
+		tar xJf $VERSION.tar.xz -C src/
+		rm $VERSION.tar.xz
+		touch .fetched_source
+	fi
+}	
+
+install_dependencies() {
+	# quick fix for missing libkmod repo...
+	add-apt-repository --yes ppa:pitti/systemd
+	apt-get update --force-yes
+	apt-get install --force-yes $DEPS
+}
+
+build () {
+	if [ ! -e .built ]; then
+		cd src/$VERSION
+		./configure --disable-manpages
+		make
+		[ ! -d $TOOL_DIR/$TOOL/build ] && mkdir -p $TOOL_DIR/$TOOL/build
+		DESTDIR=$TOOL_DIR/$TOOL/build make install
+		cd -
+	touch .built
+	fi
+}
+
+post_copy() {
+        #debug shell on tty9
+	cp $TOOL_DIR/$TOOL/data/debug-shell.service $INIT_DIR/usr/lib/systemd/system
+	ln -s ../debug-shell.service $INIT_DIR/usr/lib/systemd/system/sysinit.target.wants
+
+	# dont clear systemd log at startup
+	sed -i.bak "s/ExecStart=-\/sbin\/agetty %I 38400/ExecStart=-\/sbin\/agetty --noclear %I 38400/g" \
+        	$INIT_DIR/usr/lib/systemd/system/getty@.service
+	sed -i.bak "s/TTYVTDisallocate=yes/TTYVTDisallocate=no/g" \
+        	$INIT_DIR/usr/lib/systemd/system/getty@.service
+}
diff --git a/remote/tools/systemd/systemd.conf b/remote/tools/systemd/systemd.conf
index 0bcd18eb..e4effae2 100644
--- a/remote/tools/systemd/systemd.conf
+++ b/remote/tools/systemd/systemd.conf
@@ -1,268 +1,62 @@
 VERSION=systemd-43
 URL=http://www.freedesktop.org/software/systemd/${VERSION}.tar.xz
-DEPS="intltool gperf libcap-dev dbus libudev-dev pkg-config libdbus-1-dev libkmod-dev"
-REQUIRED_BINARIES="systemd
-systemctl
-systemd-ask-password
-systemd-analyze
-systemd-cat
-systemd-cgls
-systemd-cgtop
-systemd-journalctl
-systemd-loginctl
-systemd-machine-id-setup
-systemd-notify
-systemd-nspawn
-systemd-stdio-bridge
-systemd-tmpfiles
-systemd-tty-ask-password-agent
-systemd
-systemd-ac-power
-systemd-binfmt
-systemd-cgroups-agent
-systemd-coredump
-systemd-detect-virt
-systemd-fsck
-systemd-hostnamed
-systemd-initctl
-systemd-journald
-systemd-localed
-systemd-logind
-systemd-modules-load
-systemd-multi-seat-x
-systemd-quotacheck
-systemd-random-seed
-systemd-readahead-collect
-systemd-readahead-replay
-systemd-remount-api-vfs
-systemd-reply-password
-systemd-shutdown
-systemd-shutdownd
-systemd-sysctl
-systemd-timedated
-systemd-timestamp
-systemd-uaccess
-systemd-update-utmp
-systemd-user-sessions
-systemd-vconsole-setup"
-REQUIRED_FILES="org.freedesktop.hostname1.conf
-org.freedesktop.locale1.conf
-org.freedesktop.login1.conf
-org.freedesktop.systemd1.conf
-org.freedesktop.timedate1.conf
-70-uaccess.rules
-71-seat.rules
-73-seat-late.rules
-99-systemd.rules
-system.conf
-systemd-journald.conf
-systemd-bash-completion.sh
-system.conf
-systemd-journald.conf
-systemd-logind.conf
-user.conf
-getty@tty1.service
-remote-fs.target
-user
-sd-daemon.h
-sd-id128.h
-sd-journal.h
-sd-login.h
-sd-messages.h
-coredump.conf
-autovt@.service
-basic.target
-bluetooth.target
-console-shell.service
-ctrl-alt-del.target
-dbus-org.freedesktop.hostname1.service
-dbus-org.freedesktop.locale1.service
-dbus-org.freedesktop.login1.service
-dbus-org.freedesktop.timedate1.service
-default.target
-dev-hugepages.mount
-dev-mqueue.mount
-emergency.service
-emergency.target
-final.target
-fsck-root.service
-fsck@.service
-getty@.service
-getty.target
-graphical.target
-halt.service
-halt.target
-http-daemon.target
-kexec.service
-kexec.target
-local-fs-pre.target
-local-fs.target
-mail-transfer-agent.target
-media.mount
-multi-user.target
-network.target
-nss-lookup.target
-poweroff.service
-poweroff.target
-printer.target
-proc-sys-fs-binfmt_misc.automount
-proc-sys-fs-binfmt_misc.mount
-quotacheck.service
-quotaon.service
-reboot.service
-reboot.target
-remote-fs-pre.target
-remote-fs.target
-remount-rootfs.service
-rescue.service
-rescue.target
-rpcbind.target
-runlevel0.target
-runlevel1.target
-runlevel2.target
-runlevel3.target
-runlevel4.target
-runlevel5.target
-runlevel6.target
-serial-getty@.service
-shutdown.target
-sigpwr.target
-smartcard.target
-sockets.target
-sound.target
-swap.target
-sys-fs-fuse-connections.mount
-sysinit.target
-sys-kernel-config.mount
-sys-kernel-debug.mount
-sys-kernel-security.mount
-syslog.socket
-syslog.target
-systemd-ask-password-console.path
-systemd-ask-password-console.service
-systemd-ask-password-wall.path
-systemd-ask-password-wall.service
-systemd-binfmt.service
-systemd-hostnamed.service
-systemd-initctl.service
-systemd-initctl.socket
-systemd-journald.service
-systemd-journald.socket
-systemd-localed.service
-systemd-logind.service
-systemd-modules-load.service
-systemd-random-seed-load.service
-systemd-random-seed-save.service
-systemd-readahead-collect.service
-systemd-readahead-done.service
-systemd-readahead-done.timer
-systemd-readahead-replay.service
-systemd-remount-api-vfs.service
-systemd-shutdownd.service
-systemd-shutdownd.socket
-systemd-sysctl.service
-systemd-timedated.service
-systemd-tmpfiles-clean.service
-systemd-tmpfiles-clean.timer
-systemd-tmpfiles-setup.service
-systemd-update-utmp-runlevel.service
-systemd-update-utmp-shutdown.service
-systemd-user-sessions.service
-systemd-vconsole-setup.service
-time-sync.target
-umount.target
-user@.service
-var-lock.mount
-var-run.mount
-systemd-tmpfiles-clean.timer
-fsck-root.service
-media.mount
-remount-rootfs.service
-systemd-remount-api-vfs.service
-var-lock.mount
-var-run.mount
-getty.target
-systemd-ask-password-wall.path
-systemd-logind.service
-systemd-user-sessions.service
-systemd-update-utmp-runlevel.service
-systemd-update-utmp-runlevel.service
-systemd-update-utmp-runlevel.service
-systemd-update-utmp-runlevel.service
-systemd-update-utmp-runlevel.service
-systemd-random-seed-save.service
-systemd-update-utmp-shutdown.service
-systemd-initctl.socket
-systemd-journald.socket
-systemd-shutdownd.socket
-dev-hugepages.mount
-dev-mqueue.mount
-proc-sys-fs-binfmt_misc.automount
-sys-fs-fuse-connections.mount
-sys-kernel-config.mount
-sys-kernel-debug.mount
-sys-kernel-security.mount
-systemd-ask-password-console.path
-systemd-binfmt.service
-systemd-journald.service
-systemd-modules-load.service
-systemd-random-seed-load.service
-systemd-sysctl.service
-systemd-tmpfiles-setup.service
-systemd-vconsole-setup.service
-bluetooth.target
-default.target
-exit.service
-exit.target
-printer.target
-shutdown.target
-sockets.target
-sound.target
-legacy.conf
-systemd.conf
-tmp.conf
-x11.conf
-org.freedesktop.hostname1.xml
-org.freedesktop.locale1.xml
-org.freedesktop.systemd1.Automount.xml
-org.freedesktop.systemd1.Device.xml
-org.freedesktop.systemd1.Job.xml
-org.freedesktop.systemd1.Manager.xml
-org.freedesktop.systemd1.Mount.xml
-org.freedesktop.systemd1.Path.xml
-org.freedesktop.systemd1.Service.xml
-org.freedesktop.systemd1.Snapshot.xml
-org.freedesktop.systemd1.Socket.xml
-org.freedesktop.systemd1.Swap.xml
-org.freedesktop.systemd1.Target.xml
-org.freedesktop.systemd1.Timer.xml
-org.freedesktop.systemd1.Unit.xml
-org.freedesktop.timedate1.xml
-org.freedesktop.systemd1.service
-org.freedesktop.hostname1.service
-org.freedesktop.locale1.service
-org.freedesktop.login1.service
-org.freedesktop.systemd1.service
-org.freedesktop.timedate1.service
-org.freedesktop.hostname1.policy
-org.freedesktop.locale1.policy
-org.freedesktop.login1.policy
-org.freedesktop.systemd1.policy
-org.freedesktop.timedate1.policy
-kbd-model-map
-libsystemd-daemon.la
-libsystemd-daemon.so
-libsystemd-daemon.so.0
-libsystemd-daemon.so.0.0.1
-libsystemd-id128.la
-libsystemd-id128.so
-libsystemd-id128.so.0
-libsystemd-id128.so.0.0.2
-libsystemd-journal.la
-libsystemd-journal.so
-libsystemd-journal.so.0
-libsystemd-journal.so.0.0.2
-libsystemd-login.la
-libsystemd-login.so
-libsystemd-login.so.0
-libsystemd-login.so.0.2.0"
+DEPS="			intltool
+			gperf
+			dbus
+			pkg-config
+			libcap-dev
+			libudev-dev
+			libdbus-1-dev
+			libkmod-dev"
+REQUIRED_BINARIES="	systemd
+			systemctl
+			systemd-ask-password
+			systemd-analyze
+			systemd-cat
+			systemd-cgls
+			systemd-cgtop
+			systemd-journalctl
+			systemd-loginctl
+			systemd-machine-id-setup
+			systemd-notify
+			systemd-nspawn
+			systemd-stdio-bridge
+			systemd-tmpfiles
+			systemd-tty-ask-password-agent
+			systemd
+			systemd-ac-power
+			systemd-binfmt
+			systemd-cgroups-agent
+			systemd-coredump
+			systemd-detect-virt
+			systemd-fsck
+			systemd-hostnamed
+			systemd-initctl
+			systemd-journald
+			systemd-localed
+			systemd-logind
+			systemd-modules-load
+			systemd-multi-seat-x
+			systemd-quotacheck
+			systemd-random-seed
+			systemd-readahead-collect
+			systemd-readahead-replay
+			systemd-remount-api-vfs
+			systemd-reply-password
+			systemd-shutdown
+			systemd-shutdownd
+			systemd-sysctl
+			systemd-timedated
+			systemd-timestamp
+			systemd-uaccess
+			systemd-update-utmp
+			systemd-user-sessions
+			systemd-vconsole-setup"
+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"