From 6e00f34f61d01370dfc74c9c4f2b4ddc23050822 Mon Sep 17 00:00:00 2001 From: Jakob Hauser Date: Sun, 27 Oct 2024 14:08:10 +0100 Subject: [PATCH] main/postmarketos-ui-{mate,xfce4}: separate openrc and main post-install scripts (MR 5735) Split the post-install scripts for the main package and the openrc subpackage. They act on different things. [ci:skip-build]: already built successfully in CI --- main/postmarketos-ui-mate/APKBUILD | 3 ++- .../postmarketos-ui-mate-openrc.post-install | 2 -- main/postmarketos-ui-mate/postmarketos-ui-mate.post-install | 3 +++ main/postmarketos-ui-mate/postmarketos-ui-mate.post-upgrade | 1 + main/postmarketos-ui-xfce4/APKBUILD | 3 ++- .../postmarketos-ui-xfce4-openrc.post-install | 2 -- main/postmarketos-ui-xfce4/postmarketos-ui-xfce4.post-install | 3 +++ main/postmarketos-ui-xfce4/postmarketos-ui-xfce4.post-upgrade | 1 + 8 files changed, 12 insertions(+), 6 deletions(-) create mode 100644 main/postmarketos-ui-mate/postmarketos-ui-mate.post-install create mode 120000 main/postmarketos-ui-mate/postmarketos-ui-mate.post-upgrade create mode 100644 main/postmarketos-ui-xfce4/postmarketos-ui-xfce4.post-install create mode 120000 main/postmarketos-ui-xfce4/postmarketos-ui-xfce4.post-upgrade diff --git a/main/postmarketos-ui-mate/APKBUILD b/main/postmarketos-ui-mate/APKBUILD index c93532c70..0a30a18a8 100644 --- a/main/postmarketos-ui-mate/APKBUILD +++ b/main/postmarketos-ui-mate/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Jakko pkgname=postmarketos-ui-mate pkgver=7 -pkgrel=4 +pkgrel=5 pkgdesc="(X11) MATE Desktop Environment, fork of GNOME2 (stylus recommended)" url="http://mate-desktop.org/" arch="noarch" @@ -32,6 +32,7 @@ _pmb_recommends=" onboard unclutter-xfixes " +install="$pkgname.post-install $pkgname.post-upgrade" subpackages="$pkgname-openrc" source=" 000-system-background.gschema.override diff --git a/main/postmarketos-ui-mate/postmarketos-ui-mate-openrc.post-install b/main/postmarketos-ui-mate/postmarketos-ui-mate-openrc.post-install index 0b69b4218..537ded9ac 100644 --- a/main/postmarketos-ui-mate/postmarketos-ui-mate-openrc.post-install +++ b/main/postmarketos-ui-mate/postmarketos-ui-mate-openrc.post-install @@ -1,7 +1,5 @@ #!/bin/sh -sed -i "s/username/$(getent passwd 10000 | cut -d: -f1)/g" /usr/share/lightdm/lightdm.conf.d/61-autologin.conf - rc-update add bluetooth default rc-update add elogind default rc-update add lightdm default diff --git a/main/postmarketos-ui-mate/postmarketos-ui-mate.post-install b/main/postmarketos-ui-mate/postmarketos-ui-mate.post-install new file mode 100644 index 000000000..93e5a03c0 --- /dev/null +++ b/main/postmarketos-ui-mate/postmarketos-ui-mate.post-install @@ -0,0 +1,3 @@ +#!/bin/sh + +sed -i "s/username/$(getent passwd 10000 | cut -d: -f1)/g" /usr/share/lightdm/lightdm.conf.d/61-autologin.conf diff --git a/main/postmarketos-ui-mate/postmarketos-ui-mate.post-upgrade b/main/postmarketos-ui-mate/postmarketos-ui-mate.post-upgrade new file mode 120000 index 000000000..aaafebeb2 --- /dev/null +++ b/main/postmarketos-ui-mate/postmarketos-ui-mate.post-upgrade @@ -0,0 +1 @@ +postmarketos-ui-mate.post-install \ No newline at end of file diff --git a/main/postmarketos-ui-xfce4/APKBUILD b/main/postmarketos-ui-xfce4/APKBUILD index 4a3283aa8..c3a15aa2c 100644 --- a/main/postmarketos-ui-xfce4/APKBUILD +++ b/main/postmarketos-ui-xfce4/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Jakko pkgname=postmarketos-ui-xfce4 pkgver=0.5.2 -pkgrel=4 +pkgrel=5 pkgdesc="(X11) Lightweight desktop (stylus recommended)" url="https://gitlab.postmarketos.org/postmarketOS/xfce4-phone" arch="noarch" @@ -37,6 +37,7 @@ _pmb_recommends=" xfce4-terminal xfce4-whiskermenu-plugin " +install="$pkgname.post-install $pkgname.post-upgrade" subpackages="$pkgname-openrc" source=" xfce4-phone-$pkgver.tar.gz::https://gitlab.postmarketos.org/postmarketOS/xfce4-phone/-/archive/$pkgver/xfce4-phone-$pkgver.tar.gz diff --git a/main/postmarketos-ui-xfce4/postmarketos-ui-xfce4-openrc.post-install b/main/postmarketos-ui-xfce4/postmarketos-ui-xfce4-openrc.post-install index 2314d9a4e..537ded9ac 100644 --- a/main/postmarketos-ui-xfce4/postmarketos-ui-xfce4-openrc.post-install +++ b/main/postmarketos-ui-xfce4/postmarketos-ui-xfce4-openrc.post-install @@ -1,7 +1,5 @@ #!/bin/sh -sed -i "s/username/$(getent passwd 10000 | cut -d: -f1)/g" /usr/share/lightdm/lightdm.conf.d/64-autologin.conf - rc-update add bluetooth default rc-update add elogind default rc-update add lightdm default diff --git a/main/postmarketos-ui-xfce4/postmarketos-ui-xfce4.post-install b/main/postmarketos-ui-xfce4/postmarketos-ui-xfce4.post-install new file mode 100644 index 000000000..a5c4806d5 --- /dev/null +++ b/main/postmarketos-ui-xfce4/postmarketos-ui-xfce4.post-install @@ -0,0 +1,3 @@ +#!/bin/sh + +sed -i "s/username/$(getent passwd 10000 | cut -d: -f1)/g" /usr/share/lightdm/lightdm.conf.d/64-autologin.conf diff --git a/main/postmarketos-ui-xfce4/postmarketos-ui-xfce4.post-upgrade b/main/postmarketos-ui-xfce4/postmarketos-ui-xfce4.post-upgrade new file mode 120000 index 000000000..a52dea4b9 --- /dev/null +++ b/main/postmarketos-ui-xfce4/postmarketos-ui-xfce4.post-upgrade @@ -0,0 +1 @@ +postmarketos-ui-xfce4.post-install \ No newline at end of file