From 3e90bcf9811dd3dc5d397fbfe18d0ed84a4fac65 Mon Sep 17 00:00:00 2001 From: Cem Keylan Date: Mon, 13 Jan 2020 23:13:19 +0300 Subject: repository: move ubase and sinit to core --- extra/sinit/build | 11 ----------- extra/sinit/checksums | 7 ------- extra/sinit/depends | 2 -- extra/sinit/files/config.h | 3 --- extra/sinit/files/poweroff | 3 --- extra/sinit/files/reboot | 2 -- extra/sinit/files/sinit-launch-services.boot | 14 -------------- extra/sinit/files/sinit.post.shutdown | 16 ---------------- extra/sinit/files/sinit.pre.shutdown | 10 ---------- extra/sinit/post-install | 16 ---------------- extra/sinit/sources | 7 ------- extra/sinit/version | 1 - extra/ubase/build | 4 ---- extra/ubase/checksums | 1 - extra/ubase/sources | 1 - extra/ubase/version | 1 - 16 files changed, 99 deletions(-) delete mode 100755 extra/sinit/build delete mode 100644 extra/sinit/checksums delete mode 100644 extra/sinit/depends delete mode 100644 extra/sinit/files/config.h delete mode 100644 extra/sinit/files/poweroff delete mode 100644 extra/sinit/files/reboot delete mode 100644 extra/sinit/files/sinit-launch-services.boot delete mode 100644 extra/sinit/files/sinit.post.shutdown delete mode 100644 extra/sinit/files/sinit.pre.shutdown delete mode 100755 extra/sinit/post-install delete mode 100644 extra/sinit/sources delete mode 100644 extra/sinit/version delete mode 100755 extra/ubase/build delete mode 100644 extra/ubase/checksums delete mode 100644 extra/ubase/sources delete mode 100644 extra/ubase/version (limited to 'extra') diff --git a/extra/sinit/build b/extra/sinit/build deleted file mode 100755 index 182d70cf..00000000 --- a/extra/sinit/build +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh -e - -make CFLAGS="$CFLAGS -static" PREFIX=/usr DESTDIR="$1" install -mv "$1/usr/bin/sinit" "$1/usr/bin/init" - -install -Dm755 poweroff "$1/usr/bin/poweroff" -install -Dm755 reboot "$1/usr/bin/reboot" - -install -Dm644 sinit-launch-services.boot "$1/etc/init/sinit-launch-services.boot" -install -Dm644 sinit.post.shutdown "$1/etc/init/sinit.post.shutdown" -install -Dm644 sinit.pre.shutdown "$1/etc/init/sinit.pre.shutdown" diff --git a/extra/sinit/checksums b/extra/sinit/checksums deleted file mode 100644 index 56f24244..00000000 --- a/extra/sinit/checksums +++ /dev/null @@ -1,7 +0,0 @@ -aaccd0515070545174bf962c462686e7719c02c68004bd0b350b98b4c78a90ba sinit-1.1.tar.gz -6f0f1a5f2f43b5bcfd4beaa93e1a49438d398cf758d7813bc6ba86b5156357a8 config.h -f638aaa23383da584d3a56347a8e279abdc7c9c521661ef54a5bc8b955c5632b reboot -d21a020d7cdb6a328962adac7cc1a8701a413c1dfabd40ac00bf7dc212fa29d1 poweroff -93f3b06594447598af207f44f2dde126f05724fde0a405bd15dd0f446ff26c6f sinit-launch-services.boot -2ea497694bbf778a05bbece13bac32c8d8c0be36469fe80ccee32c1501fbb392 sinit.pre.shutdown -2c161e2c97366e12c7994f832ee96f293485e6dd398a66070f8bd35949beb8e1 sinit.post.shutdown diff --git a/extra/sinit/depends b/extra/sinit/depends deleted file mode 100644 index 6ab349da..00000000 --- a/extra/sinit/depends +++ /dev/null @@ -1,2 +0,0 @@ -carbs-init -ubase diff --git a/extra/sinit/files/config.h b/extra/sinit/files/config.h deleted file mode 100644 index dca21e3f..00000000 --- a/extra/sinit/files/config.h +++ /dev/null @@ -1,3 +0,0 @@ -static char *const rcinitcmd[] = { "/usr/lib/init/rc.boot", NULL }; -static char *const rcrebootcmd[] = { "/usr/lib/init/rc.shutdown", "reboot", NULL }; -static char *const rcpoweroffcmd[] = { "/usr/lib/init/rc.shutdown", "poweroff", NULL }; diff --git a/extra/sinit/files/poweroff b/extra/sinit/files/poweroff deleted file mode 100644 index 69e8f9a4..00000000 --- a/extra/sinit/files/poweroff +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -/bin/kill -s USR1 1 diff --git a/extra/sinit/files/reboot b/extra/sinit/files/reboot deleted file mode 100644 index 266afb92..00000000 --- a/extra/sinit/files/reboot +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -/bin/kill -s INT 1 diff --git a/extra/sinit/files/sinit-launch-services.boot b/extra/sinit/files/sinit-launch-services.boot deleted file mode 100644 index 4d4fad6a..00000000 --- a/extra/sinit/files/sinit-launch-services.boot +++ /dev/null @@ -1,14 +0,0 @@ -# we are going to start runit and getty here - -sinit_run_getty() { - for getty in 1 2 3 4 5 6; do - ubase-box respawn /sbin/getty 38400 tty${getty} 2>&1 & - done -} - -sinit_runit() { - ubase-box respawn /usr/bin/runsvdir -P /var/service & -} - -[ "$SINIT_ENABLE_GETTY" = 1 ] && sinit_run_getty -[ "$SINIT_ENABLE_RUNIT" = 1 ] && sinit_runit diff --git a/extra/sinit/files/sinit.post.shutdown b/extra/sinit/files/sinit.post.shutdown deleted file mode 100644 index 16deba74..00000000 --- a/extra/sinit/files/sinit.post.shutdown +++ /dev/null @@ -1,16 +0,0 @@ -# vim:filetype=sh - -# We handle the shutdown from here - -if [ "$SINIT_SHUTDOWN_HOOKS" = 1 ]; then - case "$1" in - reboot) - out "Requesting system reboot..." - /usr/bin/ubase-box halt -r - ;; - poweroff) - out "Requesting system poweroff..." - /usr/bin/ubase-box halt -p - ;; - esac -fi diff --git a/extra/sinit/files/sinit.pre.shutdown b/extra/sinit/files/sinit.pre.shutdown deleted file mode 100644 index af0d6f4f..00000000 --- a/extra/sinit/files/sinit.pre.shutdown +++ /dev/null @@ -1,10 +0,0 @@ -if [ "$SINIT_SHUTDOWN_HOOKS" = 1 ]; then - case "$1" in - reboot|poweroff) - ;; - *) - echo "Invalid action '$1' for rc.shutdown" 1>&2 - exit 1 - ;; - esac -fi diff --git a/extra/sinit/post-install b/extra/sinit/post-install deleted file mode 100755 index f9c906f2..00000000 --- a/extra/sinit/post-install +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/sh -e - -grep -q SINIT_ /etc/init/rc.conf || cat <> /etc/init/rc.conf - -# Uncomment these to run the scripts for sinit -# SINIT_SHUTDOWN_HOOKS=1 -# SINIT_ENABLE_GETTY=1 -# SINIT_ENABLE_RUNIT=1 -EOF - -cat <