From 4c14014faa4914b38104310b7d6c078358b7d5cb Mon Sep 17 00:00:00 2001
From: Luca Weiss <luca@z3ntu.xyz>
Date: Wed, 3 Aug 2022 15:27:34 +0200
Subject: [PATCH] pine64-dontbeevil: remove sensorfw/primaryuse.conf (MR 3338)

This conflicts with sensorfw config provided in Alpine. Both have the
same content so remove the one from device package.
---
 device/testing/device-pine64-dontbeevil/APKBUILD           | 6 +-----
 .../device-pine64-dontbeevil/sensorfw/primaryuse.conf      | 7 -------
 2 files changed, 1 insertion(+), 12 deletions(-)
 delete mode 100644 device/testing/device-pine64-dontbeevil/sensorfw/primaryuse.conf

diff --git a/device/testing/device-pine64-dontbeevil/APKBUILD b/device/testing/device-pine64-dontbeevil/APKBUILD
index 7ea408ce0..9a0c03281 100644
--- a/device/testing/device-pine64-dontbeevil/APKBUILD
+++ b/device/testing/device-pine64-dontbeevil/APKBUILD
@@ -1,7 +1,7 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-pine64-dontbeevil
 pkgver=0.3
-pkgrel=1
+pkgrel=2
 pkgdesc="PINE64 PinePhone Don't be evil devkit"
 url="https://postmarketos.org"
 license="MIT"
@@ -21,7 +21,6 @@ install="$pkgname.post-install"
 source="
 	deviceinfo
 	sensorfw/90-dontbeevil.conf
-	sensorfw/primaryuse.conf
 	uboot-script.cmd
 	weston.ini
 	xorg.conf
@@ -76,8 +75,6 @@ kernel_longts() {
 sensorfw() {
 	install_if="$pkgname=$pkgver-r$pkgrel sensorfw"
 
-	install -Dm644 -t "$subpkgdir"/etc/sensorfw \
-		"$srcdir"/primaryuse.conf
 	install -Dm644 -t "$subpkgdir"/etc/sensorfw/sensord.conf.d \
 		"$srcdir"/90-dontbeevil.conf
 }
@@ -86,7 +83,6 @@ sensorfw() {
 sha512sums="
 85dde682b5fc2975595d9a31c2054c8c375cc77fa4f6d7f83222994c9deb93d53436c1e8df8efe609e2d75d16e05077d30f549efce3c354e47a5605d3c59bc48  deviceinfo
 967e3a43c7e91ed37fc932a7c580cd168ca11d8ec7f60ff60ece7f286e5144f27faead95162fa7d571a2317ed0da970fd86f5bc9ed0235a25c0be9182d42d64d  90-dontbeevil.conf
-8e362f48fc5db58dc37d035f80f5ab0b09a20c82e6859e9662affdc192e2aa0bc7a259a9b0c63db330b3873d8b1f22af3f9193a0b7d79068354d1a788391376c  primaryuse.conf
 7d46b92a9a831ead6c1919b95ec4930242b35c2d8e2ce05fcb70dcd8c77c61d840d78738c5d82f6f4d56a1e676237243a795a728e76f38c27a74ed6dcb44279a  uboot-script.cmd
 c4c57d1627dd451213e1ef20d89de9266cd4edcc2d33a69aa9a1f13e16d9f9742036b69dc149fd910d7213f7525c41eb79576d4457bc85cc96eba0d986382d27  weston.ini
 f86ef35730b89bcc8160c08db7a7fcd0970adf60c0b77af68bac397de49c0d1783e6b8db1762380c9bf874aff2d030c6f44ecb75c803d69e79ede11376409369  xorg.conf
diff --git a/device/testing/device-pine64-dontbeevil/sensorfw/primaryuse.conf b/device/testing/device-pine64-dontbeevil/sensorfw/primaryuse.conf
deleted file mode 100644
index 1dca2cb27..000000000
--- a/device/testing/device-pine64-dontbeevil/sensorfw/primaryuse.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-[plugins]
-accelerometeradaptor = iiosensorsadaptor
-orientationadaptor = iiosensorsadaptor
-alsadaptor = iiosensorsadaptor
-magnetometeradaptor = iiosensorsadaptor
-gyroscopeadaptor = iiosensorsadaptor
-proximityadaptor = iiosensorsadaptor