forge/pmaports
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases Packages Wiki Activity Actions

main/postmarketos-ui-{i3wm,kodi,mate,plasma-mobile,sway,weston,xfce4}: fix conflicting autologin file (MR 1238)

Browse source
This commit is contained in:
Raatty 2020-05-16 17:53:02 +12:00 committed by Bart Ribbers
parent 7dcfb89c5f
commit d2bb9c2b1d
No known key found for this signature in database
GPG key ID: 699D16185DAFAE61
25 changed files with 46 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

0
main/postmarketos-ui-i3wm/60-lightdm-autologin.conf → main/postmarketos-ui-i3wm/65-lightdm-autologin.conf
View file

10
main/postmarketos-ui-i3wm/APKBUILD
View file

@ -1,22 +1,22 @@
# Maintainer: Martijn Braam <martijn@brixit.nl>
pkgname=postmarketos-ui-i3wm
pkgver=0.3
pkgrel=5
pkgrel=6
pkgdesc="(X11) Tiling WM (keyboard required)"
url="https://i3wm.org"
arch="noarch"
license="GPL-3.0-or-later"
depends="xorg-server mesa-egl i3wm i3status dmenu xset xinput st lightdm lightdm-openrc elogind"
install="$pkgname.post-install $pkgname.pre-deinstall $pkgname.post-deinstall $pkgname.post-upgrade"
source="lock.sh 60-lightdm-autologin.conf"
source="lock.sh 65-lightdm-autologin.conf"
options="!check"
package() {
install -Dm755 "$srcdir"/lock.sh \
"$pkgdir"/usr/bin/lock.sh
install -Dm644 "$srcdir"/60-lightdm-autologin.conf \
"$pkgdir"/usr/share/lightdm/lightdm.conf.d/60-autologin.conf
install -Dm644 "$srcdir"/65-lightdm-autologin.conf \
"$pkgdir"/usr/share/lightdm/lightdm.conf.d/65-autologin.conf
}
sha512sums="2165141499a830beb33ee42e410ba39104f3e70cd61507f0607115d421846104659fa7e9d4193b3394f7384fc33c2233269bb61c99d5d8a2368aa83500e54b35 lock.sh
60f4e1f3314ce8de6b92a2eb642f199c5ed24a18981958d787f0e876fa629598340cf467ab991dda4e3927ed6b11011dc0357bdcf0e5f1baac444939b4647445 60-lightdm-autologin.conf"
60f4e1f3314ce8de6b92a2eb642f199c5ed24a18981958d787f0e876fa629598340cf467ab991dda4e3927ed6b11011dc0357bdcf0e5f1baac444939b4647445 65-lightdm-autologin.conf"

2
main/postmarketos-ui-i3wm/postmarketos-ui-i3wm.post-deinstall
View file

@ -1,3 +1,3 @@
#!/bin/sh
rm /usr/share/lightdm/lightdm.conf.d/60-autologin.conf
rm /usr/share/lightdm/lightdm.conf.d/65-autologin.conf

2
main/postmarketos-ui-i3wm/postmarketos-ui-i3wm.post-install
View file

@ -1,4 +1,4 @@
#!/bin/sh
sed -i "s/username/$(getent passwd 10000 | cut -d: -f1)/g" /usr/share/lightdm/lightdm.conf.d/60-autologin.conf
sed -i "s/username/$(getent passwd 10000 | cut -d: -f1)/g" /usr/share/lightdm/lightdm.conf.d/65-autologin.conf
rc-update add lightdm default

2
main/postmarketos-ui-i3wm/postmarketos-ui-i3wm.post-upgrade
View file

@ -1,4 +1,4 @@
#!/bin/sh
sed -i "s/username/$(getent passwd 10000 | cut -d: -f1)/g" /usr/share/lightdm/lightdm.conf.d/60-autologin.conf
sed -i "s/username/$(getent passwd 10000 | cut -d: -f1)/g" /usr/share/lightdm/lightdm.conf.d/65-autologin.conf
rc-update add lightdm default

0
main/postmarketos-ui-kodi/60-lightdm-autologin.conf → main/postmarketos-ui-kodi/63-lightdm-autologin.conf
View file

10
main/postmarketos-ui-kodi/APKBUILD
View file

