Github messages for voidlinux
 help / color / mirror / Atom feed
From: mobinmob <mobinmob@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] [WIP] New package: boot-66serv-2.3.0
Date: Mon, 01 Feb 2021 18:22:11 +0100	[thread overview]
Message-ID: <20210201172211.gU9y_RgWxrSidS859rAMQQy-iTc-r0B_W0TgN7YXBlg@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-25743@inbox.vuxu.org>

[-- Attachment #1: Type: text/plain, Size: 944 bytes --]

There is an updated pull request by mobinmob against master on the void-packages repository

https://github.com/mobinmob/void-packages boot-66serv
https://github.com/void-linux/void-packages/pull/25743

[WIP] New package: boot-66serv-2.3.0
This PR is the continuation of the packaging and integration work @teldra has done on https://github.com/void-linux/void-packages/pull/23122, which is based on the work @zenfailure has done on https://github.com/void-linux/void-packages/pull/21142. They have  done pretty much all the basic work needed -and then some- to integrate @Obarun 's work with void's packaging.

In this PR I will continue their work, try to make the configuration and switch from one init to the other as smooth as possible and package the frontend service files from https://github.com/mobinmob/void-66-services once they are ready.

A patch file from https://github.com/void-linux/void-packages/pull/25743.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-boot-66serv-25743.patch --]
[-- Type: text/x-diff, Size: 19786 bytes --]

From b3991090bddd95ed0fea497a437bf3e80dcd17f6 Mon Sep 17 00:00:00 2001
From: teldra <teldra@rotce.de>
Date: Mon, 22 Jun 2020 01:43:05 +0200
Subject: [PATCH 01/11] New package: boot-66serv-2.2.1

based on:
https://github.com/void-linux/void-packages/pull/23122
https://github.com/void-linux/void-packages/pull/21142

[ci-skip]
---
 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               | 30 ++++++++++++++++++++++
 5 files changed, 82 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..1a57510f3cf
--- /dev/null
+++ b/srcpkgs/boot-66serv/template
@@ -0,0 +1,30 @@
+# Template file for 'boot-66serv'
+pkgname=boot-66serv
+version=2.2.1
+revision=1
+wrksrc=${pkgname}-v${version}
+build_style=gnu-configure
+configure_args="--HOSTNAME=voidlinux --TTY=!4
+	--KEYMAP=!us --TZ=Europe/Madrid"
+make_install_target="install install-man install-html"
+hostmakedepends="lowdown"
+makedepends="file"
+depends="s6 s6-rc s6-linux-utils s6-portable-utils 66 66-tools"
+short_desc="Stage 1 boot for 66"
+maintainer="mobinmob <mobinmob@disroot.org>"
+# previous maintainer="teldra <teldra@rotce.de>"
+license="ISC"
+homepage="https://framagit.org/Obarun/boot-66serv"
+conf_files="/etc/66/rc.local"
+distfiles="https://framagit.org/Obarun/${pkgname}/-/archive/v${version}/${pkgname}-v${version}.tar.gz"
+checksum=34eac7f84dd9cafda78a7b5a21eed484e9d6b52e8fba0ade6dbb5f1567def84d
+
+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"
+}

From c627e8a606c22d29f380b41dfa1fa72dc21738a5 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sun, 8 Nov 2020 17:08:32 +0200
Subject: [PATCH 02/11] improve runit service frontend file.

---
 srcpkgs/boot-66serv/files/runit | 18 ++++++++++++++++--
 srcpkgs/boot-66serv/template    |  2 ++
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/boot-66serv/files/runit b/srcpkgs/boot-66serv/files/runit
index 9c25c7dff43..c5e36bbfa4f 100644
--- a/srcpkgs/boot-66serv/files/runit
+++ b/srcpkgs/boot-66serv/files/runit
@@ -6,10 +6,24 @@
 @options = ( log )
 
 [start]
-@execute = ( /etc/runit/2 )
+@build = custom
+@shebang = ( "/bin/sh" )
+@execute = ( 
+PATH=/usr/bin:/usr/sbin
+
+runlevel=66
+
+runsvchdir "${runlevel}"
+mkdir -p /run/runit/runsvdir
+ln -s /etc/runit/runsvdir/current /run/runit/runsvdir/current
+
+exec env - PATH=$PATH \
+    runsvdir -P /run/runit/runsvdir/current 'log: ...........................................................................................................................................................................................................................................................................................................................................................................................................'
+
+ )
 
 [stop]
