.ci/autoupdate.sh

@@ -10,8 +10,9 @@ fi
 
 git config --global --add safe.directory "$CI_PROJECT_DIR"
 git config --global user.name "postmarketOS CI"
-# pmaports
-git config --global user.email "project_226_bot_a365eaa0c380d1bee0af03adf42ebea3@noreply.gitlab.postmarketos.org"
+# The username for the bot associated with the access token
+# e.g. project_226_bot_bfa19b84bf7f559c8ff7438a01fd29b9
+git config --global user.email "$PMAPORTS_TOKEN_BOT@noreply.gitlab.postmarketos.org"
 
 # Configure SSH key for signing
 mkdir -p ~/.ssh

.ci/testcases/test_deviceinfo.py

@@ -36,7 +36,7 @@ def test_deviceinfo():
     # Iterate over all devices
     last_exception = None
     count = 0
-    pattern = re.compile("^deviceinfo_[a-zA-Z0-9_]*=\".*\"$")
+    pattern = re.compile("^deviceinfo_[a-zA-Z0-9_]*=\".*\"(\\s*# .*)?$")
 
     for folder in pkgrepo_iglob("device/*/device-*"):
         device = folder.name.split("-", 1)[1]
@@ -63,8 +63,8 @@ def test_deviceinfo():
                 # Check line against regex (can't use multiple lines etc.)
                 if not pattern.match(line) or line.endswith("\\\""):
                     raise RuntimeError("Line looks invalid, maybe missing"
-                                       " quotes/multi-line string/comment next"
-                                       f" to line instead of above? {line}")
+                                       " quotes/multi-line string/malformed"
+                                       f" inline comment? {line}")
 
             # Successful deviceinfo parsing / obsolete options
             info = pmb.parse.deviceinfo(device)

CODEOWNERS

@@ -93,6 +93,7 @@ device/*/device-shift-axolotl/			@amartinz @calebccff @dylanvanassche
 device/*/device-solidrun-cubox/			@longnoserob
 device/*/firmware-google-sargo/			@flamingradian
 device/*/firmware-google-veyron-brcm/		@jenneron
+device/*/firmware-motorola-osprey/		@Minecrell
 device/*/firmware-odroid-xu4/			@Grimler
 device/*/firmware-oneplus-sdm845/		@calebccff
 device/*/firmware-powervr-gx6250/		@jenneron

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
 "

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"

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
 "

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"

device/community/device-lenovo-21bx/APKBUILD

@@ -4,7 +4,7 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-lenovo-21bx
 pkgdesc="Lenovo ThinkPad X13s"
-pkgver=11
+pkgver=12
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -64,7 +64,7 @@ usbguard() {
 
 sha512sums="
 9cb08de5748b0339005a910cc0475ad344dc6e912e477c5bd6b370784af6309719524f8fa7a39e7565586e47968a35c344ea853cddd716cc3e1e483efaae7ff0  deviceinfo
-82f7719285434d8c7a5268ddc21d513bb3f3788eb3dd2df099e1c245add9d19719047b003a47edb077e095ebe09d9601b1312c001578e7dfa4ed61d72098ef74  firmware.files
+5f4e6a80455c8a2ed879bfd457a89f81790824657ed4101e03b7ec288a274e63340f48e2ad5028cf83744263a4529584b1e94c36d10b98912e5b31804fa98ff0  firmware.files
 27705e998db262602b50004083fe160dbcde88e9fdcaeb43e3d1d79be0b7af371f84855bb93ba16ada3cf5fa8ff8da6ca159cda4b1de08fb54ac451c57169c57  modules-initfs
 52bbb9564ec713db5d46937701b121afe0c6c644fffe189a05766f491b4997b1bbc4c1f90229efb5764d795df8d40a57d4c840ee4b32d426e7a84520364b8bf5  pipewire.conf
 0d0412eb1f01af39000c39391f622640461305d83dae1a53aa7eef640cc17fd265cabca4e4e57dea053c47a4e50f9feb90f12ee5310d5b6425783e83efc5f9d8  usbguard.conf

device/community/device-lenovo-21bx/firmware.files

@@ -4,9 +4,7 @@
 
 # Bluetooth
 /lib/firmware/qca/hpbtfw21.tlv
-# TODO: replace this if/when the fixed fw makes its way into linux-firmware-qca
-#/lib/firmware/qca/hpnv21.bin
-/lib/firmware/postmarketos/qca/hpnv21.bin
+/lib/firmware/qca/hpnv21.b8c
 
 # GPU
 /lib/firmware/qcom/a660_gmu.bin

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
 "

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"

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
 "

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"

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
 "

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"

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
 "

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"

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
 "

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"

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
 "