main/postmarketos-initramfs: use source_deviceinfo from devicepkg-utils (MR 4129)

See https://gitlab.com/postmarketOS/pmaports/-/issues/2086

main/postmarketos-initramfs/00-initramfs-base.files

@@ -2,6 +2,7 @@
 /bin/busybox-extras
 /bin/sh
 /etc/deviceinfo
+/usr/share/misc/source_deviceinfo
 /usr/bin/unudhcpd
 /usr/sbin/kpartx
 /usr/sbin/telnetd

main/postmarketos-initramfs/APKBUILD

@@ -1,16 +1,17 @@
 # Maintainer: Oliver Smith <ollieparanoid@postmarketos.org>
 # Co-Maintainer: Clayton Craft <clayton@craftyguy.net>
 pkgname=postmarketos-initramfs
-pkgver=1.1.0
+pkgver=1.1.1
 pkgrel=0
 pkgdesc="Base files for the postmarketOS initramfs / initramfs-extra"
 url="https://postmarketos.org"
 depends="
-	busybox-extras
 	btrfs-progs
+	busybox-extras
 	bzip2
 	cryptsetup
 	device-mapper
+	devicepkg-utils
 	e2fsprogs
 	e2fsprogs-extra
 	f2fs-tools
@@ -65,8 +66,8 @@ package() {
 sha512sums="
 bed319179bcd0b894d6267c7e73f2890db07bc07df71542936947dfb3bdb17fade8a7b4e7b577f278af4472464427bba07f75aff0a1e454a4167052c088f3b6a  00-default.modules
 399da6e61993f48c8a62c956bb15d294cac10bf003d84257efdf4a213ebc87bb51cdcd75c4675f51c3be832146b8f21a7c769bf3e94f574a5067f001662632a1  00-initramfs-base.dirs
-3c47e9169ee8cfe78e1a554cf325962f5425c41a0125dcba8561f377d8c52cbfccdd791b269656478c92604644fb286b1ee8df42db9f5a771657e415da35e619  00-initramfs-base.files
+18ccd73fe772a51c266a1812900e599f7a6c1453dc8f2f3adf542c64523cae9f13859ada17ec88d17d53dbff585228701418d6d302fa6d7cefbeb2de1565d7bc  00-initramfs-base.files
 e984cd3033ce8752ebc71127828b964b46259a5263c2ebfab32c1394b674bcff464862ff00b8e920d3d31386c54ca0b94f84bc77580d275ecfeea33e76c07ef4  00-initramfs-extra-base.files
-db1fa42b738247bb75dc9242ba06ce3bb12a2225c5810fa580bea22ea85905ac1682759a7f51e27b272824957656ea58666a95b1b88724551ce1b0cab02cc783  init.sh
-a2c3e52b8e7b9763d42fd6b9a4e34962fe53dad8ea4a4a9422c21c2e234bfe3af50d5d2848440bb3a476b2a5882a9fbbc20e4cd10c61e92eaea55f16b6c4b3a7  init_functions.sh
+7742722dcad144eaa2af154711ba06afba9686a3d7b7ff80329d3e989f72d6105029aac8f32649888e2faafd970f286cbdcf467b6b4c1e12aa0fefdb5929a196  init.sh
+0325b91829a45d76c5606fec3af610ac0b138a81586ae3836058a773c10a6ed7c8b9090861cc8554c228956baa27dfe4b9edb5f7104673961649f65a878eb9dc  init_functions.sh
 "

main/postmarketos-initramfs/init.sh

@@ -4,7 +4,7 @@
 [ -e /hooks/10-verbose-initfs.sh ] && set -x
 
 . ./init_functions.sh
-source_deviceinfo
+. /usr/share/misc/source_deviceinfo
 
 export PATH=/usr/bin:/bin:/usr/sbin:/sbin
 /bin/busybox --install -s

main/postmarketos-initramfs/init_functions.sh

@@ -677,8 +677,3 @@ loop_forever() {
 		sleep 1
 	done
 }
-
-source_deviceinfo() {
-	# shellcheck disable=SC1091
-	. /etc/deviceinfo
-}