temp/libssc: patch 103 threading

DO NOT MERGE
device-pine64-pinenote: drop phosh subpackage as not needed
2025-12-05 19:43:07 +01:00 · 2025-12-05 17:56:39 +00:00 · 2025-12-05 16:57:35 +00:00 · 2025-12-05 16:42:54 +00:00 · 2025-12-05 16:42:54 +00:00 · 2025-12-05 16:16:30 +00:00
1475 changed files with 22951 additions and 7311 deletions
@@ -11,6 +11,7 @@
 if [ "$(id -u)" = 0 ]; then
 	set -x
 	apk -q add py3-pip make git
+	apk add dint --allow-untrusted --repository=https://mirror.postmarketos.org/postmarketos/master
 	exec su "${TESTUSER:-build}" -c "sh -e $0"
 fi

@@ -94,4 +94,20 @@ if grep -qEr '^deviceinfo_kernel_cmdline.*[\"\s]console=null' -- device/; then
 	exit_code=1
 fi

+# Disallow installation of files to /etc/modules-load.d and /etc/modprobe.d
+if grep -qr '/etc/modules-load.d' --exclude-dir='device-samsung-golden-downstream' -- *; then
+	echo "ERROR: Please replace '/etc/modules-load.d' with '/usr/lib/modules-load.d' in the following files:"
+	grep --color=always -r '/etc/modules-load.d' --exclude-dir='device-samsung-golden-downstream' -- *
+	exit_code=1
+fi
+# n900 is excluded because the string is in a comment linking to a repo.
+# No other non-archived devices should be excluded.
+if grep -qr '/etc/modprobe.d' --exclude-dir='archived' \
+		--exclude-dir='device-nokia-n900' -- *; then
+			echo "ERROR: Please replace '/etc/modprobe.d' with '/usr/lib/modprobe.d' in the following files:"
+			grep --color=always -r '/etc/modprobe.d' --exclude-dir='device-nokia-n900' \
+				--exclude-dir='archived' -- *
+	exit_code=1
+fi
+
 exit "$exit_code"
@@ -19,7 +19,11 @@ from pmb.core.context import get_context

 def build_strict(packages, arch):
    common.run_pmbootstrap(["build_init"])
