device/main/device-pine64-pinephone/APKBUILD

@@ -5,7 +5,7 @@
 # Co-Maintainer: Clayton Craft <clayton@craftyguy.net>
 # Co-Maintainer: Dylan Van Assche <me@dylanvanassche.be>
 pkgname=device-pine64-pinephone
-pkgver=0.39
+pkgver=0.40
 pkgrel=0
 pkgdesc="PINE64 PinePhone"
 url="https://postmarketos.org"
@@ -210,7 +210,7 @@ bac664c504d9a3adc6e3d25f24ac63cf7c449a82374544a5b56c259dc25af580897b9dc992865ac8
 8b6fa7b12c15f439c561901f3ffe24a1ef2a0c343401c0a79281060854ab29e08a1fb5e7adae8684b12aa9f535ed99e2dad993dce9724822cb0fbf2497dd86e5  70-wifi-pm.rules
 7dc2b7c20b4a2b15f597a6417bd01797643dad84a3683b0dee648e030fb6326e9d020307643fdcdf1bb43fc44af9975697e417003bd359610bae2d8ce614fc00  90-modem-eg25.rules
 ed0e03f7e1c0348c06be9a7922414469245604ce813bbf0c8910ef211cb993bbb0d0d4615c9c961d50712415f85d6b73e0cf02780ac784666aac56e4889341e4  UPower.conf
-81f6bd25a8ba972bc73048baeda53835cb69d12b8fba47f465591f4a7a2b54e3d8811a0fcb2bda7aab7a25efbb1a6856bfe737dc15c123e50488e9048a988306  deviceinfo
+4a3e607a8e8249668195c472ba181149add65be515360b4d0f465b9c798e7bf8b2f2e431eb3e95cd8620c2a580779c665762f0386239b2fb2a64352e46702edb  deviceinfo
 ccbc83b84b5028bc2c8e526759004ce71b50b2675ecffee98f5676c70a3332197a231ff9d2fd46444dd3c0a637ec08ce6125b18240fe6bfc13f624a15192e648  gpsd_device-hook.sh
 1017fc3f325227da58c77abdc59e9735288d91a7ccc63ec784fe0241c523786b617a11ce8045dab2a74ca12a7dd70aaa334af91836418db1e96a3266fecaa4fd  gpsd_pinephone.initd
 3dd6d612c381cb0002049d1974d8fb5aa5a53a1eb4d6bcbf62eb2ad52cfdc45f0f6ad24a699716d3513b0371aa1316f25dc72afc10d7176cc3b99d0965c3f030  hwtest.ini

device/main/device-pine64-pinephone/deviceinfo

@@ -8,7 +8,7 @@ deviceinfo_codename="pine64-pinephone"
 deviceinfo_year="2019"
 deviceinfo_dtb="allwinner/sun50i-a64-pinephone-1.1 allwinner/sun50i-a64-pinephone-1.2"
 # gpio_vibra: needed for osk-sdl haptic feedback
-deviceinfo_modules_initfs="sun6i_mipi_dsi sun4i_drm pwm_sun4i sun8i_mixer anx7688 gpio_vibra kb151"
+deviceinfo_modules_initfs="sun6i_mipi_dsi sun4i_drm pwm_sun4i sun8i_mixer anx7688 gpio_vibra pinephone_keyboard"
 deviceinfo_arch="aarch64"
 
 # Device related

main/make-dynpart-mappings/10-setup-dynamic-partitions.files

+/usr/bin/make-dynpart-mappings

main/make-dynpart-mappings/APKBUILD

