diff --git a/main/nnd-s6-services/APKBUILD b/main/nnd-s6-services/APKBUILD index 6448b61..f77d77e 100644 --- a/main/nnd-s6-services/APKBUILD +++ b/main/nnd-s6-services/APKBUILD @@ -1,14 +1,20 @@ # Contributor: Alex Denes # Maintainer: Alex Denes pkgname=nnd-s6-services -pkgver=0.23 -pkgrel=0 +pkgver=0.24 +pkgrel=1 pkgdesc="Base services for s6" url="none" arch="noarch" license="MIT" depends="s6-rc s6-portable-utils s6-linux-utils" -subpackages="$pkgname-core $pkgname-net $pkgname-desktop $pkgname-libvirt" +subpackages=" + $pkgname-core + $pkgname-net:_bundle + $pkgname-desktop:_bundle + $pkgname-libvirt:_bundle + $pkgname-virtual:_bundle +" builddir="$srcdir/" prepare() { @@ -25,23 +31,16 @@ package() { install -Dm755 "$builddir"/manage.sh "$pkgdir"/usr/bin/nnd-s6 } +check() { + s6-rc-compile "$builddir"/compiled "$builddir"/rc/* +} + core() { amove etc/s6/rc/core amove etc/s6/env/core } -net() { - amove etc/s6/rc/net -} - -desktop() { - amove etc/s6/rc/desktop -} - -libvirt() { - amove etc/s6/rc/libvirt -} - -check() { - s6-rc-compile "$builddir"/compiled "$builddir"/rc/* +_bundle() { + local _BNAME="${subpkgname##$pkgname-}" + amove "etc/s6/rc/$_BNAME" } diff --git a/main/nnd-s6-services/rc/core/logger.mdevd/consumer-for b/main/nnd-s6-services/rc/core/logger.mdevd/consumer-for new file mode 100644 index 0000000..3252ded --- /dev/null +++ b/main/nnd-s6-services/rc/core/logger.mdevd/consumer-for @@ -0,0 +1 @@ +mdevd diff --git a/main/nnd-s6-services/rc/core/logger.mdevd/dependencies.d/dir.var-log b/main/nnd-s6-services/rc/core/logger.mdevd/dependencies.d/dir.var-log new file mode 100644 index 0000000..e69de29 diff --git a/main/nnd-s6-services/rc/core/logger.mdevd/notification-fd b/main/nnd-s6-services/rc/core/logger.mdevd/notification-fd new file mode 100644 index 0000000..00750ed --- /dev/null +++ b/main/nnd-s6-services/rc/core/logger.mdevd/notification-fd @@ -0,0 +1 @@ +3 diff --git a/main/nnd-s6-services/rc/core/logger.mdevd/run b/main/nnd-s6-services/rc/core/logger.mdevd/run new file mode 100755 index 0000000..d74f7d8 --- /dev/null +++ b/main/nnd-s6-services/rc/core/logger.mdevd/run @@ -0,0 +1,13 @@ +#!/bin/execlineb -P +s6-envdir -i /etc/s6/env/core/path +importas -i PATH PATH +s6-envdir /etc/s6/env/core/logger +importas -i LOGPREFIX LOGPREFIX +emptyenv + +export PATH $PATH +define LOGGERNAME mdevd +define LOGSIZE 1000000 +define LOGARCHIVES 20 + +s6-log -d3 -- t s${LOGSIZE} n${LOGARCHIVES} ${LOGPREFIX}/${LOGGERNAME} diff --git a/main/nnd-s6-services/rc/core/logger.mdevd/type b/main/nnd-s6-services/rc/core/logger.mdevd/type new file mode 100644 index 0000000..5883cff --- /dev/null +++ b/main/nnd-s6-services/rc/core/logger.mdevd/type @@ -0,0 +1 @@ +longrun diff --git a/main/nnd-s6-services/rc/core/mdevd/producer-for b/main/nnd-s6-services/rc/core/mdevd/producer-for new file mode 100644 index 0000000..463da5c --- /dev/null +++ b/main/nnd-s6-services/rc/core/mdevd/producer-for @@ -0,0 +1 @@ +logger.mdevd diff --git a/main/nnd-s6-services/rc/virtual/bundle.virtual/contents.d/qemu-ga b/main/nnd-s6-services/rc/virtual/bundle.virtual/contents.d/qemu-ga new file mode 100755 index 0000000..e69de29 diff --git a/main/nnd-s6-services/rc/virtual/bundle.virtual/type b/main/nnd-s6-services/rc/virtual/bundle.virtual/type new file mode 100644 index 0000000..757b422 --- /dev/null +++ b/main/nnd-s6-services/rc/virtual/bundle.virtual/type @@ -0,0 +1 @@ +bundle diff --git a/main/nnd-s6-services/rc/virtual/logger.qemu-ga/consumer-for b/main/nnd-s6-services/rc/virtual/logger.qemu-ga/consumer-for new file mode 100644 index 0000000..ff6d75d --- /dev/null +++ b/main/nnd-s6-services/rc/virtual/logger.qemu-ga/consumer-for @@ -0,0 +1 @@ +qemu-ga diff --git a/main/nnd-s6-services/rc/virtual/logger.qemu-ga/dependencies.d/dir.var-log b/main/nnd-s6-services/rc/virtual/logger.qemu-ga/dependencies.d/dir.var-log new file mode 100644 index 0000000..e69de29 diff --git a/main/nnd-s6-services/rc/virtual/logger.qemu-ga/notification-fd b/main/nnd-s6-services/rc/virtual/logger.qemu-ga/notification-fd new file mode 100644 index 0000000..00750ed --- /dev/null +++ b/main/nnd-s6-services/rc/virtual/logger.qemu-ga/notification-fd @@ -0,0 +1 @@ +3 diff --git a/main/nnd-s6-services/rc/virtual/logger.qemu-ga/run b/main/nnd-s6-services/rc/virtual/logger.qemu-ga/run new file mode 100755 index 0000000..a20dea1 --- /dev/null +++ b/main/nnd-s6-services/rc/virtual/logger.qemu-ga/run @@ -0,0 +1,13 @@ +#!/bin/execlineb -P +s6-envdir -i /etc/s6/env/core/path +importas -i PATH PATH +s6-envdir /etc/s6/env/core/logger +importas -i LOGPREFIX LOGPREFIX +emptyenv + +export PATH $PATH +define LOGGERNAME qemu-ga +define LOGSIZE 1000000 +define LOGARCHIVES 20 + +s6-log -d3 -- t s${LOGSIZE} n${LOGARCHIVES} ${LOGPREFIX}/${LOGGERNAME} diff --git a/main/nnd-s6-services/rc/virtual/logger.qemu-ga/type b/main/nnd-s6-services/rc/virtual/logger.qemu-ga/type new file mode 100644 index 0000000..5883cff --- /dev/null +++ b/main/nnd-s6-services/rc/virtual/logger.qemu-ga/type @@ -0,0 +1 @@ +longrun diff --git a/main/nnd-s6-services/rc/virtual/qemu-ga/dependencies.d/mdevd-coldplug b/main/nnd-s6-services/rc/virtual/qemu-ga/dependencies.d/mdevd-coldplug new file mode 100644 index 0000000..e69de29 diff --git a/main/nnd-s6-services/rc/virtual/qemu-ga/dependencies.d/mount.dev b/main/nnd-s6-services/rc/virtual/qemu-ga/dependencies.d/mount.dev new file mode 100644 index 0000000..e69de29 diff --git a/main/nnd-s6-services/rc/virtual/qemu-ga/dependencies.d/mount.sys b/main/nnd-s6-services/rc/virtual/qemu-ga/dependencies.d/mount.sys new file mode 100644 index 0000000..e69de29 diff --git a/main/nnd-s6-services/rc/virtual/qemu-ga/producer-for b/main/nnd-s6-services/rc/virtual/qemu-ga/producer-for new file mode 100644 index 0000000..a5fe2f2 --- /dev/null +++ b/main/nnd-s6-services/rc/virtual/qemu-ga/producer-for @@ -0,0 +1 @@ +logger.qemu-ga diff --git a/main/nnd-s6-services/rc/virtual/qemu-ga/run b/main/nnd-s6-services/rc/virtual/qemu-ga/run new file mode 100755 index 0000000..14bad2b --- /dev/null +++ b/main/nnd-s6-services/rc/virtual/qemu-ga/run @@ -0,0 +1,10 @@ +#!/bin/execlineb -P +s6-envdir -i /etc/s6/env/core/path +importas -i PATH PATH +emptyenv + +export PATH $PATH +define METHOD virtio-serial +define COMMPATH /dev/virtio-ports/org.qemu.guest_agent.0 + +qemu-ga --method $METHOD --path $COMMPATH -r diff --git a/main/nnd-s6-services/rc/virtual/qemu-ga/type b/main/nnd-s6-services/rc/virtual/qemu-ga/type new file mode 100644 index 0000000..5883cff --- /dev/null +++ b/main/nnd-s6-services/rc/virtual/qemu-ga/type @@ -0,0 +1 @@ +longrun