copy all modules if available

For development it can be helpful to include all kernel modules in the
initramfs and copy them to the rootfs during boot. Add support for this
directly in the initramfs.

This relies on the fact that development kernels include the git tag and
build number (incrementing) so 'uname -r' changes every time.

It's up to the user to manage deleting their old modules.

Opt-in to this behaviour by setting
deviceinfo_dev_kernel_copy_all_modules="true" in your deviceinfo file.

Signed-off-by: Caleb Connolly <caleb@postmarketos.org>

.ci/autoupdate.sh

@@ -1,108 +0,0 @@
-#!/bin/sh -e
-# Description: update a list of packages
-# Options: native slow
-# https://postmarketos.org/pmb-ci
-
-if [ "$(id -u)" = 0 ]; then
-	set -x
-	apk add git openssh-keygen grep curl
-	wget "https://gitlab.com/postmarketOS/ci-common/-/raw/master/install_pmbootstrap.sh"
-	sh ./install_pmbootstrap.sh
-	exec su "${TESTUSER:-pmos}" -c "sh -e $0 $*"
-fi
-
-git config --global --add safe.directory "$CI_PROJECT_DIR"
-git config --global user.name "postmarketOS CI"
-# pmaports
-# The email address is the username of the bot (from the GitLab group members page) @noreply.gitlab.com
-git config --global user.email "project_8065375_bot_13cf44ca4cd2c938688af6e3d500d9cb@noreply.gitlab.com"
-
-# For testing with pmaports-autoupdate-test repo
-# git config --global user.email "project_58002231_bot_be2d4e9e7aba929855726aafe12940d6@noreply.gitlab.com"
-
-# Configure SSH key for signing
-mkdir -p ~/.ssh
-cp "$PMAPORTS_SSH_KEY" ~/.ssh/pmaports
-chmod 600 ~/.ssh/pmaports
-# Generate public key from private
-ssh-keygen -t ecdsa -f ~/.ssh/pmaports -y > ~/.ssh/pmaports.pub
-
-git config --global gpg.format ssh
-git config --global user.signingkey ~/.ssh/pmaports.pub
-
-export PYTHONUNBUFFERED=1
-
-PKGS="$1"
-if [ -z "$PKGS" ]; then
-	echo "Usage: $0 <packages>"
-	exit 1
-fi
-echo "Checking for new versions of packages: $PKGS"
-
-update_linux_next() {
-	# Check for the latest -next tag
-	local latest
-	local pkgver
-	local new_pkgver
-
-	# Get the current version
-	# shellcheck source=/dev/null
-	pkgver=$(. device/testing/linux-next/APKBUILD; echo "$pkgver")
-
-	curl -s "https://gitlab.com/linux-kernel/linux-next/-/tags?format=atom" | grep -oP "(?<=<title>)[^<]+" | tail -n +2 > /tmp/tags
-
-	latest=$(grep -v "v" < /tmp/tags | head -n1)
-	if [ -z "$latest" ]; then
-		echo "Failed to get the latest -next tag"
-		exit 1
-	fi
-	echo "Latest -next tag: $latest"
-
-	new_pkgver=$(grep "v" < /tmp/tags | head -n1)
-	if [ -z "$new_pkgver" ]; then
-		echo "Failed to get the latest mainline tag from atom feed, reusing current pkgver"
-		new_pkgver="${pkgver%_git*}"
-	else
-		echo "Latest mainline tag: $new_pkgver"
-		# new_pkgver is like 'v6.9-rc1' but we want '6.9'
-		new_pkgver=$(echo "$new_pkgver" | sed -e 's/^v//' -e 's/-.*//')
-	fi
-
-	new_pkgver="${new_pkgver}_git${latest#*-}"
-
-	if [ "$pkgver" = "$new_pkgver" ]; then
-		echo "No new version of linux-next"
-		exit 0
-	fi
-
-	echo "Updating linux-next from $pkgver to $new_pkgver..."
-	sed -i -e "s/pkgver=$pkgver/pkgver=$new_pkgver/" device/testing/linux-next/APKBUILD
-
-	# Update the checksums
-	pmbootstrap checksum linux-next
-
-	# Commit
-	git add device/testing/linux-next/APKBUILD
-	git commit -S -m "linux-next: upgrade to $latest"
-}
-
-# For testing
-#git remote add gitlab https://pmos-ci:"$PMAPORTS_PUSH_TOKEN"@gitlab.com/postmarketOS/pmaports-autoupdate-test.git
-
-git remote add gitlab https://pmos-ci:"$PMAPORTS_PUSH_TOKEN"@gitlab.com/postmarketOS/pmaports.git
-git fetch gitlab
-git checkout --track gitlab/master
-
-for pkg in $PKGS; do
-	case "$pkg" in
-		linux-next)
-			update_linux_next
-			;;
-		*)
-			echo "Unknown package: $pkg"
-			exit 1
-			;;
-	esac
-done
-
-git push

.ci/grep.sh

@@ -80,11 +80,4 @@ if grep -q 'before wpa_supplicant' $OPENRC_SERVICE_FILES; then
 	exit_code=1
 fi
 
-if grep -qEr 'PMOS_NO_OUTPUT_REDIRECT' -- *; then
-	echo "ERROR: PMOS_NO_OUTPUT_REDIRECT is deprecated and doesn't do anything."
-	echo "Please remove it from the following files:"
-	grep --color=always -Er 'PMOS_NO_OUTPUT_REDIRECT' -- *
-	exit_code=1
-fi
-
 exit "$exit_code"

.ci/kconfig.sh

@@ -6,7 +6,6 @@
 
 if [ "$(id -u)" = 0 ]; then
 	set -x
-	export PMBOOTSTRAP_TAG=master
 	wget "https://gitlab.com/postmarketOS/ci-common/-/raw/master/install_pmbootstrap.sh"
 	sh ./install_pmbootstrap.sh
 	exec su "${TESTUSER:-pmos}" -c "sh -e $0"

.ci/lib/check_changed_kernels.py

@@ -1,5 +1,5 @@
 #!/usr/bin/env python3
-# Copyright 2024 Oliver Smith
+# Copyright 2023 Oliver Smith
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 import glob
@@ -10,25 +10,42 @@ import subprocess
 # Same dir
 import common
 
+# pmbootstrap
+import add_pmbootstrap_to_import_path  # noqa
+import pmb.parse
+import pmb.helpers.logging
 
-def check_kconfig(pkgnames):
+
+def check_kconfig(args, pkgnames):
     last_failed = None
     for i in range(len(pkgnames)):
         pkgname = pkgnames[i]
         print(f"  ({i+1}/{len(pkgnames)}) {pkgname}")
 
-        p = subprocess.run(["pmbootstrap", "kconfig", "check", pkgname],
-                           check=False)
+        apkbuild_path = pmb.helpers.pmaports.find(args, pkgname)
+        apkbuild = pmb.parse._apkbuild.apkbuild(f"{apkbuild_path}/APKBUILD")
 
-        if p.returncode:
+        options = []
+
+        for opt in apkbuild["options"]:
+            if "pmb:kconfigcheck" in opt:
+                options += [opt]
+
+        if len(options):
+            options.sort()
+            print(f'options="{" ".join(options)}"')
+
+        if "!pmb:kconfigcheck" in apkbuild["options"]:
+            print("skipped (!pmb:kconfigcheck)")
+            continue
+
+        if not pmb.parse.kconfig.check(args, pkgname, details=True):
             last_failed = pkgname
 
     return last_failed
 
 
 def show_error(last_failed):
-    print("")
-    print("---")
     print("")
     print("Please adjust your kernel config. This is required for getting your"
           " patch merged.")
@@ -42,8 +59,6 @@ def show_error(last_failed):
     print("Run this check again (on all kernels you modified):")
     print("  pmbootstrap ci kconfig")
     print("")
-    print("---")
-    print("")
 
 
 if __name__ == "__main__":
@@ -55,7 +70,13 @@ if __name__ == "__main__":
         print("No kernels changed in this branch")
         exit(0)
 
-    last_failed = check_kconfig(pkgnames)
+    # Initialize args (so we can use pmbootstrap's kconfig parsing)
+    sys.argv = ["pmbootstrap", "kconfig", "check"]
+    args = pmb.parse.arguments()
+    pmb.helpers.logging.init(args)
+
+    print("Running kconfig check on changed kernels...")
+    last_failed = check_kconfig(args, pkgnames)
 
     if last_failed:
         show_error(last_failed)

.gitlab-ci.yml

@@ -9,7 +9,6 @@ after_script:
 stages:
   - lint
   - build
-  - autoupdate
 
 # This defines the rules for when a pipeline should run.
 workflow:
@@ -19,8 +18,8 @@ workflow:
       when: never
     # Run for merge requests
     - if: $CI_PIPELINE_SOURCE == "merge_request_event"
-    # Run scheduled pipeline for autoupdate or manually triggered pipeline
-    - if: $CI_PIPELINE_SOURCE == "schedule" || $CI_PIPELINE_SOURCE == "web"
+    # Run scheduled pipeline for autoupdate
+    - if: $CI_PIPELINE_SOURCE == "schedule"
 
 # device documentation
 wiki:
@@ -124,8 +123,6 @@ mr-settings:
 # build changed aports
 .build:
   stage: build
-  tags:
-    - saas-linux-large-amd64
   rules:
     - if: $CI_PIPELINE_SOURCE == "merge_request_event" || $CI_COMMIT_REF_PROTECTED == "false"
   before_script:
@@ -151,8 +148,6 @@ build-x86:
 
 build-aarch64:
   extends: .build
-  tags:
-    - saas-linux-large-arm64
   script:
     - .ci/build-aarch64.sh
 
@@ -170,22 +165,3 @@ build-riscv64:
   extends: .build
   script:
     - .ci/build-riscv64.sh
-
-auto-update:
-  stage: autoupdate
-  rules:
-    # This variable is set in the scheduled pipeline configuration. It should be a space separated list of
-    # package names to update.
-    - if: $AUTOUPDATE_PACKAGES != null && $CI_PIPELINE_SOURCE == "schedule" || $CI_PIPELINE_SOURCE == "web"
-  before_script:
-    - .ci/lib/gitlab_prepare_ci.sh
-  script:
-    - .ci/autoupdate.sh "$AUTOUPDATE_PACKAGES"
-  after_script:
-    - .ci/lib/move_logs.sh $CI_PROJECT_DIR
-  artifacts:
-    when: on_failure
-    paths:
-      - log.txt
-      - log_testsuite_pmaports.txt
-      - pmbootstrap.cfg

CODEOWNERS

@@ -72,7 +72,6 @@ device/*/device-nvidia-tegra-armv7/		@clamor-s @okias @mschwalm @nokun
 device/*/device-odroid-xu4/			@Grimler
 device/*/device-oneplus-enchilada/		@calebccff
 device/*/device-oneplus-fajita/			@calebccff
-device/*/device-postmarketos-trailblazer/	@calebccff
 device/*/device-qemu-aarch64/			@Minecrell @ollieparanoid
 device/*/device-qemu-amd64/			@Minecrell @ollieparanoid
 device/*/device-qemu-riscv64/			@Minecrell @z3ntu
@@ -93,7 +92,6 @@ device/*/kobo-epdc-extractor/			@akemnade
 device/*/linux-google-nyan/			@jenneron
 device/*/linux-google-veyron/			@jenneron
 device/*/linux-huawei-plank/			@gtrxAC
-device/*/linux-next/				@calebccff
 device/*/linux-postmarketos-allwinner/		@Arnavion @PsychoGame
 device/*/linux-postmarketos-amlogic/		@funderscore @exkc
 device/*/linux-postmarketos-exynos4/		@Newbyte @ThiagaoPlusPlus
@@ -127,7 +125,6 @@ device/*/u-boot-pinephone/			@Arnavion @PsychoGame
 device/*/wl1251-cal/				@Danct12
 main/postmarketos*gnome*/			@pabloyoyoista @Newbyte
 main/postmarketos-initramfs/			@calebccff @craftyguy
-main/postmarketos-ui-i3wm/			@fossdd
 main/postmarketos-ui-phosh/			@pabloyoyoista @Newbyte
 main/postmarketos-ui-plasma-mobile/		@PureTryOut
 main/shutdown-clear-rtc-wakealarm/		@Arnavion

cross/busybox-static-aarch64/APKBUILD

@@ -8,7 +8,7 @@ fi
 
 pkgname=busybox-static-aarch64
 pkgver=1.36.1
-pkgrel=31
+pkgrel=29
 
 _arch="aarch64"
 _mirror="http://dl-4.alpinelinux.org/alpine/"
@@ -32,5 +32,5 @@ package() {
 }
 
 sha512sums="
-c34906bb0a5d7e268ab43ca1e3e2f9c75c06f3f5de8d41671396bcd7d585a79a66e25ad43e80a3e107a1de0ecaf83ac7198163d3e775edbd6d626ef014307ec5  busybox-static-1.36.1-r31-aarch64-edge.apk
+3dd0da90cf278055d2c9e7710bb0389a5af74c0cabd9d786f4244ca4e36872dd307f8ff8a206479714d445fae903b2aa3292279ad737387d0584c7d34d98a274  busybox-static-1.36.1-r29-aarch64-edge.apk
 "

cross/busybox-static-armhf/APKBUILD

@@ -8,7 +8,7 @@ fi
 
 pkgname=busybox-static-armhf
 pkgver=1.36.1
