From ea7522f44e71870f06bbc33c8f96309876e738e8 Mon Sep 17 00:00:00 2001
From: Newbyte <newbie13xd@gmail.com>
Date: Mon, 29 May 2023 15:17:51 +0200
Subject: [PATCH] main/postmarketos-base: use source_deviceinfo (MR 4129)

---
 main/postmarketos-base/APKBUILD                    | 9 +++++----
 main/postmarketos-base/postmarketos-base.trigger   | 2 +-
 main/postmarketos-base/rootfs-etc-conf.d-zram-init | 2 +-
 main/postmarketos-base/rootfs-sbin-swapfile        | 2 +-
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/main/postmarketos-base/APKBUILD b/main/postmarketos-base/APKBUILD
index 189a13adc..7966c8e8f 100644
--- a/main/postmarketos-base/APKBUILD
+++ b/main/postmarketos-base/APKBUILD
@@ -1,12 +1,13 @@
 pkgname=postmarketos-base
-pkgver=26
-pkgrel=2
+pkgver=27
+pkgrel=0
 pkgdesc="Meta package for minimal postmarketOS base"
 url="https://postmarketos.org"
 arch="noarch"
 license="GPL-3.0-or-later"
 depends="
 	alpine-base
+	devicepkg-utils
 	eudev
 	openssh
 	postmarketos-bootsplash
@@ -127,7 +128,7 @@ e529f5cef1f31481b577f99b8917704f2cfefb963d98bf40a14b017938e55a00134d2033f81d2cb0
 9591c9cb2194fa1092505159c9eb3d899bec95b6dbd9a0222be62098db012da113a125e40d70373d60af9880dfa489bdbe12b6b897bdef5613e023800fb6ee1b  rootfs-etc-doas.d-10-postmarketos.conf
 a5c6bfaf6ee41f9623f463b64dab95924453d7b70bdd114cc441be9fc68fb6b0e042ae3163ec357d0dd6db93767232224b8c03df29f2cadf3ac2c6e2c998784f  rootfs-etc-conf.d-bootmisc
 e0d2d48b82a03239a4c0a00acaf83e00d397c23a8d7c71053d4e2a383357c22dcedef9e81b0e12a1d7514e1fdbe0bb3eb82613d18b29034a7ce5447f13c84a53  rootfs-etc-conf.d-swapfile
-488440c14ff7a662a6a0e5cad9caed1a972f82d2361b4985a68c3f05fab0a3fe9c58887907e66f683c8f8b6c12ba7e17cafdec1aa72cd9055190bd9f7a14c888  rootfs-etc-conf.d-zram-init
+4bc9f9c62d2cb75c1e562e070bc5260c9bc2b0abe6941b7cebd9b5a649342cb4121a0713153d3c246d0a284a50fd335638c9738778698a08fcaed7058b69efb9  rootfs-etc-conf.d-zram-init
 e4576c58c35f80bedddb1e89e186f37d31a186d3e9eb046581b8c5d7b7d435e18924539e851d3e67dc0ede80f9d44d16bd9ef52e73350d3f13224edc31d73a34  rootfs-etc-conf.d-syslog
 9b8d0493bb64457fe176fea801e0771d3c5279302c61559824bf81b3d2b66d2c1e076f4aaac65f55389005acb18c27e44bed858c2bdbad37d74199f07c86c354  rootfs-etc-fstab
 45bd0742a64a9d3c4a88e152b97edcf3fa1edca28884f9ea69e7c4c365f1e41ef9056dbe204545de7d4b2ba92e1e5872b2a929c2dcc1dd468e627cc3f090b8e6  rootfs-etc-issue
@@ -141,6 +142,6 @@ de4d8f258cb2ce654be15abe0188caa6ca9cc163fd45350f2025e7e9d043878e3f1202ef9033b1b1
 f5c6913040a0448c346fdd0b5dbea865a3ac92ac1a21646d32753e6521642a27b061c314f10a14b612b78aa6bc8d3209e51f7ced95c478f1be55e478ff04067b  rootfs-usr-lib-udev-rules.d-90-feedbackd-regulator-haptic.rules
 5fd6dd7f9941e975a6ce559924eb252606943276dc09455bbeb05ff718ecd28f20a08eee8e04ca580e5af71d4c944c256ec04f07b07286394f5dfedfa59273e7  rootfs-etc-init.d-deferred-initcalls
 f5cc0f1265955d2646e5f099dd4b5d4c287945bfc18c16044db57670d456f55c678fc11cc59e6dab3fa340832ce869d516302a3a35c13518539ed0cedca51819  rootfs-etc-init.d-swapfile
-3ceeee37f558e7c95ad973692b6a437f997e6b46c3d1c2257ddfb1529a5633477373aa123c7f08164e818daae50acb203d151379f27ca11bd458809e6a0d4de7  rootfs-sbin-swapfile
+23df2632e8ef372dccd6b9abac61441dd0ee447ccc7428fba495e28f1b697ebc415f7580dbb9a39d22d162a175d7264b47bdf9f66552347e35d9d0bb7828647d  rootfs-sbin-swapfile
 72c73bd67bfe2a659c469781e4def038a9b2482e014c0304150fbc25c5325fc7a36b288de76447837741bb9a828eb1db6df0d33b41cf67c7a25bb27b03777b1f  rootfs-usr-lib-firmwareload.sh
 "
diff --git a/main/postmarketos-base/postmarketos-base.trigger b/main/postmarketos-base/postmarketos-base.trigger
index 1162d1924..c4649bc7f 100644
--- a/main/postmarketos-base/postmarketos-base.trigger
+++ b/main/postmarketos-base/postmarketos-base.trigger
@@ -20,7 +20,7 @@ if [ "$deviceinfo" = "true" ]; then
 	deviceinfo_getty=""
 
 	# shellcheck disable=SC1091
-	. /etc/deviceinfo
+	. /usr/share/misc/source_deviceinfo
 
 	if [ -n "${deviceinfo_getty}" ]; then
 		port=$(echo "${deviceinfo_getty}" | cut -s -d ";" -f 1)
diff --git a/main/postmarketos-base/rootfs-etc-conf.d-zram-init b/main/postmarketos-base/rootfs-etc-conf.d-zram-init
index 4fbd187c2..9ccb76516 100644
--- a/main/postmarketos-base/rootfs-etc-conf.d-zram-init
+++ b/main/postmarketos-base/rootfs-etc-conf.d-zram-init
@@ -1,4 +1,4 @@
-. /etc/deviceinfo
+. /usr/share/misc/source_deviceinfo
 
 # Size defaults to:
 # - 75% of RAM for devices with 2GB of RAM or less
diff --git a/main/postmarketos-base/rootfs-sbin-swapfile b/main/postmarketos-base/rootfs-sbin-swapfile
index 0b66bf348..3a218215d 100644
--- a/main/postmarketos-base/rootfs-sbin-swapfile
+++ b/main/postmarketos-base/rootfs-sbin-swapfile
@@ -57,7 +57,7 @@ if [ ! -f ${config} ]; then
 fi
 
 # deviceinfo is a pmOS-specific thing, but it's not *required*
-source /etc/deviceinfo
+. /usr/share/misc/source_deviceinfo
 source /etc/conf.d/swapfile
 
 # Configure swap size. Size is in MB