DO NOT MERGE: ci: just download a file a bunch of times with curl and see what happens 🥳

.ci/grep.sh

@@ -87,11 +87,4 @@ if grep -qEr 'PMOS_NO_OUTPUT_REDIRECT' -- *; then
 	exit_code=1
 fi
 
-if grep -qEr '^deviceinfo_kernel_cmdline.*[\"\s]console=null' -- device/; then
-	echo "ERROR: Do not use console=null in the kernel command line."
-	echo "Use these params to quiet console on boot: quiet loglevel=2"
-	echo "For more information, see: https://gitlab.postmarketos.org/postmarketOS/pmaports/-/issues/2989"
-	exit_code=1
-fi
-
 exit "$exit_code"

.ci/lib/build_changed_aports.py

@@ -55,6 +55,14 @@ if __name__ == "__main__":
     # Package count sanity check
     common.get_changed_packages_sanity_check(len(packages))
 
+    # [ci:skip-build]: verify checksums and stop
+    verify_only = common.commit_message_has_string("[ci:skip-build]")
+    if verify_only:
+        print("WARNING: not building changed packages ([ci:skip-build])!")
+        print("verifying checksums: " + ", ".join(packages))
+        verify_checksums(packages, arch)
+        sys.exit(0)
+
     # Load context
     sys.argv = ["pmbootstrap.py", "chroot"]
     args = pmb.parse.arguments()
@@ -93,31 +101,15 @@ if __name__ == "__main__":
     # No packages: skip build
     if len(packages) == 0:
         print(f"no packages changed, which can be built for {arch}")
+        sys.exit(0)
 
-    else:
-        verify_only = common.commit_message_has_string("[ci:skip-build]")
-        if verify_only:
-            # [ci:skip-build]: verify checksums and stop
-            print("WARNING: not building changed packages ([ci:skip-build])!")
-            print("verifying checksums: " + ", ".join(packages))
-            verify_checksums(packages, arch)
-        else:
-            # Build packages
-            print(f"building in strict mode for {arch}: {', '.join(packages)}")
-            build_strict(packages, arch)
+    # Build packages
+    print(f"building in strict mode for {arch}: {', '.join(packages)}")
+    build_strict(packages, arch)
 
     # Build packages in extra-repos/systemd
     # FIXME: this should probably be more generic, if other repos are added later?
     if systemd_pkgs:
+        print(f"building in strict mode for {arch}, from extra-repos/systemd: {', '.join(packages)}")
         common.run_pmbootstrap(["config", "systemd", "always"])
-
-        verify_only = common.commit_message_has_string("[ci:skip-build]")
-        if verify_only:
-            # [ci:skip-build]: verify checksums
-            print("WARNING: not building changed packages for extra-repos/systemd: ([ci:skip-build])!")
-            print("verifying checksums: " + ", ".join(systemd_pkgs))
-            verify_checksums(systemd_pkgs, arch)
-        else:
-            # Build packages
-            print(f"building in strict mode for {arch}, from extra-repos/systemd: {', '.join(systemd_pkgs)}")
-            build_strict(systemd_pkgs, arch)
+        build_strict(systemd_pkgs, arch)

.gitlab-ci.yml

@@ -8,13 +8,12 @@ after_script:
   - .ci/lib/move_logs.sh $CI_PROJECT_DIR
 stages:
   - lint
-  - build
-  - autoupdate
 variables:
   # Default of 20 is pretty small, sometimes MRs have >20 commits in them. 100
   # seems like a reasonable balance. If this is too low, git merge-base (from ci/
   # common.py) can fail
   GIT_DEPTH: 100
+  URL: "https://download.kde.org/stable/plasma/6.2.2/kscreenlocker-6.2.2.tar.xz"
   
 # This defines the rules for when a pipeline should run.
 workflow:
@@ -27,167 +26,32 @@ workflow:
     # Run scheduled pipeline for autoupdate or manually triggered pipeline
     - if: $CI_PIPELINE_SOURCE == "schedule" || $CI_PIPELINE_SOURCE == "web"
 
-# device documentation
-wiki:
+dl_test:
   stage: lint
-  rules:
-    - if: $CI_PIPELINE_SOURCE == "merge_request_event" || $CI_COMMIT_REF_PROTECTED == "false"
-      changes:
-        - .ci/**/*
-        - .gitlab-ci.yml
-        - device/*/device-*/*
   script:
-    - .ci/lib/gitlab_prepare_ci.sh
-    - .ci/wiki.sh
+    -  apk add curl bind-tools iproute2-minimal wget
+    - cat /etc/resolv.conf
+    - nslookup postmarketos.org
+    - nslookup alpinelinux.org
+    - ip -br a
 
-# testcases linting
-ruff:
-  stage: lint
-  rules:
-    - if: $CI_PIPELINE_SOURCE == "merge_request_event" || $CI_COMMIT_REF_PROTECTED == "false"
-      changes:
-        - .ci/*
-        - .ci/*/*
-        - .gitlab-ci.yml
-  script:
-    - .ci/lib/gitlab_prepare_ci.sh
-    - .ci/ruff.sh
-
-# shellcheck and various grep checks
-shellcheck-grep:
-  stage: lint
-  image: alpine:edge
-  rules:
-    - if: $CI_PIPELINE_SOURCE == "merge_request_event" || $CI_COMMIT_REF_PROTECTED == "false"
-  script:
-    - .ci/lib/gitlab_prepare_ci.sh
-    - .ci/shellcheck.sh
-    - .ci/grep.sh
-    - .ci/codeowners.sh
-
-editor-config:
-  stage: lint
-  image: alpine:edge
-  rules:
-    - if: $CI_PIPELINE_SOURCE == "merge_request_event" || $CI_COMMIT_REF_PROTECTED == "false"
-  script:
-    - .ci/lib/gitlab_prepare_ci.sh
-    - .ci/ec.sh
-
-# aports checks (generic)
-pytest-commits:
-  stage: lint
-  rules:
-    - if: $CI_PIPELINE_SOURCE == "merge_request_event" || $CI_COMMIT_REF_PROTECTED == "false"
-  script:
-    - .ci/lib/gitlab_prepare_ci.sh
-    - .ci/pytest.sh
-    - .ci/commits.sh
-  artifacts:
-    when: on_failure
-    paths:
-      - log.txt
-      - log_testsuite_pmaports.txt
-      - pmbootstrap.cfg
-    expire_in: 1 week
-
-# APKBUILD linting
-aport-lint:
-  stage: lint
-  rules:
-    - if: $CI_PIPELINE_SOURCE == "merge_request_event" || $CI_COMMIT_REF_PROTECTED == "false"
-  script:
-    - .ci/lib/gitlab_prepare_ci.sh
-    - .ci/apkbuild-lint.sh
-  allow_failure: true
-
-# kernel kconfig check
-kernel-kconfig:
-  stage: lint
-  rules:
-    - if: $CI_PIPELINE_SOURCE == "merge_request_event" || $CI_COMMIT_REF_PROTECTED == "false"
-      changes:
-        - kconfigcheck.toml
-        - device/*/linux-*/config-*
-        - main/linux-*/config-*
-  script:
-    - .ci/lib/gitlab_prepare_ci.sh
-    - .ci/kconfig.sh
-
-# MR settings
-# (Checks for "Allow commits from members who can merge to the target branch")
-mr-settings:
-  stage: lint
-  rules:
-    - if: $CI_PIPELINE_SOURCE == "merge_request_event"
-  before_script:
-    - *global_before_scripts
-    - apk -q add python3
-  script:
-    - wget -q "https://gitlab.postmarketos.org/postmarketOS/ci-common/-/raw/master/check_mr_settings.py"
-    - python3 ./check_mr_settings.py
-
-# build changed aports
-.build:
-  stage: build
-  rules:
-    - if: $CI_PIPELINE_SOURCE == "merge_request_event" || $CI_COMMIT_REF_PROTECTED == "false"
-  before_script:
-    - *global_before_scripts
-    - .ci/lib/gitlab_prepare_ci.sh
-  after_script:
-    - cp -r /home/pmos/.local/var/pmbootstrap/packages/ packages/ || true
-  artifacts:
-    expire_in: 1 week
-    paths:
-      - packages/
-  timeout: 10 h
-
-build-x86_64:
-  extends: .build
-  script:
-    - .ci/build-x86_64.sh
-
-build-x86:
-  extends: .build
-  script:
-    - .ci/build-x86.sh
-
-build-aarch64:
-  extends: .build
-  script:
-    - .ci/build-aarch64.sh
-
-build-armv7:
-  extends: .build
-  script:
-    - .ci/build-armv7.sh
-
-build-armhf:
-  extends: .build
-  script:
-    - .ci/build-armhf.sh
-
-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
+    - wget --no-dns-cache --verbose $URL
+    - wget --no-dns-cache --verbose $URL
+    - wget --no-dns-cache --verbose $URL
+    - wget --no-dns-cache --verbose $URL
+    - wget --no-dns-cache --verbose $URL
+    - wget --no-dns-cache --verbose $URL
+    - wget --no-dns-cache --verbose $URL
+    - wget --no-dns-cache --verbose $URL
+    - curl --dns-servers 140.211.166.130 --verbose --max-time 10 $URL
+    - curl --dns-servers 140.211.166.130 --verbose --max-time 10 $URL
+    - curl --dns-servers 140.211.166.130 --verbose --max-time 10 $URL
+    - curl --dns-servers 140.211.166.130 --verbose --max-time 10 $URL
+    - curl --dns-servers 140.211.166.130 --verbose --max-time 10 $URL
+    - curl --dns-servers 140.211.166.130 --verbose --max-time 10 $URL
+    - curl --dns-servers 140.211.166.130 --verbose --max-time 10 $URL
+    - curl --dns-servers 140.211.166.130 --verbose --max-time 10 $URL
+    - curl --dns-servers 140.211.166.130 --verbose --max-time 10 $URL
+    - curl --dns-servers 140.211.166.130 --verbose --max-time 10 $URL
+    - curl --dns-servers 140.211.166.130 --verbose --max-time 10 $URL
+    - curl --dns-servers 140.211.166.130 --verbose --max-time 10 $URL

CODEOWNERS

@@ -90,7 +90,6 @@ device/*/device-samsung-lt01/			@knuxify
 device/*/device-samsung-m0/			@Newbyte
 device/*/device-samsung-manta/			@jenneron @alexmrqt
 device/*/device-shift-axolotl/			@amartinz @calebccff @dylanvanassche
-device/*/device-solidrun-cubox/			@longnoserob
 device/*/firmware-google-sargo/			@flamingradian
 device/*/firmware-google-veyron-brcm/		@jenneron
 device/*/firmware-odroid-xu4/			@Grimler
@@ -107,7 +106,6 @@ device/*/linux-postmarketos-exynos4/		@Newbyte @Grimler @knuxify
 device/*/linux-postmarketos-exynos5/		@jenneron @Grimler
 device/*/linux-postmarketos-grate/		@clamor-s @jenneron @jethrob
 device/*/linux-postmarketos-imx-ereader/	@akemnade
-device/*/linux-postmarketos-marvell-dove/	@longnoserob
 device/*/linux-postmarketos-mediatek-mt8173/	@jenneron @adamthiede
 device/*/linux-postmarketos-mediatek-mt8183/	@jenneron @binarycraft
 device/*/linux-postmarketos-omap/		@MightyM17 @Sicelo

cross/busybox-static-aarch64/APKBUILD

@@ -8,7 +8,7 @@ fi
 
 pkgname=busybox-static-aarch64
 pkgver=1.37.0
-pkgrel=7
+pkgrel=3
 
 _arch="aarch64"
 _mirror="http://dl-4.alpinelinux.org/alpine/"
@@ -32,5 +32,5 @@ package() {
 }
 
 sha512sums="
-9d0fd2ad11f7b2f9fbb3d5e71a2a7f113187648f61c269bee7b6b7ef0976d181d6a7588638382415b7eb2cc3934d0ef62080d4462acfc97c4c7b056003d333d4  busybox-static-1.37.0-r7-aarch64-edge.apk
+c0e12a73463638803a7adddb241f93ae0617498bb88bc349c62e2e1fe0b3ee25ebec1853e21bd0a42efb7578f09c8d0324073bc93a530855030d4f192a49e0b0  busybox-static-1.37.0-r3-aarch64-edge.apk
 "

cross/busybox-static-armhf/APKBUILD

@@ -8,7 +8,7 @@ fi
 
 pkgname=busybox-static-armhf
 pkgver=1.37.0
-pkgrel=7
+pkgrel=3
 
 _arch="armhf"
 _mirror="http://dl-4.alpinelinux.org/alpine/"
@@ -32,5 +32,5 @@ package() {
 }
 
 sha512sums="
-c89807c048cd58a5994c8162685669d0e49752f7284adc427d017355bbfd43f5a686617be42abd2b470c15869225a03f31a6231ee4dbb03fc6b27d6c920b5208  busybox-static-1.37.0-r7-armhf-edge.apk
+a56b1f41818d5c4c9096c406e7a3d61ed1ea97624bd274c0f6f8914276cf041ee2cd6a170241f9cc93ed170fe13f183304166bfa12152d261cf898f838c1e781  busybox-static-1.37.0-r3-armhf-edge.apk
 "

cross/busybox-static-armv7/APKBUILD

@@ -8,7 +8,7 @@ fi
 
 pkgname=busybox-static-armv7
 pkgver=1.37.0
-pkgrel=7
+pkgrel=3
 
 _arch="armv7"
 _mirror="http://dl-4.alpinelinux.org/alpine/"
@@ -32,5 +32,5 @@ package() {
 }
 
 sha512sums="
