From 10280b22e28cd6cb44ae86099043a8f53b31e486 Mon Sep 17 00:00:00 2001 From: Henrik Grimler Date: Sun, 28 Jan 2024 17:08:10 +0100 Subject: [PATCH] device-htc-protou: avoid overriding udev v4l rule in /etc (MR 4768) Depend on postmarketos-base-downstream-disable-udev-v4l instead, which symlinks /lib/udev/rules.d/60-persistent-v4l.rules to /dev/null. --- device/testing/device-htc-protou/APKBUILD | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/device/testing/device-htc-protou/APKBUILD b/device/testing/device-htc-protou/APKBUILD index 39f0c2912..6cb7f4ea4 100644 --- a/device/testing/device-htc-protou/APKBUILD +++ b/device/testing/device-htc-protou/APKBUILD @@ -2,12 +2,18 @@ pkgname=device-htc-protou pkgdesc="HTC Desire X" pkgver=0.1 -pkgrel=11 +pkgrel=12 url="https://postmarketos.org" license="MIT" arch="armv7" options="!check !archcheck" -depends="postmarketos-base linux-htc-protou mkbootimg msm-fb-refresher" +depends=" + postmarketos-base + postmarketos-base-downstream-disable-udev-v4l + linux-htc-protou + mkbootimg + msm-fb-refresher +" makedepends="devicepkg-dev" subpackages="$pkgname-nonfree-firmware:nonfree_firmware" source="deviceinfo initfs-hook.sh pointercal" @@ -21,10 +27,6 @@ package() { install -Dm644 "$srcdir"/pointercal \ "$pkgdir"/etc/pointercal - - # Disable v4l (video4linux), because without the camera firmware - # blobs this makes udev hang with the kernel this device uses (#1033) - ln -s /dev/null "$pkgdir"/etc/udev/rules.d/60-persistent-v4l.rules } nonfree_firmware() {