+# Maintainer: Richard Acayan <mailingradian@gmail.com>
+pkgname=make-dynpart-mappings
+pkgver=10.2.3
+pkgrel=0
+pkgdesc="a command-line tool that uses the device mapper to make block devices based on dynamic partitions"
+url="https://gitlab.com/flamingradian/make-dynpart-mappings/"
+arch="all"
+license="GPL-3.0-only"
+depends="device-mapper-libs libblkid libmd"
+makedepends="gcc libmd-dev lvm2-dev util-linux-dev"
+source="https://gitlab.com/flamingradian/make-dynpart-mappings/-/archive/$pkgver/make-dynpart-mappings-$pkgver.tar.gz
+10-setup-dynamic-partitions.files
+"
+options="!check"
+
+build() {
+	make
+}
+
+package() {
+	install -Dm755 "$builddir/make-dynpart-mappings" "$pkgdir/usr/bin/make-dynpart-mappings"
+	install -Dm644 "$srcdir/10-setup-dynamic-partitions.files" "$pkgdir/etc/postmarketos-mkinitfs/files/10-setup-dynamic-partitions.files"
+}
+
+sha512sums="
+151eb40229e58ef2aa2560018f85d79af1341928d48e1d42ec4b3324e73f512147a389ea3302ba3b239c58a24bb070f6f72753ab762002a8b8392278e0889005  make-dynpart-mappings-10.2.3.tar.gz
+c240f51e76efd049098e446fd0a78b4323b7b2c50e09bec69c51f666d56799862b878b3e2fa3c79ccf26bc1757aebb9826f46ab0a1d0ecd779f53d2153eadc9a  10-setup-dynamic-partitions.files
+"

main/postmarketos-mkinitfs/APKBUILD

@@ -2,7 +2,7 @@
 # Co-Maintainer: Clayton Craft <clayton@craftyguy.net>
 pkgname=postmarketos-mkinitfs
 pkgver=1.4.1
-pkgrel=2
+pkgrel=3
 pkgdesc="Tool to generate initramfs images for postmarketOS"
 url="https://postmarketos.org"
 depends="
@@ -70,6 +70,6 @@ check() {
 sha512sums="
 f827acb0a10c0e5c1631f1b712e91fde7eb4ade0f1174eb2ef1754018bf4518ea1ad3229fd335c25fb0c6fe46ae20890f5cf43e58c8143ae17b5ab9bb36f0199  postmarketos-mkinitfs-1.4.1.tar.gz
 08a3e79c6fa7d3839d43515b8da7817cb36f4ab014552fd0164957c232bb16fde337e57c47c9734d396a5fca3328fbf49ebabe4728c6071c80b04dad14886bba  00-default.modules
-0c6d2c749952ff027f1c435a7a3b2861fb632b81c16b6d69a92b47457da4af8cb80e50168b93f92b316377c8c1f5243029fca22ac49fef0940eb5ad6c3dff6ec  init.sh
-ddf1d545413cbf4bdd910c8bbd457ce46b1d0afe4c32ec204f3fee933386b08bc27af9f2907b0734b53d929b38352c5c8744d5828d60ffbc68f2a724b854d267  init_functions.sh
+fae45b5ee2cca9c0a4f75f29b4cb89cf07aed1f19b966964ccfeb5d2933474b60d7aa8f80190a997589e19e6aa3fc6317eaed8a54e1e349311a3564e73ab31e5  init.sh
+22617f7ceab27b2c48bdbaa40193a49065b6ba3c49f6f50d5bf987064814c7eedbd97b5000320c4dec419bbf7dd31d83abd1b6792465a9e8f60adbb673defa68  init_functions.sh
 "

main/postmarketos-mkinitfs/init.sh

@@ -19,6 +19,7 @@ setup_firmware_path
 [ -d /lib/modules ] && modprobe -a ${deviceinfo_modules_initfs} ext4 usb_f_rndis
 
 setup_mdev
+setup_dynamic_partitions "${deviceinfo_super_partitions:=}"
 mount_subpartitions
 setup_framebuffer
 

main/postmarketos-mkinitfs/init_functions.sh

@@ -76,6 +76,26 @@ get_uptime_seconds() {
 	awk -F '.' '{print $1}' /proc/uptime
 }
 
+setup_dynamic_partitions() {
+	command -v make-dynpart-mappings > /dev/null || return
+	attempt_start=$(get_uptime_seconds)
+	wait_seconds=10
+	slot_number=0
+	for super_partition in $1; do
+		# Wait for mdev
+		echo "Waiting for super partition $super_partition..."
+		while [ ! -b "$super_partition" ]; do
+			if [ "$(get_uptime_seconds)" -ge $(( attempt_start + wait_seconds )) ]; then
+				echo "ERROR: Super partition $super_partition failed to show up!"
+				return;
+			fi
+			sleep 0.1
+		done
+		make-dynpart-mappings "$super_partition" "$slot_number"
+		slot_number=$(( slot_number + 1 ))
+	done
+}
+
 mount_subpartitions() {
 	# Do not create subpartition mappings if pmOS_boot
 	# already exists (e.g. installed on an sdcard)