-56e0b396ced0a0afab2f5b50156b87707e3511a2e24c52c9688a20791fad20f11869b5b06bb6c7d407ffec3e4e06ea3100876e3d32efae678fc5a0fe6b57715a  busybox-static-1.37.0-r7-armv7-edge.apk
+f4027d0be53ae42fb079208e04f2ad9ca6971b8b489389c4ebae364f423cea361d2a304dd0ceced1acf3780583456fc404d599760ea9df0550f77c11eac30a04  busybox-static-1.37.0-r3-armv7-edge.apk
 "

device/archived/device-samsung-a5lte-downstream/APKBUILD

@@ -2,8 +2,8 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-samsung-a5lte-downstream
 pkgdesc="Samsung Galaxy A5 (SM-A500F)"
-pkgver=2
-pkgrel=0
+pkgver=1
+pkgrel=2
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
@@ -21,5 +21,5 @@ package() {
 }
 
 sha512sums="
-410b5caac31e2af65ebfe1f3312fc2106c681430b75dfa8f4412f5727cd7db669dc3f46b1b2c20ece1b438052c36cbd3ff7b212ea03d9fea5af0b3c5bb14ff9b  deviceinfo
+09f28323fac82a8f8495af89de94449100e0f9233e22e33af807e559803bf3d9114aedc6d21626c7d5d736e93025de812292a0ee47c3639ac704696995c3d675  deviceinfo
 "

device/archived/device-samsung-a5lte-downstream/deviceinfo

@@ -17,7 +17,7 @@ deviceinfo_screen_height="1280"
 
 # Bootloader related
 deviceinfo_flash_method="fastboot"
-deviceinfo_kernel_cmdline="quiet loglevel=2 androidboot.hardware=qcom user_debug=23 msm_rtb.filter=0x3F ehci-hcd.park=3 androidboot.bootdevice=7824900.sdhci"
+deviceinfo_kernel_cmdline="console=null androidboot.hardware=qcom user_debug=23 msm_rtb.filter=0x3F ehci-hcd.park=3 androidboot.bootdevice=7824900.sdhci"
 deviceinfo_generate_bootimg="true"
 deviceinfo_bootimg_qcdt="true"
 deviceinfo_bootimg_dtb_second="false"

device/archived/device-samsung-a5ulte-downstream/APKBUILD

@@ -2,8 +2,8 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-samsung-a5ulte-downstream
 pkgdesc="Samsung Galaxy A5 (SM-A500FU)"
-pkgver=2
-pkgrel=0
+pkgver=1
+pkgrel=2
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
@@ -21,5 +21,5 @@ package() {
 }
 
 sha512sums="
-8c08854b664866087f3df1dccbe39ee0aba4563e9fc2cb38567bbbb9f54a74e3a9ed7a574bc18930ecf595d8beda32dd301cd757b6788d24cdd819c8c9cc5c52  deviceinfo
+1e7fe5a6788c1b635ab5c63083da5c1f353440567b8f86948092202ce026cbbae000ea047e65fae543f13092f97626ce227bc3f329477fbd7521df1b31f30bc8  deviceinfo
 "

device/archived/device-samsung-a5ulte-downstream/deviceinfo

@@ -17,7 +17,7 @@ deviceinfo_screen_height="1280"
 
 # Bootloader related
 deviceinfo_flash_method="fastboot"
-deviceinfo_kernel_cmdline="quiet loglevel=2 androidboot.hardware=qcom user_debug=23 msm_rtb.filter=0x3F ehci-hcd.park=3 androidboot.bootdevice=7824900.sdhci"
+deviceinfo_kernel_cmdline="console=null androidboot.hardware=qcom user_debug=23 msm_rtb.filter=0x3F ehci-hcd.park=3 androidboot.bootdevice=7824900.sdhci"
 deviceinfo_generate_bootimg="true"
 deviceinfo_bootimg_qcdt="true"
 deviceinfo_bootimg_dtb_second="false"

device/archived/device-samsung-j6lte-downstream/APKBUILD

@@ -1,39 +0,0 @@
-# Reference: <https://postmarketos.org/devicepkg>
-pkgname=device-samsung-j6lte-downstream
-pkgdesc="Samsung Galaxy J6 (2018)"
-pkgver=1
-pkgrel=0
-url="https://postmarketos.org"
-license="MIT"
-arch="aarch64"
-options="!check !archcheck"
-depends="
-	linux-samsung-j6lte-downstream
-	mkbootimg
-	postmarketos-base
-	postmarketos-base-downstream
-	msm-fb-refresher
-"
-makedepends="devicepkg-dev"
-source="
-	deviceinfo
-"
-subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
-
-build() {
-	devicepkg_build $startdir $pkgname
-}
-
-package() {
-	devicepkg_package $startdir $pkgname
-}
-
-nonfree_firmware() {
-	pkgdesc="$pkgdesc (WiFi firmware)"
-	depends="firmware-samsung-j6lte-downstream"
-	mkdir "$subpkgdir"
-}
-
-sha512sums="
-5bbe8f6840d75c4d8693fbe62afaf071cddaef750aee2f9cae31187489a2b05873369ee06bf5292ec484a70f6d5ac7aea7862fc27f7fc3057205afda52996d7e  deviceinfo
-"

device/archived/device-samsung-j6lte-downstream/deviceinfo

@@ -1,32 +0,0 @@
-# Reference: <https://postmarketos.org/deviceinfo>
-# Please use double quotes only. You can source this file in shell
-# scripts.
-
-deviceinfo_format_version="0"
-deviceinfo_name="Samsung Galaxy J6"
-deviceinfo_manufacturer="Samsung"
-deviceinfo_codename="samsung-j6lte-downstream"
-deviceinfo_year="2018"
-deviceinfo_arch="aarch64"
-
-# Device related
-deviceinfo_chassis="handset"
-deviceinfo_keyboard="false"
-deviceinfo_external_storage="true"
-deviceinfo_screen_width="720"
-deviceinfo_screen_height="1480"
-
-# Bootloader related
-deviceinfo_flash_method="heimdall-bootimg"
-deviceinfo_kernel_cmdline="androidboot.selinux=permissive androidboot.selinux=permissive"
-deviceinfo_generate_bootimg="true"
-deviceinfo_bootimg_qcdt="true"
-deviceinfo_bootimg_dtb_second="false"
-deviceinfo_flash_pagesize="2048"
-deviceinfo_flash_offset_base="0x10000000"
-deviceinfo_flash_offset_kernel="0x00008000"
-deviceinfo_flash_offset_ramdisk="0x01000000"
-deviceinfo_flash_offset_second="0x00f00000"
-deviceinfo_flash_offset_tags="0x00000100"
-deviceinfo_flash_heimdall_partition_kernel="BOOT"
-deviceinfo_flash_heimdall_partition_rootfs="SYSTEM"

device/archived/firmware-samsung-j6lte-downstream/APKBUILD

@@ -1,37 +0,0 @@
-pkgname=firmware-samsung-j6lte-downstream
-pkgver=1
-pkgrel=0
-pkgdesc="Firmware files for Samsung Galaxy J6 (2018)"
-url="https://github.com/samsungexynos7870/android_vendor_samsung_j6lte"
-arch="aarch64"
-license="proprietary"
-options="!strip !check !archcheck !spdx !tracedeps pmb:cross-native"
-
-# Source
-_commit="0ace47cab223eb50ef39a2725f3974ed43918b29"
-builddir="$srcdir/android_vendor_samsung_j6lte-$_commit"
-_raw_wifi_path="$url/raw/$_commit/proprietary/vendor/etc/wifi"
-_install_wifi_path="/lib/firmware/postmarketos/wifi/"
-source="
-	bcmdhd_apsta.bin_36::$_raw_wifi_path/bcmdhd_apsta.bin_36
-	bcmdhd_clm.blob::$_raw_wifi_path/bcmdhd_clm.blob
-	bcmdhd_mfg.bin_36::$_raw_wifi_path/bcmdhd_mfg.bin_36
-	bcmdhd_sta.bin_36::$_raw_wifi_path/bcmdhd_sta.bin_36
-	nvram.txt_36::$_raw_wifi_path/nvram.txt_36
-"
-
-package() {
-	install -Dm644 "$srcdir/bcmdhd_apsta.bin_36" "$pkgdir$_install_wifi_path/bcmdhd_apsta.bin_36"
-	install -Dm644 "$srcdir/bcmdhd_clm.blob" "$pkgdir$_install_wifi_path/bcmdhd_clm.blob"
-	install -Dm644 "$srcdir/bcmdhd_mfg.bin_36" "$pkgdir$_install_wifi_path/bcmdhd_mfg.bin_36"
-	install -Dm644 "$srcdir/bcmdhd_sta.bin_36" "$pkgdir$_install_wifi_path/bcmdhd_sta.bin_36"
-	install -Dm644 "$srcdir/nvram.txt_36" "$pkgdir$_install_wifi_path/nvram.txt_36"
-}
-
-sha512sums="
-678c30e5e64ba216fca0e0121eb9b2f6ad22f6e10c19138b3fa4af52bbce91f0a22886e7282062a44a4ded79bb675893556c5a193e56a8bd9979a0b0a679f008  bcmdhd_apsta.bin_36
-e2d1ca4f6a5f3649c1ab0fc9a7dca34077d5a4c5ea8465c3da92845141145e5f19d06c1bcb5f7d683bdce6c15675f41506bb9fbff0076ec58defa27114b2ad52  bcmdhd_clm.blob
-fbe0c453088efc5318fc80cdd6b6b9855ea21ce6619ca7f40fdf007d0dd9c8f4f821fe9356dd3492506223bfdb67eb6821347a2d0b420e06a8fadaf9166a947c  bcmdhd_mfg.bin_36
-706cb7f4eda0bba5069cb3635033a34d7155a4e60dc2fd1d5a724c387da77865d5a960f1c8b08546e1715470fe71bebbad29404207c62cdbfd3bbbdce26fa60d  bcmdhd_sta.bin_36
-6ff097c0895d39c576ec70b1e5a6ba37dddef1e2f9a5f22f077033d08c9c94dd62c4e482210105d38f639b45564b54b5919f52af3eecd6961af1fb2eb600fa5f  nvram.txt_36
-"

device/community/device-google-gru/APKBUILD

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

device/community/device-google-gru/deviceinfo

@@ -20,7 +20,7 @@ deviceinfo_disable_dhcpd="true"
 
 # Bootloader related
 deviceinfo_flash_method="none"
-deviceinfo_kernel_cmdline="quiet loglevel=2"
+deviceinfo_kernel_cmdline="console=null"
 deviceinfo_cgpt_kpart="/boot/vmlinuz.kpart"
 deviceinfo_cgpt_kpart_start="8192"
 deviceinfo_cgpt_kpart_size="65536"

device/community/device-google-kukui/APKBUILD

@@ -2,7 +2,7 @@
 # Maintainer: Jenneron <jenneron@protonmail.com>
 pkgname=device-google-kukui
 pkgdesc="Google Kukui Chromebooks"
-pkgver=9
+pkgver=8
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -73,6 +73,6 @@ nonfree_firmware() {
 }
 
 sha512sums="
-563b0c9ee35c90f2be74e30fa6d490a351e5e114f946c21556f00b621bfd5c756599eef5228dad8cf74c258eb8eb9e12f8012058da285ddff7834820cad5fc7e  deviceinfo
+ecd503069ecf272ddc238bd49dc257a1f3e0f4c20b322238e2da83104b94b331c22886d1591b6fe0b78c986e15ac6251e364ec1b750f9125ea722a6b1a79e2b8  deviceinfo
 8e95624610dae7d18684056396c9e82635ddce7303d6770e965f9372ffa101fdfd5f8337bc7368004890e9836798663a98c142c52ed63795877ea37ac8da56af  modules-initfs
 "

device/community/device-google-kukui/deviceinfo

@@ -19,7 +19,7 @@ deviceinfo_gpu_accelerated="true"
 deviceinfo_disable_dhcpd="true"
 
 # Bootloader related
-deviceinfo_kernel_cmdline="quiet loglevel=2"
+deviceinfo_kernel_cmdline="console=null"
 deviceinfo_flash_method="none"
 deviceinfo_cgpt_kpart="/boot/vmlinuz.kpart"
 deviceinfo_cgpt_kpart_start="8192"

device/community/device-google-oak/APKBUILD

@@ -3,7 +3,7 @@
 # Co-Maintainer: Jenneron <jenneron@protonmail.com>
 pkgname=device-google-oak
 pkgdesc="Google Oak Chromebooks"
-pkgver=8
+pkgver=7
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -39,6 +39,6 @@ nonfree_firmware() {
 }
 
 sha512sums="
-6e4c6704aaca2b157ca437d0c9575a7efb369934facc59d0e43cbfff103f2e98dca42a46ba332069f00cc8f1289355a2177cb2ca4627445d50be7daaad60d817  deviceinfo
+d0c595a323707f6e53cdd382a56b9d3faf4a32296e53a188361f482b752817892e74c7cf32bba0140607e266ecdb53b9c79fded45bda5e9f4d955eb4d8fe1d23  deviceinfo
 4b0197eacfeeb4b13f5abc26950f570ee762742547674ce10110ccea63eb46630a2e3b5f87e9c9a1f9deda21baf05bec248ab7a65656687ec94d296b5657dafa  modules-initfs
 "

device/community/device-google-oak/deviceinfo

@@ -22,7 +22,7 @@ deviceinfo_create_initfs_extra="true"
 
 # Bootloader related
 deviceinfo_flash_method="none"
-deviceinfo_kernel_cmdline="quiet loglevel=2"
+deviceinfo_kernel_cmdline="console=null"
 deviceinfo_cgpt_kpart="/boot/vmlinuz.kpart"
 deviceinfo_cgpt_kpart_start="8192"
 deviceinfo_cgpt_kpart_size="65536"

device/community/device-google-sargo/APKBUILD

@@ -3,7 +3,7 @@
 pkgname=device-google-sargo
 pkgdesc="Google Pixel 3a"
 pkgver=6
