From 319396a6d5267fbff5128209e4923728eef3b1bb Mon Sep 17 00:00:00 2001
From: Stephan Gerhold <stephan@gerhold.net>
Date: Sun, 17 Nov 2024 21:19:20 +0100
Subject: [PATCH] device-<qcom-msm8916>: revert to msdos partition table for
 now (MR 5813)

pmbootstrap 3.0.0 uses GPT partition table by default, which breaks booting
on all the devices using the lk2nd bootloader. The current version of lk2nd
supports GPT only for the eMMC, while subpartitions and SD cards must be
partitioned with MBR. GPT support was present in the legacy branch of
lk2nd, but was dropped at some point because of poor code quality.

Fix the regression for now by reverting back to the old msdos (MBR)
partition table. We can revert this again later when lk2nd restores support
for GPT.

Generated with
$ for d in $(grep -R linux-postmarketos-qcom-msm8916 | grep -Eo 'device-[^/]+' | sort -u); do \
  echo -e '\n# lk2nd does not support GPT for subpartitions/SD cards yet\ndeviceinfo_partition_type="msdos"' \
  >> device/*/$d/deviceinfo && pmbootstrap checksum $d && pmbootstrap pkgver_bump $d; done

[ci:ignore-count]

[ci:skip-build]: bug in CI prevents build testing armv7 and aarch64, so
Clayton did the test locally for those archs
---
 device/community/device-arrow-db410c/APKBUILD         | 6 +++---
 device/community/device-arrow-db410c/deviceinfo       | 3 +++
 device/community/device-bq-paella/APKBUILD            | 6 +++---
 device/community/device-bq-paella/deviceinfo          | 3 +++
 device/community/device-lenovo-a6000/APKBUILD         | 6 +++---
 device/community/device-lenovo-a6000/deviceinfo       | 3 +++
 device/community/device-lenovo-a6010/APKBUILD         | 6 +++---
 device/community/device-lenovo-a6010/deviceinfo       | 3 +++
 device/community/device-motorola-harpia/APKBUILD      | 6 +++---
 device/community/device-motorola-harpia/deviceinfo    | 3 +++
 device/community/device-samsung-a3/APKBUILD           | 6 +++---
 device/community/device-samsung-a3/deviceinfo         | 3 +++
 device/community/device-samsung-a5/APKBUILD           | 6 +++---
 device/community/device-samsung-a5/deviceinfo         | 3 +++
 device/community/device-samsung-e7/APKBUILD           | 6 +++---
 device/community/device-samsung-e7/deviceinfo         | 3 +++
 device/community/device-samsung-grandmax/APKBUILD     | 6 +++---
 device/community/device-samsung-grandmax/deviceinfo   | 3 +++
 device/community/device-samsung-gt510/APKBUILD        | 6 +++---
 device/community/device-samsung-gt510/deviceinfo      | 3 +++
 device/community/device-samsung-gt58/APKBUILD         | 6 +++---
 device/community/device-samsung-gt58/deviceinfo       | 3 +++
 device/community/device-samsung-serranove/APKBUILD    | 6 +++---
 device/community/device-samsung-serranove/deviceinfo  | 3 +++
 device/community/device-wileyfox-crackling/APKBUILD   | 6 +++---
 device/community/device-wileyfox-crackling/deviceinfo | 3 +++
 device/community/device-xiaomi-wt88047/APKBUILD       | 6 +++---
 device/community/device-xiaomi-wt88047/deviceinfo     | 3 +++
 device/testing/device-acer-t01/APKBUILD               | 6 +++---
 device/testing/device-acer-t01/deviceinfo             | 3 +++
 device/testing/device-alcatel-idol3/APKBUILD          | 6 +++---
 device/testing/device-alcatel-idol3/deviceinfo        | 3 +++
 device/testing/device-alcatel-idol347/APKBUILD        | 6 +++---
 device/testing/device-alcatel-idol347/deviceinfo      | 3 +++
 device/testing/device-ark-peach/APKBUILD              | 6 +++---
 device/testing/device-ark-peach/deviceinfo            | 3 +++
 device/testing/device-asus-z00l/APKBUILD              | 6 +++---
 device/testing/device-asus-z00l/deviceinfo            | 3 +++
 device/testing/device-asus-z010d/APKBUILD             | 6 +++---
 device/testing/device-asus-z010d/deviceinfo           | 3 +++
 device/testing/device-bq-piccolo/APKBUILD             | 6 +++---
 device/testing/device-bq-piccolo/deviceinfo           | 3 +++
 device/testing/device-generic-zhihe/APKBUILD          | 6 +++---
 device/testing/device-generic-zhihe/deviceinfo        | 3 +++
 device/testing/device-huawei-g7/APKBUILD              | 6 +++---
 device/testing/device-huawei-g7/deviceinfo            | 3 +++
 device/testing/device-huawei-kiwi/APKBUILD            | 6 +++---
 device/testing/device-huawei-kiwi/deviceinfo          | 3 +++
 device/testing/device-huawei-y635/APKBUILD            | 6 +++---
 device/testing/device-huawei-y635/deviceinfo          | 3 +++
 device/testing/device-lenovo-a6020a40/APKBUILD        | 6 +++---
 device/testing/device-lenovo-a6020a40/deviceinfo      | 3 +++
 device/testing/device-lg-c50/APKBUILD                 | 6 +++---
 device/testing/device-lg-c50/deviceinfo               | 3 +++
 device/testing/device-lg-m216/APKBUILD                | 6 +++---
 device/testing/device-lg-m216/deviceinfo              | 3 +++
 device/testing/device-motorola-osprey/APKBUILD        | 6 +++---
 device/testing/device-motorola-osprey/deviceinfo      | 3 +++
 device/testing/device-motorola-surnia/APKBUILD        | 6 +++---
 device/testing/device-motorola-surnia/deviceinfo      | 3 +++
 device/testing/device-nokia-argon/APKBUILD            | 4 ++--
 device/testing/device-nokia-argon/deviceinfo          | 3 +++
 device/testing/device-nokia-leo/APKBUILD              | 4 ++--
 device/testing/device-nokia-leo/deviceinfo            | 3 +++
 device/testing/device-nokia-sparkler/APKBUILD         | 4 ++--
 device/testing/device-nokia-sparkler/deviceinfo       | 3 +++
 device/testing/device-qcom-msm8909/APKBUILD           | 4 ++--
 device/testing/device-qcom-msm8909/deviceinfo         | 3 +++
 device/testing/device-qcom-msm8916/APKBUILD           | 6 +++---
 device/testing/device-qcom-msm8916/deviceinfo         | 3 +++
 device/testing/device-samsung-a7/APKBUILD             | 6 +++---
 device/testing/device-samsung-a7/deviceinfo           | 3 +++
 device/testing/device-samsung-cprime/APKBUILD         | 4 ++--
 device/testing/device-samsung-cprime/deviceinfo       | 3 +++
 device/testing/device-samsung-fortuna3g/APKBUILD      | 6 +++---
 device/testing/device-samsung-fortuna3g/deviceinfo    | 3 +++
 device/testing/device-samsung-fortunaltezt/APKBUILD   | 6 +++---
 device/testing/device-samsung-fortunaltezt/deviceinfo | 3 +++
 device/testing/device-samsung-gprimeltecan/APKBUILD   | 6 +++---
 device/testing/device-samsung-gprimeltecan/deviceinfo | 3 +++
 device/testing/device-samsung-gprimeltexx/APKBUILD    | 6 +++---
 device/testing/device-samsung-gprimeltexx/deviceinfo  | 3 +++
 device/testing/device-samsung-gtelwifiue/APKBUILD     | 6 +++---
 device/testing/device-samsung-gtelwifiue/deviceinfo   | 3 +++
 device/testing/device-samsung-heatqlte/APKBUILD       | 6 +++---
 device/testing/device-samsung-heatqlte/deviceinfo     | 3 +++
 device/testing/device-samsung-j3ltetw/APKBUILD        | 6 +++---
 device/testing/device-samsung-j3ltetw/deviceinfo      | 3 +++
 device/testing/device-samsung-j5/APKBUILD             | 6 +++---
 device/testing/device-samsung-j5/deviceinfo           | 3 +++
 device/testing/device-samsung-j5x/APKBUILD            | 6 +++---
 device/testing/device-samsung-j5x/deviceinfo          | 3 +++
 device/testing/device-samsung-matisseve/APKBUILD      | 6 +++---
 device/testing/device-samsung-matisseve/deviceinfo    | 3 +++
 device/testing/device-samsung-on7/APKBUILD            | 6 +++---
 device/testing/device-samsung-on7/deviceinfo          | 3 +++
 device/testing/device-vivo-y21l/APKBUILD              | 6 +++---
 device/testing/device-vivo-y21l/deviceinfo            | 3 +++
 98 files changed, 289 insertions(+), 142 deletions(-)

diff --git a/device/community/device-arrow-db410c/APKBUILD b/device/community/device-arrow-db410c/APKBUILD
index 9cd8b2171f5..7a88429ed71 100644
--- a/device/community/device-arrow-db410c/APKBUILD
+++ b/device/community/device-arrow-db410c/APKBUILD
@@ -2,8 +2,8 @@
 # Maintainer: Minecrell <minecrell@minecrell.net>
 pkgname=device-arrow-db410c
 pkgdesc="Arrow DragonBoard 410c"
-pkgver=4
-pkgrel=1
+pkgver=5
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -32,6 +32,6 @@ nonfree_firmware() {
 }
 
 sha512sums="
-b7431dcf918509458637442814d6f91f1532c75cd483be65d14dedd7af81f2f565187a190b3e3537474d00eec71cdb4ef6eb7fe3246ecde5a6c7b92593e71207  deviceinfo
+748f5953d059f6765b041910bc8d7654a9e92d54d1646d8b90a4cdf5a66087f9a1917c7d1bddba994d2cc65d5b2ce422d6fb4650f771819b9f3f9ff33342be99  deviceinfo
 ccd6758cb4954eb0a96c7fb15e732e8147414f8edc498d9faf7d04ddef85d817733669ec1a6003e623e8392f3f6bb85f71160efe4e82f27e300d58aa6f5c8549  modules-initfs
 "
diff --git a/device/community/device-arrow-db410c/deviceinfo b/device/community/device-arrow-db410c/deviceinfo
index bf122a5570a..a7918c12ca9 100644
--- a/device/community/device-arrow-db410c/deviceinfo
+++ b/device/community/device-arrow-db410c/deviceinfo
@@ -33,3 +33,6 @@ deviceinfo_flash_offset_tags="0x01e00000"
 deviceinfo_flash_pagesize="2048"
 deviceinfo_flash_sparse="true"
 deviceinfo_flash_fastboot_partition_rootfs="rootfs"
+
+# lk2nd does not support GPT for subpartitions/SD cards yet
+deviceinfo_partition_type="msdos"
diff --git a/device/community/device-bq-paella/APKBUILD b/device/community/device-bq-paella/APKBUILD
index 4e7684dba6e..721afb08b72 100644
--- a/device/community/device-bq-paella/APKBUILD
+++ b/device/community/device-bq-paella/APKBUILD
@@ -2,8 +2,8 @@
 # Maintainer: Minecrell <minecrell@minecrell.net>
 pkgname=device-bq-paella
 pkgdesc="BQ Aquaris X5"
-pkgver=8
-pkgrel=1
+pkgver=9
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -38,6 +38,6 @@ nonfree_firmware() {
 }
 
 sha512sums="
-75e857f36f627d1ef209bfc79bac574b432ecb93a0e0de131675de43c43cef15e455284bab7b635376d21fd908e8cd21e6e918c6bd03c6e711179489f56e39a5  deviceinfo
+ec9416137ac7e49f564428bd92811ecc557567d3ee9b73061bab6da4d818fbecbbe70d179b91ef98576244bb6793e64b8add8d82a3a0398c5f542ba18978b58f  deviceinfo
 ebf6a40372329116a25df1407e671365bb2bf0613f61f0a572fc77890fb0a1760259ab35ed9f002ef2a5c6ee8836bc7bbeb50bf5ac3de14c11e6d96872ad3644  modules-initfs
 "
diff --git a/device/community/device-bq-paella/deviceinfo b/device/community/device-bq-paella/deviceinfo
index 38c06561903..61dbca387de 100644
--- a/device/community/device-bq-paella/deviceinfo
+++ b/device/community/device-bq-paella/deviceinfo
@@ -31,3 +31,6 @@ deviceinfo_flash_offset_second="0x00f00000"
 deviceinfo_flash_offset_tags="0x01e00000"
 deviceinfo_flash_pagesize="2048"
 deviceinfo_flash_sparse="true"
+
+# lk2nd does not support GPT for subpartitions/SD cards yet
+deviceinfo_partition_type="msdos"
diff --git a/device/community/device-lenovo-a6000/APKBUILD b/device/community/device-lenovo-a6000/APKBUILD
index f4dab212596..c92077c3b2e 100644
--- a/device/community/device-lenovo-a6000/APKBUILD
+++ b/device/community/device-lenovo-a6000/APKBUILD
@@ -3,8 +3,8 @@
 # Co-Maintainer: Minecrell <minecrell@minecrell.net>
 pkgname=device-lenovo-a6000
 pkgdesc="Lenovo A6000"
-pkgver=8
-pkgrel=1
+pkgver=9
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -46,7 +46,7 @@ phosh() {
 }
 
 sha512sums="
-4939c4931addcfc05dbd5ede8083385e554c51c90ce5b375291fc57f245bfccc71054c9ae66c421bd5a39fe8f4449b58450246b667af0cda84399b5d65dc2173  deviceinfo
+4d09fab52932eec68e861ece0e1b6be8091b4834d765e533c8af9eaa0598838d11c3297fd501717af2124739c17a91be923fbefb59459e9f8f2ecbf767421069  deviceinfo
 d433b8376b6e89daf4eac2073cb33627bdcacdcd48b6d4990cc698627dcf3c951bb1874951bc4631ea6b89d22c6002b9d02b77ff24992106061fcecc22fa5f25  modules-initfs
 10d4ee62e5f7a9e4c368c460dd4c3ef282476e47d8cc40e4e3b83e971d04c493b801e5628ebdfe721f869e2fd68c521cf192cba1a973c8e03a61445534a28811  phoc.ini
 "
diff --git a/device/community/device-lenovo-a6000/deviceinfo b/device/community/device-lenovo-a6000/deviceinfo
index 58caf663682..9d9a4f10a2d 100644
--- a/device/community/device-lenovo-a6000/deviceinfo
+++ b/device/community/device-lenovo-a6000/deviceinfo
@@ -31,3 +31,6 @@ deviceinfo_flash_offset_second="0x00f00000"
 deviceinfo_flash_offset_tags="0x01e00000"
 deviceinfo_flash_pagesize="2048"
 deviceinfo_flash_sparse="true"
+
+# lk2nd does not support GPT for subpartitions/SD cards yet
+deviceinfo_partition_type="msdos"
diff --git a/device/community/device-lenovo-a6010/APKBUILD b/device/community/device-lenovo-a6010/APKBUILD
index ec89cd8f665..4e7faf85a62 100644
--- a/device/community/device-lenovo-a6010/APKBUILD
+++ b/device/community/device-lenovo-a6010/APKBUILD
@@ -3,8 +3,8 @@
 # Co-Maintainer: Minecrell <minecrell@minecrell.net>
 pkgname=device-lenovo-a6010
 pkgdesc="Lenovo A6010"
-pkgver=8
-pkgrel=1
+pkgver=9
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -46,7 +46,7 @@ phosh() {
 }
 
 sha512sums="
-f367b90ebbf89896884d3cc34c559cc3d36b6e4187aeb52497c23b0cb133c25163751d0013aa37109a441c76339f13de829fc01ff9537dc9fcdf53ae0066bd24  deviceinfo
+0b50a8f01bf0014f905e212ab8677a34c1b538b6ef3205895f16a7b40fa0c20b5db966f9358ffe25f1bf06283eac4ee166ee8d1e68aafe12069d22c9f87376b8  deviceinfo
 258464e46872cf221f7ac367766f9b8ead5d5dccbd71f3df5a5555127a42448906247ff2519d1750eec53b3ed37ae96c2409369d7cb8e2fffeb202a8f69bba53  modules-initfs
 10d4ee62e5f7a9e4c368c460dd4c3ef282476e47d8cc40e4e3b83e971d04c493b801e5628ebdfe721f869e2fd68c521cf192cba1a973c8e03a61445534a28811  phoc.ini
 "
diff --git a/device/community/device-lenovo-a6010/deviceinfo b/device/community/device-lenovo-a6010/deviceinfo
index 1d20736417b..6aa11d19ca2 100644
--- a/device/community/device-lenovo-a6010/deviceinfo
+++ b/device/community/device-lenovo-a6010/deviceinfo
@@ -31,3 +31,6 @@ deviceinfo_flash_offset_second="0x00f00000"
 deviceinfo_flash_offset_tags="0x01e00000"
 deviceinfo_flash_pagesize="2048"
 deviceinfo_flash_sparse="true"
+
+# lk2nd does not support GPT for subpartitions/SD cards yet
+deviceinfo_partition_type="msdos"
diff --git a/device/community/device-motorola-harpia/APKBUILD b/device/community/device-motorola-harpia/APKBUILD
index 5b4ebd90168..d930f335549 100644
--- a/device/community/device-motorola-harpia/APKBUILD
+++ b/device/community/device-motorola-harpia/APKBUILD
@@ -2,8 +2,8 @@
 # Maintainer: Minecrell <minecrell@minecrell.net>
 pkgname=device-motorola-harpia
 pkgdesc="Motorola Moto G4 Play"
-pkgver=9
-pkgrel=1
+pkgver=10
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -41,6 +41,6 @@ nonfree_firmware() {
 }
 
 sha512sums="
-31eba51ab586af61d0ea0efb2e0f0a8533524254e864d59bc2142ba30c6b5745a46a00314fbf86a8b5bcfeee2d42b218c27d2e8aa5ed19f24e50468860999e56  deviceinfo
+001c54115e5a4d0444c098f009bfc40a756b4044a9c1026fad0f5b0316e9540cc35ccd517689fcd298cb6481c0697e3127d46c618093a644a915ea8eb68bac27  deviceinfo
 525a3e20672a7dff26b885b99ee157e0ece33efa10db34c90aed45dc47d7f1c2e90d7082dc84f2724892f199b5adaca04d5864f0aa1d1e4b8ea695f840346d60  modules-initfs
 "
diff --git a/device/community/device-motorola-harpia/deviceinfo b/device/community/device-motorola-harpia/deviceinfo
index c92d5f85d06..c21b8de9574 100644
--- a/device/community/device-motorola-harpia/deviceinfo
+++ b/device/community/device-motorola-harpia/deviceinfo
@@ -31,3 +31,6 @@ deviceinfo_flash_offset_second="0x00f00000"
 deviceinfo_flash_offset_tags="0x01e00000"
 deviceinfo_flash_pagesize="2048"
 deviceinfo_flash_sparse="true"
+
+# lk2nd does not support GPT for subpartitions/SD cards yet
+deviceinfo_partition_type="msdos"
diff --git a/device/community/device-samsung-a3/APKBUILD b/device/community/device-samsung-a3/APKBUILD
index 3a754334c73..cb1be96c699 100644
--- a/device/community/device-samsung-a3/APKBUILD
+++ b/device/community/device-samsung-a3/APKBUILD
@@ -4,8 +4,8 @@
 # Co-Maintainer: Minecrell <minecrell@minecrell.net>
 pkgname=device-samsung-a3
 pkgdesc="Samsung Galaxy A3 (2015)"
-pkgver=12
-pkgrel=1
+pkgver=13
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -57,7 +57,7 @@ phosh() {
 }
 
 sha512sums="
-b0bf0480159db976c1ba827d65cf68400dad255ff0f2627fd9ff74673993d605b8a1059fac1e7f11e4d565e2072dcf1760e61e04f816880bafc722a4b725fc31  deviceinfo
+382a8a6aa87e9b78acbe50adacb9c8b0e765ae9a14dfade648b83fac8b6b3fce5798fd16ec3a877a3b56ade2daef4adce643c86e63ef180ae0ab552dfa0da001  deviceinfo
 3754688b2a61c204f37944d700b6fc273f68a01e25d444a3c3f2dd2531d8538650a2e571657e18e7a96a2db96b19f2f738d6f465bde477efd66ab31a78edfb91  modules-initfs
 e8f734a2f8d154813dbb493f0d58af50a7f624ffed41967a81493b975a6211efc6d30743b23825562cfd126791cbdd3348bfbed32eeece9b8acec0a37c3c51b6  phoc.ini
 "
diff --git a/device/community/device-samsung-a3/deviceinfo b/device/community/device-samsung-a3/deviceinfo
index d04b2ddc76a..2ace7a1d397 100644
--- a/device/community/device-samsung-a3/deviceinfo
+++ b/device/community/device-samsung-a3/deviceinfo
@@ -38,3 +38,6 @@ deviceinfo_flash_sparse="true"
 deviceinfo_usb_idVendor="0x04e8"
 # Galaxy (MTP)
 deviceinfo_usb_idProduct="0x6860"
+
+# lk2nd does not support GPT for subpartitions/SD cards yet
+deviceinfo_partition_type="msdos"
diff --git a/device/community/device-samsung-a5/APKBUILD b/device/community/device-samsung-a5/APKBUILD
index ea556d67f6e..96f64f73b68 100644
--- a/device/community/device-samsung-a5/APKBUILD
+++ b/device/community/device-samsung-a5/APKBUILD
@@ -3,8 +3,8 @@
 # Co-Maintainer: Alexey Min <alexey.min@gmail.com>
 pkgname=device-samsung-a5
 pkgdesc="Samsung Galaxy A5 (2015)"
-pkgver=11
-pkgrel=1
+pkgver=12
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -42,6 +42,6 @@ nonfree_firmware() {
 }
 
 sha512sums="
-2fc9ed97981cc439046475eef8eb6d358bfde571242b14763cf4223c076cbda9ee861221e6978056e65a09020bfaeeb7734e22782701a2bcb134ef113467dc9a  deviceinfo
+113af5e20f5a42870b2796e71b6533a1f330fefacbec7dd659648f9148391a8ba9a1dde4a3f8732740ff25c8334a6dbfb4352a4a82e76da45d9ce5a597fc3199  deviceinfo
 13ba472485d757332b46a21fe771ae2779d0c5f1e997b6e51a4c0acce902256f0a2c724828251acf0150d7de919b691053de59041fea0b983569a004dcb75256  modules-initfs
 "
diff --git a/device/community/device-samsung-a5/deviceinfo b/device/community/device-samsung-a5/deviceinfo
index 350ecedcb5a..82fcadd7da6 100644
--- a/device/community/device-samsung-a5/deviceinfo
+++ b/device/community/device-samsung-a5/deviceinfo
@@ -38,3 +38,6 @@ deviceinfo_flash_sparse="true"
 deviceinfo_usb_idVendor="0x04e8"
 # Galaxy (MTP)
 deviceinfo_usb_idProduct="0x6860"
+
+# lk2nd does not support GPT for subpartitions/SD cards yet
+deviceinfo_partition_type="msdos"
diff --git a/device/community/device-samsung-e7/APKBUILD b/device/community/device-samsung-e7/APKBUILD
index 079bf8e99a9..f6cb2001771 100644
--- a/device/community/device-samsung-e7/APKBUILD
+++ b/device/community/device-samsung-e7/APKBUILD
@@ -2,8 +2,8 @@
 # Maintainer: Raymond Hackley <wonderfulShrineMaidenOfParadise@postmarketos.org>
 pkgname=device-samsung-e7
 pkgdesc="Samsung Galaxy E7"
-pkgver=2
-pkgrel=2
+pkgver=3
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
@@ -37,6 +37,6 @@ nonfree_firmware() {
 }
 
 sha512sums="
-a07a79468307db2a23ef0daead5c49d588e64a42b2806a5051eb422e693cb176cf16092f384aacd08d53e34be828725766d75f94d2b88cac2c31932051bd2ebc  deviceinfo
+6fe8a7c014c14380016f8629072fdeb2bfc495cda22abd89e48e58188925518b97611bf8fa7659f2cc4feab61967a01e148ddcfe3622c57674c70733aec95b1e  deviceinfo
 659b6cdc0e9be756cfae34031d407175356edc331a8d4f51fb70b0beea4f8067c5ded39e158054c02811df0964d967d3a790bfef99675ca2587ef867d02db8db  modules-initfs
 "
diff --git a/device/community/device-samsung-e7/deviceinfo b/device/community/device-samsung-e7/deviceinfo
index 6b960e5bfd5..460d56ce9aa 100644
--- a/device/community/device-samsung-e7/deviceinfo
+++ b/device/community/device-samsung-e7/deviceinfo
@@ -36,3 +36,6 @@ deviceinfo_flash_sparse="true"
 deviceinfo_usb_idVendor="0x04e8"
 # Galaxy (MTP)
 deviceinfo_usb_idProduct="0x6860"
+
+# lk2nd does not support GPT for subpartitions/SD cards yet
+deviceinfo_partition_type="msdos"
diff --git a/device/community/device-samsung-grandmax/APKBUILD b/device/community/device-samsung-grandmax/APKBUILD
index e705cc67fa2..db26f046e6b 100644
--- a/device/community/device-samsung-grandmax/APKBUILD
+++ b/device/community/device-samsung-grandmax/APKBUILD
@@ -2,8 +2,8 @@
 # Maintainer: Raymond Hackley <wonderfulShrineMaidenOfParadise@postmarketos.org>
 pkgname=device-samsung-grandmax
 pkgdesc="Samsung Galaxy Grand Max"
-pkgver=2
-pkgrel=2
+pkgver=3
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
@@ -37,6 +37,6 @@ nonfree_firmware() {
 }
 
 sha512sums="
-a7f7c5ef87b8bc6d6f8c732098342e8a91742a67978eb107e20cc839c5dedb8ce497bf1a9df143fe447e74936cfc6dfeecb4b25427c43278f0020ba1065dee2e  deviceinfo
+a632d55dd34cfe3c5e88f063335d44a7ad04d93caca641f788415e361757e37f13ec48e51e268ef3e6af27704eb4e1a0ce5b8307c7800544b469582eb5083995  deviceinfo
 24b1b199ca26d902807038faa20b44d6060c039900df5c7aa263cdb22b35930e726c2bfd86e32b1f1dd6fa8ab3b57a6c8ff430ce9aae2dd04c04565ea56c8a43  modules-initfs
 "
diff --git a/device/community/device-samsung-grandmax/deviceinfo b/device/community/device-samsung-grandmax/deviceinfo
index 4f4dc361e02..2efac92a188 100644
--- a/device/community/device-samsung-grandmax/deviceinfo
+++ b/device/community/device-samsung-grandmax/deviceinfo
@@ -36,3 +36,6 @@ deviceinfo_flash_sparse="true"
 deviceinfo_usb_idVendor="0x04e8"
 # Galaxy (MTP)
 deviceinfo_usb_idProduct="0x6860"
+
+# lk2nd does not support GPT for subpartitions/SD cards yet
+deviceinfo_partition_type="msdos"
diff --git a/device/community/device-samsung-gt510/APKBUILD b/device/community/device-samsung-gt510/APKBUILD
index 5d3234a288b..155f72453c0 100644
--- a/device/community/device-samsung-gt510/APKBUILD
+++ b/device/community/device-samsung-gt510/APKBUILD
@@ -2,8 +2,8 @@
 # Maintainer: Nikita Travkin <nikita@trvn.ru>
 pkgname=device-samsung-gt510
 pkgdesc="Samsung Galaxy Tab A 9.7 (2015)"
-pkgver=6
-pkgrel=1
+pkgver=7
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -51,7 +51,7 @@ phosh() {
 }
 
 sha512sums="
-4a64cf8f1800a6a8de3ca4c61a40189377ce354e4ef2a8fdfe48002c7fd255d66b1bbb9112e9ba2a247847ac6e2e3147c94eb349c155cc3ead004153653e5d44  deviceinfo
+2eaf2d4c34e655c9e2a48592435e1d204072b4cc918c735c75fb9fa5cf9cbe58f1701ac9530894d7162ff99aed944fe806748c7f882b0963cfb9bbdc13239e08  deviceinfo
 77e32266772a201ba42d91586dce32bd93ff81f1a49c5f5b157847e3107d0b2c9a2f0478b383416ca37ddfb820fe6c9147abe8ccd7e07ad704c3c4c9d4683f3a  modules-initfs
 6aedd5eeac4d21356678f5399f3f0946392c9a7477ac21d39b8e761133dc8ed67adb4966647314f71d5263483ab68cad92847dacff95ffa45eabfc33c9f405b5  pointercal
 ed612b090c1ee512fc257368082fe0c88ca6c98a9d673ece68593739c7a41b4f9dca5d9360de6f84d206f297feba480a9f1982301132e08a14a5ff920a2675a6  phoc.ini
diff --git a/device/community/device-samsung-gt510/deviceinfo b/device/community/device-samsung-gt510/deviceinfo
index e29a1c3cd23..b3e04cfff1f 100644
--- a/device/community/device-samsung-gt510/deviceinfo
+++ b/device/community/device-samsung-gt510/deviceinfo
@@ -36,3 +36,6 @@ deviceinfo_flash_sparse="true"
 deviceinfo_usb_idVendor="0x04e8"
 # Galaxy (MTP)
 deviceinfo_usb_idProduct="0x6860"
+
+# lk2nd does not support GPT for subpartitions/SD cards yet
+deviceinfo_partition_type="msdos"
diff --git a/device/community/device-samsung-gt58/APKBUILD b/device/community/device-samsung-gt58/APKBUILD
index 1f51dafbed5..9f8f0314ed6 100644
--- a/device/community/device-samsung-gt58/APKBUILD
+++ b/device/community/device-samsung-gt58/APKBUILD
@@ -2,8 +2,8 @@
 # Maintainer: Nikita Travkin <nikita@trvn.ru>
 pkgname=device-samsung-gt58
 pkgdesc="Samsung Galaxy Tab A 8.0 (2015)"
-pkgver=6
-pkgrel=1
+pkgver=7
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -47,7 +47,7 @@ phosh() {
 }
 
 sha512sums="
-2e7363625b58da2fe036fc70538207a490d5b93a99c3d0c2835fab3114fe09b5e90a3b7583b8f62d8eea7af7910f963d0aa994483045d570f062449cc939fb13  deviceinfo
+3597027a39462451a80eb781d17382a0fb4618eeaf61392af6998c94a68c52a85ec1df8bc2ac6a30b71e53c38ab52b640052c97b66e2e8eeb4e55c95858ce308  deviceinfo
 8071b89c832619c74d3bb50d638653aeaab99fee209cde425a7e8425d46d424bad9e8ab76d2d7360bd4c7ff093a712d51c3ca1b6086e1f70812224bbb115b04f  modules-initfs
 ed612b090c1ee512fc257368082fe0c88ca6c98a9d673ece68593739c7a41b4f9dca5d9360de6f84d206f297feba480a9f1982301132e08a14a5ff920a2675a6  phoc.ini
 "
diff --git a/device/community/device-samsung-gt58/deviceinfo b/device/community/device-samsung-gt58/deviceinfo
index 686a671061f..cf39d03a298 100644
--- a/device/community/device-samsung-gt58/deviceinfo
+++ b/device/community/device-samsung-gt58/deviceinfo
@@ -38,3 +38,6 @@ deviceinfo_flash_sparse="true"
 deviceinfo_usb_idVendor="0x04e8"
 # Galaxy (MTP)
 deviceinfo_usb_idProduct="0x6860"
+
+# lk2nd does not support GPT for subpartitions/SD cards yet
+deviceinfo_partition_type="msdos"
diff --git a/device/community/device-samsung-serranove/APKBUILD b/device/community/device-samsung-serranove/APKBUILD
index c3d8a23813a..ce7682b79cd 100644
--- a/device/community/device-samsung-serranove/APKBUILD
+++ b/device/community/device-samsung-serranove/APKBUILD
@@ -2,8 +2,8 @@
 # Maintainer: Minecrell <minecrell@minecrell.net>
 pkgname=device-samsung-serranove
 pkgdesc="Samsung Galaxy S4 Mini Value Edition"
-pkgver=13
-pkgrel=1
+pkgver=14
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
@@ -53,7 +53,7 @@ phosh() {
 }
 
 sha512sums="
-6c28cc461becf05428282016c6d0e1982e0d5e08484245877bd8674b667d2f1f6bb7db8a696a1493f3bf36511e2c84835b28435b3c395b10424edc51f33d512a  deviceinfo
+7acbdb4baa909ff0920a3a6e43da76cf6026bc45c74adbbbac1890ddfcf7d360c6f8fe13f234a1c6569923ebbaec0545ce71ab1a483ea3668c763147f0b0268f  deviceinfo
 0c92ace5c522d039d356e8914c0e0237e11fc38dd05390ba7a89532be659707d2b499ae77b263c5984345caac11fd007bd6d1e279d3426126bc276a0bcd9348b  modules-initfs
 1bc90a1a67309b43435039332b2a1d7e606408c6429b3cb8991a57f53dd4de36fbe471481b6481fbdb098c3819344e8093dd8eab0d34eb3c091ab6d8abd5c087  phoc.ini
 "
diff --git a/device/community/device-samsung-serranove/deviceinfo b/device/community/device-samsung-serranove/deviceinfo
index d3e6ffeedd7..0db14817012 100644
--- a/device/community/device-samsung-serranove/deviceinfo
+++ b/device/community/device-samsung-serranove/deviceinfo
@@ -39,3 +39,6 @@ deviceinfo_flash_sparse="true"
 deviceinfo_usb_idVendor="0x04e8"
 # Galaxy (MTP)
 deviceinfo_usb_idProduct="0x6860"
+
+# lk2nd does not support GPT for subpartitions/SD cards yet
+deviceinfo_partition_type="msdos"
diff --git a/device/community/device-wileyfox-crackling/APKBUILD b/device/community/device-wileyfox-crackling/APKBUILD
index 518c1d7f6a9..71e30b18b5b 100644
--- a/device/community/device-wileyfox-crackling/APKBUILD
+++ b/device/community/device-wileyfox-crackling/APKBUILD
@@ -3,8 +3,8 @@
 # Co-Maintainer: Minecrell <minecrell@minecrell.net>
 pkgname=device-wileyfox-crackling
 pkgdesc="Wileyfox Swift"
-pkgver=8
-pkgrel=1
+pkgver=9
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -45,7 +45,7 @@ nonfree_firmware() {
 }
 
 sha512sums="
-fb5ff1648128331dff061026e8c783a26f66dea4530de6ad3a27620e1aa0fc516e8c0b2f04fe3f6e9e5ce882b77b415d93981532c546129949caec802cdda883  deviceinfo
+9d3ed4562e48c6ec484a4a6faf7a836c48c18fabf5ccbbe718b80df168a8b8706a962f1b2bd76bc1adbbb5bf5043be32678850884c5baf779684de414619896b  deviceinfo
 31f926acffed502edca7d6a26c97c197970b842122df42a1ea5c63f2707b4375465eae77a754f5d58f556f55e1f5f421af21a92ca6165a3a4bacf55c5fbf7faf  modules-initfs
 a845e860cf43e58818bbffda62a9514e9a24527e14c485dd10944587b29dbf5864a1d3ec17d219c342512fac4bd6c25f5f0f4efb8883b8f383a79846759318ee  10-crackling-proximity.rules
 "
diff --git a/device/community/device-wileyfox-crackling/deviceinfo b/device/community/device-wileyfox-crackling/deviceinfo
index 370b55c4d5a..17520968d66 100644
--- a/device/community/device-wileyfox-crackling/deviceinfo
+++ b/device/community/device-wileyfox-crackling/deviceinfo
@@ -31,3 +31,6 @@ deviceinfo_flash_offset_second="0x00f00000"
 deviceinfo_flash_offset_tags="0x01e00000"
 deviceinfo_flash_pagesize="2048"
 deviceinfo_flash_sparse="true"
+
+# lk2nd does not support GPT for subpartitions/SD cards yet
+deviceinfo_partition_type="msdos"
diff --git a/device/community/device-xiaomi-wt88047/APKBUILD b/device/community/device-xiaomi-wt88047/APKBUILD
index 0ea4f1469c3..e803af36a56 100644
--- a/device/community/device-xiaomi-wt88047/APKBUILD
+++ b/device/community/device-xiaomi-wt88047/APKBUILD
@@ -2,8 +2,8 @@
 # Maintainer: Minecrell <minecrell@minecrell.net>
 pkgname=device-xiaomi-wt88047
 pkgdesc="Xiaomi Redmi 2"
-pkgver=9
-pkgrel=1
+pkgver=10
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -38,6 +38,6 @@ nonfree_firmware() {
 }
 
 sha512sums="
-088daf52e6273289e279ee5c39d170bcde6b163eed39a11f3b25c6504347d304cd09745b3eb568b56eb03b67231e6948d1a75df19fb0e24dc535dcc8ce2c2e8c  deviceinfo
+0cdcff4e49c0c4413759e12dba07810fa7d7cb2647b9b378dc26d6f5b62ba51e5c9ac3e198a6e29464c943ef0b1dedf071e0476da04a3d05f167a621b106259d  deviceinfo
 7f6892125a15fdfcfca140571073150df25a5c355eae8ae632a56a00cd9e5fc7168d435680ca83eb8a8d9ae63aef6af478f42e92815f175d26ec592941de61e6  modules-initfs
 "
diff --git a/device/community/device-xiaomi-wt88047/deviceinfo b/device/community/device-xiaomi-wt88047/deviceinfo
index 7dcc2c92f4a..60870a9b18f 100644
--- a/device/community/device-xiaomi-wt88047/deviceinfo
+++ b/device/community/device-xiaomi-wt88047/deviceinfo
@@ -36,3 +36,6 @@ deviceinfo_flash_sparse="true"
 deviceinfo_usb_idVendor="0x2717"
 # Mi/Redmi series (MTP)
 deviceinfo_usb_idProduct="0xFF40"
+
+# lk2nd does not support GPT for subpartitions/SD cards yet
+deviceinfo_partition_type="msdos"
diff --git a/device/testing/device-acer-t01/APKBUILD b/device/testing/device-acer-t01/APKBUILD
index 84727331b0b..af1114be7e5 100644
--- a/device/testing/device-acer-t01/APKBUILD
+++ b/device/testing/device-acer-t01/APKBUILD
@@ -1,8 +1,8 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-acer-t01
 pkgdesc="Acer Liquid Z330"
-pkgver=2
-pkgrel=1
+pkgver=3
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
@@ -38,6 +38,6 @@ nonfree_firmware() {
 }
 
 sha512sums="
-1009145f30d70d46207a6c09571fd6d28bb909fe1d28d14c6bdcbbe45d2ee024c74aa1c083794f4d53c8616a08579d55e7a242c8a27fcc647f60fa98eae02692  deviceinfo
+ac76d059a6725c3d8a15b4d66f3c88e1f719d8f99c92b4b5d22292b5c6df3203749d5bdef1d3dba5f8daca7cf33e7e869093c86cb83593c7994821aa791abba8  deviceinfo
 a0e3f4ca9dd9bb171b021ee07a2aaf3886b3d6376bb38298128b0bf0325a2305e48ba42a37105b13f7f469fb98d8326c8ce95b6259f8974a4f04b09acb3af7f2  modules-initfs
 "
diff --git a/device/testing/device-acer-t01/deviceinfo b/device/testing/device-acer-t01/deviceinfo
index 0fc9cfbf242..59324087f08 100644
--- a/device/testing/device-acer-t01/deviceinfo
+++ b/device/testing/device-acer-t01/deviceinfo
@@ -38,3 +38,6 @@ deviceinfo_flash_sparse="true"
 deviceinfo_usb_idVendor="0x0502"
 # Acer Liquid Z330
 deviceinfo_usb_idProduct="0x37c3"
+
+# lk2nd does not support GPT for subpartitions/SD cards yet
+deviceinfo_partition_type="msdos"
diff --git a/device/testing/device-alcatel-idol3/APKBUILD b/device/testing/device-alcatel-idol3/APKBUILD
index 5e86cd4f9f7..03ecd954051 100644
--- a/device/testing/device-alcatel-idol3/APKBUILD
+++ b/device/testing/device-alcatel-idol3/APKBUILD
@@ -2,8 +2,8 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-alcatel-idol3
 pkgdesc="Alcatel OneTouch Idol 3 (5.5)"
-pkgver=1
-pkgrel=1
+pkgver=2
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -40,7 +40,7 @@ phosh() {
 }
 
 sha512sums="
-9538a647ff7c0d56f27c94e09b900b28f47cc224865daad92fabed82ac92e44525d46a26e5272a420253fca965fb1ac0016304a295c10462054a56c21b3e7b2e  deviceinfo
+3510410d32d5ebcb16d938ede8dccd98e08a886b4c8f7ddf1786fa1b46cc415bf6efabdb1e465bdcd3a986ccff8fda94cceac3591adeaac0eb9da22975449d23  deviceinfo
 4634f125e81a06fc1ad22f950a13b8a50a3f91caaa6e82a07cdd3d497ecf13459c623c7b14ee052874cc9b63ea1caf88e3c7c81668226a39608577295435a6a4  modules-initfs
 3c31b24f049788592c15db5c73607624af9ff181ee265d824735d38e45dd129477867360eb6241b94757e68e89e682feda7b76daa205e5ba2901234af68f0e76  phoc.ini
 "
diff --git a/device/testing/device-alcatel-idol3/deviceinfo b/device/testing/device-alcatel-idol3/deviceinfo
index 4e14a023a16..4c2c1f7d6a1 100644
--- a/device/testing/device-alcatel-idol3/deviceinfo
+++ b/device/testing/device-alcatel-idol3/deviceinfo
@@ -30,3 +30,6 @@ deviceinfo_flash_offset_second="0x00f00000"
 deviceinfo_flash_offset_tags="0x01e00000"
 deviceinfo_flash_pagesize="2048"
 deviceinfo_flash_sparse="true"
+
+# lk2nd does not support GPT for subpartitions/SD cards yet
+deviceinfo_partition_type="msdos"
diff --git a/device/testing/device-alcatel-idol347/APKBUILD b/device/testing/device-alcatel-idol347/APKBUILD
index 504e867f3b1..fe35aeea5fd 100644
--- a/device/testing/device-alcatel-idol347/APKBUILD
+++ b/device/testing/device-alcatel-idol347/APKBUILD
@@ -2,8 +2,8 @@
 # Maintainer: Vincent Knecht <vincent.knecht@mailoo.org>
 pkgname=device-alcatel-idol347
 pkgdesc="Alcatel OneTouch Idol 3 (4.7)"
-pkgver=6
-pkgrel=1
+pkgver=7
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -40,7 +40,7 @@ phosh() {
 }
 
 sha512sums="
-ebbf2683764c8521051de861baf0dc0970852310d24f139afcd444ecd41b95b65f4e8cb0eb152b510c01a21249a0c333080fc5e1e2d07cf8285bd5cc0e3219cc  deviceinfo
+5dbc419ba81fcd508a32a52d284fed78dc5fe185d69f532d1e755395af7c000dfee775f9b9703e5b0e6802925c2e1473a8b72d5d1711f4dce00cf296066f3dc1  deviceinfo
 6c6bae673076920edf1e6477759e9ae5acead5035acad82f7506c625ead99a997a3b00382d043dd8f1ae6deb126b0a8074de14b03bab2b21d2bb4418a91e3481  modules-initfs
 3823556d741a352fc7f43567d7218255a27c45c2c5d4d4bdf23f4d26ce2828c5a1c642519b84fef7f59756c990e6a199d72e6ba0c277939b08a40526c3ff3714  phoc.ini
 ccdfe80d56c7bf8ecce0919a9b1c6721df3c4d0f819585475d4e78b44adf66306f7c2c7082bc7c669dfbfd066028fd2ac3cf4cd2878b34262547ea1fd1f6ae3e  pointercal
diff --git a/device/testing/device-alcatel-idol347/deviceinfo b/device/testing/device-alcatel-idol347/deviceinfo
index 7f1008ba5eb..917c986a865 100644
--- a/device/testing/device-alcatel-idol347/deviceinfo
+++ b/device/testing/device-alcatel-idol347/deviceinfo
@@ -30,3 +30,6 @@ deviceinfo_flash_offset_second="0x00f00000"
 deviceinfo_flash_offset_tags="0x00000100"
 deviceinfo_flash_pagesize="2048"
 deviceinfo_flash_sparse="true"
+
+# lk2nd does not support GPT for subpartitions/SD cards yet
+deviceinfo_partition_type="msdos"
diff --git a/device/testing/device-ark-peach/APKBUILD b/device/testing/device-ark-peach/APKBUILD
index 8a66f3519f6..0dfdd4e5d87 100644
--- a/device/testing/device-ark-peach/APKBUILD
+++ b/device/testing/device-ark-peach/APKBUILD
@@ -1,8 +1,8 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-ark-peach
 pkgdesc="ARK Benefit A3"
-pkgver=2
-pkgrel=1
+pkgver=3
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -27,6 +27,6 @@ nonfree_firmware() {
 }
 
 sha512sums="
-9d30c8b5a70cad55c9739ee32bdc9451f988e7d8fe3daddcc9bf604baa3fe01b1ed45785abcd05b505a4a12af2d12316ac20edc190519f56569a0bda7d26e2aa  deviceinfo
+47d0c897350043fbd12560fb28bba6ffe97062dcbe2082597d4cc02e8fc77fa30dcdcc27131416d65ba54909b5621c18e2f681abf6a0ee90781df0dc220106fa  deviceinfo
 ae478cf0d7e6da4efdd14398400c4d261dff7093d81d82570ebcefc7fd23d7ae148489eafb60c548ab788b3c5b715a2de8a95b625ad64b225ad9f8378de74dde  modules-initfs
 "
diff --git a/device/testing/device-ark-peach/deviceinfo b/device/testing/device-ark-peach/deviceinfo
index 218f45f501f..a40d95ec8f9 100644
--- a/device/testing/device-ark-peach/deviceinfo
+++ b/device/testing/device-ark-peach/deviceinfo
@@ -31,3 +31,6 @@ deviceinfo_flash_offset_second="0x00f00000"
 deviceinfo_flash_offset_tags="0x01e00000"
 deviceinfo_flash_pagesize="2048"
 deviceinfo_flash_sparse="true"
+
+# lk2nd does not support GPT for subpartitions/SD cards yet
+deviceinfo_partition_type="msdos"
diff --git a/device/testing/device-asus-z00l/APKBUILD b/device/testing/device-asus-z00l/APKBUILD
index 548cdcb9c90..80db57db8eb 100644
--- a/device/testing/device-asus-z00l/APKBUILD
+++ b/device/testing/device-asus-z00l/APKBUILD
@@ -2,8 +2,8 @@
 # Maintainer: Antony J.R. <antonyjr@pm.me>
 pkgname=device-asus-z00l
 pkgdesc="ASUS Zenfone 2 Laser (720p)"
-pkgver=6
-pkgrel=1
+pkgver=7
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -32,6 +32,6 @@ nonfree_firmware() {
 }
 
 sha512sums="
-b090f56a03713f8bed2b28d2c9fa559b0f190bd65973a7d4d5ed103334917d39bf1235f45d3bbc5a11a50971fad64fc26f8b26acd809596dcabb6e7aba95e20e  deviceinfo
+7a343ddeb7ae5cea86c9b51b5d132b68aa7d34080ceb06ebc18242e8707db25fbd16341febc510acd8963b36e9fde30c91d74892e2b70115c2714bb778d5d316  deviceinfo
 868ea93ae3be2a9b2be7cac329b66b7be6f7e72ade7bd111d7b354dcd81a23f4e0d7f4dc617f8d1321a14bbac803778150cce1bff21cd0ed3846803f3d2ed70c  modules-initfs
 "
diff --git a/device/testing/device-asus-z00l/deviceinfo b/device/testing/device-asus-z00l/deviceinfo
index 61424747ca8..2cf5a6a40c1 100644
--- a/device/testing/device-asus-z00l/deviceinfo
+++ b/device/testing/device-asus-z00l/deviceinfo
@@ -31,3 +31,6 @@ deviceinfo_flash_offset_second="0x00f00000"
 deviceinfo_flash_offset_tags="0x01e00000"
 deviceinfo_flash_pagesize="2048"
 deviceinfo_flash_sparse="true"
+
+# lk2nd does not support GPT for subpartitions/SD cards yet
+deviceinfo_partition_type="msdos"
diff --git a/device/testing/device-asus-z010d/APKBUILD b/device/testing/device-asus-z010d/APKBUILD
index 0f046d908b1..7f253cac5f0 100644
--- a/device/testing/device-asus-z010d/APKBUILD
+++ b/device/testing/device-asus-z010d/APKBUILD
@@ -1,8 +1,8 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-asus-z010d
 pkgdesc="Asus Zenfone Max ZC550KL"
-pkgver=5
-pkgrel=1
+pkgver=6
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -32,5 +32,5 @@ nonfree_firmware() {
 }
 
 sha512sums="
-af36b9677baa35da3653483a35c4ce0c26b61fac60961b499fd7f24834fdb3b22ba96b95ceaea3298c12d165e2f12b5c739ca9fedc153c04e9591347f7b1c6d3  deviceinfo
+a73b2f1a7c5ec6df882a076982680960eae1eb6ae32200f9dcc0081cb99cd16ac1da4054aa047a10891b598da809cf2c7003ba0148d94a32a7e0c381dc5d0a42  deviceinfo
 "
diff --git a/device/testing/device-asus-z010d/deviceinfo b/device/testing/device-asus-z010d/deviceinfo
index 07f55973f2d..88dfd0b9ae8 100644
--- a/device/testing/device-asus-z010d/deviceinfo
+++ b/device/testing/device-asus-z010d/deviceinfo
@@ -34,3 +34,6 @@ deviceinfo_flash_offset_second="0x00f00000"
 deviceinfo_flash_offset_tags="0x01e00000"
 deviceinfo_flash_pagesize="2048"
 deviceinfo_flash_sparse="true"
+
+# lk2nd does not support GPT for subpartitions/SD cards yet
+deviceinfo_partition_type="msdos"
diff --git a/device/testing/device-bq-piccolo/APKBUILD b/device/testing/device-bq-piccolo/APKBUILD
index 58e98c2801a..4b1b502c551 100644
--- a/device/testing/device-bq-piccolo/APKBUILD
+++ b/device/testing/device-bq-piccolo/APKBUILD
@@ -1,8 +1,8 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-bq-piccolo
 pkgdesc="BQ Aquaris M5"
-pkgver=6
-pkgrel=1
+pkgver=7
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -39,7 +39,7 @@ phosh() {
 }
 
 sha512sums="
-fad7d6f1289b8385889dd742ef1f3c07fdea94829eef837b03d3a8712d99bda71dd5a80cead2aa923184ab3ce1cc3a410483fec21dfd91265745490f9d09247e  deviceinfo
+0e69b6f9adf9728ae1c876e2e6e001624cff0a1d828e13bb2de9abb969e2712badcfc57e03cf619a96f3df447ec495115502c9d5eaa42b9738fb5d25bc4c5c6a  deviceinfo
 d7ba0b86dc573d0d57591399ec71c76169730b169546d1692910c3e04913100f8bfa534100dab8d5ad302d2a539fb64b040a6fb26979f41c8e7b76b596427afd  modules-initfs
 08a84d731ab0b33b8ec21001331e9c2261a039d3f137eb8bd2f580abea5cfb78706d95443b3e34f9ea3c73e15bcc75038a830402adc7e05636c03e9ce3581eb7  phoc.ini
 "
diff --git a/device/testing/device-bq-piccolo/deviceinfo b/device/testing/device-bq-piccolo/deviceinfo
index 2b326af323b..037ee31979c 100644
--- a/device/testing/device-bq-piccolo/deviceinfo
+++ b/device/testing/device-bq-piccolo/deviceinfo
@@ -31,3 +31,6 @@ deviceinfo_flash_offset_second="0x00f00000"
 deviceinfo_flash_offset_tags="0x01e00000"
 deviceinfo_flash_pagesize="2048"
 deviceinfo_flash_sparse="true"
+
+# lk2nd does not support GPT for subpartitions/SD cards yet
+deviceinfo_partition_type="msdos"
diff --git a/device/testing/device-generic-zhihe/APKBUILD b/device/testing/device-generic-zhihe/APKBUILD
index 914db69050e..e4246febffa 100644
--- a/device/testing/device-generic-zhihe/APKBUILD
+++ b/device/testing/device-generic-zhihe/APKBUILD
@@ -4,8 +4,8 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-generic-zhihe
 pkgdesc="A generic device package for various MSM8916-based dongles(namely zhihe)"
-pkgver=2
-pkgrel=1
+pkgver=3
+pkgrel=0
 url="https://postmarketos.org"
 license="GPL"
 arch="aarch64"
@@ -60,5 +60,5 @@ kernel_uz801() {
 }
 
 sha512sums="
-94713427c83db27c6523c6a022aa1b28526db05be2a6f43d9a2f22acee6dde3ca997736f1673e5962939c300f92a286aa7e2845c266bc96b4cedfd562edfc1c1  deviceinfo
+d47e04945d3fd57352278fa6df29352f0b200abd70e70fba9bd17599889c0b7fdf86cca94c9d0a60762ebc37b5f5bea9e23d43aece0b0554b0192dc25693b8e8  deviceinfo
 "
diff --git a/device/testing/device-generic-zhihe/deviceinfo b/device/testing/device-generic-zhihe/deviceinfo
index 3813654fd6d..f21f565a574 100644
--- a/device/testing/device-generic-zhihe/deviceinfo
+++ b/device/testing/device-generic-zhihe/deviceinfo
@@ -32,3 +32,6 @@ deviceinfo_flash_offset_ramdisk="0x02000000"
 deviceinfo_flash_offset_second="0x00f00000"
 deviceinfo_flash_offset_tags="0x01e00000"
 deviceinfo_flash_sparse="true"
+
+# lk2nd does not support GPT for subpartitions/SD cards yet
+deviceinfo_partition_type="msdos"
diff --git a/device/testing/device-huawei-g7/APKBUILD b/device/testing/device-huawei-g7/APKBUILD
index 607bbd463ae..8cbccd71f03 100644
--- a/device/testing/device-huawei-g7/APKBUILD
+++ b/device/testing/device-huawei-g7/APKBUILD
@@ -2,8 +2,8 @@
 # Maintainer: Minecrell <minecrell@minecrell.net>
 pkgname=device-huawei-g7
 pkgdesc="Huawei Ascend G7"
-pkgver=3
-pkgrel=1
+pkgver=4
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -32,7 +32,7 @@ nonfree_firmware() {
 }
 
 sha512sums="
-63b398a256b7863bdcb82fcb55a381226cc7c832e28035eda536ac1e780ec425b4989d1628ec4ea74954971113c217ad5accc98ed846bfc71cb2a32b8e5461ec  deviceinfo
+3be557cdf2ac1331ec7a6eda903b09b3ba2fd0b9130d1a2eb302189ef349c7e5d7a3d3c70d7a93a6cf4125f281bee835f4972de6737d7c459186214d7efcc4fd  deviceinfo
 1523b9cdd3d3578089bd4ffca40c06f595cda5f94c75433b5786dddeba5df1011cbb027e46d66c153479b03bc3e7ac3a1ea74fc296fc07032562abc4892b22bd  modules-initfs
 b47b3eee3f330408ea28f89b0a70752466f1ab854fc7c4677157fd2dcf5a546d1056b1fbfac587ece827b7ae864e969f0fef6981e4e9802b159f88d03fe9b487  pointercal
 "
diff --git a/device/testing/device-huawei-g7/deviceinfo b/device/testing/device-huawei-g7/deviceinfo
index edc93ceab0d..637b81b599b 100644
--- a/device/testing/device-huawei-g7/deviceinfo
+++ b/device/testing/device-huawei-g7/deviceinfo
@@ -31,3 +31,6 @@ deviceinfo_flash_offset_second="0x00f00000"
 deviceinfo_flash_offset_tags="0x01e00000"
 deviceinfo_flash_pagesize="2048"
 deviceinfo_flash_sparse="true"
+
+# lk2nd does not support GPT for subpartitions/SD cards yet
+deviceinfo_partition_type="msdos"
diff --git a/device/testing/device-huawei-kiwi/APKBUILD b/device/testing/device-huawei-kiwi/APKBUILD
index dff93f0158b..bf9e3e13d23 100644
--- a/device/testing/device-huawei-kiwi/APKBUILD
+++ b/device/testing/device-huawei-kiwi/APKBUILD
@@ -1,8 +1,8 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-huawei-kiwi
 pkgdesc="Huawei Honor 5X / GR5 (2016)"
-pkgver=3
-pkgrel=1
+pkgver=4
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -28,6 +28,6 @@ package() {
 }
 
 sha512sums="
-9a94fd4e021db757d114b3c053e541d165a30f93ab7b31896cd0a0da09a30403fb2afc3b09258a574fd3448d17949811008b903253aa65f59643872de96ffcce  deviceinfo
+75a1f85387c92c5a8673af3571ede85d68584ee97ccdc269468d16f34963c9c54e44a6981fa878e13aaaff57e8639be4371f43a3ad288ba76fa0ac47df7d77d4  deviceinfo
 96b41eb6b39f8c8bcb6c99ab6b5729ec33d6bc394b2230ed168cf19cba8f86ebae3340b0ef9e15a3a6ee202895cd81f4d8812e5c81c4cc6d087ca9e239023993  modules-initfs
 "
diff --git a/device/testing/device-huawei-kiwi/deviceinfo b/device/testing/device-huawei-kiwi/deviceinfo
index 0ff76d6deae..0620d5d4a42 100644
--- a/device/testing/device-huawei-kiwi/deviceinfo
+++ b/device/testing/device-huawei-kiwi/deviceinfo
@@ -31,3 +31,6 @@ deviceinfo_flash_offset_second="0x00f00000"
 deviceinfo_flash_offset_tags="0x01e00000"
 deviceinfo_flash_pagesize="2048"
 deviceinfo_flash_sparse="true"
+
+# lk2nd does not support GPT for subpartitions/SD cards yet
+deviceinfo_partition_type="msdos"
diff --git a/device/testing/device-huawei-y635/APKBUILD b/device/testing/device-huawei-y635/APKBUILD
index 2fce05c2826..01a9066cc92 100644
--- a/device/testing/device-huawei-y635/APKBUILD
+++ b/device/testing/device-huawei-y635/APKBUILD
@@ -1,8 +1,8 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-huawei-y635
 pkgdesc="Huawei Y635"
-pkgver=3
-pkgrel=1
+pkgver=4
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -38,7 +38,7 @@ phosh() {
 }
 
 sha512sums="
-625b8c8e037a5b27cb4579e056223d329f87129d9d51d1148123c2b55c11cba6aff36d0b332b431e4dfaded8c8f3e379d085b86d166174b9a481b96d2ca886cc  deviceinfo
+d942d052d60e7765c702e6a8b90d9a144fc43a4625ded728c8f6f039998a10422b06b8ad4c2a928e1017572654f43d9d27fc136b6e1668b1791ef69c9851651d  deviceinfo
 573feeb83028d1c7f5bce4347747e9bfa36ad927125633981a037503088786848cf1985e2d5da73f60fe534deaf05ec6ab12d55438efb3e4bf516b382e4432eb  modules-initfs
 4d43e2c8facedbf5ba98c072e8fc20197a15acb06918a02bb753b48df356be1d4cafc0383968aac2dda50d240dc8cb038370da1fd37d807a9cb832e873de2b85  pointercal
 e8f734a2f8d154813dbb493f0d58af50a7f624ffed41967a81493b975a6211efc6d30743b23825562cfd126791cbdd3348bfbed32eeece9b8acec0a37c3c51b6  phoc.ini
diff --git a/device/testing/device-huawei-y635/deviceinfo b/device/testing/device-huawei-y635/deviceinfo
index ffb6a6e83f6..ef9a4157c0f 100644
--- a/device/testing/device-huawei-y635/deviceinfo
+++ b/device/testing/device-huawei-y635/deviceinfo
@@ -31,3 +31,6 @@ deviceinfo_flash_offset_second="0x00f00000"
 deviceinfo_flash_offset_tags="0x01e00000"
 deviceinfo_flash_pagesize="2048"
 deviceinfo_flash_sparse="true"
+
+# lk2nd does not support GPT for subpartitions/SD cards yet
+deviceinfo_partition_type="msdos"
diff --git a/device/testing/device-lenovo-a6020a40/APKBUILD b/device/testing/device-lenovo-a6020a40/APKBUILD
index 563c4657b15..28c3b0764bb 100644
--- a/device/testing/device-lenovo-a6020a40/APKBUILD
+++ b/device/testing/device-lenovo-a6020a40/APKBUILD
@@ -1,8 +1,8 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-lenovo-a6020a40
 pkgdesc="Lenovo Vibe K5"
-pkgver=2
-pkgrel=1
+pkgver=3
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -33,6 +33,6 @@ nonfree_firmware() {
 }
 
 sha512sums="
-e938936b3d01f085ee9b7b4c44426df3a617c3441ff8d4864db910d1aa6894cbe7a5502af7010d4c95655772bb63a97e0a34504910a767ea4b74dfe30e2bd27f  deviceinfo
+8a876e7fc336c5e8ff0475bd20f1205675f4808b17bb5363a3c32c354c53576888f40c5c9a6abdccbb1613154ce3907837091302a4d88f63186bb1036aee93da  deviceinfo
 36791d00fdb1856c8b2e25f7ce675cd177262809348b218dd66f7e55e92f5f6e22699860d9a667d12169da75685787074a4d06d5cf49f64d5cb83be74ccf0533  modules-initfs
 "
diff --git a/device/testing/device-lenovo-a6020a40/deviceinfo b/device/testing/device-lenovo-a6020a40/deviceinfo
index a9f9cc937bc..8c18321730b 100644
--- a/device/testing/device-lenovo-a6020a40/deviceinfo
+++ b/device/testing/device-lenovo-a6020a40/deviceinfo
@@ -35,3 +35,6 @@ deviceinfo_flash_offset_ramdisk="0x02000000"
 deviceinfo_flash_offset_second="0x00f00000"
 deviceinfo_flash_offset_tags="0x01e00000"
 deviceinfo_flash_sparse="true"
+
+# lk2nd does not support GPT for subpartitions/SD cards yet
+deviceinfo_partition_type="msdos"
diff --git a/device/testing/device-lg-c50/APKBUILD b/device/testing/device-lg-c50/APKBUILD
index 580b4afa33e..6c20685a68f 100644
--- a/device/testing/device-lg-c50/APKBUILD
+++ b/device/testing/device-lg-c50/APKBUILD
@@ -2,8 +2,8 @@
 # Maintainer: Minecrell <minecrell@minecrell.net>
 pkgname=device-lg-c50
 pkgdesc="LG Leon LTE"
-pkgver=2
-pkgrel=1
+pkgver=3
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -41,7 +41,7 @@ phosh() {
 }
 
 sha512sums="
-416fbbc278b34805100fbff39521007477422a1f3acc324a787241112ea1ba11d32cea9eb17396f6da626a9459d4674edf6981c05f8dd395a3b87330a7b390c7  deviceinfo
+90614944336fcf52934d078269cc84f715bcc8f19a8725ee57f366d7d3df650b0b98546246edc804fd5c4332558e989d6c5140fc09f4feed7b5d406bb4f59615  deviceinfo
 11cd680cf30411fdb5d3036cdcd8bebfb8a7999a7386e837235b03377d521c7e5bf150da35da95aad56b4878c7af6637c738f099fe139a268dfb8a566f48b5dd  modules-initfs
 1a87b0303bb77bbe98a4100934da9a6e9533e5cefe985a73ec29bd50e1588d9a9ac9f5a126b450eecfa83fe6289013825a76fe699fce2bd3afbdc90cd83cf8d9  phoc.ini
 "
diff --git a/device/testing/device-lg-c50/deviceinfo b/device/testing/device-lg-c50/deviceinfo
index 8d1a73907eb..9fb24b042f9 100644
--- a/device/testing/device-lg-c50/deviceinfo
+++ b/device/testing/device-lg-c50/deviceinfo
@@ -31,3 +31,6 @@ deviceinfo_flash_offset_second="0x00f00000"
 deviceinfo_flash_offset_tags="0x01e00000"
 deviceinfo_flash_pagesize="2048"
 deviceinfo_flash_sparse="true"
+
+# lk2nd does not support GPT for subpartitions/SD cards yet
+deviceinfo_partition_type="msdos"
diff --git a/device/testing/device-lg-m216/APKBUILD b/device/testing/device-lg-m216/APKBUILD
index 7e3219a77b4..364ec875aad 100644
--- a/device/testing/device-lg-m216/APKBUILD
+++ b/device/testing/device-lg-m216/APKBUILD
@@ -1,8 +1,8 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-lg-m216
 pkgdesc="LG K10 (m216)"
-pkgver=7
-pkgrel=1
+pkgver=8
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -33,6 +33,6 @@ nonfree_firmware() {
 }
 
 sha512sums="
-3e16e48fa102db23eeb6da6da4b57a40a48a3277c28a340f994a54763db21df4e44892e0884ff38d8eb87b957348d53a1c7604a3b01944dddd3647e35c3380b3  deviceinfo
+c7332c140f36c8655ae5a808864265b6be891c91f82d17b3150cab4916d4d201c5c918e66aca5434279c3cf196d7accbd13e1cd5ff2eac8c6872ee70fe19f128  deviceinfo
 d4d77f5db6e361d723c7202bf68342970bc568d6e040b3fba694c5ff0af0eec0a6aaaf582fd6b40a5ab46a26931edacea3cba70e7f6d13be42e9676a5ee06d86  modules-initfs
 "
diff --git a/device/testing/device-lg-m216/deviceinfo b/device/testing/device-lg-m216/deviceinfo
index 464e8aa6b04..dac4f6827f8 100644
--- a/device/testing/device-lg-m216/deviceinfo
+++ b/device/testing/device-lg-m216/deviceinfo
@@ -34,3 +34,6 @@ deviceinfo_flash_offset_second="0x00f00000"
 deviceinfo_flash_offset_tags="0x01e00000"
 deviceinfo_flash_pagesize="2048"
 deviceinfo_flash_sparse="true"
+
+# lk2nd does not support GPT for subpartitions/SD cards yet
+deviceinfo_partition_type="msdos"
diff --git a/device/testing/device-motorola-osprey/APKBUILD b/device/testing/device-motorola-osprey/APKBUILD
index 80640f662d2..21370c018e2 100644
--- a/device/testing/device-motorola-osprey/APKBUILD
+++ b/device/testing/device-motorola-osprey/APKBUILD
@@ -1,7 +1,7 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-motorola-osprey
-pkgver=8
-pkgrel=1
+pkgver=9
+pkgrel=0
 pkgdesc="Motorola Moto G 2015"
 url="https://postmarketos.org"
 arch="aarch64"
@@ -34,6 +34,6 @@ nonfree_firmware() {
 }
 
 sha512sums="
-84a6e3df87b55153265538e6c89d9a6c478f7cfcc49c3c7719b6d2ef80c53b456043a7d652d31dab44e753b948193bc9450e2cd3e5441d0fce01361acda3ac64  deviceinfo
+d5a16ed4ea27f48c304bf40aeb0c58aca982c74265996edf0ed6e7f3a9a77a9f00f32bf14e0b10ef50411689b698bb520d8bf315a52e5bbdd906a8f5abea270a  deviceinfo
 fc1d1e57bd2a366884b1359ba32acfb484719958fb655067cfba28787384d626dde7683750dda523e2941df4fc78e2d234130ef5a5217002a09623a4a2f34919  modules-initfs
 "
diff --git a/device/testing/device-motorola-osprey/deviceinfo b/device/testing/device-motorola-osprey/deviceinfo
index 89be4832bec..8139cf89539 100644
--- a/device/testing/device-motorola-osprey/deviceinfo
+++ b/device/testing/device-motorola-osprey/deviceinfo
@@ -31,3 +31,6 @@ deviceinfo_flash_offset_second="0x00f00000"
 deviceinfo_flash_offset_tags="0x01e00000"
 deviceinfo_flash_pagesize="2048"
 deviceinfo_flash_sparse="true"
+
+# lk2nd does not support GPT for subpartitions/SD cards yet
+deviceinfo_partition_type="msdos"
diff --git a/device/testing/device-motorola-surnia/APKBUILD b/device/testing/device-motorola-surnia/APKBUILD
index c41d8e8c338..087e97fa7be 100644
--- a/device/testing/device-motorola-surnia/APKBUILD
+++ b/device/testing/device-motorola-surnia/APKBUILD
@@ -1,8 +1,8 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-motorola-surnia
 pkgdesc="Motorola Moto E (2nd Gen)"
-pkgver=3
-pkgrel=1
+pkgver=4
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -33,6 +33,6 @@ nonfree_firmware() {
 }
 
 sha512sums="
-80a650fa5b941e063f41d474ba92573188deff7bf51cb3266817736a74e6b635f533fa93cc66b8f70813c6694454e2f68e7d990bd17560fa8d9922b1daccf516  deviceinfo
+341eb5c87cef4228b3dd65c51aafa219960ad3b77ec3b21249f63317667650ab33e2c9777f460a0c64ae207f0835d8922ceb223338dc3d6680a18745275aafcb  deviceinfo
 44df8245209d15e16e5114874e22160383861988b0bd1b2e2faca27c817cc03f431a387e8cc5a708ab2cfcc67b04f204043cdaaf898552588ea8feb18755b0a9  modules-initfs
 "
diff --git a/device/testing/device-motorola-surnia/deviceinfo b/device/testing/device-motorola-surnia/deviceinfo
index c6f1f191d6a..093c0f0075f 100644
--- a/device/testing/device-motorola-surnia/deviceinfo
+++ b/device/testing/device-motorola-surnia/deviceinfo
@@ -31,3 +31,6 @@ deviceinfo_flash_offset_second="0x00f00000"
 deviceinfo_flash_offset_tags="0x00000100"
 deviceinfo_flash_pagesize="2048"
 deviceinfo_flash_sparse="true"
+
+# lk2nd does not support GPT for subpartitions/SD cards yet
+deviceinfo_partition_type="msdos"
diff --git a/device/testing/device-nokia-argon/APKBUILD b/device/testing/device-nokia-argon/APKBUILD
index e4eb18c10fe..0dfb3ddbbb2 100644
--- a/device/testing/device-nokia-argon/APKBUILD
+++ b/device/testing/device-nokia-argon/APKBUILD
@@ -1,7 +1,7 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-nokia-argon
 pkgdesc="Nokia 8110 4G"
-pkgver=4
+pkgver=5
 pkgrel=0
 url="https://postmarketos.org"
 license="GPL-2.0-only"
@@ -54,7 +54,7 @@ nonfree_firmware() {
 
 sha512sums="
 66302bb5d83c4ba155ff62405fb9a374ab76e1912411310b1ad75e00c216b6868da4e2b6f3987c97146389aa44b2b2c26f0ca0819566be45c9d0d2dd1d3b72f1  00-nokia-argon-display.files
-69b04093b06d7aa615eaf585931ff6c16a4800476fa6b461d015318cd45fff224abf88019f4de2e966c0ad469b6bb4e6d5720e481d226cf691f8fc1b1c0cc99b  deviceinfo
+aa3e62d0a13b71208566a9b847036779aecaf8427a72ad9b987db0bfdf8f28e66cc1694cb60b18ce749870af8757725efaabab671029251f189deebd734eabeb  deviceinfo
 749fa5911f53f65c1a18a8768d374d1ea39ef47ed61146a5f79d669250788501434a059cfff65b83cb54eb7273841686b4a3a04f20aaec6ec7f742e14623c8bc  modules-initfs
 dd82fd4732694a24c91339b5c5fbb0bf485b3b2da3c17c11b72a02e90e9827c367504c99894556dd8273f927408cdb187325e5f3b9ea9e4a82e3cb3798cb2816  nokia,argon-gc9305-v2-panel.txt
 "
diff --git a/device/testing/device-nokia-argon/deviceinfo b/device/testing/device-nokia-argon/deviceinfo
index fcc3b82810d..3c675287915 100644
--- a/device/testing/device-nokia-argon/deviceinfo
+++ b/device/testing/device-nokia-argon/deviceinfo
@@ -35,3 +35,6 @@ deviceinfo_flash_offset_ramdisk="0x02700000"
 deviceinfo_flash_offset_second="0x00f00000"
 deviceinfo_flash_offset_tags="0x02500000"
 deviceinfo_flash_sparse="true"
+
+# lk2nd does not support GPT for subpartitions/SD cards yet
+deviceinfo_partition_type="msdos"
diff --git a/device/testing/device-nokia-leo/APKBUILD b/device/testing/device-nokia-leo/APKBUILD
index 685a716b1e4..36831a3c91a 100644
--- a/device/testing/device-nokia-leo/APKBUILD
+++ b/device/testing/device-nokia-leo/APKBUILD
@@ -1,7 +1,7 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-nokia-leo
 pkgdesc="Nokia 6300 4G"
-pkgver=2
+pkgver=3
 pkgrel=0
 url="https://postmarketos.org"
 license="GPL-2.0-only"
@@ -55,6 +55,6 @@ nonfree_firmware() {
 sha512sums="
 8583c7d5a97c4efedff3ec554cf682d815fd7b83140c2cab9eec4b6e2e735ce3c012bc3bd97f8bc75adc3483f76ce83a5bf1090d4f3e73a327efc64ca9eca5a7  nokia,leo-gc9305-hlt-24-panel.txt
 c9985232e5e64ddb0906b053e5024c87fa62cc1bcb254260e1ef6afb43d384196e09d41287143bcba61dff616dd6b562a5ca335dbe592fcd8c954642b8085f38  00-nokia-leo-display.files
-d28c316bace09629d13bf93261cbaaf2c6c2c9f3f0adb891e4055d4da721b881a9b883d13683989f483b9a5ef9a283974d6e4d1f7179928d768c1424c7fcc449  deviceinfo
+9389406802864ac4954057e07cbfe067f4dfab6d319c6bc7765bc74d3b7157d7af3d9ed02d19e89ba022705f8e60049013a41c48d3e6832c5e23d0cf727fac4b  deviceinfo
 d5dfe844a45cfc4e0844e43b8fb3e1bbcb155e06430188f8d5059fc5ce3c4100fde7f1580b1b54c5318f40d238736b233463582e55b9dd25654e40539e11ed39  modules-initfs
 "
diff --git a/device/testing/device-nokia-leo/deviceinfo b/device/testing/device-nokia-leo/deviceinfo
index 896f18a6dfb..0b411761915 100644
--- a/device/testing/device-nokia-leo/deviceinfo
+++ b/device/testing/device-nokia-leo/deviceinfo
@@ -35,3 +35,6 @@ deviceinfo_flash_offset_ramdisk="0x02700000"
 deviceinfo_flash_offset_second="0x00f00000"
 deviceinfo_flash_offset_tags="0x02500000"
 deviceinfo_flash_sparse="true"
+
+# lk2nd does not support GPT for subpartitions/SD cards yet
+deviceinfo_partition_type="msdos"
diff --git a/device/testing/device-nokia-sparkler/APKBUILD b/device/testing/device-nokia-sparkler/APKBUILD
index 106e1caf800..ec0d8a574d3 100644
--- a/device/testing/device-nokia-sparkler/APKBUILD
+++ b/device/testing/device-nokia-sparkler/APKBUILD
@@ -1,7 +1,7 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-nokia-sparkler
 pkgdesc="Nokia 8000 4G"
-pkgver=2
+pkgver=3
 pkgrel=0
 url="https://postmarketos.org"
 license="GPL-2.0-only"
@@ -55,6 +55,6 @@ nonfree_firmware() {
 sha512sums="
 721d740ff8dbbbafff4bc734228a82bd57d76177b9bf417d660ecb181a72a998319ddbde77d0efc5e875d2256596578212e3e0bfb85c2e77e5bbf6d0e88d9fa4  nokia,sparkler-gc9307-hlt-28-panel.txt
 89b3dd5bf1dd5e85bf66bfb6dba56e2a8e919fe3aa7dc369c18c9e56f7e0ae88319186551412497a601081b904c12dd07ebed4f39fd4a4ba6199fb8af9c90f40  00-nokia-sparkler-display.files
-7566d2cc3a43a12b37ae3b62c8e7947788dde94174ead19e9fd80e80244a02c97f27847a67677ff8564ad573048af884f588969b39dd2ce6385688c4fe0964b5  deviceinfo
+ae1297c0a36eaa46ff282009544f866fb06385492b9a5c96c801fc617ba7ac093295501ff239a64f8741ddb9ef4e697170df7d6a7c94d5c81ebf38e870b30e47  deviceinfo
 d5dfe844a45cfc4e0844e43b8fb3e1bbcb155e06430188f8d5059fc5ce3c4100fde7f1580b1b54c5318f40d238736b233463582e55b9dd25654e40539e11ed39  modules-initfs
 "
diff --git a/device/testing/device-nokia-sparkler/deviceinfo b/device/testing/device-nokia-sparkler/deviceinfo
index f0dc80d6222..0d78abc716a 100644
--- a/device/testing/device-nokia-sparkler/deviceinfo
+++ b/device/testing/device-nokia-sparkler/deviceinfo
@@ -35,3 +35,6 @@ deviceinfo_flash_offset_ramdisk="0x02700000"
 deviceinfo_flash_offset_second="0x00f00000"
 deviceinfo_flash_offset_tags="0x02500000"
 deviceinfo_flash_sparse="true"
+
+# lk2nd does not support GPT for subpartitions/SD cards yet
+deviceinfo_partition_type="msdos"
diff --git a/device/testing/device-qcom-msm8909/APKBUILD b/device/testing/device-qcom-msm8909/APKBUILD
index 7307e04e281..85ecce346c8 100644
--- a/device/testing/device-qcom-msm8909/APKBUILD
+++ b/device/testing/device-qcom-msm8909/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Raymond Hackley <raymondhackley@protonmail.com>
 pkgname=device-qcom-msm8909
 pkgdesc="Generic device package for various Qualcomm MSM8905/MSM8909/MSM8916-based devices"
-pkgver=1
+pkgver=2
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -43,6 +43,6 @@ nonfree_firmware() {
 }
 
 sha512sums="
-d77082a92edd4b2f8de2f8a3eaa395a020014c829c73e4008fbe7a2c1dfa7d8a258b10e52b288c2cfa7afc85156a6ab667561f0f4c20c32856ec6bf71b66398c  deviceinfo
+93cbd664d37f63ac142e03ab9168bc94a8cde1880d88b12d17b94fb9318a330434df427878be3af4d96c0bb156beaeb41741a9cf42f557c5a160837a62f1233c  deviceinfo
 3c4ae8aad562270a6094add613912955bafed994e0df2f8842575fb4e38db0f21a57dc61fb772af418d1423512811e7f9f533c2e9b3f8edb657ed20f12ca2fc9  modules-initfs
 "
diff --git a/device/testing/device-qcom-msm8909/deviceinfo b/device/testing/device-qcom-msm8909/deviceinfo
index 22d193fc8d5..4c5f45fccfa 100644
--- a/device/testing/device-qcom-msm8909/deviceinfo
+++ b/device/testing/device-qcom-msm8909/deviceinfo
@@ -22,3 +22,6 @@ deviceinfo_dtb="qcom-msm8*05-* qcom-msm8*09-* qcom-msm8*16-*"
 deviceinfo_flash_method="fastboot"
 deviceinfo_generate_extlinux_config="true"
 deviceinfo_kernel_cmdline="earlycon console=ttyMSM0,115200"
+
+# lk2nd does not support GPT for subpartitions/SD cards yet
+deviceinfo_partition_type="msdos"
diff --git a/device/testing/device-qcom-msm8916/APKBUILD b/device/testing/device-qcom-msm8916/APKBUILD
index 66341e81f02..53a4dcac690 100644
--- a/device/testing/device-qcom-msm8916/APKBUILD
+++ b/device/testing/device-qcom-msm8916/APKBUILD
@@ -2,8 +2,8 @@
 # Maintainer: Nikita Travkin <nikita@trvn.ru>
 pkgname=device-qcom-msm8916
 pkgdesc="Generic device package for various Qualcomm MSM8916/MSM8939-based devices"
-pkgver=2
-pkgrel=1
+pkgver=3
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -58,6 +58,6 @@ kernel_efi() {
 }
 
 sha512sums="
-0894e6a63f69062d4c9e744cdda700b30c68795fdfdc866b8c60c0d0d27b97f3ad915615d87baede2fdaceb5c2773240c649eb95d82b2d58acd5b59f1e5190c0  deviceinfo
+1ac19001a2b89bc5bec53fe5dfbdbc2b57030dc2982ada172f7ef438279a95bc8ebad54621d4672067ec258a6d3f8cea8faefe3b1adcaf7587a94d1f44c2ef01  deviceinfo
 80b037998756dab0c6b2a3bb438fb2d6bf727148c4af29648074b85c3beacdbbbffb2fefd477e68904d4c3bedb76bf0e532719a15a3bb7c8ef5f922be0d73c1d  modules-initfs
 "
diff --git a/device/testing/device-qcom-msm8916/deviceinfo b/device/testing/device-qcom-msm8916/deviceinfo
index 91741d4aa6c..1f4ff9bcc38 100644
--- a/device/testing/device-qcom-msm8916/deviceinfo
+++ b/device/testing/device-qcom-msm8916/deviceinfo
@@ -28,3 +28,6 @@ deviceinfo_boot_filesystem_extlinux="ext2"
 # EFI
 deviceinfo_generate_systemd_boot_efi="true"
 deviceinfo_boot_filesystem_efi="fat32"
+
+# lk2nd does not support GPT for subpartitions/SD cards yet
+deviceinfo_partition_type="msdos"
diff --git a/device/testing/device-samsung-a7/APKBUILD b/device/testing/device-samsung-a7/APKBUILD
index b1aa747fd63..615c09912ad 100644
--- a/device/testing/device-samsung-a7/APKBUILD
+++ b/device/testing/device-samsung-a7/APKBUILD
@@ -1,8 +1,8 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-samsung-a7
 pkgdesc="Samsung Galaxy A7 (2015)"
-pkgver=6
-pkgrel=1
+pkgver=7
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -47,7 +47,7 @@ phosh() {
 }
 
 sha512sums="
-49829643e53eeea6f807f8b4ade933eaa8455e18149efb1ad38a856cd2e258d709acce3c6d24b7ae1ae820db729e0273d293bab6f5918711a7f3ebd65fb7324a  deviceinfo
+0f569ce97d3da5a5b17d73c699f37284f21d927d2f13fc72312f50c9f1109bdc069b2216dcf714ebfbd18cd8d7ab5f4e53db0597b9e1d161b9b1f84e96605482  deviceinfo
 0bccefc8adb58a3e2d2553da486ed8adb0cfdbc9771ee91a76465b66581d4d024ac86e377b3cb5086e9f37590889541cdf6ac5037199353e399e08aeccb2698c  modules-initfs
 25d2518d66e612df1f218e00544a282fa730dfe801bb0f8a7c928eb1a54aa9e5a167bd76fb00358c87dd8fd86564303c956c8a7460ab27e7eb96e44e80beb919  phoc.ini
 "
diff --git a/device/testing/device-samsung-a7/deviceinfo b/device/testing/device-samsung-a7/deviceinfo
index 6a50c1c78a2..4ecf02a9296 100644
--- a/device/testing/device-samsung-a7/deviceinfo
+++ b/device/testing/device-samsung-a7/deviceinfo
@@ -36,3 +36,6 @@ deviceinfo_flash_sparse="true"
 deviceinfo_usb_idVendor="0x04e8"
 # Galaxy (MTP)
 deviceinfo_usb_idProduct="0x6860"
+
+# lk2nd does not support GPT for subpartitions/SD cards yet
+deviceinfo_partition_type="msdos"
diff --git a/device/testing/device-samsung-cprime/APKBUILD b/device/testing/device-samsung-cprime/APKBUILD
index 6e12c0b9c82..3432b9f6af0 100644
--- a/device/testing/device-samsung-cprime/APKBUILD
+++ b/device/testing/device-samsung-cprime/APKBUILD
@@ -1,7 +1,7 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-samsung-cprime
 pkgdesc="Samsung Galaxy Core Prime"
-pkgver=3
+pkgver=4
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -37,6 +37,6 @@ nonfree_firmware() {
 }
 
 sha512sums="
-81d2f6f4fb769563b176630d38a126a45570e6237e089ae67a5d65d719eef6489fae8fc624dda18e35a6d97de122620efa1508b9378a53f7f47182ca181971b1  deviceinfo
+47bfdff2d3f8fdbcb01af2b5cc2c9c93ab251857a4f2095bcc370e0e2bccb2ba908aab971847a83bfb69a6e3f5235583c5d85add136e9cf84fcecd1e282eb897  deviceinfo
 9ead03b9e3edb69b238b25e5eecd477c99f03223237a549d124903dfb56a8be02df25ea43c8c308998d2250f9e586c8fef594007f43bc426dfb2d074a6270bba  modules-initfs
 "
diff --git a/device/testing/device-samsung-cprime/deviceinfo b/device/testing/device-samsung-cprime/deviceinfo
index 3e915ea51a0..1470865b8d0 100644
--- a/device/testing/device-samsung-cprime/deviceinfo
+++ b/device/testing/device-samsung-cprime/deviceinfo
@@ -36,3 +36,6 @@ deviceinfo_flash_sparse="true"
 deviceinfo_usb_idVendor="0x04e8"
 # Galaxy (MTP)
 deviceinfo_usb_idProduct="0x6860"
+
+# lk2nd does not support GPT for subpartitions/SD cards yet
+deviceinfo_partition_type="msdos"
diff --git a/device/testing/device-samsung-fortuna3g/APKBUILD b/device/testing/device-samsung-fortuna3g/APKBUILD
index febb84336ba..be91ca61762 100644
--- a/device/testing/device-samsung-fortuna3g/APKBUILD
+++ b/device/testing/device-samsung-fortuna3g/APKBUILD
@@ -1,8 +1,8 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-samsung-fortuna3g
 pkgdesc="Samsung Galaxy Grand Prime 3G (G530H)"
-pkgver=3
-pkgrel=1
+pkgver=4
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -29,6 +29,6 @@ nonfree_firmware() {
 }
 
 sha512sums="
-88267937c5da2e5dccd56d8eb3b8a42d1bb7b8a576a85661e4a74744897959b62f8a1e389aaa9f5e4e05b892fe5a99d482320901863cd6dd9b2c7eeff666bc3e  deviceinfo
+82dac2964a2fa415257c3bbc226a850ba59339af728dc13369f1a92c1b2214e0116d32a82cecaae02d80439d8032a38bbdd7877c320b5d2c5756724c593096fb  deviceinfo
 02b6d383149ba2ec3a31b206767be7ead31d9f0e7ee5cab11047000c53ccad387a118cbddb06093bca5cae3e82f884c02194de47b8e7a9c76102ac46506bb111  modules-initfs
 "
diff --git a/device/testing/device-samsung-fortuna3g/deviceinfo b/device/testing/device-samsung-fortuna3g/deviceinfo
index 6070506ae7f..0cb821ddce4 100644
--- a/device/testing/device-samsung-fortuna3g/deviceinfo
+++ b/device/testing/device-samsung-fortuna3g/deviceinfo
@@ -36,3 +36,6 @@ deviceinfo_flash_sparse="true"
 deviceinfo_usb_idVendor="0x04e8"
 # Galaxy (MTP)
 deviceinfo_usb_idProduct="0x6860"
+
+# lk2nd does not support GPT for subpartitions/SD cards yet
+deviceinfo_partition_type="msdos"
diff --git a/device/testing/device-samsung-fortunaltezt/APKBUILD b/device/testing/device-samsung-fortunaltezt/APKBUILD
index 2bbc1d5fef4..9594fe56431 100644
--- a/device/testing/device-samsung-fortunaltezt/APKBUILD
+++ b/device/testing/device-samsung-fortunaltezt/APKBUILD
@@ -1,8 +1,8 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-samsung-fortunaltezt
 pkgdesc="Samsung Galaxy Grand Prime (SM-G530Y)"
-pkgver=2
-pkgrel=1
+pkgver=3
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
@@ -37,6 +37,6 @@ nonfree_firmware() {
 }
 
 sha512sums="
-03007cde27317649e4f9bb488fa304967922531927cc07f8b31b7feb5a04ec43629fa92e5daab415cab9621a167e364e11736b566d1971ecb9ac7587d1a27d9e  deviceinfo
+497d61341daf05a6ad2b87c8460dad0662c97e51dfd38207b8d074bec51d7beb14c5c24bc1649285d0e9e8b75eddf4d7c2f9f5e9904e740d7657509a17029964  deviceinfo
 0dcec6521708a8733aab879eb65047d3bf0ab562d4afb40fec2cff057a08b52b59940e1f9dea2f32519b2565af0399f724950c631ee45790a73199eb53c0653f  modules-initfs
 "
diff --git a/device/testing/device-samsung-fortunaltezt/deviceinfo b/device/testing/device-samsung-fortunaltezt/deviceinfo
index af7270d0aae..3d7a41792c3 100644
--- a/device/testing/device-samsung-fortunaltezt/deviceinfo
+++ b/device/testing/device-samsung-fortunaltezt/deviceinfo
@@ -36,3 +36,6 @@ deviceinfo_flash_sparse="true"
 deviceinfo_usb_idVendor="0x04e8"
 # Galaxy (MTP)
 deviceinfo_usb_idProduct="0x6860"
+
+# lk2nd does not support GPT for subpartitions/SD cards yet
+deviceinfo_partition_type="msdos"
diff --git a/device/testing/device-samsung-gprimeltecan/APKBUILD b/device/testing/device-samsung-gprimeltecan/APKBUILD
index 1eac944f9ff..0550c615fa2 100644
--- a/device/testing/device-samsung-gprimeltecan/APKBUILD
+++ b/device/testing/device-samsung-gprimeltecan/APKBUILD
@@ -1,8 +1,8 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-samsung-gprimeltecan
 pkgdesc="Samsung Galaxy Grand Prime CAN (G530W)"
-pkgver=3
-pkgrel=1
+pkgver=4
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -29,6 +29,6 @@ nonfree_firmware() {
 }
 
 sha512sums="
-a115b035ebbd8ac1fea77bc0905b847ede42e7a242ad006c69706b61ff3d3e98d3bd2cfadb1498bea4e7e305bf52c3d143ed4e03be9eff61794ebaa797e59d5c  deviceinfo
+ba287d22a5839624881c39cde5c6f0640fea461e5579d43bb5678340e2a067b8af5d06150844698c73768c5a72b03cdf8e789f9a16663391b5729eb330ba57fe  deviceinfo
 02b6d383149ba2ec3a31b206767be7ead31d9f0e7ee5cab11047000c53ccad387a118cbddb06093bca5cae3e82f884c02194de47b8e7a9c76102ac46506bb111  modules-initfs
 "
diff --git a/device/testing/device-samsung-gprimeltecan/deviceinfo b/device/testing/device-samsung-gprimeltecan/deviceinfo
index 2df49b0ff06..89f05e9fd17 100644
--- a/device/testing/device-samsung-gprimeltecan/deviceinfo
+++ b/device/testing/device-samsung-gprimeltecan/deviceinfo
@@ -36,3 +36,6 @@ deviceinfo_flash_sparse="true"
 deviceinfo_usb_idVendor="0x04e8"
 # Galaxy (MTP)
 deviceinfo_usb_idProduct="0x6860"
+
+# lk2nd does not support GPT for subpartitions/SD cards yet
+deviceinfo_partition_type="msdos"
diff --git a/device/testing/device-samsung-gprimeltexx/APKBUILD b/device/testing/device-samsung-gprimeltexx/APKBUILD
index d6bc3eb17fa..ac44c14d159 100644
--- a/device/testing/device-samsung-gprimeltexx/APKBUILD
+++ b/device/testing/device-samsung-gprimeltexx/APKBUILD
@@ -1,8 +1,8 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-samsung-gprimeltexx
 pkgdesc="Samsung Galaxy Grand Prime (G530FZ)"
-pkgver=3
-pkgrel=1
+pkgver=4
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -33,6 +33,6 @@ nonfree_firmware() {
 }
 
 sha512sums="
-48a862b04c38e743760fa08b2658f30d39435f63bae07e5c273afdd107d6b1d93e1d91e45061c3426d2119305ed53b1801ad38bf3dc81a9afd1730b81f325a83  deviceinfo
+5571f8291ca4d75c6465607326d58df9220f7cf433ba338d4a36dd2082b6554d1b665c061dc07f3026d42d0dcf69069b5a420927bd7c342ca73ef44e3f3153c3  deviceinfo
 02b6d383149ba2ec3a31b206767be7ead31d9f0e7ee5cab11047000c53ccad387a118cbddb06093bca5cae3e82f884c02194de47b8e7a9c76102ac46506bb111  modules-initfs
 "
diff --git a/device/testing/device-samsung-gprimeltexx/deviceinfo b/device/testing/device-samsung-gprimeltexx/deviceinfo
index 72c9f6d75d7..f3fd62a2f6f 100644
--- a/device/testing/device-samsung-gprimeltexx/deviceinfo
+++ b/device/testing/device-samsung-gprimeltexx/deviceinfo
@@ -36,3 +36,6 @@ deviceinfo_flash_sparse="true"
 deviceinfo_usb_idVendor="0x04e8"
 # Galaxy (MTP)
 deviceinfo_usb_idProduct="0x6860"
+
+# lk2nd does not support GPT for subpartitions/SD cards yet
+deviceinfo_partition_type="msdos"
diff --git a/device/testing/device-samsung-gtelwifiue/APKBUILD b/device/testing/device-samsung-gtelwifiue/APKBUILD
index cbd264dbfab..8d71a78f832 100644
--- a/device/testing/device-samsung-gtelwifiue/APKBUILD
+++ b/device/testing/device-samsung-gtelwifiue/APKBUILD
@@ -1,8 +1,8 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-samsung-gtelwifiue
 pkgdesc="Samsung Galaxy Tab E 9.6 (SM-T560NU)"
-pkgver=2
-pkgrel=1
+pkgver=3
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -27,6 +27,6 @@ nonfree_firmware() {
 }
 
 sha512sums="
-9fb68f52d7f0962ee03da16c3cf206a261ee9f21887f207913fc1dcb12e2a3361b982f6ebc439fe71ce78890fe6a94da40dcbff341da183efa5a49df060ee754  deviceinfo
+9472880d4b68735da1ae1b766a62aeedc90e3300ef2726f629a63046af69ba040d9c4bfb6371a1bd700f013cea872fba069ed1cf18f8a0aaa3c494c9469d00e1  deviceinfo
 8e075951dc7fe3f05a4a0a1c33fd1e5630bc20d800f3c2de578853e6249ebf4fc8d31d5752a8abb707df3f3c9f9c18adaa89a1918adf9d3a90a38364d9b93b3c  modules-initfs
 "
diff --git a/device/testing/device-samsung-gtelwifiue/deviceinfo b/device/testing/device-samsung-gtelwifiue/deviceinfo
index 54c21bda601..3f84a23b340 100644
--- a/device/testing/device-samsung-gtelwifiue/deviceinfo
+++ b/device/testing/device-samsung-gtelwifiue/deviceinfo
@@ -32,3 +32,6 @@ deviceinfo_flash_offset_second="0x00f00000"
 deviceinfo_flash_offset_tags="0x01e00000"
 deviceinfo_flash_pagesize="2048"
 deviceinfo_flash_sparse="true"
+
+# lk2nd does not support GPT for subpartitions/SD cards yet
+deviceinfo_partition_type="msdos"
diff --git a/device/testing/device-samsung-heatqlte/APKBUILD b/device/testing/device-samsung-heatqlte/APKBUILD
index 604d051c86c..d1584131049 100644
--- a/device/testing/device-samsung-heatqlte/APKBUILD
+++ b/device/testing/device-samsung-heatqlte/APKBUILD
@@ -1,8 +1,8 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-samsung-heatqlte
 pkgdesc="Samsung Galaxy Ace 4 (SM-G357FZ)"
-pkgver=2
-pkgrel=1
+pkgver=3
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
@@ -28,6 +28,6 @@ nonfree_firmware() {
 }
 
 sha512sums="
-8fab423ea3b8b6a2475c0a4fb03466dcafbe5000553681bd5a5dc45d7e0a09c4cd54febb53b10331928aa6b4b2b3f9bd49642eb42ed46153c44cc8f90a050b10  deviceinfo
+2b3c891cc07eed3127d5d31b2fe98b459a3505c43b86985756103ef7d192e5c52a7b98fb0d85360b55532f9033b2f1a457be5691da8e90d2e9c17e54987ed94b  deviceinfo
 ef54a1b54c229c8152050d902b9690675490347c0308ddd7053305a578bd1a641dbb3a86bf95b5c3f2c7d3136e6ddf5444bb53e91aa513d2707f7f239f2ed43e  modules-initfs
 "
diff --git a/device/testing/device-samsung-heatqlte/deviceinfo b/device/testing/device-samsung-heatqlte/deviceinfo
index 635db3bac7c..3b82c2e39a9 100644
--- a/device/testing/device-samsung-heatqlte/deviceinfo
+++ b/device/testing/device-samsung-heatqlte/deviceinfo
@@ -37,3 +37,6 @@ deviceinfo_flash_sparse="true"
 deviceinfo_usb_idVendor="0x04e8"
 # Galaxy (MTP)
 deviceinfo_usb_idProduct="0x6860"
+
+# lk2nd does not support GPT for subpartitions/SD cards yet
+deviceinfo_partition_type="msdos"
diff --git a/device/testing/device-samsung-j3ltetw/APKBUILD b/device/testing/device-samsung-j3ltetw/APKBUILD
index 2d8c00ceae0..b4be3fe1304 100644
--- a/device/testing/device-samsung-j3ltetw/APKBUILD
+++ b/device/testing/device-samsung-j3ltetw/APKBUILD
@@ -1,8 +1,8 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-samsung-j3ltetw
 pkgdesc="Samsung Galaxy J3 (2016)"
-pkgver=3
-pkgrel=1
+pkgver=4
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -34,6 +34,6 @@ nonfree_firmware() {
 }
 
 sha512sums="
-985c203e4af9d6c9d04773233d2e38366b1101ef8c70435e1514f00522726238033ef0b6db6d901589469530ac70a78f3c582e5ae0195dcfba361e744b64d972  deviceinfo
+8525b036da879cc13147d82374c39c89d8f867b31db11ba54959e9ae4f65815a145256536533bcb492f3aece73188ace76b18e63b100bb46da8fee53c53d4d2f  deviceinfo
 27839a3da5c8b17516f64e0f7c38af2f502379553643a23834038cebd8ef47ea8d321fe796f99715102ce92f70a9fe0cb97062624a3589b98696154bfd7a4514  modules-initfs
 "
diff --git a/device/testing/device-samsung-j3ltetw/deviceinfo b/device/testing/device-samsung-j3ltetw/deviceinfo
index 7143e8b1240..13e1573e308 100644
--- a/device/testing/device-samsung-j3ltetw/deviceinfo
+++ b/device/testing/device-samsung-j3ltetw/deviceinfo
@@ -36,3 +36,6 @@ deviceinfo_flash_sparse="true"
 deviceinfo_usb_idVendor="0x04e8"
 # Galaxy (MTP)
 deviceinfo_usb_idProduct="0x6860"
+
+# lk2nd does not support GPT for subpartitions/SD cards yet
+deviceinfo_partition_type="msdos"
diff --git a/device/testing/device-samsung-j5/APKBUILD b/device/testing/device-samsung-j5/APKBUILD
index 9448d75bc5b..d252401df3f 100644
--- a/device/testing/device-samsung-j5/APKBUILD
+++ b/device/testing/device-samsung-j5/APKBUILD
@@ -2,8 +2,8 @@
 # Maintainer: Raymond Hackley <raymondhackley@protonmail.com>
 pkgname=device-samsung-j5
 pkgdesc="Samsung Galaxy J5 (2015)"
-pkgver=6
-pkgrel=2
+pkgver=7
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -35,6 +35,6 @@ nonfree_firmware() {
 }
 
 sha512sums="
-480a84da82ec9836dd5c1242d1738f278d79608ee909afd67bb9ae93eceef1a97da2ee2dfb3c69a739c68bb09a357dda50e42ef07ec52524573d636d34583dd0  deviceinfo
+d5340fb7a15e3e43759d1139147cb65165b5bdf6f0f449bb44822854de066ab93a6ed2b0dd1d9bc67fc7c9f0146b4534c1af4c0915dd515ebb095749fbc8252f  deviceinfo
 27839a3da5c8b17516f64e0f7c38af2f502379553643a23834038cebd8ef47ea8d321fe796f99715102ce92f70a9fe0cb97062624a3589b98696154bfd7a4514  modules-initfs
 "
diff --git a/device/testing/device-samsung-j5/deviceinfo b/device/testing/device-samsung-j5/deviceinfo
index f7dd668d4ce..18fc91f5ec0 100644
--- a/device/testing/device-samsung-j5/deviceinfo
+++ b/device/testing/device-samsung-j5/deviceinfo
@@ -36,3 +36,6 @@ deviceinfo_flash_sparse="true"
 deviceinfo_usb_idVendor="0x04e8"
 # Galaxy (MTP)
 deviceinfo_usb_idProduct="0x6860"
+
+# lk2nd does not support GPT for subpartitions/SD cards yet
+deviceinfo_partition_type="msdos"
diff --git a/device/testing/device-samsung-j5x/APKBUILD b/device/testing/device-samsung-j5x/APKBUILD
index 91a8ac32702..e616469c0c2 100644
--- a/device/testing/device-samsung-j5x/APKBUILD
+++ b/device/testing/device-samsung-j5x/APKBUILD
@@ -2,8 +2,8 @@
 # Maintainer: Raymond Hackley <raymondhackley@protonmail.com>
 pkgname=device-samsung-j5x
 pkgdesc="Samsung Galaxy J5 (2016)"
-pkgver=4
-pkgrel=2
+pkgver=5
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -35,6 +35,6 @@ nonfree_firmware() {
 }
 
 sha512sums="
-09e2319dea448b3c4580e55d6b121726557a893e8d8ecde9e62cf3fd5e72acbf784215a3ea688b3c43b5e56cf07523a17ba1aa36bcdbc77413f8362b06bd9a18  deviceinfo
+7ecebbbe80f3a2f6ee62d1fc5c166420961681fd6cd558a6a1af900ccb38a8982bc9528f0474fa00a68e96fcdfef1dd98774cf1ff4dabbd5c7a59c19e3d272e1  deviceinfo
 72ccbf2f59a72d5299339f9db3cdf4e84d4b20c756b549c11d2e94b0bd4b433d993d64c2908e2536ff369363813586691af28c2a5c0e1aecf7a848e8b455cb8d  modules-initfs
 "
diff --git a/device/testing/device-samsung-j5x/deviceinfo b/device/testing/device-samsung-j5x/deviceinfo
index 31b05ed8b98..117a43b6784 100644
--- a/device/testing/device-samsung-j5x/deviceinfo
+++ b/device/testing/device-samsung-j5x/deviceinfo
@@ -36,3 +36,6 @@ deviceinfo_flash_sparse="true"
 deviceinfo_usb_idVendor="0x04e8"
 # Galaxy (MTP)
 deviceinfo_usb_idProduct="0x6860"
+
+# lk2nd does not support GPT for subpartitions/SD cards yet
+deviceinfo_partition_type="msdos"
diff --git a/device/testing/device-samsung-matisseve/APKBUILD b/device/testing/device-samsung-matisseve/APKBUILD
index e57f66ab1a5..87451534457 100644
--- a/device/testing/device-samsung-matisseve/APKBUILD
+++ b/device/testing/device-samsung-matisseve/APKBUILD
@@ -1,8 +1,8 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-samsung-matisseve
 pkgdesc="Samsung Galaxy Tab 4 10.1"
-pkgver=7
-pkgrel=1
+pkgver=8
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -27,6 +27,6 @@ nonfree_firmware() {
 }
 
 sha512sums="
-075a03ecbaf743db67e02408c2ffee3693718feac97b2cabf6f6b66db05390beef0ad96006cf91273a68cc55432c3524001a3cae22b28a02322a13e3d6f69e29  deviceinfo
+b1de7e0e22f6c1c72e9c12a0d8afd4651924cbcc234a4ac533eb9dd81737f5447a5991913ab0eea427324ad189a018ff58dc243acf6d07fbdb70ce4e0c1d51c6  deviceinfo
 a04d688a6df0cbb202598b558c5c9d3cf2ad39c8268f3055cc79c56fc7728be4a08366f67fddbb2b689e5bb23bec9a3821860114ea21f60a1d1cd0d6723dd53d  modules-initfs
 "
diff --git a/device/testing/device-samsung-matisseve/deviceinfo b/device/testing/device-samsung-matisseve/deviceinfo
index fc960763dda..65a8310956c 100644
--- a/device/testing/device-samsung-matisseve/deviceinfo
+++ b/device/testing/device-samsung-matisseve/deviceinfo
@@ -31,3 +31,6 @@ deviceinfo_flash_offset_second="0x00f00000"
 deviceinfo_flash_offset_tags="0x01e00000"
 deviceinfo_flash_pagesize="2048"
 deviceinfo_flash_sparse="true"
+
+# lk2nd does not support GPT for subpartitions/SD cards yet
+deviceinfo_partition_type="msdos"
diff --git a/device/testing/device-samsung-on7/APKBUILD b/device/testing/device-samsung-on7/APKBUILD
index daeea582c2d..5e46e0faf5d 100644
--- a/device/testing/device-samsung-on7/APKBUILD
+++ b/device/testing/device-samsung-on7/APKBUILD
@@ -1,8 +1,8 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-samsung-on7
 pkgdesc="Samsung Galaxy On7 (2015)"
-pkgver=1
-pkgrel=1
+pkgver=2
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -37,6 +37,6 @@ nonfree_firmware() {
 
 
 sha512sums="
-f35bc86201b8def8c48d1620d02ec184ac34e5a47d344291941a3367a333505425b829df889a8378c0ed264240ba853959158fb6b18f02dabd68a6254cf1895e  deviceinfo
+81a79f14da305550723cf450ef933a0f91fd422855d809478ebdfb42ca632e79d5ca46cfe6dd6d1dadb1ec623ab2654a76bb92264d3e1c0b15ef1b7506df05d6  deviceinfo
 2ec94ab06240419953494aede92263232e07745b8406923d39849c1a4b32bd135f4411243755e5f892d201e39dca10e8aa7b175b6c63361be094f6ba086a518f  modules-initfs
 "
diff --git a/device/testing/device-samsung-on7/deviceinfo b/device/testing/device-samsung-on7/deviceinfo
index 86a94b56ed7..dd5c58701ad 100644
--- a/device/testing/device-samsung-on7/deviceinfo
+++ b/device/testing/device-samsung-on7/deviceinfo
@@ -34,3 +34,6 @@ deviceinfo_flash_offset_ramdisk="0x02000000"
 deviceinfo_flash_offset_second="0x00f00000"
 deviceinfo_flash_offset_tags="0x01e00000"
 deviceinfo_flash_sparse="true"
+
+# lk2nd does not support GPT for subpartitions/SD cards yet
+deviceinfo_partition_type="msdos"
diff --git a/device/testing/device-vivo-y21l/APKBUILD b/device/testing/device-vivo-y21l/APKBUILD
index 5c9d2df8303..1ed251b263e 100644
--- a/device/testing/device-vivo-y21l/APKBUILD
+++ b/device/testing/device-vivo-y21l/APKBUILD
@@ -2,8 +2,8 @@
 # Maintainer Raihan Ahamed <raihan1999ahamed@gmail.com>
 pkgname=device-vivo-y21l
 pkgdesc="Vivo Y21L"
-pkgver=2
-pkgrel=1
+pkgver=3
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -28,5 +28,5 @@ nonfree_firmware() {
 }
 
 sha512sums="
-2b9d2fef344d5bfdaf2459a220aabb5a718b9412806b54dc8397ca8803392faa30c6b9a8fdc3decac3ce5ec3ea7ef7ab5523f8fd675114b929d30ef54c121af6  deviceinfo
+c3c4fef9d974af48fe2c3b51f76a6093b7f959075366b4a7da20419388c851d01469c156a1d6410012a2727ef47da718d22efcef1cc919ddaa2ae20d68fb3f2f  deviceinfo
 "
diff --git a/device/testing/device-vivo-y21l/deviceinfo b/device/testing/device-vivo-y21l/deviceinfo
index 6a9036d5f7b..d0d69153bf7 100644
--- a/device/testing/device-vivo-y21l/deviceinfo
+++ b/device/testing/device-vivo-y21l/deviceinfo
@@ -34,3 +34,6 @@ deviceinfo_flash_offset_second="0x00f00000"
 deviceinfo_flash_offset_tags="0x00000100"
 deviceinfo_flash_pagesize="2048"
 deviceinfo_flash_sparse="true"
+
+# lk2nd does not support GPT for subpartitions/SD cards yet
+deviceinfo_partition_type="msdos"
-- 
GitLab