From 4dcb53f8ec4fd895c2d72ea4542b67b8b52fc9e1 Mon Sep 17 00:00:00 2001 From: taca Date: Sat, 11 May 2019 23:28:28 +0200 Subject: [PATCH] Add missing packages to PKGBUILD * nosh-net-tools-shims, nosh-run-via-open-rc, nosh-run-mdevd * remove the nosh-service-management install script --- .SRCINFO | 10 ++++++++-- PKGBUILD | 30 +++++++++++++++++++++++------- archnosh.changelog | 4 ++++ 3 files changed, 35 insertions(+), 9 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index a1f30b1..67cac59 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = nosh pkgdesc = A suite of system-level utilities for initializing and running a BSD or Linux system, for managing daemons, for managing terminals, and for managing logging. pkgver = 1.40 - pkgrel = 1 + pkgrel = 2 url = https://jdebp.eu/Softwares/nosh/index.html changelog = archnosh.changelog arch = x86_64 @@ -38,8 +38,8 @@ pkgbase = nosh source = nosh-run-udev.install source = nosh-run-user-vt.install source = nosh-run-via-systemd.install + source = nosh-run-via-open-rc.install source = nosh-run-virtualbox-guest.install - source = nosh-service-management.install sha256sums = 263982c4ba2889f823f9d4be6ac2daafd1af5b341f9e02f2ed7b28b0788e02c3 sha256sums = 21f94e9eb2ddb4f3e1590177f62385b30a263fc43281b5d4cace38abb7723bb5 sha256sums = 1713514f1e702b1fa663a84108c37d2cd28f70e1eea31e4c4ffb7d5ff940fa03 @@ -111,6 +111,8 @@ pkgname = nosh-ucspi-tcp-shims pkgname = nosh-kbd-shims +pkgname = nosh-net-tools-shims + pkgname = nosh-bcron-as-cron-shims pkgname = nosh-desktop-bus-shims @@ -131,6 +133,8 @@ pkgname = nosh-run-kernel-vt pkgname = nosh-run-user-vt +pkgname = nosh-run-via-open-rc + pkgname = nosh-run-via-systemd pkgname = nosh-run-virtualbox-guest @@ -153,6 +157,8 @@ pkgname = nosh-run-suckless-mdev pkgname = nosh-run-vdev +pkgname = nosh-run-mdevd + pkgname = nosh-run-local-syslog pkgname = nosh-run-klog diff --git a/PKGBUILD b/PKGBUILD index ad7d513..7d7f31c 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -24,6 +24,7 @@ pkgname=( 'nosh-bsd-shims' 'nosh-ucspi-tcp-shims' 'nosh-kbd-shims' + 'nosh-net-tools-shims' #'nosh-logrotate-shims' 'nosh-bcron-as-cron-shims' 'nosh-desktop-bus-shims' @@ -35,6 +36,7 @@ pkgname=( 'nosh-run-debian-server-base' 'nosh-run-kernel-vt' 'nosh-run-user-vt' + 'nosh-run-via-open-rc' 'nosh-run-via-systemd' 'nosh-run-virtualbox-guest' 'nosh-run-freedesktop-system-bus' @@ -46,12 +48,13 @@ pkgname=( 'nosh-run-busybox-mdev' 'nosh-run-suckless-mdev' 'nosh-run-vdev' + 'nosh-run-mdevd' 'nosh-run-local-syslog' 'nosh-run-klog' 'nosh-run-bcron' ) pkgver=1.40 -pkgrel=1 +pkgrel=2 pkgdesc="A suite of system-level utilities for initializing and running a BSD or Linux system, for managing daemons, for managing terminals, and for managing logging." arch=('x86_64') url="https://jdebp.eu/Softwares/nosh/index.html" @@ -88,6 +91,7 @@ _pkginstalls=( "nosh-run-system-manager" "nosh-run-udev" "nosh-run-user-vt" + "nosh-run-via-open-rc" "nosh-run-via-systemd" "nosh-run-virtualbox-guest" "nosh-service-management" @@ -124,8 +128,8 @@ source=("https://jdebp.eu/Repository/freebsd/nosh-$pkgver.tar.gz" "nosh-run-udev.install" "nosh-run-user-vt.install" "nosh-run-via-systemd.install" + "nosh-run-via-open-rc.install" "nosh-run-virtualbox-guest.install" - "nosh-service-management.install" ) noextract=() sha256sums=( @@ -154,8 +158,8 @@ sha256sums=( 'SKIP' # nosh-run-udev.install 'SKIP' # nosh-run-user-vt.install 'SKIP' # nosh-run-via-systemd.install + 'SKIP' # nosh-run-via-open-rc.install 'SKIP' # nosh-run-virtualbox-guest.install - 'SKIP' # nosh-service-management.install ) validpgpkeys=() @@ -329,6 +333,10 @@ _package() { pkgdesc="Shim kbd utilities" depends+=( 'nosh-common' 'nosh-terminal-management' ) ;; + nosh-net-tools-shims) + pkgdesc="Linux utility shims" + depends+=( 'nosh-common' 'nosh-exec' ) + ;; #nosh-logrotate-shims) # pkgdesc="Shim for the logrotate package" # depends+=( 'nosh-common' 'nosh-bundles' ) @@ -344,7 +352,7 @@ _package() { ;; nosh-bundles) pkgdesc="Service bundles" - depends+=( 'nosh-common' 'nosh-service-management>=1.38' 'nosh-exec>=1.38' 'nosh-terminal-management>=1.22' 'shadow' ) + depends+=( 'nosh-common' 'nosh-service-management>=1.39' 'nosh-exec>=1.39' 'nosh-terminal-management>=1.39' 'shadow' ) install="nosh-bundles.install" ;; nosh-debian-crontab-no-anacron) @@ -396,15 +404,19 @@ _package() { ;; nosh-run-user-vt) pkgdesc="Run new-style application-mode virtual terminals" - depends+=( 'nosh-common' 'nosh-exec' 'nosh-service-management>=1.33' 'nosh-terminal-management' 'nosh-bundles' ) + depends+=( 'nosh-common' 'nosh-exec' 'nosh-service-management>=1.33' 'nosh-terminal-management' 'nosh-bundles>=1.37' ) install="nosh-run-user-vt.install" backup=( 'usr/share/system-control/presets/80-enable-user-vt.preset' 'usr/share/system-control/presets/80-linux-ttylogin-vc.preset' ) ;; + nosh-run-via-open-rc) + pkgdesc="Run the nosh service manager and daemontools service scanner via OpenRC" + depends+=( 'nosh-common' 'nosh-service-management>=1.33' 'systemd' 'nosh-bundles>=1.40' ) + ;; nosh-run-via-systemd) pkgdesc="Run the nosh service manager and daemontools service scanner via systemd" - depends+=( 'nosh-common' 'nosh-service-management>=1.33' 'systemd' 'nosh-bundles' ) + depends+=( 'nosh-common' 'nosh-service-management>=1.33' 'systemd' 'nosh-bundles>=1.40' ) install="nosh-run-via-systemd.install" backup=( 'usr/share/system-control/presets/80-disable-sysinit.preset' 'usr/share/system-control/presets/80-disable-dbus.preset' @@ -491,12 +503,16 @@ _package() { ;; nosh-run-vdev) pkgdesc="Run vdev as the device manager" - depends+=( 'nosh-common' 'nosh-exec' 'nosh-service-management' 'nosh-bundles' 'vdev-git') + depends+=( 'nosh-common' 'nosh-exec' 'nosh-service-management>=1.33' 'nosh-bundles' 'vdev-git') conflicts+=('nosh-run-busybox-mdev' 'nosh-run-suckless-mdev' 'nosh-run-udev' 'nosh-run-systemd-udev') # no run script so far # install="nosh-run-vdev.install" backup=( 'usr/share/system-control/presets/80-enable-vdev.preset' ) ;; + nosh-run-mdevd) + pkgdesc="Run Laurent Bercot's mdevd as the device manager" + depends+=( 'nosh-common' 'nosh-service-management>=1.33' 'nosh-bundles' ) + ;; nosh-run-local-syslog) pkgdesc="Run the local syslog service" depends+=( 'nosh-common' 'nosh-exec' 'nosh-service-management>=1.33' 'nosh-bundles' ) diff --git a/archnosh.changelog b/archnosh.changelog index 7db4756..51eeb83 100644 --- a/archnosh.changelog +++ b/archnosh.changelog @@ -1,3 +1,7 @@ +1.40-2 +* update PKGBUILD with missing packages: nosh-net-tools-shims, nosh-run-via-open-rc, nosh-run-mdevd +* remove nosh-service-management install script + 1.40-1 * add missing ncftpbatch per-user service as a patch -- 2.11.4.GIT