From 4a1db82b655bcbabc64a21f47610ad8cf0171ce5 Mon Sep 17 00:00:00 2001
From: Henrik Grimler <henrik@grimler.se>
Date: Sun, 28 Jan 2024 13:29:31 +0100
Subject: [PATCH] device-sharp-shl22: 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-sharp-shl22/APKBUILD | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/device/testing/device-sharp-shl22/APKBUILD b/device/testing/device-sharp-shl22/APKBUILD
index 0a652f296..45ed53f7a 100644
--- a/device/testing/device-sharp-shl22/APKBUILD
+++ b/device/testing/device-sharp-shl22/APKBUILD
@@ -2,12 +2,18 @@
 pkgname=device-sharp-shl22
 pkgdesc="SHARP SHL22"
 pkgver=0.1
-pkgrel=9
+pkgrel=10
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
 options="!check !archcheck"
-depends="postmarketos-base linux-sharp-shl22 mkbootimg msm-fb-refresher"
+depends="
+	postmarketos-base
+	postmarketos-base-downstream-disable-udev-v4l
+	linux-sharp-shl22
+	mkbootimg
+	msm-fb-refresher
+"
 makedepends="devicepkg-dev"
 source="
 	deviceinfo
@@ -20,11 +26,6 @@ build() {
 
 package() {
 	devicepkg_package $startdir $pkgname
-
-	# Disable v4l (video4linux), because without the camera firmware
-	# blobs this makes dev hang with the kernel this device uses (#1033)
-	mkdir -p "$pkgdir"/etc/udev/rules.d
-	ln -s /dev/null "$pkgdir"/etc/udev/rules.d/60-persistent-v4l.rules
 }