diff options
22 files changed, 48 insertions, 150 deletions
@@ -123,4 +123,8 @@ run() { initial_checks read_params $@ + +#exec 6>&1 > stdout.log +#exec 2> stderr.log + run diff --git a/remote/setup_tools b/remote/setup_tools index e12ea00d..bf1ac93e 100755 --- a/remote/setup_tools +++ b/remote/setup_tools @@ -201,7 +201,8 @@ generate_stage32 () { clean_tools() { if [ "x$1" = "x" -o "x$1" = "xall" ]; then #clean all - [ -d ${INIT_DIR} ] && rm -rf ${INIT_DIR} + [ -d ${INIT_DIR} ] && echo -n "Cleaning ${INIT_DIR}..." \ + && rm -rf ${INIT_DIR} && echo " done." for TOOL in $(ls ${TOOL_DIR}); do clean_tool $TOOL done diff --git a/remote/tools/base/base.conf b/remote/tools/base/base.conf index 72330a55..24ca5442 100644 --- a/remote/tools/base/base.conf +++ b/remote/tools/base/base.conf @@ -12,7 +12,8 @@ REQUIRED_BINARIES=" bash ldd strace blkid - modprobe" + modprobe + rsyslogd" REQUIRED_LIBRARIES=" libcap libcidn libcom_err diff --git a/remote/tools/busybox/busybox.build b/remote/tools/busybox/busybox.build index 0194bab7..050da667 100644 --- a/remote/tools/busybox/busybox.build +++ b/remote/tools/busybox/busybox.build @@ -18,7 +18,7 @@ build() { if [ ! -e .built ]; then cd src - make + make -j5 [ ! -d $TOOL_DIR/$TOOL/build/$TARGET_DIR ] && mkdir -p $TOOL_DIR/$TOOL/build/$TARGET_DIR make CONFIG_PREFIX=$TOOL_DIR/$TOOL/build/$TARGET_DIR install cd - diff --git a/remote/tools/plymouth/plymouth.build b/remote/tools/plymouth/plymouth.build index 43b0e838..fd54d876 100644 --- a/remote/tools/plymouth/plymouth.build +++ b/remote/tools/plymouth/plymouth.build @@ -25,7 +25,7 @@ build() { cd src/$VERSION ./configure --enable-systemd-integration --disable-gtk --prefix="" - make + make -j5 [ ! -d $BUILDDIR ] && mkdir -p $BUILDDIR DESTDIR=$BUILDDIR make install cd - 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/udev/data/lib/udev/rules.d/99-systemd.rules b/remote/tools/systemd/data/usr/lib/udev/rules.d/99-systemd.rules index 52377d1f..52377d1f 100644 --- a/remote/tools/udev/data/lib/udev/rules.d/99-systemd.rules +++ b/remote/tools/systemd/data/usr/lib/udev/rules.d/99-systemd.rules 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" diff --git a/remote/tools/udev/data/etc/systemd/system/basic.target.wants/udev-trigger.service b/remote/tools/udev/data/etc/systemd/system/basic.target.wants/udev-trigger.service deleted file mode 120000 index 3df21468..00000000 --- a/remote/tools/udev/data/etc/systemd/system/basic.target.wants/udev-trigger.service +++ /dev/null @@ -1 +0,0 @@ -../udev-trigger.service
\ No newline at end of file diff --git a/remote/tools/udev/data/etc/systemd/system/basic.target.wants/udev.service b/remote/tools/udev/data/etc/systemd/system/basic.target.wants/udev.service deleted file mode 120000 index d94dbc16..00000000 --- a/remote/tools/udev/data/etc/systemd/system/basic.target.wants/udev.service +++ /dev/null @@ -1 +0,0 @@ -../udev.service
\ No newline at end of file diff --git a/remote/tools/udev/data/etc/systemd/system/sockets.target.wants/udev-control.socket b/remote/tools/udev/data/etc/systemd/system/sockets.target.wants/udev-control.socket deleted file mode 120000 index 24d13e63..00000000 --- a/remote/tools/udev/data/etc/systemd/system/sockets.target.wants/udev-control.socket +++ /dev/null @@ -1 +0,0 @@ -../udev-control.socket
\ No newline at end of file diff --git a/remote/tools/udev/data/etc/systemd/system/sockets.target.wants/udev-kernel.socket b/remote/tools/udev/data/etc/systemd/system/sockets.target.wants/udev-kernel.socket deleted file mode 120000 index c12bc879..00000000 --- a/remote/tools/udev/data/etc/systemd/system/sockets.target.wants/udev-kernel.socket +++ /dev/null @@ -1 +0,0 @@ -../udev-kernel.socket
\ No newline at end of file diff --git a/remote/tools/udev/data/etc/systemd/system/udev-control.socket b/remote/tools/udev/data/etc/systemd/system/udev-control.socket deleted file mode 100644 index 858ddffd..00000000 --- a/remote/tools/udev/data/etc/systemd/system/udev-control.socket +++ /dev/null @@ -1,8 +0,0 @@ -[Unit] -Description=udev Control Socket -DefaultDependencies=no -ConditionCapability=CAP_MKNOD - -[Socket] -Service=udev.service -ListenSequentialPacket=/run/udev/control diff --git a/remote/tools/udev/data/etc/systemd/system/udev-kernel.socket b/remote/tools/udev/data/etc/systemd/system/udev-kernel.socket deleted file mode 100644 index 1c554537..00000000 --- a/remote/tools/udev/data/etc/systemd/system/udev-kernel.socket +++ /dev/null @@ -1,9 +0,0 @@ -[Unit] -Description=udev Kernel Socket -DefaultDependencies=no -ConditionCapability=CAP_MKNOD - -[Socket] -Service=udev.service -ReceiveBuffer=134217728 -ListenNetlink=kobject-uevent 1 diff --git a/remote/tools/udev/data/etc/systemd/system/udev-settle.service b/remote/tools/udev/data/etc/systemd/system/udev-settle.service deleted file mode 100644 index 5ebad476..00000000 --- a/remote/tools/udev/data/etc/systemd/system/udev-settle.service +++ /dev/null @@ -1,25 +0,0 @@ -# This service is usually not enabled by default. If enabled, it -# acts as a barrier for basic.target -- so all later services will -# wait for udev completely finishing its coldplug run. -# -# If needed, to work around broken or non-hotplug-aware services, -# it might be enabled unconditionally, or pulled-in on-demand by -# the services that assume a fully populated /dev at startup. It -# should not be used or pulled-in ever on systems without such -# legacy services running. - -[Unit] -Description=udev Wait for Complete Device Initialization -DefaultDependencies=no -Wants=udev.service -After=udev-trigger.service -Before=basic.target - -[Service] -Type=oneshot -TimeoutSec=180 -RemainAfterExit=yes -ExecStart=/sbin/udevadm settle - -[Install] -WantedBy=basic.target diff --git a/remote/tools/udev/data/etc/systemd/system/udev-trigger.service b/remote/tools/udev/data/etc/systemd/system/udev-trigger.service deleted file mode 100644 index 88ec5acc..00000000 --- a/remote/tools/udev/data/etc/systemd/system/udev-trigger.service +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=udev Coldplug all Devices -Wants=udev.service -After=udev-kernel.socket udev-control.socket -DefaultDependencies=no - -[Service] -Type=oneshot -RemainAfterExit=yes -ExecStart=/sbin/udevadm trigger --type=subsystems --action=add ; /sbin/udevadm trigger --type=devices --action=add diff --git a/remote/tools/udev/data/etc/systemd/system/udev.service b/remote/tools/udev/data/etc/systemd/system/udev.service deleted file mode 100644 index 12bb582a..00000000 --- a/remote/tools/udev/data/etc/systemd/system/udev.service +++ /dev/null @@ -1,14 +0,0 @@ -[Unit] -Description=udev Kernel Device Manager -Wants=udev-control.socket udev-kernel.socket -After=udev-control.socket udev-kernel.socket -Before=basic.target -DefaultDependencies=no -ConditionCapability=CAP_MKNOD - -[Service] -Type=notify -OOMScoreAdjust=-1000 -Sockets=udev-control.socket udev-kernel.socket -Restart=on-failure -ExecStart=/sbin/udevd diff --git a/remote/tools/udev/udev.build b/remote/tools/udev/udev.build deleted file mode 100644 index b3dc35f2..00000000 --- a/remote/tools/udev/udev.build +++ /dev/null @@ -1,35 +0,0 @@ -#!/bin/bash - -install_dependencies() { - echo "No dependencies." -} - -fetch_source() { - echo "Extracting from running system..." -} - -build() { - - BUILDDIR=$TOOL_DIR/$TOOL/build - - COPYLIST="list_dpkg_output" - [ -e $COPYLIST ] && rm $COPYLIST - - for FILE in $(dpkg -L udev | grep -v share/doc | grep -v share/man) - do - [ ! -d $FILE ] && echo $FILE >> $COPYLIST - done - - # prepare target dir & copy there - [ ! -d $BUILDDIR ] && mkdir -p $BUILDDIR - tar -cpv $(cat $COPYLIST|sort -u) | tar -xpv -C $BUILDDIR -} - -post_copy() { - - # copy custom systemd files - SYSTEMDDIR=$INIT_DIR/etc/systemd/system - [ ! -d $SYSTEMDDIR ] && mkdir -p $SYSTEMDDIR - cp -r $TOOL_DIR/$TOOL/data/* $INIT_DIR - -} diff --git a/remote/tools/udev/udev.conf b/remote/tools/udev/udev.conf deleted file mode 100644 index a0a8f5e3..00000000 --- a/remote/tools/udev/udev.conf +++ /dev/null @@ -1,20 +0,0 @@ -REQUIRED_BINARIES=" accelerometer - scsi_id - v4l_id - firmware - udev-acl - keymap - ata_id - mtd_probe - write_cd_rules - write_net_rules - pci-db - cdrom_id - usb-db - collect - udevadm - udevd" -REQUIRED_DIRECTORIES=" /etc/udev - /lib/udev" -REQUIRED_FILES=" /usr/lib/ConsoleKit/run-seat.d/udev-acl.ck - /lib/udev/findkeyboards" |