From 60c8f7a54f098871daa9554f55528f86bef3bf94 Mon Sep 17 00:00:00 2001 From: Henrik Grimler Date: Sun, 28 Jan 2024 13:32:47 +0100 Subject: [PATCH] device-sony-yuga: avoid overriding udev v4l rule in /etc (MR 4768) Postmarketos-base-downstream-disable-udev-v4l symlinks /lib/udev/rules.d/60-persistent-v4l.rules to /dev/null, so depend on this package instead. The dependency is added to downstream kernel subpackage, as issue *should* only affect downstream kernel. --- device/testing/device-sony-yuga/APKBUILD | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/device/testing/device-sony-yuga/APKBUILD b/device/testing/device-sony-yuga/APKBUILD index 515150604..16f24de48 100644 --- a/device/testing/device-sony-yuga/APKBUILD +++ b/device/testing/device-sony-yuga/APKBUILD @@ -1,7 +1,7 @@ # Reference: pkgname=device-sony-yuga -pkgver=3 -pkgrel=4 +pkgver=4 +pkgrel=0 pkgdesc="Sony Xperia Z" url="https://postmarketos.org" arch="armv7" @@ -24,15 +24,15 @@ package() { devicepkg_package $startdir $pkgname install -D -m644 "$srcdir"/90-android-touch-dev.rules \ "$pkgdir"/etc/udev/rules.d/90-android-touch-dev.rules - - # Disable v4l (video4linux), because without the camera firmware - # blobs this makes dev hang with the kernel this device uses (#1033) - ln -s /dev/null "$pkgdir"/etc/udev/rules.d/60-persistent-v4l.rules } kernel_downstream() { pkgdesc="LineageOS downstream kernel (recommended)" - depends="linux-sony-yuga msm-fb-refresher" + depends=" + linux-sony-yuga + msm-fb-refresher + postmarketos-base-downstream-disable-udev-v4l + " devicepkg_subpackage_kernel $startdir $pkgname $subpkgname }