From c63c3139964881e6b3ff8c93d63c6439ca1b2746 Mon Sep 17 00:00:00 2001
From: Henrik Grimler <henrik@grimler.se>
Date: Sun, 28 Jan 2024 13:40:42 +0100
Subject: [PATCH] device-samsung-kminilte: 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-samsung-kminilte/APKBUILD    | 14 +++++++-------
 .../udev/60-persistent-v4l.rules                   |  4 ----
 2 files changed, 7 insertions(+), 11 deletions(-)
 delete mode 100644 device/testing/device-samsung-kminilte/udev/60-persistent-v4l.rules

diff --git a/device/testing/device-samsung-kminilte/APKBUILD b/device/testing/device-samsung-kminilte/APKBUILD
index 85f62cc4c..90e8a9797 100644
--- a/device/testing/device-samsung-kminilte/APKBUILD
+++ b/device/testing/device-samsung-kminilte/APKBUILD
@@ -2,18 +2,22 @@
 pkgname=device-samsung-kminilte
 pkgdesc="Samsung Galaxy S5 Mini"
 pkgver=0.1
-pkgrel=16
+pkgrel=17
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
 options="!check !archcheck"
-depends="postmarketos-base linux-samsung-kminilte mkbootimg"
+depends="
+	postmarketos-base
+	postmarketos-base-downstream-disable-udev-v4l
+	linux-samsung-kminilte
+	mkbootimg
+"
 makedepends="devicepkg-dev"
 subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
 source="
 	deviceinfo
 	fb.modes
-	udev/60-persistent-v4l.rules
 	"
 
 build() {
@@ -23,9 +27,6 @@ build() {
 package() {
 	devicepkg_package $startdir $pkgname
 	install -Dm644 "$srcdir"/fb.modes "$pkgdir"/etc/fb.modes
-
-	install -Dm644 "$srcdir"/60-persistent-v4l.rules \
-		"$pkgdir"/etc/udev/rules.d/60-persistent-v4l.rules
 }
 
 nonfree_firmware() {
@@ -37,5 +38,4 @@ nonfree_firmware() {
 sha512sums="
 190428b4b14c0d180fe23b49c545c0a34463f45935de191d7dba57057c1c689188e6f94b84e1ad790da74d83694f5cda98c1e3f34a16c61937cd51ddd1c2baf4  deviceinfo
 245efec73f85ef715c877d6c24eb4b7b677d250bd38167dc19b1b0ed84c3ea91049576adbbf21dd48940c08e40f0294a1a01b0ab3e56efd794109a7e7ebc1104  fb.modes
-b8bf2e3ec166af6acbbfaaa2b57b053473c0b12df007090eecf7a885aee2e3cd5d982819e2ee73e2817e5266b9875dc9240389bca409d5523f3cfa8037fa7870  60-persistent-v4l.rules
 "
diff --git a/device/testing/device-samsung-kminilte/udev/60-persistent-v4l.rules b/device/testing/device-samsung-kminilte/udev/60-persistent-v4l.rules
deleted file mode 100644
index 7ecc69a94..000000000
--- a/device/testing/device-samsung-kminilte/udev/60-persistent-v4l.rules
+++ /dev/null
@@ -1,4 +0,0 @@
-# This file is intentionally empty, to disable the default rule with the same name.
-# You can find the default rule in /lib/udev/rules.d/60-persistent-v4l.rules.
-#
-# See https://gitlab.com/postmarketOS/pmaports/-/merge_requests/1160 for why this is needed.