@ -1,21 +1,21 @@
# Maintainer: Bart Ribbers <bribbers@disroot.org>
pkgname=postmarketos-ui-kodi
pkgver=1
pkgrel=3
pkgrel=4
pkgdesc="(Wayland) 10-foot UI useful on TV's"
url="https://kodi.tv"
arch="noarch !armhf"
license="GPL-3.0-or-later"
depends="kodi-wayland kodi cage lightdm lightdm-openrc elogind pulseaudio upower"
install="$pkgname.post-install $pkgname.post-upgrade"
source="60-lightdm-autologin.conf kodi.desktop"
source="63-lightdm-autologin.conf kodi.desktop"
options="!check"
package() {
install -Dm644 "$srcdir"/60-lightdm-autologin.conf \
"$pkgdir"/usr/share/lightdm/lightdm.conf.d/60-autologin.conf
install -Dm644 "$srcdir"/63-lightdm-autologin.conf \
"$pkgdir"/usr/share/lightdm/lightdm.conf.d/63-autologin.conf
install -Dm644 "$srcdir"/kodi.desktop \
"$pkgdir"/usr/share/wayland-sessions/kodi-wayland.desktop
}
sha512sums="4cbef7ef9b4da927e123ea28c5918f49ec4dc1367774596e1bc192f172e1e09cb9711015e20743a7fbb3bbbc8ca6df2bee66571a28fb530e2e9d24d945eb982a 60-lightdm-autologin.conf
sha512sums="4cbef7ef9b4da927e123ea28c5918f49ec4dc1367774596e1bc192f172e1e09cb9711015e20743a7fbb3bbbc8ca6df2bee66571a28fb530e2e9d24d945eb982a 63-lightdm-autologin.conf
fc7d545310a77845af88638e95a72f8774be4fb91231554ac91a2dfcd65d11aed5e6cea550548df5e12c49963968a17a89429fc0fb3ebf4a6843d95dccad7eee kodi.desktop"

2
main/postmarketos-ui-kodi/postmarketos-ui-kodi.post-install
View file

@ -1,5 +1,5 @@
#!/bin/sh
sed -i "s/username/$(getent passwd 10000 | cut -d: -f1)/g" /usr/share/lightdm/lightdm.conf.d/60-autologin.conf
sed -i "s/username/$(getent passwd 10000 | cut -d: -f1)/g" /usr/share/lightdm/lightdm.conf.d/63-autologin.conf
rc-update add lightdm default

0
main/postmarketos-ui-mate/60-lightdm-autologin.conf → main/postmarketos-ui-mate/61-lightdm-autologin.conf
View file

10
main/postmarketos-ui-mate/APKBUILD
View file

@ -1,23 +1,23 @@
# Maintainer: Daniele Debernardi <drebrez@gmail.com>
pkgname=postmarketos-ui-mate
pkgver=1
pkgrel=9
pkgrel=10
pkgdesc="(X11) MATE Desktop Environment, fork of GNOME2 (stylus recommended)"
url="http://mate-desktop.org/"
arch="noarch"
license="GPL-3.0-or-later"
depends="mate-desktop-environment xorg-server dbus-x11 mesa-egl postmarketos-artwork-wallpapers gtk+2.0 lightdm lightdm-openrc"
install="$pkgname.post-install $pkgname.pre-deinstall $pkgname.post-deinstall $pkgname.post-upgrade"
source="000-system-background.gschema.override 60-lightdm-autologin.conf"
source="000-system-background.gschema.override 61-lightdm-autologin.conf"
options="!check"
package() {
install -Dm644 "$srcdir"/000-system-background.gschema.override \
"$pkgdir"/usr/share/glib-2.0/schemas/000-system-background.gschema.override
install -Dm644 "$srcdir"/60-lightdm-autologin.conf \
"$pkgdir"/usr/share/lightdm/lightdm.conf.d/60-autologin.conf
install -Dm644 "$srcdir"/61-lightdm-autologin.conf \
"$pkgdir"/usr/share/lightdm/lightdm.conf.d/61-autologin.conf
}
sha512sums="b4eded3d1aba2086d53507d434da6f2d5aae24fa49c7a8619abb1d81f87898d7a6d813be777a285ce988d78db236bea7507e7868c39fe020e5d23c230dd36242 000-system-background.gschema.override
225c4d1bccad4bdacad34958322015147077158b395b8db095b7afd47e18638044780b381124c3b82bf639af66ea565e1763c54ab9599ec13177c289e0d2a000 60-lightdm-autologin.conf"
225c4d1bccad4bdacad34958322015147077158b395b8db095b7afd47e18638044780b381124c3b82bf639af66ea565e1763c54ab9599ec13177c289e0d2a000 61-lightdm-autologin.conf"

2
main/postmarketos-ui-mate/postmarketos-ui-mate.post-deinstall
View file

@ -1,3 +1,3 @@
#!/bin/sh
rm /usr/share/lightdm/lightdm.conf.d/60-autologin.conf
rm /usr/share/lightdm/lightdm.conf.d/61-autologin.conf