-    common.run_pmbootstrap(["--details-to-stdout", "--no-ccache", "build",
+    # We set the timeout to 1 hour because linking the Linux kernel with
+    # ThinLTO on our aarch64 runners takes slightly over 30 minutes
+    common.run_pmbootstrap(["--details-to-stdout", "--no-ccache",
+                            "--timeout", "3600",
+                            "build",
                            "--strict", "--force",
                            "--arch", arch, ] + list(packages))

@@ -32,7 +36,7 @@ if __name__ == "__main__":
    arch = sys.argv[1]

    # Get and print modified packages
-    packages = common.get_changed_packages()
+    packages = common.get_changed_packages(skip_archived=True)

    # Load context
    sys.argv = ["pmbootstrap.py", "chroot"]
@@ -29,4 +29,4 @@ pmbootstrap -q shutdown
 # Needed to import "common"
 export PYTHONPATH=".ci/lib"
 # Run testcases
-pytest -vv -x --tb=native "$pmaports/.ci/testcases" "$@"
+pytest -vv --tb=native "$pmaports/.ci/testcases" "$@"
@@ -67,6 +67,7 @@ instance/

 # Documentation
 public
+docs/deviceinfo-reference.md

 # PyBuilder
 target/
@@ -219,6 +219,8 @@ deploy-docs:
    - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH && $CI_PROJECT_NAMESPACE == "postmarketOS"
      changes:
        - docs/**
+    - if: $CI_PIPELINE_SOURCE == "schedule"
+      when: never

 auto-update:
  stage: autoupdate
@@ -8,6 +8,12 @@ branch_pmaports=master
 branch_aports=master
 mirrordir_alpine=edge

+[v25.12]
+description=Upcoming stable release (DO NOT USE)
+branch_pmaports=v25.12
+branch_aports=master
+mirrordir_alpine=v3.23
+
 [v25.06]
 description=Latest release / Recommended for best stability
 branch_pmaports=v25.06
@@ -2,7 +2,7 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-alcatel-idol347-downstream
 pkgdesc="Alcatel OneTouch Idol 3 (4.7) (Downstream)"
-pkgver=2
+pkgver=3
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -21,5 +21,5 @@ package() {
 }

 sha512sums="
-131bddf782050fd8301ebd242a5b19cd70c520f03fe2e8a2f0b7afba60cc3dc0330f3765395de70553fc172a116a02a9512c3fc189303cb09609e4adac76a799  deviceinfo
+118b62d7ad6d9b62f0d63a1749005321fdf73417f95e8d70e761b6755f7c4e0164b2b476c8e1aad93dc42cd4df24384f660e21af6c62a9f8eda4d3e3bd8298e6  deviceinfo
 "
@@ -10,7 +10,6 @@ deviceinfo_arch="armv7"

 # Device related
 deviceinfo_chassis="handset"
-deviceinfo_keyboard="false"
 deviceinfo_external_storage="true"
 deviceinfo_screen_width="720"
 deviceinfo_screen_height="1280"
@@ -20,7 +19,6 @@ deviceinfo_flash_method="fastboot"
 deviceinfo_kernel_cmdline="console=ttyHSL0,115200,n8 androidboot.console=ttyHSL0 androidboot.hardware=qcom msm_rtb.filter=0x237 ehci-hcd.park=3 androidboot.bootdevice=7824900.sdhci lpm_levels.sleep_disabled=1 earlyprintk androidboot.bootloader=L1BGC0C0BG00"
 deviceinfo_generate_bootimg="true"
 deviceinfo_bootimg_qcdt="false"
-deviceinfo_bootimg_dtb_second="false"
 deviceinfo_flash_offset_base="0x80000000"
 deviceinfo_flash_offset_kernel="0x00008000"
 deviceinfo_flash_offset_ramdisk="0x01000000"
@@ -2,7 +2,7 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-amazon-mantis
 pkgdesc="Amazon Fire TV Stick 4K"
-pkgver=2
+pkgver=3
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -25,5 +25,5 @@ package() {
 }

 sha512sums="
-56da9bba99d1c16a18ae1dbabdf7a38b9d6f28f12fd3c2c9a938abf11cdd1fcc281c0a735144e93d79288574eff1ac5f6ec51907dc3625b99697ea435d920bd8  deviceinfo
+1b59ddbb22701e1921c58bc8cc1cd6832becd5e37ccac2d0cca08e002e7fdd8921a8cc500e1c9bfdf2b17e7890fd88073f533b41d2b0a4904041277fb5a4197a  deviceinfo
 "
@@ -11,7 +11,6 @@ deviceinfo_arch="armv7"

 # Device related
 deviceinfo_chassis="embedded"
-deviceinfo_keyboard="false"
 deviceinfo_external_storage="false"
 deviceinfo_screen_width="1920"
 deviceinfo_screen_height="1080"
@@ -20,7 +19,6 @@ deviceinfo_screen_height="1080"
 deviceinfo_flash_method="fastboot"
 deviceinfo_generate_bootimg="true"
 deviceinfo_bootimg_qcdt="false"
-deviceinfo_bootimg_dtb_second="false"
 deviceinfo_flash_pagesize="2048"
 deviceinfo_flash_offset_base="0x40000000"
 deviceinfo_flash_offset_kernel="0x00008000"
@@ -3,7 +3,7 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-amazon-suez
 pkgdesc="Amazon Fire HD 10"
-pkgver=1
+pkgver=2
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -23,5 +23,5 @@ package() {


 sha512sums="
-7fabe51a6cc1b013ce9d6c8875f2c127dfd7dad827312aba2564af02fd321d5174d5fd7f7a0c92853e5b95e4cee88fff2a06bb2590de81c0424156baf9b9fcb8  deviceinfo
+91b9a695bbf1bf322a072041bf02adc5b9d182fd381b27b5847f82d6b55189abec68281952072b7368491fc549e4f557a82db96942fc1d4b7977e256e0f38f83  deviceinfo
 "
@@ -10,7 +10,6 @@ deviceinfo_arch="aarch64"

 # Device related
 deviceinfo_chassis="tablet"
-deviceinfo_keyboard="false"
 deviceinfo_external_storage="true"
 deviceinfo_screen_width="1200"
 deviceinfo_screen_height="1920"
@@ -20,7 +19,6 @@ deviceinfo_flash_method="fastboot"
 deviceinfo_kernel_cmdline="bootopt=64S3,32N2,64N2"
 deviceinfo_generate_bootimg="true"
 deviceinfo_bootimg_qcdt="false"
-deviceinfo_bootimg_dtb_second="false"
 deviceinfo_flash_offset_base="0x40078000"
 deviceinfo_flash_offset_kernel="0x00008000"
 deviceinfo_flash_offset_ramdisk="0x03f88000"
@@ -3,7 +3,7 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-apple-d22
 pkgdesc="Apple iPhone X (Global)"
-pkgver=1
+pkgver=2
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -27,5 +27,5 @@ package() {
 }

 sha512sums="
-77576a8cfeffae46fa9ba47ca050355a844e3648f2c1fd36f8de27d996e721b1e840adecb418f9260ae5781229dc3e3bbadbc793df7b30e8f58949b86dd4352d  deviceinfo
+ff755a83597c073aafbd1c6d0d0671129dd5a14c3133df0c53562e7322c904a3c228f863ddc33da0085b7a786b1d3af9430f2a03b7b38f5275ba3357c2351e8b  deviceinfo
 "
@@ -21,4 +21,3 @@ deviceinfo_screen_height="2346"
 deviceinfo_create_initfs_extra="true"

 # Bootloader related
-deviceinfo_flash_method="none"
@@ -4,7 +4,7 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-apple-iphone7
 pkgdesc="Apple iPhone 7"
-pkgver=1
+pkgver=2
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -23,5 +23,5 @@ package() {
 }

 sha512sums="
-89e982924d3fbf7e95144e85565597a1dda57394505e5381737b4026e05160986c51c69c007f37e5f48b4aa4e321c498345b4b14d10b18db25b86f3f26c41e2f  deviceinfo
+3c204cecf7a9c6d05eeee38e4be563877affdd957cb7952639747e457206fffb6b3d1637550558a9215c4384ed6e23b1b1649d4e03fc7596b96a0b92a87bdda4  deviceinfo
 "
@@ -10,11 +10,9 @@ deviceinfo_arch="aarch64"

 # Device related
 deviceinfo_chassis="handset"
-deviceinfo_keyboard="false"
 deviceinfo_external_storage="false"
 deviceinfo_screen_width="750"
 deviceinfo_screen_height="1334"

 # Bootloader related
-deviceinfo_flash_method="none"

@@ -4,7 +4,7 @@
 # Maintainer: Aster Boese <asterboese@mailbox.org>
 pkgname=device-apple-n61
 pkgdesc="Apple iPhone 6"
-pkgver=2
+pkgver=3
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -28,6 +28,6 @@ package() {
 }

 sha512sums="
-7500439e30455b5116d6f8cfb3b50abc51947c358e0ff506ca457c6eccc70abd0d3c48355e82d2e97ead2971403cc861722b5f13d72baf7398bc3d878ef306bf  deviceinfo
+8ea21948631e391c48e0589dbf14c776eb24102771cc7eea994c2bf618ed71f5ef303c29f59be3cd8983b76b392967403435f6c6984ef3f0b5bfc69e5ca0aceb  deviceinfo
 f4df83d543efb5748743f56fbfeddc6734ad341fb623f796faa74b4f42cadfd9a7b1aea2bd3a6f7aa3f284bcb34c05b2ec2a1704ad6e88b043f92dc0de14a573  modules-initfs
 "
@@ -11,10 +11,8 @@ deviceinfo_arch="aarch64"

 # Device related
 deviceinfo_chassis="handset"
-deviceinfo_keyboard="false"
 deviceinfo_external_storage="false"
 deviceinfo_screen_width="750"
 deviceinfo_screen_height="1334"

 # Bootloader related
-deviceinfo_flash_method="none"
@@ -3,7 +3,7 @@
 # Maintainer: Luca Weiss <luca@lucaweiss.eu>
 pkgname=device-asus-sparrow-downstream
 pkgdesc="ASUS ZenWatch 2 (Downstream)"
-pkgver=1
+pkgver=2
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -26,5 +26,5 @@ package() {
 }

 sha512sums="
-9e623485ede2810071135a324360860ca7b2b43a696b5b7a8525f334018aa13f130fdd3b729ffd1b2b8541949fb781b426613a9968daa983d9affff407ed55b1  deviceinfo
+64ad025793dbaca01bde6eefc446ab4f1f5a21b300cce8daba1851926c08f1bbac668fffebe8e5c492499205bae15b410bdc2741f366039bf20054f12c98f0bb  deviceinfo
 "
@@ -11,7 +11,6 @@ deviceinfo_arch="armv7"

 # Device related
 deviceinfo_chassis="watch"
-deviceinfo_keyboard="false"
 deviceinfo_external_storage="false"
 deviceinfo_screen_width="320"
 deviceinfo_screen_height="320"
@@ -22,7 +21,6 @@ deviceinfo_kernel_cmdline="console=ttyHSL0,115200,n8 androidboot.console=ttyHSL0
 deviceinfo_generate_bootimg="true"
 deviceinfo_generate_extlinux_config="true"
 deviceinfo_bootimg_qcdt="false"
-deviceinfo_bootimg_dtb_second="false"
 deviceinfo_flash_pagesize="2048"
 deviceinfo_flash_offset_base="0x00000000"
 deviceinfo_flash_offset_kernel="0x00008000"
@@ -3,7 +3,7 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-asus-x00td-downstream
 pkgdesc="Asus Zenfone Max Pro M1 downstream"
-pkgver=0.1
+pkgver=2
 pkgrel=0
 url="postmarketos.org"
 arch="aarch64"
@@ -22,5 +22,5 @@ package() {
 }

 sha512sums="
-dee8129a078693d5c5b13da6247615f1b9720d7268e16280ef5d5111b07cd96f534eee91893a20935d182cf6205598d283308f91bc1d7cc7b701907b33090ae8  deviceinfo
+aacace112d10033fc2a0e1fa5705e2734961a6282833da0277e2fec6662eb4142eb797979b648466d5f1fa31c4d296c3b7f74df473dfbb9927cd3fb34b2491dd  deviceinfo
 "
@@ -11,7 +11,6 @@ deviceinfo_arch="aarch64"

 # Device related
 deviceinfo_chassis="handset"
-deviceinfo_keyboard="false"
 deviceinfo_external_storage="true"
 deviceinfo_screen_width="1080"
 deviceinfo_screen_height="2160"
@@ -2,8 +2,8 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-bq-paella-downstream
 pkgdesc="BQ Aquaris X5 (Downstream)"
-pkgver=2
-pkgrel=3
+pkgver=3
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
@@ -28,4 +28,6 @@ nonfree_firmware() {
 	mkdir "$subpkgdir"
 }

-sha512sums="e872f7f78d9add160fc962dc6053a490edce1cda8c306e47b9e90098640af5e83556e138242abfc76757cd913bf4c56d9c3857533fcdb780a1578e641ecf015e  deviceinfo"
+sha512sums="
+2759dceedaca6672489410f092db2b47d451cab7cb7706e942412eb957a1c2861d723a3938c79e1543be01e3d584c62408be9675b9533f5cc49ce50287b2d16f  deviceinfo
+"
@@ -10,7 +10,6 @@ deviceinfo_arch="armv7"

 # Device related
 deviceinfo_chassis="handset"
-deviceinfo_keyboard="false"
 deviceinfo_external_storage="true"
 deviceinfo_screen_width="720"
 deviceinfo_screen_height="1280"
@@ -4,7 +4,7 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-bq-tenshi
 pkgdesc="BQ Aquaris U Plus"
-pkgver=1
+pkgver=2
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -29,5 +29,5 @@ package() {
 }

 sha512sums="
-f6132a554b5aa0d6191ecd32e8eb61abc6473a6281b1fedb42c8f6668a9893b1cdbbc2e410cfdac9b629f70c082e6d65d1e99f11a95b35e4889d00f4fb4b1ad2  deviceinfo
+7e41e1c6de6c8a11b872b393c638b6c0253d7a1ac4dabef551ff8453228b1166bb1c29447a568b0f31ff347e252c17aa6c696bf01b74a0e931e0e81950090e83  deviceinfo
 "
@@ -11,7 +11,6 @@ deviceinfo_arch="armv7"

 # Device related
 deviceinfo_chassis="handset"
-deviceinfo_keyboard="false"
 deviceinfo_external_storage="true"

 # Bootloader related
@@ -19,7 +18,6 @@ deviceinfo_flash_method="fastboot"
 deviceinfo_kernel_cmdline="console=ttyHSL0,115200,n8 androidboot.console=ttyHSL0 androidboot.hardware=qcom user_debug=30 msm_rtb.filter=0x237 ehci-hcd.park=3 androidboot.bootdevice=7824900.sdhci lpm_levels.sleep_disabled=1 earlycon=msm_hsl_uart,0x78B0000 buildvariant=user buildvariant=eng"
 deviceinfo_generate_bootimg="true"
 deviceinfo_bootimg_qcdt="false"
-deviceinfo_bootimg_dtb_second="false"
 deviceinfo_flash_pagesize="2048"
 deviceinfo_header_version="0"
 deviceinfo_flash_offset_base="0x80000000"
@@ -2,7 +2,7 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-bq-vegetahd
 pkgdesc="BQ Aquaris E5 HD"
-pkgver=2
+pkgver=3
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -30,5 +30,5 @@ package() {
 }

 sha512sums="
-c746b4547c89e1359c5c4da933db049e9ec766081f08b73f6ef4b1942ae670ee4ae8abf38c15756ade22602575543a73738a780fcfb0e178cf7dba5ba4e08896  deviceinfo
+c6eb6140cbfbedfe9cde731329502db7c17366664dbc7813c5e7fc46a5914118d1dfec750ea27e435946d056077f2caf586a77798951caec565af8cd29edc6c6  deviceinfo
 "
@@ -11,7 +11,6 @@ deviceinfo_arch="armv7"

 # Device related
 deviceinfo_chassis="handset"
-deviceinfo_keyboard="false"
 deviceinfo_external_storage="true"
 deviceinfo_screen_width="1280"
 deviceinfo_screen_height="720"
@@ -22,7 +21,6 @@ deviceinfo_generate_bootimg="true"
 deviceinfo_bootimg_qcdt="false"
 deviceinfo_bootimg_mtk_label_kernel="KERNEL"
 deviceinfo_bootimg_mtk_label_ramdisk="ROOTFS"
-deviceinfo_bootimg_dtb_second="false"
 deviceinfo_flash_pagesize="2048"
 deviceinfo_header_version="0"
 deviceinfo_flash_offset_base="0x80000000"
@@ -1,8 +1,9 @@
+# Archived: linux-radxa-dev packages x86_64 binaries in aarch64 package which makes akms part of this device fail when built on aarch64
 # Reference: <https://postmarketos.org/devicepkg>
 # Maintainer: Antoine Martin (ayakael) <dev@ayakael.net>
 pkgname=device-clockworkpi-uconsole-radxa-cm5
 pkgdesc="Clockwork Tech ClockworkPi uConsole Radxa CM5"
-pkgver=3
+pkgver=5
 _commit=2e8040ec92f85e3d43caf3e44557cb0659db4531
 _dtso_commit=c2204834e1d7d0acfd64e1b7874d432bc142f1a4
 pkgrel=0
@@ -134,7 +135,7 @@ openrc() {
 sha512sums="
 a9c48c3470d5641113e351456d6cfa1e2283e6577cf54eea9a2d49ba4f6269e46cba16039584b34e07c7d8006f6dec112e970148f155f2c3ff0670521568a5a7  clockworkradxa-linux-2e8040ec92f85e3d43caf3e44557cb0659db4531.tar.gz
 a15eb74d9db9114022e96ba04542d18350cf6d637c5efa49f4a5a65c33c5fd20a7997095a049a561fb7aac767a299f367489c5a342138a5259cc32ebb6152384  radxa-cm5-uconsole-c2204834e1d7d0acfd64e1b7874d432bc142f1a4.tar.gz
-6309b7581a17792f282b2c9f35ff4d6ad4eaa5836e488843da33d3e1af051bb3dadc66147e10e7d33b67ae3bcb0ece307ad2f34555875bf8116916bf535bd678  deviceinfo
+8552698a2bfbfab71e2b00be9397ab2117aba646a5d4afd5a7e8f53a93bb1736ed81c260a6c863130c7f4cd8eb9a56518885ac4de01a6f67afa1b42d501a91a3  deviceinfo
 85d573bfd51ac4aa502336452b0384af77b6ec095f5c4760e8f287b8452b3ccb4521051bc01c53fa0856440d52231f535f3f0258d62ad578161ad464344413e9  modules-initfs
 642cdb1b4ac02b8c3ab7b72f4eeef615ac4911b42bcd845b54305f0ff64c07b86f4a807a97d395cb6c0cd0a5f5eed15e68d9e4ccb69db8e38fb65c8be4acaeeb  modules-load.conf
 a5324ed5118168b846d359dc2c8e76ccdc624003d157a28e4c9728ddedd9b52c6deb95af9c3a9d94faf52413f2f830dc45ec6c0093458d27149ef17de5dceef5  modprobe.conf
@@ -1,7 +1,5 @@
 # Reference: <https://postmarketos.org/deviceinfo>
-# Maintainer: Antoine Martin (ayakael) <dev@ayakael.net>
-# Please use double quotes only. You can source this file in shell
-# scripts.
+# Please use double quotes only. You can source this file in shell scripts.

 deviceinfo_format_version="0"
 deviceinfo_name="Clockwork Tech ClockworkPi uConsole Radxa CM5"
@@ -12,16 +10,14 @@ deviceinfo_arch="aarch64"
 deviceinfo_disable_dhcpd="true"

 # Device related
-deviceinfo_gpu_accelerated="true"
+deviceinfo_drm="true"
 deviceinfo_chassis="embedded"
-deviceinfo_keyboard="true"
 deviceinfo_external_storage="true"
 deviceinfo_screen_width="1280"
 deviceinfo_screen_height="720"
 deviceinfo_getty="ttyFIQ0;1500000"

 # Bootloader related
-deviceinfo_flash_method="none"
 deviceinfo_boot_filesystem="fat32"
 deviceinfo_dtb="rockchip/rk3588s-radxa-cm5-uconsole"
 deviceinfo_kernel_cmdline="console=tty1 console=ttyFIQ0,1500000n8 PMOS_FORCE_PARTITION_RESIZE earlycon consoleblank=0 coherent_pool=2M irqchip.gicv3_pseudo_nmi=0 cgroup_enable=cpuset cgroup_memory=1 cgroup_enable=memory swapaccount=1"
@@ -3,7 +3,7 @@
 # Maintainer: Luca Weiss <luca@lucaweiss.eu>
 pkgname=device-fairphone-fp2-downstream
 pkgdesc="Fairphone 2 (Downstream)"
-pkgver=1
+pkgver=2
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -42,7 +42,7 @@ package() {
 }

 sha512sums="
-4607ef7ae4ec302a4ac231fc13e230b976b649506d7bdfd642a5f60f6a4ee5510b7cfdacbaa1ba1c51cc0b2a272d6811e6e23e95fbc4ceba24bc1907a75f24fd  deviceinfo
+e9ca33701c6f42213ad91a9bce6f07a57dea2833098a12da361352ef1ca0663843709caaf0c7ded8bdc00d71ec90a678c327082ee573aa65e0815f37fcfb7fc2  deviceinfo
 55360b1ba4ddadea341c9edb13c32ba5f19aabf75ab28602f30cfb79b9df8834f115ef979c70569f23ec1293b1fcd408baf320d87803293ce7106bdc73a26c9f  FP2.conf
 b834461c6866bb0c473dd089dd5da641dd42a00f610aad6503117aa50fe6e200db9ad0a264bb609f12350d59faee1f772907bacd75439f702ea7d52f6f85e2b1  hifi
 "
@@ -10,7 +10,6 @@ deviceinfo_arch="armv7"

 # Device related
 deviceinfo_chassis="handset"
-deviceinfo_keyboard="false"
 deviceinfo_external_storage="true"
 deviceinfo_screen_width="1080"
 deviceinfo_screen_height="1920"
@@ -2,7 +2,7 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-google-crosshatch-downstream
 pkgdesc="Google Pixel 3 XL (Downstream)"
-pkgver=1
+pkgver=2
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -25,5 +25,5 @@ package() {
 }

 sha512sums="
-3f0f9410733e7646aec1efb19afd4240139feb19091977bb80d3d98c72747e067557e82475f6697bf324cb87aba543b4a54beb1375e5899055dd1a0f9f664e3e  deviceinfo
+941eb2010c0fc853cab893b40207f309cc2cd566aaeeb1b32c1731b74fd9c69b63e87fc303ee175a81a76627e2634ea1ced985d0e1003d865d0439de3f776ba5  deviceinfo
 "
@@ -10,7 +10,6 @@ deviceinfo_arch="aarch64"

 # Device related
 deviceinfo_chassis="handset"
-deviceinfo_keyboard="false"
 deviceinfo_external_storage="false"
 deviceinfo_screen_width="1440"
 deviceinfo_screen_height="2960"
@@ -2,7 +2,7 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-hisense-m470bsa
 pkgdesc="Hisense Sero 7 Pro"
-pkgver=1
+pkgver=2
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -31,7 +31,7 @@ nonfree_firmware() {
 }

 sha512sums="
-c876dc3a98fb8d837237e6a171679a8c6925ec612bb92bd682a61505a2860a75c7efc051221724349dee4f906d14a7dd6ce64f0ad3a81bc1c68b5f9c22c6a37c  deviceinfo
+131c99e89e66ae8a10d933574e8fc0b326caec84c260496cac92738c3fa81f32d083dbdc58116804d53c68562c967fdc0b1ffb25d74bb076369d5a3b0f7dee74  deviceinfo
 6a53747e22b530dcd52ca523017edf422b36bcd6616d7b0df0ba23f50de0f91dff63913ec6aab5051eebc131879c235cfb724aacefc90a10b94a1790985144ec  modules-load.conf
 8fcb7330a660995bb1aabf3fd2f3a3536fed79e9369bda115874151e84651839c59d134ac3ca0919eff0770ac51c934b252e7d544a26c076614f7f1d10bfd016  pointercal
 "
@@ -10,11 +10,9 @@ deviceinfo_arch="armv7"

 # Device related
 deviceinfo_chassis="tablet"
-deviceinfo_keyboard="false"
 deviceinfo_external_storage="true"
 deviceinfo_screen_width="800"
 deviceinfo_screen_height="1280"
-deviceinfo_framebuffer_landscape="false"
 deviceinfo_dev_touchscreen="/dev/input/event0"
 deviceinfo_dev_touchscreen_calibration="/etc/pointercal"

@@ -23,7 +21,6 @@ deviceinfo_flash_method="fastboot"
 deviceinfo_kernel_cmdline="androidboot.selinux=enforcing"
 deviceinfo_generate_bootimg="true"
 deviceinfo_bootimg_qcdt="false"
-deviceinfo_flash_offset_base="0x10000000"
 deviceinfo_flash_offset_kernel="0x00008000"
 deviceinfo_flash_offset_ramdisk="0x01000000"
 deviceinfo_flash_offset_second="0x00f00000"
@@ -2,7 +2,7 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-htc-a5ul
 pkgdesc="HTC Desire 816"
-pkgver=1
+pkgver=2
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -20,6 +20,6 @@ package() {
 	devicepkg_package $startdir $pkgname
 }
 sha512sums="
-fbd5b895aada671e8c83a2578e16523e60f8697bfd82411b86886035f53d077ba73bc516503e56a3a2f529462f36e40f4d8355a711d8f311e11d1ba4781fa1e3  deviceinfo
+6c65eed2a3679a1d016b3ed452c499efc53294fb3b7cc67755849bf31467154ba4e8d453281daac3ea09b54324f91e8379d57a6b138114a7e6e6c03b98903a08  deviceinfo
 765abaad5fda0dfda5e62e1e48414d3eea822198f39d0792171a04d73f86f6273a6e562afab430cbfcdd084412568a0ad03d012e9c40c5564f5cd1b9c0f181eb  initfs-hook.sh
 "
@@ -10,7 +10,6 @@ deviceinfo_arch="armhf"

 # Device related
 deviceinfo_chassis="handset"
-deviceinfo_keyboard="false"
 deviceinfo_external_storage="true"
 deviceinfo_screen_width="720"
 deviceinfo_screen_height="1280"
@@ -1,8 +1,8 @@
 # Archived: Kernel does not build anymore
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-htc-bravo
-pkgver=1
-pkgrel=25
+pkgver=2
+pkgrel=0
 pkgdesc="HTC Desire"
 url="https://postmarketos.org"
 arch="armhf"
@@ -30,7 +30,7 @@ package() {
 }

 sha512sums="
-310f4dfcc04c240d99f8ec39ba2d37a7dcc64e2c7354dac506519de7e8a58efc549d017027a301f272e6b24cb05be983bee4a6eb17f3524da829f6120fca1da3  deviceinfo
+f0cb0ced4d76dbe3a60e9062cf0e78cb5b936287c4078869c47fcfcc2980e7449e07c3c23e25fd6d7b992adec5bf57c1e46e02f0a48740a9aba814b50e784528  deviceinfo
 3ce2d134aa59677e25a160b5985c552fbf048b237169bbeb85e2b8824f734627064b51c097036db10eee0254064d45d804d17372dffcd1ba246938968fe1e225  initfs-hook.sh
 f0f69ab3b5b3fed11ec5049f37c71c4e9dcf87dc1f238199a3917dd61957d46783a8798d63d400cc5d3983987e750e3fec6d7117561ad5005f28131ae4821d66  90-android-touch-dev.rules
 d3de411b31de4bf4336dfac530e6af3392620ef6276ad143ebe0e417d543bfc7f5c9fcab8dab9342798e2c03281275c97e25bd01e97c350a2596f52795a37cef  pointercal
@@ -12,7 +12,6 @@ deviceinfo_arch="armhf"

 # Device related
 deviceinfo_chassis="handset"
-deviceinfo_keyboard="false"
 deviceinfo_screen_width="480"
 deviceinfo_screen_height="800"
 deviceinfo_dev_touchscreen="/dev/input/event2"
@@ -3,7 +3,7 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-htc-enrc2b
 pkgdesc="HTC One X+"
-pkgver=1
+pkgver=2
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -23,5 +23,5 @@ package() {


 sha512sums="
-1b407793e79ead46239e1396a8702230bfc296c6811171f8924caa2009e82096e241c1413e4690a78c83c26fabb792615a6d3b473725dd896a558d3294725bc8  deviceinfo
+562c474510ded0b9189f93f0aa2bf8ea9f8edaa816f2127cf0d4ef575d64c140968bc5cc0a2a5b4aaced1784c76f9aad1f02ac81972148a19caa90dab416f058  deviceinfo
 "
@@ -10,7 +10,6 @@ deviceinfo_chassis="handset"
 deviceinfo_arch="armv7"

 # Device related
-deviceinfo_keyboard="false"
 deviceinfo_external_storage="false"
 deviceinfo_screen_width="720"
 deviceinfo_screen_height="1280"
@@ -19,8 +18,6 @@ deviceinfo_screen_height="1280"
 deviceinfo_flash_method="fastboot"
 deviceinfo_generate_bootimg="true"
 deviceinfo_bootimg_qcdt="false"
-deviceinfo_bootimg_dtb_second="false"
-deviceinfo_flash_offset_base="0x10000000"
 deviceinfo_flash_offset_kernel="0x00008000"
 deviceinfo_flash_offset_ramdisk="0x01000000"
 deviceinfo_flash_offset_second="0x00f00000"
@@ -2,7 +2,7 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-htc-flounder-downstream
 pkgdesc="Google Nexus 9"
-pkgver=1
+pkgver=2
 pkgrel=0
 url="https://postmarketos.org"
 license="gpl-v3"
@@ -26,5 +26,5 @@ nonfree_firmware() {
 	mkdir "$subpkgdir"
 }
 sha512sums="
-a1912ffe196fd8677366ac9e891a06dab2deb324dc33c6b588c32565e90b6463c01b021fa8de3704668860c5b2b224e00552e443becf3b8e3efda230cccc9688  deviceinfo
+459f06b48d516c09ee8a1d03e6a2058354bcbf2b137040b58b77e29d29838c4e1586ccf972989dddbc4035c1d171c328d16e3a2ff4e26ae07f9d804a5aa58924  deviceinfo
 "
@@ -10,7 +10,6 @@ deviceinfo_arch="aarch64"

 # Device related
 deviceinfo_chassis="tablet"
-deviceinfo_keyboard="false"
 deviceinfo_external_storage="false"
 deviceinfo_screen_width="2048"
 deviceinfo_screen_height="1536"
@@ -21,7 +20,6 @@ deviceinfo_flash_method="fastboot"
 deviceinfo_kernel_cmdline="no_console_suspend=1 tegra_wdt.enable_on_probe=1 tegra_wdt.heartbeat=120 androidboot.hardware=flounder androidboot.selinux=permissive selinux=0"
 deviceinfo_generate_bootimg="true"
 deviceinfo_bootimg_qcdt="false"
-deviceinfo_flash_offset_base="0x10000000"
 deviceinfo_flash_offset_kernel="0x00008000"
 deviceinfo_flash_offset_ramdisk="0x01000000"
 deviceinfo_flash_offset_second="0x00f00000"
@@ -2,7 +2,7 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-htc-m8-downstream
 pkgdesc="HTC One M8 (Downstream)"
-pkgver=1
+pkgver=2
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -33,7 +33,7 @@ package() {
 }

 sha512sums="
-96229ef0f9725256b2ef464fa5173fa158e8db0bd3263e42825015858f107eae9f2a3000ad281a40f4fd84340f177d6c23d355351cd36209843c66427628a9da  deviceinfo
+f46238ef93ae77fed95f04bd325d3dab562190842089939116850d2898c8e62c30b5a80ffceb7c2da431b106f6f7b53892027a1e046ba68c534da89eade9531c  deviceinfo
 765abaad5fda0dfda5e62e1e48414d3eea822198f39d0792171a04d73f86f6273a6e562afab430cbfcdd084412568a0ad03d012e9c40c5564f5cd1b9c0f181eb  initfs-hook.sh
 f0f69ab3b5b3fed11ec5049f37c71c4e9dcf87dc1f238199a3917dd61957d46783a8798d63d400cc5d3983987e750e3fec6d7117561ad5005f28131ae4821d66  90-android-touch-dev.rules
 "
@@ -10,7 +10,6 @@ deviceinfo_arch="armv7"

 # Device related
 deviceinfo_chassis="handset"
-deviceinfo_keyboard="false"
 deviceinfo_external_storage="true"
 deviceinfo_create_initfs_extra="true"

@@ -3,7 +3,7 @@
 # Maintainer: Luca Weiss <luca@lucaweiss.eu>
 pkgname=device-htc-memul-downstream
 pkgdesc="HTC One Mini 2 (Downstream)"
-pkgver=1
+pkgver=2
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -29,6 +29,6 @@ package() {
 }

 sha512sums="
-b08ffbf641267e1d62b62a193f720031da50ad63b399badc0442c5f9bd4a546e3a82a063480d849cff14342361324982a68dd0e0ddd879741069c458b055b351  deviceinfo
+e0f730aeb956d9e6ff0c7cbc420351f66386473c7779ea6aba7429407597878e4f30bdbbb2f56052155030d7d5b7b36ba4572f41340b2e2fa626404985814de1  deviceinfo
 765abaad5fda0dfda5e62e1e48414d3eea822198f39d0792171a04d73f86f6273a6e562afab430cbfcdd084412568a0ad03d012e9c40c5564f5cd1b9c0f181eb  initfs-hook.sh
 "
@@ -10,7 +10,6 @@ deviceinfo_arch="armv7"

 # Device related
 deviceinfo_chassis="handset"
-deviceinfo_keyboard="false"
 deviceinfo_external_storage="true"
 deviceinfo_screen_width="720"
 deviceinfo_screen_height="1280"
@@ -2,7 +2,7 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-huawei-alice
 pkgdesc="Huawei P8 Lite"
-pkgver=2
+pkgver=3
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -29,5 +29,5 @@ package() {
 }

 sha512sums="
-5430865c8531590622e1adda2828a040694ad03f9cc6959a628aa32c77293d2aea7f6ffccaea3cac28e4c7f20f98e0293977a666ae13108ff2f8c20fdd545d3f  deviceinfo
+0f3c10a89b310664b66b991c8934896f618af87ce800cd8a5aa6762058ba4f6c553d52bf8f86d6ccd38d61350edff41ceffd48b87138dcf803d6fb49ba0508a1  deviceinfo
 "
@@ -10,7 +10,6 @@ deviceinfo_arch="aarch64"

 # Device related
 deviceinfo_chassis="handset"
-deviceinfo_keyboard="false"
 deviceinfo_external_storage="true"
 deviceinfo_screen_width="720"
 deviceinfo_screen_height="1280"
@@ -20,7 +19,6 @@ deviceinfo_flash_method="fastboot"
 deviceinfo_kernel_cmdline="console=tty1 enforcing=0 hisi_dma_print=0 vmalloc=384M maxcpus=8 coherent_pool=512K no_irq_affinity ate_enable=true androidboot.selinux=permissive buildvariant=userdebug"
 deviceinfo_generate_bootimg="true"
 deviceinfo_bootimg_qcdt="false"
-deviceinfo_bootimg_dtb_second="false"
 deviceinfo_flash_offset_base="0x07478000"
 deviceinfo_flash_offset_kernel="0x00008000"
 deviceinfo_flash_offset_ramdisk="0x07b88000"
@@ -1,7 +1,7 @@
 # Archived: Downstream port, only for testing. Use mainline port!
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-huawei-angler-downstream
-pkgver=1
+pkgver=2
 pkgrel=0
 pkgdesc="Huawei Nexus 6P (Downstream)"
 url="https://postmarketos.org"
@@ -41,5 +41,5 @@ package() {
 sha512sums="
 262f9f3e28cbb28d236cf6edce4919766baabb18e5b0cf35d672d306efeaf12fd66ffba57e6d9bef0eee90203dc98f95aab17145e4c12383055afb58b922ae58  90-android-touch-dev.rules
 61fe1f91d7b0b570b77fcca76503373cbac2515ca3dcc2f2543b910dfaeb1e935a11975f824f6a72001df4e63329356a6aff2d016e9b4f5d8f7b739fee065c4e  bcmdhd.cal
-0089ea9710e3b4f0e6e8c66f327640f762b55e32306ac05ba7a385d2ac6e5786a582926959f4459a9ce7ec093332424d34892b6d78b9e3573716b769ec9c83da  deviceinfo
+a642b851495f68bfdd9788e911623bc0c655e0e3869cdcb03e40686e36a2b17d4c2a9c3402f30c26272ef579cb53fc12f9477caa8f4c73a39079ee78e6d965a0  deviceinfo
 "
@@ -7,7 +7,6 @@ deviceinfo_manufacturer="Huawei"
 deviceinfo_codename="huawei-angler-downstream"
 deviceinfo_year="2015"
 deviceinfo_chassis="handset"
-deviceinfo_keyboard="false"
 deviceinfo_external_storage="false"
 deviceinfo_flash_method="fastboot"
 deviceinfo_arch="aarch64"
@@ -2,8 +2,8 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-huawei-kiwi-downstream
 pkgdesc="Huawei Honor 5X (Downstream)"
-pkgver=1
-pkgrel=3
+pkgver=2
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -28,5 +28,5 @@ nonfree_firmware() {
 }

 sha512sums="
-6c7172554ff2ef25996c06cf7b823c11101029e31cafbb0c41d8d59b8c8b05803a9324c708847a4e86d88bc3bd2a42e90deb94dcc3c1298ff8a52621dda9878a  deviceinfo
+12ad849642a8548a5d17c24ee4a5a2c0b2d7d2c2f15528e4fff52ce03b17cdc9c898dcc5dc20949b9cc6157613dbc2b180ede47a532b30b621c75002e2a33711  deviceinfo
 "
@@ -10,7 +10,6 @@ deviceinfo_arch="aarch64"

 # Device related
 deviceinfo_chassis="handset"
-deviceinfo_keyboard="false"
 deviceinfo_external_storage="true"
 deviceinfo_screen_width="1080"
 deviceinfo_screen_height="1920"
@@ -20,7 +19,6 @@ deviceinfo_flash_method="fastboot"
 deviceinfo_kernel_cmdline="androidboot.hardware=qcom ehci-hcd.park=3 androidboot.bootdevice=7824900.sdhci lpm_levels.sleep_disabled=1 buildvariant=userdebug"
 deviceinfo_generate_bootimg="true"
 deviceinfo_bootimg_qcdt="true"
-deviceinfo_bootimg_dtb_second="false"
 deviceinfo_flash_offset_base="0x80000000"
 deviceinfo_flash_offset_kernel="0x00008000"
 deviceinfo_flash_offset_ramdisk="0x02000000"
@@ -3,8 +3,8 @@
 # Maintainer: gtrxAC <gtrxac2@gmail.com>
 pkgname=device-huawei-plank
 pkgdesc="Huawei Honor 7"
-pkgver=2
-pkgrel=1
+pkgver=3
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -26,5 +26,5 @@ package() {
 }

 sha512sums="
-f02ba5e67bb20df6fe660ae6744bf2c46359cb4bae42f5266d643666c7d96a468f3436332f1fba9a45951dca9cb83f5d553d0191086c88436e9048defe4832a7  deviceinfo
+92ebb3f14228b9163a20c712ee86c3d0b384601bfaa8f50d464ab1a307555c567a5bee12868aa51f4001b5d68e33288008de33324a21962d30d3e20c540c16a6  deviceinfo
 "
@@ -11,7 +11,6 @@ deviceinfo_arch="aarch64"

 # Device related
 deviceinfo_chassis="handset"
-deviceinfo_keyboard="false"
 deviceinfo_external_storage="true"
 deviceinfo_screen_width="1080"
 deviceinfo_screen_height="1920"
@@ -21,7 +20,6 @@ deviceinfo_flash_method="fastboot"
 deviceinfo_kernel_cmdline="androidboot.hardware=hi3635 androidboot.selinux=permissive no_console_suspend=1 mem=3072M coherent_pool=512K mmcparts=mmcblk0:p1(vrl),p2(vrl_backup),p6(modemnvm_factory),p9(splash),p10(modemnvm_backup),p11(modemnvm_img),p12(modemnvm_system),p14(3rdmodemnvm),p15(3rdmodemnvmback),p17(modem_om),p20(modemnvm_update),p30(modem),p31(modem_dsp),p32(dfx),p33(3rdmodem) cpuidle_sysfs_switch=1"
 deviceinfo_generate_bootimg="true"
 deviceinfo_bootimg_qcdt="false"
-deviceinfo_bootimg_dtb_second="false"
 deviceinfo_flash_pagesize="2048"
 deviceinfo_header_version="0"
 deviceinfo_flash_offset_base="0x00678000"
@@ -3,7 +3,7 @@
 # Maintainer: Luca Weiss <luca@lucaweiss.eu>
 pkgname=device-huawei-sturgeon-downstream
 pkgdesc="Huawei Watch"
-pkgver=1
+pkgver=2
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -32,6 +32,6 @@ package() {
 }

 sha512sums="
-36be65b715e509585a0bdbfc381cbe04a4886860b0cd2675347be4825ce6233c02d0a160bda83e26b72060bc4b538ab229275035f2004fa3fe2ecb5827ab1807  deviceinfo
+949e469b75898e00af1f22ede5ee52602c521308058fb9ac46041d4cae7f86036cf34c4e7a208ee6c3978d6985c9e10540276cb8803737f93a62cce444c95b90  deviceinfo
 a19923f30ac1d328a85ab1162e44442da28dd1ae45529fb73e21d8004594487f61c8f5372e5bbaadfefd27fe27c8a22ce430b81891ac1965e5704bbfec108b82  networkmanager.conf
 "
@@ -11,7 +11,6 @@ deviceinfo_arch="armv7"

 # Device related
 deviceinfo_chassis="watch"
-deviceinfo_keyboard="false"
 deviceinfo_external_storage="false"
 deviceinfo_screen_width="400"
 deviceinfo_screen_height="400"
@@ -22,11 +21,9 @@ deviceinfo_kernel_cmdline="androidboot.hardware=sturgeon user_debug=31 maxcpus=4
 deviceinfo_generate_bootimg="true"
 deviceinfo_generate_extlinux_config="true"
 deviceinfo_bootimg_qcdt="false"
-deviceinfo_bootimg_dtb_second="false"
 deviceinfo_flash_offset_base="0x00000000"
 deviceinfo_flash_offset_kernel="0x00008000"
 deviceinfo_flash_offset_ramdisk="0x02000000"
 deviceinfo_flash_offset_second="0x00f00000"
 deviceinfo_flash_offset_tags="0x01e00000"
 deviceinfo_flash_pagesize="2048"
-deviceinfo_flash_fastboot_partition_rootfs="userdata"
@@ -2,7 +2,7 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-klipad-rel
 pkgdesc="KLIPAD Klipad Tablet"
-pkgver=2
+pkgver=3
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -25,5 +25,5 @@ package() {
 }

 sha512sums="
-77d26d205c953e6e191d32747388cbb43c024c21de3f40289235fec397459212fb2007ac935915cc453e703c5526cb11f344fc0529fddaf5a25927670e1cbcfb  deviceinfo
+6d51632faf832e1ad00a60609a749008e0ada21237517c6d87c2ac88b4fb683f3ded8995e718329e4d83bac8fc84833ddefa1a68ef71becd16259e9efb28893f  deviceinfo
 "
@@ -11,20 +11,16 @@ deviceinfo_arch="armv7"

 # Device related
 deviceinfo_chassis="tablet"
-deviceinfo_keyboard="true"
 deviceinfo_external_storage="true"
 deviceinfo_screen_width="1024"
 deviceinfo_screen_height="600"

 # Bootloader related
-deviceinfo_flash_method="none"

 # pmbootstrap bootimg_analyze
 deviceinfo_kernel_cmdline="buildvariant=user"
 deviceinfo_generate_bootimg="true"
 deviceinfo_bootimg_qcdt="false"
-deviceinfo_bootimg_dtb_second="false"
-deviceinfo_flash_offset_base="0x10000000"
 deviceinfo_flash_offset_kernel="0x00008000"
 deviceinfo_flash_offset_ramdisk="0x01000000"
 deviceinfo_flash_offset_second="0x00f00000"
@@ -3,7 +3,7 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-kobo-clara-downstream
 pkgdesc="Kobo Clara HD downstream"
-pkgver=0.1
+pkgver=2
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -41,6 +41,6 @@ nonfree_firmware() {
 }

 sha512sums="
-84b9e5385b7fd77af6891b31d7e95ec424645f741d54168d3d38f6f703071d622829d9f7cf5a29136bf6eb9ec5b2a50a05efe76ddc3e047bb4a69e197fbfde24  deviceinfo
+d4081fa9f52fdf7b7b4d3363dc8e8fc6f05ea4a98d68ff12a602320b6a4b668ef9c7866d8ec7faaffc5a4d95117d2e03c38b7b757b5d483925ad4b6b520e286b  deviceinfo
 4bfc2714a2670efc451860bd97d36ba12559e00aed41afdde1ac3e01b41458390358ac7f6bc96a6dee6be6a34f534da52d845b02df0566b25f4868774ef69b1d  uboot-script-downstream.cmd
 "
@@ -12,13 +12,11 @@ deviceinfo_dtb="imx6sll-e60k02"

 # Device related
 deviceinfo_chassis="tablet"
-deviceinfo_keyboard="false"
 deviceinfo_external_storage="true"
 deviceinfo_screen_width="1072"
 deviceinfo_screen_height="1448"

 # Bootloader related
-deviceinfo_flash_method="none"
 deviceinfo_boot_part_start="49152"
 deviceinfo_getty="ttymxc0;115200"
 deviceinfo_generate_legacy_uboot_initfs="true"
@@ -2,7 +2,7 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-lenovo-kuntao
 pkgdesc="Lenovo P2"
-pkgver=4
+pkgver=5
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -30,6 +30,6 @@ package() {
 }

 sha512sums="
-5e0a1e6315c1bc85af7bc0c4ae58c817cfe4a373b1f65fe8a133310868e1ccb974d9648d5397a2a1566cf174b935e8b1717f23ede6096e77caa86f8fba29fe3f  deviceinfo
+af9c0294698e7d439dfd3b2967c0f70d3b3106172138e2cb7dde06cec8d258842b3794c0cb290f27e97218588440987b1f23c7c9600a829b91b4597f3db1e891  deviceinfo
 2ce6911ef54351f46819b3323e361ce60297b30f94e81a77e2d20b1bc294e51e3a0fa859ad8e257fa3fdef404a47dd3b64c247222cb7ca73f03cb4dcd083d1f8  modules-initfs
 "
@@ -12,9 +12,8 @@ deviceinfo_append_dtb="true"
 deviceinfo_arch="aarch64"

 # Device related
-deviceinfo_gpu_accelerated="true"
+deviceinfo_drm="true"
 deviceinfo_chassis="handset"
-deviceinfo_keyboard="false"
 deviceinfo_external_storage="true"
 deviceinfo_screen_width="1080"
 deviceinfo_screen_height="1920"
@@ -26,7 +25,6 @@ deviceinfo_kernel_cmdline="console=earlycon console=ttyMSM0,115200"
 deviceinfo_generate_bootimg="true"
 deviceinfo_generate_extlinux_config="true"
 deviceinfo_bootimg_qcdt="false"
-deviceinfo_bootimg_dtb_second="false"
 deviceinfo_flash_pagesize="2048"
 deviceinfo_flash_offset_base="0x80000000"
 deviceinfo_flash_offset_kernel="0x00008000"
@@ -2,7 +2,7 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-lg-bullhead-downstream
 pkgdesc="Google Nexus 5X"
-pkgver=1
+pkgver=2
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -27,5 +27,5 @@ package() {
 }

 sha512sums="
-0f804120a6a8ee3fd17f08cb05fc3685e24562f16ea64ad1d1fdb7530bc7be3d723bf1b083061c300443850f596a68832d5b9d7f26d738d9e0f229aa94c3f925  deviceinfo
+fa2bc401b16b6ece4aecf227249d36c1789ca896b2832761f5ec6d23c50cbd08d5ddbb3c103eb7110a075bba329537d9c44b9bad76877be27d62ae3aa5a83c49  deviceinfo
 "
@@ -10,7 +10,6 @@ deviceinfo_arch="aarch64"

 # Device related
 deviceinfo_chassis="handset"
-deviceinfo_keyboard="false"
 deviceinfo_external_storage="false"
 deviceinfo_screen_width="1080"
 deviceinfo_screen_height="1920"
@@ -2,7 +2,7 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-lg-d802
 pkgdesc="LG G2"
-pkgver=2
+pkgver=3
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -21,5 +21,5 @@ package() {
 }

 sha512sums="
-e3978ec4f85ee3fe5c44f82a7dc85f7f309db1f315d1ddb23cf8eebadcf517b84cf91a274f846feaa8a35a98c98a605a3b546e2ffd68c9d3d50049b1d80b3e72  deviceinfo
+c224c447e38ed1ae80fd18bbb61f1faaaec4383283e039d4b206be1661754e377a1135cf7c552b1b427c7aaa5bd1212fb801a3f05bd7de2a482813a314b98751  deviceinfo
 "
@@ -11,7 +11,6 @@ deviceinfo_arch="armv7"

 # Device related
 deviceinfo_chassis="handset"
-deviceinfo_keyboard="false"
 deviceinfo_external_storage="false"
 deviceinfo_screen_width="1080"
 deviceinfo_screen_height="1920"
@@ -21,7 +20,6 @@ deviceinfo_flash_method="fastboot"
 deviceinfo_kernel_cmdline="androidboot.hardware=g2 buildvariant=userdebug"
 deviceinfo_generate_bootimg="true"
 deviceinfo_bootimg_qcdt="true"
-deviceinfo_bootimg_dtb_second="false"
 deviceinfo_flash_offset_base="0x00000000"
 deviceinfo_flash_offset_kernel="0x00008000"
 deviceinfo_flash_offset_ramdisk="0x05000000"
@@ -2,7 +2,7 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-lg-h815-downstream
 pkgdesc="LG G4 (h815) (Downstream)"
-pkgver=1
+pkgver=2
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -26,5 +26,5 @@ package() {
 }

 sha512sums="
-1128fd9903a1e450686b091dce1df58694eb9f8ae54aaa725ee290c45a20464f5e8d0cbdbf9601fc6f3818e9675b6d70cf65eee3db0eec2c44c2fab92fb4104d  deviceinfo
+d55b9831a95366f51efae3a29e936c226bb5a6875a62633705ed5d1400a1272e20d11fce8b67c022fa6ba6e9fe4b1533ec2778f09e1afbe3f0128e8944b355e9  deviceinfo
 "
@@ -10,7 +10,6 @@ deviceinfo_arch="aarch64"

 # Device related
 deviceinfo_chassis="handset"
-deviceinfo_keyboard="false"
 deviceinfo_external_storage="true"
 deviceinfo_screen_width="1440"
 deviceinfo_screen_height="2560"
@@ -3,7 +3,7 @@
 # Maintainer: Luca Weiss <luca@lucaweiss.eu>
 pkgname=device-lg-lenok-downstream
 pkgdesc="LG G Watch R (Downstream)"
-pkgver=1
+pkgver=2
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -52,7 +52,7 @@ asteroid() {

 sha512sums="
 a36ba9017df3b4be233783096c303abafa873dcdf50f6357b82f3c5526fd161a1914dafe143377cb5982955108b987890638b51911d0dd339172554e39a82d9f  90-android-touch-dev.rules
-e189deb274e23b178de51bbdbd3e1136d39bfa75d8210f76725acd079794f4331ed584b7bf280a87c7a097724293ba2d2e485d5d2181034917b475ee2a622bc6  deviceinfo
+f5d9698b37c69a51cd4d821b3e54f370681f6c04979de890aafa98e5dc4b0226159fc62778a82b2994e2841f7daa9c939a4d21f29d24f083569682356d70e24c  deviceinfo
 1fc5a7609d8f79f74f29d55ce492dc6b77bb247da1b79abc1361e5e9072b5283816cef02c4cc283300031d708733c5fdbed94f539ae1c16b1dca96bf4d512234  fb_fix.sh
 d29105805adcd79d4f73c2f2c4483a2c627dc7b70acb77f43d085742ef930407c9b1423f7020c34f38e8a09f40cadd991b9acae23e936c90d6a4c0900250da22  initfs-hook.sh
 81cf2c20d2efa0f71f18116efeda11ae4f18fee96ba998dc4d6a36205626dce496cb36711af5c4e3215578b174942e721290cfcff8db6fb1c998b90b7345244d  machine.conf
@@ -10,7 +10,6 @@ deviceinfo_arch="armv7"

 # Device related
 deviceinfo_chassis="watch"
-deviceinfo_keyboard="false"
 deviceinfo_external_storage="false"
 deviceinfo_screen_width="320"
 deviceinfo_screen_height="320"
@@ -1,7 +1,7 @@
 # Archived: Downstream port, only for testing. Use mainline port!
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-lg-mako-downstream
-pkgver=1
+pkgver=2
 pkgrel=0
 pkgdesc="Google Nexus 4 (Downstream)"
 url="https://postmarketos.org"
@@ -44,7 +44,7 @@ package() {

 sha512sums="
 ee25f3d0377f027d108593eb7953b8db49d7f05a5c36a0c8ca7e7849d15e3c217bc1ac97d77a66e28d2db4b81c0f50b905639911276da40321d2b6cca7f797df  90-android-touch-dev.rules
-00140e3e52bc8a0bf3b00be653d16142ebf5983d8ad1ab34f5cd1b6f09ca94b44c02e44cfb1f8c5193ea66201b68b2bc1b2eebcdc745900f74994ebba76deb7c  deviceinfo
+dd364618f054b2baf84b53d5290e2a1cc08da9b9cd935e1624ca30a7a619ebad8a7dc144ae01281c9066f273770be94857328cfb799d716c172164203ccbe4a4  deviceinfo
 217bdf692ade75d57968299e29e9379ffcfc97addf735663b3e1e7dfce049f9d13b26347b4405ac724ae5fac2946012dcc58014b23b8df357e225b6718dbc0a6  fb.modes
 52b1465c75c51e2dc2e351a0609220af04b939b9edf7fca844cc00bb9eeb4e71f53e34817ba094e477fc43bf15101fcfd07963c791a36be5c52f199bba6a6d9d  pointercal
 a8cfde9dd3bc96d990038443e8d10a551f13536f017992ae23545d2f1e09b0f729e5cfd1f94f52a2a335335172f082925b91c980695a27f76f636343de795898  wcnss-wlan
@@ -12,18 +12,15 @@ deviceinfo_arch="armv7"

 # Device related
 deviceinfo_chassis="handset"
-deviceinfo_keyboard="false"
 deviceinfo_screen_width="768"
 deviceinfo_screen_height="1280"
 deviceinfo_dev_touchscreen="/dev/input/event2"
-deviceinfo_gpu_accelerated="false"

 # Fastboot related
 deviceinfo_generate_bootimg="true"
 deviceinfo_kernel_cmdline="console=ttyHSL0,115200,n8"
 deviceinfo_generate_bootimg="true"
 deviceinfo_bootimg_qcdt="false"
-deviceinfo_bootimg_dtb_second="false"
 deviceinfo_flash_pagesize="2048"
 deviceinfo_flash_offset_base="0x80200000"
 deviceinfo_flash_offset_kernel="0x00008000"
@@ -2,7 +2,7 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-lg-mmh4x
 pkgdesc="LG K40 (AT&T)"
-pkgver=2
+pkgver=3
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -26,5 +26,5 @@ package() {
 }

 sha512sums="
-f3de3fe23adf839b5c4def9b399abb8fd57a9a76f52470269e112a8f6037939066e61df7399121cb2626805081dcc97d924c55656b85bf8973c9635826ede06f  deviceinfo
+ba3b8f6318bb5b511805ee541059fd090670e4b0070aed68c47e155468dfd424550802103c00508c19eb97869abdf1873f315ec8ed950d07bf7786102b5edef4  deviceinfo
 "
@@ -11,7 +11,6 @@ deviceinfo_arch="armv7"

 # Device related
 deviceinfo_chassis="handset"
-deviceinfo_keyboard="false"
 deviceinfo_external_storage="true"
 deviceinfo_screen_width="720"
 deviceinfo_screen_height="1440"
@@ -23,7 +22,6 @@ deviceinfo_flash_mtkclient_partition_rootfs="userdata"
 deviceinfo_kernel_cmdline="bootopt=64S3,32N2,32N2 androidboot.hardware=mmh4x androidboot.usbconfigfs=true androidboot.product.lge.op_verity=1 buildvariant=user"
 deviceinfo_generate_bootimg="true"
 deviceinfo_bootimg_qcdt="false"
-deviceinfo_bootimg_dtb_second="false"
 deviceinfo_flash_pagesize="2048"
 deviceinfo_flash_offset_base="0x40000000"
 deviceinfo_flash_offset_kernel="0x00008000"
@@ -4,7 +4,7 @@

 pkgname=device-lg-us996
 pkgdesc="LG V20"
-pkgver=2
+pkgver=3
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -28,5 +28,5 @@ package() {
 }

 sha512sums="
-c9046826642e80ff43ab8020520a3884bc9c24e1c79489732cf9b78f9eb760a5dd2a6e638c2cb7aa03eec5049a9d3d8e3a010ed92cbadbc07dc2801e598cdaa9  deviceinfo
+a5bccebc2fdf2d6b53dd45a1f07f8ef215379861d8b59023b0bebcad8864d1337019e16993d8fc6ca7518157181665cdd63754881e56c24d510a6bd58bb83eb5  deviceinfo
 "
@@ -10,7 +10,6 @@ deviceinfo_arch="aarch64"

 # Device related
 deviceinfo_chassis="handset"
-deviceinfo_keyboard="false"
 deviceinfo_external_storage="true"
 deviceinfo_screen_width="1440"
 deviceinfo_screen_height="2560"
@@ -20,7 +19,6 @@ deviceinfo_flash_method="fastboot"
 deviceinfo_kernel_cmdline="console=ttyHSL0,115200,n8 androidboot.console=ttyHSL0 user_debug=31 ehci-hcd.park=3 lpm_levels.sleep_disabled=1 cma=32M@0-0xffffffff androidboot.hardware=elsa androidboot.bootdevice=624000.ufshc androidboot.selinux=permissive buildvariant=eng"
 deviceinfo_generate_bootimg="true"
 deviceinfo_bootimg_qcdt="false"
-deviceinfo_bootimg_dtb_second="false"
 deviceinfo_flash_offset_base="0x80000000"
 deviceinfo_flash_offset_kernel="0x00008000"
 deviceinfo_flash_offset_ramdisk="0x02200000"
@@ -2,7 +2,7 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-meizu-mblu2
 pkgdesc="Meizu M2"
-pkgver=2
+pkgver=3
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -26,5 +26,5 @@ package() {
 }

 sha512sums="
-f3d3c665d446956077823a73b0e7bc242d9db90eee18523a95af71fd363fd9e17db412dbda565b3fec7a71d9f1c93472e0c8ff75e5e9f26d6c59bc24465baa5e  deviceinfo
+7012a8c03b7cce889cafdafc6050e505a1c9f9ebb74c456a366ca782e6f8a613646394a23763070d36be04eca0a759945ad76a93cd7053be6e3ef1cbae566ef3  deviceinfo
 "
@@ -11,7 +11,6 @@ deviceinfo_arch="aarch64"

 # Device related
 deviceinfo_chassis="handset"
-deviceinfo_keyboard="false"
 deviceinfo_external_storage="true"
 deviceinfo_screen_width="720"
 deviceinfo_screen_height="1280"
@@ -21,7 +20,6 @@ deviceinfo_flash_method="fastboot"
 deviceinfo_kernel_cmdline="bootopt=64S3,32N2,64N2 androidboot.selinux=permissive buildvariant=userdebug"
 deviceinfo_generate_bootimg="true"
 deviceinfo_bootimg_qcdt="false"
-deviceinfo_bootimg_dtb_second="false"
 deviceinfo_flash_offset_base="0x40078000"
 deviceinfo_flash_offset_kernel="0x00008000"
 deviceinfo_flash_offset_ramdisk="0x03f88000"
@@ -2,7 +2,7 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-mobvoi-skipjack
 pkgdesc="Mobvoi Ticwatch C2"
-pkgver=3
+pkgver=4
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -49,5 +49,5 @@ nonfree_firmware_wcnss() {
 }

 sha512sums="
-455443ca487a0fabd1a53bddfe41872adf814c86f8b0eefe2ed2cc9afcf59ee985dd42ac34fa3458dfe395d002c9b3b40a126c1ac331a4be32ee4437a8ffd41d  deviceinfo
+a9fb2617015cb201d4be52619f4d3e2714a25452472643b2e71a04ebfa3a5e73191e87f4b26f80c574b86f59e12ba6500bad4e0251ba28060e8ace8dd0f9628c  deviceinfo
 "
@@ -11,7 +11,6 @@ deviceinfo_arch="armv7"

 # Device related
 deviceinfo_chassis="watch"
-deviceinfo_keyboard="false"
 deviceinfo_external_storage="false"
 deviceinfo_screen_width="360"
 deviceinfo_screen_height="360"
@@ -22,7 +21,6 @@ deviceinfo_flash_sparse="true"
 deviceinfo_kernel_cmdline="androidboot.hardware=skipjack msm_rtb.filter=0x237 ehci-hcd.park=3 lpm_levels.sleep_disabled=1 androidboot.selinux=permissive buildvariant=eng"
 deviceinfo_generate_bootimg="true"
 deviceinfo_bootimg_qcdt="false"
-deviceinfo_bootimg_dtb_second="false"
 deviceinfo_flash_pagesize="2048"
 deviceinfo_flash_offset_base="0x80100000"
 deviceinfo_flash_offset_kernel="0x00008000"
@@ -3,7 +3,7 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-motorola-def
 pkgdesc="Motorola Moto One Hyper"
-pkgver=1
+pkgver=2
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -30,5 +30,5 @@ nonfree_firmware() {


 sha512sums="
-0b133cd1fc0c3b77766771652c4a11f146c6d8cbc4a75a15675bf53640249096887a4a412a88a43ccee858366a08302e8810b146628cec8d39d137fe3859b0b0  deviceinfo
+af469ff2346a449b544d92fb254d39f1750adcdb4cfda7ff93aafa272450aa9e409b4fd8a73f7f53b3c9bf17f3fbbfee4b9d84c09507ae31ca1c524fb625483d  deviceinfo
 "
@@ -11,7 +11,6 @@ deviceinfo_arch="aarch64"
 # Device related
 deviceinfo_no_framebuffer="true"
 deviceinfo_chassis="handset"
-deviceinfo_keyboard="false"
 deviceinfo_external_storage="true"
 deviceinfo_screen_width="1080"
 deviceinfo_screen_height="2340"
@@ -21,7 +20,6 @@ deviceinfo_flash_method="fastboot"
 deviceinfo_kernel_cmdline="console=ttyMSM0,115200n8 androidboot.hardware=qcom androidboot.console=ttyMSM0 androidboot.memcg=1 lpm_levels.sleep_disabled=1 video=vfb:640x400,bpp=32,memsize=3072000 msm_rtb.filter=0x237 service_locator.enable=1 swiotlb=1 androidboot.usbcontroller=a600000.dwc3 earlycon=msm_geni_serial,0x880000 loop.max_part=7 printk.devkmsg=on androidboot.hab.csv=0 androidboot.hab.product=def androidboot.hab.cid=50 firmware_class.path=/vendor/firmware_mnt/image buildvariant=user"
 deviceinfo_generate_bootimg="true"
 deviceinfo_bootimg_qcdt="false"
-deviceinfo_bootimg_dtb_second="false"
 deviceinfo_flash_offset_base="0x00000000"
 deviceinfo_flash_offset_kernel="0x00008000"
 deviceinfo_flash_offset_ramdisk="0x01000000"
@@ -2,7 +2,7 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-motorola-falcon-downstream
 pkgdesc="Moto G (2013) (Downstream)"
-pkgver=1
+pkgver=2
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -29,5 +29,5 @@ package() {
 }

 sha512sums="
-98742dd972f815d910908ad0ede6ee3bb57357e0238328b0c69cf4fd0257cd8165abe3e0a8baf6acc1026cc8aab6b95ace85a96fae5135a418aacc73f592cd67  deviceinfo
+92e5bb7805edf0d13d775067a55a5ec23a7295894146eb6a112009b4fe3d6e30151653779947efe93e9fe86d61a62ac84a30c1c69f0cd66a37c55cbc5dec03d7  deviceinfo
 "
@@ -10,7 +10,6 @@ deviceinfo_arch="armv7"

 # Device related
 deviceinfo_chassis="handset"
-deviceinfo_keyboard="false"
 deviceinfo_external_storage="false"
 deviceinfo_screen_width="720"
 deviceinfo_screen_height="1280"
@@ -1,12 +1,13 @@
 #!/bin/sh
 . ./init_functions.sh
-. /usr/share/misc/source_deviceinfo
+
+SAFESTRAP_PARTITION="/dev/mmcblk1p25"

 mount_safestrap() {
 	grep -q PMOS_NO_SAFESTRAP /proc/cmdline && return

 	mkdir /ss
-	mount -t vfat -o uid=1023,gid=1023,fmask=0007,dmask=0007,allow_utime=0020 ${deviceinfo_safestrap_partition} /ss
+	mount -t vfat -o uid=1023,gid=1023,fmask=0007,dmask=0007,allow_utime=0020 ${SAFESTRAP_PARTITION} /ss

 	slot_loc=$(cat /ss/safestrap/active_slot)

@@ -2,7 +2,7 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-motorola-maserati
 pkgdesc="Motorola Motorola Droid 4"
-pkgver=1
+pkgver=3
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -24,6 +24,6 @@ package() {
 		"$pkgdir"/usr/share/mkinitfs/hooks/
 }
 sha512sums="
-3d9c48f2b3574e8893674867a97e981adf5e03f85c39724b228b032f78421437907245f8fc712770949ddec15e5c68db85d4e8cc504517233a4f758e81e581b4  deviceinfo
-0f46df1da505f2a196d227763da3d7b7620382a01f1b5f0067c4a78eab02415b6f6fdb9277656ae0cfc41996c5ae49ee8605c88cde6ad4a0b5a20634f1d8a4f3  10-safestrap-maserati.sh
+ebd3e5d7dd51b144da8724172aff4fdb5281ce8a159bc8effae2ff68faf24ef004ea8d0239ce99740b88a5aaaa7867d7449f36203f59c5f4a181fb1ff7d1890b  deviceinfo
+f9a4d71ae2736f269863eaf2ca7ef7db764ab38dbead49d7f8ee40a8346c7247a03b2516c871acce4902507381a6518c7ebde7e678e20fa876876910b1529aeb  10-safestrap-maserati.sh
 "
@@ -11,12 +11,5 @@ deviceinfo_external_storage="true"

 # Device related
 deviceinfo_chassis="handset"
-deviceinfo_keyboard="true"
 deviceinfo_screen_width="540"
 deviceinfo_screen_height="960"
-
-# Bootloader related
-deviceinfo_flash_method="none"
-deviceinfo_safestrap_partition="/dev/mmcblk1p25"
-deviceinfo_data_partition="/dev/mmcblk1p24"
-deviceinfo_system_partition="/dev/mmcblk1p20"
@@ -2,7 +2,7 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-motorola-ocean-downstream
 pkgdesc="Motorola Moto G7 Power"
-pkgver=1
+pkgver=2
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -28,5 +28,5 @@ nonfree_firmware() {
 }

 sha512sums="
-28fbf43b00ab02535fb8c5822e7adb32025b0593a3f99f43778ab891fb2c8ac5db9dfc0d6ecefca7ad3484bd72e3d26a73fee06d723419921ad513a6f7f08177  deviceinfo
+0e3c481d3a14914916d8cb264e3c37c19bb65fad9c4e35a8ca0a9e6f6fbf6be02ad34fdcca86c713893153cace1f5254bd76cc8747a5ca141bb4b8b4c7cdebdd  deviceinfo
 "
@@ -10,7 +10,6 @@ deviceinfo_arch="aarch64"

 # Device related
 deviceinfo_chassis="handset"
-deviceinfo_keyboard="false"
 deviceinfo_external_storage="true"
 deviceinfo_screen_width="720"
 deviceinfo_screen_height="1520"
@@ -20,7 +19,6 @@ deviceinfo_flash_method="fastboot"
 deviceinfo_kernel_cmdline="console=ttyMSM0,115200 androidboot.console=ttyMSM0 androidboot.hardware=qcom msm_rtb.filter=0x237 ehci-hcd.park=3 lpm_levels.sleep_disabled=1 androidboot.bootdevice=7824900.sdhci earlycon=msm_serial_hs,0x78af000 firmware_class.path=/vendor/firmware_mnt/image androidboot.usbconfigfs=true loop.max_part=7 printk.devkmsg=on androidboot.hab.csv=12 androidboot.hab.product=ocean androidboot.hab.cid=21 buildvariant=user"
 deviceinfo_generate_bootimg="true"
 deviceinfo_bootimg_qcdt="false"
-deviceinfo_bootimg_dtb_second="false"
 deviceinfo_flash_offset_base="0x80000000"
 deviceinfo_flash_offset_kernel="0x00008000"
 deviceinfo_flash_offset_ramdisk="0x01000000"