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

purism-librem5: upgrade to librem5-base 61 (MR 4182)

Browse source 
Signed-off-by: Alistair Francis <alistair@alistair23.me>
This commit is contained in:
Alistair Francis 2023-06-14 20:42:51 +10:00 committed by Luca Weiss
parent 9e11b3aa03
commit 016e512c83
No known key found for this signature in database
GPG key ID: 72D843B89D4DD756
2 changed files with 3 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
device/main/device-purism-librem5/0002-pm-udev-Use-DEVPATH-instead-of-ID_PATH.patch
View file

@ -1,32 +0,0 @@
From b4c555ca3b2f4311a1a45ca4d27ca82c0c4d3b8f Mon Sep 17 00:00:00 2001
From: Alistair Francis <alistair@alistair23.me>
Date: Mon, 10 Apr 2023 21:11:12 +1000
Subject: [PATCH] pm: udev: Use DEVPATH instead of ID_PATH
ID_PATH doesn't correctly apply the quirks when using pmOS. Let's use
DEVPATH instead of ID_PATH to allow the udev quirks to work in pmOS as
well as PureOS.
Signed-off-by: Alistair Francis <alistair@alistair23.me>
---
debian/librem5-base-defaults.librem5-pm.udev | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/debian/librem5-base-defaults.librem5-pm.udev b/debian/librem5-base-defaults.librem5-pm.udev
index cad668e..f1e319d 100644
--- a/debian/librem5-base-defaults.librem5-pm.udev
+++ b/debian/librem5-base-defaults.librem5-pm.udev
@@ -8,8 +8,8 @@ DEVPATH=="/devices/platform/soc@0/38100000.usb", TEST=="power/control", ATTR{pow
### Enable power management for internal USB devices:
-SUBSYSTEM=="usb", ENV{ID_PATH}=="platform-xhci-hcd.4.auto-usb-0:0:1.0", ATTR{usb1-port1/quirks}="10000000"
-SUBSYSTEM=="usb", ENV{ID_PATH}=="platform-xhci-hcd.4.auto-usb-0:1:1.0", ATTR{1-1-port2/quirks}="10000000", ATTR{1-1-port3/power/pm_qos_no_power_off}="0"
+SUBSYSTEM=="usb", ENV{DEVPATH}=="/devices/platform/soc@0/38200000.usb/xhci-hcd.4.auto/usb1/1-0:1.0", ATTR{usb1-port1/quirks}="10000000"
+SUBSYSTEM=="usb", ENV{DEVPATH}=="/devices/platform/soc@0/38200000.usb/xhci-hcd.4.auto/usb1/1-1/1-1:1.0", ATTR{1-1-port2/quirks}="10000000", ATTR{1-1-port3/power/pm_qos_no_power_off}="0"
# Broadmobi BM818
SUBSYSTEM=="usb", ATTR{idVendor}=="2020", ATTR{idProduct}=="2060", TEST=="power/control", ATTR{power/control}="auto"
--
2.39.2

8
device/main/device-purism-librem5/APKBUILD
View file

@ -3,9 +3,9 @@
# Co-Maintainer: Alistair Francis <alistair@alistair23.me>
# Co-Maintainer: Newbyte <newbyte@postmarketos.org>
pkgname=device-purism-librem5
pkgver=1.49
pkgver=1.50
pkgrel=0
_confver=60
_confver=61
_purismrel=1
# <librem5-base ver>.<purism release>
_purismver=${_confver}pureos$_purismrel
@ -44,7 +44,6 @@ source="
0001-udev-cameras-use-correct-path-for-modprobe-on-Alpine.patch
l5-ship-mode.initd
l5-lockdown-support.initd
0002-pm-udev-Use-DEVPATH-instead-of-ID_PATH.patch
0003-fix-ship-mode-linux-6.3.patch
modemmanager.conf
"
@ -185,7 +184,7 @@ nonfree_firmware() {
}
sha512sums="
e88ee3f5b972f463bd0480f7ce90924d287f1b95acda0da337d3752143891c04b461c0e6764dc66544c8fce2749bce9b2414061401a45af05fe8675cfb12f240 librem5-base-pureos-60pureos1.tar.gz
8ec49aa14c2d47dbf2beacd4612e0c3a5aa19a309e8152468314251b30ff633298dd5235f529e92ddb7219c835ebab9934553b68bf6c364726881144443801ca librem5-base-pureos-61pureos1.tar.gz
2e72d9a084ecd6c96cafbbd8fda461ae8b2ebd14ffda601d9f36d73f08f04088213de17da078293ddd958d4c76d33148c7af6e252eb0709f6934855a55578509 00-mesa.sh
8b6fa7b12c15f439c561901f3ffe24a1ef2a0c343401c0a79281060854ab29e08a1fb5e7adae8684b12aa9f535ed99e2dad993dce9724822cb0fbf2497dd86e5 70-wifi-pm.rules
00355d9ad085a77e157f3c62eb4f1bcac2823d3b341e34d1128edbfb1444fba83e8eacd263ea61da9f6d853f1328ab7fbe5ea63bd08c8a1bc9b8eaf44ae1f1c6 77-mm-broadmobi-port-types.rules
@ -201,7 +200,6 @@ fad386071fc45f9880a94cc8004fabd5d98b3e6a12606c98d8e72e0208f22ab54f03b921f5967a95
b45749fcddfd65a302b502bcabfa5828d1b63e45d844fd50e44009a756b919db20fe9526102947c0f0dfcdffe4a037e5050fe1b24fb915933ce0837f49759378 0001-udev-cameras-use-correct-path-for-modprobe-on-Alpine.patch
c723764d507ccd4b04aa5ce79b1d1ebc131873cdc37a943cb0f92b8a08a3c69eb9e0d31fcd4589fd8c40a9676bae9897e4f12ec2ebe4db8214ac85669ef35a53 l5-ship-mode.initd
f4b314d553655f7975445ac0a33099923e20dabb082c07e2cf6a78e4118c143d777dd4ad2c09cbc388600bdefe8deb3073fbd15b238772ddf09c66ac46415590 l5-lockdown-support.initd
f70597afb93ca5a8bf1ff2414d77616e3820bb187120b252142af3d586f69fc1e71b438112f3c9173c86e81172f6a855f54e040b26d2591a04ee3510458c58d1 0002-pm-udev-Use-DEVPATH-instead-of-ID_PATH.patch
a075f3952dfdd4bcadc055f853b6d5206c5db4efcacfa27541653fd5a7daef6e753d6c7ed74fd1aad2a40837450fdac76fa04a61829e08bd938cc3548cbe8390 0003-fix-ship-mode-linux-6.3.patch
e089b0c4320c8cb5a6bd1e85f12b6afb24d035958f2bdc7a8ed2cee5b0f379e6fdfad876d8d22c03c9cb0576b4aa7c20c3e9986ba8147500add6d93b44e5f266 modemmanager.conf
"