2
main/postmarketos-ui-mate/postmarketos-ui-mate.post-install
View file

@ -1,5 +1,5 @@
#!/bin/sh
sed -i "s/username/$(getent passwd 10000 | cut -d: -f1)/g" /usr/share/lightdm/lightdm.conf.d/60-autologin.conf
sed -i "s/username/$(getent passwd 10000 | cut -d: -f1)/g" /usr/share/lightdm/lightdm.conf.d/61-autologin.conf
rc-update add lightdm default

0
main/postmarketos-ui-plasma-mobile/60-lightdm-autologin.conf → main/postmarketos-ui-plasma-mobile/62-lightdm-autologin.conf
View file

10
main/postmarketos-ui-plasma-mobile/APKBUILD
View file

@ -1,7 +1,7 @@
# Maintainer: Bart Ribbers <bribbers@disroot.org>
pkgname=postmarketos-ui-plasma-mobile
pkgver=2
pkgrel=20
pkgrel=21
pkgdesc="(Wayland) Mobile variant of KDE Plasma (slow without hardware acceleration, allows only numeric passwords!)"
url="https://wiki.postmarketos.org/wiki/Plasma_Mobile"
arch="noarch !armhf" # Crashes on armhf due to https://gitlab.com/postmarketOS/pmaports/issues/75
@ -50,14 +50,14 @@ source="
kdeglobals
qtlogging.ini
unlock-plasma
60-lightdm-autologin.conf
62-lightdm-autologin.conf
000-gschema.override
"
options="!check"
package() {
install -Dm644 "$srcdir"/60-lightdm-autologin.conf \
"$pkgdir"/usr/share/lightdm/lightdm.conf.d/60-autologin.conf
install -Dm644 "$srcdir"/62-lightdm-autologin.conf \
"$pkgdir"/usr/share/lightdm/lightdm.conf.d/62-autologin.conf
install -Dm644 "$srcdir"/kwinrc \
"$pkgdir"/etc/xdg/kwinrc
@ -78,5 +78,5 @@ sha512sums="a95d3bbd1e8051c9b394ad7a26e4beb2d1be8d3c38189819da61fd42b1c7fd3948c4
93d6c3e76b6e8d3c8c5424fcb921595ad3569e1aba1b03255b977230b33146dc73a97327e455e8a539018cb02c3bf1a700dd951622f798b50f36c5d381a1b342 kdeglobals
341f0b866c315f37868ef3e7137cce8b53a0e8e6164e5af71b3e8e2fa68321afbf0652d76124ef84bade1393f701748852ac939aef9daff7e272a0df827780eb qtlogging.ini
e5dcc82c0e58288fd7a8f805e60fa777fab71c68355f085a0e4f25b05526491476fdb6decbc7c0495626d6736a53bfc8e8f34a3231210858998e19cd6fbc89a0 unlock-plasma
564d682f188ebba7371d9b860c699cf7e73006788f48b9fc2e2ba925e0359194ae1a4508fad2b3a5c2ed92a99d7cbc4cd3cb2e3d5bb003511d51e7bd249958a9 60-lightdm-autologin.conf
564d682f188ebba7371d9b860c699cf7e73006788f48b9fc2e2ba925e0359194ae1a4508fad2b3a5c2ed92a99d7cbc4cd3cb2e3d5bb003511d51e7bd249958a9 62-lightdm-autologin.conf
2c0ac3cc66e9af71fb89c4f790b6f71598b5c0ecd9b684bd7cbd95d25ce27c256154b8e3a66e1f2648e4d4410d7a5cedc9663b31c1c87b33dcc3179c98d04252 000-gschema.override"

2
main/postmarketos-ui-plasma-mobile/postmarketos-ui-plasma-mobile.post-install
View file

@ -1,6 +1,6 @@
#!/bin/sh
sed -i "s/username/$(getent passwd 10000 | cut -d: -f1)/g" /usr/share/lightdm/lightdm.conf.d/60-autologin.conf
sed -i "s/username/$(getent passwd 10000 | cut -d: -f1)/g" /usr/share/lightdm/lightdm.conf.d/62-autologin.conf
rc-update add lightdm default
rc-update add urfkill default

0
main/postmarketos-ui-sway/60-lightdm-autologin.conf → main/postmarketos-ui-sway/67-lightdm-autologin.conf
View file

10
main/postmarketos-ui-sway/APKBUILD
View file

@ -1,7 +1,7 @@
# Maintainer: Danct12 <danct12@disroot.org>
pkgname=postmarketos-ui-sway
pkgver=1
pkgrel=5
pkgrel=6
pkgdesc="(Wayland) Tiling WM, drop-in replacement for i3wm (DOES NOT RUN WITHOUT HW ACCELERATION!)"
url="https://postmarketos.org"
arch="noarch"
@ -9,14 +9,14 @@ license="GPL-3.0-or-later"
depends="sway swaylock swayidle xorg-server-xwayland postmarketos-artwork-wallpapers
rxvt-unicode lightdm lightdm-openrc elogind"
install="$pkgname.post-install $pkgname.post-upgrade"
source="60-lightdm-autologin.conf postmarketos_background"
source="67-lightdm-autologin.conf postmarketos_background"
options="!check" # no testsuite
package() {
install -Dm644 "$srcdir"/60-lightdm-autologin.conf \
"$pkgdir"/usr/share/lightdm/lightdm.conf.d/60-autologin.conf
install -Dm644 "$srcdir"/67-lightdm-autologin.conf \
"$pkgdir"/usr/share/lightdm/lightdm.conf.d/67-autologin.conf
install -Dm644 "$srcdir"/postmarketos_background \
"$pkgdir"/etc/sway/config.d/postmarketos_background
}
sha512sums="5cf8c2e04ec1e1f7a330a3c81f82bc8c9eff4af0b61fb1b4f4a3b2f00fd0f149ab4e517ba38b4be97b22b6316c20861977e99548a9ecf0d89d81faf916c4e714 60-lightdm-autologin.conf
sha512sums="5cf8c2e04ec1e1f7a330a3c81f82bc8c9eff4af0b61fb1b4f4a3b2f00fd0f149ab4e517ba38b4be97b22b6316c20861977e99548a9ecf0d89d81faf916c4e714 67-lightdm-autologin.conf
1a70c9a0709d4474317b75ad4929673509a1198e4b95378f8dd02f795b2585ad296b409f06c66d4375c5b6732643f86d04a5220a32de794f464b9375af8487ec postmarketos_background"

2
main/postmarketos-ui-sway/postmarketos-ui-sway.post-install
View file

@ -1,5 +1,5 @@
#!/bin/sh
sed -i "s/username/$(getent passwd 10000 | cut -d: -f1)/g" /usr/share/lightdm/lightdm.conf.d/60-autologin.conf
sed -i "s/username/$(getent passwd 10000 | cut -d: -f1)/g" /usr/share/lightdm/lightdm.conf.d/67-autologin.conf
rc-update add lightdm default

0
main/postmarketos-ui-weston/60-lightdm-autologin.conf → main/postmarketos-ui-weston/66-lightdm-autologin.conf
View file

10
main/postmarketos-ui-weston/APKBUILD
View file

@ -1,19 +1,19 @@
# Maintainer: Bart Ribbers <bribbers@disroot.org>
pkgname=postmarketos-ui-weston
pkgver=4
pkgrel=15
pkgrel=16
pkgdesc="(Wayland) Reference compositor (demo, not a phone interface)"
url="https://postmarketos.org"
arch="noarch"
license="GPL-3.0-or-later"
depends="weston-clients weston weston-shell-desktop weston-backend-fbdev weston-backend-drm weston-backend-x11 weston-terminal weston-xwayland xorg-server-xwayland postmarketos-demos postmarketos-artwork-wallpapers elogind lightdm lightdm-openrc xorg-server htop"
install="$pkgname.post-install $pkgname.post-upgrade"
source="start_weston.sh weston.ini.default 60-lightdm-autologin.conf"
source="start_weston.sh weston.ini.default 66-lightdm-autologin.conf"
options="!check" # Meta package, no test suite
package() {
install -Dm644 "$srcdir"/60-lightdm-autologin.conf \
"$pkgdir"/usr/share/lightdm/lightdm.conf.d/60-autologin.conf
install -Dm644 "$srcdir"/66-lightdm-autologin.conf \
"$pkgdir"/usr/share/lightdm/lightdm.conf.d/66-autologin.conf
install -Dm755 "$srcdir"/start_weston.sh \
"$pkgdir"/usr/bin/start_weston.sh
@ -23,4 +23,4 @@ package() {
}
sha512sums="02cb16254fa6bff405bd19448daeb1b4c2ac1fa696b6f7d67ea89795e4480ed1a9b5487dc00fc671d31d175fc8b8e509071b53dba879519a69d54648a076a549 start_weston.sh
b712c9d4c846437656781656ec15e9b7e238a9244e0b77bf84b67f6661d44f68718330706f69ccb8b4d7f6182b8f17f273018ca461c0c40e49b9185f6eec168d weston.ini.default
6800b81055c854ef69c0084341e31841d4b06d1d894542f1e125d0d70b6606f11218bda0d29dab9a48594b4c2f815a540f91bfba6c2c22c3378040c41fe4bbb1 60-lightdm-autologin.conf"
6800b81055c854ef69c0084341e31841d4b06d1d894542f1e125d0d70b6606f11218bda0d29dab9a48594b4c2f815a540f91bfba6c2c22c3378040c41fe4bbb1 66-lightdm-autologin.conf"

2
main/postmarketos-ui-weston/postmarketos-ui-weston.post-install
View file

@ -1,6 +1,6 @@
#!/bin/sh
sed -i "s/username/$(getent passwd 10000 | cut -d: -f1)/g" /usr/share/lightdm/lightdm.conf.d/60-autologin.conf
sed -i "s/username/$(getent passwd 10000 | cut -d: -f1)/g" /usr/share/lightdm/lightdm.conf.d/66-autologin.conf
sed -i "s/^Exec=weston$/Exec=start_weston.sh/g" /usr/share/wayland-sessions/weston.desktop

0
main/postmarketos-ui-xfce4/60-lightdm-autologin.conf → main/postmarketos-ui-xfce4/64-lightdm-autologin.conf
View file

10
main/postmarketos-ui-xfce4/APKBUILD
View file

@ -1,7 +1,7 @@
# Maintainer: Daniele Debernardi <drebrez@gmail.com>
pkgname=postmarketos-ui-xfce4
pkgver=0.3
pkgrel=1
pkgrel=2
pkgdesc="(X11) Lightweight GTK+2 desktop (stylus recommended)"
url="https://gitlab.com/postmarketOS/xfce4-phone"
arch="noarch"
@ -12,7 +12,7 @@ depends="xfce4 xfce4-terminal xfce4-battery-plugin xfce4-pulseaudio-plugin xfce4
pm-utils pavucontrol pulseaudio-utils elogind"
install="$pkgname.post-install $pkgname.pre-deinstall $pkgname.post-deinstall $pkgname.post-upgrade"
source="$pkgname-$pkgver.tar.gz::https://gitlab.com/postmarketOS/xfce4-phone/-/archive/$pkgver/xfce4-phone-$pkgver.tar.gz
60-lightdm-autologin.conf"
64-lightdm-autologin.conf"
options="!check"
builddir="$srcdir/xfce4-phone-$pkgver"
@ -20,9 +20,9 @@ package() {
install -d -m755 "$pkgdir"/etc/skel
cp -a "$builddir"/config "$pkgdir"/etc/skel/.config
install -Dm644 "$srcdir"/60-lightdm-autologin.conf \
"$pkgdir"/usr/share/lightdm/lightdm.conf.d/60-autologin.conf
install -Dm644 "$srcdir"/64-lightdm-autologin.conf \
"$pkgdir"/usr/share/lightdm/lightdm.conf.d/64-autologin.conf
}
sha512sums="9adf87cdb531ad0eb4ab0d42dd4d43c88da117fdb8c7583c58ef2fcda52ce658e9234fe0451e5bf7d3768cdabf966c9dc27bda360e53ec44c04856ddfa941ab4 postmarketos-ui-xfce4-0.3.tar.gz
3841294daffdd3e0da5a7ba155ba8c21e9e5a2f2ba5b3b5ffa3ea6a16486625d3655d03f8c18740fcddfbca673c42a5289ec3b22720cfbbdd56fde8fdc3bf9b0 60-lightdm-autologin.conf"
3841294daffdd3e0da5a7ba155ba8c21e9e5a2f2ba5b3b5ffa3ea6a16486625d3655d03f8c18740fcddfbca673c42a5289ec3b22720cfbbdd56fde8fdc3bf9b0 64-lightdm-autologin.conf"

2
main/postmarketos-ui-xfce4/postmarketos-ui-xfce4.post-deinstall
View file

@ -1,3 +1,3 @@
#!/bin/sh
rm /usr/share/lightdm/lightdm.conf.d/60-autologin.conf
rm /usr/share/lightdm/lightdm.conf.d/64-autologin.conf

2
main/postmarketos-ui-xfce4/postmarketos-ui-xfce4.post-install
View file

@ -1,5 +1,5 @@
#!/bin/sh
sed -i "s/username/$(getent passwd 10000 | cut -d: -f1)/g" /usr/share/lightdm/lightdm.conf.d/60-autologin.conf
sed -i "s/username/$(getent passwd 10000 | cut -d: -f1)/g" /usr/share/lightdm/lightdm.conf.d/64-autologin.conf
rc-update add lightdm default