-@execute = ( exec-cmdline -s { sv force-stop /var/service/*; sv exit /var/service/* } )
+@execute = ( execl-cmdline -s { sv force-stop /var/service/*; sv exit /var/service/* } )
 
 [logger]
 @backup = 3 
diff --git a/srcpkgs/boot-66serv/template b/srcpkgs/boot-66serv/template
index 1a57510f3cf..f953ead216e 100644
--- a/srcpkgs/boot-66serv/template
+++ b/srcpkgs/boot-66serv/template
@@ -19,6 +19,8 @@ conf_files="/etc/66/rc.local"
 distfiles="https://framagit.org/Obarun/${pkgname}/-/archive/v${version}/${pkgname}-v${version}.tar.gz"
 checksum=34eac7f84dd9cafda78a7b5a21eed484e9d6b52e8fba0ade6dbb5f1567def84d
 
+make_dirs="/etc/runit/runsvdir/66 0750 root root"
+
 post_install() {
 	vinstall ${FILESDIR}/switch-initutils 644 etc/runit/core-services 99-switch-initutils.sh
 	vbin ${FILESDIR}/66

From 768b72fdf37ef5d9f8c65c67b2b47af16ec62a56 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Tue, 24 Nov 2020 01:54:26 +0200
Subject: [PATCH 03/11] make [stop] do its job :P

---
 srcpkgs/boot-66serv/files/runit | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/boot-66serv/files/runit b/srcpkgs/boot-66serv/files/runit
index c5e36bbfa4f..fe741ff2bd8 100644
--- a/srcpkgs/boot-66serv/files/runit
+++ b/srcpkgs/boot-66serv/files/runit
@@ -23,7 +23,11 @@ exec env - PATH=$PATH \
  )
 
 [stop]
-@execute = ( execl-cmdline -s { sv force-stop /var/service/*; sv exit /var/service/* } )
+@build = custom
+@shebang = ( "/bin/sh" )
+@execute = ( 
+ sv force-stop /var/service/*
+ sv exit /var/service/* )
 
 [logger]
 @backup = 3 

From afd70627d4c42aafd9d54ab211034edf71d4bc50 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Wed, 25 Nov 2020 21:24:43 +0200
Subject: [PATCH 04/11] Separate switch-initutils code for runit and 66, and
 document both consistently.

---
 srcpkgs/boot-66serv/files/switch-initutils | 34 +++++++++-------------
 1 file changed, 13 insertions(+), 21 deletions(-)

diff --git a/srcpkgs/boot-66serv/files/switch-initutils b/srcpkgs/boot-66serv/files/switch-initutils
index 3919274b0f7..b596b3ba95f 100755
--- a/srcpkgs/boot-66serv/files/switch-initutils
+++ b/srcpkgs/boot-66serv/files/switch-initutils
@@ -1,22 +1,14 @@
-# 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
+# This core service checks for /usr/bin/{reboot,poweroff,halt,shutdown}
+# and if they are part of 66 it deletes them and moves the runit 
+# utilities in their place. It runs by default. There is a similar 
+# oneshot service for 66 that does the opposite and should be enabled.
+# The script make sure that the user has the proper utilities for the 
+# init system they are currently running.
+
+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
 
-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

From 440a15068e76bee628ea249cc0251aae29660b6b Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Tue, 15 Dec 2020 23:47:29 +0200
Subject: [PATCH 05/11] add the 66 frontend file in the package.

---
 srcpkgs/boot-66serv/files/switch-initutils-66 | 28 +++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 srcpkgs/boot-66serv/files/switch-initutils-66

diff --git a/srcpkgs/boot-66serv/files/switch-initutils-66 b/srcpkgs/boot-66serv/files/switch-initutils-66
new file mode 100644
index 00000000000..1bf6c724745
--- /dev/null
+++ b/srcpkgs/boot-66serv/files/switch-initutils-66
@@ -0,0 +1,28 @@
+
+# This oneshot service checks for /usr/bin/{reboot,poweroff,halt,shutdown}
+# and if they are part of runit-void it renames them and copies the 66 
+# utilities in their place. It must be enabled, especially if one
+# changes between the two init systems. There is a similar script for
+# runit core-services that does the opposite and runs by default with runit. 
+# The service makes sure that the user has the proper utilities for the 
+# init system they are currently running. 
+
+[main]
+@type = oneshot
+@version = @VERSION@
+@description = "Switch initutils"
+@user = ( root )
+
+[start]
+@build = custom
+@shebang = "/bin/sh -c"
+@execute = ( 
+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
+                       cp /etc/66/${i} /usr/bin/${i}
+               fi
+       done
+fi
+)

From 81d4835e725d98226956995897ae54b2542f8cbe Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Tue, 15 Dec 2020 23:51:22 +0200
Subject: [PATCH 06/11] install switch-initutils for 66 and change how the
 '@version' key is set.

---
 srcpkgs/boot-66serv/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/boot-66serv/template b/srcpkgs/boot-66serv/template
index f953ead216e..fa659c37010 100644
--- a/srcpkgs/boot-66serv/template
+++ b/srcpkgs/boot-66serv/template
@@ -25,8 +25,12 @@ post_install() {
 	vinstall ${FILESDIR}/switch-initutils 644 etc/runit/core-services 99-switch-initutils.sh
 	vbin ${FILESDIR}/66
 	vlicense LICENSE
+	# @version should be incremented only when there is a change in the specific
+	# frontend service file.
 	vinstall ${FILESDIR}/tty@ 644 usr/share/66/service/
-	vsed -i "s/@VERSION@/${version}/" "${DESTDIR}/usr/share/66/service/tty@"
+	vsed -i "s/@VERSION@/0.0.1/" "${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"
+	vsed -i "s/@VERSION@/0.0.1/" "${DESTDIR}/usr/share/66/service/runit"
+	vinstall ${FILESDIR}/switch-initutils-66 644 usr/share/66/service/ switch-initutils
+	vsed -i "s/@VERSION@/0.0.1/" "${DESTDIR}/usr/share/66/service/switch-initutils"
 }

From 2bce6588b26e613002584d0cac25563953f0b053 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 28 Dec 2020 23:57:01 +0200
Subject: [PATCH 07/11] New package: void-66-services-0.0.1

---
 srcpkgs/void-66-services/template | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 srcpkgs/void-66-services/template

diff --git a/srcpkgs/void-66-services/template b/srcpkgs/void-66-services/template
new file mode 100644
index 00000000000..7ed84c93713
--- /dev/null
+++ b/srcpkgs/void-66-services/template
@@ -0,0 +1,17 @@
+# Template file for 'void-66-services'
+pkgname=void-66-services
+version=0.0.1
+revision=1
+build_style=gnu-makefile
+depends="66"
+short_desc="66 service frontend files for voidlinux"
+maintainer="mobinmob <mobinmob@disroot.org>"
+license="BSD-2-Clause"
+homepage="https://github.com/mobinmob/void-66-services/"
+distfiles="https://github.com/mobinmob/void-66-services/archive/v${version}.tar.gz"
+checksum=ca223594ebae8e7a79e16f150bbebd44878143c07b928c9985020b5183175b95
+
+post_install() {
+	vlicense LICENSE
+	vlicense AUTHORS
+}

From f4156f7224b7fe1e31684f24a8cc3a0c5b1e2980 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sun, 3 Jan 2021 16:22:47 +0200
Subject: [PATCH 08/11] more work on the runit service.

---
 srcpkgs/boot-66serv/files/runit | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/boot-66serv/files/runit b/srcpkgs/boot-66serv/files/runit
index fe741ff2bd8..d3d60bb82dd 100644
--- a/srcpkgs/boot-66serv/files/runit
+++ b/srcpkgs/boot-66serv/files/runit
@@ -1,5 +1,5 @@
 [main]
-@type = longrun
+@type = classic
 @version = @VERSION@
 @description = "runit"
 @user = (root)
@@ -14,20 +14,19 @@ PATH=/usr/bin:/usr/sbin
 runlevel=66
 
 runsvchdir "${runlevel}"
-mkdir -p /run/runit/runsvdir
-ln -s /etc/runit/runsvdir/current /run/runit/runsvdir/current
-
-exec env - PATH=$PATH \
-    runsvdir -P /run/runit/runsvdir/current 'log: ...........................................................................................................................................................................................................................................................................................................................................................................................................'
+s6-mkdir -v -p /run/runit/runsvdir
+s6-ln -s /etc/runit/runsvdir/current /run/runit/runsvdir/current
 
+exec s6-env PATH=$PATH \
+    runsvdir -P /run/runit/runsvdir/current
  )
 
 [stop]
 @build = custom
 @shebang = ( "/bin/sh" )
 @execute = ( 
- sv force-stop /var/service/*
- sv exit /var/service/* )
+	sv force-stop /var/service/*
+	sv exit /var/service/* )
 
 [logger]
 @backup = 3 

From 39b6c5ba0eb6a54273bf1a95cd9146840f5200d4 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sun, 3 Jan 2021 17:13:57 +0200
Subject: [PATCH 09/11] add -i switch to s6-env: the /etc/runit/2 script uses -
 which is non-standard but in gnu coreutils and busybox does the same as -i.

---
 srcpkgs/boot-66serv/files/runit | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/boot-66serv/files/runit b/srcpkgs/boot-66serv/files/runit
index d3d60bb82dd..362266bad06 100644
--- a/srcpkgs/boot-66serv/files/runit
+++ b/srcpkgs/boot-66serv/files/runit
@@ -17,7 +17,7 @@ runsvchdir "${runlevel}"
 s6-mkdir -v -p /run/runit/runsvdir
 s6-ln -s /etc/runit/runsvdir/current /run/runit/runsvdir/current
 
-exec s6-env PATH=$PATH \
+exec s6-env -i PATH=$PATH \
     runsvdir -P /run/runit/runsvdir/current
  )
 

From 9a0e8fcbf3fd39e33c8c3e2250b5ba9c0690ef32 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sat, 23 Jan 2021 22:07:22 +0200
Subject: [PATCH 10/11] boot-66serv: update to 2.3.0 adapt to new 66 version.

---
 srcpkgs/boot-66serv/files/runit | 10 ++++------
 srcpkgs/boot-66serv/files/tty@  |  1 -
 srcpkgs/boot-66serv/template    |  8 ++++----
 3 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/srcpkgs/boot-66serv/files/runit b/srcpkgs/boot-66serv/files/runit
index 362266bad06..3a0f89f8707 100644
--- a/srcpkgs/boot-66serv/files/runit
+++ b/srcpkgs/boot-66serv/files/runit
@@ -3,12 +3,11 @@
 @version = @VERSION@
 @description = "runit"
 @user = (root)
-@options = ( log )
 
 [start]
 @build = custom
 @shebang = ( "/bin/sh" )
-@execute = ( 
+@execute = (
 PATH=/usr/bin:/usr/sbin
 
 runlevel=66
@@ -24,10 +23,9 @@ exec s6-env -i PATH=$PATH \
 [stop]
 @build = custom
 @shebang = ( "/bin/sh" )
-@execute = ( 
-	sv force-stop /var/service/*
-	sv exit /var/service/* )
+@execute = ( sv force-stop /var/service/* }
+ sv exit /var/service/* )
 
 [logger]
-@backup = 3 
+@backup = 3
 @maxsize = 1000000
diff --git a/srcpkgs/boot-66serv/files/tty@ b/srcpkgs/boot-66serv/files/tty@
index 7b72f625d84..f4a783bde6c 100644
--- a/srcpkgs/boot-66serv/files/tty@
+++ b/srcpkgs/boot-66serv/files/tty@
@@ -3,7 +3,6 @@
 @version = @VERSION@
 @description = "Launch @I"
 @user = ( root )
-@options = ( env )
 
 [start]
 @execute = ( execl-cmdline -s { agetty ${cmd_args} @I } )
diff --git a/srcpkgs/boot-66serv/template b/srcpkgs/boot-66serv/template
index fa659c37010..c088b82dd9e 100644
--- a/srcpkgs/boot-66serv/template
+++ b/srcpkgs/boot-66serv/template
@@ -1,6 +1,6 @@
 # Template file for 'boot-66serv'
 pkgname=boot-66serv
-version=2.2.1
+version=2.3.0
 revision=1
 wrksrc=${pkgname}-v${version}
 build_style=gnu-configure
@@ -14,10 +14,10 @@ short_desc="Stage 1 boot for 66"
 maintainer="mobinmob <mobinmob@disroot.org>"
 # previous maintainer="teldra <teldra@rotce.de>"
 license="ISC"
-homepage="https://framagit.org/Obarun/boot-66serv"
+homepage="https://framagit.org/pkg/obmods/boot-66serv"
 conf_files="/etc/66/rc.local"
-distfiles="https://framagit.org/Obarun/${pkgname}/-/archive/v${version}/${pkgname}-v${version}.tar.gz"
-checksum=34eac7f84dd9cafda78a7b5a21eed484e9d6b52e8fba0ade6dbb5f1567def84d
+distfiles="https://framagit.org/pkg/obmods/boot-66serv/-/archive/v${version}/boot-66serv-v${version}.tar.bz2"
+checksum=03b692700030eaae1e882b6df97e84cbbf0180e067291342d5ed9117047475ba
 
 make_dirs="/etc/runit/runsvdir/66 0750 root root"
 

From c692426c11ef24eb0a4abb39ecc1975b10acf7b7 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 1 Feb 2021 19:20:01 +0200
Subject: [PATCH 11/11] remove tty@ frontend service file - no longer needed.

---
 srcpkgs/boot-66serv/files/tty@ | 11 -----------
 srcpkgs/boot-66serv/template   |  2 --
 2 files changed, 13 deletions(-)
 delete mode 100644 srcpkgs/boot-66serv/files/tty@

diff --git a/srcpkgs/boot-66serv/files/tty@ b/srcpkgs/boot-66serv/files/tty@
deleted file mode 100644
index f4a783bde6c..00000000000
--- a/srcpkgs/boot-66serv/files/tty@
+++ /dev/null
@@ -1,11 +0,0 @@
-[main]
-@type = classic
-@version = @VERSION@
-@description = "Launch @I"
-@user = ( root )
-
-[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
index c088b82dd9e..4747249557d 100644
--- a/srcpkgs/boot-66serv/template
+++ b/srcpkgs/boot-66serv/template
@@ -27,8 +27,6 @@ post_install() {
 	vlicense LICENSE
 	# @version should be incremented only when there is a change in the specific
 	# frontend service file.
-	vinstall ${FILESDIR}/tty@ 644 usr/share/66/service/
-	vsed -i "s/@VERSION@/0.0.1/" "${DESTDIR}/usr/share/66/service/tty@"
 	vinstall ${FILESDIR}/runit 644 usr/share/66/service/
 	vsed -i "s/@VERSION@/0.0.1/" "${DESTDIR}/usr/share/66/service/runit"
 	vinstall ${FILESDIR}/switch-initutils-66 644 usr/share/66/service/ switch-initutils

  parent reply	other threads:[~2021-02-01 17:22 UTC|newest]

Thread overview: 173+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-10-19 19:14 [PR PATCH] [WIP] New package: boot-66serv-2.2.0 mobinmob
2020-10-19 19:16 ` mobinmob
2020-10-19 19:18 ` [PR PATCH] [Updated] " mobinmob
2020-11-08 15:10 ` [PR PATCH] [Updated] [WIP] New package: boot-66serv-2.2.1 mobinmob
2020-11-08 15:24 ` mobinmob
2020-11-08 15:26 ` mobinmob
2020-11-08 15:27 ` mobinmob
2020-11-08 15:31 ` mobinmob
2020-11-23 23:55 ` [PR PATCH] [Updated] " mobinmob
2020-11-23 23:58 ` mobinmob
2020-11-25 19:25 ` [PR PATCH] [Updated] " mobinmob
2020-11-25 19:29 ` mobinmob
2020-12-15 21:54 ` mobinmob
2020-12-15 22:01 ` mobinmob
2020-12-28 21:58 ` [PR PATCH] [Updated] " mobinmob
2020-12-28 22:00 ` mobinmob
2020-12-29  7:47 ` travankor
2020-12-29  9:54 ` mobinmob
2020-12-29  9:55 ` mobinmob
2020-12-29 10:03 ` mobinmob
2021-01-03 14:24 ` [PR PATCH] [Updated] " mobinmob
2021-01-03 14:30 ` mobinmob
2021-01-03 14:31 ` mobinmob
2021-01-03 14:32 ` mobinmob
2021-01-03 14:32 ` mobinmob
2021-01-03 14:35 ` mobinmob
2021-01-03 15:14 ` [PR PATCH] [Updated] " mobinmob
2021-01-23 20:07 ` mobinmob
2021-01-23 20:14 ` mobinmob
2021-01-23 20:17 ` mobinmob
2021-02-01 17:22 ` mobinmob [this message]
2021-02-01 17:24 ` [WIP] New package: boot-66serv-2.3.0 mobinmob
2021-02-03  0:14 ` [PR PATCH] [Updated] " mobinmob
2021-02-03  0:16 ` mobinmob
2021-02-03  0:25 ` mobinmob
2021-02-04 19:48 ` [PR PATCH] [Updated] " mobinmob
2021-02-04 19:50 ` mobinmob
2021-02-04 20:01 ` mobinmob
2021-02-04 20:08 ` [PR REVIEW] " ericonr
2021-02-04 20:08 ` ericonr
2021-02-04 20:08 ` ericonr
2021-02-04 20:08 ` ericonr
2021-02-04 20:12 ` mobinmob
2021-02-04 20:16 ` mobinmob
2021-02-04 20:17 ` mobinmob
2021-02-04 20:19 ` mobinmob
2021-02-04 20:20 ` [PR PATCH] [Updated] " mobinmob
2021-02-04 20:20 ` [PR REVIEW] " mobinmob
2021-02-04 20:21 ` mobinmob
2021-02-04 20:23 ` [PR PATCH] [Updated] " mobinmob
2021-02-04 20:24 ` [PR REVIEW] " mobinmob
2021-02-04 23:24 ` [PR PATCH] [Updated] " mobinmob
2021-02-04 23:52 ` mobinmob
2021-02-06  0:46 ` mobinmob
2021-02-06  0:47 ` mobinmob
2021-02-06  0:55 ` mobinmob
2021-02-06  1:01 ` mobinmob
2021-02-06  1:08 ` mobinmob
2021-02-08 11:13 ` [PR PATCH] [Updated] " mobinmob
2021-02-08 17:06 ` mobinmob
2021-02-14 18:11 ` mobinmob
2021-02-14 22:54 ` [PR PATCH] [Updated] " mobinmob
2021-02-14 22:59 ` mobinmob
2021-02-14 22:59 ` mobinmob
2021-02-14 23:01 ` mobinmob
2021-02-16 15:14 ` [PR PATCH] [Updated] " mobinmob
2021-02-27 23:24 ` mobinmob
2021-02-27 23:31 ` mobinmob
2021-02-27 23:31 ` mobinmob
2021-02-27 23:31 ` mobinmob
2021-03-02 21:50 ` [PR PATCH] [Updated] " mobinmob
2021-03-03 20:24 ` mobinmob
2021-03-03 22:37 ` mobinmob
2021-03-03 22:39 ` mobinmob
2021-03-05 17:56 ` mobinmob
2021-03-05 17:57 ` mobinmob
2021-03-05 17:58 ` mobinmob
2021-03-05 18:01 ` mobinmob
2021-03-16 19:19 ` [PR PATCH] [Updated] " mobinmob
2021-03-16 19:22 ` mobinmob
2021-03-21 15:22 ` [PR PATCH] [Updated] " mobinmob
2021-03-22 20:49 ` mobinmob
2021-03-22 20:55 ` mobinmob
2021-05-28 20:24 ` [PR PATCH] [Updated] " mobinmob
2021-05-28 20:30 ` [WIP] New package: boot-66serv-2.3.1 mobinmob
2021-05-29 23:13 ` paper42
2021-05-30 14:14 ` mobinmob
2021-05-30 14:16 ` mobinmob
2021-05-30 14:24 ` mobinmob
2021-07-13 21:35 ` [PR PATCH] [Updated] " mobinmob
2021-07-13 21:36 ` mobinmob
2021-07-13 21:43 ` [PR PATCH] [Updated] " mobinmob
2021-09-15 13:07 ` mobinmob
2021-09-15 13:09 ` mobinmob
2021-09-15 13:10 ` mobinmob
2021-09-15 13:15 ` [PR PATCH] [Updated] " mobinmob
2021-09-15 19:19 ` [PR PATCH] [Updated] [WIP] New package: boot-66serv-2.4.0 mobinmob
2021-09-15 19:23 ` mobinmob
2021-11-19 18:01 ` [PR PATCH] [Updated] " mobinmob
2021-11-19 18:04 ` mobinmob
2021-11-24  2:09 ` thegarlynch
2021-11-24  5:39 ` mobinmob
2021-11-24 13:51 ` mobinmob
2022-02-20 10:37 ` [PR PATCH] [Updated] " mobinmob
2022-02-20 10:37 ` mobinmob
2022-02-20 10:41 ` mobinmob
2022-02-20 19:29 ` mobinmob
2022-02-21 17:51 ` [PR PATCH] [Updated] " mobinmob
2022-02-21 17:56 ` mobinmob
2022-02-22 14:31 ` mobinmob
2022-03-11 10:07 ` thegarlynch
2022-03-12  9:30 ` mobinmob
2022-03-12  9:30 ` mobinmob
2022-03-12  9:34 ` mobinmob
2022-03-12  9:37 ` mobinmob
2022-05-14 10:49 ` [PR PATCH] [Updated] " mobinmob
2022-05-14 10:49 ` mobinmob
2022-05-14 10:52 ` [PR PATCH] [Updated] " mobinmob
2022-05-14 10:53 ` mobinmob
2022-05-14 13:02 ` mobinmob
2022-05-14 13:02 ` mobinmob
2022-05-15 13:44 ` mobinmob
2022-05-15 13:45 ` mobinmob
2022-06-18 10:43 ` mobinmob
2022-06-18 10:43 ` mobinmob
2022-08-22 15:18 ` NymanMatthias
2022-08-22 15:18 ` NymanMatthias
2022-08-22 16:11 ` mobinmob
2022-10-01 15:49 ` mobinmob
2022-10-16 13:08 ` [PR PATCH] [Updated] [WIP] New package: boot-66serv-2.4.1 mobinmob
2022-10-16 13:11 ` mobinmob
2022-10-16 13:19 ` [PR PATCH] [Updated] " mobinmob
2022-10-16 13:21 ` mobinmob
2022-10-16 14:16 ` mobinmob
2022-10-16 22:27 ` NymanMatthias
2022-10-17  3:00 ` mobinmob
2022-10-17  3:05 ` mobinmob
2022-10-17  3:23 ` mobinmob
2022-10-17 12:54 ` mobinmob
2023-01-16  1:58 ` github-actions
2023-01-18 17:05 ` mobinmob
2023-01-18 17:07 ` mobinmob
2023-02-05 18:41 ` [PR PATCH] [Updated] " mobinmob
2023-02-05 19:06 ` mobinmob
2023-02-05 19:08 ` mobinmob
2023-03-11 18:37 ` [PR PATCH] [Updated] " mobinmob
2023-03-11 18:53 ` mobinmob
2023-03-11 18:57 ` mobinmob
2023-03-11 18:58 ` mobinmob
2023-03-11 18:58 ` mobinmob
2023-03-11 18:59 ` mobinmob
2023-03-11 19:00 ` mobinmob
2023-04-12 16:33 ` sonnysighedup
2023-04-12 16:45 ` mobinmob
2023-04-12 16:46 ` mobinmob
2023-04-12 16:48 ` mobinmob
2023-04-12 17:35 ` mobinmob
2023-04-12 17:50 ` sonnysighedup
2023-04-12 17:59 ` mobinmob
2023-04-12 17:59 ` mobinmob
2023-07-12  2:06 ` github-actions
2023-07-27  1:46 ` [PR PATCH] [Closed]: " github-actions
2023-07-29 17:42 ` mobinmob
2023-07-29 17:43 ` mobinmob
2023-07-29 17:43 ` mobinmob
2023-08-05  7:55 ` mobinmob
2023-08-05  8:08 ` mobinmob
2023-08-05  9:08 ` mobinmob
2023-08-06 18:55 ` mobinmob
2023-08-06 19:15 ` mobinmob
2023-08-13 14:46 ` mobinmob
2023-08-14  8:07 ` mobinmob
2023-08-14  8:07 ` mobinmob

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210201172211.gU9y_RgWxrSidS859rAMQQy-iTc-r0B_W0TgN7YXBlg@z \
    --to=mobinmob@users.noreply.github.com \
    --cc=ml@inbox.vuxu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).