-pkgrel=31
+pkgrel=29
 
 _arch="armhf"
 _mirror="http://dl-4.alpinelinux.org/alpine/"
@@ -32,5 +32,5 @@ package() {
 }
 
 sha512sums="
-7e6a961a0adcbc2912f5b261ce84a62b9189dce49c5dd3d2bcbdae407645dec72c27af8804c1d5446d50e78ea938a4d812c477db199ed83cac7c647c4b41f3fe  busybox-static-1.36.1-r31-armhf-edge.apk
+3ed54a2b4c23a08dc066b585198fe81d39b5fd0d54347d9ab727d6bea73cfc4ad9a5fb55c25a3e59ef8fce6cc83a24f0807980f6d3ea6c05029522627192e716  busybox-static-1.36.1-r29-armhf-edge.apk
 "

cross/busybox-static-armv7/APKBUILD

@@ -8,7 +8,7 @@ fi
 
 pkgname=busybox-static-armv7
 pkgver=1.36.1
-pkgrel=31
+pkgrel=29
 
 _arch="armv7"
 _mirror="http://dl-4.alpinelinux.org/alpine/"
@@ -32,5 +32,5 @@ package() {
 }
 
 sha512sums="
-b9736dc7df4230196bf05de3bd76b61fc689c56861bc7c5194cd310e23f513cec649c1b3e3f338266b8d58540468d97e8525948a3efc2d1af53e288cd525e836  busybox-static-1.36.1-r31-armv7-edge.apk
+3b2124f93cd873440797b25b5c2456dfc441ff18831ae8a0540bd5ca67f3869766aa6a76e31b9f9d0a7382e760b0d8acb1e91599c65a72298fffbbd4aafc6175  busybox-static-1.36.1-r29-armv7-edge.apk
 "

device/archived/device-samsung-coreprimevelte-downstream/APKBUILD

@@ -4,14 +4,14 @@
 pkgname=device-samsung-coreprimevelte-downstream
 pkgdesc="Samsung Galaxy Core Prime VE LTE downstream"
 pkgver=1
-pkgrel=3
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
 options="!check !archcheck"
-depends="mkbootimg linux-samsung-coreprimevelte-downstream postmarketos-base postmarketos-initramfs-minimal pxa-mkbootimg u-boot-tools"
+depends="mkbootimg linux-samsung-coreprimevelte-downstream postmarketos-base pxa-mkbootimg u-boot-tools"
 makedepends="devicepkg-dev"
