From a3f7bf3e1a3b80c7b498f16343ed8ed55fc28733 Mon Sep 17 00:00:00 2001 From: Dylan Van Assche Date: Wed, 20 Jul 2022 14:23:17 +0200 Subject: [PATCH] main/postmarketos-base: use setup-devd (MR 3302) Alpine does not use setup-udev anymore and provides the same functionality through setup-devd. The setup-udev script was deleted [1] but postmarketos-base still used it and caused pmbootstrap to fail when building a device image. Use the rc-service setup directly from setup-devd. [1] https://gitlab.alpinelinux.org/alpine/aports/-/commit/b56c4c2b9ddea6007c5e4349f97310a1538f29b6 --- main/postmarketos-base/APKBUILD | 4 ++-- main/postmarketos-base/postmarketos-base.post-install | 8 +++++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/main/postmarketos-base/APKBUILD b/main/postmarketos-base/APKBUILD index efd3af679..10da91c7b 100644 --- a/main/postmarketos-base/APKBUILD +++ b/main/postmarketos-base/APKBUILD @@ -1,6 +1,6 @@ pkgname=postmarketos-base -pkgver=20 -pkgrel=2 +pkgver=21 +pkgrel=0 pkgdesc="Meta package for minimal postmarketOS base" url="https://postmarketos.org" arch="noarch" diff --git a/main/postmarketos-base/postmarketos-base.post-install b/main/postmarketos-base/postmarketos-base.post-install index a05242d64..ec049f2ca 100644 --- a/main/postmarketos-base/postmarketos-base.post-install +++ b/main/postmarketos-base/postmarketos-base.post-install @@ -1,8 +1,10 @@ #!/bin/sh -e -# Enable udev OpenRC services and runlevels -# https://github.com/alpinelinux/aports/blob/master/main/eudev/setup-udev -setup-udev -n +# Enable eudev service +rc-update add udev sysinit +rc-update add udev-trigger sysinit +rc-update add udev-settle sysinit +rc-update add udev-postmount default # Enable other OpenRC services for service in devfs dmesg; do