diff --git a/extra-repos/systemd/cups/APKBUILD b/extra-repos/systemd/cups/APKBUILD index ea35f9f4b..5f51c5ce5 100644 --- a/extra-repos/systemd/cups/APKBUILD +++ b/extra-repos/systemd/cups/APKBUILD @@ -4,7 +4,7 @@ maintainer="Jane Rachinger " pkgname=cups pkgver=99992.4.11 _pkgver=2.4.11 -pkgrel=0 +pkgrel=1 pkgdesc="The CUPS Printing System" url="https://github.com/OpenPrinting/cups/" arch="all" @@ -97,11 +97,6 @@ package() { find usr/share/cups/model -name "*.ppd" -exec gzip -n9f {} + } -systemd() { - install="$subpkgname.post-install $subpkgname.pre-deinstall" - default_systemd -} - dev() { default_dev diff --git a/extra-repos/systemd/cups/cups-systemd.post-install b/extra-repos/systemd/cups/cups-systemd.post-install deleted file mode 100644 index 48532d421..000000000 --- a/extra-repos/systemd/cups/cups-systemd.post-install +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh - -. /usr/lib/systemd/systemd-apk-macros.sh -systemd_service_post_install system cups.path cups.socket cups.service diff --git a/extra-repos/systemd/cups/cups-systemd.pre-deinstall b/extra-repos/systemd/cups/cups-systemd.pre-deinstall deleted file mode 100644 index 5603f069b..000000000 --- a/extra-repos/systemd/cups/cups-systemd.pre-deinstall +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh - -. /usr/lib/systemd/systemd-apk-macros.sh -systemd_service_pre_deinstall system cups.path cups.socket cups.service diff --git a/extra-repos/systemd/gdm/APKBUILD b/extra-repos/systemd/gdm/APKBUILD index b5cdd23d9..b941467c4 100644 --- a/extra-repos/systemd/gdm/APKBUILD +++ b/extra-repos/systemd/gdm/APKBUILD @@ -3,7 +3,7 @@ pkgname=gdm pkgver=99948.0 _pkgver=48.0 -pkgrel=0 +pkgrel=1 pkgdesc="GNOME display manager" url="https://wiki.gnome.org/Projects/GDM" # blocked by gnome-shell @@ -76,11 +76,6 @@ package() { install -m755 -D "$srcdir/Xsession" "$pkgdir"/etc/gdm } -systemd() { - install="$subpkgname.post-install $subpkgname.pre-deinstall" - default_systemd -} - sha512sums=" 3e4a320cc6a0b43d65122bacd2b99531695f20ec809a767b957d63a511e00da017a9a4abe815596c6ad1398c5d427418d5c51bf6162216f60fdae5e8095bd305 gdm-48.0.tar.xz aa302c33c9b31e823ab98ca80c330c3f7eaa10d05c402cf111d78a35fbec82ce90bff34c19b713b6e352428c31df91f04bd01b58cae8968e130a991c73382020 0001-DOWNSTREAM-use-bin-touch-instead-of-usr-bin-touch.patch diff --git a/extra-repos/systemd/gdm/gdm-systemd.post-install b/extra-repos/systemd/gdm/gdm-systemd.post-install deleted file mode 100644 index 2f4e18802..000000000 --- a/extra-repos/systemd/gdm/gdm-systemd.post-install +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh - -. /usr/lib/systemd/systemd-apk-macros.sh -systemd_service_post_install system gdm.service diff --git a/extra-repos/systemd/gdm/gdm-systemd.pre-deinstall b/extra-repos/systemd/gdm/gdm-systemd.pre-deinstall deleted file mode 100644 index 7aa42a6e0..000000000 --- a/extra-repos/systemd/gdm/gdm-systemd.pre-deinstall +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh - -. /usr/lib/systemd/systemd-apk-macros.sh -systemd_service_pre_deinstall system gdm.service diff --git a/extra-repos/systemd/gnome-keyring/APKBUILD b/extra-repos/systemd/gnome-keyring/APKBUILD index 7593dba2b..5996f3e1e 100644 --- a/extra-repos/systemd/gnome-keyring/APKBUILD +++ b/extra-repos/systemd/gnome-keyring/APKBUILD @@ -4,7 +4,7 @@ pkgname=gnome-keyring pkgver=99946.2 _pkgver=46.2 -pkgrel=0 +pkgrel=1 pkgdesc="GNOME keyring" url="https://wiki.gnome.org//Projects/GnomeKeyring" arch="all" @@ -67,11 +67,6 @@ package() { make DESTDIR="$pkgdir" install } -systemd() { - install="$subpkgname.post-install $subpkgname.pre-deinstall" - default_systemd -} - sha512sums=" 4229ca0606bdd1b84a3c737288df7f1fc1f8715734e3001964babd882201c3d818deabb3a7662dbf9b67316f03b234de84da3128fb991a500ef8305c2f962ba2 gnome-keyring-46.2.tar.xz 53e04eade3579fe5d65d11d6cde6c5fdffc9f73a3a7f372b1f4dbc7437212e753123c12854d3a5a7a22f3beb1b00604eec0371615ceb0f7024cb38cf35e33065 0001-build-Use-p11_module_configs-as-default-pkcs11-confi.patch diff --git a/extra-repos/systemd/gnome-keyring/gnome-keyring-systemd.post-install b/extra-repos/systemd/gnome-keyring/gnome-keyring-systemd.post-install deleted file mode 100644 index 1efcbd88d..000000000 --- a/extra-repos/systemd/gnome-keyring/gnome-keyring-systemd.post-install +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh - -. /usr/lib/systemd/systemd-apk-macros.sh -systemd_service_post_install user gnome-keyring-daemon diff --git a/extra-repos/systemd/gnome-keyring/gnome-keyring-systemd.pre-deinstall b/extra-repos/systemd/gnome-keyring/gnome-keyring-systemd.pre-deinstall deleted file mode 100644 index 9c81b1f67..000000000 --- a/extra-repos/systemd/gnome-keyring/gnome-keyring-systemd.pre-deinstall +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh - -. /usr/lib/systemd/systemd-apk-macros.sh -systemd_service_pre_deinstall user gnome-keyring-daemon diff --git a/extra-repos/systemd/networkmanager/APKBUILD b/extra-repos/systemd/networkmanager/APKBUILD index 1c12d5a64..e639231bf 100644 --- a/extra-repos/systemd/networkmanager/APKBUILD +++ b/extra-repos/systemd/networkmanager/APKBUILD @@ -5,7 +5,7 @@ maintainer="Jane Rachinger " pkgname=networkmanager pkgver=9991.52.0 _pkgver=1.52.0 -pkgrel=0 +pkgrel=1 pkgdesc="Network Management daemon" url="https://wiki.gnome.org/Projects/NetworkManager" arch="all" @@ -232,11 +232,6 @@ _default_plugin() { amove $_plugindir/libnm*-${subpkgname#"$pkgname"-}.so } -systemd() { - install="$subpkgname.post-install $subpkgname.pre-deinstall" - default_systemd -} - sha512sums=" 6669467bad7a4965b92124506d25649bd6c95e90c34213edb3f854df9a163507ac5dd381ff53800254a2db703f23233f8dc5b59a75042532bd573fc8c7022158 networkmanager-1.52.0.tar.gz 0f79016bf717dea43830962f524deae8d1cedc274376e40bd912ebe63208c5b1c3b7a5aa14379da19020c587dbd5588df2f0066ca1540070a226983a43e4159b networkmanager.conf diff --git a/extra-repos/systemd/networkmanager/networkmanager-systemd.post-install b/extra-repos/systemd/networkmanager/networkmanager-systemd.post-install deleted file mode 100644 index f8ed7b484..000000000 --- a/extra-repos/systemd/networkmanager/networkmanager-systemd.post-install +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh - -. /usr/lib/systemd/systemd-apk-macros.sh -systemd_service_post_install system NetworkManager.service diff --git a/extra-repos/systemd/networkmanager/networkmanager-systemd.pre-deinstall b/extra-repos/systemd/networkmanager/networkmanager-systemd.pre-deinstall deleted file mode 100644 index 3e0bac9a2..000000000 --- a/extra-repos/systemd/networkmanager/networkmanager-systemd.pre-deinstall +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh - -. /usr/lib/systemd/systemd-apk-macros.sh -systemd_service_pre_deinstall system NetworkManager.service diff --git a/extra-repos/systemd/pipewire/APKBUILD b/extra-repos/systemd/pipewire/APKBUILD index 1ff65eab3..e6410d647 100644 --- a/extra-repos/systemd/pipewire/APKBUILD +++ b/extra-repos/systemd/pipewire/APKBUILD @@ -3,7 +3,7 @@ pkgname=pipewire pkgver=9991.4.1 _pkgver=1.4.1 -pkgrel=0 +pkgrel=1 _so_ver=0.3 pkgdesc="Multimedia processing graphs" url="https://pipewire.org/" @@ -49,6 +49,7 @@ subpackages=" $pkgname-doc $pkgname-alsa $pkgname-pulse + $pkgname-pulse-systemd:pulse_systemd $pkgname-jack $pkgname-jack-dev:jackdev $pkgname-dev @@ -60,8 +61,9 @@ subpackages=" $pkgname-spa-tools:spa_tools $pkgname-lang $pkgname-echo-cancel:echo_cancel + $pkgname-systemd " -install="$pkgname.post-upgrade $pkgname.post-install $pkgname.pre-deinstall" +install="$pkgname.post-upgrade $pkgname.post-install" source="$pkgname-$_pkgver.tar.gz::https://github.com/PipeWire/pipewire/archive/refs/tags/$_pkgver.tar.gz pipewire.desktop pipewire-launcher.sh @@ -143,7 +145,6 @@ pulse() { " provides="pulseaudio=$pkgver-r$pkgrel pulseaudio-bluez=$pkgver-r$pkgrel" provider_priority=1 - install="$subpkgname.post-install $subpkgname.pre-deinstall" amove usr/bin/pipewire-pulse amove usr/lib/pipewire-$_so_ver/libpipewire-module-protocol-pulse.so @@ -151,8 +152,15 @@ pulse() { amove usr/lib/pipewire-$_so_ver/libpipewire-module-filter-chain.so amove usr/share/pipewire/pipewire-pulse.conf amove usr/share/pipewire/pipewire-pulse.conf.avail +} + +pulse_systemd() { amove usr/lib/systemd/user/pipewire-pulse.service amove usr/lib/systemd/user/pipewire-pulse.socket + + # We can't just call default_systemd because that would take + # all the systemd unit files! + default_systemd_install_scripts } jack() { diff --git a/extra-repos/systemd/pipewire/pipewire-pulse.post-install b/extra-repos/systemd/pipewire/pipewire-pulse.post-install deleted file mode 100644 index f442288f1..000000000 --- a/extra-repos/systemd/pipewire/pipewire-pulse.post-install +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh - -. /usr/lib/systemd/systemd-apk-macros.sh -systemd_service_post_install user pipewire-pulse.socket diff --git a/extra-repos/systemd/pipewire/pipewire-pulse.pre-deinstall b/extra-repos/systemd/pipewire/pipewire-pulse.pre-deinstall deleted file mode 100644 index d060ead84..000000000 --- a/extra-repos/systemd/pipewire/pipewire-pulse.pre-deinstall +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh - -. /usr/lib/systemd/systemd-apk-macros.sh -systemd_service_pre_deinstall user pipewire-pulse.socket diff --git a/extra-repos/systemd/pipewire/pipewire.post-install b/extra-repos/systemd/pipewire/pipewire.post-install index 05a31c01a..b29403850 100644 --- a/extra-repos/systemd/pipewire/pipewire.post-install +++ b/extra-repos/systemd/pipewire/pipewire.post-install @@ -1,6 +1,3 @@ #!/bin/sh addgroup -S pipewire 2>/dev/null - -. /usr/lib/systemd/systemd-apk-macros.sh -systemd_service_post_install user pipewire.socket diff --git a/extra-repos/systemd/pipewire/pipewire.pre-deinstall b/extra-repos/systemd/pipewire/pipewire.pre-deinstall deleted file mode 100644 index 1e862e380..000000000 --- a/extra-repos/systemd/pipewire/pipewire.pre-deinstall +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh - -. /usr/lib/systemd/systemd-apk-macros.sh -systemd_service_pre_deinstall user pipewire.socket diff --git a/extra-repos/systemd/postmarketos-base-systemd/APKBUILD b/extra-repos/systemd/postmarketos-base-systemd/APKBUILD index 3ea65690c..e727d2889 100644 --- a/extra-repos/systemd/postmarketos-base-systemd/APKBUILD +++ b/extra-repos/systemd/postmarketos-base-systemd/APKBUILD @@ -2,7 +2,7 @@ # Co-maintainer: Clayton Craft # pmbootstrap installs this, if systemd is selected in "pmbootstrap init". pkgname=postmarketos-base-systemd -pkgver=34 +pkgver=35 pkgrel=0 pkgdesc="Meta package for running postmarketOS with systemd" url="https://postmarketos.org" diff --git a/extra-repos/systemd/postmarketos-base-systemd/postmarketos-base-systemd.post-install b/extra-repos/systemd/postmarketos-base-systemd/postmarketos-base-systemd.post-install index edce36109..654fc88ae 100644 --- a/extra-repos/systemd/postmarketos-base-systemd/postmarketos-base-systemd.post-install +++ b/extra-repos/systemd/postmarketos-base-systemd/postmarketos-base-systemd.post-install @@ -1,7 +1,5 @@ #!/bin/sh -. /usr/lib/systemd/systemd-apk-macros.sh - system_preset_path="/usr/lib/systemd/system-preset/90-base.preset" user_preset_path="/usr/lib/systemd/user-preset/90-base.preset" @@ -89,8 +87,10 @@ policy_changed() { check_and_apply_presets() { local type="$1" local preset_path="" + local extra_args="" if [ "$type" = user ]; then preset_path="$user_preset_path" + extra_args="--global" else preset_path="$system_preset_path" type="system" @@ -106,7 +106,7 @@ check_and_apply_presets() { echo " wildcards are not supported yet, skipping" else if [ -f "/usr/lib/systemd/$type/$entry" ]; then - systemd_service_post_install "$type" "$entry" + systemctl --no-reload preset $extra_args "$entry" else echo " no unit file found, skipping" fi diff --git a/extra-repos/systemd/wireplumber/APKBUILD b/extra-repos/systemd/wireplumber/APKBUILD index 676a11f86..31eb1838c 100644 --- a/extra-repos/systemd/wireplumber/APKBUILD +++ b/extra-repos/systemd/wireplumber/APKBUILD @@ -3,7 +3,7 @@ pkgname=wireplumber pkgver=9990.5.8 _pkgver=0.5.8 -pkgrel=0 +pkgrel=1 pkgdesc="Session / policy manager implementation for PipeWire" url="https://pipewire.org/" arch="all" @@ -30,12 +30,12 @@ subpackages=" $pkgname-lang $pkgname-zsh-completion $pkgname-doc + $pkgname-systemd " source="https://gitlab.freedesktop.org/PipeWire/wireplumber/-/archive/$_pkgver/wireplumber-$_pkgver.tar.gz" provides="pipewire-session-manager" provider_priority=50 -install="$pkgname.post-install $pkgname.pre-deinstall" builddir="$srcdir/$pkgname-$_pkgver" case "$CARCH" in diff --git a/extra-repos/systemd/wireplumber/wireplumber.post-install b/extra-repos/systemd/wireplumber/wireplumber.post-install deleted file mode 100644 index 99a3bf415..000000000 --- a/extra-repos/systemd/wireplumber/wireplumber.post-install +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh - -. /usr/lib/systemd/systemd-apk-macros.sh -systemd_service_post_install user wireplumber.service diff --git a/extra-repos/systemd/wireplumber/wireplumber.pre-deinstall b/extra-repos/systemd/wireplumber/wireplumber.pre-deinstall deleted file mode 100644 index 052917b0e..000000000 --- a/extra-repos/systemd/wireplumber/wireplumber.pre-deinstall +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh - -. /usr/lib/systemd/systemd-apk-macros.sh -systemd_service_pre_deinstall user wireplumber.service diff --git a/main/bootmac/APKBUILD b/main/bootmac/APKBUILD index ae4d58c5d..b250161eb 100644 --- a/main/bootmac/APKBUILD +++ b/main/bootmac/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Dylan Van Assche pkgname=bootmac pkgver=0.6.0 -pkgrel=0 +pkgrel=1 pkgdesc="Configure MAC addresses at boot" url="https://gitlab.postmarketos.org/postmarketOS/bootmac" arch="all" @@ -29,11 +29,6 @@ openrc() { amove usr/lib/udev/rules.d/90-bootmac-wifi.rules } -systemd() { - install="$subpkgname.post-install $subpkgname.pre-deinstall" - default_systemd -} - sha512sums=" 164f35b2e008aa0f7b7ad42338e46d8fdac1ec2d4403123b390706437603b1d2060659130a477823734fbda56fa45e9987fb9a2c08cf1e87adebea979e634bbb bootmac-v0.6.0.tar.gz " diff --git a/main/bootmac/bootmac-systemd.post-install b/main/bootmac/bootmac-systemd.post-install deleted file mode 100644 index 60073166b..000000000 --- a/main/bootmac/bootmac-systemd.post-install +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh - -. /usr/lib/systemd/systemd-apk-macros.sh -systemd_service_post_install system bootmac-bluetooth.service diff --git a/main/bootmac/bootmac-systemd.pre-deinstall b/main/bootmac/bootmac-systemd.pre-deinstall deleted file mode 100644 index 145d9711d..000000000 --- a/main/bootmac/bootmac-systemd.pre-deinstall +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh - -. /usr/lib/systemd/systemd-apk-macros.sh -systemd_service_pre_deinstall system bootmac-bluetooth.service diff --git a/main/hexagonfs-firmware-loader/APKBUILD b/main/hexagonfs-firmware-loader/APKBUILD index 66af90ae4..67ff7cb9b 100644 --- a/main/hexagonfs-firmware-loader/APKBUILD +++ b/main/hexagonfs-firmware-loader/APKBUILD @@ -1,6 +1,6 @@ pkgname=hexagonfs-firmware-loader pkgver=1.0.0 -pkgrel=0 +pkgrel=1 pkgdesc="Prepare the HexagonFS directory from msm-firmware-loader mounts" url="https://postmarketos.org/" subpackages="$pkgname-openrc $pkgname-systemd" @@ -42,11 +42,6 @@ openrc() { default_openrc } -systemd() { - install="$subpkgname.post-install $subpkgname.pre-deinstall" - default_systemd -} - sha512sums=" 64c50d1e92cc29b3e8c0e5ee0c14603c5d3b6c9f9671038928cb3093a1276e6004452e55c5f7e3793b72bbc0a7dc48063ed29ba779ece2edea5ac743fa1ec473 hexagonrpcd.confd 77c2d49b21afab2ae848d9f32bb88b7bc10c10215ed4f418e8c71ed4e5772ef5a67eded5f420244de66f90b1bb9f53c168395b9587c50a8c1903556acb6b2c7d hexagonfs-firmware-loader-1.0.0.tar.gz diff --git a/main/hexagonfs-firmware-loader/hexagonfs-firmware-loader-systemd.post-install b/main/hexagonfs-firmware-loader/hexagonfs-firmware-loader-systemd.post-install deleted file mode 100644 index 63ea5ecdf..000000000 --- a/main/hexagonfs-firmware-loader/hexagonfs-firmware-loader-systemd.post-install +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh - -. /usr/lib/systemd/systemd-apk-macros.sh -systemd_service_post_install system hexagonfs-firmware-loader diff --git a/main/hexagonfs-firmware-loader/hexagonfs-firmware-loader-systemd.pre-deinstall b/main/hexagonfs-firmware-loader/hexagonfs-firmware-loader-systemd.pre-deinstall deleted file mode 100644 index 07463ef81..000000000 --- a/main/hexagonfs-firmware-loader/hexagonfs-firmware-loader-systemd.pre-deinstall +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh - -. /usr/lib/systemd/systemd-apk-macros.sh -systemd_service_pre_deinstall system hexagonfs-firmware-loader diff --git a/main/msm-firmware-loader/APKBUILD b/main/msm-firmware-loader/APKBUILD index cb4ddba9c..17a2960f0 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=0 +pkgrel=1 pkgdesc="Set of init services to automatically load firmware from device partitions" url="https://postmarketos.org/" subpackages="$pkgname-openrc $pkgname-systemd $pkgname-wcnss" @@ -40,11 +40,6 @@ openrc() { default_openrc } -systemd() { - install="$subpkgname.post-install $subpkgname.pre-deinstall" - default_systemd -} - wcnss() { pkgdesc="Use WiFi/BT firmware from stock firmware partition using $pkgname" provides="firmware-qcom-msm8916-wcnss=$pkgver-r$pkgrel" diff --git a/main/msm-firmware-loader/msm-firmware-loader-systemd.post-install b/main/msm-firmware-loader/msm-firmware-loader-systemd.post-install deleted file mode 100644 index 2932d4480..000000000 --- a/main/msm-firmware-loader/msm-firmware-loader-systemd.post-install +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh - -. /usr/lib/systemd/systemd-apk-macros.sh -systemd_service_post_install system msm-firmware-loader msm-firmware-loader-unpack diff --git a/main/msm-firmware-loader/msm-firmware-loader-systemd.pre-deinstall b/main/msm-firmware-loader/msm-firmware-loader-systemd.pre-deinstall deleted file mode 100644 index a53a87cbb..000000000 --- a/main/msm-firmware-loader/msm-firmware-loader-systemd.pre-deinstall +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh - -. /usr/lib/systemd/systemd-apk-macros.sh -systemd_service_pre_deinstall system msm-firmware-loader msm-firmware-loader-unpack diff --git a/main/postmarketos-ui-buffyboard/APKBUILD b/main/postmarketos-ui-buffyboard/APKBUILD index 8b58a267d..46a38398a 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=0 +pkgrel=1 pkgdesc="Plain framebuffer console with modern touchscreen keyboard support" url="https://gitlab.postmarketos.org/postmarketOS/buffybox" arch="all" @@ -32,11 +32,6 @@ openrc() { mkdir -p "$subpkgdir" } -systemd() { - install="$subpkgname.post-install $subpkgname.pre-deinstall" - default_systemd -} - sha512sums=" 81178d6f86dbe24c8ddfd0c1c29504f12941232f11124d21aedde54d2a82c34e03fba8e82e5bbc285d94e216e812763291787e086b51e8eb258562714e4dadcd buffyboard.init 0bf529465d5d882e64f1804c0a809bc38c1fbadaf52b276848708c761d53014c8d302c2573200d2f831090d6833abc6da6f89f28e9b309dc63f9ca10d148b4b2 buffyboard.service diff --git a/main/postmarketos-ui-buffyboard/postmarketos-ui-buffyboard-systemd.post-install b/main/postmarketos-ui-buffyboard/postmarketos-ui-buffyboard-systemd.post-install deleted file mode 100644 index 94ba57e9f..000000000 --- a/main/postmarketos-ui-buffyboard/postmarketos-ui-buffyboard-systemd.post-install +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh - -# This file is forcefully included into CI shellcheck by: -# $(find . -path './main/postmarketos-ui-*/*.post-install') -# in .ci/shellcheck.sh. Silence it here to avoid error: -# SC1091 (info): Not following: /usr/lib/systemd/systemd-apk-macros.sh: -# openBinaryFile: does not exist (No such file or directory) -# shellcheck disable=SC1091 -. /usr/lib/systemd/systemd-apk-macros.sh -systemd_service_post_install system buffyboard diff --git a/main/postmarketos-ui-buffyboard/postmarketos-ui-buffyboard-systemd.pre-deinstall b/main/postmarketos-ui-buffyboard/postmarketos-ui-buffyboard-systemd.pre-deinstall deleted file mode 100644 index 79ffb7171..000000000 --- a/main/postmarketos-ui-buffyboard/postmarketos-ui-buffyboard-systemd.pre-deinstall +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh - -# This file is forcefully included into CI shellcheck by: -# $(find . -path './main/postmarketos-ui-*/*.pre-deinstall') -# in .ci/shellcheck.sh. Silence it here to avoid error: -# SC1091 (info): Not following: /usr/lib/systemd/systemd-apk-macros.sh: -# openBinaryFile: does not exist (No such file or directory) -# shellcheck disable=SC1091 -. /usr/lib/systemd/systemd-apk-macros.sh -systemd_service_pre_deinstall system buffyboard diff --git a/main/postmarketos-ui-fbkeyboard/APKBUILD b/main/postmarketos-ui-fbkeyboard/APKBUILD index 5c56ec747..4f3260821 100644 --- a/main/postmarketos-ui-fbkeyboard/APKBUILD +++ b/main/postmarketos-ui-fbkeyboard/APKBUILD @@ -1,7 +1,7 @@ # Reference: https://postmarketos.org/uipkg # Maintainer: Ferenc Bakonyi pkgname=postmarketos-ui-fbkeyboard -pkgver=4 +pkgver=5 pkgrel=0 pkgdesc="Plain framebuffer console with touchscreen keyboard support" url="https://github.com/bakonyiferenc/fbkeyboard" @@ -32,11 +32,6 @@ openrc() { mkdir -p "$subpkgdir" } -systemd() { - install="$subpkgname.post-install $subpkgname.pre-deinstall" - default_systemd -} - sha512sums=" bed2c48abfac7cc9bc16fb16cd3ae3a7048121d2867b961458f0d3a9520e16598c8115a7b00808bded64904956aea445fa31a3106c52bab87cfba3420be309b8 fbkeyboard.init 5b70d6087a4448673a4f3f1868ee93f67517edcdf02a6aeec7381b9c91e43cf213a96714388b437497026188276f9c55e759c9fb75e3465422188e9cd00724c9 fbkeyboard.service diff --git a/main/postmarketos-ui-fbkeyboard/postmarketos-ui-fbkeyboard-systemd.post-install b/main/postmarketos-ui-fbkeyboard/postmarketos-ui-fbkeyboard-systemd.post-install deleted file mode 100644 index 091d9be54..000000000 --- a/main/postmarketos-ui-fbkeyboard/postmarketos-ui-fbkeyboard-systemd.post-install +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh - -# This file is forcefully included into CI shellcheck by: -# $(find . -path './main/postmarketos-ui-*/*.post-install') -# in .ci/shellcheck.sh. Silence it here to avoid error: -# SC1091 (info): Not following: /usr/lib/systemd/systemd-apk-macros.sh: -# openBinaryFile: does not exist (No such file or directory) -# shellcheck disable=SC1091 -. /usr/lib/systemd/systemd-apk-macros.sh -systemd_service_post_install system fbkeyboard diff --git a/main/postmarketos-ui-fbkeyboard/postmarketos-ui-fbkeyboard-systemd.pre-deinstall b/main/postmarketos-ui-fbkeyboard/postmarketos-ui-fbkeyboard-systemd.pre-deinstall deleted file mode 100644 index aa92c5de8..000000000 --- a/main/postmarketos-ui-fbkeyboard/postmarketos-ui-fbkeyboard-systemd.pre-deinstall +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh - -# This file is forcefully included into CI shellcheck by: -# $(find . -path './main/postmarketos-ui-*/*.pre-deinstall') -# in .ci/shellcheck.sh. Silence it here to avoid error: -# SC1091 (info): Not following: /usr/lib/systemd/systemd-apk-macros.sh: -# openBinaryFile: does not exist (No such file or directory) -# shellcheck disable=SC1091 -. /usr/lib/systemd/systemd-apk-macros.sh -systemd_service_pre_deinstall system fbkeyboard diff --git a/main/swclock-offset/APKBUILD b/main/swclock-offset/APKBUILD index 4176a9f27..c37eb5fa1 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=0 +pkgrel=1 pkgdesc="Keep system time at an offset to a non-writable RTC" url="https://gitlab.postmarketos.org/postmarketOS/swclock-offset" arch="noarch" @@ -15,13 +15,6 @@ package() { make DESTDIR="$pkgdir" install } -systemd() { - install="$subpkgname.post-install $subpkgname.pre-deinstall" - install_if="$pkgname=$pkgver-r$pkgrel systemd" - - amove usr/lib/systemd -} - openrc() { install="$subpkgname.post-install $subpkgname.pre-deinstall" default_openrc diff --git a/main/swclock-offset/swclock-offset-systemd.post-install b/main/swclock-offset/swclock-offset-systemd.post-install deleted file mode 100644 index 9309c2c00..000000000 --- a/main/swclock-offset/swclock-offset-systemd.post-install +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh - -. /usr/lib/systemd/systemd-apk-macros.sh -systemd_service_post_install system swclock-offset-boot.service -systemd_service_post_install system swclock-offset-shutdown.service diff --git a/main/swclock-offset/swclock-offset-systemd.pre-deinstall b/main/swclock-offset/swclock-offset-systemd.pre-deinstall deleted file mode 100644 index d620575dd..000000000 --- a/main/swclock-offset/swclock-offset-systemd.pre-deinstall +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh - -. /usr/lib/systemd/systemd-apk-macros.sh -systemd_service_pre_deinstall system swclock-offset-boot.service -systemd_service_pre_deinstall system swclock-offset-shutdown.service