From 851b7f736fd07d079809a1056d72b6d846997b84 Mon Sep 17 00:00:00 2001 From: Cem Keylan Date: Tue, 24 Mar 2020 17:30:14 +0300 Subject: sinit: reflect changes to carbs-init --- core/sinit/build | 11 ++--------- core/sinit/checksums | 2 -- core/sinit/files/sinit.post.shutdown | 1 - core/sinit/sources | 6 ++---- core/sinit/version | 2 +- 5 files changed, 5 insertions(+), 17 deletions(-) delete mode 100644 core/sinit/files/sinit.post.shutdown diff --git a/core/sinit/build b/core/sinit/build index e51e3f5c..f543146d 100755 --- a/core/sinit/build +++ b/core/sinit/build @@ -1,13 +1,6 @@ #!/bin/sh -e -( - cd sinit - make CFLAGS="$CFLAGS -static" PREFIX=/usr DESTDIR="$1" install -) +make CFLAGS="$CFLAGS -static" PREFIX=/usr DESTDIR="$1" install ln -s sinit "$1/usr/bin/init" -install -Dm755 poweroff "$1/usr/bin/poweroff" -install -Dm755 reboot "$1/usr/bin/reboot" - -# shellcheck disable=2086 -"${CC:-gcc}" -o "$1/usr/bin/kpow" init/bin/kpow.c $CFLAGS -static +install -Dm755 -t "$1/usr/bin" poweroff reboot diff --git a/core/sinit/checksums b/core/sinit/checksums index 4fc20a8d..44ce8cc6 100644 --- a/core/sinit/checksums +++ b/core/sinit/checksums @@ -1,6 +1,4 @@ git git+git://git.suckless.org/sinit#v1.1 -c334ec2395fab8e45800c97b2f032395262ea7e61adc2be2f3b59fd565c292d8 0.4.tar.gz 6f0f1a5f2f43b5bcfd4beaa93e1a49438d398cf758d7813bc6ba86b5156357a8 config.h f638aaa23383da584d3a56347a8e279abdc7c9c521661ef54a5bc8b955c5632b reboot 4da8b0c2771a9046a7ce2ded49beb5297045e9979796e5e4b390168286f05379 poweroff -5e2541aa672d80a8d0fcef694e4a4e74b8a0b12d415e7189228b793a4411ccd1 sinit.post.shutdown diff --git a/core/sinit/files/sinit.post.shutdown b/core/sinit/files/sinit.post.shutdown deleted file mode 100644 index 5ce4d8ec..00000000 --- a/core/sinit/files/sinit.post.shutdown +++ /dev/null @@ -1 +0,0 @@ -case "$1" in reboot) kpow r ;; poweroff) kpow p ;; esac diff --git a/core/sinit/sources b/core/sinit/sources index 321b9e88..306bbaf2 100644 --- a/core/sinit/sources +++ b/core/sinit/sources @@ -1,6 +1,4 @@ -git+git://git.suckless.org/sinit#v1.1 sinit -https://github.com/kisslinux/init/archive/0.4.tar.gz init -files/config.h sinit +git+git://git.suckless.org/sinit#v1.1 +files/config.h files/reboot files/poweroff -files/sinit.post.shutdown diff --git a/core/sinit/version b/core/sinit/version index 08ad782f..ccfcfa47 100644 --- a/core/sinit/version +++ b/core/sinit/version @@ -1 +1 @@ -1.1 2 +1.1 3 -- cgit v1.2.3