-_pmb_recommends="firmware-samsung-pxa1908-downstream"
+subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
 source="deviceinfo 90-coreprimevelte.conf"
 
 build() {
@@ -23,6 +23,12 @@ package() {
 	install -Dm444 $startdir/90-coreprimevelte.conf $pkgdir/etc/sysctl.d/90-coreprimevelte.conf
 }
 
+nonfree_firmware() {
+	pkgdesc="Wi-Fi firmware"
+	depends="firmware-samsung-pxa1908"
+	mkdir "$subpkgdir"
+}
+
 sha512sums="
 741f46736c2742d4a6f118a924eee89954fb14e5b1dc00f372bda41b63ec975cf960909f915fcb31ad965f136a712905bc8626cd7e530f40e110885f7c861790  deviceinfo
 4854cc57b86e1199dbc165110514e672dabf45044fe9f7ebbde5b2b24768fb5497273b5f38612cf2dfeffc9bf0648c725114b4fa01165bf7fb02f7d741ee5806  90-coreprimevelte.conf

device/archived/device-shift-axolotl-downstream/APKBUILD

@@ -4,7 +4,7 @@
 pkgname=device-shift-axolotl-downstream
 pkgdesc="SHIFT6mq downstream"
 pkgver=1
-pkgrel=2
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -27,5 +27,5 @@ package() {
 }
 
 sha512sums="
-75bc9e4b1225f3988bef27763d5961160e3dbdb25260327c0390290827b8e946a27ed7f8b0a810f89d696112ca9d220652c8789cbc86f898d2292dd0ae2f61e4  deviceinfo
+3a60faa3024b6a066e5f5319c0e651ffe4980be51cc1b848a946b96cd861be16d651dc2184993eca89f28fe442a39a1a78f67753dc1bb295cab4bdaaa6f2fe49  deviceinfo
 "

device/archived/device-shift-axolotl-downstream/deviceinfo

@@ -18,7 +18,7 @@ deviceinfo_screen_height="2160"
 
 # Bootloader related
 deviceinfo_flash_method="fastboot"
-deviceinfo_kernel_cmdline="console=ttyMSM0,115200n8 buildvariant=userdebug androidboot.hardware=qcom user_debug=31 msm_rtb.filter=0x37 ehci-hcd.park=3 lpm_levels.sleep_disabled=1 sched_enable_hmp=1 sched_enable_power_aware=1 service_locator.enable=1 swiotlb=2048 androidboot.usbconfigfs=true androidboot.usbcontroller=a800000.dwc3 firmware_class.path=/vendor/firmware_mnt/image loop.max_part=7 ramoops.mem_address=0xac000000 ramoops.mem_size=0x200000 ramoops.console_size=0x40000"
+deviceinfo_kernel_cmdline="console=ttyMSM0,115200n8 buildvariant=userdebug androidboot.hardware=qcom user_debug=31 msm_rtb.filter=0x37 ehci-hcd.park=3 lpm_levels.sleep_disabled=1 sched_enable_hmp=1 sched_enable_power_aware=1 service_locator.enable=1 swiotlb=2048 androidboot.usbconfigfs=true androidboot.usbcontroller=a800000.dwc3 firmware_class.path=/vendor/firmware_mnt/image loop.max_part=7 ramoops.mem_address=0xac000000 ramoops.mem_size=0x200000 ramoops.console_size=0x40000 PMOS_NO_OUTPUT_REDIRECT"
 deviceinfo_generate_bootimg="true"
 deviceinfo_bootimg_qcdt="false"
 deviceinfo_bootimg_dtb_second="false"

device/community/device-arrow-db410c/APKBUILD

@@ -3,7 +3,7 @@
 pkgname=device-arrow-db410c
 pkgdesc="Arrow DragonBoard 410c"
 pkgver=4
-pkgrel=1
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -32,6 +32,6 @@ nonfree_firmware() {
 }
 
 sha512sums="
-b7431dcf918509458637442814d6f91f1532c75cd483be65d14dedd7af81f2f565187a190b3e3537474d00eec71cdb4ef6eb7fe3246ecde5a6c7b92593e71207  deviceinfo
+9e4e3c89c6328c60a3e6a02bae30e79863a512760be04177c710827788970963be3679602e288ddee1a4a054e0e80d707ad53d15db6918998680119882e3eab8  deviceinfo
 ccd6758cb4954eb0a96c7fb15e732e8147414f8edc498d9faf7d04ddef85d817733669ec1a6003e623e8392f3f6bb85f71160efe4e82f27e300d58aa6f5c8549  modules-initfs
 "

device/community/device-arrow-db410c/deviceinfo

@@ -21,7 +21,7 @@ deviceinfo_getty="ttyMSM0;115200"
 
 # Bootloader related
 deviceinfo_flash_method="fastboot"
-deviceinfo_kernel_cmdline="earlycon console=ttyMSM0,115200"
+deviceinfo_kernel_cmdline="earlycon console=ttyMSM0,115200 PMOS_NO_OUTPUT_REDIRECT"
 deviceinfo_generate_bootimg="true"
 deviceinfo_generate_extlinux_config="true"
 deviceinfo_bootimg_dtb_second="true"

device/community/device-bq-paella/APKBUILD

@@ -3,7 +3,7 @@
 pkgname=device-bq-paella
 pkgdesc="BQ Aquaris X5"
 pkgver=8
-pkgrel=1
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -38,6 +38,6 @@ nonfree_firmware() {
 }
 
 sha512sums="
-75e857f36f627d1ef209bfc79bac574b432ecb93a0e0de131675de43c43cef15e455284bab7b635376d21fd908e8cd21e6e918c6bd03c6e711179489f56e39a5  deviceinfo
+ae1d413f189856d5f9ccc6a3a64e6cd719ad3cf7e4d1f5b358201037f7fcad2098a33eedfb83278ecf80073bdfbfd49cc796b43da4992f7b2bd3a6dbaa266c40  deviceinfo
 ebf6a40372329116a25df1407e671365bb2bf0613f61f0a572fc77890fb0a1760259ab35ed9f002ef2a5c6ee8836bc7bbeb50bf5ac3de14c11e6d96872ad3644  modules-initfs
 "

device/community/device-bq-paella/deviceinfo

@@ -21,7 +21,7 @@ deviceinfo_getty="ttyMSM0;115200"
 
 # Bootloader related
 deviceinfo_flash_method="fastboot"
-deviceinfo_kernel_cmdline="earlycon console=ttyMSM0,115200"
+deviceinfo_kernel_cmdline="earlycon console=ttyMSM0,115200 PMOS_NO_OUTPUT_REDIRECT"
 deviceinfo_generate_bootimg="true"
 deviceinfo_generate_extlinux_config="true"
 deviceinfo_flash_offset_base="0x80000000"

device/community/device-fairphone-fp4/81-libssc-fairphone-fp4.rules

@@ -1,3 +0,0 @@
-# iio-sensor-proxy with libssc: accelerometer mount matrix
-
-SUBSYSTEM=="misc", KERNEL=="fastrpc-*", ENV{ACCEL_MOUNT_MATRIX}+="-1, 0, 0; 0, -1, 0; 0, 0, -1"

device/community/device-fairphone-fp4/APKBUILD

@@ -1,52 +1,34 @@
 # Reference: <https://postmarketos.org/devicepkg>
-# Maintainer: Luca Weiss <luca@lucaweiss.eu>
+# Maintainer: Luca Weiss <luca@z3ntu.xyz>
 pkgname=device-fairphone-fp4
 pkgdesc="Fairphone 4"
-pkgver=3
-pkgrel=0
+pkgver=2
+pkgrel=3
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
 options="!check !archcheck"
 depends="
 	bootmac
-	firmware-fairphone-fp4-adreno
-	firmware-fairphone-fp4-adsp
-	firmware-fairphone-fp4-bluetooth
-	firmware-fairphone-fp4-cdsp
-	firmware-fairphone-fp4-hexagonfs
-	firmware-fairphone-fp4-ipa
-	firmware-fairphone-fp4-modem
-	firmware-fairphone-fp4-wlan
-	firmware-qcom-adreno-a630
-	hexagonrpcd
-	hexagonrpcd-openrc
-	linux-firmware-ath10k
 	linux-postmarketos-qcom-sm6350
 	make-dynpart-mappings
 	mesa-vulkan-freedreno
 	mkbootimg
-	msm-modem
-	msm-modem-uim-selection
-	pd-mapper
-	pd-mapper-openrc
 	postmarketos-base
 	qbootctl
 	qbootctl-openrc
 	swclock-offset
-	tqftpserv
-	tqftpserv-openrc
 "
 makedepends="devicepkg-dev"
-replaces="hexagonrpcd-openrc"
 install="$pkgname.post-install $pkgname.post-upgrade"
 source="
-	81-libssc-fairphone-fp4.rules
 	90-feedbackd-aw8695.rules
 	deviceinfo
-	hexagonrpcd.confd
 	modules-initfs
 	"
+subpackages="
+	$pkgname-nonfree-firmware:nonfree_firmware
+"
 
 build() {
 	devicepkg_build $startdir $pkgname
@@ -55,18 +37,33 @@ build() {
 package() {
 	devicepkg_package $startdir $pkgname
 
-	install -Dm644 "$srcdir"/81-libssc-fairphone-fp4.rules \
-		"$pkgdir"/usr/lib/udev/rules.d/81-libssc-fairphone-fp4.rules
 	install -Dm644 "$srcdir"/90-feedbackd-aw8695.rules \
 		"$pkgdir"/usr/lib/udev/rules.d/90-feedbackd-aw8695.rules
-	install -Dm644 "$srcdir"/hexagonrpcd.confd \
-		"$pkgdir"/etc/conf.d/hexagonrpcd-adsp-sensorspd
+}
+
+nonfree_firmware() {
+	pkgdesc="Firmware for Modem, WiFi, etc."
+	depends="
+		firmware-fairphone-fp4-adreno
+		firmware-fairphone-fp4-adsp
+		firmware-fairphone-fp4-bluetooth
+		firmware-fairphone-fp4-cdsp
+		firmware-fairphone-fp4-ipa
+		firmware-fairphone-fp4-modem
+		firmware-fairphone-fp4-wlan
+		firmware-qcom-adreno-a630
+		linux-firmware-ath10k
+		msm-modem
+		msm-modem-uim-selection
+		pd-mapper
+		tqftpserv
+		"
+	install="$subpkgname.post-install"
+	mkdir "$subpkgdir"
 }
 
 sha512sums="
-2c16ba75e0077b2b1eaefa4c73b287475505a1aeb291ec29316d41cc094277320f9d2aaabfd91eb1dc0f488ab2d61a94faef16e7afe0f1e226779113761b9a37  81-libssc-fairphone-fp4.rules
 2974ccc172bf1299daeb0bc746879b3a1db1fbc3a2b163a02a6554fed6ed9f733144bcf976cd2441c5664d496dcce3ae943f4314c653470dc07dda0de5ad632b  90-feedbackd-aw8695.rules
-9549f105f865d230e7b67819c96b7e06a5ed4d5808f083099a408934ffbacdb412984b861f6756fa4fde94b51e6a268b8d2ce9fed6f13ee3e8041bb96492310a  deviceinfo
-6a3d620f2cc60308a62ff651ffb00a5ee1f092131cca9d33b6afd61c8a372a3fd7d46540162213593107e0943b33f3f0119d003d43dcd06dbde757390a6c1729  hexagonrpcd.confd
+e223df827d1d18507197d64fc409f527514f7f76b68f784811b7b59452260dbd72133c85277b1e7df38b0058e0f16ac0d1174104a193b7f6c8dcf64577863eba  deviceinfo
 52bb7ed829caa4dcff9728bd6e3cdf118b3c7ee7dfe90df0d4e6422dd67bf3258ae2a4d2dc7599da4182fbd8eb47a0e1d20c58198dc17f2bf178b8f01a8887f7  modules-initfs
 "

device/community/device-fairphone-fp4/device-fairphone-fp4-nonfree-firmware.post-install

@@ -0,0 +1,3 @@
+#!/bin/sh
+rc-update add tqftpserv boot
+rc-update add pd-mapper boot

device/community/device-fairphone-fp4/device-fairphone-fp4.post-install

@@ -1,5 +1,2 @@
 #!/bin/sh
-rc-update add hexagonrpcd-adsp-sensorspd default
-rc-update add pd-mapper boot
 rc-update add qbootctl default
-rc-update add tqftpserv boot

device/community/device-fairphone-fp4/deviceinfo

@@ -23,7 +23,7 @@ deviceinfo_getty="ttyMSM0;115200"
 
 # Bootloader related
 deviceinfo_flash_method="fastboot"
-
+deviceinfo_kernel_cmdline="PMOS_NO_OUTPUT_REDIRECT"
 deviceinfo_generate_bootimg="true"
 deviceinfo_bootimg_qcdt="false"
 deviceinfo_bootimg_mtk_mkimage="false"

device/community/device-fairphone-fp4/hexagonrpcd.confd

@@ -1,2 +0,0 @@
-# Fairphone 4 specific hexagonrpcd firmware directory
-hexagonrpcd_fw_dir="/usr/share/qcom/sm7225/Fairphone/fairphone4"

device/community/device-generic-x86_64/APKBUILD

@@ -2,8 +2,8 @@
 # Co-Maintainer: Oliver Smith <ollieparanoid@postmarketos.org>
 pkgname=device-generic-x86_64
 pkgdesc="Generic x86_64 system, with EFI"
-pkgver=14
-pkgrel=0
+pkgver=13
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="x86_64"
@@ -59,5 +59,5 @@ kernel_lts() {
 
 sha512sums="
 e9dfcd70ccfb9a0fdaa0cdc52faf3be96d6de8af8c60a758bb703c515b0648cec4552e0eaf56e5168b0004cd3fc4b28118abb05dad2c581d3579a2e9134862cb  deviceinfo
-e464ef0ad4a4c34d2d53f69c4612b612ea878a77c9efdef69b0f842edf701036c8218809fd63aac286d6a08ae07f39e568199fc3e38d145e716c1723e7215019  modules-initfs
+cf9ad3e80b43aa799a8123289e3ab77f6a1c37cee3d48db737688b93afd4f1094db76008ec0f28358c35dd1e115c4fabf9452f9abee76481a2630f02e3ae0953  modules-initfs
 "

device/community/device-generic-x86_64/modules-initfs

@@ -2,7 +2,6 @@ ahci
 ehci_hcd
 ehci_pci
 hid-multitouch
-hid_apple
 hid_generic
 i2c_hid_acpi
 jbd2

device/community/device-google-gru/APKBUILD

@@ -2,8 +2,8 @@
 # Maintainer: Jenneron <jenneron@protonmail.com>
 pkgname=device-google-gru
 pkgdesc="Google Gru Chromebooks"
-pkgver=6
-pkgrel=0
+pkgver=5
+pkgrel=7
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -53,6 +53,6 @@ nonfree_firmware() {
 
 
 sha512sums="
-6a8aba7e13f864a223a658f724ad8ff6c04ed986a747439cf88a6365c5fa037da9fb4950fa94794eff64937979f988015af9d0a6359deb041d1a2b128baac75e  deviceinfo
+bf5d1d687e5dd4231eea758611799bfb2aef8caf3314e9469093bf7158ed85dd3aa2fd7894a1a97542a076ddd2ca8a735e54b012f6bee9522fea85d8556a8b90  deviceinfo
 a750a0c41068082e0b82351d5aec91715e1a5215b09b26fec644dfe259cea2d662e878433a732a8c06dab2a9b420baec2bcc6161d8357cf3ed770239c5165090  modules-initfs
 "

device/community/device-google-gru/deviceinfo

@@ -16,7 +16,6 @@ deviceinfo_chassis="convertible"
 deviceinfo_keyboard="true"
 deviceinfo_external_storage="true"
 deviceinfo_gpu_accelerated="true"
-deviceinfo_disable_dhcpd="true"
 
 # Bootloader related
 deviceinfo_flash_method="none"

device/community/device-google-kukui/APKBUILD

@@ -2,8 +2,8 @@
 # Maintainer: Jenneron <jenneron@protonmail.com>
 pkgname=device-google-kukui
 pkgdesc="Google Kukui Chromebooks"
-pkgver=7
-pkgrel=0
+pkgver=6
+pkgrel=6
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -14,7 +14,6 @@ depends="
 	linux-postmarketos-mediatek-mt8183>=6.1.28-r0
 	postmarketos-base
 	postmarketos-cros-common
-	postmarketos-initramfs-minimal
 	soc-mediatek-mt8183
 "
 makedepends="devicepkg-dev"
@@ -74,6 +73,6 @@ nonfree_firmware() {
 }
 
 sha512sums="
-e1c88545563aa40b69f79ed1d86b4da0d7ad65dfff07dce05f56d51b442ad9bae27ae2d27afa2f5131309072a9ea4f3b026d498ab067b315ed0719a3dded4b2c  deviceinfo
+4c7f6c37afbf2fbd9169f158dc8ab2c29599a3eb1f945b51c46dfb3a385ee007c3524b8c689dfc19f51f4e850ec87550f7af6ab3c0590ba713ba14f549a3efb2  deviceinfo
 8e95624610dae7d18684056396c9e82635ddce7303d6770e965f9372ffa101fdfd5f8337bc7368004890e9836798663a98c142c52ed63795877ea37ac8da56af  modules-initfs
 "

device/community/device-google-kukui/deviceinfo

@@ -16,7 +16,6 @@ deviceinfo_chassis="convertible"
 deviceinfo_keyboard="true"
 deviceinfo_external_storage="true"
 deviceinfo_gpu_accelerated="true"
-deviceinfo_disable_dhcpd="true"
 
 # Bootloader related
 deviceinfo_kernel_cmdline="console=null"

device/community/device-google-oak/APKBUILD

@@ -3,8 +3,8 @@
 # Co-Maintainer: Jenneron <jenneron@protonmail.com>
 pkgname=device-google-oak
 pkgdesc="Google Oak Chromebooks"
-pkgver=5
-pkgrel=0
+pkgver=4
+pkgrel=6
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -15,7 +15,6 @@ depends="
 	linux-postmarketos-mediatek-mt8173
 	postmarketos-base
 	postmarketos-cros-common
-	postmarketos-initramfs-minimal
 "
 makedepends="devicepkg-dev"
 source="deviceinfo modules-initfs"
@@ -40,6 +39,6 @@ nonfree_firmware() {
 }
 
 sha512sums="
-ebf7ed07ffcfe30c01c717db00c255e2c650339bace70afffcac4566267da8b6d3e22f819601be2ee355d2c1f56b01e37fca5566a2517fc1ffb642e530b674fb  deviceinfo
+866dad1295698accf952a52bdabd8be99d3449c6131d305067ed404e917a36a5d28e2482c6a205774c9438d17b9d50a2da66a26d58f147ae1aeaa4f225a377c8  deviceinfo
 4b0197eacfeeb4b13f5abc26950f570ee762742547674ce10110ccea63eb46630a2e3b5f87e9c9a1f9deda21baf05bec248ab7a65656687ec94d296b5657dafa  modules-initfs
 "

device/community/device-google-oak/deviceinfo

@@ -17,7 +17,6 @@ deviceinfo_keyboard="true"
 deviceinfo_external_storage="true"
 deviceinfo_screen_width="1366"
 deviceinfo_screen_height="768"
-deviceinfo_disable_dhcpd="true"
 
 # Bootloader related
 deviceinfo_flash_method="none"

device/community/device-google-peach-pit/APKBUILD

@@ -2,8 +2,8 @@
 # Maintainer: Jenneron <jenneron@protonmail.com>
 pkgname=device-google-peach-pit
 pkgdesc="Samsung Chromebook 2 (11.6 inch)"
-pkgver=7
-pkgrel=0
+pkgver=6
+pkgrel=2
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
@@ -58,7 +58,7 @@ nonfree_firmware() {
 }
 
 sha512sums="
-18e829f0eddcc8a0e64eb5081afa324da060de98478ac17d6199c1cecb4d2e984212c8681e8c75b4552d4dd5bbffff2f60dc8be1884b6ef23daa58319d4274fc  deviceinfo
+cbeb0f1fdf4357763eae7ede0b28923ae39c18aa187894baa778bdb20afa728aa97cad63b957d799ffcd1130ae40c3b796e293a2a1c97d9a68bf132ec6ce6d13  deviceinfo
 e12a68f919182cb4e6812a5dd13fce8dc15266d2ac16aa5f0a31034f111cb403c020ebaaa4d94309f4baf2f71379327c57c08029e27c506d152695e9a2b04b2b  modules-initfs
 e53ca475830930ecfc1fd537702e850e2abcb66fbed521cb6c3a2918d762649254bd0244ec93a47b20dfc593ec3afc9bdebdec1759a7bc96dcbe4800f40893da  90-tap-to-click.conf
 6fe67c8f2e09e3e37297eebaf2a86a32671923a5fd4d18e5aeb10e580fb998e4ddb4a691531a0c8f4b4e70c6f0f7e91008dd836ffca8026d59862c6e829fd996  Peach-Pit-I2S-MAX98090.conf

device/community/device-google-peach-pit/deviceinfo

@@ -17,7 +17,6 @@ deviceinfo_external_storage="true"
 deviceinfo_screen_width="1366"
 deviceinfo_screen_height="768"
 deviceinfo_gpu_accelerated="true"
-deviceinfo_disable_dhcpd="true"
 
 # Bootloader related
 deviceinfo_flash_method="none"

device/community/device-google-snow/APKBUILD

@@ -2,8 +2,8 @@
 # Maintainer: Jenneron <jenneron@protonmail.com>
 pkgname=device-google-snow
 pkgdesc="Samsung Chromebook"
-pkgver=7
-pkgrel=0
+pkgver=6
+pkgrel=2
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
@@ -56,7 +56,7 @@ sway() {
 }
 
 sha512sums="
-475bc214db10d233137e8d9a43bfc4ea0c58e8938e9536fddab6c1d57ed133f37aa3a8ffce196df876af17e7817ccf6894947deaaa624bf3c161298196d866f6  deviceinfo
+8f12e32794f68ecc312ef9edde380bffc73f931cf210c8e0a5552f47b325f0f6648a95986ae17ad0a32245308dfd3c1e381377b67e6b96eeae18f97b83621f92  deviceinfo
 e12a68f919182cb4e6812a5dd13fce8dc15266d2ac16aa5f0a31034f111cb403c020ebaaa4d94309f4baf2f71379327c57c08029e27c506d152695e9a2b04b2b  modules-initfs
 8a8f593694528a9323ef4a0aff7e9c6ad45608957eb042d425663f682885c2f95eb01db4fe87b7c43a90de48f3e5f8b10cab4b13c547b5b0d31b924fcb083cad  HiFi.conf
 b163535da7626e3866faa45768c3888f69f90c98d694650e16a7594a03eb91391e166931eb487901217d983bb2dc4e49b99a2a5531740a7d87f8f4f5c3d0cf59  Snow-I2S-MAX98090.conf

device/community/device-google-snow/deviceinfo

@@ -17,7 +17,6 @@ deviceinfo_external_storage="true"
 deviceinfo_screen_width="1366"
 deviceinfo_screen_height="768"
 deviceinfo_gpu_accelerated="true"
-deviceinfo_disable_dhcpd="true"
 
 # Bootloader related
 deviceinfo_flash_method="none"

device/community/device-google-trogdor/APKBUILD

@@ -2,8 +2,8 @@
 # Maintainer: Jenneron <jenneron@protonmail.com>
 pkgname=device-google-trogdor
 pkgdesc="Google Trogdor Chromebooks"
-pkgver=2
-pkgrel=0
+pkgver=1
+pkgrel=5
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -44,6 +44,6 @@ nonfree_firmware() {
 
 
 sha512sums="
-e2eee558c89272358b4531ef9d7b7cefc937702c17985c3067181029a7f2c8545f68c3634d515fee6d12229d09f52b6f2b4ae804449f37c11b3aa9e5bcfaaced  deviceinfo
+9c3357ad83bbcb3e3fb5507c35a8eba1ed07c7c054a91f56a9f97cdde7219b624c20ead95da1a4170f3e1889b0d6ed84eecc9eb4f8d28954254b3eaccdd4deb3  deviceinfo
 ef0257928f28aff25e6c625fabfd0942b01d4d86f1b523212ca825cf80f8b7a6c20ff17bfb02cb19f2a5d8787326ba22ad560a957c8d3c38b9ec70f1e16f9117  modules-initfs
 "

device/community/device-google-trogdor/deviceinfo

@@ -16,7 +16,6 @@ deviceinfo_chassis="convertible"
 deviceinfo_keyboard="true"
 deviceinfo_external_storage="true"
 deviceinfo_gpu_accelerated="true"
-deviceinfo_disable_dhcpd="true"
 
 # Bootloader related
 deviceinfo_flash_method="none"

device/community/device-google-veyron/APKBUILD

@@ -2,8 +2,8 @@
 # Maintainer: Jenneron <jenneron@protonmail.com>
 pkgname=device-google-veyron
 pkgdesc="Google Veyron Chromebooks"
-pkgver=6
-pkgrel=0
+pkgver=5
+pkgrel=6
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
@@ -53,6 +53,6 @@ nonfree_firmware() {
 
 
 sha512sums="
-851e0eb0b32d81a4aa2a63f7722f92bf221e49c1822a4fd179e997cd0e0231bb6f79c0b67ed12387890193617fd514862ac3aa6efacfc267e142acdd1f96fc1d  deviceinfo
+5c63bb90fce9fdbc61eedcd6fe0772e731baf0262ec195bc946f8d24cbea630b1e487e030d0557cea9029ca4abfc0d6724b5e21a0fd9e9f3f22d78baa7eec535  deviceinfo
 be3e804fa538d9d377c637094dcf95e503e8a156fa71676a9e78abc0e290595dfdaa70b5642df721ebcdd3daa04d14e0c61d9bab6f78cb1dbd669404abc3a56d  modules-initfs
 "

device/community/device-google-veyron/deviceinfo

@@ -16,7 +16,6 @@ deviceinfo_chassis="convertible"
 deviceinfo_keyboard="true"
 deviceinfo_external_storage="true"
 deviceinfo_gpu_accelerated="true"
-deviceinfo_disable_dhcpd="true"
 
 # Bootloader related
 deviceinfo_flash_method="none"

device/community/device-google-x64cros/APKBUILD

@@ -4,8 +4,8 @@
 # Co-Maintainer: Jenneron <jenneron@protonmail.com>
 pkgname=device-google-x64cros
 pkgdesc="Google Chromebooks with x64 CPU"
-pkgver=8
-pkgrel=1
+pkgver=7
+pkgrel=3
 url="https://postmarketos.org"
 license="MIT"
 arch="x86_64"
@@ -15,7 +15,6 @@ depends="
 	depthcharge-tools
 	postmarketos-base
 	postmarketos-cros-common
-	postmarketos-initramfs-minimal
 	systemd-boot
 	"
 makedepends="devicepkg-dev"
@@ -56,6 +55,6 @@ kernel_lts() {
 }
 
 sha512sums="
-6ab370ce8de6ce77d255ad347563afa8314bdde1d54ba51970de3b3739bb52098284beead99485e416c9af5c8b53811f5286c1cd561896480526a892f982bdad  deviceinfo
+9260fe8df64e284f137f77844562d2f08e28d72d36a50772b0216cd7d68eeb41d0cdb650d0f0d1ad04c3906991aba0561c36813a2beb62cedf16f616c9ccedb9  deviceinfo
 1b3bbfcdc6642488304653aef996dddf7a354e7279f2c735ac7aec404e598948423630fcaa2cac87e2c0aef033ecfc57a7a91154f9dac9a85411db7bad62e677  modules-initfs
 "

device/community/device-google-x64cros/deviceinfo

@@ -13,7 +13,6 @@ deviceinfo_gpu_accelerated="true"
 deviceinfo_chassis="laptop"
 deviceinfo_keyboard="true"
 deviceinfo_external_storage="true"
-deviceinfo_disable_dhcpd="true"
 
 # Bootloader related
 deviceinfo_flash_method="none"

device/community/device-lenovo-a6000/APKBUILD

@@ -4,7 +4,7 @@
 pkgname=device-lenovo-a6000
 pkgdesc="Lenovo A6000"
 pkgver=8
-pkgrel=1
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -46,7 +46,7 @@ phosh() {
 }
 
 sha512sums="
-4939c4931addcfc05dbd5ede8083385e554c51c90ce5b375291fc57f245bfccc71054c9ae66c421bd5a39fe8f4449b58450246b667af0cda84399b5d65dc2173  deviceinfo
+09836576cf3dc54afa8f7d8f3d5117ba08fa2dbc58b792062a3a55bae73041c8adbc934682e96d1dc98dd2e1d14fa1fe175801f0e387ea747b1d3df076cc0bc8  deviceinfo
 d433b8376b6e89daf4eac2073cb33627bdcacdcd48b6d4990cc698627dcf3c951bb1874951bc4631ea6b89d22c6002b9d02b77ff24992106061fcecc22fa5f25  modules-initfs
 10d4ee62e5f7a9e4c368c460dd4c3ef282476e47d8cc40e4e3b83e971d04c493b801e5628ebdfe721f869e2fd68c521cf192cba1a973c8e03a61445534a28811  phoc.ini
 "

device/community/device-lenovo-a6000/deviceinfo

@@ -21,7 +21,7 @@ deviceinfo_getty="ttyMSM0;115200"
 
 # Bootloader related
 deviceinfo_flash_method="fastboot"
-deviceinfo_kernel_cmdline="earlycon console=ttyMSM0,115200"
+deviceinfo_kernel_cmdline="earlycon console=ttyMSM0,115200 PMOS_NO_OUTPUT_REDIRECT"
 deviceinfo_generate_bootimg="true"
 deviceinfo_generate_extlinux_config="true"
 deviceinfo_flash_offset_base="0x80000000"

device/community/device-lenovo-a6010/APKBUILD

@@ -4,7 +4,7 @@
 pkgname=device-lenovo-a6010
 pkgdesc="Lenovo A6010"
 pkgver=8
-pkgrel=1
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -46,7 +46,7 @@ phosh() {
 }
 
 sha512sums="
-f367b90ebbf89896884d3cc34c559cc3d36b6e4187aeb52497c23b0cb133c25163751d0013aa37109a441c76339f13de829fc01ff9537dc9fcdf53ae0066bd24  deviceinfo
+49d72c36be47a98ae4474e5f21f3eb96a069d085639d3fbcaa738ee05ac85ab47b7f9d229185a1dbe338489d5d091164f5c904065bdfdb2703aa817b19ecf5ab  deviceinfo
 258464e46872cf221f7ac367766f9b8ead5d5dccbd71f3df5a5555127a42448906247ff2519d1750eec53b3ed37ae96c2409369d7cb8e2fffeb202a8f69bba53  modules-initfs
 10d4ee62e5f7a9e4c368c460dd4c3ef282476e47d8cc40e4e3b83e971d04c493b801e5628ebdfe721f869e2fd68c521cf192cba1a973c8e03a61445534a28811  phoc.ini
 "

device/community/device-lenovo-a6010/deviceinfo

@@ -21,7 +21,7 @@ deviceinfo_getty="ttyMSM0;115200"
 
 # Bootloader related
 deviceinfo_flash_method="fastboot"
-deviceinfo_kernel_cmdline="earlycon console=ttyMSM0,115200"
+deviceinfo_kernel_cmdline="earlycon console=ttyMSM0,115200 PMOS_NO_OUTPUT_REDIRECT"
 deviceinfo_generate_bootimg="true"
 deviceinfo_generate_extlinux_config="true"
 deviceinfo_flash_offset_base="0x80000000"

device/community/device-microsoft-surface-rt/APKBUILD

@@ -4,7 +4,7 @@
 pkgname=device-microsoft-surface-rt
 pkgdesc="Microsoft Surface RT"
 pkgver=7
-pkgrel=1
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
@@ -61,6 +61,6 @@ x11() {
 }
 
 sha512sums="
-cdaa85adbeff8fe72bc4e4594688937a4bfab20bd3458e2e3b4e8bd2c53f6160c19af3e1de5cf8568f1e6a050d289454c786a50c8480a2e6217ae737b2f53364  deviceinfo
+4585b96c10b86012d2ce33c623adf4f64a77219372a17e79ff3617bed1b18617f0965a4d9ea859dc7ecc6892970cbc9327936ce9413787e991d77ad57ec94ba6  deviceinfo
 67ff4306270b7e6e292ddb48ac5fcb1472840d8eaa412f9cd989442fb20139ee3c844fd1ca5c5b923c7980403d945999a77fc6617127059e56e22bdc8dca2bf8  modules-initfs
 "

device/community/device-microsoft-surface-rt/deviceinfo

@@ -17,7 +17,7 @@ deviceinfo_external_storage="true"
 # Bootloader related
 deviceinfo_flash_method="none"
 deviceinfo_dtb="tegra30-microsoft-surface-rt-efi"
-deviceinfo_kernel_cmdline="cpuidle.off=1 console=ttyS0,115200 PMOS_FORCE_PARTITION_RESIZE"
+deviceinfo_kernel_cmdline="cpuidle.off=1 console=ttyS0,115200 PMOS_NO_OUTPUT_REDIRECT PMOS_FORCE_PARTITION_RESIZE"
 deviceinfo_generate_grub_config="true"
 deviceinfo_generate_bootimg="false"
 deviceinfo_boot_filesystem="fat32"

device/community/device-motorola-harpia/APKBUILD

@@ -3,7 +3,7 @@
 pkgname=device-motorola-harpia
 pkgdesc="Motorola Moto G4 Play"
 pkgver=9
-pkgrel=1
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -41,6 +41,6 @@ nonfree_firmware() {
 }
 
 sha512sums="
-31eba51ab586af61d0ea0efb2e0f0a8533524254e864d59bc2142ba30c6b5745a46a00314fbf86a8b5bcfeee2d42b218c27d2e8aa5ed19f24e50468860999e56  deviceinfo
+aebe4b604357b068fb8fd2c67ba68db12f0d81a807afddb58fbd92706c29100753656f8a1f7f33bea19540e24fe2a6e0bf47d3e608a6c817d41647c62a8fcca9  deviceinfo
 525a3e20672a7dff26b885b99ee157e0ece33efa10db34c90aed45dc47d7f1c2e90d7082dc84f2724892f199b5adaca04d5864f0aa1d1e4b8ea695f840346d60  modules-initfs
 "

device/community/device-motorola-harpia/deviceinfo

@@ -21,7 +21,7 @@ deviceinfo_getty="ttyMSM0;115200"
 
 # Bootloader related
 deviceinfo_flash_method="fastboot"
-deviceinfo_kernel_cmdline="earlycon console=ttyMSM0,115200"
+deviceinfo_kernel_cmdline="earlycon console=ttyMSM0,115200 PMOS_NO_OUTPUT_REDIRECT"
 deviceinfo_generate_bootimg="true"
 deviceinfo_generate_extlinux_config="true"
 deviceinfo_flash_offset_base="0x80000000"

device/community/device-nokia-n900/APKBUILD

@@ -2,7 +2,7 @@
 # Maintainer: Sicelo <absicsz@gmail.com>
 # Co-Maintainer: Danct12 <danct12@disroot.org>
 pkgname=device-nokia-n900
-pkgver=28
+pkgver=27
 pkgrel=0
 pkgdesc="Nokia N900"
 url="https://postmarketos.org"
@@ -238,7 +238,7 @@ e440ed7a3070c17e003b86b72dbe6d8194d01b577ca8dd56dd066f216b6dda32bb965c780950f178
 134f51d20decc0c63ab08010931a0b410b70d2f85bf6899f2ff137b1680f59f706a6287d01f5fbb41fa5309125df75a430d0783149bd1a6a1bca07d22f4f6a21  proxishot.sh
 fc21e3b7e045055c080a7f7ffb0cd4140b63a02690e92c8370dbccbef506fe271ee9584ac9f14725b8bc9fd6e74e7fafde589d2360f44491c614837472d8ad53  deviceprofile.sh
 5dab895c34599bf233635463271ea8308d434c97789efe931eec24870c3b4688fe48ca3b7cdc66e5c1a705940d042b9f18f26420b60f22e1cfad1854e97f8687  start_hook.sh
-7bd9dd2468ba6a0fc8e5e7118ecfc4b4ca2f0691190473e12770a857e4082ab2958d0a3a8ee2f0276ed83776aff3b5fff0099980c265d674b90d2ff3108f660d  uboot-script.cmd
+239a54ae5c5effb53ccf4d658652c0462da57604b16b77a63627a17caa171caf82e3d1769f9c5afea8756415acbbf3b73db9b57715fce6c70ea3f29e5c6ac84a  uboot-script.cmd
 9e72035c88632d12895534e5aa5746f2c130c7dcdafa8702748d62b71ed0e1b5911b6e1f07f9b9e39b6072bbb662f66aead585baa1dcacb7d8c8953ca89b6762  10-nokia-modem.rules
 03079030237440080e833dbfeff80327c1ad6a8129c6c730b401a3052cd00a986783ec3473a526b14ae73ba1f20653b4c7b2a6590839bfe6cc156bbbc3b7bb74  80-feedbackd-twl4030.rules
 c6012aef28b096141b924fced226ec99fb93eb53b69c064a8887d8fecdf8dc08a3ba3db399e18d88374c6ef4c59013a30699c7e4d76e5cb771040582573a0527  90-touchscreen-dev.rules

device/community/device-nokia-n900/uboot-script.cmd

@@ -2,7 +2,7 @@ setenv mmcnum 0
 setenv mmcpart 1
 setenv mmctype ext2
 setenv setup_omap_atag 1
-setenv bootargs init=/init.sh rw console=tty0 console=ttyS2 PMOS_FORCE_PARTITION_RESIZE
+setenv bootargs init=/init.sh rw console=tty0 console=ttyS2 maxcpus=0 PMOS_NO_OUTPUT_REDIRECT PMOS_FORCE_PARTITION_RESIZE
 setenv mmckernfile /uImage
 setenv mmcinitrdfile /uInitrd
 setenv mmcscriptfile

device/community/device-oneplus-enchilada/APKBUILD

@@ -3,7 +3,7 @@
 
 pkgname=device-oneplus-enchilada
 pkgdesc="OnePlus 6"
-pkgver=15
+pkgver=14
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -16,7 +16,6 @@ depends="
 	soc-qcom-sdm845
 	soc-qcom-sdm845-ucm
 	soc-qcom-sdm845-qbootctl
-	systemd-boot
 "
 makedepends="devicepkg-dev"
 source="
@@ -67,7 +66,7 @@ pmtest() {
 
 sha512sums="
 e957b7b0ed219eaa56be6c6b976b60886f73970703fdebf045800154ee652affee4e19654b3ac4244b29bcf6760ad3db6cb87143dc9c4673e905800d751103d1  10-unl0kr.conf
-28dba3b6b65ba8528ecf411b5d6c2e7e915594c98089194c57a576db55a005bff97dcb79f80914e63cbfad28c10f54fe66430500c0ebe35de421819963b52605  deviceinfo
+83fc698ebeda6245abc2a653eeff97b3b996d06dd7731386a07d102937f9b005c7277e0dece05ff359d9ff109a1d9ed7791fc510b146354df179804aadb5642c  deviceinfo
 c8d3026e9f803ea823e35f83dab66fa8545e99af9655576476c194567113084d78200feab46f84983a2dad608ca55c0a4a66e36406c6d64023c0aec59307d146  hexagonrpcd.confd
 ea8709aa214cffaefb1d486c0c47044537446faebff16efb3b015623f043f730b7121e401c676e43aa8868bd6c630fc8a2d7dbf5fb082490e9b5493e0405b66d  modules-initfs
 fe9871c325a38c0cadc9631870801ec15ab9f5b786ee854325b93eb3d23e7d8b1ac4f1075572ffcd225d8ec514dec09b986972ddff12a89260c0218af6de7887  q6voiced.conf

device/community/device-oneplus-enchilada/deviceinfo

@@ -17,16 +17,11 @@ deviceinfo_screen_width="1080"
 deviceinfo_screen_height="2280"
 
 # Bootloader related
-deviceinfo_flash_method="fastboot-bootpart"
-# Where to flash boot.img, or in our case where to flash the pmOS boot partition.
-# This is a bit confusing.
-deviceinfo_flash_fastboot_partition_kernel="system"
-deviceinfo_flash_fastboot_partition_system="userdata"
+deviceinfo_flash_method="fastboot"
 # FIXME: Console enabled to workaround a race condition with display initialisation
 # See https://gitlab.freedesktop.org/drm/msm/-/issues/46
 deviceinfo_kernel_cmdline="console=ttyMSM0,115200"
 deviceinfo_generate_bootimg="true"
-deviceinfo_generate_systemd_boot="true"
 deviceinfo_bootimg_qcdt="false"
 deviceinfo_bootimg_dtb_second="false"
 deviceinfo_flash_offset_base="0x00000000"

device/community/device-oneplus-fajita/APKBUILD

@@ -3,7 +3,7 @@
 
 pkgname=device-oneplus-fajita
 pkgdesc="OnePlus 6T"
-pkgver=15
+pkgver=14
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -16,7 +16,6 @@ depends="
 	soc-qcom-sdm845
 	soc-qcom-sdm845-ucm
 	soc-qcom-sdm845-qbootctl
-	systemd-boot
 "
 makedepends="devicepkg-dev"
 source="
@@ -67,7 +66,7 @@ pmtest() {
 
 sha512sums="
 e957b7b0ed219eaa56be6c6b976b60886f73970703fdebf045800154ee652affee4e19654b3ac4244b29bcf6760ad3db6cb87143dc9c4673e905800d751103d1  10-unl0kr.conf
-cc008924ba65b7bd02f9acb2452ce0ce7df0edc2c741959ec49cd907b29cfe16c40f3f6a0dc6b2c581c28f5cfbba1f7f8290eb83e7bf704e95d542233d9ad261  deviceinfo
+07e3d79715befccd1e7393908c06f88ac8468d1ce6cb96138e3a04e6f8274889db169f5daf05b04b633bcc9e85d11ea5c2017b84bc0ae86a8fad80b05794d0d8  deviceinfo
 6b5308471fcbb938ac00d6e9a3f8e61073bda1d608f2edf1a2aba4b256dd3f76b1ccee0873dcaa8dc4a8db304d433360a56fe447d70f57ba068428b75ddea236  hexagonrpcd.confd
 ea8709aa214cffaefb1d486c0c47044537446faebff16efb3b015623f043f730b7121e401c676e43aa8868bd6c630fc8a2d7dbf5fb082490e9b5493e0405b66d  modules-initfs
 fe9871c325a38c0cadc9631870801ec15ab9f5b786ee854325b93eb3d23e7d8b1ac4f1075572ffcd225d8ec514dec09b986972ddff12a89260c0218af6de7887  q6voiced.conf

device/community/device-oneplus-fajita/deviceinfo

@@ -17,16 +17,11 @@ deviceinfo_screen_width="1080"
 deviceinfo_screen_height="2340"
 
 # Bootloader related
-deviceinfo_flash_method="fastboot-bootpart"
-# Where to flash boot.img, or in our case where to flash the pmOS boot partition.
-# This is a bit confusing.
-deviceinfo_flash_fastboot_partition_kernel="system"
-deviceinfo_flash_fastboot_partition_system="userdata"
+deviceinfo_flash_method="fastboot"
 # FIXME: Console enabled to workaround a race condition with display initialisation
 # See https://gitlab.freedesktop.org/drm/msm/-/issues/46
 deviceinfo_kernel_cmdline="console=ttyMSM0,115200"
 deviceinfo_generate_bootimg="true"
-deviceinfo_generate_systemd_boot="true"
 deviceinfo_bootimg_qcdt="false"
 deviceinfo_bootimg_dtb_second="false"
 deviceinfo_flash_offset_base="0x00000000"

device/community/device-pine64-pinebookpro/APKBUILD

@@ -3,7 +3,7 @@
 pkgname=device-pine64-pinebookpro
 pkgdesc="PINE64 Pinebook Pro"
 pkgver=16
-pkgrel=6
+pkgrel=5
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -60,7 +60,7 @@ nonfree_firmware() {
 	mkdir "$subpkgdir"
 }
 sha512sums="
-7b3cd3ff2af954d07e88cca043a9975e74236bb49454bbcff8eaed23d822560ba2200adc88373dc2a0e5f130b8f90fd1c522f7b25171325d8e41e75c4b7bfba5  deviceinfo
+7ebb7e00ae1566fd4c176839c4cd6501f237b577e8db1180aa9934d70101807f8f9b513e529da3f0e96b73d682708b1f51a94430bc90d655f0d7ac059b076a04  deviceinfo
 6e3d97855a1f898db46b87ae1eb190d23d841fcb72332fcac4d11cd27c8f7d50eb8fd73007ed0447f106d19ff2e0fc1f34da1baf890e1465135dd692d65df2ba  modules-initfs
 2abfa31fa56028339efc6d2b6cb838f310990d7110ac4dd996bc4cfcf90f0a8770e70f28f77f7b6929d110e494bc33731302f16b9717729f991c2732be0731d5  nvme-powersave.initd
 0fd7580e197e409978c219726af627cabe347404ee826e32892b61f3da1775b0fd81f8ed5e9a0f0bfaad87faa434d7a73ddaebf475ed0ad8fdcef6690cd692d3  wlan-powersave-off.start

device/community/device-pine64-pinebookpro/deviceinfo

@@ -24,7 +24,7 @@ deviceinfo_dev_internal_storage_repartition="true"
 
 # Bootloader related
 deviceinfo_flash_method="none"
-deviceinfo_kernel_cmdline="console=tty0 console=ttyS2,1500000n8 panic=10 coherent_pool=1M video=HDMI-A-1:1920x1080@60 video=eDP-1:1920x1080@60 loglevel=5 PMOS_FORCE_PARTITION_RESIZE fw_devlink=off nvme_core.default_ps_max_latency_us=5500 pcie_aspm.policy=performance"
+deviceinfo_kernel_cmdline="console=tty0 console=ttyS2,1500000n8 panic=10 coherent_pool=1M video=HDMI-A-1:1920x1080@60 video=eDP-1:1920x1080@60 loglevel=5 PMOS_NO_OUTPUT_REDIRECT PMOS_FORCE_PARTITION_RESIZE fw_devlink=off nvme_core.default_ps_max_latency_us=5500 pcie_aspm.policy=performance"
 deviceinfo_generate_extlinux_config="true"
 deviceinfo_sd_embed_firmware="u-boot/pine64-rockpro64/u-boot-rockchip.bin:32"
 deviceinfo_boot_part_start="32768"

device/community/device-pine64-pinephonepro/APKBUILD

@@ -3,7 +3,7 @@
 pkgname=device-pine64-pinephonepro
 pkgdesc="PINE64 PinePhone Pro"
 pkgver=4
-pkgrel=1
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -138,7 +138,7 @@ x11() {
 sha512sums="
 2d68ffe143f633a86670f30e45dbad1cc313f219f22b7cd3319ab44bb7209c20cb29f2ff2c60c92390154af9c9a6815c4186be555364cf31552005eba024c0e7  51_keyboard.gschema.override
 98e9dcfb36dd5843ff441b148e3bffb70757c59601c5f01f55a584e8f017c7ca73f2275c1bff46e4236dd8174df36a43d10abf9b8dadee988b962036846dc6ed  90-modem-eg25.rules
-38e7111dd8ea40f52ba7f185ab58ff37d50619ae2df2f104cb3a84aba5ab082409fae3721ced5834f698f7f2766e98af86e9315ac31e2189c6936f92b7374450  deviceinfo
+aa33c497b145f0e840ccf646814cc7f53c49e7472c013b3cb951614766d568e70578869305dfd5bbc87490927e2b5b5798437b5cf31efe7baca8089f0b7b7771  deviceinfo
 3ab1a9482d97739b03299f9237d15cb1d1d76ca2298bc6c1b4d1214590464cb13139d1a9c98c3eb7761ef8a5db060d5e365b38efcac57ed9ae34a1d12657e3f5  modules-initfs
 c5006c38828eb519917d57756f7831c4552feffef2d4922a384073f6a551535f615ad397d784e313818e0b943e1f6212bcca0aff9ce37da60b29547b1631f24b  modemmanager.conf
 43f67e94491791685cdbb4874bb3034b1d297bdf3d23e7405c45ba8c58de72b4fb6a9943b79f46ef7b8f4dbc4d9db254ebec8eb3453d720a5a8fad277c6a9d88  ppkb.sh

device/community/device-pine64-pinephonepro/deviceinfo

@@ -24,7 +24,7 @@ deviceinfo_dev_internal_storage_repartition="true"
 
 # Bootloader related
 deviceinfo_flash_method="none"
-deviceinfo_kernel_cmdline="console=tty0 earlycon=uart8250,mmio32,0xff1a0000 console=ttyS2,115200 panic=10 coherent_pool=1M loglevel=1 mem_sleep_default=s2idle PMOS_FORCE_PARTITION_RESIZE fw_devlink=off"
+deviceinfo_kernel_cmdline="console=tty0 earlycon=uart8250,mmio32,0xff1a0000 console=ttyS2,115200 panic=10 coherent_pool=1M loglevel=1 mem_sleep_default=s2idle PMOS_NO_OUTPUT_REDIRECT PMOS_FORCE_PARTITION_RESIZE fw_devlink=off"
 deviceinfo_generate_grub_config="true"
 deviceinfo_boot_filesystem="fat32"
 deviceinfo_partition_type="gpt"

device/community/device-pine64-rockpro64/APKBUILD

@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=device-pine64-rockpro64
 pkgver=3
-pkgrel=8
+pkgrel=7
 pkgdesc="PINE64 ROCKPro64"
 url="https://postmarketos.org"
 license="MIT"
@@ -28,5 +28,5 @@ nonfree_firmware() {
 }
 
 sha512sums="
-e215cfae2d0e42ebea9c9425ba50ffdfd96512587b6bd96bbda4f1beca77f22b79b62795818b3635a7d4cdfad120249bf3a04ccfdb4af72d228f0e3c26efee65  deviceinfo
+75388e8dd877db42b5ffa7148e667487f58785ef1112dda3dd5e34122f24870887de4e38aa9a861ac454e6eaa6b3a3b91583e92548b349c2e7919408565e4a65  deviceinfo
 "

device/community/device-pine64-rockpro64/deviceinfo

@@ -21,5 +21,5 @@ deviceinfo_screen_height="1080"
 deviceinfo_flash_method="none"
 deviceinfo_sd_embed_firmware="u-boot/rockpro64-rk3399/u-boot-rockchip.bin:32"
 deviceinfo_boot_part_start="32768"
-deviceinfo_kernel_cmdline="console=tty0 console=ttyS2,1500000n8 panic=10 coherent_pool=1M video=HDMI-A-1:1920x1080@60 video=eDP-1:1920x1080@60 loglevel=5"
+deviceinfo_kernel_cmdline="console=tty0 console=ttyS2,1500000n8 panic=10 coherent_pool=1M video=HDMI-A-1:1920x1080@60 video=eDP-1:1920x1080@60 loglevel=5 PMOS_NO_OUTPUT_REDIRECT"
 deviceinfo_generate_extlinux_config="true"

device/community/device-samsung-a3/APKBUILD

@@ -5,7 +5,7 @@
 pkgname=device-samsung-a3
 pkgdesc="Samsung Galaxy A3 (2015)"
 pkgver=12
-pkgrel=1
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -57,7 +57,7 @@ phosh() {
 }
 
 sha512sums="
-b0bf0480159db976c1ba827d65cf68400dad255ff0f2627fd9ff74673993d605b8a1059fac1e7f11e4d565e2072dcf1760e61e04f816880bafc722a4b725fc31  deviceinfo
+a2437b8c6f420d4c67f57fd4940974e3cacfd86de9727a72cc524e17837aa7860181da401b501f12980b8c02ec66ef92d4f276a21daa1d64ebef2a40fb5e62ca  deviceinfo
 3754688b2a61c204f37944d700b6fc273f68a01e25d444a3c3f2dd2531d8538650a2e571657e18e7a96a2db96b19f2f738d6f465bde477efd66ab31a78edfb91  modules-initfs
 e8f734a2f8d154813dbb493f0d58af50a7f624ffed41967a81493b975a6211efc6d30743b23825562cfd126791cbdd3348bfbed32eeece9b8acec0a37c3c51b6  phoc.ini
 "

device/community/device-samsung-a3/deviceinfo

@@ -23,7 +23,7 @@ deviceinfo_getty="ttyMSM0;115200"
 
 # Bootloader related
 deviceinfo_flash_method="fastboot"
-deviceinfo_kernel_cmdline="earlycon console=ttyMSM0,115200"
+deviceinfo_kernel_cmdline="earlycon console=ttyMSM0,115200 PMOS_NO_OUTPUT_REDIRECT"
 deviceinfo_generate_bootimg="true"
 deviceinfo_generate_extlinux_config="true"
 deviceinfo_flash_offset_base="0x80000000"

device/community/device-samsung-a5/APKBUILD

@@ -4,7 +4,7 @@
 pkgname=device-samsung-a5
 pkgdesc="Samsung Galaxy A5 (2015)"
 pkgver=11
-pkgrel=1
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -42,6 +42,6 @@ nonfree_firmware() {
 }
 
 sha512sums="
-2fc9ed97981cc439046475eef8eb6d358bfde571242b14763cf4223c076cbda9ee861221e6978056e65a09020bfaeeb7734e22782701a2bcb134ef113467dc9a  deviceinfo
+72cbc4f8e5ec234b5a9b7eb8da40cdabaf3dbe0cee5665aab5107b1795897c30b88a3ec32e3bc4327bf1a512a64fe09a5c1b79baaee9aa2e19ea9d04381550b8  deviceinfo
 13ba472485d757332b46a21fe771ae2779d0c5f1e997b6e51a4c0acce902256f0a2c724828251acf0150d7de919b691053de59041fea0b983569a004dcb75256  modules-initfs
 "

device/community/device-samsung-a5/deviceinfo

@@ -23,7 +23,7 @@ deviceinfo_getty="ttyMSM0;115200"
 
 # Bootloader related
 deviceinfo_flash_method="fastboot"
-deviceinfo_kernel_cmdline="earlycon console=ttyMSM0,115200"
+deviceinfo_kernel_cmdline="earlycon console=ttyMSM0,115200 PMOS_NO_OUTPUT_REDIRECT"
 deviceinfo_generate_bootimg="true"
 deviceinfo_generate_extlinux_config="true"
 deviceinfo_flash_offset_base="0x80000000"

device/community/device-samsung-e7/APKBUILD

@@ -3,7 +3,7 @@
 pkgname=device-samsung-e7
 pkgdesc="Samsung Galaxy E7"
 pkgver=2
-pkgrel=1
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
@@ -37,6 +37,6 @@ nonfree_firmware() {
 }
 
 sha512sums="
-a07a79468307db2a23ef0daead5c49d588e64a42b2806a5051eb422e693cb176cf16092f384aacd08d53e34be828725766d75f94d2b88cac2c31932051bd2ebc  deviceinfo
+eac74a530dfec9136cbce8fbfb4e4548416374609e3db26d7ebc05b2af8d2344f4120aca5dda98007ce6fb790554236ec077875dfa0e41ffbed56c1409dd252e  deviceinfo
 659b6cdc0e9be756cfae34031d407175356edc331a8d4f51fb70b0beea4f8067c5ded39e158054c02811df0964d967d3a790bfef99675ca2587ef867d02db8db  modules-initfs
 "

device/community/device-samsung-e7/deviceinfo

@@ -21,7 +21,7 @@ deviceinfo_getty="ttyMSM0;115200"
 
 # Bootloader related
 deviceinfo_flash_method="fastboot"
-deviceinfo_kernel_cmdline="earlycon console=ttyMSM0,115200"
+deviceinfo_kernel_cmdline="earlycon console=ttyMSM0,115200 PMOS_NO_OUTPUT_REDIRECT"
 deviceinfo_generate_bootimg="true"
 deviceinfo_generate_extlinux_config="true"
 deviceinfo_flash_offset_base="0x80000000"

device/community/device-samsung-grandmax/APKBUILD

@@ -3,7 +3,7 @@
 pkgname=device-samsung-grandmax
 pkgdesc="Samsung Galaxy Grand Max"
 pkgver=2
-pkgrel=1
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
@@ -37,6 +37,6 @@ nonfree_firmware() {
 }
 
 sha512sums="
-a7f7c5ef87b8bc6d6f8c732098342e8a91742a67978eb107e20cc839c5dedb8ce497bf1a9df143fe447e74936cfc6dfeecb4b25427c43278f0020ba1065dee2e  deviceinfo
+41bad63b5c0839357a608b2d56917eb8798bb8e6f260dcba0ba8b4e2f6faf7455406d18460ad9b33f112bd5f89ca5843c7327b6d52d29f640b35f3839b85f421  deviceinfo
 24b1b199ca26d902807038faa20b44d6060c039900df5c7aa263cdb22b35930e726c2bfd86e32b1f1dd6fa8ab3b57a6c8ff430ce9aae2dd04c04565ea56c8a43  modules-initfs
 "

device/community/device-samsung-grandmax/deviceinfo

@@ -21,7 +21,7 @@ deviceinfo_getty="ttyMSM0;115200"
 
 # Bootloader related
 deviceinfo_flash_method="fastboot"
-deviceinfo_kernel_cmdline="earlycon console=ttyMSM0,115200"
+deviceinfo_kernel_cmdline="earlycon console=ttyMSM0,115200 PMOS_NO_OUTPUT_REDIRECT"
 deviceinfo_generate_bootimg="true"
 deviceinfo_generate_extlinux_config="true"
 deviceinfo_flash_offset_base="0x80000000"

device/community/device-samsung-gt510/APKBUILD

@@ -3,7 +3,7 @@
 pkgname=device-samsung-gt510
 pkgdesc="Samsung Galaxy Tab A 9.7 (2015)"
 pkgver=6
-pkgrel=1
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -51,7 +51,7 @@ phosh() {
 }
 
 sha512sums="
-4a64cf8f1800a6a8de3ca4c61a40189377ce354e4ef2a8fdfe48002c7fd255d66b1bbb9112e9ba2a247847ac6e2e3147c94eb349c155cc3ead004153653e5d44  deviceinfo
+dda91e0c78a369450a9584f1404350a6bd09541ee498231382f50ebc02b85b9659a9fed1f3cfda4e766eebec48b2e610d0a67fb3ce580447be1cc2b92959da58  deviceinfo
 77e32266772a201ba42d91586dce32bd93ff81f1a49c5f5b157847e3107d0b2c9a2f0478b383416ca37ddfb820fe6c9147abe8ccd7e07ad704c3c4c9d4683f3a  modules-initfs
 6aedd5eeac4d21356678f5399f3f0946392c9a7477ac21d39b8e761133dc8ed67adb4966647314f71d5263483ab68cad92847dacff95ffa45eabfc33c9f405b5  pointercal
 ed612b090c1ee512fc257368082fe0c88ca6c98a9d673ece68593739c7a41b4f9dca5d9360de6f84d206f297feba480a9f1982301132e08a14a5ff920a2675a6  phoc.ini

device/community/device-samsung-gt510/deviceinfo

@@ -21,7 +21,7 @@ deviceinfo_gpu_accelerated="true"
 
 # Bootloader related
 deviceinfo_flash_method="fastboot"
-deviceinfo_kernel_cmdline="earlycon console=ttyMSM0,115200"
+deviceinfo_kernel_cmdline="earlycon console=ttyMSM0,115200 PMOS_NO_OUTPUT_REDIRECT"
 deviceinfo_generate_bootimg="true"
 deviceinfo_generate_extlinux_config="true"
 deviceinfo_flash_offset_base="0x80000000"

device/community/device-samsung-gt58/APKBUILD

@@ -3,7 +3,7 @@
 pkgname=device-samsung-gt58
 pkgdesc="Samsung Galaxy Tab A 8.0 (2015)"
 pkgver=6
-pkgrel=1
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -47,7 +47,7 @@ phosh() {
 }
 
 sha512sums="
-2e7363625b58da2fe036fc70538207a490d5b93a99c3d0c2835fab3114fe09b5e90a3b7583b8f62d8eea7af7910f963d0aa994483045d570f062449cc939fb13  deviceinfo
+eef08e96e77c1620f50a0296e709e9898a3313da2539632c3434c261d3790ab008b59bcb934a7d669ff9d50280692dc4adf9f6d81c88dc3faf3ef0710e4555d2  deviceinfo
 8071b89c832619c74d3bb50d638653aeaab99fee209cde425a7e8425d46d424bad9e8ab76d2d7360bd4c7ff093a712d51c3ca1b6086e1f70812224bbb115b04f  modules-initfs
 ed612b090c1ee512fc257368082fe0c88ca6c98a9d673ece68593739c7a41b4f9dca5d9360de6f84d206f297feba480a9f1982301132e08a14a5ff920a2675a6  phoc.ini
 "

device/community/device-samsung-gt58/deviceinfo

@@ -21,7 +21,7 @@ deviceinfo_getty="ttyMSM0;115200"
 
 # Bootloader related
 deviceinfo_flash_method="fastboot"
-deviceinfo_kernel_cmdline="earlycon console=ttyMSM0,115200"
+deviceinfo_kernel_cmdline="earlycon console=ttyMSM0,115200 PMOS_NO_OUTPUT_REDIRECT"
 deviceinfo_generate_bootimg="true"
 deviceinfo_generate_extlinux_config="true"
 deviceinfo_bootimg_mtk_mkimage="false"

device/community/device-samsung-manta/APKBUILD

@@ -3,8 +3,8 @@
 # Co-Maintainer: Alexandre Marquet <tb@a-marquet.fr>
 pkgname=device-samsung-manta
 pkgdesc="Google Nexus 10"
-pkgver=8
-pkgrel=0
+pkgver=7
+pkgrel=2
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
@@ -65,7 +65,7 @@ nonfree_firmware() {
 }
 
 sha512sums="
-9a566c5be457834f0cfa5750ced12ed1c26019dd24c311f4c8b3bf8b6417658c2868a6b2b6d2eb73b75a67e3bb707d8ae8016f80342d2b467d1e44eff7303269  deviceinfo
+63db3dc101ffd25ea43a8d6f02005cb1a21d7e2b0872d9142c5f5db11a1baea4639df3eacb10177ed5748769796fb4560148e48094a2bce36d745668ab4cac2e  deviceinfo
 e00c58936fa4340f8531538136ad028d002342a4399b68d26190b931831108007486257f9d8a48c3ed454696b45d176b1497d624c33ace21e61eba33ac7ce136  modules-initfs
 37a18d36e1e08ddcc605de73214dc02a9e7737f6a66b2e4be301fca816bbf3c2ba6b5ead1f12c745fd0fa019e2a8e959e4fc20386ad94ca7277d4c7d7f9fb703  100-wlan-mac.rules
 cfba48f87335ed8810004e02db165203149532ade7be206947f8195bbcc14d61bf3a898378566aca7295ba08784665f462442bf5e74d7f58b2cc62d996376317  wifi-macaddr.sh

device/community/device-samsung-manta/deviceinfo

@@ -7,7 +7,6 @@ deviceinfo_manufacturer="Samsung"
 deviceinfo_codename="samsung-manta"
 deviceinfo_year="2012"
 deviceinfo_arch="armv7"
-deviceinfo_getty="ttySAC2;115200"
 
 # Device related
 deviceinfo_chassis="tablet"

device/community/device-samsung-serranove/APKBUILD

@@ -3,7 +3,7 @@
 pkgname=device-samsung-serranove
 pkgdesc="Samsung Galaxy S4 Mini Value Edition"
 pkgver=13
-pkgrel=1
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
@@ -53,7 +53,7 @@ phosh() {
 }
 
 sha512sums="
-6c28cc461becf05428282016c6d0e1982e0d5e08484245877bd8674b667d2f1f6bb7db8a696a1493f3bf36511e2c84835b28435b3c395b10424edc51f33d512a  deviceinfo
+b9c9595c48a43a9f2470a01fb21e58d8f6c1b21680f27c28462fd3c4895b44b9793ac78fe57fbb2fdb5b9c7afee82ef831d6586fe239fc882a12087baee25bad  deviceinfo
 0c92ace5c522d039d356e8914c0e0237e11fc38dd05390ba7a89532be659707d2b499ae77b263c5984345caac11fd007bd6d1e279d3426126bc276a0bcd9348b  modules-initfs
 1bc90a1a67309b43435039332b2a1d7e606408c6429b3cb8991a57f53dd4de36fbe471481b6481fbdb098c3819344e8093dd8eab0d34eb3c091ab6d8abd5c087  phoc.ini
 "

device/community/device-samsung-serranove/deviceinfo

@@ -21,7 +21,7 @@ deviceinfo_getty="ttyMSM0;115200"
 
 # The panel on this device displays everything horizontally flipped for some reason (WTF Samsung?).
 # Make it look normal by instructing the kernel to flip the screen using video=540x960,reflect_x.
-deviceinfo_kernel_cmdline="earlycon console=ttyMSM0,115200 video=540x960,reflect_x"
+deviceinfo_kernel_cmdline="earlycon console=ttyMSM0,115200 video=540x960,reflect_x PMOS_NO_OUTPUT_REDIRECT"
 
 # Bootloader related
 deviceinfo_flash_method="fastboot"

device/community/device-shift-axolotl/APKBUILD

@@ -4,7 +4,7 @@
 
 pkgname=device-shift-axolotl
 pkgdesc="SHIFT6mq"
-pkgver=16
+pkgver=15
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -19,7 +19,6 @@ depends="
 	soc-qcom-sdm845-ucm
 	soc-qcom-sdm845-qbootctl
 	fwupd>=1.8.6
-	systemd-boot
 "
 makedepends="devicepkg-dev postmarketos-test"
 source="
@@ -68,7 +67,7 @@ pmtest() {
 }
 
 sha512sums="
-d2c636b8421cfac85cc607777dcd4ec1e6d4438f8050c7fd78e10d059243afb108fe28a21c9c2c4f67ee2eb08c93fdbfee1598fed6cfcb6c7565d00b9cb7a36c  deviceinfo
+e3f8a8d556a3c3134791693f2003aa64465b6971f7e353f547d6f1cbe3a0a0225a225e40ee4dbed951c0fa67f5a4636fd15953f6a3fe23d4f098fa1d39baa8f5  deviceinfo
 5966325963a3a62c919b5f39f7bc56e1785f192f50c40a6cc644a2fea0c9b8dd083e287ef43c59c2b9cab5c88d65266b0cd9cf1f5110924950bd250be5385622  hexagonrpcd.confd
 4dc84207c5ca84b33b74139c8b0c9ce5baa8bcb1068df9943c478c02abcf8daccb88e06af63f120a434a115e277008e899305bd5239d8669436cb269889040e9  modules-initfs
 2a3cbdad5aa91181d24a4e56e63986af6accf887c64fa4d1b6ddad1926e29050243c4b1e2fd892d38ca7c16e24dff8545a16552e5749ae31b6d01bf428468e51  q6voiced.conf

device/community/device-shift-axolotl/deviceinfo

@@ -19,16 +19,11 @@ deviceinfo_screen_width="1080"
 deviceinfo_screen_height="2160"
 
 # Bootloader related
-deviceinfo_flash_method="fastboot-bootpart"
-# Where to flash boot.img, or in our case where to flash the pmOS boot partition.
-# This is a bit confusing.
-deviceinfo_flash_fastboot_partition_kernel="super"
-deviceinfo_flash_fastboot_partition_system="userdata"
+deviceinfo_flash_method="fastboot"
 # FIXME: Console enabled to workaround a race condition with display initialisation
 # See https://gitlab.freedesktop.org/drm/msm/-/issues/46
 deviceinfo_kernel_cmdline="console=ttyMSM0,115200"
 deviceinfo_generate_bootimg="true"
-deviceinfo_generate_systemd_boot="true"
 deviceinfo_bootimg_qcdt="false"
 deviceinfo_bootimg_dtb_second="false"
 deviceinfo_flash_offset_base="0x00000000"

device/community/device-wileyfox-crackling/APKBUILD

@@ -4,7 +4,7 @@
 pkgname=device-wileyfox-crackling
 pkgdesc="Wileyfox Swift"
 pkgver=8
-pkgrel=1
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -45,7 +45,7 @@ nonfree_firmware() {
 }
 
 sha512sums="
-fb5ff1648128331dff061026e8c783a26f66dea4530de6ad3a27620e1aa0fc516e8c0b2f04fe3f6e9e5ce882b77b415d93981532c546129949caec802cdda883  deviceinfo
+4b34841808755b704b51997d63bee4c1bba3f7cdc5362767c3078a3824066887b4a9e63c468b89049c8572d912cf4b6bb849f7359727677bcbfebdb9d55cdeaf  deviceinfo
 31f926acffed502edca7d6a26c97c197970b842122df42a1ea5c63f2707b4375465eae77a754f5d58f556f55e1f5f421af21a92ca6165a3a4bacf55c5fbf7faf  modules-initfs
 a845e860cf43e58818bbffda62a9514e9a24527e14c485dd10944587b29dbf5864a1d3ec17d219c342512fac4bd6c25f5f0f4efb8883b8f383a79846759318ee  10-crackling-proximity.rules
 "

device/community/device-wileyfox-crackling/deviceinfo

@@ -21,7 +21,7 @@ deviceinfo_getty="ttyMSM0;115200"
 
 # Bootloader related
 deviceinfo_flash_method="fastboot"
-deviceinfo_kernel_cmdline="earlycon console=ttyMSM0,115200"
+deviceinfo_kernel_cmdline="earlycon console=ttyMSM0,115200 PMOS_NO_OUTPUT_REDIRECT"
 deviceinfo_generate_bootimg="true"
 deviceinfo_generate_extlinux_config="true"
 deviceinfo_flash_offset_base="0x80000000"

device/community/device-xiaomi-beryllium/APKBUILD

@@ -3,7 +3,7 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-xiaomi-beryllium
 pkgdesc="Xiaomi Poco F1"
-pkgver=12
+pkgver=11
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -71,7 +71,7 @@ kernel_ebbg() {
 }
 
 sha512sums="
-055a34dcdbfed0067c780ec9820ce751b60373bccf25d94592b80ab02569aa07d95ab64b4832261af8ef2ef2dd04b0546b582c7ac4af1be9b1908965a6efc2dd  deviceinfo
+3d6247e3d1d045fea5cec78dd2a41b4cf81a84fa27550e9502d44152fbfa8246302d5ecb52837a05652a599a6e11dd87acf656b2235dff9dd0717cedb7afd8ab  deviceinfo
 52079045a0c1f48628d891bf8867f5c1802152fce8e2c4bd787630f1f5e4c9b386bfc373e464cb053688350ac678dbc3c407a76a31a1ae700ca67764d0d384f1  hexagonrpcd.confd
 cab76675b9c48eb1ce0691b31667d17ee73ecf21439a7f7c9c2ba96344e3bf4ad713ebc685298d6e32ad589ba26f429cd6b0d200338b50d136ad1a29758e4214  modules-initfs.ebbg
 175a7d859956a029b91a1105b93c4113b07ab5cfe932294dd369808059ed03471625f64ce90e5146a65c0bb26417470d8f7c02e48dfacf2d016ce5b2c28cee76  modules-initfs.tianma

device/community/device-xiaomi-beryllium/deviceinfo

@@ -22,14 +22,10 @@ deviceinfo_screen_height="2246"
 deviceinfo_rootfs_image_sector_size="4096"
 
 # Bootloader related
-deviceinfo_flash_method="fastboot-bootpart"
-# Where to flash boot.img, or in our case where to flash the pmOS boot partition.
-# This is a bit confusing.
-deviceinfo_flash_fastboot_partition_kernel="system"
-deviceinfo_flash_fastboot_partition_system="userdata"
+deviceinfo_flash_method="fastboot"
 # FIXME: Console enabled to workaround a race condition with display initialisation
 # See https://gitlab.freedesktop.org/drm/msm/-/issues/46
-deviceinfo_kernel_cmdline="console=ttyMSM0,115200"
+deviceinfo_kernel_cmdline="console=ttyMSM0,115200 PMOS_NO_OUTPUT_REDIRECT"
 deviceinfo_generate_bootimg="true"
 deviceinfo_bootimg_qcdt="false"
 deviceinfo_bootimg_mtk_mkimage="false"

device/community/device-xiaomi-daisy/APKBUILD

@@ -3,7 +3,7 @@
 pkgname=device-xiaomi-daisy
 pkgdesc="Xiaomi Mi A2 Lite"
 pkgver=11
-pkgrel=3
+pkgrel=2
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -43,7 +43,7 @@ fake_goodix() {
 }
 
 sha512sums="
-327d6b49c6bc26725ed566ee968220cd7bbd5c8fd31b91705b6a02635daf5ce02567ba493a5bd431e0438339e004d42c7f4a57d4ed683274b94dc78668771d8d  deviceinfo
+493e74847984e51c4f788f1272351571411ba21dea6c3ad1fd2d669271e197bd6f55a8720e97c00480a30dd2803515384fe55362c90c5800fe8ef51f6c7c5521  deviceinfo
 7202f0a55dfe43348940412fc38e59c855594b070db8742419feadb2299086d5810107201a228b7137b7cc7a97c94afac95d81c0cd65c52f31dbcb619b0a4279  modules-initfs
 a2608b01b7b6e2dade694af355ff4f0f26cad49cf54bc332c77eb75d19fdc985f7f996fedb72753de447be0391deabf5fcea52406791d1e6e0d165703b63f145  90-device-xiaomi-daisy.rules
 "

device/community/device-xiaomi-daisy/deviceinfo

@@ -25,7 +25,7 @@ deviceinfo_swap_size_recommended="1024"
 deviceinfo_flash_method="fastboot"
 deviceinfo_generate_bootimg="true"
 deviceinfo_generate_extlinux_config="true"
-deviceinfo_kernel_cmdline="earlycon console=ttyMSM0,115200"
+deviceinfo_kernel_cmdline="earlycon console=ttyMSM0,115200 PMOS_NO_OUTPUT_REDIRECT"
 deviceinfo_bootimg_qcdt="false"
 deviceinfo_bootimg_dtb_second="false"
 deviceinfo_flash_offset_base="0x80000000"

device/community/device-xiaomi-markw/APKBUILD

@@ -3,7 +3,7 @@
 pkgname=device-xiaomi-markw
 pkgdesc="Xiaomi Redmi 4 Prime"
 pkgver=6
-pkgrel=2
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -31,6 +31,6 @@ package() {
 }
 
 sha512sums="
-dd33fe1f043da42f935a66b2d7bcf909bb65b737289574018917f3a5bb385f826c5ff441a808e442957ff9d3fdd1391e7f6381720c55062adcdc404d40754c1c  deviceinfo
+045c326d054120720b4971b10fc367fbb96b95621e6e1b5d453b8fbd90191bc7040adfda11215975d0e117487ca3882149fbee94bfd75b68896eb8b94578a68d  deviceinfo
 0cba88d7ede62dc7c47feefb27d10e58e4c93498bec97cd274a1d10c4f16dff06c5472ed555170e0392a57c9269cc50bf550523f41bf1ba6c600af533302574b  modules-initfs
 "

device/community/device-xiaomi-markw/deviceinfo

@@ -21,7 +21,7 @@ deviceinfo_getty="ttyMSM0;115200"
 
 # Bootloader related
 deviceinfo_flash_method="fastboot"
-deviceinfo_kernel_cmdline="earlycon console=ttyMSM0,115200"
+deviceinfo_kernel_cmdline="earlycon console=ttyMSM0,115200 PMOS_NO_OUTPUT_REDIRECT"
 deviceinfo_generate_bootimg="true"
 deviceinfo_generate_extlinux_config="true"
 deviceinfo_flash_offset_base="0x80000000"

device/community/device-xiaomi-mido/APKBUILD

@@ -2,7 +2,7 @@
 pkgname=device-xiaomi-mido
 pkgdesc="Xiaomi Redmi Note 4X"
 pkgver=7
-pkgrel=2
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -30,6 +30,6 @@ package() {
 }
 
 sha512sums="
-22dd70e5730b46bfdb257eb5e577da2d91d72d0335e2f591af66dfb318169ccdf813d800c2c7adb12cbf8063fc35bb33519577cc33b6322104cd52f75e035e99  deviceinfo
+815d228250a6783e02fa4107526bc2eae5428c05e48ed77a651980f00917a44e6bcecdac7835ad4a24320d4be2c510e2879a45a2b06accc3217d97d7bbf32e9e  deviceinfo
 9f534c76689728c3fa699ac8c854ca82815d5158a3675a70ef879ddbf140460977187dc3c1a799dadd0ab53d5a08b6275a1594a7b976eda983f3e78b2738a8be  modules-initfs
 "

device/community/device-xiaomi-mido/deviceinfo

@@ -21,7 +21,7 @@ deviceinfo_getty="ttyMSM0;115200"
 
 # Bootloader related
 deviceinfo_flash_method="fastboot"
-deviceinfo_kernel_cmdline="earlycon console=ttyMSM0,115200"
+deviceinfo_kernel_cmdline="earlycon console=ttyMSM0,115200 PMOS_NO_OUTPUT_REDIRECT"
 deviceinfo_generate_bootimg="true"
 deviceinfo_generate_extlinux_config="true"
 deviceinfo_bootimg_qcdt="false"

device/community/device-xiaomi-scorpio/APKBUILD

@@ -4,7 +4,7 @@
 pkgname=device-xiaomi-scorpio
 pkgdesc="Xiaomi Mi Note 2"
 pkgver=3
-pkgrel=12
+pkgrel=11
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -76,7 +76,7 @@ camera() {
 
 sha512sums="
 b033e7357c4ef91ba84f6f715e96e67637c2631d4746402f8a92333ba8974bbee7736a7bc081b0f84a84dc5b555a7db4dbb4f14f628bbfc42cbfa501c4f0ed36  30-gpu-firmware.files
-92a92e4c57b421034ba5009f2c9ee85db9c2e6a52656156028de613a42dc20185a7c803cae247d8ddc5fe0ed315ea780e0cda2d816653827283ef24822616e63  deviceinfo
+561b327a42004532fb0db9750f27aeb5aa6d97478666d0c63a939fc21c36cc2a81b41129588ff27e186fd3cdd168c1f6a85eb5ad44862ae8e1d5dc3d2311ae2e  deviceinfo
 93518206c01baa4ef8216dfdbbc5df27c61ea7f17d11c1167a074f4324411b195be2fb29124430a537b1e724067806060f53a2d769a89a4928c33eae93279847  modules-initfs
 ecd40b8f9bc17f383c52aa96ad23ceec41be75a4500d5e7a67f2f59875bf9f72eb35686a0b6e4949b45fd589c5da409d1212c52172fef94de2d1655b28c339b4  gpu-nobin.sh
 e9ee9c1404b41ba15eafff3f728ff6e0e78dc17e9a88483fca92db1aa3efe0e4d5bf26142e533c4ff12b1bf8ce04ccabb7ca0f93aaea586d5b30910282aad237  pointercal

device/community/device-xiaomi-scorpio/deviceinfo

@@ -23,7 +23,7 @@ deviceinfo_rootfs_image_sector_size="4096"
 
 # Bootloader related
 deviceinfo_flash_method="fastboot"
-
+deviceinfo_kernel_cmdline="PMOS_NO_OUTPUT_REDIRECT"
 deviceinfo_generate_bootimg="true"
 deviceinfo_bootimg_qcdt="false"
 deviceinfo_bootimg_dtb_second="false"

device/community/device-xiaomi-tissot/APKBUILD

@@ -4,8 +4,8 @@
 
 pkgname=device-xiaomi-tissot
 pkgdesc="Xiaomi Mi A1"
-pkgver=8
-pkgrel=0
+pkgver=7
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -34,6 +34,6 @@ package() {
 }
 
 sha512sums="
-4ea529e8822f268773e043dec4af4c419803e3220bc0bc85def1c07ee480efd5f33b2f8f74007aaf7d608926048c49d4dfc1d529f6501cebf5aba0f183ac9cd0  deviceinfo
+aed10dce67aa863073d5978d7ad47683ffdc7118cffc96c670b914c8dd423c79ee4cebd4878836e44cc6f2b62f67c7cfb7d7f28664bfc8b0f6499c982b0ead4c  deviceinfo
 4284d7c184f364d81a06de962808cb240b713cda11381ddcec5acdfbb4d4962922b64b2f2675ab463961c0510352211ec439a6b9e4ebdc47bf73980133e9626a  modules-initfs
 "

device/community/device-xiaomi-tissot/deviceinfo

@@ -19,6 +19,7 @@ deviceinfo_swap_size_recommended="512"
 
 # Bootloader related
 deviceinfo_flash_method="fastboot"
+deviceinfo_kernel_cmdline="console=null"
 deviceinfo_generate_bootimg="true"
 deviceinfo_generate_extlinux_config="true"
 deviceinfo_bootimg_qcdt="false"

device/community/device-xiaomi-wt88047/APKBUILD

@@ -3,7 +3,7 @@
 pkgname=device-xiaomi-wt88047
 pkgdesc="Xiaomi Redmi 2"
 pkgver=9
-pkgrel=1
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -38,6 +38,6 @@ nonfree_firmware() {
 }
 
 sha512sums="
-088daf52e6273289e279ee5c39d170bcde6b163eed39a11f3b25c6504347d304cd09745b3eb568b56eb03b67231e6948d1a75df19fb0e24dc535dcc8ce2c2e8c  deviceinfo
+e34d4cf37a1f47a22915a11d3fae479348f378d49c3d8f7773eb0b891e488993a133d670d37fb080884a0945a280e5730ff8c8c0f00720551724a37bfb8d5520  deviceinfo
 7f6892125a15fdfcfca140571073150df25a5c355eae8ae632a56a00cd9e5fc7168d435680ca83eb8a8d9ae63aef6af478f42e92815f175d26ec592941de61e6  modules-initfs
 "

device/community/device-xiaomi-wt88047/deviceinfo

@@ -21,7 +21,7 @@ deviceinfo_getty="ttyMSM0;115200"
 
 # Bootloader related
 deviceinfo_flash_method="fastboot"
-deviceinfo_kernel_cmdline="earlycon console=ttyMSM0,115200"
+deviceinfo_kernel_cmdline="earlycon console=ttyMSM0,115200 PMOS_NO_OUTPUT_REDIRECT"
 deviceinfo_generate_bootimg="true"
 deviceinfo_generate_extlinux_config="true"
 deviceinfo_flash_offset_base="0x80000000"

device/community/device-xiaomi-ysl/APKBUILD

@@ -2,8 +2,8 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-xiaomi-ysl
 pkgdesc="Xiaomi Redmi S2/Y2"
-pkgver=5
-pkgrel=0
+pkgver=4
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -31,6 +31,6 @@ package() {
 }
 
 sha512sums="
-a985591e27192acc03a3218ae7e419aa557b6219139058f3269ff5c3bb5f695c2af1af8157c55331d4238d9fb179c0492db660e7212a100bd3c5c31e37d623fe  deviceinfo
+559dbc06a031cd4b2b5f8dd612ea647313eeed6170eb97d26332f75daf7f41613c8f759aa64f2e5c70adabdb44ff9a5f60fe02869ad8f80a9b15cfca9d673d59  deviceinfo
 b5e4f6dec04a9a7d7231a62d8b60e17a9a5265768eb80050225c0f57b8188ec108d8b7155ccb70ba95201906b653d19ef33a0ff04072da040b0242d7032b103d  modules-initfs
 "

device/community/device-xiaomi-ysl/deviceinfo

@@ -20,6 +20,7 @@ deviceinfo_screen_height="1440"
 
 # Bootloader related
 deviceinfo_flash_method="fastboot"
+deviceinfo_kernel_cmdline="console=null"
 deviceinfo_generate_bootimg="true"
 deviceinfo_generate_extlinux_config="true"
 deviceinfo_bootimg_qcdt="false"

device/community/firmware-fairphone-fp4/APKBUILD

@@ -1,13 +1,12 @@
 pkgname=firmware-fairphone-fp4
 pkgver=20240313
-pkgrel=1
+pkgrel=0
 pkgdesc="Firmware for Fairphone 4"
 subpackages="
 	$pkgname-adreno
 	$pkgname-adsp
 	$pkgname-bluetooth
 	$pkgname-cdsp
-	$pkgname-hexagonfs
 	$pkgname-ipa
 	$pkgname-modem
 	$pkgname-venus
@@ -17,8 +16,8 @@ url="https://github.com/FairBlobs/FP4-firmware"
 arch="aarch64"
 license="proprietary"
 makedepends="pil-squasher"
-options="!check !strip !archcheck !tracedeps textrels pmb:cross-native"
-_commit="222756885ff5eb24ee89684ef8cfe860a45a54ec"
+options="!check !strip !archcheck !tracedeps pmb:cross-native"
+_commit="d95bd920afa9084cefe0f69be931a5421e544154"
 source="https://github.com/FairBlobs/FP4-firmware/archive/$_commit/FP4-firmware-$_commit.tar.gz"
 builddir="$srcdir/FP4-firmware-$_commit"
 
@@ -69,24 +68,10 @@ cdsp() {
 		"$subpkgdir/lib/firmware/qcom/sm7225/fairphone4/"
 }
 
-hexagonfs() {
-	pkgdesc="Fairphone 4 hexagonfs files"
-
-	mkdir -p "$subpkgdir"/usr/share/qcom/sm7225/Fairphone/
-	cp -r "$builddir"/hexagonfs/ \
-		"$subpkgdir"/usr/share/qcom/sm7225/Fairphone/fairphone4
-
-	# Remove files that we don't need - for now
-	rm -r "$subpkgdir"/usr/share/qcom/sm7225/Fairphone/fairphone4/acdb/
-	rm -r "$subpkgdir"/usr/share/qcom/sm7225/Fairphone/fairphone4/dsp/
-
-	find "$subpkgdir/usr/share/qcom/sm7225/Fairphone/fairphone4/" \
-		-type f -exec chmod 0644 {} \;
-}
-
 ipa() {
 	pkgdesc="Fairphone 4 ipa firmware"
 
+	cd "$builddir"
 	install -Dm644 "$builddir"/lagoon_ipa_fws.mbn \
 		"$subpkgdir/lib/firmware/qcom/sm7225/fairphone4/ipa_fws.mbn"
 }
@@ -120,5 +105,5 @@ wlan() {
 }
 
 sha512sums="
-b6836a8770c089615698ec26d397530c75086457c309d7220265da1203f2b06c4021d5a872244ad1e5a4a19d0d8192c13ae2051538e24d1df5292480daa6309d  FP4-firmware-222756885ff5eb24ee89684ef8cfe860a45a54ec.tar.gz
+3839431922c6250fa76c563183387edbc1370f34d833d5d7c6c08f0d921c0498c93ff376af5d43fecf78d4ac6aff3b90e41345310181826b0a21507dbfba778c  FP4-firmware-d95bd920afa9084cefe0f69be931a5421e544154.tar.gz
 "

device/community/firmware-motorola-osprey/APKBUILD

@@ -1,6 +1,7 @@
+# Maintainer: Martijn Braam <martijn@brixit.nl>
 pkgname=firmware-motorola-osprey
 pkgver=4
-pkgrel=1
+pkgrel=0
 pkgdesc="Firmware for Motorola Moto G 2015"
 url="https://github.com/pmsourcedump/firmware-motorola-osprey"
 subpackages="$pkgname-wcnss $pkgname-wcnss-nv:wcnss_nv $pkgname-venus"

device/community/linux-postmarketos-exynos4/APKBUILD

@@ -4,7 +4,7 @@
 
 pkgname=linux-postmarketos-exynos4
 pkgver=6.7.6
-pkgrel=4
+pkgrel=3
 pkgdesc="Mainline kernel fork for Samsung Exynos4 devices"
 arch="armv7"
 _carch="arm"
@@ -81,7 +81,7 @@ package() {
 
 sha512sums="
 705cd617d135900cb25c8b6da7177d507e6a179b521e04aeae18080995514cbd69381a21f942ebf4d8cee427e3c60d53e6a06ed918ddcaacc243ca585ef61c11  linux-postmarketos-exynos4-v6.7.6-exynos4.tar.bz2
-fd8b8d9c12148ef44c87cdefaaeaa2b52bd9a958ba3431ce1640f0ee0db4bcc5192cdb5f546513a1a1795ec3d0b466928e59b540f6de8ac62bd7703c6022c9fa  config-postmarketos-exynos4.armv7
+c1ce78565a909eea2281d17e81c879c39e02149563ff12f661359e02eca37225a5a58d7c43021ab3d0a78bdadc46cf1c54ef655a4167cc96d80874a72e847904  config-postmarketos-exynos4.armv7
 aaff0332b90e1f9f62de1128cace934717336e54ab09de46477369fa808302482d97334e43a85ee8597c1bcab64d3484750103559fea2ce8cd51776156bf7591  initramfs.list
 09f1f214a24300696809727a7b04378887c06ca6f40803ca51a12bf2176a360b2eb8632139d6a0722094e05cb2038bdb04018a1e3d33fc2697674552ade03bee  init
 aea665e80dee318ec3be23d3f28b88e87eb551d2756e14d896781a0861a4387920f6969990eb171e8c7d6f86c36cef63a89337d63bfee7e44b9de7a8efb36c73  tab3-limit-memory.patch

device/community/linux-postmarketos-exynos4/config-postmarketos-exynos4.armv7

@@ -508,7 +508,7 @@ CONFIG_ARM_APPENDED_DTB=y
 CONFIG_ARM_ATAG_DTB_COMPAT=y
 CONFIG_ARM_ATAG_DTB_COMPAT_CMDLINE_FROM_BOOTLOADER=y
 # CONFIG_ARM_ATAG_DTB_COMPAT_CMDLINE_EXTEND is not set
-CONFIG_CMDLINE=""
+CONFIG_CMDLINE="PMOS_NO_OUTPUT_REDIRECT"
 # CONFIG_CMDLINE_FROM_BOOTLOADER is not set
 CONFIG_CMDLINE_EXTEND=y
 # CONFIG_CMDLINE_FORCE is not set