From d6c83500215d61fcc949b3ea1c611f42b51205c8 Mon Sep 17 00:00:00 2001
From: Aster Boese <asterboese@mailbox.org>
Date: Mon, 28 Jul 2025 13:25:30 -0400
Subject: [PATCH] main/devicepkg-utils: remove etc-deviceinfo

Removes the template file to abide by hermetic-usr. If a user
wishes to override deviceinfo themselves, then they can create
the file. Existing /etc/deviceinfo files will not be deleted if
they have been edited, so current installs with modifications
will not be affected.

Signed-off-by: Aster Boese <asterboese@mailbox.org>
Part-of: <https://gitlab.postmarketos.org/postmarketOS/pmaports/-/merge_requests/6834>
---
 main/devicepkg-utils/APKBUILD       | 7 ++-----
 main/devicepkg-utils/etc-deviceinfo | 7 -------
 2 files changed, 2 insertions(+), 12 deletions(-)
 delete mode 100644 main/devicepkg-utils/etc-deviceinfo

diff --git a/main/devicepkg-utils/APKBUILD b/main/devicepkg-utils/APKBUILD
index 58fecddef..b718ad75c 100644
--- a/main/devicepkg-utils/APKBUILD
+++ b/main/devicepkg-utils/APKBUILD
@@ -1,23 +1,20 @@
 maintainer=""
 pkgname=devicepkg-utils
-pkgver=0.3.2
+pkgver=0.3.3
 pkgrel=0
 pkgdesc="Utilities for interacting with device packages"
 url="https://postmarketos.org"
 arch="noarch"
 license="MIT"
 source="
-	etc-deviceinfo
 	source_deviceinfo
 "
 options="!check"
 
 package() {
 	install -Dm644 "$srcdir"/source_deviceinfo -t "$pkgdir"/usr/share/misc
-
-	install -Dm644 "$srcdir"/etc-deviceinfo "$pkgdir"/etc/deviceinfo
 }
+
 sha512sums="
-a6b988baddbf298356e22526f3731cde92babe0584c08dc63d950c160daa55d28896af6dd054ebb624aee6c8fe08ca41e5107a7e1f4aa6a496240d7180bcb388  etc-deviceinfo
 9e0a27f8f3e236817e3f5d5997bc376dc4d95508ecf5f812c48a29eaf7c9a21d46a2c78a65be98d60a12576b476e27314cdd3515a645b91706a85f929e83c053  source_deviceinfo
 "
diff --git a/main/devicepkg-utils/etc-deviceinfo b/main/devicepkg-utils/etc-deviceinfo
deleted file mode 100644
index ca82b54d2..000000000
--- a/main/devicepkg-utils/etc-deviceinfo
+++ /dev/null
@@ -1,7 +0,0 @@
-# Override settings from /usr/share/deviceinfo/deviceinfo with this file.
-# After modifying: Some settings require running "mkinitfs" as root and/or
-# a reboot to apply.
-# Reference: https://postmarketos.org/deviceinfo
-
-# Examples:
-# deviceinfo_usb_network_function="ncm.usb0"