From 9a481ed295eb852ff18d31600bfa346fa2fb4f1a Mon Sep 17 00:00:00 2001 From: taca Date: Thu, 20 Apr 2017 22:24:52 +0200 Subject: [PATCH] Added nosh-run-systemd-udev package No more need for the .extra scriptlet, the service bundle calls /lib/systemd/systemd-udevd directly. --- .SRCINFO | 8 ++++++-- PKGBUILD | 30 ++++++++++++++++++++---------- maintenance-scripts.patch | 14 +++++++------- maintenance.sh | 7 +++---- nosh-run-udev.post_install.extra | 12 ------------ 5 files changed, 36 insertions(+), 35 deletions(-) delete mode 100644 nosh-run-udev.post_install.extra diff --git a/.SRCINFO b/.SRCINFO index 2d84fd0..07a436e 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -36,13 +36,14 @@ pkgbase = nosh source = nosh-run-virtualbox-guest.install source = nosh-run-kernel-vt.install source = nosh-run-udev.install + source = nosh-run-systemd-udev.install source = nosh-run-debian-server-base.install source = nosh-run-debian-desktop-base.install source = nosh-run-openssh-server.install sha256sums = ac61466f97e90074804739ee0eba3544de5dce07da386379d9c57b17f2c5a7b7 sha256sums = ceab03a0b164c16b1189e46e1db45e71e83c5612ea01c639d750437cbeb6ff58 - sha256sums = bc4fff63166d6347cfc9e160c1882c91ed9551577da563aafa12e32375420887 - sha256sums = e23cc822956da263bd9bfc7bc37a4edc48bd92dcd452535afbf7ea9828cf8d19 + sha256sums = e5e90eea4ed0685eccbb6f5435c55100b4ffa53062068d202b0cb96c521c221a + sha256sums = 766ae08d97b2d840761132d164bd6bc596c4157470e9ce8b8a6135ea95624ed4 sha256sums = 2f3a9ee93505534f2db82d71edb694b1c32aa3f4e2880f3d62589a5fe65f062b sha256sums = 429755272a87b062d97dbaa9c146d551d8b20b6ea3670c5803ddb5b789b829b2 sha256sums = 0f79d7e1bdcc41181ebb06b49d347927e67a83fa5682a9a094fa3a2d8ec01c3a @@ -64,6 +65,7 @@ pkgbase = nosh sha256sums = SKIP sha256sums = SKIP sha256sums = SKIP + sha256sums = SKIP pkgname = nosh-common @@ -109,6 +111,8 @@ pkgname = nosh-run-kernel-vt pkgname = nosh-run-udev +pkgname = nosh-run-systemd-udev + pkgname = nosh-run-busybox-mdev pkgname = nosh-run-suckless-mdev diff --git a/PKGBUILD b/PKGBUILD index 6294b73..1de97af 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -24,6 +24,7 @@ pkgname=( 'nosh-run-via-systemd' 'nosh-run-kernel-vt' 'nosh-run-udev' + 'nosh-run-systemd-udev' 'nosh-run-busybox-mdev' 'nosh-run-suckless-mdev' 'nosh-run-vdev' @@ -73,6 +74,7 @@ _pkginstalls=( "nosh-run-virtualbox-guest" "nosh-run-kernel-vt" "nosh-run-udev" + "nosh-run-systemd-udev" "nosh-run-debian-server-base" "nosh-run-debian-desktop-base" "nosh-run-openssh-server" @@ -107,6 +109,7 @@ source=("https://jdebp.eu/Repository/freebsd/nosh-$pkgver.tar.gz" "nosh-run-virtualbox-guest.install" "nosh-run-kernel-vt.install" "nosh-run-udev.install" + "nosh-run-systemd-udev.install" "nosh-run-debian-server-base.install" "nosh-run-debian-desktop-base.install" "nosh-run-openssh-server.install" @@ -115,8 +118,8 @@ noextract=() sha256sums=( 'ac61466f97e90074804739ee0eba3544de5dce07da386379d9c57b17f2c5a7b7' # nosh-1.34.tar.gz 'ceab03a0b164c16b1189e46e1db45e71e83c5612ea01c639d750437cbeb6ff58' # staging.patch - 'bc4fff63166d6347cfc9e160c1882c91ed9551577da563aafa12e32375420887' # maintenance-scripts.patch - 'e23cc822956da263bd9bfc7bc37a4edc48bd92dcd452535afbf7ea9828cf8d19' # maintenance.sh + 'e5e90eea4ed0685eccbb6f5435c55100b4ffa53062068d202b0cb96c521c221a' # maintenance-scripts.patch + '766ae08d97b2d840761132d164bd6bc596c4157470e9ce8b8a6135ea95624ed4' # maintenance.sh '2f3a9ee93505534f2db82d71edb694b1c32aa3f4e2880f3d62589a5fe65f062b' # scriptletbuilder.sh '429755272a87b062d97dbaa9c146d551d8b20b6ea3670c5803ddb5b789b829b2' # services-dbus.patch '0f79d7e1bdcc41181ebb06b49d347927e67a83fa5682a9a094fa3a2d8ec01c3a' # nosh-run-udev.post_install.extra @@ -139,6 +142,7 @@ sha256sums=( 'SKIP' 'SKIP' 'SKIP' + 'SKIP' ) validpgpkeys=() @@ -318,27 +322,33 @@ _package() { ;; nosh-run-udev) pkgdesc="Run udev as the device manager" - depends+=( 'nosh-common' 'nosh-exec' 'nosh-service-management>=1.16' 'nosh-bundles' ) - optdepends+=( 'systemd: use systemd-udevd directly' 'eudev: alternative udev implementation' ) - conflicts+=('nosh-run-busybox-mdev' 'nosh-run-suckless-mdev' 'nosh-run-vdev') + depends+=( 'nosh-common' 'nosh-exec' 'nosh-service-management>=1.33' 'nosh-bundles' ) + optdepends+=( 'eudev: alternative udev implementation' ) + conflicts+=('nosh-run-busybox-mdev' 'nosh-run-suckless-mdev' 'nosh-run-vdev' 'nosh-run-systemd-udev') install="nosh-run-udev.install" ;; + nosh-run-systemd-udev) + pkgdesc="Run systemd-udev as the device manager" + depends+=( 'nosh-common' 'nosh-exec' 'nosh-service-management>=1.33' 'nosh-bundles>=1.34' 'systemd') + conflicts+=('nosh-run-busybox-mdev' 'nosh-run-suckless-mdev' 'nosh-run-vdev' 'nosh-run-udev') + install="nosh-run-systemd-udev.install" + ;; nosh-run-busybox-mdev) pkgdesc="Run BusyBox mdev as the device manager" - depends+=( 'nosh-common' 'nosh-exec' 'nosh-service-management>=1.16' 'nosh-bundles' 'busybox') - conflicts+=('nosh-run-udev' 'nosh-run-suckless-mdev' 'nosh-run-vdev') + depends+=( 'nosh-common' 'nosh-exec' 'nosh-service-management>=1.33' 'nosh-bundles' 'busybox') + conflicts+=('nosh-run-udev' 'nosh-run-suckless-mdev' 'nosh-run-vdev' 'nosh-run-systemd-udev') install="nosh-run-busybox-mdev.install" ;; nosh-run-suckless-mdev) pkgdesc="Run SuckLess mdev as the device manager" - depends+=( 'nosh-common' 'nosh-exec' 'nosh-service-management>=1.16' 'nosh-bundles' 'smdev') - conflicts+=('nosh-run-udev' 'nosh-run-busybox-mdev' 'nosh-run-vdev') + depends+=( 'nosh-common' 'nosh-exec' 'nosh-service-management>=1.33' 'nosh-bundles' 'smdev') + conflicts+=('nosh-run-udev' 'nosh-run-busybox-mdev' 'nosh-run-vdev' 'nosh-run-systemd-udev') install="nosh-run-suckless-mdev.install" ;; nosh-run-vdev) pkgdesc="Run vdev as the device manager" depends+=( 'nosh-common' 'nosh-exec' 'nosh-service-management' 'nosh-bundles' 'vdev-git') - conflicts+=('nosh-run-busybox-mdev' 'nosh-run-suckless-mdev' 'nosh-run-udev') + 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" ;; diff --git a/maintenance-scripts.patch b/maintenance-scripts.patch index c634348..b8c64c5 100644 --- a/maintenance-scripts.patch +++ b/maintenance-scripts.patch @@ -1,9 +1,9 @@ diff --git a/package/debian/nosh-run-system-manager.postinst b/package/debian/nosh-run-system-manager.postinst -index 4176377..5c3d127 100755 +index 4176377..e6d1a65 100755 --- a/package/debian/nosh-run-system-manager.postinst +++ b/package/debian/nosh-run-system-manager.postinst -@@ -1,14 +1,7 @@ - #!/bin/sh - +@@ -1,14 +1,6 @@ +-#!/bin/sh - -case "$1" in - configure) - if test -z "$2" # No prior version installed/left configured. @@ -18,18 +18,18 @@ index 4176377..5c3d127 100755 - ;; -esac diff --git a/package/debian/nosh-run-via-systemd.postrm b/package/debian/nosh-run-via-systemd.postrm -index d73693e..7fb3187 100755 +index 433f762..71a75b2 100755 --- a/package/debian/nosh-run-via-systemd.postrm +++ b/package/debian/nosh-run-via-systemd.postrm -@@ -1,7 +1,4 @@ - #!/bin/sh - +@@ -1,7 +1,3 @@ +-#!/bin/sh - -case "$1" in - # post-deinstall for nosh-run-via-systemd - remove|purge) # Re-apply presets to services that were cut-out by a special preset in this package. system-control preset sysinit.target dbus.socket local-syslog.target system-control preset static-networking.target -@@ -10,5 +7,3 @@ case "$1" in +@@ -10,5 +6,3 @@ case "$1" in system-control preset busybox-mdev.socket busybox-mdev-log.service busybox-mdev-rescan.service system-control preset suckless-mdev.socket suckless-mdev-log.service suckless-mdev-rescan.service system-control preset vdev.socket vdev-log.service diff --git a/maintenance.sh b/maintenance.sh index ea64fa5..c6e38a7 100755 --- a/maintenance.sh +++ b/maintenance.sh @@ -14,10 +14,9 @@ mv -v nosh-bundles.postrm.extra nosh-bundles.post_upgrade.extra mv -v nosh-bundles.preinst.extra nosh-bundles.pre_upgrade.extra mv -v nosh-bundles.prerm.extra nosh-bundles.pre_remove.extra -# runs external format import conversion -mv -v nosh-run-system-manager.postinst nosh-run-system-manager.post_upgrade -# needs to be done on install, explicitly for Archlinux -cp -v nosh-run-system-manager.post_upgrade nosh-run-system-manager.post_install +# runs external format import conversions on install and upgrades +mv -v nosh-run-system-manager.postinst nosh-run-system-manager.post_install +cp -v nosh-run-system-manager.post_install nosh-run-system-manager.post_upgrade mv -v nosh-run-via-systemd.postinst.extra nosh-run-via-systemd.post_install mv -v nosh-run-via-systemd.prerm.extra nosh-run-via-systemd.pre_remove diff --git a/nosh-run-udev.post_install.extra b/nosh-run-udev.post_install.extra deleted file mode 100644 index f005e47..0000000 --- a/nosh-run-udev.post_install.extra +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh - -# add a symlink for systemd if it exists - -if test ! -e /usr/bin/udevd -then - echo "Symlinking /usr/lib/systemd/systemd-udevd to /usr/bin/udevd" - ln -s /usr/lib/systemd/systemd-udevd /usr/bin/udevd -else - echo "/usr/bin/udevd already exists" - echo "On Archlinux, udev is provided by systemd by default" - echo "Make sure it points to a working udev implementation" -fi -- 2.11.4.GIT