* Re: [PR PATCH] [Updated] [nomerge] New package: boot-66serv-2.1.0
[not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-23122@inbox.vuxu.org>
@ 2020-07-04 20:07 ` teldra
2020-07-05 8:21 ` teldra
` (3 subsequent siblings)
4 siblings, 0 replies; 5+ messages in thread
From: teldra @ 2020-07-04 20:07 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 391 bytes --]
There is an updated pull request by teldra against master on the void-packages repository
https://github.com/teldra/void-packages 66-boot
https://github.com/void-linux/void-packages/pull/23122
[nomerge] New package: boot-66serv-2.1.0
based on https://github.com/void-linux/void-packages/pull/21142
A patch file from https://github.com/void-linux/void-packages/pull/23122.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-66-boot-23122.patch --]
[-- Type: text/x-diff, Size: 4544 bytes --]
From 314de1ad0d0fe45b327a11f81d24dcb1a4117a54 Mon Sep 17 00:00:00 2001
From: teldra <teldra@rotce.de>
Date: Mon, 22 Jun 2020 01:43:05 +0200
Subject: [PATCH] New package: boot-66serv-2.1.0
based on https://github.com/void-linux/void-packages/pull/21142
---
srcpkgs/66-service-dbus | 1 +
srcpkgs/boot-66serv/files/66 | 2 ++
srcpkgs/boot-66serv/files/runit | 16 +++++++++++++
srcpkgs/boot-66serv/files/switch-initutils | 21 ++++++++++++++++
srcpkgs/boot-66serv/files/tty@ | 12 ++++++++++
srcpkgs/boot-66serv/template | 28 ++++++++++++++++++++++
6 files changed, 80 insertions(+)
create mode 120000 srcpkgs/66-service-dbus
create mode 100644 srcpkgs/boot-66serv/files/66
create mode 100644 srcpkgs/boot-66serv/files/runit
create mode 100755 srcpkgs/boot-66serv/files/switch-initutils
create mode 100644 srcpkgs/boot-66serv/files/tty@
create mode 100644 srcpkgs/boot-66serv/template
diff --git a/srcpkgs/66-service-dbus b/srcpkgs/66-service-dbus
new file mode 120000
index 00000000000..36e616293b3
--- /dev/null
+++ b/srcpkgs/66-service-dbus
@@ -0,0 +1 @@
+boot-66serv
\ No newline at end of file
diff --git a/srcpkgs/boot-66serv/files/66 b/srcpkgs/boot-66serv/files/66
new file mode 100644
index 00000000000..c82ece19fc5
--- /dev/null
+++ b/srcpkgs/boot-66serv/files/66
@@ -0,0 +1,2 @@
+#!/usr/bin/execlineb -P
+66-boot -b "Booting Voidlinux" -m
diff --git a/srcpkgs/boot-66serv/files/runit b/srcpkgs/boot-66serv/files/runit
new file mode 100644
index 00000000000..429b2ff9cd5
--- /dev/null
+++ b/srcpkgs/boot-66serv/files/runit
@@ -0,0 +1,16 @@
+[main]
+@type = longrun
+@version = @VERSION@
+@description = "runit"
+@user = (root)
+@options = ( log )
+
+[start]
+@execute = ( /etc/runit/2 )
+
+[stop]
+@execute = ( exec-cmdline -s { sv force-stop /var/service/*; sv exit /var/service/* } )
+
+[logger]
+@backup = 3
+@maxsize = 1000000
\ No newline at end of file
diff --git a/srcpkgs/boot-66serv/files/switch-initutils b/srcpkgs/boot-66serv/files/switch-initutils
new file mode 100755
index 00000000000..93f19f0ae93
--- /dev/null
+++ b/srcpkgs/boot-66serv/files/switch-initutils
@@ -0,0 +1,21 @@
+# This service automatically moves
+# /usr/bin/{reboot,poweroff,halt,shutdown}
+# so that if started with 66, users can shutdown etc. with it.
+# It automatically moves everything back if started with
+# runit again.
+
+if grep -q "init=/usr/bin/66" /proc/cmdline; then
+ for i in reboot poweroff halt shutdown; do
+ if ! test -e /usr/bin/${i}.runit; then
+ mv /usr/bin/${i} /usr/bin/${i}.runit
+ ln -s /etc/66/${i} /usr/bin/${i}
+ fi
+ done
+else
+ for i in reboot poweroff halt shutdown; do
+ if test -e /usr/bin/${i}.runit; then
+ rm /usr/bin/${i}
+ mv /usr/bin/${i}.runit /usr/bin/${i}
+ fi
+ done
+fi
\ No newline at end of file
diff --git a/srcpkgs/boot-66serv/files/tty@ b/srcpkgs/boot-66serv/files/tty@
new file mode 100644
index 00000000000..7b72f625d84
--- /dev/null
+++ b/srcpkgs/boot-66serv/files/tty@
@@ -0,0 +1,12 @@
+[main]
+@type = classic
+@version = @VERSION@
+@description = "Launch @I"
+@user = ( root )
+@options = ( env )
+
+[start]
+@execute = ( execl-cmdline -s { agetty ${cmd_args} @I } )
+
+[environment]
+cmd_args=!-J 38400
diff --git a/srcpkgs/boot-66serv/template b/srcpkgs/boot-66serv/template
new file mode 100644
index 00000000000..77f56c0f8e5
--- /dev/null
+++ b/srcpkgs/boot-66serv/template
@@ -0,0 +1,28 @@
+# Template file for 'boot-66serv'
+pkgname=boot-66serv
+version=2.1.0
+revision=1
+archs="noarch"
+wrksrc=${pkgname}-v${version}
+build_style=gnu-configure
+configure_args="--HOSTNAME=voidlinux --TTY=!4
+ --KEYMAP=!us --TZ=Europe/Madrid --CRYPTTAB=!yes"
+makedepends="file"
+depends="s6 s6-rc s6-linux-utils s6-portable-utils 66 66-tools"
+short_desc="Stage 1 boot for 66"
+maintainer="teldra <teldra@rotce.de>"
+license="ISC"
+homepage="https://framagit.org/Obarun/boot-66serv"
+distfiles="https://framagit.org/Obarun/${pkgname}/-/archive/v${version}/${pkgname}-v${version}.tar.gz"
+checksum=6cf417a7eb5bcac152480f9a76711b06289ae672d1da7d36dc8186a6eef04235
+conf_files="/etc/66/rc.local"
+
+post_install() {
+ vinstall ${FILESDIR}/switch-initutils 644 etc/runit/core-services 99-switch-initutils.sh
+ vbin ${FILESDIR}/66
+ vlicense LICENSE
+ vinstall ${FILESDIR}/tty@ 644 usr/share/66/service/
+ vsed -i "s/@VERSION@/${version}/" "${DESTDIR}/usr/share/66/service/tty@"
+ vinstall ${FILESDIR}/runit 644 usr/share/66/service/
+ vsed -i "s/@VERSION@/${version}/" "${DESTDIR}/usr/share/66/service/runit"
+}
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PR PATCH] [Updated] [nomerge] New package: boot-66serv-2.1.0
[not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-23122@inbox.vuxu.org>
2020-07-04 20:07 ` [PR PATCH] [Updated] [nomerge] New package: boot-66serv-2.1.0 teldra
@ 2020-07-05 8:21 ` teldra
2020-07-05 8:21 ` teldra
` (2 subsequent siblings)
4 siblings, 0 replies; 5+ messages in thread
From: teldra @ 2020-07-05 8:21 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 391 bytes --]
There is an updated pull request by teldra against master on the void-packages repository
https://github.com/teldra/void-packages 66-boot
https://github.com/void-linux/void-packages/pull/23122
[nomerge] New package: boot-66serv-2.1.0
based on https://github.com/void-linux/void-packages/pull/21142
A patch file from https://github.com/void-linux/void-packages/pull/23122.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-66-boot-23122.patch --]
[-- Type: text/x-diff, Size: 4578 bytes --]
From c6a22d75c25a136fd15763c4d02955d7fc64a5b4 Mon Sep 17 00:00:00 2001
From: teldra <teldra@rotce.de>
Date: Mon, 22 Jun 2020 01:43:05 +0200
Subject: [PATCH] New package: boot-66serv-2.1.0
based on https://github.com/void-linux/void-packages/pull/21142
---
srcpkgs/66-service-dbus | 1 +
srcpkgs/boot-66serv/files/66 | 2 ++
srcpkgs/boot-66serv/files/runit | 16 +++++++++++++
srcpkgs/boot-66serv/files/switch-initutils | 22 +++++++++++++++++
srcpkgs/boot-66serv/files/tty@ | 12 ++++++++++
srcpkgs/boot-66serv/template | 28 ++++++++++++++++++++++
6 files changed, 81 insertions(+)
create mode 120000 srcpkgs/66-service-dbus
create mode 100644 srcpkgs/boot-66serv/files/66
create mode 100644 srcpkgs/boot-66serv/files/runit
create mode 100755 srcpkgs/boot-66serv/files/switch-initutils
create mode 100644 srcpkgs/boot-66serv/files/tty@
create mode 100644 srcpkgs/boot-66serv/template
diff --git a/srcpkgs/66-service-dbus b/srcpkgs/66-service-dbus
new file mode 120000
index 00000000000..36e616293b3
--- /dev/null
+++ b/srcpkgs/66-service-dbus
@@ -0,0 +1 @@
+boot-66serv
\ No newline at end of file
diff --git a/srcpkgs/boot-66serv/files/66 b/srcpkgs/boot-66serv/files/66
new file mode 100644
index 00000000000..c82ece19fc5
--- /dev/null
+++ b/srcpkgs/boot-66serv/files/66
@@ -0,0 +1,2 @@
+#!/usr/bin/execlineb -P
+66-boot -b "Booting Voidlinux" -m
diff --git a/srcpkgs/boot-66serv/files/runit b/srcpkgs/boot-66serv/files/runit
new file mode 100644
index 00000000000..429b2ff9cd5
--- /dev/null
+++ b/srcpkgs/boot-66serv/files/runit
@@ -0,0 +1,16 @@
+[main]
+@type = longrun
+@version = @VERSION@
+@description = "runit"
+@user = (root)
+@options = ( log )
+
+[start]
+@execute = ( /etc/runit/2 )
+
+[stop]
+@execute = ( exec-cmdline -s { sv force-stop /var/service/*; sv exit /var/service/* } )
+
+[logger]
+@backup = 3
+@maxsize = 1000000
\ No newline at end of file
diff --git a/srcpkgs/boot-66serv/files/switch-initutils b/srcpkgs/boot-66serv/files/switch-initutils
new file mode 100755
index 00000000000..5c22850096e
--- /dev/null
+++ b/srcpkgs/boot-66serv/files/switch-initutils
@@ -0,0 +1,22 @@
+# This service automatically moves
+# /usr/bin/{reboot,poweroff,halt,shutdown}
+# so that if started with 66, users can shutdown etc. with it.
+# It automatically moves everything back if started with
+# runit again.
+# This is run from runit and 66
+
+if grep -q "init=/usr/bin/66" /proc/cmdline; then
+ for i in reboot poweroff halt shutdown; do
+ if ! test -e /usr/bin/${i}.runit; then
+ mv /usr/bin/${i} /usr/bin/${i}.runit
+ ln -s /etc/66/${i} /usr/bin/${i}
+ fi
+ done
+else
+ for i in reboot poweroff halt shutdown; do
+ if test -e /usr/bin/${i}.runit; then
+ rm /usr/bin/${i}
+ mv /usr/bin/${i}.runit /usr/bin/${i}
+ fi
+ done
+fi
\ No newline at end of file
diff --git a/srcpkgs/boot-66serv/files/tty@ b/srcpkgs/boot-66serv/files/tty@
new file mode 100644
index 00000000000..7b72f625d84
--- /dev/null
+++ b/srcpkgs/boot-66serv/files/tty@
@@ -0,0 +1,12 @@
+[main]
+@type = classic
+@version = @VERSION@
+@description = "Launch @I"
+@user = ( root )
+@options = ( env )
+
+[start]
+@execute = ( execl-cmdline -s { agetty ${cmd_args} @I } )
+
+[environment]
+cmd_args=!-J 38400
diff --git a/srcpkgs/boot-66serv/template b/srcpkgs/boot-66serv/template
new file mode 100644
index 00000000000..77f56c0f8e5
--- /dev/null
+++ b/srcpkgs/boot-66serv/template
@@ -0,0 +1,28 @@
+# Template file for 'boot-66serv'
+pkgname=boot-66serv
+version=2.1.0
+revision=1
+archs="noarch"
+wrksrc=${pkgname}-v${version}
+build_style=gnu-configure
+configure_args="--HOSTNAME=voidlinux --TTY=!4
+ --KEYMAP=!us --TZ=Europe/Madrid --CRYPTTAB=!yes"
+makedepends="file"
+depends="s6 s6-rc s6-linux-utils s6-portable-utils 66 66-tools"
+short_desc="Stage 1 boot for 66"
+maintainer="teldra <teldra@rotce.de>"
+license="ISC"
+homepage="https://framagit.org/Obarun/boot-66serv"
+distfiles="https://framagit.org/Obarun/${pkgname}/-/archive/v${version}/${pkgname}-v${version}.tar.gz"
+checksum=6cf417a7eb5bcac152480f9a76711b06289ae672d1da7d36dc8186a6eef04235
+conf_files="/etc/66/rc.local"
+
+post_install() {
+ vinstall ${FILESDIR}/switch-initutils 644 etc/runit/core-services 99-switch-initutils.sh
+ vbin ${FILESDIR}/66
+ vlicense LICENSE
+ vinstall ${FILESDIR}/tty@ 644 usr/share/66/service/
+ vsed -i "s/@VERSION@/${version}/" "${DESTDIR}/usr/share/66/service/tty@"
+ vinstall ${FILESDIR}/runit 644 usr/share/66/service/
+ vsed -i "s/@VERSION@/${version}/" "${DESTDIR}/usr/share/66/service/runit"
+}
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PR PATCH] [Updated] [nomerge] New package: boot-66serv-2.1.0
[not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-23122@inbox.vuxu.org>
2020-07-04 20:07 ` [PR PATCH] [Updated] [nomerge] New package: boot-66serv-2.1.0 teldra
2020-07-05 8:21 ` teldra
@ 2020-07-05 8:21 ` teldra
2020-07-06 16:23 ` teldra
2020-07-06 16:25 ` teldra
4 siblings, 0 replies; 5+ messages in thread
From: teldra @ 2020-07-05 8:21 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 391 bytes --]
There is an updated pull request by teldra against master on the void-packages repository
https://github.com/teldra/void-packages 66-boot
https://github.com/void-linux/void-packages/pull/23122
[nomerge] New package: boot-66serv-2.1.0
based on https://github.com/void-linux/void-packages/pull/21142
A patch file from https://github.com/void-linux/void-packages/pull/23122.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-66-boot-23122.patch --]
[-- Type: text/x-diff, Size: 4576 bytes --]
From ae79fec3c0c3aa3cb6c9c81b003c2973180c212c Mon Sep 17 00:00:00 2001
From: teldra <teldra@rotce.de>
Date: Mon, 22 Jun 2020 01:43:05 +0200
Subject: [PATCH] New package: boot-66serv-2.1.0
based on https://github.com/void-linux/void-packages/pull/21142
---
srcpkgs/66-service-dbus | 1 +
srcpkgs/boot-66serv/files/66 | 2 ++
srcpkgs/boot-66serv/files/runit | 16 +++++++++++++
srcpkgs/boot-66serv/files/switch-initutils | 22 +++++++++++++++++
srcpkgs/boot-66serv/files/tty@ | 12 ++++++++++
srcpkgs/boot-66serv/template | 28 ++++++++++++++++++++++
6 files changed, 81 insertions(+)
create mode 120000 srcpkgs/66-service-dbus
create mode 100644 srcpkgs/boot-66serv/files/66
create mode 100644 srcpkgs/boot-66serv/files/runit
create mode 100755 srcpkgs/boot-66serv/files/switch-initutils
create mode 100644 srcpkgs/boot-66serv/files/tty@
create mode 100644 srcpkgs/boot-66serv/template
diff --git a/srcpkgs/66-service-dbus b/srcpkgs/66-service-dbus
new file mode 120000
index 00000000000..36e616293b3
--- /dev/null
+++ b/srcpkgs/66-service-dbus
@@ -0,0 +1 @@
+boot-66serv
\ No newline at end of file
diff --git a/srcpkgs/boot-66serv/files/66 b/srcpkgs/boot-66serv/files/66
new file mode 100644
index 00000000000..c82ece19fc5
--- /dev/null
+++ b/srcpkgs/boot-66serv/files/66
@@ -0,0 +1,2 @@
+#!/usr/bin/execlineb -P
+66-boot -b "Booting Voidlinux" -m
diff --git a/srcpkgs/boot-66serv/files/runit b/srcpkgs/boot-66serv/files/runit
new file mode 100644
index 00000000000..429b2ff9cd5
--- /dev/null
+++ b/srcpkgs/boot-66serv/files/runit
@@ -0,0 +1,16 @@
+[main]
+@type = longrun
+@version = @VERSION@
+@description = "runit"
+@user = (root)
+@options = ( log )
+
+[start]
+@execute = ( /etc/runit/2 )
+
+[stop]
+@execute = ( exec-cmdline -s { sv force-stop /var/service/*; sv exit /var/service/* } )
+
+[logger]
+@backup = 3
+@maxsize = 1000000
\ No newline at end of file
diff --git a/srcpkgs/boot-66serv/files/switch-initutils b/srcpkgs/boot-66serv/files/switch-initutils
new file mode 100755
index 00000000000..0229a2ff36c
--- /dev/null
+++ b/srcpkgs/boot-66serv/files/switch-initutils
@@ -0,0 +1,22 @@
+# This service automatically moves
+# /usr/bin/{reboot,poweroff,halt,shutdown}
+# so that if started with 66, users can shutdown etc. with it.
+# It automatically moves everything back if started with
+# runit again.
+# This is run by runit and 66
+
+if grep -q "init=/usr/bin/66" /proc/cmdline; then
+ for i in reboot poweroff halt shutdown; do
+ if ! test -e /usr/bin/${i}.runit; then
+ mv /usr/bin/${i} /usr/bin/${i}.runit
+ ln -s /etc/66/${i} /usr/bin/${i}
+ fi
+ done
+else
+ for i in reboot poweroff halt shutdown; do
+ if test -e /usr/bin/${i}.runit; then
+ rm /usr/bin/${i}
+ mv /usr/bin/${i}.runit /usr/bin/${i}
+ fi
+ done
+fi
\ No newline at end of file
diff --git a/srcpkgs/boot-66serv/files/tty@ b/srcpkgs/boot-66serv/files/tty@
new file mode 100644
index 00000000000..7b72f625d84
--- /dev/null
+++ b/srcpkgs/boot-66serv/files/tty@
@@ -0,0 +1,12 @@
+[main]
+@type = classic
+@version = @VERSION@
+@description = "Launch @I"
+@user = ( root )
+@options = ( env )
+
+[start]
+@execute = ( execl-cmdline -s { agetty ${cmd_args} @I } )
+
+[environment]
+cmd_args=!-J 38400
diff --git a/srcpkgs/boot-66serv/template b/srcpkgs/boot-66serv/template
new file mode 100644
index 00000000000..77f56c0f8e5
--- /dev/null
+++ b/srcpkgs/boot-66serv/template
@@ -0,0 +1,28 @@
+# Template file for 'boot-66serv'
+pkgname=boot-66serv
+version=2.1.0
+revision=1
+archs="noarch"
+wrksrc=${pkgname}-v${version}
+build_style=gnu-configure
+configure_args="--HOSTNAME=voidlinux --TTY=!4
+ --KEYMAP=!us --TZ=Europe/Madrid --CRYPTTAB=!yes"
+makedepends="file"
+depends="s6 s6-rc s6-linux-utils s6-portable-utils 66 66-tools"
+short_desc="Stage 1 boot for 66"
+maintainer="teldra <teldra@rotce.de>"
+license="ISC"
+homepage="https://framagit.org/Obarun/boot-66serv"
+distfiles="https://framagit.org/Obarun/${pkgname}/-/archive/v${version}/${pkgname}-v${version}.tar.gz"
+checksum=6cf417a7eb5bcac152480f9a76711b06289ae672d1da7d36dc8186a6eef04235
+conf_files="/etc/66/rc.local"
+
+post_install() {
+ vinstall ${FILESDIR}/switch-initutils 644 etc/runit/core-services 99-switch-initutils.sh
+ vbin ${FILESDIR}/66
+ vlicense LICENSE
+ vinstall ${FILESDIR}/tty@ 644 usr/share/66/service/
+ vsed -i "s/@VERSION@/${version}/" "${DESTDIR}/usr/share/66/service/tty@"
+ vinstall ${FILESDIR}/runit 644 usr/share/66/service/
+ vsed -i "s/@VERSION@/${version}/" "${DESTDIR}/usr/share/66/service/runit"
+}
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PR PATCH] [Updated] [nomerge] New package: boot-66serv-2.1.0
[not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-23122@inbox.vuxu.org>
` (2 preceding siblings ...)
2020-07-05 8:21 ` teldra
@ 2020-07-06 16:23 ` teldra
2020-07-06 16:25 ` teldra
4 siblings, 0 replies; 5+ messages in thread
From: teldra @ 2020-07-06 16:23 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 391 bytes --]
There is an updated pull request by teldra against master on the void-packages repository
https://github.com/teldra/void-packages 66-boot
https://github.com/void-linux/void-packages/pull/23122
[nomerge] New package: boot-66serv-2.1.0
based on https://github.com/void-linux/void-packages/pull/21142
A patch file from https://github.com/void-linux/void-packages/pull/23122.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-66-boot-23122.patch --]
[-- Type: text/x-diff, Size: 4548 bytes --]
From 884d8f4ca8d7bd3d2139685a1d0a833618c14dfe Mon Sep 17 00:00:00 2001
From: teldra <teldra@rotce.de>
Date: Mon, 22 Jun 2020 01:43:05 +0200
Subject: [PATCH] New package: boot-66serv-2.1.0
based on https://github.com/void-linux/void-packages/pull/21142
---
srcpkgs/66-service-dbus | 1 +
srcpkgs/boot-66serv/files/66 | 2 ++
srcpkgs/boot-66serv/files/runit | 16 +++++++++++++
srcpkgs/boot-66serv/files/switch-initutils | 22 +++++++++++++++++
srcpkgs/boot-66serv/files/tty@ | 12 ++++++++++
srcpkgs/boot-66serv/template | 28 ++++++++++++++++++++++
6 files changed, 81 insertions(+)
create mode 120000 srcpkgs/66-service-dbus
create mode 100644 srcpkgs/boot-66serv/files/66
create mode 100644 srcpkgs/boot-66serv/files/runit
create mode 100755 srcpkgs/boot-66serv/files/switch-initutils
create mode 100644 srcpkgs/boot-66serv/files/tty@
create mode 100644 srcpkgs/boot-66serv/template
diff --git a/srcpkgs/66-service-dbus b/srcpkgs/66-service-dbus
new file mode 120000
index 00000000000..36e616293b3
--- /dev/null
+++ b/srcpkgs/66-service-dbus
@@ -0,0 +1 @@
+boot-66serv
\ No newline at end of file
diff --git a/srcpkgs/boot-66serv/files/66 b/srcpkgs/boot-66serv/files/66
new file mode 100644
index 00000000000..c82ece19fc5
--- /dev/null
+++ b/srcpkgs/boot-66serv/files/66
@@ -0,0 +1,2 @@
+#!/usr/bin/execlineb -P
+66-boot -b "Booting Voidlinux" -m
diff --git a/srcpkgs/boot-66serv/files/runit b/srcpkgs/boot-66serv/files/runit
new file mode 100644
index 00000000000..429b2ff9cd5
--- /dev/null
+++ b/srcpkgs/boot-66serv/files/runit
@@ -0,0 +1,16 @@
+[main]
+@type = longrun
+@version = @VERSION@
+@description = "runit"
+@user = (root)
+@options = ( log )
+
+[start]
+@execute = ( /etc/runit/2 )
+
+[stop]
+@execute = ( exec-cmdline -s { sv force-stop /var/service/*; sv exit /var/service/* } )
+
+[logger]
+@backup = 3
+@maxsize = 1000000
\ No newline at end of file
diff --git a/srcpkgs/boot-66serv/files/switch-initutils b/srcpkgs/boot-66serv/files/switch-initutils
new file mode 100755
index 00000000000..3919274b0f7
--- /dev/null
+++ b/srcpkgs/boot-66serv/files/switch-initutils
@@ -0,0 +1,22 @@
+# This service automatically moves
+# /usr/bin/{reboot,poweroff,halt,shutdown}
+# so that if started with 66, users can shutdown etc. with it.
+# It automatically moves everything back if started with
+# runit again.
+# This is run by runit and 66
+
+if grep -q "init=/usr/bin/66" /proc/cmdline; then
+ for i in reboot poweroff halt shutdown; do
+ if ! test -e /usr/bin/${i}.runit; then
+ mv /usr/bin/${i} /usr/bin/${i}.runit
+ ln -s /etc/66/${i} /usr/bin/${i}
+ fi
+ done
+else
+ for i in reboot poweroff halt shutdown; do
+ if test -e /usr/bin/${i}.runit; then
+ rm /usr/bin/${i}
+ mv /usr/bin/${i}.runit /usr/bin/${i}
+ fi
+ done
+fi
diff --git a/srcpkgs/boot-66serv/files/tty@ b/srcpkgs/boot-66serv/files/tty@
new file mode 100644
index 00000000000..7b72f625d84
--- /dev/null
+++ b/srcpkgs/boot-66serv/files/tty@
@@ -0,0 +1,12 @@
+[main]
+@type = classic
+@version = @VERSION@
+@description = "Launch @I"
+@user = ( root )
+@options = ( env )
+
+[start]
+@execute = ( execl-cmdline -s { agetty ${cmd_args} @I } )
+
+[environment]
+cmd_args=!-J 38400
diff --git a/srcpkgs/boot-66serv/template b/srcpkgs/boot-66serv/template
new file mode 100644
index 00000000000..77f56c0f8e5
--- /dev/null
+++ b/srcpkgs/boot-66serv/template
@@ -0,0 +1,28 @@
+# Template file for 'boot-66serv'
+pkgname=boot-66serv
+version=2.1.0
+revision=1
+archs="noarch"
+wrksrc=${pkgname}-v${version}
+build_style=gnu-configure
+configure_args="--HOSTNAME=voidlinux --TTY=!4
+ --KEYMAP=!us --TZ=Europe/Madrid --CRYPTTAB=!yes"
+makedepends="file"
+depends="s6 s6-rc s6-linux-utils s6-portable-utils 66 66-tools"
+short_desc="Stage 1 boot for 66"
+maintainer="teldra <teldra@rotce.de>"
+license="ISC"
+homepage="https://framagit.org/Obarun/boot-66serv"
+distfiles="https://framagit.org/Obarun/${pkgname}/-/archive/v${version}/${pkgname}-v${version}.tar.gz"
+checksum=6cf417a7eb5bcac152480f9a76711b06289ae672d1da7d36dc8186a6eef04235
+conf_files="/etc/66/rc.local"
+
+post_install() {
+ vinstall ${FILESDIR}/switch-initutils 644 etc/runit/core-services 99-switch-initutils.sh
+ vbin ${FILESDIR}/66
+ vlicense LICENSE
+ vinstall ${FILESDIR}/tty@ 644 usr/share/66/service/
+ vsed -i "s/@VERSION@/${version}/" "${DESTDIR}/usr/share/66/service/tty@"
+ vinstall ${FILESDIR}/runit 644 usr/share/66/service/
+ vsed -i "s/@VERSION@/${version}/" "${DESTDIR}/usr/share/66/service/runit"
+}
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PR PATCH] [Updated] [nomerge] New package: boot-66serv-2.1.0
[not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-23122@inbox.vuxu.org>
` (3 preceding siblings ...)
2020-07-06 16:23 ` teldra
@ 2020-07-06 16:25 ` teldra
4 siblings, 0 replies; 5+ messages in thread
From: teldra @ 2020-07-06 16:25 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 391 bytes --]
There is an updated pull request by teldra against master on the void-packages repository
https://github.com/teldra/void-packages 66-boot
https://github.com/void-linux/void-packages/pull/23122
[nomerge] New package: boot-66serv-2.1.0
based on https://github.com/void-linux/void-packages/pull/21142
A patch file from https://github.com/void-linux/void-packages/pull/23122.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-66-boot-23122.patch --]
[-- Type: text/x-diff, Size: 4211 bytes --]
From 50bd4e67161b172443eb9e84271829eb87e9257b Mon Sep 17 00:00:00 2001
From: teldra <teldra@rotce.de>
Date: Mon, 22 Jun 2020 01:43:05 +0200
Subject: [PATCH] New package: boot-66serv-2.1.0
based on https://github.com/void-linux/void-packages/pull/21142
---
srcpkgs/boot-66serv/files/66 | 2 ++
srcpkgs/boot-66serv/files/runit | 16 +++++++++++++
srcpkgs/boot-66serv/files/switch-initutils | 22 +++++++++++++++++
srcpkgs/boot-66serv/files/tty@ | 12 ++++++++++
srcpkgs/boot-66serv/template | 28 ++++++++++++++++++++++
5 files changed, 80 insertions(+)
create mode 100644 srcpkgs/boot-66serv/files/66
create mode 100644 srcpkgs/boot-66serv/files/runit
create mode 100755 srcpkgs/boot-66serv/files/switch-initutils
create mode 100644 srcpkgs/boot-66serv/files/tty@
create mode 100644 srcpkgs/boot-66serv/template
diff --git a/srcpkgs/boot-66serv/files/66 b/srcpkgs/boot-66serv/files/66
new file mode 100644
index 00000000000..c82ece19fc5
--- /dev/null
+++ b/srcpkgs/boot-66serv/files/66
@@ -0,0 +1,2 @@
+#!/usr/bin/execlineb -P
+66-boot -b "Booting Voidlinux" -m
diff --git a/srcpkgs/boot-66serv/files/runit b/srcpkgs/boot-66serv/files/runit
new file mode 100644
index 00000000000..9c25c7dff43
--- /dev/null
+++ b/srcpkgs/boot-66serv/files/runit
@@ -0,0 +1,16 @@
+[main]
+@type = longrun
+@version = @VERSION@
+@description = "runit"
+@user = (root)
+@options = ( log )
+
+[start]
+@execute = ( /etc/runit/2 )
+
+[stop]
+@execute = ( exec-cmdline -s { sv force-stop /var/service/*; sv exit /var/service/* } )
+
+[logger]
+@backup = 3
+@maxsize = 1000000
diff --git a/srcpkgs/boot-66serv/files/switch-initutils b/srcpkgs/boot-66serv/files/switch-initutils
new file mode 100755
index 00000000000..3919274b0f7
--- /dev/null
+++ b/srcpkgs/boot-66serv/files/switch-initutils
@@ -0,0 +1,22 @@
+# This service automatically moves
+# /usr/bin/{reboot,poweroff,halt,shutdown}
+# so that if started with 66, users can shutdown etc. with it.
+# It automatically moves everything back if started with
+# runit again.
+# This is run by runit and 66
+
+if grep -q "init=/usr/bin/66" /proc/cmdline; then
+ for i in reboot poweroff halt shutdown; do
+ if ! test -e /usr/bin/${i}.runit; then
+ mv /usr/bin/${i} /usr/bin/${i}.runit
+ ln -s /etc/66/${i} /usr/bin/${i}
+ fi
+ done
+else
+ for i in reboot poweroff halt shutdown; do
+ if test -e /usr/bin/${i}.runit; then
+ rm /usr/bin/${i}
+ mv /usr/bin/${i}.runit /usr/bin/${i}
+ fi
+ done
+fi
diff --git a/srcpkgs/boot-66serv/files/tty@ b/srcpkgs/boot-66serv/files/tty@
new file mode 100644
index 00000000000..7b72f625d84
--- /dev/null
+++ b/srcpkgs/boot-66serv/files/tty@
@@ -0,0 +1,12 @@
+[main]
+@type = classic
+@version = @VERSION@
+@description = "Launch @I"
+@user = ( root )
+@options = ( env )
+
+[start]
+@execute = ( execl-cmdline -s { agetty ${cmd_args} @I } )
+
+[environment]
+cmd_args=!-J 38400
diff --git a/srcpkgs/boot-66serv/template b/srcpkgs/boot-66serv/template
new file mode 100644
index 00000000000..77f56c0f8e5
--- /dev/null
+++ b/srcpkgs/boot-66serv/template
@@ -0,0 +1,28 @@
+# Template file for 'boot-66serv'
+pkgname=boot-66serv
+version=2.1.0
+revision=1
+archs="noarch"
+wrksrc=${pkgname}-v${version}
+build_style=gnu-configure
+configure_args="--HOSTNAME=voidlinux --TTY=!4
+ --KEYMAP=!us --TZ=Europe/Madrid --CRYPTTAB=!yes"
+makedepends="file"
+depends="s6 s6-rc s6-linux-utils s6-portable-utils 66 66-tools"
+short_desc="Stage 1 boot for 66"
+maintainer="teldra <teldra@rotce.de>"
+license="ISC"
+homepage="https://framagit.org/Obarun/boot-66serv"
+distfiles="https://framagit.org/Obarun/${pkgname}/-/archive/v${version}/${pkgname}-v${version}.tar.gz"
+checksum=6cf417a7eb5bcac152480f9a76711b06289ae672d1da7d36dc8186a6eef04235
+conf_files="/etc/66/rc.local"
+
+post_install() {
+ vinstall ${FILESDIR}/switch-initutils 644 etc/runit/core-services 99-switch-initutils.sh
+ vbin ${FILESDIR}/66
+ vlicense LICENSE
+ vinstall ${FILESDIR}/tty@ 644 usr/share/66/service/
+ vsed -i "s/@VERSION@/${version}/" "${DESTDIR}/usr/share/66/service/tty@"
+ vinstall ${FILESDIR}/runit 644 usr/share/66/service/
+ vsed -i "s/@VERSION@/${version}/" "${DESTDIR}/usr/share/66/service/runit"
+}
^ permalink raw reply [flat|nested] 5+ messages in thread