From f84adcd778866ce27a06b09dad2eb4c65d1ebde7 Mon Sep 17 00:00:00 2001 From: Clayton Craft Date: Mon, 5 May 2025 15:24:27 -0700 Subject: [PATCH] main/*: explicitly depend on openrc if install scripts call rc-update [ci:ignore-count] Part-of: https://gitlab.postmarketos.org/postmarketOS/pmaports/-/merge_requests/6476 [ci:skip-build]: already built successfully in CI --- main/msm-firmware-loader/APKBUILD | 3 ++- main/postmarketos-base-ui-gnome/APKBUILD | 3 ++- main/postmarketos-base-ui-plasma/APKBUILD | 5 +++-- main/postmarketos-base-ui/APKBUILD | 9 ++++++--- main/postmarketos-base/APKBUILD | 5 +++-- main/postmarketos-boot-hwtest/APKBUILD | 3 ++- main/postmarketos-tweaks/APKBUILD | 3 ++- main/postmarketos-ui-buffyboard/APKBUILD | 5 +++-- main/postmarketos-ui-console/APKBUILD | 4 ++-- main/postmarketos-ui-fbkeyboard/APKBUILD | 5 +++-- main/postmarketos-ui-framebufferphone/APKBUILD | 3 ++- main/postmarketos-ui-gnome-mobile/APKBUILD | 4 ++-- main/postmarketos-ui-gnome/APKBUILD | 4 ++-- main/postmarketos-ui-lomiri/APKBUILD | 3 ++- main/postmarketos-ui-lxqt/APKBUILD | 3 ++- main/postmarketos-ui-openbox/APKBUILD | 5 +++-- main/postmarketos-ui-plasma-bigscreen/APKBUILD | 3 ++- main/postmarketos-ui-plasma-desktop/APKBUILD | 3 ++- main/postmarketos-ui-plasma-mobile/APKBUILD | 5 +++-- main/postmarketos-ui-sway/APKBUILD | 5 +++-- main/postmarketos-ui-sxmo-de-dwm/APKBUILD | 3 ++- main/postmarketos-ui-sxmo-de-sway/APKBUILD | 3 ++- main/postmarketos-ui-weston/APKBUILD | 5 +++-- main/swclock-offset/APKBUILD | 3 ++- main/ttyescape/APKBUILD | 4 ++-- main/watchdog-kick/APKBUILD | 3 ++- modem/msm-modem/APKBUILD | 7 +++++-- modem/samsungipcd/APKBUILD | 3 ++- 28 files changed, 71 insertions(+), 43 deletions(-) diff --git a/main/msm-firmware-loader/APKBUILD b/main/msm-firmware-loader/APKBUILD index 17a2960f00..f573f3be3c 100644 --- a/main/msm-firmware-loader/APKBUILD +++ b/main/msm-firmware-loader/APKBUILD @@ -1,6 +1,6 @@ pkgname=msm-firmware-loader pkgver=1.6.0 -pkgrel=1 +pkgrel=2 pkgdesc="Set of init services to automatically load firmware from device partitions" url="https://postmarketos.org/" subpackages="$pkgname-openrc $pkgname-systemd $pkgname-wcnss" @@ -37,6 +37,7 @@ package() { openrc() { install="$subpkgname.post-install" + depends="openrc" default_openrc } diff --git a/main/postmarketos-base-ui-gnome/APKBUILD b/main/postmarketos-base-ui-gnome/APKBUILD index 5e00c1fe92..7b7522cd5e 100644 --- a/main/postmarketos-base-ui-gnome/APKBUILD +++ b/main/postmarketos-base-ui-gnome/APKBUILD @@ -3,7 +3,7 @@ # Co-Maintainer: fossdd pkgname=postmarketos-base-ui-gnome pkgver=6 -pkgrel=1 +pkgrel=2 pkgdesc="Meta package for shared configuration for GNOME-based UIs" url="https://postmarketos.org" arch="noarch" @@ -80,6 +80,7 @@ openrc() { iio-sensor-proxy-openrc modemmanager-openrc networkmanager-openrc + openrc polkit-elogind " diff --git a/main/postmarketos-base-ui-plasma/APKBUILD b/main/postmarketos-base-ui-plasma/APKBUILD index b64a9e1cd9..0f8d619358 100644 --- a/main/postmarketos-base-ui-plasma/APKBUILD +++ b/main/postmarketos-base-ui-plasma/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Bart Ribbers pkgname=postmarketos-base-ui-plasma pkgver=2 -pkgrel=12 +pkgrel=13 pkgdesc="Meta package for shared configuration for Plasma-based UIs" url="https://postmarketos.org" arch="noarch !armhf" # armhf is not supported @@ -73,9 +73,10 @@ openrc() { elogind elogind-openrc iio-sensor-proxy-openrc + openrc networkmanager-openrc urfkill-openrc - " + " mkdir -p "$subpkgdir" } diff --git a/main/postmarketos-base-ui/APKBUILD b/main/postmarketos-base-ui/APKBUILD index 096bc553fa..eb43acbf24 100644 --- a/main/postmarketos-base-ui/APKBUILD +++ b/main/postmarketos-base-ui/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Clayton Craft pkgname=postmarketos-base-ui pkgver=37 -pkgrel=0 +pkgrel=1 pkgdesc="Meta package for minimal postmarketOS UI base" url="https://postmarketos.org" arch="noarch" @@ -152,8 +152,9 @@ _openrc() { chrony-openrc dbus-openrc haveged-openrc + openrc util-linux-openrc - " + " mkdir -p "$subpkgdir" } @@ -161,7 +162,7 @@ _openrc() { elogind() { install_if="$pkgname=$pkgver-r$pkgrel elogind" install="$subpkgname.post-install" - depends="!systemd-logind sleep-inhibitor-openrc" + depends="!systemd-logind sleep-inhibitor-openrc openrc" replaces=" elogind sleep-inhibitor @@ -176,6 +177,8 @@ _openrc_settingsd() { install_if="$pkgname=$pkgver-r$pkgrel openrc-settingsd-openrc" install="$subpkgname.post-install $subpkgname.post-upgrade" replaces="openrc-settingsd-openrc" + depends="openrc" + amove etc/conf.d/openrc-settingsd } diff --git a/main/postmarketos-base/APKBUILD b/main/postmarketos-base/APKBUILD index 1e6561d3b0..040e438772 100644 --- a/main/postmarketos-base/APKBUILD +++ b/main/postmarketos-base/APKBUILD @@ -1,6 +1,6 @@ pkgname=postmarketos-base pkgver=43 -pkgrel=4 +pkgrel=5 pkgdesc="Meta package for minimal postmarketOS base" url="https://postmarketos.org" arch="noarch" @@ -126,7 +126,7 @@ nftables() { nftables_openrc() { install_if="$pkgname-openrc=$pkgver-r$pkgrel nftables" - depends="nftables-openrc" + depends="nftables-openrc openrc" install="$subpkgname.post-install" mkdir -p "$subpkgdir" @@ -145,6 +145,7 @@ openrc() { eudev-openrc logbookd logbookd-openrc + openrc openssh-server-common-openrc udev-init-scripts-openrc zram-init-openrc diff --git a/main/postmarketos-boot-hwtest/APKBUILD b/main/postmarketos-boot-hwtest/APKBUILD index 351e4d34a8..3f7a1baf3b 100644 --- a/main/postmarketos-boot-hwtest/APKBUILD +++ b/main/postmarketos-boot-hwtest/APKBUILD @@ -1,6 +1,6 @@ pkgname=postmarketos-boot-hwtest pkgver=0.1 -pkgrel=1 +pkgrel=2 pkgdesc="Boot into a TTY running hwtest" url="https://gitlab.com/MartijnBraam/hwtest" arch="all" @@ -20,6 +20,7 @@ package() { openrc() { install_if="$pkgname=$pkgver-r$pkgrel openrc" install="$subpkgname.post-install" + depends="openrc" mkdir -p "$subpkgdir" } diff --git a/main/postmarketos-tweaks/APKBUILD b/main/postmarketos-tweaks/APKBUILD index 6a147a5fe2..c12e9eafce 100644 --- a/main/postmarketos-tweaks/APKBUILD +++ b/main/postmarketos-tweaks/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Newbyte pkgname=postmarketos-tweaks pkgver=0.13.2 -pkgrel=2 +pkgrel=3 pkgdesc="Tweak tool for phone UIs" url="https://gitlab.postmarketos.org/postmarketOS/postmarketos-tweaks" arch="noarch" @@ -47,6 +47,7 @@ sxmo() { openrc() { install_if="$pkgname=$pkgver-r$pkgrel" install="$subpkgname.post-install" + depends="openrc" default_openrc } diff --git a/main/postmarketos-ui-buffyboard/APKBUILD b/main/postmarketos-ui-buffyboard/APKBUILD index 6f832a9ac4..0126460031 100644 --- a/main/postmarketos-ui-buffyboard/APKBUILD +++ b/main/postmarketos-ui-buffyboard/APKBUILD @@ -2,7 +2,7 @@ # Based On: postmarketos-ui-fbkeyboard pkgname=postmarketos-ui-buffyboard pkgver=1 -pkgrel=2 +pkgrel=3 pkgdesc="Plain framebuffer console with modern touchscreen keyboard support" url="https://gitlab.postmarketos.org/postmarketOS/buffybox" arch="all" @@ -27,8 +27,9 @@ openrc() { install_if="$pkgname=$pkgver-r$pkgrel openrc" install="$subpkgname.post-install $subpkgname.pre-deinstall $subpkgname.post-upgrade" depends=" + openrc networkmanager-openrc - " + " mkdir -p "$subpkgdir" } diff --git a/main/postmarketos-ui-console/APKBUILD b/main/postmarketos-ui-console/APKBUILD index 7fd4ee8f2e..35ddadeb7f 100644 --- a/main/postmarketos-ui-console/APKBUILD +++ b/main/postmarketos-ui-console/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Clayton Craft pkgname=postmarketos-ui-console pkgver=0.1 -pkgrel=9 +pkgrel=10 pkgdesc="Console environment, with no graphical/touch UI" url="https://postmarketos.org/" arch="noarch" @@ -23,6 +23,6 @@ package() { _openrc() { install_if="$pkgname=$pkgver-r$pkgrel openrc" install="$subpkgname.post-install $subpkgname.post-upgrade" - depends="networkmanager-openrc" + depends="networkmanager-openrc openrc" mkdir -p "$subpkgdir" } diff --git a/main/postmarketos-ui-fbkeyboard/APKBUILD b/main/postmarketos-ui-fbkeyboard/APKBUILD index a02dfe6c62..04401ed314 100644 --- a/main/postmarketos-ui-fbkeyboard/APKBUILD +++ b/main/postmarketos-ui-fbkeyboard/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Ferenc Bakonyi pkgname=postmarketos-ui-fbkeyboard pkgver=5 -pkgrel=1 +pkgrel=2 pkgdesc="Plain framebuffer console with touchscreen keyboard support" url="https://github.com/bakonyiferenc/fbkeyboard" arch="all" @@ -27,8 +27,9 @@ openrc() { install_if="$pkgname=$pkgver-r$pkgrel openrc" install="$subpkgname.post-install $subpkgname.pre-deinstall $subpkgname.post-upgrade" depends=" + openrc networkmanager-openrc - " + " mkdir -p "$subpkgdir" } diff --git a/main/postmarketos-ui-framebufferphone/APKBUILD b/main/postmarketos-ui-framebufferphone/APKBUILD index c93a4a08df..88a4b7c58b 100644 --- a/main/postmarketos-ui-framebufferphone/APKBUILD +++ b/main/postmarketos-ui-framebufferphone/APKBUILD @@ -3,7 +3,7 @@ # Contributor: Miles Alan pkgname=postmarketos-ui-framebufferphone pkgver=1 -pkgrel=4 +pkgrel=5 pkgdesc="Minimalist framebuffer menu/keyboard UI accessible via touch/volume keys & compatible scripts" url="http://sr.ht/~hamblingreen/framebufferphone" arch="aarch64 x86_64" # Limited by fbp / zig in alpine support @@ -37,6 +37,7 @@ package() { openrc() { install_if="$pkgname=$pkgver-r$pkgrel openrc" install="$subpkgname.post-install $subpkgname.pre-deinstall $subpkgname.post-upgrade" + depends="openrc" mkdir -p "$subpkgdir" } diff --git a/main/postmarketos-ui-gnome-mobile/APKBUILD b/main/postmarketos-ui-gnome-mobile/APKBUILD index f2fbb0c7aa..ceb133ce9b 100644 --- a/main/postmarketos-ui-gnome-mobile/APKBUILD +++ b/main/postmarketos-ui-gnome-mobile/APKBUILD @@ -4,7 +4,7 @@ # Co-Maintainer: fossdd pkgname=postmarketos-ui-gnome-mobile pkgver=4 -pkgrel=0 +pkgrel=1 pkgdesc="(Wayland) Gnome Shell patched to adapt better to phones (Experimental)" url="https://gnome.org/" arch="noarch !armhf !riscv64" # gnome-shell / riscv64: mutter-mobile @@ -44,7 +44,7 @@ package() { openrc() { install_if="$pkgname=$pkgver-r$pkgrel openrc" install="$subpkgname.post-install $subpkgname.post-upgrade" - depends="gdm-openrc" + depends="gdm-openrc openrc" mkdir -p "$subpkgdir" } diff --git a/main/postmarketos-ui-gnome/APKBUILD b/main/postmarketos-ui-gnome/APKBUILD index a38b7d8b59..1068c6779e 100644 --- a/main/postmarketos-ui-gnome/APKBUILD +++ b/main/postmarketos-ui-gnome/APKBUILD @@ -4,7 +4,7 @@ # Co-Maintainer: fossdd pkgname=postmarketos-ui-gnome pkgver=4 -pkgrel=1 +pkgrel=2 pkgdesc="(Wayland) Gnome Shell" url="https://gnome.org/" # armhf blocked by gnome-shell -> gjs -> mozjs102 @@ -37,7 +37,7 @@ package() { openrc() { install_if="$pkgname=$pkgver-r$pkgrel openrc" install="$subpkgname.post-install $subpkgname.post-upgrade" - depends="gdm-openrc" + depends="gdm-openrc openrc" mkdir -p "$subpkgdir" } diff --git a/main/postmarketos-ui-lomiri/APKBUILD b/main/postmarketos-ui-lomiri/APKBUILD index 415c9139ab..24ffbc3b9c 100644 --- a/main/postmarketos-ui-lomiri/APKBUILD +++ b/main/postmarketos-ui-lomiri/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Luca Weiss pkgname=postmarketos-ui-lomiri pkgver=1 -pkgrel=1 +pkgrel=2 pkgdesc="(Wayland) The convergent desktop environment (Experimental)" url="https://lomiri.com/" arch="noarch !armhf !riscv64" @@ -98,6 +98,7 @@ openrc() { install_if="$pkgname openrc" install="$subpkgname.post-install $subpkgname.post-upgrade" depends=" + openrc postmarketos-base-ui-bluez-openrc polkit-elogind postmarketos-base-ui-elogind diff --git a/main/postmarketos-ui-lxqt/APKBUILD b/main/postmarketos-ui-lxqt/APKBUILD index 3b0336f130..47219c05f7 100644 --- a/main/postmarketos-ui-lxqt/APKBUILD +++ b/main/postmarketos-ui-lxqt/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Antoni Aloy pkgname=postmarketos-ui-lxqt pkgver=0.4 -pkgrel=1 +pkgrel=2 pkgdesc="(X11) Lightweight Qt Desktop Environment (stylus recommended)" url="https://lxqt-project.org/" # armhf: lxqt-desktop not available @@ -93,6 +93,7 @@ openrc() { brightnessctl-openrc elogind-openrc networkmanager-openrc + openrc tinydm-openrc " diff --git a/main/postmarketos-ui-openbox/APKBUILD b/main/postmarketos-ui-openbox/APKBUILD index 880362b5eb..f679909c42 100644 --- a/main/postmarketos-ui-openbox/APKBUILD +++ b/main/postmarketos-ui-openbox/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: hexaheximal pkgname=postmarketos-ui-openbox pkgver=1 -pkgrel=1 +pkgrel=2 pkgdesc="(X11) A highly configurable and lightweight X11 window manager (keyboard required)" url="https://openbox.org/" arch="noarch" @@ -34,9 +34,10 @@ openrc() { install="$subpkgname.post-install $subpkgname.post-upgrade" depends=" elogind-openrc + openrc networkmanager-openrc tinydm-openrc - " + " mkdir -p "$subpkgdir" } diff --git a/main/postmarketos-ui-plasma-bigscreen/APKBUILD b/main/postmarketos-ui-plasma-bigscreen/APKBUILD index 6145e77acb..1f791144af 100644 --- a/main/postmarketos-ui-plasma-bigscreen/APKBUILD +++ b/main/postmarketos-ui-plasma-bigscreen/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Bart Ribbers pkgname=postmarketos-ui-plasma-bigscreen pkgver=1 -pkgrel=2 +pkgrel=3 _commit_configs="a8bd93e279c222be6058ef46b065c11e88aa8400" pkgdesc="(Wayland) 10-feet variant of Plasma, made for big screen TVs" url="https://wiki.postmarketos.org/wiki/Plasma_Bigscreen" @@ -44,6 +44,7 @@ openrc() { install="$subpkgname.post-install $subpkgname.post-upgrade" depends=" elogind-openrc + openrc networkmanager-openrc tinydm-openrc " diff --git a/main/postmarketos-ui-plasma-desktop/APKBUILD b/main/postmarketos-ui-plasma-desktop/APKBUILD index 7d9f86085b..2db7fd4b20 100644 --- a/main/postmarketos-ui-plasma-desktop/APKBUILD +++ b/main/postmarketos-ui-plasma-desktop/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Bart Ribbers pkgname=postmarketos-ui-plasma-desktop pkgver=3 -pkgrel=2 +pkgrel=3 pkgdesc="(X11/Wayland) KDE Desktop Environment (works well with tablets)" url="https://www.kde.org" # armhf and riscv64 blocked by plasma @@ -61,6 +61,7 @@ extras() { openrc() { install_if="$pkgname=$pkgver-r$pkgrel openrc" install="$subpkgname.post-install $subpkgname.post-upgrade" + depends="openrc" mkdir -p "$subpkgdir" } diff --git a/main/postmarketos-ui-plasma-mobile/APKBUILD b/main/postmarketos-ui-plasma-mobile/APKBUILD index 0eb6dd82e2..369cabdbc2 100644 --- a/main/postmarketos-ui-plasma-mobile/APKBUILD +++ b/main/postmarketos-ui-plasma-mobile/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Bart Ribbers pkgname=postmarketos-ui-plasma-mobile pkgver=5 -pkgrel=6 +pkgrel=7 pkgdesc="(Wayland) Mobile variant of KDE Plasma (does not run without hardware acceleration)" url="https://wiki.postmarketos.org/wiki/Plasma_Mobile" arch="noarch !armhf !x86" # armhf: pmaports#75, x86: aports#11807 @@ -76,9 +76,10 @@ openrc() { install="$subpkgname.post-install $subpkgname.post-upgrade" depends=" modemmanager-openrc + openrc tinydm tinydm-openrc - " + " mkdir -p "$subpkgdir" } diff --git a/main/postmarketos-ui-sway/APKBUILD b/main/postmarketos-ui-sway/APKBUILD index 99f4948a20..bdc397bc45 100644 --- a/main/postmarketos-ui-sway/APKBUILD +++ b/main/postmarketos-ui-sway/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Oliver Smith pkgname=postmarketos-ui-sway pkgver=3.1 -pkgrel=9 +pkgrel=10 pkgdesc="(Wayland) Tiling WM, drop-in replacement for i3wm (DOES NOT RUN WITHOUT HW ACCELERATION!)" url="https://postmarketos.org" arch="noarch" @@ -58,9 +58,10 @@ openrc() { elogind-openrc modemmanager-openrc networkmanager-openrc + openrc seatd-openrc tinydm-openrc - " + " mkdir -p "$subpkgdir" } diff --git a/main/postmarketos-ui-sxmo-de-dwm/APKBUILD b/main/postmarketos-ui-sxmo-de-dwm/APKBUILD index 6d60541f1e..28be784fb7 100644 --- a/main/postmarketos-ui-sxmo-de-dwm/APKBUILD +++ b/main/postmarketos-ui-sxmo-de-dwm/APKBUILD @@ -5,7 +5,7 @@ # Co-Maintainer: Aren Moynihan pkgname=postmarketos-ui-sxmo-de-dwm pkgver=1.17.1 # Bump this so the file names in bpo are correct -pkgrel=3 +pkgrel=4 pkgdesc="Simple Mobile: Mobile environment based on SXMO and running on dwm" url="http://sr.ht/~mil/Sxmo" # riscv64: builder currently stuck, libphonenumber needs rebuild @@ -19,6 +19,7 @@ depends=" sxmo-utils-dwm sxmo-utils-audio-bluetooth + openrc tinydm-openrc modemmanager-openrc networkmanager-openrc diff --git a/main/postmarketos-ui-sxmo-de-sway/APKBUILD b/main/postmarketos-ui-sxmo-de-sway/APKBUILD index d9520e1226..540938ac0f 100644 --- a/main/postmarketos-ui-sxmo-de-sway/APKBUILD +++ b/main/postmarketos-ui-sxmo-de-sway/APKBUILD @@ -5,7 +5,7 @@ # Co-Maintainer: Aren Moynihan pkgname=postmarketos-ui-sxmo-de-sway pkgver=1.17.1 # Bump this so the file names in bpo are correct -pkgrel=3 +pkgrel=4 pkgdesc="Simple Mobile: Mobile environment based on SXMO and running on sway" url="http://sr.ht/~mil/Sxmo" # riscv64: builder currently stuck, libphonenumber needs rebuild @@ -19,6 +19,7 @@ depends=" sxmo-utils-sway sxmo-utils-audio-bluetooth + openrc seatd-openrc tinydm-openrc modemmanager-openrc diff --git a/main/postmarketos-ui-weston/APKBUILD b/main/postmarketos-ui-weston/APKBUILD index 15e4d346fe..f95a4d030a 100644 --- a/main/postmarketos-ui-weston/APKBUILD +++ b/main/postmarketos-ui-weston/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Bart Ribbers pkgname=postmarketos-ui-weston pkgver=6 -pkgrel=10 +pkgrel=11 pkgdesc="(Wayland) Reference compositor (demo, not a phone interface)" url="https://postmarketos.org" arch="noarch" @@ -48,8 +48,9 @@ openrc() { bluez-openrc elogind-openrc lightdm-openrc + openrc networkmanager-openrc - " + " mkdir -p "$subpkgdir" } diff --git a/main/swclock-offset/APKBUILD b/main/swclock-offset/APKBUILD index c37eb5fa15..11bd24debc 100644 --- a/main/swclock-offset/APKBUILD +++ b/main/swclock-offset/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Jakko pkgname=swclock-offset pkgver=0.2.5 -pkgrel=1 +pkgrel=2 pkgdesc="Keep system time at an offset to a non-writable RTC" url="https://gitlab.postmarketos.org/postmarketOS/swclock-offset" arch="noarch" @@ -17,6 +17,7 @@ package() { openrc() { install="$subpkgname.post-install $subpkgname.pre-deinstall" + depends="openrc" default_openrc } diff --git a/main/ttyescape/APKBUILD b/main/ttyescape/APKBUILD index b80067b14b..c318d1d942 100644 --- a/main/ttyescape/APKBUILD +++ b/main/ttyescape/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Caleb Connolly pkgname=ttyescape pkgver=1.0.1 -pkgrel=3 +pkgrel=4 pkgdesc="Daemon to allow users to escape to a tty" url="https://gitlab.postmarketos.org/postmarketOS/ttyescape" arch="noarch" @@ -27,7 +27,7 @@ package() { openrc() { install="$subpkgname.post-install" - depends="hkdm-openrc" + depends="hkdm-openrc openrc" default_openrc } diff --git a/main/watchdog-kick/APKBUILD b/main/watchdog-kick/APKBUILD index c54265f338..4bc90c3c3a 100644 --- a/main/watchdog-kick/APKBUILD +++ b/main/watchdog-kick/APKBUILD @@ -1,6 +1,6 @@ pkgname=watchdog-kick pkgver=0.1 -pkgrel=2 +pkgrel=3 pkgdesc="Periodically kich watchdogs" url="https://postmarketos.org" arch="noarch" @@ -22,6 +22,7 @@ package() { openrc() { install_if="$pkgname=$pkgver-r$pkgrel openrc" install="$subpkgname.post-install" + depends="openrc" mkdir -p "$subpkgdir" } diff --git a/modem/msm-modem/APKBUILD b/modem/msm-modem/APKBUILD index 3dd8c59e94..e4ab77f812 100644 --- a/modem/msm-modem/APKBUILD +++ b/modem/msm-modem/APKBUILD @@ -1,6 +1,6 @@ pkgname=msm-modem pkgver=8 -pkgrel=0 +pkgrel=1 pkgdesc="Common support for Qualcomm MSM modems" url="https://postmarketos.org/" arch="armhf armv7 aarch64" @@ -38,6 +38,7 @@ uim_selection() { uim_selection_openrc() { install_if="$pkgname-uim-selection=$pkgver-r$pkgrel openrc" install="$subpkgname.post-install" + depends="openrc" install -Dm644 "$srcdir/$pkgname-uim-selection.confd" \ "$subpkgdir/etc/conf.d/$pkgname-uim-selection" @@ -55,6 +56,7 @@ downstream() { downstream_openrc() { install_if="$pkgname-downstream=$pkgver-r$pkgrel openrc" install="$subpkgname.post-install" + depends="openrc" install -Dm755 "$srcdir/$pkgname-downstream.initd" \ "$subpkgdir/etc/init.d/$pkgname-downstream" @@ -62,8 +64,9 @@ downstream_openrc() { openrc() { install_if="$pkgname=$pkgver-r$pkgrel openrc" - depends="rmtfs-openrc" + depends="openrc rmtfs-openrc" install="$subpkgname.post-install" + mkdir -p "$subpkgdir" } diff --git a/modem/samsungipcd/APKBUILD b/modem/samsungipcd/APKBUILD index a7431980fd..f3e5d87ec4 100644 --- a/modem/samsungipcd/APKBUILD +++ b/modem/samsungipcd/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: sleirsgoevy pkgname=samsungipcd pkgver=0.3.0 -pkgrel=0 +pkgrel=1 pkgdesc="AT modem emulation using libsamsung-ipc" url="https://gitlab.com/sleirsgoevy/samsungipcd" arch="all" @@ -34,6 +34,7 @@ package() { openrc() { install_if="$pkgname=$pkgver-r$pkgrel openrc" install="$subpkgname.post-install" + depends="openrc" mkdir -p "$subpkgdir" }