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

postmarketos-ui-i3wm: use tinydm and relocate device-specific file (MR 3769)

Browse source 
* lock.sh is specific to Nokia N900, so move to device-nokia-n900
* use tinydm instead of lightdm

Signed-off-by: Sicelo A. Mhlongo <absicsz@gmail.com>
[ci:skip-build]: already built successfully in CI
This commit is contained in:
Sicelo A. Mhlongo 2022-12-28 11:23:27 +02:00 • committed by Oliver Smith
parent 22e26ced4f
commit a787222aeb
No known key found for this signature in database
GPG key ID: 5AE7F5513E0885CB
5 changed files with 19 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
device/community/device-nokia-n900/APKBUILD
View file

@ -2,8 +2,8 @@
# Maintainer: Sicelo <absicsz@gmail.com> # Maintainer: Sicelo <absicsz@gmail.com>
# Co-Maintainer: Danct12 <danct12@disroot.org> # Co-Maintainer: Danct12 <danct12@disroot.org>
pkgname=device-nokia-n900 pkgname=device-nokia-n900
pkgver=8.3 pkgver=8.4
pkgrel=3 pkgrel=0
pkgdesc="Nokia N900" pkgdesc="Nokia N900"
url="https://postmarketos.org" url="https://postmarketos.org"
arch="armv7" arch="armv7"
@ -41,6 +41,7 @@ source="
keymaps/rx51_fise.map keymaps/rx51_fise.map
keymaps/rx51_it.map keymaps/rx51_it.map
keymaps/rx51_us.map keymaps/rx51_us.map
lock.sh
n900-wlan-data.initd n900-wlan-data.initd
pointercal pointercal
uboot-script.cmd uboot-script.cmd
@ -118,10 +119,13 @@ package() {
x11() { x11() {
install_if="$pkgname xorg-server" install_if="$pkgname xorg-server"
depends="xset xinput"
install -D -m644 "$srcdir"/40-xkb.conf \ install -D -m644 "$srcdir"/40-xkb.conf \
"$subpkgdir"/etc/X11/xorg.conf.d/40-xkb.conf "$subpkgdir"/etc/X11/xorg.conf.d/40-xkb.conf
install -D -m644 "$srcdir"/xorg.conf \ install -D -m644 "$srcdir"/xorg.conf \
"$subpkgdir"/etc/X11/xorg.conf.d/11-n900.conf "$subpkgdir"/etc/X11/xorg.conf.d/11-n900.conf
install -Dm755 "$srcdir"/lock.sh \
"$pkgdir"/usr/bin/lock.sh
} }
xkeyboard_config() { xkeyboard_config() {
@ -187,6 +191,7 @@ dc585e11bf4e06e36c5c62bcc024eaacecc30437d9da5257df14be05e247a2f2bc208874be3058ed
0a3e58a3a81c463937caf508a76461b4cc43f593f0817a52b6581fdd132cc894c0960fe7b950b6e6bfac1fad15cd9dd230c103fcf08a30b44ef7d8fbe31cea28 rx51_fise.map 0a3e58a3a81c463937caf508a76461b4cc43f593f0817a52b6581fdd132cc894c0960fe7b950b6e6bfac1fad15cd9dd230c103fcf08a30b44ef7d8fbe31cea28 rx51_fise.map
082a5166e38296b097e873b0b4aeaf007e594d3bf4470c74e91ee3efedcf28ad25cd55c23dd63e460339898ae08e77e111b0e1092fa5e661db90bb40732103a1 rx51_it.map 082a5166e38296b097e873b0b4aeaf007e594d3bf4470c74e91ee3efedcf28ad25cd55c23dd63e460339898ae08e77e111b0e1092fa5e661db90bb40732103a1 rx51_it.map
e440ed7a3070c17e003b86b72dbe6d8194d01b577ca8dd56dd066f216b6dda32bb965c780950f1789a66f7c948290016b048da9f1cf63aba9e11d7e7fd6873ba rx51_us.map e440ed7a3070c17e003b86b72dbe6d8194d01b577ca8dd56dd066f216b6dda32bb965c780950f1789a66f7c948290016b048da9f1cf63aba9e11d7e7fd6873ba rx51_us.map
caf9f4c45d11c28e1a6681255fafe5a286b0c417737fac1ca0ee37d3f82fd65c1712f5180375d7813fa308dfdca91d96876b5ce5b05b55ac14cfc31303b1ea5f lock.sh
b50e7f37ffb1fa0bb782b117a4e8bcfdb722b6127c3e5d643e90cd901a1f4e65e77a0773ed418673c8195595347482be0c8096f5a723e840315ad61ccd043b66 n900-wlan-data.initd b50e7f37ffb1fa0bb782b117a4e8bcfdb722b6127c3e5d643e90cd901a1f4e65e77a0773ed418673c8195595347482be0c8096f5a723e840315ad61ccd043b66 n900-wlan-data.initd
143c21f0b18a016d37cb44178e9daea09f128a90769b48353c03c3f245cb9b1f7e773b9ccee084973fc78ddd7a18c2642e54888a85bda7c7daecddc9a8c62eff pointercal 143c21f0b18a016d37cb44178e9daea09f128a90769b48353c03c3f245cb9b1f7e773b9ccee084973fc78ddd7a18c2642e54888a85bda7c7daecddc9a8c62eff pointercal
9aaae66ae159236346f67818c44da61aed84a63b3bac0c706492f198db82fc67c2378bcabaf260b695b980bf2faf144472f15355bb097b021551db9547f2e1bc uboot-script.cmd 9aaae66ae159236346f67818c44da61aed84a63b3bac0c706492f198db82fc67c2378bcabaf260b695b980bf2faf144472f15355bb097b021551db9547f2e1bc uboot-script.cmd

0
main/postmarketos-ui-i3wm/lock.sh → device/community/device-nokia-n900/lock.sh
View file

5
main/postmarketos-ui-i3wm/65-lightdm-autologin.conf
View file

@ -1,5 +0,0 @@
# This file gets removed with postmarketos-ui-i3wm, even if modified!
[Seat:*]
autologin-user=username
autologin-user-timeout=0
autologin-session=i3

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

@ -1,8 +1,8 @@
# Reference: https://postmarketos.org/uipkg # Reference: https://postmarketos.org/uipkg
# Maintainer: Martijn Braam <martijn@brixit.nl> # Maintainer: Martijn Braam <martijn@brixit.nl>
pkgname=postmarketos-ui-i3wm pkgname=postmarketos-ui-i3wm
pkgver=0.3 pkgver=0.4
pkgrel=13 pkgrel=0
pkgdesc="(X11) Tiling WM (keyboard required)" pkgdesc="(X11) Tiling WM (keyboard required)"
url="https://i3wm.org" url="https://i3wm.org"
arch="noarch" arch="noarch"
@ -13,8 +13,8 @@ depends="
elogind elogind
i3status i3status
i3wm i3wm
lightdm tinydm
lightdm-openrc tinydm-openrc
mesa-egl mesa-egl
networkmanager networkmanager
networkmanager-cli networkmanager-cli
@ -24,22 +24,15 @@ depends="
networkmanager-wwan networkmanager-wwan
postmarketos-base-ui postmarketos-base-ui
st st
xinput
xorg-server xorg-server
xset
" "
install="$pkgname.post-install $pkgname.post-upgrade" install="$pkgname.post-install $pkgname.post-upgrade"
source="lock.sh 65-lightdm-autologin.conf"
options="!check" options="!check"
package() { build() {
install -Dm755 "$srcdir"/lock.sh \ return 0
"$pkgdir"/usr/bin/lock.sh }
install -Dm644 "$srcdir"/65-lightdm-autologin.conf \ package() {
"$pkgdir"/usr/share/lightdm/lightdm.conf.d/65-autologin.conf mkdir -p "$pkgdir"
} }
sha512sums="
caf9f4c45d11c28e1a6681255fafe5a286b0c417737fac1ca0ee37d3f82fd65c1712f5180375d7813fa308dfdca91d96876b5ce5b05b55ac14cfc31303b1ea5f lock.sh
60f4e1f3314ce8de6b92a2eb642f199c5ed24a18981958d787f0e876fa629598340cf467ab991dda4e3927ed6b11011dc0357bdcf0e5f1baac444939b4647445 65-lightdm-autologin.conf
"

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

@ -1,6 +1,5 @@
#!/bin/sh #!/bin/sh
sed -i "s/username/$(getent passwd 10000 | cut -d: -f1)/g" /usr/share/lightdm/lightdm.conf.d/65-autologin.conf rc-update add tinydm default
tinydm-set-session -s /usr/share/xsessions/i3.desktop
rc-update add lightdm default
rc-update add networkmanager default rc-update add networkmanager default