-pkgrel=5
+pkgrel=3
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -48,6 +48,7 @@ package() {
 
 nonfree_firmware() {
 	pkgdesc="Proprietary firmware blobs for the Google Pixel 3a"
+	replaces="hexagonrpcd-openrc"
 	depends="
 		firmware-google-sargo
 		hexagonrpcd
@@ -63,12 +64,10 @@ nonfree_firmware() {
 }
 
 nonfree_firmware_openrc() {
-	replaces="hexagonrpcd-openrc"
 	install_if="$pkgname-nonfree-firmware=$pkgver-r$pkgrel openrc"
 	# Enable HexagonRPCD by default, but not if the user installed this
 	# package then disabled it.
 	install="$subpkgname.post-install"
-	replaces="hexagonrpcd-openrc"
 	# The FastRPC service is only enabled when non-free firmware is installed.
 	install -Dm755 "$srcdir"/no-hexagonrpcd-on-suspend.sh \
 		"$subpkgdir"/etc/elogind/system-sleep/no-hexagonrpcd-on-suspend.sh

device/community/device-google-snow/APKBUILD

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

device/community/device-google-snow/deviceinfo

@@ -25,7 +25,7 @@ deviceinfo_flash_method="none"
 deviceinfo_cgpt_kpart="/boot/vmlinuz.kpart"
 deviceinfo_cgpt_kpart_start="8192"
 deviceinfo_cgpt_kpart_size="16384"
-deviceinfo_kernel_cmdline="quiet loglevel=2"
+deviceinfo_kernel_cmdline="console=null"
 deviceinfo_depthcharge_board="snow"
 deviceinfo_generate_depthcharge_image="true"
 deviceinfo_generate_extlinux_config="true"

device/community/device-google-trogdor/APKBUILD

@@ -2,7 +2,7 @@
 # Maintainer: Jenneron <jenneron@protonmail.com>
 pkgname=device-google-trogdor
 pkgdesc="Google Trogdor Chromebooks"
-pkgver=4
+pkgver=3
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -44,6 +44,6 @@ nonfree_firmware() {
 
 
 sha512sums="
-f94dcb175e49cbaadce524586ed1c3e3b0182e414c84c495a5585b49ed40ca6f7fa9c73544d19cbad236333f9fd997f150f836452b47a271f99b7b059972c4bc  deviceinfo
+0a40c43eda1dbb159da59c00b3a1e51fff299a29add210de4d9a16c060da523c358b6d821aa1dd16523bb912d00e1a1837193cce52415f329ac2e171d220f6d3  deviceinfo
 ef0257928f28aff25e6c625fabfd0942b01d4d86f1b523212ca825cf80f8b7a6c20ff17bfb02cb19f2a5d8787326ba22ad560a957c8d3c38b9ec70f1e16f9117  modules-initfs
 "

device/community/device-google-trogdor/deviceinfo

@@ -20,7 +20,7 @@ deviceinfo_disable_dhcpd="true"
 
 # Bootloader related
 deviceinfo_flash_method="none"
-deviceinfo_kernel_cmdline="quiet loglevel=2 deferred_probe_timeout=30"
+deviceinfo_kernel_cmdline="console=null deferred_probe_timeout=30"
 deviceinfo_cgpt_kpart="/boot/vmlinuz.kpart"
 deviceinfo_cgpt_kpart_start="8192"
 # 128M kernel partition

device/community/device-google-veyron/APKBUILD

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

device/community/device-google-veyron/deviceinfo

@@ -20,7 +20,7 @@ deviceinfo_disable_dhcpd="true"
 
 # Bootloader related
 deviceinfo_flash_method="none"
-deviceinfo_kernel_cmdline="quiet loglevel=2"
+deviceinfo_kernel_cmdline="console=null"
 deviceinfo_cgpt_kpart="/boot/vmlinuz.kpart"
 deviceinfo_cgpt_kpart_start="24576"
 deviceinfo_cgpt_kpart_size="32768"

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

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

device/community/device-lenovo-21bx/deviceinfo

@@ -15,7 +15,7 @@ deviceinfo_gpu_accelerated="true"
 deviceinfo_chassis="laptop"
 deviceinfo_keyboard="true"
 deviceinfo_external_storage="true"
-deviceinfo_kernel_cmdline="quiet loglevel=2 quiet clk_ignore_unused pd_ignore_unused arm64.nopauth"
+deviceinfo_kernel_cmdline="console=null quiet clk_ignore_unused pd_ignore_unused arm64.nopauth"
 
 # Bootloader related
 deviceinfo_flash_method="none"

device/community/device-oneplus-fajita/APKBUILD

@@ -4,7 +4,7 @@
 pkgname=device-oneplus-fajita
 pkgdesc="OnePlus 6T"
 pkgver=14
-pkgrel=2
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -51,6 +51,7 @@ nonfree_firmware() {
 		soc-qcom-sdm845-nonfree-firmware
 		soc-qcom-sdm845-modem
 	"
+	replaces="hexagonrpcd-openrc"
 
 	install -Dm644 "$srcdir"/81-libssc-oneplus-fajita.rules -t "$subpkgdir"/usr/lib/udev/rules.d/
 }
@@ -58,7 +59,6 @@ nonfree_firmware() {
 nonfree_firmware_openrc() {
 	install_if="$pkgname-nonfree-firmware=$pkgver-r$pkgrel openrc"
 	install="$subpkgname.post-install $subpkgname.post-upgrade"
-	replaces="hexagonrpcd-openrc"
 
 	install -Dm644 q6voiced.conf "$subpkgdir"/etc/conf.d/q6voiced
 	install -Dm644 "$srcdir"/hexagonrpcd.confd "$subpkgdir"/etc/conf.d/hexagonrpcd-sdsp

device/community/device-xiaomi-beryllium/APKBUILD

@@ -1,9 +1,10 @@
 # Maintainer: Joel Selvaraj <joelselvaraj.oss@gmail.com>
+
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-xiaomi-beryllium
 pkgdesc="Xiaomi Poco F1"
 pkgver=11
-pkgrel=3
+pkgrel=2
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -47,6 +48,7 @@ nonfree_firmware() {
 		soc-qcom-sdm845-modem
 		hexagonrpcd
 	"
+	replaces="hexagonrpcd-openrc"
 	mkdir "$subpkgdir"
 
 	install -Dm644 81-libssc-xiaomi-beryllium.rules \
@@ -56,7 +58,6 @@ nonfree_firmware() {
 nonfree_firmware_openrc() {
 	install_if="$pkgname-nonfree-firmware=$pkgver-r$pkgrel openrc"
 	install="$subpkgname.post-install $subpkgname.post-upgrade"
-	replaces="hexagonrpcd-openrc"
 	mkdir "$subpkgdir"
 
 	install -Dm644 q6voiced.conf "$subpkgdir"/etc/conf.d/q6voiced

device/community/firmware-xiaomi-daisy/APKBUILD

@@ -1,7 +1,7 @@
 # Maintainer: Alejandro Tafalla <alikates@dnyon.com>
 pkgname=firmware-xiaomi-daisy
 pkgver=2
-pkgrel=2
+pkgrel=1
 pkgdesc="Firmware files for Xiaomi Mi A2 Lite"
 url="https://postmarketos.org"
 arch="aarch64"
@@ -12,7 +12,7 @@ source="$pkgname-$_commit.tar.gz::https://github.com/alikates/firmware-xiaomi-da
 options="!strip !check !archcheck !spdx !tracedeps pmb:cross-native"
 builddir="$srcdir/firmware-xiaomi-daisy-$_commit/gpu"
 
-_fwdir="/lib/firmware/qcom/msm8953/xiaomi/daisy"
+_fwdir="/lib/firmware/postmarketos"
 
 package() {
 	# GPU firmwares

device/community/firmware-xiaomi-markw/APKBUILD

@@ -2,7 +2,7 @@
 
 pkgname=firmware-xiaomi-markw
 pkgver=2
-pkgrel=2
+pkgrel=1
 pkgdesc="Firmware files for Xiaomi Redmi 4 Prime (markw)"
 url="https://gitlab.com/vipaoL/firmware-xiaomi-markw"
 arch="aarch64"
@@ -13,7 +13,7 @@ _commit="8cc7f7d9e56aa9fa0193403b694115d759eafaf2"
 
 source="$pkgname-$_commit.tar.gz::$url/-/archive/$_commit/$pkgname-$_commit.tar.gz"
 builddir="$srcdir/$pkgname-$_commit/lib/firmware/postmarketos"
-_fwdir="/lib/firmware/qcom/msm8953/xiaomi/markw"
+_fwdir="/lib/firmware/postmarketos"
 
 package() {
 	# GPU firmwares

device/community/firmware-xiaomi-mido/APKBUILD

@@ -1,7 +1,7 @@
 # Maintainer: Barnabas Czeman <trabarni@gmail.com>
 pkgname=firmware-xiaomi-mido
 pkgver=3
-pkgrel=1
+pkgrel=0
 pkgdesc="Firmware for Xiaomi Redmi Note 4X"
 url="https://github.com/Kiciuk/proprietary_firmware_mido"
 arch="aarch64"
@@ -11,7 +11,7 @@ _commit="bc001cbb255a0ded2b58af07b93f712cd9322483"
 source="https://github.com/Kiciuk/proprietary_firmware_mido/archive/$_commit.zip"
 builddir="$srcdir/proprietary_firmware_mido-$_commit/apnhlos"
 
-_fwdir="/lib/firmware/qcom/msm8953/xiaomi/mido"
+_fwdir="/lib/firmware/postmarketos"
 
 package() {
 	# GPU firmware

device/community/firmware-xiaomi-tissot/APKBUILD

@@ -3,7 +3,7 @@
 
 pkgname=firmware-xiaomi-tissot
 pkgver=2
-pkgrel=2
+pkgrel=1
 pkgdesc="Firmware files for Xiaomi Mi A1"
 url="https://gitlab.com/jiaxyga/firmware-xiaomi-tissot"
 arch="aarch64"
@@ -14,7 +14,7 @@ _commit="bf686895224cae33c2130932b4a5914fea415287"
 
 source="$pkgname-$_commit.tar.gz::$url/-/archive/$_commit/$pkgname-$_commit.tar.gz"
 builddir="$srcdir/$pkgname-$_commit/lib/firmware/postmarketos"
-_fwdir="/lib/firmware/qcom/msm8953/xiaomi/tissot"
+_fwdir="/lib/firmware/postmarketos"
 
 package() {
 	# GPU firmwares

device/community/firmware-xiaomi-vince/APKBUILD

@@ -1,7 +1,7 @@
 # Maintainer: m0rf30 <morf3089@gmail.com>
 pkgname=firmware-xiaomi-vince
 pkgver=4
-pkgrel=2
+pkgrel=1
 _commit="9acb58a25d66314700eeea15c69c4571154f19cc"
 pkgdesc="Firmware files for Xiaomi Redmi 5 Plus"
 url="https://postmarketos.org"
@@ -10,7 +10,7 @@ license="proprietary"
 source="vince-fw-$_commit.tar.gz::https://github.com/M0Rf30/postmarketos-vendor-xiaomi-vince/archive/$_commit.tar.gz"
 options="!strip !check !archcheck !spdx !tracedeps pmb:cross-native"
 builddir="$srcdir/postmarketos-vendor-xiaomi-vince-$_commit/gpu"
-_fwdir="/lib/firmware/qcom/msm8953/xiaomi/vince"
+_fwdir="/lib/firmware/postmarketos"
 
 package() {
 	# GPU firmwares

device/community/firmware-xiaomi-ysl/APKBUILD

@@ -1,7 +1,7 @@
 # Maintainer: Barnabas Czeman <trabarni@gmail.com>
 pkgname=firmware-xiaomi-ysl
 pkgver=3
-pkgrel=2
+pkgrel=1
 pkgdesc="Firmware files for Xiaomi Redmi S2/Y2"
 url="https://gitlab.com/barni2000/$pkgname"
 arch="aarch64"
@@ -13,7 +13,7 @@ _commit="ccfd274b825aec2d80e834b16499a6d9ba96c3f5"
 source="$pkgname-$_commit.tar.gz::$url/-/archive/$_commit/$pkgname-$_commit.tar.gz"
 builddir="$srcdir/$pkgname-$_commit/lib/firmware/postmarketos"
 
-_fwdir="/lib/firmware/qcom/msm8953/xiaomi/ysl"
+_fwdir="/lib/firmware/postmarketos"
 
 package() {
 	# GPU Firmware files

device/community/linux-google-veyron/APKBUILD

@@ -1,7 +1,7 @@
 # Maintainer: Jenneron <jenneron@protonmail.com>
 pkgname=linux-google-veyron
 pkgver=6.1.39
-pkgrel=5
+pkgrel=4
 pkgdesc="Mainline kernel for Google Veyron devices"
 arch="armv7"
 _carch="arm"
@@ -68,7 +68,7 @@ package() {
 
 sha512sums="
 20d468ae89b57dda82d7c7b814c3d8b1b510e1623775b09a8a0b0a8a0431461e0a1d2df2bfa01f3102932c8eef91405546898b50ec3e6f30015098bb39722b41  linux-6.1.39.tar.xz
-b41e30f8c2364b8945f899d47246ac84d8e55379dce1e8196753d2c07ea66453f1399e119ed8eafa546b7aa5090b1bf0a6ab5319bc7a248c8c8525bafa341a25  config-google-veyron.armv7
+3251546c093d41c3cd832d864a5f24b0de6da1e8ab2856bc7b168d450c450d66c82a141c0c4550ed124a3cf59745bdaef28eab6cef220e3fa8295889d222e1d3  config-google-veyron.armv7
 2912c675c1e07f7e91e2edcaa82738643907ed46614e4b871565930ff4ffece468d47db7905c2c081f936c020ea78db4a9d9f33b76c110125a0e68a1bd57f9fd  veyron.better_clock_selection_logic_and_dts_rate_list.patch
 b16da0e0b1da9f074a773300e954aa5e0da6c2113e20c0b594a7a4875e9addb10efcf5be694467fb00cd8d7c2e3cc83e6d7aac618047775dc0bb354245cf7c35  veyron.dts_allow_dedicating_npll_to_vop.patch
 b7bda162526abdb61c0223f1aac31893526d3d1d21d79ebd3e707be8d9b5dc464f6b4fa20b74444c44fda987352728433913f6f50b9b860c2621d11ae2306e1b  veyron.dts_do_dedicate_npll_to_vop.patch

device/community/linux-google-veyron/config-google-veyron.armv7

@@ -34,9 +34,9 @@ CONFIG_HAVE_KERNEL_LZMA=y
 CONFIG_HAVE_KERNEL_XZ=y
 CONFIG_HAVE_KERNEL_LZO=y
 CONFIG_HAVE_KERNEL_LZ4=y
-# CONFIG_KERNEL_GZIP is not set
+CONFIG_KERNEL_GZIP=y
 # CONFIG_KERNEL_LZMA is not set
-CONFIG_KERNEL_XZ=y
+# CONFIG_KERNEL_XZ is not set
 # CONFIG_KERNEL_LZO is not set
 # CONFIG_KERNEL_LZ4 is not set
 CONFIG_DEFAULT_INIT=""

device/community/linux-postmarketos-exynos5/APKBUILD

@@ -4,8 +4,8 @@
 # and Hardkernel's odroidxu4_defconfig
 
 pkgname=linux-postmarketos-exynos5
-pkgver=6.6.59
-pkgrel=0
+pkgver=6.6.41
+pkgrel=3
 pkgdesc="Mainline kernel fork for Samsung Exynos5 devices"
 arch="armv7"
 _carch="arm"
@@ -69,6 +69,6 @@ package() {
 }
 
 sha512sums="
-db6976d67236b2612c7dcbb201c1f0cad403358418cf359ec9a5e02eeeaa01aebb812eaa575ff7f986e3123e9a971bfe8587dc4ce1be750a88490644dcfe9545  linux-postmarketos-exynos5-v6.6.59-exynos5-lts.tar.bz2
-5cfee4cfbe30afeacf467a8db4dc98321e12a58bf9a2d55b8fd81a943b3c7bab4bbb88e115000636f83ae8d848fbb964dc20683f02b20c5e14b79f829d0cfda1  config-postmarketos-exynos5.armv7
+f82cebbe5683baca5f1e2f7c51d3132d84e52dc553170ed21229b8c2e3d46aa5abd06b5059f8fc336034d39a9040ad96b35c704f6d027b8cd32ead0f3d9e6036  linux-postmarketos-exynos5-v6.6.41-exynos5-lts.tar.bz2
+7c35ceb606c2eb8af6e9f594d61f2cf055488bfd788602ee000da6575bb7c9cae3d6be93ebb0d2f8371acc5f357990c35e0f53bb5c597b6fc6c972a0f68bb6a4  config-postmarketos-exynos5.armv7
 "

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

@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 6.6.59 Kernel Configuration
+# Linux/arm 6.6.41 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="armv7-alpine-linux-musleabihf-gcc (Alpine 14.2.0) 14.2.0"
 CONFIG_CC_IS_GCC=y
@@ -847,7 +847,6 @@ CONFIG_COMPACT_UNEVICTABLE_DEFAULT=1
 # CONFIG_PAGE_REPORTING is not set
 CONFIG_MIGRATION=y
 CONFIG_CONTIG_ALLOC=y
-CONFIG_PCP_BATCH_SCALE_MAX=5
 CONFIG_PHYS_ADDR_T_64BIT=y
 CONFIG_BOUNCE=y
 # CONFIG_KSM is not set
@@ -4246,7 +4245,7 @@ CONFIG_BACKLIGHT_PWM=y
 # CONFIG_BACKLIGHT_ADP8870 is not set
 # CONFIG_BACKLIGHT_LM3630A is not set
 # CONFIG_BACKLIGHT_LM3639 is not set
-CONFIG_BACKLIGHT_LP855X=m
+# CONFIG_BACKLIGHT_LP855X is not set
 # CONFIG_BACKLIGHT_GPIO is not set
 # CONFIG_BACKLIGHT_LV5207LP is not set
 # CONFIG_BACKLIGHT_BD6107 is not set
@@ -4735,7 +4734,6 @@ CONFIG_HID_ZYDACRON=m
 CONFIG_HID_SENSOR_HUB=m
 CONFIG_HID_SENSOR_CUSTOM_SENSOR=m
 CONFIG_HID_ALPS=m
-# CONFIG_HID_MCP2200 is not set
 CONFIG_HID_MCP2221=m
 # end of Special HID drivers
 
@@ -5003,13 +5001,13 @@ CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2
 # end of USB Peripheral Controller
 
 CONFIG_USB_LIBCOMPOSITE=y
-CONFIG_USB_F_ACM=y
-CONFIG_USB_U_SERIAL=y
+CONFIG_USB_F_ACM=m
+CONFIG_USB_U_SERIAL=m
 CONFIG_USB_U_ETHER=y
 CONFIG_USB_F_NCM=y
-CONFIG_USB_F_ECM=y
+CONFIG_USB_F_ECM=m
 CONFIG_USB_F_RNDIS=y
-CONFIG_USB_F_MASS_STORAGE=y
+CONFIG_USB_F_MASS_STORAGE=m
 CONFIG_USB_CONFIGFS=y
 # CONFIG_USB_CONFIGFS_SERIAL is not set
 CONFIG_USB_CONFIGFS_ACM=y
@@ -5046,7 +5044,7 @@ CONFIG_USB_CONFIGFS_MASS_STORAGE=y
 # CONFIG_USB_G_SERIAL is not set
 # CONFIG_USB_MIDI_GADGET is not set
 # CONFIG_USB_G_PRINTER is not set
-CONFIG_USB_CDC_COMPOSITE=y
+CONFIG_USB_CDC_COMPOSITE=m
 CONFIG_USB_G_ACM_MS=m
 # CONFIG_USB_G_MULTI is not set
 # CONFIG_USB_G_HID is not set
@@ -6630,9 +6628,6 @@ CONFIG_ENCRYPTED_KEYS=y
 # CONFIG_USER_DECRYPTED_DATA is not set
 CONFIG_KEY_DH_OPERATIONS=y
 # CONFIG_SECURITY_DMESG_RESTRICT is not set
-CONFIG_PROC_MEM_ALWAYS_FORCE=y
-# CONFIG_PROC_MEM_FORCE_PTRACE is not set
-# CONFIG_PROC_MEM_NO_FORCE is not set
 # CONFIG_SECURITY is not set
 CONFIG_SECURITYFS=y
 # CONFIG_HARDENED_USERCOPY is not set

device/community/linux-postmarketos-qcom-msm8953/APKBUILD

@@ -5,7 +5,7 @@
 
 _flavor="postmarketos-qcom-msm8953"
 pkgname=linux-$_flavor
-pkgver=6.11.6
+pkgver=6.11.1
 pkgrel=0
 pkgdesc="Close to mainline linux kernel for Qualcomm Snapdragon MSM8953"
 arch="aarch64"
@@ -27,7 +27,7 @@ makedepends="
 	python3
 "
 
-_tag="$pkgver-r1"
+_tag="$pkgver-r0"
 
 source="
 	$pkgname-v$_tag.tar.gz::$url/archive/v$_tag.tar.gz
@@ -61,6 +61,6 @@ package() {
 		"$pkgdir/usr/share/kernel/$_flavor/kernel.release"
 }
 sha512sums="
-d88be9e01b728f18f7b588e217683e282ec69fd37d05089a44aac860ee1d22513a08ad8626b254dc3866dbb57c20dfa21d9458962ba1855e245ce7241a7b5716  linux-postmarketos-qcom-msm8953-v6.11.6-r1.tar.gz
-2f48f7c05b986f30d4cb8f84bc586d7e1fba654d0f17c6b8d7f52b4257a2d2354d6162cae28bb4a027b445c82119908bcf2023c2409891d4368aa2fbf0f54595  config-postmarketos-qcom-msm8953.aarch64
+1a3778c6c6e05691cdee6358ad76f7b4853a02c2db1be655701db88cc7d68c3ae2355af1a962db052e7622bf7ab30e6b8b03b3e39f26d6e19d035e2a9e17195f  linux-postmarketos-qcom-msm8953-v6.11.1-r0.tar.gz
+49a4f6b018076411909267ac9f2f18544861f2b37e97b3af7828ffd6cf7d89179e43e0eefb5400279577083c471aaa418f79d0869699177265dc76ce4417cf79  config-postmarketos-qcom-msm8953.aarch64
 "

device/community/linux-postmarketos-qcom-msm8953/config-postmarketos-qcom-msm8953.aarch64

@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 6.11.6 Kernel Configuration
+# Linux/arm64 6.11.1 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="aarch64-alpine-linux-musl-gcc (Alpine 14.2.0) 14.2.0"
 CONFIG_CC_IS_GCC=y
@@ -3329,6 +3329,7 @@ CONFIG_V4L_MEM2MEM_DRIVERS=y
 #
 # Chips&Media media platform drivers
 #
+# CONFIG_VIDEO_E5010_JPEG_ENC is not set
 
 #
 # Intel media platform drivers
@@ -3367,6 +3368,7 @@ CONFIG_VIDEO_QCOM_VENUS=m
 #
 # Raspberry Pi media platform drivers
 #
+# CONFIG_VIDEO_RASPBERRYPI_PISP_BE is not set
 
 #
 # Renesas media platform drivers
@@ -3744,7 +3746,6 @@ CONFIG_DRM_PANEL_HUAWEI_MILAN_TIANMA_OTM1906C=m
 CONFIG_DRM_PANEL_LENOVO_CD_18781Y_FT8201=m
 CONFIG_DRM_PANEL_LENOVO_CD_18781Y_HX83100A=m
 CONFIG_DRM_PANEL_LENOVO_CD_18781Y_JD9365=m
-CONFIG_DRM_PANEL_LENOVO_KUNTAO_549=m
 CONFIG_DRM_PANEL_MDSS_FT8716_FHD=m
 CONFIG_DRM_PANEL_MDSS_ILI7807_FHD=m
 CONFIG_DRM_PANEL_MDSS_ILI7807_FHDPLUS=m
@@ -4209,7 +4210,7 @@ CONFIG_SND_SOC_SPDIF=m
 # CONFIG_SND_SOC_TDA7419 is not set
 CONFIG_SND_SOC_TFA9872=m
 # CONFIG_SND_SOC_TFA9879 is not set
-CONFIG_SND_SOC_TFA989X=m
+# CONFIG_SND_SOC_TFA989X is not set
 # CONFIG_SND_SOC_TLV320ADC3XXX is not set
 # CONFIG_SND_SOC_TLV320AIC23_I2C is not set
 # CONFIG_SND_SOC_TLV320AIC23_SPI is not set
@@ -5851,7 +5852,7 @@ CONFIG_IIO_ST_LSM6DSX_SPI=m
 # CONFIG_BH1780 is not set
 # CONFIG_CM32181 is not set
 # CONFIG_CM3232 is not set
-CONFIG_CM3323=m
+# CONFIG_CM3323 is not set
 # CONFIG_CM3605 is not set
 # CONFIG_CM36651 is not set
 # CONFIG_GP2AP002 is not set
@@ -6498,9 +6499,6 @@ CONFIG_KEYS=y
 CONFIG_KEY_DH_OPERATIONS=y
 # CONFIG_KEY_NOTIFICATIONS is not set
 # CONFIG_SECURITY_DMESG_RESTRICT is not set
-CONFIG_PROC_MEM_ALWAYS_FORCE=y
-# CONFIG_PROC_MEM_FORCE_PTRACE is not set
-# CONFIG_PROC_MEM_NO_FORCE is not set
 CONFIG_SECURITY=y
 CONFIG_SECURITYFS=y
 # CONFIG_SECURITY_NETWORK is not set

device/community/soc-qcom-msm8953/APKBUILD

@@ -1,8 +1,8 @@
 # Maintainer: Barnabas Czeman <trabarni@gmail.com>
 pkgname=soc-qcom-msm8953
 pkgdesc="Common package for Qualcomm MSM8953 devices"
-pkgver=11
-pkgrel=0
+pkgver=10
+pkgrel=1
 url="https://postmarketos.org"
 license="BSD-3-Clause"
 arch="aarch64"
@@ -15,7 +15,7 @@ subpackages="
 	$pkgname-ucm
 "
 
-_ucm_commit="f6dfc9b072e74b0ab2afcf452bc106242049ef28"
+_ucm_commit="b6860eae577ddea6f55834850fb4ed403f208d2f"
 source="
 	$pkgname-$_ucm_commit.tar.gz::https://github.com/msm8953-mainline/alsa-ucm-conf/archive/$_ucm_commit.tar.gz
 	90-feedbackd-pm8xxx-vib.rules
@@ -68,7 +68,7 @@ gpu() {
 }
 
 sha512sums="
-8aadc874c8a334e46c7bf630874c3035070aa7b9052deba1a28ae059ab9d63dd99dfb82c1a58d09da5063ad250de813e3974e040ce938a53347e390ce2e450eb  soc-qcom-msm8953-f6dfc9b072e74b0ab2afcf452bc106242049ef28.tar.gz
+a7e6ca9fa3409403af780dfd97d2c5f502c54bf5877123739a893050a77d62ceeeafd73674fd34fe69eb7e1fffdb790f6df75633e6afd49b1c74da5f9c480047  soc-qcom-msm8953-b6860eae577ddea6f55834850fb4ed403f208d2f.tar.gz
 90fca4a3291a2c84c0b20e41308c4698374ba896e9365ca80dbfd0c0c4f7dc08317f3dd865a3c7f6707c81b02f5bb24136d1172253d2e4fdd50039bbbf02a178  90-feedbackd-pm8xxx-vib.rules
 3a4a9322839d4b3ef9d79668a37840a9f444954759ae3c512e694051d2f9a2573db42ad6c4c1a5c75eeb861232a27ba1a8cef9b503decd54ead25a96e3dd6f98  q6voiced.conf
 d546c99ca8d406b4e2e3901a417e4e461314a38f2f01c48525e44ca524ad57af7bfc280f416bda90573b0bfb1cca27d45cb0a0ed44e999ef8d406a380d1fdbb2  adreno-a506-quirks.sh

device/main/linux-postmarketos-allwinner/APKBUILD

@@ -3,9 +3,9 @@
 _flavor=postmarketos-allwinner
 _config="config-$_flavor.$CARCH"
 pkgname=linux-$_flavor
-pkgver=6.11.8_git20241114
+pkgver=6.11.5_git20241029
 pkgrel=0
-_tag="orange-pi-6.11-20241114-1547"
+_tag="orange-pi-6.11-20241029-1901"
 pkgdesc="Kernel fork with Pine64 patches (megi's tree, slightly patched)"
 arch="aarch64 armv7"
 url="https://megous.com/git/linux/"
@@ -79,9 +79,9 @@ package() {
 		INSTALL_DTBS_PATH="$pkgdir/boot/dtbs"
 }
 sha512sums="
-03d64d86df1772ccb83d5a392fb1e60d147ba6383a80d711807d8240dd6df55061a36bee54c98a0ff444362fe6467aca49b659b56e9c29c7a3b5bc378dcd313f  linux-postmarketos-allwinner-orange-pi-6.11-20241114-1547.tar.gz
-8f5131f091dc85f81edc8a633a90b13f2babe749f13850338d53b9df4f9d20e9721f75a444e6a270e275c41df56762477ef332718d3440011ee773c6da92c668  config-postmarketos-allwinner.aarch64
-057ec34ae439941a18ce57e6c52976858c0e1abe00aa03b6173434d385e47bf744faeb1570665bb09e2f1f9cffea7764f8e667dc2ce29654d7d9bf256c0745c8  config-postmarketos-allwinner.armv7
+95a3a4fd30b53ac43e1d5f181bfb415e66fdf3eb9e2265ace36c9e099ce26e6dfc4509a721f56bf1bbd25ae3f97e255838ffbf84fe24bb89c54054c22c961855  linux-postmarketos-allwinner-orange-pi-6.11-20241029-1901.tar.gz
+a306025dcc859e8f3001734704b89206de26b92c88af035eb08f0c041d47bad5ff6c597405fbf0d4f9d1672c156eac6bd0189ecdf7d8a565c9cc7c6b948888dd  config-postmarketos-allwinner.aarch64
+51106cf76390a68e84ac3c7e9e92d3b8d4009fb65b001e0dd0fe12f722f07dd47f26af63cf9170dd08dc20c07467b974639aca93d2f4333f595a41a26200aa27  config-postmarketos-allwinner.armv7
 54bb653f2eec755d831e4c3c7d5a202c09e8d738335d79664879fea6783c54ea74a935259e77bbbe748138a17e92f421ab3e6bd5b07f7e970fd7b22deebcb84b  0001-dts-add-dontbeevil-pinephone-devkit.patch
 1bfff7c0bd3c6761520c444968b9d61b9c43a733d398628dbe12134858a2803b4761117cd2946e86595a3dd2cbffb395c075502dafa40d9fa97e298f49701eb2  0002-dts-add-pinetab-dev-old-display-panel.patch
 91d10d8d377e3f957f76b634a2e075a8927462621610a12be3fbb7e233580bfbb41e0bc5dab06d16eb59fda54a61c4d0415de7b07a7a3de4b46c7f33d7c00aa3  0003-dts-pinetab-add-missing-ohci1.patch

device/main/linux-postmarketos-allwinner/config-postmarketos-allwinner.aarch64

@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 6.11.8 Kernel Configuration
+# Linux/arm64 6.11.5 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="aarch64-alpine-linux-musl-gcc (Alpine 14.2.0) 14.2.0"
 CONFIG_CC_IS_GCC=y
@@ -514,6 +514,7 @@ CONFIG_ARM64_EPAN=y
 # end of ARMv8.7 architectural features
 
 CONFIG_ARM64_SVE=y
+CONFIG_ARM64_SME=y
 # CONFIG_ARM64_PSEUDO_NMI is not set
 CONFIG_RELOCATABLE=y
 # CONFIG_RANDOMIZE_BASE is not set

device/main/linux-postmarketos-allwinner/config-postmarketos-allwinner.armv7

@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 6.11.8 Kernel Configuration
+# Linux/arm 6.11.5 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="armv7-alpine-linux-musleabihf-gcc (Alpine 14.2.0) 14.2.0"
 CONFIG_CC_IS_GCC=y

device/testing/device-acer-aspire1/APKBUILD

@@ -2,7 +2,7 @@
 # Maintainer: Nikita Travkin <nikita@trvn.ru>
 pkgname=device-acer-aspire1
 pkgdesc="Acer Aspire 1"
-pkgver=5
+pkgver=4
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -68,7 +68,7 @@ nonfree_firmware() {
 }
 
 sha512sums="
-9506c0095105a9d0d1107dd561790b304001b6759f22f0beb0857528e4af90017c40a1cc394e695c46290ddec7f5358d7257429f124e242c8fd50f93bb327947  deviceinfo
+9f0aafaea32377cc8a9ed05c82dacf237f3149f325d34cc7784565596cca0ca2f0858dbe37573872c96b3264dbd9e8ceeb3a7af614aa0fccf501880d4ea38083  deviceinfo
 99b3c6fee1e4088ad0246170b6884c5f342893efa4d4846c4e9fa47fbf58f2dc655b8379f465e7d690621630804634533392254fc4305fea6d292a9d5eb4795a  modules-initfs
 0626518d52fb56b80115e333030abe409fb5ca13aa7c13387e3f41e7d34c3b7c7da3ff06dd7062b79b5472f93119100bffa98f32f05f530623ccca7282777302  sc7180.conf
 ee33efa68a091f47ecaf51fc05f43fb7d5c62ec3eeaacb917dc1438edc4636eaba52c336645bf8a555b68b366a7dc40baf55895595ac7ac66cdeaa7ede86a72f  init.conf

device/testing/device-acer-aspire1/deviceinfo

@@ -18,7 +18,7 @@ deviceinfo_screen_height="1080"
 
 # Bootloader related
 deviceinfo_flash_method="none"
-deviceinfo_kernel_cmdline="efi=novamap,noruntime deferred_probe_timeout=30 quiet loglevel=2"
+deviceinfo_kernel_cmdline="efi=novamap,noruntime deferred_probe_timeout=30 console=null"
 deviceinfo_generate_systemd_boot="true"
 deviceinfo_boot_filesystem="fat32"
 deviceinfo_partition_type="gpt"

device/testing/device-amediatech-x96-mini/APKBUILD

@@ -1,8 +1,8 @@
 # Reference: <https://postmarketos.org/devicepkg>
 # Maintainer: exkc <exxxxkc@getgoogleoff.me>
 pkgname=device-amediatech-x96-mini
-pkgver=2
-pkgrel=0
+pkgver=1
+pkgrel=4
 pkgdesc="Amediatech X96 mini"
 url="https://postmarketos.org"
 license="MIT"
@@ -32,6 +32,6 @@ nonfree_firmware() {
 
 sha512sums="
 981ef458837524b2b1922e7bc5abd4936d629e3f83e92062b46597cef985b65fdb90900de1ef93a7d741b9b0ac4b41cef9c3c2625181ff0e10effc22cb2fa3a3  asound.state
-c7d9003f62a5622b2bf70a2a6a9affbc803b71d687db5775ff608b69eb2eab2c8d52fe6cda93d27a0f01e2c04c9d19952ac382014319080491afc0af3ae37162  deviceinfo
+2944571d84d2c3b622ce1e12913e341a6c323f23d7bda5470000717e297e5d04f3486f515aaaf11dae8c85848a8b5a30056110d61e97a0cd0e4eb9e6d4a81aeb  deviceinfo
 b9f3e1902c17909de928c99868265a257ba5873f6ea6aa1097ad10721f59d68342d50ee51992472ecd23722f7664a13dd15f4e26071a40595c7c3e5161e533d7  modules-initfs
 "

device/testing/device-amediatech-x96-mini/deviceinfo

@@ -24,5 +24,5 @@ deviceinfo_sd_embed_firmware="u-boot/amediatech-x96-mini/u-boot.bin.sd-stripped.
 deviceinfo_boot_part_start="4096"
 deviceinfo_generate_extlinux_config="true"
 # Kernel options
-deviceinfo_kernel_cmdline="quiet loglevel=2"
+deviceinfo_kernel_cmdline="console=null"
 

device/testing/device-asus-zenfone3/APKBUILD

@@ -1,53 +0,0 @@
-# Maintainer: Antony Kurniawan S. <postmarketos@smankusors.com>
-pkgname=device-asus-zenfone3
-pkgdesc="Asus Zenfone 3"
-pkgver=1
-pkgrel=1
-url="https://postmarketos.org"
-license="MIT"
-arch="aarch64"
-options="!check !archcheck"
-depends="
-	firmware-asus-zenfone3
-	firmware-qcom-adreno-a530
-	lk2nd-msm8953
-	mkbootimg
-	msm-firmware-loader
-	postmarketos-base
-	soc-qcom-msm8953
-	soc-qcom-msm8953-modem
-"
-makedepends="devicepkg-dev"
-subpackages="
-	$pkgname-kernel-ze520kl:kernel_ze520kl
-	$pkgname-kernel-ze552kl:kernel_ze552kl
-"
-source="
-	deviceinfo
-	modules-initfs
-"
-
-build() {
-	devicepkg_build $startdir $pkgname
-}
-
-package() {
-	devicepkg_package $startdir $pkgname
-}
-
-kernel_ze520kl() {
-	depends="linux-postmarketos-qcom-msm8953"
-	pkgdesc="Asus Zenfone 3 (ZE520KL)"
-	devicepkg_subpackage_kernel $startdir $pkgname $subpkgname
-}
-
-kernel_ze552kl() {
-	depends="linux-postmarketos-qcom-msm8953"
-	pkgdesc="Asus Zenfone 3 (ZE552KL)"
-	devicepkg_subpackage_kernel $startdir $pkgname $subpkgname
-}
-
-sha512sums="
-7070801470fe2e7ba2ea5cee79ec52d65ad7ff6bdc995283061aeb4967102082602bacb342d38bfa6589bb2e0140cbd71063803039b1e4eb861867c05232f588  deviceinfo
-a4c56173941e88434073d9980a687a82956fbcaaaf15068fd2b4fd9351011a934c82f67e62ce87440876d673784938cfdaedc70ae03e1943c95baef6205567b1  modules-initfs
-"

device/testing/device-asus-zenfone3/deviceinfo

@@ -1,34 +0,0 @@
-# Reference: <https://postmarketos.org/deviceinfo>
-# Please use double quotes only. You can source this file in shell
-# scripts.
-
-deviceinfo_format_version="0"
-deviceinfo_name="Asus Zenfone 3"
-deviceinfo_manufacturer="Asus"
-deviceinfo_codename="asus-zenfone3"
-deviceinfo_year="2016"
-deviceinfo_dtb_ze520kl="qcom/msm8953-asus-ze520kl"
-deviceinfo_dtb_ze552kl="qcom/msm8953-asus-ze552kl"
-deviceinfo_append_dtb="true"
-deviceinfo_arch="aarch64"
-
-# Device related
-deviceinfo_gpu_accelerated="true"
-deviceinfo_chassis="handset"
-deviceinfo_keyboard="false"
-deviceinfo_external_storage="true"
-deviceinfo_getty="ttyMSM0;115200"
-
-# Bootloader related
-deviceinfo_flash_method="fastboot"
-deviceinfo_generate_extlinux_config="true"
-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"
-deviceinfo_flash_offset_kernel="0x00008000"
-deviceinfo_flash_offset_ramdisk="0x01000000"
-deviceinfo_flash_offset_second="0x00f00000"
-deviceinfo_flash_offset_tags="0x00000100"

device/testing/device-asus-zenfone3/modules-initfs

@@ -1,7 +0,0 @@
-msm
-panel_asus_ze520kl_ili7807b_boe
-panel_asus_ze520kl_r63350_tm
-panel_asus_ze552kl_ili7807b_ctc
-panel_asus_ze552kl_nt35596_txd
-panel_asus_ze552kl_otm1901a_lce
-panel_asus_ze552kl_r63350_tm

device/testing/device-google-asurada/APKBUILD

@@ -2,7 +2,7 @@
 # Maintainer: Jenneron <jenneron@protonmail.com>
 pkgname=device-google-asurada
 pkgdesc="Google Asurada Chromebooks"
-pkgver=4
+pkgver=3
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -35,6 +35,6 @@ nonfree_firmware() {
 }
 
 sha512sums="
-6e5effd7bb0fc9b976936d6f31b7709ec854327f4aec3cd7eb28c32a491316c299f01c74a38fc79901b9ed787b7cdc944c2544bf0fd0331b5725135f006c741d  deviceinfo
+d497233fa521d67a04a87d6c1ca0c4360fc182856f9db1eff46f567127f258aa2516b1fbc4b0d1881f08204656b48b899becc7bdf6cbc6299dd6302505767495  deviceinfo
 d90b91bd2bb409941878ebadf8d28ef66406edb64cbcac99443c3e0c072801ba94ec9fa3b551f59b8a27a33c7a34f511604bd30328195fc261f927d87138801d  modules-initfs
 "

device/testing/device-google-asurada/deviceinfo

@@ -18,7 +18,7 @@ deviceinfo_gpu_accelerated="true"
 deviceinfo_disable_dhcpd="true"
 
 # Bootloader related
-deviceinfo_kernel_cmdline="quiet loglevel=2"
+deviceinfo_kernel_cmdline="console=null"
 deviceinfo_flash_method="none"
 deviceinfo_cgpt_kpart="/boot/vmlinuz.kpart"
 deviceinfo_cgpt_kpart_start="8192"

device/testing/device-google-blueline/10-unl0kr.conf

@@ -1,2 +0,0 @@
-[quirks]
-fbdev_force_refresh=true

device/testing/device-google-blueline/APKBUILD

@@ -5,7 +5,7 @@
 
 pkgname=device-google-blueline
 pkgdesc="Google Pixel 3"
-pkgver=2
+pkgver=1
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -24,7 +24,6 @@ depends="
 "
 makedepends="devicepkg-dev"
 source="
-	10-unl0kr.conf
 	deviceinfo
 	modules-initfs
 "
@@ -35,13 +34,9 @@ build() {
 
 package() {
 	devicepkg_package $startdir $pkgname
-
-	install -Dm644 "$srcdir"/10-unl0kr.conf \
-		"$pkgdir"/etc/unl0kr.conf.d/10-unl0kr.conf
 }
 
 sha512sums="
-e957b7b0ed219eaa56be6c6b976b60886f73970703fdebf045800154ee652affee4e19654b3ac4244b29bcf6760ad3db6cb87143dc9c4673e905800d751103d1  10-unl0kr.conf
 1a6c56470ccf94a51d235b011d0069ed028f781eb94863759113b62646138e3a8a34936536715eb908b5bea06c360567b0f217427fc4e5b34a617388072367ec  deviceinfo
-c8b486aefd8b65676a7466d65df9c3e227efb372df3970085f01aff985ea2bb6e545bd83a91d944659b99e08e47770b066c1fdcd731e2d92767f8b35dab97c5b  modules-initfs
+e92b431723994d0edc9d946d45746282d7ff25d13b799bada703ba13669de131a97f317ed0fecdedeefea7879a06bafe1df7e4a42f86c46e9e4f30309a928b15  modules-initfs
 "

device/testing/device-google-blueline/modules-initfs

@@ -3,5 +3,4 @@ rmi_core
 rmi_i2c
 qcom_fg
 qcom_pmi8998_charger
-gpi
 ftm5

device/testing/device-google-cherry/APKBUILD

@@ -2,7 +2,7 @@
 # Maintainer: Jenneron <jenneron@protonmail.com>
 pkgname=device-google-cherry
 pkgdesc="Google Cherry Chromebooks"
-pkgver=4
+pkgver=3
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -35,6 +35,6 @@ nonfree_firmware() {
 }
 
 sha512sums="
-a48ef8e74b8aa39dfbedd2a516ce83b2a8399df969adf8bef2830071d844bbc75b9680099cf37c90e47e01be993ba1d403573ae0b349223b07cf0c788fe56126  deviceinfo
+6661b7c7a880dc3991921b1395ea48023a641b2d3f8e46d005b5778fed1bc5b5c0d55fa5d43499f00bb7453fde8d644ba3ae50d98de10f2daa62ad34bd1580c9  deviceinfo
 bb7f9a426bfa151c53089f07fd4e874b1fb69fd8180a584b4c9824e2d5ea1e7678602d74eb641b2640b692fec73b88acc78ca26ba9c9f3b8ac8366c6fb63dd5f  modules-initfs
 "

device/testing/device-google-cherry/deviceinfo

@@ -18,7 +18,7 @@ deviceinfo_gpu_accelerated="true"
 deviceinfo_disable_dhcpd="true"
 
 # Bootloader related
-deviceinfo_kernel_cmdline="quiet loglevel=2"
+deviceinfo_kernel_cmdline="console=null"
 deviceinfo_flash_method="none"
 deviceinfo_cgpt_kpart="/boot/vmlinuz.kpart"
 deviceinfo_cgpt_kpart_start="8192"

device/testing/device-google-corsola/APKBUILD

@@ -2,7 +2,7 @@
 # Maintainer: Jenneron <jenneron@protonmail.com>
 pkgname=device-google-corsola
 pkgdesc="Google Corsola Chromebooks"
-pkgver=5
+pkgver=4
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -58,7 +58,7 @@ nonfree_firmware() {
 }
 
 sha512sums="
-2298eb85c97d4a6c716c85ff7b15e6d7604f12be9918d64e55d7742b519626111e347964220eaa0a5cb5c4974cd0f0001e891488ded23e851465bf9202a7035d  deviceinfo
+2e00f2483bc135ececdc0e4428bab92798a1b43f7ddf6c6440d41313695bf2162ca56ab8931392e05a20aaf0b8dfd08d5f6c21e9bfbf3b734d06337bd8f254bb  deviceinfo
 56fdcaa7a610497ed1bddbbfc0850f895bcfd79173b2e7de4bcf196f69120e1b62680da2a0b74543f153cb3d2b84055e71e258e7df938913aff66dca47061d7a  modules-initfs
 d33545d435755c2cca3b916d920464f3f711c6f09f48b68622f740f389c4faf95544467d9e3b418e562fadb8141ae37f2311166f228d5149434183736710567d  alsa-ucm-conf-b728563a07ebcd05545c60989412ae023b1dd06d.tar.gz
 "

device/testing/device-google-corsola/deviceinfo

@@ -18,7 +18,7 @@ deviceinfo_gpu_accelerated="true"
 deviceinfo_disable_dhcpd="true"
 
 # Bootloader related
-deviceinfo_kernel_cmdline="quiet loglevel=2"
+deviceinfo_kernel_cmdline="console=null"
 deviceinfo_flash_method="none"
 deviceinfo_cgpt_kpart="/boot/vmlinuz.kpart"
 deviceinfo_cgpt_kpart_start="8192"

device/testing/device-google-nyan-big/APKBUILD

@@ -3,7 +3,7 @@
 # Co-Maintainer: Jenneron <jenneron@protonmail.com>
 pkgname=device-google-nyan-big
 pkgdesc="Acer Chromebook 13 CB5-311 / Acer Chromebook C810"
-pkgver=6
+pkgver=5
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -105,7 +105,7 @@ sway() {
 
 sha512sums="
 793688374d77efaf050c187d296d7fd55243773a1257b4d8adfa4cda50d4c0cacc035fb3d419a4b608989ed920636048680d900afe8a712f2166edf51552087a  30-xusb-firmware.files
-387d9a80affd98c0701c97ddba51ec7b71cdc7776296f02c525663a4189e0ae9a22018a1fd818f9d160f7993d62eeb008f5bfc073ac3c2bd1fea898e585b79f9  deviceinfo
+b6d5870f2de9c589d679e12344e2aad1267c45195401dbabfc612d9bf7a6cabf33b20f11f633ae4c48e2bd4ce50b68d2f058a0a04419122d0686e45b98c57b42  deviceinfo
 8cf99819584972f96c2342d6fa945bea13f0f374d1525d3b35c41137f4cce71ade20b927072e16c1e354f2a62018bd6c9bed2923a0afa127cc0b9bd645fc3937  modules-initfs
 e6c5382b6f7dd10f350136d65a714de3ae337978c3ca88e63f016b4a42be87b422d2388fbf6d6a2feba15516fb9b409f6c5ff08968829e6fc2d1e8aeb9d3c508  gpu.conf
 8f9dc3c7caeab6c5321dc2bf498f1a03a793f23cb776763316bc356b9d433d7a3337e61154069464dcda200bf390b99f3be8f657a40c6d2f6be3cbc6fb751080  mpv.conf.wayland

device/testing/device-google-nyan-big/deviceinfo

@@ -23,7 +23,7 @@ deviceinfo_create_initfs_extra="true"
 
 # Bootloader related
 deviceinfo_flash_method="none"
-deviceinfo_kernel_cmdline="quiet loglevel=2"
+deviceinfo_kernel_cmdline="console=null"
 deviceinfo_cgpt_kpart="/boot/vmlinuz.kpart"
 deviceinfo_cgpt_kpart_start="8192"
 deviceinfo_cgpt_kpart_size="32768"

device/testing/device-google-nyan-blaze/APKBUILD

@@ -2,7 +2,7 @@
 # Maintainer: Jenneron <jenneron@protonmail.com>
 pkgname=device-google-nyan-blaze
 pkgdesc="HP Chromebook 14 G3"
-pkgver=6
+pkgver=5
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -74,7 +74,7 @@ sway() {
 
 sha512sums="
 793688374d77efaf050c187d296d7fd55243773a1257b4d8adfa4cda50d4c0cacc035fb3d419a4b608989ed920636048680d900afe8a712f2166edf51552087a  30-xusb-firmware.files
-5b780b9248a171623d561f75aa3409a10f9ce51b56de71712ee63723cf131eb777aa0f952325dda944b9c455acd4bc3547034d3fd2b4bbda402a48c4e6e7dbf2  deviceinfo
+dad80578c0087b3a843d1bc6817ee6f14790de84f6987a66aeaff13b2199c8c7cd9a65decd0f1295025ada2f978c5499249b8e2a949397c7180bab80c0f66aa6  deviceinfo
 8cf99819584972f96c2342d6fa945bea13f0f374d1525d3b35c41137f4cce71ade20b927072e16c1e354f2a62018bd6c9bed2923a0afa127cc0b9bd645fc3937  modules-initfs
 e6c5382b6f7dd10f350136d65a714de3ae337978c3ca88e63f016b4a42be87b422d2388fbf6d6a2feba15516fb9b409f6c5ff08968829e6fc2d1e8aeb9d3c508  gpu.conf
 8f9dc3c7caeab6c5321dc2bf498f1a03a793f23cb776763316bc356b9d433d7a3337e61154069464dcda200bf390b99f3be8f657a40c6d2f6be3cbc6fb751080  mpv.conf.wayland

device/testing/device-google-nyan-blaze/deviceinfo

@@ -22,7 +22,7 @@ deviceinfo_create_initfs_extra="true"
 
 # Bootloader related
 deviceinfo_flash_method="none"
-deviceinfo_kernel_cmdline="quiet loglevel=2"
+deviceinfo_kernel_cmdline="console=null"
 deviceinfo_cgpt_kpart="/boot/vmlinuz.kpart"
 deviceinfo_cgpt_kpart_start="8192"
 deviceinfo_cgpt_kpart_size="32768"

device/testing/device-google-smaug/APKBUILD

@@ -1,7 +1,7 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-google-smaug
 pkgdesc="Google Pixel C"
-pkgver=3
+pkgver=2
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -39,6 +39,6 @@ nonfree_firmware() {
 
 sha512sums="
 80d1ff3ae3045cb071d0eb7ac53cebccfe363a9584ef806e7b79309231c58d00f89612423440526a08b14fc80e96162b8f429f453f662d4c438c787fa45ef122  30-xusb-firmware.files
-1ee3d0eada4435181f8c70ead25f1dbd1afc6389819afc5c1fb0d45ee6ab936fd52352a3362697e6a8f27fe5fa8f8149b7a602eaf60f908010b4e265fd8073e7  deviceinfo
+36a0f0046f63e6b17cbc4f58e80f9f75048bdbe9a7c767b08e82ca476ba595d49aca8aa2f1712753bd42b2bfd7a45275a78e89b8b3e2576aa571fe6f057a99e3  deviceinfo
 d883fa37ea89379aec31e518714adbef76d0c260929deb05c131c5df4c532344f3358a82cc39e81d06da821df81171709cd9dc20837795bee6834c34d4dfa47a  modules-initfs
 "

device/testing/device-google-smaug/deviceinfo

@@ -20,7 +20,7 @@ deviceinfo_disable_dhcpd="true"
 
 # Bootloader related
 deviceinfo_flash_method="fastboot"
-deviceinfo_kernel_cmdline="quiet loglevel=2"
+deviceinfo_kernel_cmdline="console=null"
 deviceinfo_cgpt_kpart="/boot/boot.img"
 deviceinfo_cgpt_kpart_start="8192"
 deviceinfo_cgpt_kpart_size="65536"

device/testing/device-htc-protou/APKBUILD

@@ -1,7 +1,7 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-htc-protou
 pkgdesc="HTC Desire X"
-pkgver=2
+pkgver=1
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -36,7 +36,7 @@ nonfree_firmware() {
 }
 
 sha512sums="
-8c040ba13c2fdcada448852f89e74c3bc5b9ecbd9fd80c30462e87c8a529843fdf060be3a06876d8bc638201032884d6ad8011b22e9afc4112f72920ffd5ff75  deviceinfo
+7afbcb20a7cf0fa87de438b852b06fa86e223c2ac98cc7f5dedba2bed45d56315a86a23cee18c990bb6dd139606098beda1325186519d175725d3a23749e1313  deviceinfo
 b49562b112ac966896d152ba30548f5b863cc94359fb02a8b75ec43a2c1229a852a218d50201628c0cbee3b88b68136163716e78dcc4ec71401ff9dc8340e016  initfs-hook.sh
 e76d0a2e1a9b611e811f6c0c90201f019ef435132ea4e7119e6179ffc99ba72c5fb6c3bdd1041ff06186d75a163bf3443d0c073c7fe1b55c10b58af53ada163a  pointercal
 "

device/testing/device-htc-protou/deviceinfo

@@ -18,7 +18,7 @@ deviceinfo_dev_touchscreen="/dev/input/event1"
 
 # Bootloader related
 deviceinfo_flash_method="fastboot"
-deviceinfo_kernel_cmdline="no_console_suspend=1 quiet loglevel=2"
+deviceinfo_kernel_cmdline="no_console_suspend=1 console=null"
 deviceinfo_generate_bootimg="true"
 deviceinfo_bootimg_qcdt="false"
 deviceinfo_flash_offset_base="0x03200000"

device/testing/device-inet-a33/APKBUILD

@@ -1,7 +1,7 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-inet-a33
 pkgdesc="iNet Tek D70 A33"
-pkgver=2
+pkgver=1
 pkgrel=0
 url="https://postmarketos.org"
 license="GPL-3.0-or-later"
@@ -20,5 +20,5 @@ package() {
 }
 
 sha512sums="
-2e6afc5b5adc3e5fb68e3eb6bb9f33a470ceb4a17a2dc445eb5253c627dd7e8583b259a16c0b0d6e4e46b1973aca5a5d96b57ee697bfa57d3965976f09adad70  deviceinfo
+193989891fc9eb720006685281051fa36270e6043387317527d4a82630cb623eb43d4355bfb2ac3b9fb13a18a09ac38f6fe60cc5cb8ca7b0bf4ce4cec85dfe31  deviceinfo
 "

device/testing/device-inet-a33/deviceinfo

@@ -22,5 +22,5 @@ deviceinfo_getty="ttyS0;115200"
 # Bootloader related
 deviceinfo_flash_method="none"
 deviceinfo_generate_extlinux_config="true"
-deviceinfo_kernel_cmdline="quiet loglevel=2"
+deviceinfo_kernel_cmdline="console=null"
 deviceinfo_sd_embed_firmware="u-boot/q8-a33/u-boot-sunxi-with-spl.bin:8"

device/testing/device-lenovo-flex-5g/APKBUILD

@@ -2,8 +2,8 @@
 # Maintainer: Jenneron <jenneron@protonmail.com>
 pkgname=device-lenovo-flex-5g
 pkgdesc="Lenovo Flex 5G"
-pkgver=3
-pkgrel=0
+pkgver=2
+pkgrel=2
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -27,6 +27,6 @@ package() {
 
 
 sha512sums="
-a855111b436b3c7dac9db6e1a7a9eb5e76b48293de06ab2eb4fcfd119fb16b4bd463624b24f2ffffe890c2cf8df7febecd057f0f03c4260a5db74746bfdad3d9  deviceinfo
+2fed2ff7cba1c0c19842b9bae7d75e41a1e03c19ca64ee5dba7f47a2273c4f0a226c05b0a62e2a7af991c1ef15e125dbac4ccdc4bcee6465a26c46f2127c6df2  deviceinfo
 438f30d14ad15fa87e5fa3b5127e5430af35cdddc400d2a01acbba6487792a602fcf3400e2c42ee991e6785fe62b083030ea977292efa88dacb3fcbe03bc32d7  modules-initfs
 "

device/testing/device-lenovo-flex-5g/deviceinfo

@@ -20,7 +20,7 @@ deviceinfo_screen_height="1080"
 # Bootloader related
 deviceinfo_flash_method="none"
 # most parameters from: https://github.com/jhovold/linux/wiki/X13s#kernel-command-line
-deviceinfo_kernel_cmdline="quiet loglevel=2 iommu.passthrough=0 iommu.strict=0 pcie_aspm.policy=powersupersave clk_ignore_unused pd_ignore_unused arm64.nopauth efi=noruntime"
+deviceinfo_kernel_cmdline="console=null iommu.passthrough=0 iommu.strict=0 pcie_aspm.policy=powersupersave clk_ignore_unused pd_ignore_unused arm64.nopauth efi=noruntime"
 deviceinfo_generate_systemd_boot="true"
 deviceinfo_boot_filesystem="fat32"
 deviceinfo_partition_type="gpt"

device/testing/device-lenovo-kuntao/APKBUILD

@@ -1,24 +1,23 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-lenovo-kuntao
 pkgdesc="Lenovo P2"
-pkgver=3
-pkgrel=0
+pkgver=2
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
 options="!check !archcheck"
 depends="
-	firmware-lenovo-kuntao
-	firmware-qcom-adreno-a530
 	linux-postmarketos-qcom-msm8953
 	lk2nd-msm8953
 	mkbootimg
-	msm-firmware-loader
 	postmarketos-base
-	soc-qcom-msm8953-modem
 "
 makedepends="devicepkg-dev"
-source="deviceinfo modules-initfs"
+source="deviceinfo"
+subpackages="
+	$pkgname-nonfree-firmware:nonfree_firmware
+"
 
 build() {
 	devicepkg_build $startdir $pkgname
@@ -28,7 +27,12 @@ package() {
 	devicepkg_package $startdir $pkgname
 }
 
+nonfree_firmware() {
+	pkgdesc="GPU/Wi-Fi/Bluetooth/Audio/Video/Modem firmware"
+	depends="msm-firmware-loader"
+	mkdir "$subpkgdir"
+}
+
 sha512sums="
 0eb7a1a0b10e79d4d8b64b22cda74ccd6f8ef1d5f30ac75dd08e3eb6858ac730f4cba4561adb74d23dc5cf118df6708ea4508c1fc4d347a7dd0ae510fb8b7f60  deviceinfo
-2ce6911ef54351f46819b3323e361ce60297b30f94e81a77e2d20b1bc294e51e3a0fa859ad8e257fa3fdef404a47dd3b64c247222cb7ca73f03cb4dcd083d1f8  modules-initfs
 "

device/testing/device-lenovo-kuntao/modules-initfs

@@ -1,2 +0,0 @@
-msm
-panel_lenovo_kuntao_549

device/testing/device-lenovo-tb-x704f/APKBUILD

@@ -1,7 +1,7 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-lenovo-tb-x704f
 pkgdesc="Lenovo TAB4 10 Plus"
-pkgver=2
+pkgver=1
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -24,5 +24,5 @@ package() {
 }
 
 sha512sums="
-a0f8b0da1b997ecc6e08b7ac392802c681780e506fc99e543d69fbe12c706eab5d788748d600375a56378272a810a0947c51ef730068ae8e05c57516a9de063e  deviceinfo
+dc0c8dd524f075a1ab5c7d87a0e0a3ed083ee1d8fbd5364e0d254371d33f5fb6482f5eea141c59d35188dc2d7e51ac8fb60d7d4b48298e1a93862b2deca6c11d  deviceinfo
 "

device/testing/device-lenovo-tb-x704f/deviceinfo

@@ -18,7 +18,7 @@ deviceinfo_screen_height="1200"
 
 # Bootloader related
 deviceinfo_flash_method="fastboot"
-deviceinfo_kernel_cmdline="quiet loglevel=2 androidboot.hardware=qcom msm_rtb.filter=0x237 ehci-hcd.park=3 lpm_levels.sleep_disabled=1 androidboot.bootdevice=7824900.sdhci loop.max_part=7 firmware_class.path=/vendor/firmware_mnt/image androidboot.selinux=permissive buildvariant=eng"
+deviceinfo_kernel_cmdline="console=null androidboot.hardware=qcom msm_rtb.filter=0x237 ehci-hcd.park=3 lpm_levels.sleep_disabled=1 androidboot.bootdevice=7824900.sdhci loop.max_part=7 firmware_class.path=/vendor/firmware_mnt/image androidboot.selinux=permissive buildvariant=eng"
 deviceinfo_generate_bootimg="true"
 deviceinfo_bootimg_qcdt="false"
 deviceinfo_bootimg_mtk_mkimage="false"

device/testing/device-lenovo-tb8504f/APKBUILD

@@ -1,7 +1,7 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-lenovo-tb8504f
 pkgdesc="Lenovo Tab 4 8"
-pkgver=2
+pkgver=1
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -20,5 +20,5 @@ package() {
 }
 
 sha512sums="
-8bde53e63f1c5975ff0a02368f2b6ab4b791d4ff9a1889770325d655fc626e83739ade14a67c8fe49ce9515c41d0c5c5a5bbbe3e31e86b06e17de8e7dc457851  deviceinfo
+54af8ca863219cabc6174806d61ac0f7737d7bbfa29fdc62b71a53648d4b438958bd6d0f94fb7603494a855517324cfd20aeffa953282682bb713b8d7fd22c74  deviceinfo
 "

device/testing/device-lenovo-tb8504f/deviceinfo

@@ -18,7 +18,7 @@ deviceinfo_screen_height="1280"
 
 # Bootloader related
 deviceinfo_flash_method="fastboot"
-deviceinfo_kernel_cmdline="quiet loglevel=2 androidboot.hardware=qcom msm_rtb.filter=0x237 ehci-hcd.park=3 lpm_levels.sleep_disabled=1 androidboot.bootdevice=7824900.sdhci loop.max_part=7 firmware_class.path=/vendor/firmware_mnt/image buildvariant=userdebug"
+deviceinfo_kernel_cmdline="console=null androidboot.hardware=qcom msm_rtb.filter=0x237 ehci-hcd.park=3 lpm_levels.sleep_disabled=1 androidboot.bootdevice=7824900.sdhci loop.max_part=7 firmware_class.path=/vendor/firmware_mnt/image buildvariant=userdebug"
 deviceinfo_generate_bootimg="true"
 deviceinfo_bootimg_qcdt="false"
 deviceinfo_bootimg_mtk_mkimage="false"

device/testing/device-lenovo-yoga-5g/APKBUILD

@@ -2,8 +2,8 @@
 # Maintainer: Jenneron <jenneron@protonmail.com>
 pkgname=device-lenovo-yoga-5g
 pkgdesc="Lenovo Yoga 5G"
-pkgver=3
-pkgrel=0
+pkgver=2
+pkgrel=2
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -34,6 +34,6 @@ nonfree_firmware() {
 
 
 sha512sums="
-7601e33a77407ddb6e9745242f4a4df108943040e69dc33286d809e4f6ad45f8aeba2012dbdd5ec1b3bcb841776e19c6df5cace3c8465ef26e2a4ac04cb0697d  deviceinfo
+6ce114352091fe995d47496e36c1aeca2b47e73b7991c0a9c5f8e315f8f0d3b122d3da0ef4ee0e355fc850d076abb0ee861c2fc4dcff596cf4b3d20df5251d86  deviceinfo
 438f30d14ad15fa87e5fa3b5127e5430af35cdddc400d2a01acbba6487792a602fcf3400e2c42ee991e6785fe62b083030ea977292efa88dacb3fcbe03bc32d7  modules-initfs
 "

device/testing/device-lenovo-yoga-5g/deviceinfo

@@ -20,7 +20,7 @@ deviceinfo_screen_height="1080"
 # Bootloader related
 deviceinfo_flash_method="none"
 # most parameters from: https://github.com/jhovold/linux/wiki/X13s#kernel-command-line
-deviceinfo_kernel_cmdline="quiet loglevel=2 iommu.passthrough=0 iommu.strict=0 pcie_aspm.policy=powersupersave clk_ignore_unused pd_ignore_unused arm64.nopauth efi=noruntime"
+deviceinfo_kernel_cmdline="console=null iommu.passthrough=0 iommu.strict=0 pcie_aspm.policy=powersupersave clk_ignore_unused pd_ignore_unused arm64.nopauth efi=noruntime"
 deviceinfo_generate_systemd_boot="true"
 deviceinfo_boot_filesystem="fat32"
 deviceinfo_partition_type="gpt"

device/testing/device-librecomputer-lafrite/APKBUILD

@@ -2,7 +2,7 @@
 # Maintainer: Ferass El Hafidi <funderscore@postmarketos.org>
 pkgname=device-librecomputer-lafrite
 pkgdesc="Libre Computer AML-S805X-AC-V1.0"
-pkgver=2
+pkgver=1
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -36,6 +36,6 @@ nonfree_firmware() {
 }
 
 sha512sums="
-604613ffd6b9cabafacc868fb13e4a70849070df534ed646d517af721ffc9b7cbb73638b4934924b366cc9f7bdb05d10a664e3c88855ee52ba78c01895e11069  deviceinfo
+df70b3bf040500ee8579f0a7ed1aef7691fc36b2e682f052bc6d502c0bc23338f1b96579a3ced77c8635a9f9198316fff8589c8588709410ca566f11e01ed855  deviceinfo
 52948c2884a6f6384e12b7a598f70878526d0d3293c214425170145231144ec7de805c038641741a4a5d75b50e554f6a3fa3769784a674217ed032f9b6a233c8  modules-initfs
 "

device/testing/device-librecomputer-lafrite/deviceinfo

@@ -25,4 +25,4 @@ deviceinfo_generate_extlinux_config="true"
 deviceinfo_sd_embed_firmware_step_size="512"
 deviceinfo_sd_embed_firmware="u-boot/librecomputer-lafrite/u-boot.bin.sd-stripped.bin:1"
 deviceinfo_boot_part_start="4096"
-deviceinfo_kernel_cmdline="quiet loglevel=2"
+deviceinfo_kernel_cmdline="console=null"

device/testing/device-librecomputer-lepotato/APKBUILD

@@ -2,7 +2,7 @@
 # Maintainer: Ferass El Hafidi <funderscore@postmarketos.org>
 pkgname=device-librecomputer-lepotato
 pkgdesc="Libre Computer AML-S905X-CC-V1.0"
-pkgver=2
+pkgver=1
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -36,6 +36,6 @@ nonfree_firmware() {
 }
 
 sha512sums="
-b5005b9546c95275c9370a0ec808fbb80b0c46adfc5e3819c364df662ee88d8483b3ec150fb0b2a5a20fb13500f8c34ad19e5b68dd662eeac9d3f421feb5529f  deviceinfo
+ea97f80d58c69fa31d0260ab1f6d827508d393677a0533ed75f9139212d2da2ee7b656cf9a4d4c5ea1a9d5d03fa8f818c22ec52b2131d3024577522009bac442  deviceinfo
 52948c2884a6f6384e12b7a598f70878526d0d3293c214425170145231144ec7de805c038641741a4a5d75b50e554f6a3fa3769784a674217ed032f9b6a233c8  modules-initfs
 "

device/testing/device-librecomputer-lepotato/deviceinfo

@@ -25,4 +25,4 @@ deviceinfo_generate_extlinux_config="true"
 deviceinfo_sd_embed_firmware_step_size="512"
 deviceinfo_sd_embed_firmware="u-boot/librecomputer-lepotato/u-boot.bin.sd-stripped.bin:1"
 deviceinfo_boot_part_start="4096"
-deviceinfo_kernel_cmdline="quiet loglevel=2"
+deviceinfo_kernel_cmdline="console=null"

device/testing/device-librecomputer-solitude/APKBUILD

@@ -3,7 +3,7 @@
 # Co-maintainer: Ferass El Hafidi <funderscore@postmarketos.org>
 pkgname=device-librecomputer-solitude
 pkgdesc="Libre Computer AML-S905D3-CC"
-pkgver=2
+pkgver=1
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -36,6 +36,6 @@ nonfree_firmware() {
 }
 
 sha512sums="
-e353ee2f4e821520d66f04ec66752fb12e9ea87f21aab19b053cc9be59eb82ded609d3f9dc3dc4c906772afce0bc2c1d8218cff3060d04c8182af1e67a9991d2  deviceinfo
+8349aa8a457c8effe4606e6e5030f910319436b3a99b024bb73c10c1de8a453348fd3b1859082850132348e30f9f33001d102b85ded2ea7afc23cea0e983d9a5  deviceinfo
 52948c2884a6f6384e12b7a598f70878526d0d3293c214425170145231144ec7de805c038641741a4a5d75b50e554f6a3fa3769784a674217ed032f9b6a233c8  modules-initfs
 "

device/testing/device-librecomputer-solitude/deviceinfo

@@ -19,4 +19,4 @@ deviceinfo_gpu_accelerated="true"
 # Bootloader related
 deviceinfo_flash_method="none"
 deviceinfo_generate_extlinux_config="true"
-deviceinfo_kernel_cmdline="quiet loglevel=2"
+deviceinfo_kernel_cmdline="console=null"

device/testing/device-motorola-ocean/APKBUILD

@@ -3,23 +3,21 @@
 pkgname=device-motorola-ocean
 pkgdesc="Motorola Moto G7 Power"
 pkgver=1
-pkgrel=1
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
 options="!check !archcheck"
 depends="
-	firmware-motorola-ocean
-	firmware-qcom-adreno-a530
 	linux-postmarketos-qcom-msm8953
 	lk2nd-msm8953
 	mkbootimg
-	msm-firmware-loader
 	postmarketos-base
 	soc-qcom-msm8916
 "
 makedepends="devicepkg-dev"
 source="deviceinfo modules-initfs"
+subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
 
 build() {
 	devicepkg_build $startdir $pkgname
@@ -29,6 +27,12 @@ package() {
 	devicepkg_package $startdir $pkgname
 }
 
+nonfree_firmware() {
+	pkgdesc="Wifi, GPU, modem, and audio firmware"
+	depends="firmware-motorola-ocean"
+	mkdir "$subpkgdir"
+}
+
 sha512sums="
 6c2c4244319a5c24b888c5c30c28b42a7514c2ffcdddcdb2d87bccb37da1eed6722fa66ff865d4d31855b9d9fca4ab6012532fb65127928a74becb228625d0a1  deviceinfo
 f627d473ccfc01f39ed7b1345c2795af0cd358b4738d202e53fbae07c605d239f9139b034c5a29411bafe368b92a44c756e2bd029246b385d6397f519af8ff7c  modules-initfs

device/testing/device-qcom-msm8953/APKBUILD

@@ -3,7 +3,7 @@
 
 pkgname=device-qcom-msm8953
 pkgdesc="Generic device package for various Qualcomm MSM8953/SDM450/SDM632-based devices"
-pkgver=3
+pkgver=1
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -11,7 +11,6 @@ arch="aarch64"
 options="!check !archcheck"
 depends="
 	firmware-qcom-adreno-a530
-	firmware-qcom-msm8953
 	linux-postmarketos-qcom-msm8953
 	lk2nd-msm8953
 	mkbootimg
@@ -35,6 +34,6 @@ package() {
 }
 
 sha512sums="
-f5f41dc82c96aac6451f5512a36911706e6ed055f8d70a4acae208d24c527fef5a66f34f645347ffa3d24edaa49961bea1d020cd341b818705fc87050fe9bf61  deviceinfo
-70917147c1c49f9419ff8be2a03e38c24ad7730091c53a2182797dde85fd8c2073f71187e8e583774974a1509b634433725543547e528364f41d85e63b2ace85  modules-initfs
+b624c27c7e87cc57c20f79682ca119765b826e0f95bec94f18617d67a832cd2869475fa212d7c21e36a9b448312cb98c497007e0081e1a3c64bf3d60b40bb87a  deviceinfo
+bd17b9384a4aba90d3938b170e47349b98f5e035715abac6ae8cb2e65431159e20e5324c72e69f8f0492d12dd45813615850f1f83a48327fd1a7313e82183d43  modules-initfs
 "

device/testing/device-qcom-msm8953/deviceinfo

@@ -17,7 +17,6 @@ deviceinfo_keyboard="false"
 
 # Bootloader related
 deviceinfo_flash_method="fastboot"
-deviceinfo_kernel_cmdline="quiet loglevel=2"
 
 # extlinux.conf
 deviceinfo_dtb="qcom/apq8053-* qcom/msm8953-* qcom/sdm450-* qcom/sdm632-*"

device/testing/device-qcom-msm8953/modules-initfs

@@ -20,7 +20,6 @@ panel_huawei_milan_jdi_r63452
 panel_huawei_milan_tianma_fic8736
 panel_huawei_milan_tianma_focal8716
 panel_huawei_milan_tianma_otm1906c
-panel_lenovo_kuntao_549
 panel_mdss_ft8716_fhd
 panel_mdss_ili7807_fhd
 panel_mdss_ili7807_fhdplus

device/testing/device-samsung-a2corelte/APKBUILD

@@ -1,7 +1,7 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-samsung-a2corelte
 pkgdesc="Samsung Galaxy A2 Core"
-pkgver=2
+pkgver=1
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -33,5 +33,5 @@ nonfree_firmware() {
 }
 
 sha512sums="
-5f70d4c77f8d7b0367d2d07c972cded1bdaee445cd270187edd73d6010736746690924a4cc613b1e3e55453e9c5da70c8fae5ce7cee55bc09f92f70758653330  deviceinfo
+ba75ed1b002e28dee895183e91cb66d86886b04f2e9c07bd15d196fbd8435f284a05bd10385a1c50b79e8b76b99128da9b4b87622f64b146b9885460b083f355  deviceinfo
 "

device/testing/device-samsung-a2corelte/deviceinfo

@@ -26,7 +26,6 @@ deviceinfo_bootimg_mtk_mkimage="false"
 deviceinfo_bootimg_dtb_second="false"
 deviceinfo_flash_sparse="true"
 deviceinfo_flash_pagesize="2048"
-deviceinfo_flash_kernel_on_update="true"
 deviceinfo_flash_offset_base="0x10000000"
 deviceinfo_flash_offset_kernel="0x00008000"
 deviceinfo_flash_offset_ramdisk="0x01000000"

device/testing/device-samsung-afyonltecan/APKBUILD

@@ -1,7 +1,7 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-samsung-afyonltecan
 pkgdesc="Samsung Galaxy Core LTE"
-pkgver=2
+pkgver=1
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -20,5 +20,5 @@ package() {
 }
 
 sha512sums="
-f6950361dfc10c471d2324a67a86b8e684358f9b4f78360d2b508bec01ad5f52bc3a8c46cea5420ecef265209704e39a9e0a6347705829acf1c2794352f87f45  deviceinfo
+7f5dee60dc8a12b2cc7cfbb438e3ddf57bb2afc0c9759956f15841e67dcfe8956a01e4137ceb6193c7be593b32dfbf54ad10b3dbf420f1838593f2a8ce495487  deviceinfo
 "

device/testing/device-samsung-afyonltecan/deviceinfo

@@ -16,7 +16,7 @@ deviceinfo_external_storage="true"
 
 # Bootloader related
 deviceinfo_flash_method="heimdall-bootimg"
-deviceinfo_kernel_cmdline="quiet loglevel=2 androidboot.console=null androidboot.hardware=qcom user_debug=31 msm_rtb.filter=0x37 zcache.enabled=1 zcache.compressor=lz4 androidboot.selinux=permissive buildvariant=eng"
+deviceinfo_kernel_cmdline="console=null androidboot.console=null androidboot.hardware=qcom user_debug=31 msm_rtb.filter=0x37 zcache.enabled=1 zcache.compressor=lz4 androidboot.selinux=permissive buildvariant=eng"
 deviceinfo_generate_bootimg="true"
 deviceinfo_bootimg_qcdt="true"
 deviceinfo_bootimg_dtb_second="false"

device/testing/device-samsung-gts210velte/APKBUILD

@@ -1,7 +1,7 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-samsung-gts210velte
 pkgdesc="Samsung Galaxy Tab S2 9.7 LTE (SM-T819)"
-pkgver=2
+pkgver=1
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -23,6 +23,6 @@ package() {
 
 
 sha512sums="
-fd315ecd9606fa52c8392c42c1d1d8dc37ab83758b0f73c9197c357bf2fbdda5482687129a085817f1132cf42f33704510d82df38131286e518d8daffd2d093e  deviceinfo
+353972b4587a74ded0ec4d2ed11932255207a58337fb104b1f7bbad303ddc03c8fa46e30e7ddf53a8913cabfb3485cc2aed74835fb1e96238bd499c30140a10e  deviceinfo
 0d23fae6de9b04a36f395068278b8a9054c33e435b24de943da1e55a0ee2d88ee932a3fd2f660596377b14474483edecb8357684f9b7bc2c53979c7f863fae52  90-sec_touchscreen.rules
 "

device/testing/device-samsung-gts210velte/deviceinfo

@@ -19,7 +19,7 @@ deviceinfo_dev_touchscreen_calibration="0 1 1.342 -1 0 1536"
 
 # Bootloader related
 deviceinfo_flash_method="heimdall-bootimg"
-deviceinfo_kernel_cmdline="quiet loglevel=2 androidboot.hardware=qcom androidboot.wificountrycode=00 firmware_class.path=/lib/firmware/postmarketos msm_rtb.filter=0x237 ehci-hcd.park=3 androidboot.bootdevice=7824900.sdhci lpm_levels.sleep_disabled=1 earlyprintk androidboot.selinux=permissive buildvariant=userdebug androidboot.sec_atd.tty=/dev/ttyHSL0 sec_log=0x200000@0xa0200000 sec_dbg=0x1ff000@0xa0000000 androidboot.revision=4 androidboot.warranty_bit=1 androidboot.bootloader=T819XXS2BRB1 androidboot.boot_recovery=0 sec_debug.reset_reason=0x0 sec_dbg_ex_info=0x400@0xa01ff000 charging_mode=0x00 pmic_info=3 androidboot.debug_level=0x4f4c sec_debug.enable=0 sec_debug.enable_user=0 msm_rtb.enable=0 androidboot.cp_debug_level=0x55FF sec_debug.enable_cp_debug=0 vmalloc=450M sysscope=0xff000000 fg_reset=0 androidboot.security_mode=1526595584 androidboot.ucs_mode=0 androidboot.emmc=true gpt androidboot.baseband=msm lcd_id=0x424015 lcd_id2=0xffffff hall_ic=0x0 mdss_mdp.panel=1:dsi:0:ss_dsi_panel_ANA38401_AMS968HH01_QXGA:1:ss_dsi_panel_ANA38"
+deviceinfo_kernel_cmdline="console=null androidboot.hardware=qcom androidboot.wificountrycode=00 firmware_class.path=/lib/firmware/postmarketos msm_rtb.filter=0x237 ehci-hcd.park=3 androidboot.bootdevice=7824900.sdhci lpm_levels.sleep_disabled=1 earlyprintk androidboot.selinux=permissive buildvariant=userdebug androidboot.sec_atd.tty=/dev/ttyHSL0 sec_log=0x200000@0xa0200000 sec_dbg=0x1ff000@0xa0000000 androidboot.revision=4 androidboot.warranty_bit=1 androidboot.bootloader=T819XXS2BRB1 androidboot.boot_recovery=0 sec_debug.reset_reason=0x0 sec_dbg_ex_info=0x400@0xa01ff000 charging_mode=0x00 pmic_info=3 androidboot.debug_level=0x4f4c sec_debug.enable=0 sec_debug.enable_user=0 msm_rtb.enable=0 androidboot.cp_debug_level=0x55FF sec_debug.enable_cp_debug=0 vmalloc=450M sysscope=0xff000000 fg_reset=0 androidboot.security_mode=1526595584 androidboot.ucs_mode=0 androidboot.emmc=true gpt androidboot.baseband=msm lcd_id=0x424015 lcd_id2=0xffffff hall_ic=0x0 mdss_mdp.panel=1:dsi:0:ss_dsi_panel_ANA38401_AMS968HH01_QXGA:1:ss_dsi_panel_ANA38"
 deviceinfo_generate_bootimg="true"
 deviceinfo_bootimg_qcdt="true"
 deviceinfo_flash_offset_base="0x80000000"

device/testing/device-samsung-gts210vewifi/APKBUILD

@@ -1,7 +1,7 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-samsung-gts210vewifi
 pkgdesc="Galaxy Tab S2 9.7 WiFi (SM-T813)"
-pkgver=2
+pkgver=1
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -23,6 +23,6 @@ package() {
 }
 
 sha512sums="
-fe7913dcf6569961f1a128f9d92e3d697fb045b0c7efa61c3deaf06d887a8e217adee68846898df9bdb3327285bbc381abd6cc389e33905fac720c989ed9239f  deviceinfo
+fb4e1a6b3df0a505aa6cd781948da261fb68f5015aac08e74ef8ba7d6da8494ce9556e86e0767f3fdf0773eaf62c68003d5c4ef7e0edf5ebc62d295b86ba2cf7  deviceinfo
 0d23fae6de9b04a36f395068278b8a9054c33e435b24de943da1e55a0ee2d88ee932a3fd2f660596377b14474483edecb8357684f9b7bc2c53979c7f863fae52  90-sec_touchscreen.rules
 "