diff --git a/device/testing/device-samsung-zeroltexx/APKBUILD b/device/testing/device-samsung-zeroltexx/APKBUILD index 7e1ea55e2..a7a30cbc9 100644 --- a/device/testing/device-samsung-zeroltexx/APKBUILD +++ b/device/testing/device-samsung-zeroltexx/APKBUILD @@ -2,16 +2,20 @@ pkgname=device-samsung-zeroltexx pkgdesc="Samsung Galaxy S6 edge" pkgver=0.1 -pkgrel=4 +pkgrel=5 url="https://postmarketos.org" license="MIT" arch="aarch64" options="!check !archcheck" -depends="postmarketos-base linux-samsung-zeroltexx mkbootimg msm-fb-refresher" +depends=" + postmarketos-base + postmarketos-base-downstream-disable-udev-v4l + linux-samsung-zeroltexx + mkbootimg + msm-fb-refresher +" makedepends="devicepkg-dev" -source="deviceinfo - udev/60-persistent-v4l.rules - " +source="deviceinfo" subpackages="$pkgname-nonfree-firmware:nonfree_firmware" @@ -23,10 +27,6 @@ build() { package() { devicepkg_package $startdir $pkgname - - install -Dm644 "$srcdir"/60-persistent-v4l.rules \ - "$pkgdir"/etc/udev/rules.d/60-persistent-v4l.rules - } nonfree_firmware() { @@ -36,5 +36,6 @@ nonfree_firmware() { } -sha512sums="0dc3899d396587d90d03b31932c14debe67b7fe1b10be0308720f6382748ecaaf5338fccae4c239fb3aa877f835e769b65a15d641fcdd77258f3a80410072dd8 deviceinfo -b8bf2e3ec166af6acbbfaaa2b57b053473c0b12df007090eecf7a885aee2e3cd5d982819e2ee73e2817e5266b9875dc9240389bca409d5523f3cfa8037fa7870 60-persistent-v4l.rules" +sha512sums=" +0dc3899d396587d90d03b31932c14debe67b7fe1b10be0308720f6382748ecaaf5338fccae4c239fb3aa877f835e769b65a15d641fcdd77258f3a80410072dd8 deviceinfo +" diff --git a/device/testing/device-samsung-zeroltexx/udev/60-persistent-v4l.rules b/device/testing/device-samsung-zeroltexx/udev/60-persistent-v4l.rules deleted file mode 100644 index 7ecc69a94..000000000 --- a/device/testing/device-samsung-zeroltexx/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.