Piecuu/pmaports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

purism-librem5: don't install custom geoclue service file (MR 4120)

Browse source 
Geoclue now supports reading from this path:

https://gitlab.alpinelinux.org/alpine/aports/-/merge_requests/43661

fixes https://gitlab.com/postmarketOS/pmaports/-/issues/2024

[ci:skip-build]: Already built successfully in CI.
This commit is contained in:
Clayton Craft 2023-05-26 04:42:50 -07:00 • committed by Newbyte
parent 9ba1d82f6e
commit 3fff515886
No known key found for this signature in database
GPG key ID: 990600ED1DB95E02
2 changed files with 1 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -3,7 +3,7 @@
# Co-Maintainer: Alistair Francis <alistair@alistair23.me>
# Co-Maintainer: Newbyte <newbyte@postmarketos.org>
pkgname=device-purism-librem5
pkgver=1.45
pkgver=1.46
pkgrel=0
_confver=60
_purismrel=1
@ -44,12 +44,10 @@ source="
0001-udev-cameras-use-correct-path-for-modprobe-on-Alpine.patch
l5-ship-mode.initd
l5-lockdown-support.initd
org.freedesktop.GeoClue2.service
0002-pm-udev-Use-DEVPATH-instead-of-ID_PATH.patch
"
subpackages="
$pkgname-camera
$pkgname-geoclue
$pkgname-gnome
$pkgname-nonfree-firmware:nonfree_firmware
$pkgname-pulseaudio
@ -67,14 +65,6 @@ build() {
devicepkg_build $startdir $pkgname
}
geoclue() {
pkgdesc="geoclue configuration for the Librem 5"
install_if="$pkgname geoclue"
replaces="geoclue"
install -Dm644 "$srcdir"/org.freedesktop.GeoClue2.service \
-t "$subpkgdir"/usr/share/dbus-1/system-services/
}
gnome() {
install_if="$pkgname=$pkgver-r$pkgrel postmarketos-base-ui-gnome"
depends="
@ -193,6 +183,5 @@ fad386071fc45f9880a94cc8004fabd5d98b3e6a12606c98d8e72e0208f22ab54f03b921f5967a95
b45749fcddfd65a302b502bcabfa5828d1b63e45d844fd50e44009a756b919db20fe9526102947c0f0dfcdffe4a037e5050fe1b24fb915933ce0837f49759378 0001-udev-cameras-use-correct-path-for-modprobe-on-Alpine.patch
c723764d507ccd4b04aa5ce79b1d1ebc131873cdc37a943cb0f92b8a08a3c69eb9e0d31fcd4589fd8c40a9676bae9897e4f12ec2ebe4db8214ac85669ef35a53 l5-ship-mode.initd
f4b314d553655f7975445ac0a33099923e20dabb082c07e2cf6a78e4118c143d777dd4ad2c09cbc388600bdefe8deb3073fbd15b238772ddf09c66ac46415590 l5-lockdown-support.initd
fd91bcd8cecd509587f0a26d454157a1df094d2d86c75329d1002e9474946494d4d1b5407e055fbd5f21e22394eeb1bbd4b3439ae6925db50a3427b4fac101cf org.freedesktop.GeoClue2.service
f70597afb93ca5a8bf1ff2414d77616e3820bb187120b252142af3d586f69fc1e71b438112f3c9173c86e81172f6a855f54e040b26d2591a04ee3510458c58d1 0002-pm-udev-Use-DEVPATH-instead-of-ID_PATH.patch
"

5
device/main/device-purism-librem5/org.freedesktop.GeoClue2.service
View file

@ -1,5 +0,0 @@
[D-BUS Service]
Name=org.freedesktop.GeoClue2
Exec=/usr/libexec/geoclue --nmea-socket /var/run/gnss-share.sock
User=geoclue
SystemdService=geoclue.service