summaryrefslogtreecommitdiff
path: root/system/s6-linux-init/APKBUILD
diff options
context:
space:
mode:
authorA. Wilcox <awilcox@wilcox-tech.com>2019-07-22 17:21:03 +0000
committerA. Wilcox <awilcox@wilcox-tech.com>2019-07-22 17:21:03 +0000
commitf0ca86424f048b1042611fef65bdd9d2e8a2372b (patch)
tree6c5ca2648ffc2ee1ec503dc192a89309614f3413 /system/s6-linux-init/APKBUILD
parent85778be046ee5ea714511e4eab9fb579972fbad7 (diff)
parent2d5bb95bb096b535989210cbb3ce9fc9fc3dd9b9 (diff)
downloadpackages-f0ca86424f048b1042611fef65bdd9d2e8a2372b.tar.gz
packages-f0ca86424f048b1042611fef65bdd9d2e8a2372b.tar.bz2
packages-f0ca86424f048b1042611fef65bdd9d2e8a2372b.tar.xz
packages-f0ca86424f048b1042611fef65bdd9d2e8a2372b.zip
Merge branch 'lr.skaware' into 'master'
system/s6-linux-init-early-getty: new subpackage of s6-linux-init See merge request adelie/packages!291
Diffstat (limited to 'system/s6-linux-init/APKBUILD')
-rw-r--r--system/s6-linux-init/APKBUILD17
1 files changed, 14 insertions, 3 deletions
diff --git a/system/s6-linux-init/APKBUILD b/system/s6-linux-init/APKBUILD
index aed46e575..d1cead76d 100644
--- a/system/s6-linux-init/APKBUILD
+++ b/system/s6-linux-init/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Laurent Bercot <ska-adelie@skarnet.org>
pkgname=s6-linux-init
pkgver=1.0.2.0
-pkgrel=0
+pkgrel=1
pkgdesc="A s6-based init system"
url="https://skarnet.org/software/$pkgname/"
arch="all"
@@ -11,11 +11,11 @@ license="ISC"
_skalibs_version=2.8.1.0
depends="execline s6 s6-linux-init-common"
makedepends="skalibs-dev>=$_skalibs_version execline-dev s6-dev utmps-dev"
-subpackages="$pkgname-common:common:noarch $pkgname-libs $pkgname-dev $pkgname-libs-dev:libsdev $pkgname-doc"
+subpackages="$pkgname-common:common:noarch $pkgname-early-getty:earlygetty:noarch $pkgname-libs $pkgname-dev $pkgname-libs-dev:libsdev $pkgname-doc"
source="https://skarnet.org/software/$pkgname/$pkgname-$pkgver.tar.gz rc.init runlevel rc.shutdown reboot.sh"
install="$pkgname.post-install $pkgname.post-upgrade $pkgname.pre-deinstall"
provides="/sbin/init=0"
-
+_earlytty=tty2
build() {
cd "$builddir"
@@ -46,6 +46,7 @@ package() {
./s6-linux-init-maker \
-u catchlog \
+ -G "/sbin/agetty -- 38400 $_earlytty linux" \
-1 \
-L \
-p "/usr/bin:/usr/sbin:/bin:/sbin" \
@@ -77,6 +78,16 @@ common() {
}
+earlygetty() {
+ pkgdesc="Files for an early getty on $_earlytty"
+ depends="s6-linux-init-common"
+ svcimg="$pkgdir/etc/s6-linux-init/current/run-image/service"
+ subsvcimg="$subpkgdir/etc/s6-linux-init/current/run-image/service"
+ mkdir -p -m 0755 "$subsvcimg"
+ mv "$svcimg/s6-linux-init-early-getty" "$subsvcimg/getty-$_earlytty"
+}
+
+
libs() {
pkgdesc="$pkgdesc (shared libraries)"
depends="skalibs-libs>=$_skalibs_version"