From e8adc4196611a814bb08fcc267322d053e5e30bd Mon Sep 17 00:00:00 2001 From: Aster Boese Date: Tue, 20 Jan 2026 12:26:10 -0500 Subject: [PATCH] device/testing/*: `/etc/X11/xorg.conf.d` -> `/usr/share/X11/xorg.conf.d` Signed-off-by: Aster Boese Part-of: --- device/testing/device-blackberry-key2-generic/APKBUILD | 4 ++-- device/testing/device-google-peach-pi/APKBUILD | 4 ++-- device/testing/device-lg-hammerhead/APKBUILD | 4 ++-- device/testing/device-pine64-dontbeevil/APKBUILD | 4 ++-- device/testing/device-rockchip-rk322x/APKBUILD | 4 ++-- device/testing/device-samsung-i927/APKBUILD | 9 +++++---- device/testing/soc-amlogic-aarch64/APKBUILD | 8 ++++---- 7 files changed, 19 insertions(+), 18 deletions(-) diff --git a/device/testing/device-blackberry-key2-generic/APKBUILD b/device/testing/device-blackberry-key2-generic/APKBUILD index fa8973284..9b89cfc0a 100644 --- a/device/testing/device-blackberry-key2-generic/APKBUILD +++ b/device/testing/device-blackberry-key2-generic/APKBUILD @@ -3,7 +3,7 @@ maintainer="Paul Sajna " pkgname=device-blackberry-key2-generic pkgdesc="BlackBerry KEY2" pkgver=2 -pkgrel=0 +pkgrel=1 url="https://postmarketos.org" license="MIT" arch="aarch64" @@ -76,7 +76,7 @@ sway() { x11() { install_if="$pkgname=$pkgver-r$pkgrel xorg-server" install -D -m644 "$srcdir"/40-xkb.conf \ - "$subpkgdir"/etc/X11/xorg.conf.d/40-xkb.conf + "$subpkgdir"/usr/share/X11/xorg.conf.d/40-xkb.conf } sha512sums=" diff --git a/device/testing/device-google-peach-pi/APKBUILD b/device/testing/device-google-peach-pi/APKBUILD index b0289df09..f4f53f679 100644 --- a/device/testing/device-google-peach-pi/APKBUILD +++ b/device/testing/device-google-peach-pi/APKBUILD @@ -3,7 +3,7 @@ maintainer="" pkgname=device-google-peach-pi pkgdesc="Samsung Chromebook 2 (13.3 inch)" pkgver=10 -pkgrel=0 +pkgrel=1 url="https://postmarketos.org" license="MIT" arch="armv7" @@ -46,7 +46,7 @@ package() { i3wm() { install_if="$pkgname=$pkgver-r$pkgrel postmarketos-ui-i3wm" install -Dm644 "$srcdir"/90-tap-to-click.conf \ - "$subpkgdir"/etc/X11/xorg.conf.d/90-tap-to-click.conf + "$subpkgdir"/usr/share/X11/xorg.conf.d/90-tap-to-click.conf } nonfree_firmware() { diff --git a/device/testing/device-lg-hammerhead/APKBUILD b/device/testing/device-lg-hammerhead/APKBUILD index b74858b82..db2bbffd4 100644 --- a/device/testing/device-lg-hammerhead/APKBUILD +++ b/device/testing/device-lg-hammerhead/APKBUILD @@ -2,7 +2,7 @@ maintainer="Luca Weiss " pkgname=device-lg-hammerhead pkgver=15 -pkgrel=0 +pkgrel=1 pkgdesc="Google Nexus 5" url="https://postmarketos.org" arch="armv7" @@ -46,7 +46,7 @@ x11() { xf86-video-fbdev msm-fb-refresher" install -Dm644 "$srcdir"/xorg.conf \ - "$subpkgdir"/etc/X11/xorg.conf.d/10-hammerhead.conf + "$subpkgdir"/usr/share/X11/xorg.conf.d/10-hammerhead.conf } phosh() { diff --git a/device/testing/device-pine64-dontbeevil/APKBUILD b/device/testing/device-pine64-dontbeevil/APKBUILD index 733b9fde6..8919d170a 100644 --- a/device/testing/device-pine64-dontbeevil/APKBUILD +++ b/device/testing/device-pine64-dontbeevil/APKBUILD @@ -2,7 +2,7 @@ maintainer="" pkgname=device-pine64-dontbeevil pkgver=2 -pkgrel=0 +pkgrel=1 pkgdesc="PINE64 PinePhone Don't be evil devkit" url="https://postmarketos.org" license="MIT" @@ -47,7 +47,7 @@ x11() { xf86-input-libinput xf86-video-fbdev" install -Dm644 "$srcdir"/xorg.conf \ - "$subpkgdir"/etc/X11/xorg.conf.d/10-framebuffer.conf + "$subpkgdir"/usr/share/X11/xorg.conf.d/10-framebuffer.conf } nonfree_firmware() { diff --git a/device/testing/device-rockchip-rk322x/APKBUILD b/device/testing/device-rockchip-rk322x/APKBUILD index f78f17d52..966d49d87 100644 --- a/device/testing/device-rockchip-rk322x/APKBUILD +++ b/device/testing/device-rockchip-rk322x/APKBUILD @@ -2,7 +2,7 @@ maintainer="leap123 " pkgname=device-rockchip-rk322x pkgdesc="Generic device package for various Rockchip RK3228/RK3229-based devices" pkgver=3 -pkgrel=0 +pkgrel=1 url="https://postmarketos.org" license="MIT" arch="armv7" @@ -35,7 +35,7 @@ x11() { # https://github.com/armbian/build/blob/master/config/sources/families/include/meson64_common.inc install_if="$pkgname xorg-server" install -D -m644 "$srcdir"/xorg.conf \ - "$subpkgdir"/etc/X11/xorg.conf.d/11-rockchip.conf + "$subpkgdir"/usr/share/X11/xorg.conf.d/11-rockchip.conf } package() { diff --git a/device/testing/device-samsung-i927/APKBUILD b/device/testing/device-samsung-i927/APKBUILD index a205d8e40..1e9c1212b 100644 --- a/device/testing/device-samsung-i927/APKBUILD +++ b/device/testing/device-samsung-i927/APKBUILD @@ -3,7 +3,7 @@ maintainer="" pkgname=device-samsung-i927 pkgdesc="Samsung Captivate Glide" pkgver=5 -pkgrel=0 +pkgrel=1 url="https://postmarketos.org" license="MIT" arch="armv7" @@ -56,7 +56,7 @@ package() { "$pkgdir"/etc/pm/config.d/i927-pm-conf install -D -m644 "$srcdir"/40-samsung-i927.conf \ - "$pkgdir"/etc/X11/xorg.conf.d/40-samsung-i927.conf + "$pkgdir"/usr/share/X11/xorg.conf.d/40-samsung-i927.conf } nonfree_firmware() { @@ -66,9 +66,10 @@ nonfree_firmware() { } x11() { - install_if="$pkgname xorg-server" + install_if="$pkgname=$pkgver-r$pkgrel xorg-server" depends="xf86-video-opentegra libvdpau-tegra" - mkdir "$subpkgdir" + + amove usr/share/X11 } sha512sums=" diff --git a/device/testing/soc-amlogic-aarch64/APKBUILD b/device/testing/soc-amlogic-aarch64/APKBUILD index 161cfc009..5dfa0c756 100644 --- a/device/testing/soc-amlogic-aarch64/APKBUILD +++ b/device/testing/soc-amlogic-aarch64/APKBUILD @@ -3,7 +3,7 @@ maintainer="Ferass El Hafidi " pkgname=soc-amlogic-aarch64 pkgdesc="Common package for devices using an Amlogic AArch64 SoC" pkgver=3 -pkgrel=1 +pkgrel=2 url="https://postmarketos.org" license="MIT" arch="aarch64" @@ -38,9 +38,9 @@ x11() { pkgdesc="X11 configuration for Amlogic AArch64-based devices" # Shamelessly taken from Armbian. # https://github.com/armbian/build/blob/master/config/sources/families/include/meson64_common.inc - install_if="$pkgname xorg-server" - install -D -m644 "$srcdir"/xorg.conf \ - "$subpkgdir"/etc/X11/xorg.conf.d/11-meson.conf + install_if="$pkgname=$pkgver-r$pkgrel xorg-server" + install -Dm644 "$srcdir"/xorg.conf \ + "$subpkgdir"/usr/share/X11/xorg.conf.d/11-meson.conf } sha512sums="