systemd/util-linux-pmos: fork from alpine

logger -> journald agetty, walls, mount and a few others also adjusted to a meson for a simpler APKBUILD not building hexdump as this is part of the default pmbootstrap install rename to avoid cycial dependency
systemd/plasma*: upgrade to 6.2.4 (MR 5892)
2025-01-02 14:01:09 +01:00 · 2024-12-31 12:36:26 -08:00 · 2024-12-31 19:36:30 +01:00 · 2024-12-30 10:39:14 -08:00 · 2024-12-30 10:39:14 -08:00 · 2024-12-30 10:02:34 -08:00
535 changed files with 24573 additions and 15873 deletions
@@ -56,34 +56,8 @@ def get_upstream_branch():

        :returns: branch name, e.g. "v20.05" """

-    # Prefer gitlab CI target branch name if it's set (i.e. running in gitlab CI)
-    if target_branch := os.environ.get("CI_MERGE_REQUEST_TARGET_BRANCH_NAME"):
-        return target_branch
-
-    global cache
-    if "upstream_branch" in cache:
-        return cache["upstream_branch"]
-
-    # Get channel (e.g. "stable") from pmaports.cfg
-    # https://postmarketos.org/pmaports.cfg
-    pmaports_dir = get_pmaports_dir()
-    pmaports_cfg = configparser.ConfigParser()
-    pmaports_cfg.read(f"{pmaports_dir}/pmaports.cfg")
-    channel = pmaports_cfg["pmaports"]["channel"]
-
-    # Get branch_pmaports (e.g. "v20.05") from channels.cfg
-    # https://postmarketos.org/channels.cfg
-    channels_cfg_str = run_git(["show", "upstream/master:channels.cfg"])
-    channels_cfg = configparser.ConfigParser()
-    channels_cfg.read_string(channels_cfg_str)
-    assert channel in channels_cfg, \
-        f"Channel '{channel}' from pmaports.cfg in your branch is unknown." \
-        " This appears to be an old branch, consider recreating your change" \
-        " on top of master."
-
-    ret = channels_cfg[channel]["branch_pmaports"]
-    cache["upstream_branch"] = ret
-    return ret
+    # HACK for master_staging_systemd branch
+    return "master_staging_systemd"


 def get_changed_files(removed=True):
@@ -24,6 +24,7 @@ sh_files="
 	./main/postmarketos-mkinitfs-hook-netboot/netboot.sh
 	./main/ttyescape/*.post-install
 	./main/unl0kr/unlock.sh
+	./main/msm-firmware-loader/*.post-install
 	./device/community/soc-qcom-sdm845/call_audio_idle_suspend_workaround.sh

 	$(find . -path './main/postmarketos-ui-*/*.sh')
@@ -31,7 +31,7 @@ workflow:
 wiki:
  stage: lint
  rules:
-    - if: &mr_rule $CI_PIPELINE_SOURCE == "merge_request_event" || $CI_COMMIT_REF_PROTECTED == "false"
+    - if: $CI_PIPELINE_SOURCE == "merge_request_event" || $CI_COMMIT_REF_PROTECTED == "false"
      changes:
        - .ci/**/*
        - .gitlab-ci.yml
@@ -44,7 +44,7 @@ wiki:
 ruff:
  stage: lint
  rules:
-    - if: *mr_rule
+    - if: $CI_PIPELINE_SOURCE == "merge_request_event" || $CI_COMMIT_REF_PROTECTED == "false"
      changes:
        - .ci/*
        - .ci/*/*
@@ -58,7 +58,7 @@ shellcheck-grep:
  stage: lint
  image: alpine:edge
  rules:
-    - if: *mr_rule
+    - if: $CI_PIPELINE_SOURCE == "merge_request_event" || $CI_COMMIT_REF_PROTECTED == "false"
  script:
    - .ci/lib/gitlab_prepare_ci.sh
    - .ci/shellcheck.sh
@@ -69,7 +69,7 @@ editor-config:
  stage: lint
  image: alpine:edge
  rules:
-    - if: *mr_rule
+    - if: $CI_PIPELINE_SOURCE == "merge_request_event" || $CI_COMMIT_REF_PROTECTED == "false"
  script:
    - .ci/lib/gitlab_prepare_ci.sh
    - .ci/ec.sh
@@ -78,7 +78,7 @@ editor-config:
 pytest-commits:
  stage: lint
  rules:
-    - if: *mr_rule
+    - if: $CI_PIPELINE_SOURCE == "merge_request_event" || $CI_COMMIT_REF_PROTECTED == "false"
  script:
    - .ci/lib/gitlab_prepare_ci.sh
    - .ci/pytest.sh
@@ -95,7 +95,7 @@ pytest-commits:
 aport-lint:
  stage: lint
  rules:
-    - if: *mr_rule
+    - if: $CI_PIPELINE_SOURCE == "merge_request_event" || $CI_COMMIT_REF_PROTECTED == "false"
  script:
    - .ci/lib/gitlab_prepare_ci.sh
    - .ci/apkbuild-lint.sh
@@ -105,12 +105,9 @@ aport-lint:
 kernel-kconfig:
  stage: lint
  rules:
-    - if: *mr_rule
+    - if: $CI_PIPELINE_SOURCE == "merge_request_event" || $CI_COMMIT_REF_PROTECTED == "false"
      changes:
        - kconfigcheck.toml
-      allow_failure: true
-    - if: *mr_rule
-      changes:
        - device/*/linux-*/config-*
  script:
    - .ci/lib/gitlab_prepare_ci.sh
@@ -133,7 +130,7 @@ mr-settings:
 .build:
  stage: build
  rules:
-    - if: *mr_rule
+    - if: $CI_PIPELINE_SOURCE == "merge_request_event" || $CI_COMMIT_REF_PROTECTED == "false"
  before_script:
    - *global_before_scripts
    - .ci/lib/gitlab_prepare_ci.sh
@@ -150,11 +147,6 @@ build-x86_64:
  script:
    - .ci/build-x86_64.sh

-build-x86:
-  extends: .build
-  script:
-    - .ci/build-x86.sh
-
 build-aarch64:
  extends: .build
  script:
@@ -165,16 +157,6 @@ build-armv7:
  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:
@@ -39,9 +39,6 @@
 * [ ] Plasma Mobile
 * [ ] Sxmo (Wayland/Sway) **Please post the output of `sxmo_version.sh`**
 * [ ] Other: **Please fill out**
-### Which init system are you using?
-* [ ] OpenRC
-* [ ] systemd
 ### How did you get postmarketOS image?
 * [ ] from https://images.postmarketos.org
 * [ ] I built it using pmbootstrap
@@ -68,7 +68,6 @@ device/*/*-xiaomi-wt88047/			@Minecrell
 device/*/*-xiaomi-ysl/				@barni2000
 device/*/alsa-ucm-conf-cros/			@WeirdTreeThing
 device/*/alsa-ucm-conf-qcom-sdm670/		@flamingradian
-device/*/device-apple-n61/			@JustSoup321
 device/*/device-fairphone-*/			@z3ntu
 device/*/device-generic-x86_64/			@craftyguy @ollieparanoid
 device/*/device-google-nyan-big/		@jenneron
@@ -114,7 +113,6 @@ device/*/linux-huawei-plank/			@gtrxAC
 device/*/linux-next/				@calebccff
 device/*/linux-postmarketos-allwinner/		@Arnavion @PsychoGame
 device/*/linux-postmarketos-amlogic/		@funderscore @exkc
-device/*/linux-postmarketos-apple/		@JustSoup321
 device/*/linux-postmarketos-exynos4/		@Newbyte @Grimler @knuxify
 device/*/linux-postmarketos-exynos5/		@jenneron @Grimler
 device/*/linux-postmarketos-grate/		@clamor-s @jenneron @jethrob
@@ -34,19 +34,20 @@ _pkgsnap="${pkgver##*_git}"
 [ "$CHOST" != "$CTARGET" ] && _target="-$CTARGET_ARCH" || _target=""

 pkgname=gcc-aarch64
-pkgrel=5
+pkgrel=4
 pkgdesc="Stage2 cross-compiler for aarch64"
 url="https://gcc.gnu.org"
 arch="x86_64"
 license="GPL-2.0-or-later AND LGPL-2.1-or-later"
 _gccrel=$pkgver-r$pkgrel
-depends="binutils-aarch64 mpc1 so:libc.musl-x86_64.so.1 so:libgcc_s.so.1 so:libgmp.so.10 so:libisl.so.23 so:libmpc.so.3 so:libmpfr.so.6 so:libstdc++.so.6 so:libz.so.1"
+depends="binutils-aarch64 mpc1"
 makedepends_build="gcc g++ bison flex texinfo gawk zip gmp-dev mpfr-dev mpc1-dev zlib-dev"
 makedepends_host="linux-headers gmp-dev mpfr-dev mpc1-dev isl-dev zlib-dev musl-dev-aarch64 binutils-aarch64"
 subpackages="g++-aarch64:gpp libstdc++-dev-aarch64:libcxx_dev"
 [ "$CHOST" = "$CTARGET" ] && subpackages="gcc-gdb gcc-doc"
 replaces="libstdc++ binutils"
 options="!strip !tracedeps"
+depends="$depends so:libc.musl-x86_64.so.1 so:libgcc_s.so.1 so:libgmp.so.10 so:libisl.so.23 so:libmpc.so.3 so:libmpfr.so.6 so:libstdc++.so.6 so:libz.so.1"

 : "${LANG_CXX:=true}"
 : "${LANG_D:=true}"
@@ -319,7 +320,7 @@ build() {
 	i586-*-*-*)		_arch_configure="--with-arch=pentium-m --with-fpmath=sse --with-tune=generic --enable-cld";;
 	s390x-*-*-*)		_arch_configure="--with-arch=z196 --with-tune=zEC12 --with-zarch --with-long-double-128 --enable-decimal-float";;
 	riscv64-*-*-*)		_arch_configure="--with-arch=rv64gc --with-abi=lp64d --enable-autolink-libatomic";;
-	loongarch64-*-*-*)      _arch_configure="--with-arch=la64v1.0 --with-abi=lp64d";;
+	loongarch64-*-*-*)      _arch_configure="--with-arch=loongarch64 --with-abi=lp64d";;
 	esac

 	case "$CTARGET_ARCH" in
@@ -472,9 +473,7 @@ package() {

 	# move ada runtime libs
 	if $LANG_ADA; then
-		local libgnat_static=
-		[ "$CHOST" = "$CTARGET" ] && libgnat_static="libgna*.a"
-		for i in $(find "$pkgdir"/$_gcclibdir/adalib/ -type f -maxdepth 1 \( -name "libgna*.so" -o -name "$libgnat_static" \) ); do
+		for i in $(find "$pkgdir"/$_gcclibdir/adalib/ -type f -maxdepth 1 \( -name "libgna*.so" -o -name "libgna*.a" \) ); do
 			mv "$i" "$pkgdir"/usr/lib/
 			ln -s ../../../../${i##*/} $i
 		done
@@ -487,6 +486,9 @@ package() {
 		# libcc1 does not depend on target, don't ship it
 		rm -rf "$pkgdir"/usr/lib/libcc1.so*

+		# These are moved into packages with arch=$CTARGET_ARCH so remove
+		# cross prefix
+		#mv "$pkgdir"/usr/$CTARGET/lib/*.so.* "$pkgdir"/usr/lib/ # FIXME

 		# fixup gcc library symlinks to be linker scripts so
 		# linker finds the libs from relocated sysroot
@@ -568,9 +570,8 @@ libcxx_dev() {
 gpp() {
 	pkgdesc="GNU C++ standard library and compiler"
 	depends="libstdc++-dev$_target=$_gccrel gcc$_target=$_gccrel musl-dev"
-	[ "$CHOST" = "$CTARGET" ] && depends="$depends libstdc++=$_gccrel"
-
 	depends="$depends so:libc.musl-x86_64.so.1 so:libgmp.so.10 so:libisl.so.23 so:libmpc.so.3 so:libmpfr.so.6 so:libz.so.1"
+	[ "$CHOST" = "$CTARGET" ] && depends="$depends libstdc++=$_gccrel"

 	amove $_gcclibexec/cc1plus
 	amove usr/bin/*++
@@ -34,19 +34,20 @@ _pkgsnap="${pkgver##*_git}"
 [ "$CHOST" != "$CTARGET" ] && _target="-$CTARGET_ARCH" || _target=""

 pkgname=gcc-armhf
-pkgrel=5
+pkgrel=4
 pkgdesc="Stage2 cross-compiler for armhf"
 url="https://gcc.gnu.org"
 arch="x86_64"
 license="GPL-2.0-or-later AND LGPL-2.1-or-later"
 _gccrel=$pkgver-r$pkgrel
-depends="binutils-armhf mpc1 so:libc.musl-x86_64.so.1 so:libgcc_s.so.1 so:libgmp.so.10 so:libisl.so.23 so:libmpc.so.3 so:libmpfr.so.6 so:libstdc++.so.6 so:libz.so.1"
+depends="binutils-armhf mpc1"
 makedepends_build="gcc g++ bison flex texinfo gawk zip gmp-dev mpfr-dev mpc1-dev zlib-dev"
 makedepends_host="linux-headers gmp-dev mpfr-dev mpc1-dev isl-dev zlib-dev musl-dev-armhf binutils-armhf"
 subpackages="g++-armhf:gpp libstdc++-dev-armhf:libcxx_dev"
 [ "$CHOST" = "$CTARGET" ] && subpackages="gcc-gdb gcc-doc"
 replaces="libstdc++ binutils"
 options="!strip !tracedeps"
+depends="$depends so:libc.musl-x86_64.so.1 so:libgcc_s.so.1 so:libgmp.so.10 so:libisl.so.23 so:libmpc.so.3 so:libmpfr.so.6 so:libstdc++.so.6 so:libz.so.1"

 : "${LANG_CXX:=true}"
 : "${LANG_D:=true}"
@@ -319,7 +320,7 @@ build() {
 	i586-*-*-*)		_arch_configure="--with-arch=pentium-m --with-fpmath=sse --with-tune=generic --enable-cld";;
 	s390x-*-*-*)		_arch_configure="--with-arch=z196 --with-tune=zEC12 --with-zarch --with-long-double-128 --enable-decimal-float";;
 	riscv64-*-*-*)		_arch_configure="--with-arch=rv64gc --with-abi=lp64d --enable-autolink-libatomic";;
-	loongarch64-*-*-*)      _arch_configure="--with-arch=la64v1.0 --with-abi=lp64d";;
+	loongarch64-*-*-*)      _arch_configure="--with-arch=loongarch64 --with-abi=lp64d";;
 	esac

 	case "$CTARGET_ARCH" in
@@ -472,9 +473,7 @@ package() {

 	# move ada runtime libs
 	if $LANG_ADA; then
-		local libgnat_static=
-		[ "$CHOST" = "$CTARGET" ] && libgnat_static="libgna*.a"
-		for i in $(find "$pkgdir"/$_gcclibdir/adalib/ -type f -maxdepth 1 \( -name "libgna*.so" -o -name "$libgnat_static" \) ); do
+		for i in $(find "$pkgdir"/$_gcclibdir/adalib/ -type f -maxdepth 1 \( -name "libgna*.so" -o -name "libgna*.a" \) ); do
 			mv "$i" "$pkgdir"/usr/lib/
 			ln -s ../../../../${i##*/} $i
 		done
@@ -487,6 +486,9 @@ package() {
 		# libcc1 does not depend on target, don't ship it
 		rm -rf "$pkgdir"/usr/lib/libcc1.so*

+		# These are moved into packages with arch=$CTARGET_ARCH so remove
+		# cross prefix
+		#mv "$pkgdir"/usr/$CTARGET/lib/*.so.* "$pkgdir"/usr/lib/ # FIXME

 		# fixup gcc library symlinks to be linker scripts so
 		# linker finds the libs from relocated sysroot
@@ -568,9 +570,8 @@ libcxx_dev() {
 gpp() {
 	pkgdesc="GNU C++ standard library and compiler"
 	depends="libstdc++-dev$_target=$_gccrel gcc$_target=$_gccrel musl-dev"
-	[ "$CHOST" = "$CTARGET" ] && depends="$depends libstdc++=$_gccrel"
-
 	depends="$depends so:libc.musl-x86_64.so.1 so:libgmp.so.10 so:libisl.so.23 so:libmpc.so.3 so:libmpfr.so.6 so:libz.so.1"
+	[ "$CHOST" = "$CTARGET" ] && depends="$depends libstdc++=$_gccrel"

 	amove $_gcclibexec/cc1plus
 	amove usr/bin/*++
@@ -34,19 +34,20 @@ _pkgsnap="${pkgver##*_git}"
 [ "$CHOST" != "$CTARGET" ] && _target="-$CTARGET_ARCH" || _target=""

 pkgname=gcc-armv7
-pkgrel=5
+pkgrel=4
 pkgdesc="Stage2 cross-compiler for armv7"
 url="https://gcc.gnu.org"
 arch="x86_64"
 license="GPL-2.0-or-later AND LGPL-2.1-or-later"
 _gccrel=$pkgver-r$pkgrel
-depends="binutils-armv7 mpc1 so:libc.musl-x86_64.so.1 so:libgcc_s.so.1 so:libgmp.so.10 so:libisl.so.23 so:libmpc.so.3 so:libmpfr.so.6 so:libstdc++.so.6 so:libz.so.1"
+depends="binutils-armv7 mpc1"
 makedepends_build="gcc g++ bison flex texinfo gawk zip gmp-dev mpfr-dev mpc1-dev zlib-dev"
 makedepends_host="linux-headers gmp-dev mpfr-dev mpc1-dev isl-dev zlib-dev musl-dev-armv7 binutils-armv7"
 subpackages="g++-armv7:gpp libstdc++-dev-armv7:libcxx_dev"
 [ "$CHOST" = "$CTARGET" ] && subpackages="gcc-gdb gcc-doc"
 replaces="libstdc++ binutils"
 options="!strip !tracedeps"
+depends="$depends so:libc.musl-x86_64.so.1 so:libgcc_s.so.1 so:libgmp.so.10 so:libisl.so.23 so:libmpc.so.3 so:libmpfr.so.6 so:libstdc++.so.6 so:libz.so.1"

 : "${LANG_CXX:=true}"
 : "${LANG_D:=true}"
@@ -319,7 +320,7 @@ build() {
 	i586-*-*-*)		_arch_configure="--with-arch=pentium-m --with-fpmath=sse --with-tune=generic --enable-cld";;
 	s390x-*-*-*)		_arch_configure="--with-arch=z196 --with-tune=zEC12 --with-zarch --with-long-double-128 --enable-decimal-float";;
 	riscv64-*-*-*)		_arch_configure="--with-arch=rv64gc --with-abi=lp64d --enable-autolink-libatomic";;
-	loongarch64-*-*-*)      _arch_configure="--with-arch=la64v1.0 --with-abi=lp64d";;
+	loongarch64-*-*-*)      _arch_configure="--with-arch=loongarch64 --with-abi=lp64d";;
 	esac

 	case "$CTARGET_ARCH" in
@@ -472,9 +473,7 @@ package() {

 	# move ada runtime libs
 	if $LANG_ADA; then
-		local libgnat_static=
-		[ "$CHOST" = "$CTARGET" ] && libgnat_static="libgna*.a"
-		for i in $(find "$pkgdir"/$_gcclibdir/adalib/ -type f -maxdepth 1 \( -name "libgna*.so" -o -name "$libgnat_static" \) ); do
+		for i in $(find "$pkgdir"/$_gcclibdir/adalib/ -type f -maxdepth 1 \( -name "libgna*.so" -o -name "libgna*.a" \) ); do
 			mv "$i" "$pkgdir"/usr/lib/
 			ln -s ../../../../${i##*/} $i
 		done
@@ -487,6 +486,9 @@ package() {
 		# libcc1 does not depend on target, don't ship it
 		rm -rf "$pkgdir"/usr/lib/libcc1.so*

+		# These are moved into packages with arch=$CTARGET_ARCH so remove
+		# cross prefix
+		#mv "$pkgdir"/usr/$CTARGET/lib/*.so.* "$pkgdir"/usr/lib/ # FIXME

 		# fixup gcc library symlinks to be linker scripts so
 		# linker finds the libs from relocated sysroot
@@ -568,9 +570,8 @@ libcxx_dev() {
 gpp() {
 	pkgdesc="GNU C++ standard library and compiler"
 	depends="libstdc++-dev$_target=$_gccrel gcc$_target=$_gccrel musl-dev"
-	[ "$CHOST" = "$CTARGET" ] && depends="$depends libstdc++=$_gccrel"
-
 	depends="$depends so:libc.musl-x86_64.so.1 so:libgmp.so.10 so:libisl.so.23 so:libmpc.so.3 so:libmpfr.so.6 so:libz.so.1"
+	[ "$CHOST" = "$CTARGET" ] && depends="$depends libstdc++=$_gccrel"

 	amove $_gcclibexec/cc1plus
 	amove usr/bin/*++
@@ -34,19 +34,20 @@ _pkgsnap="${pkgver##*_git}"
 [ "$CHOST" != "$CTARGET" ] && _target="-$CTARGET_ARCH" || _target=""

 pkgname=gcc-riscv64
-pkgrel=5
+pkgrel=4
 pkgdesc="Stage2 cross-compiler for riscv64"
 url="https://gcc.gnu.org"
 arch="x86_64"
 license="GPL-2.0-or-later AND LGPL-2.1-or-later"
 _gccrel=$pkgver-r$pkgrel
-depends="binutils-riscv64 mpc1 so:libc.musl-x86_64.so.1 so:libgcc_s.so.1 so:libgmp.so.10 so:libisl.so.23 so:libmpc.so.3 so:libmpfr.so.6 so:libstdc++.so.6 so:libz.so.1"
+depends="binutils-riscv64 mpc1"
 makedepends_build="gcc g++ bison flex texinfo gawk zip gmp-dev mpfr-dev mpc1-dev zlib-dev"
 makedepends_host="linux-headers gmp-dev mpfr-dev mpc1-dev isl-dev zlib-dev musl-dev-riscv64 binutils-riscv64"
 subpackages="g++-riscv64:gpp libstdc++-dev-riscv64:libcxx_dev"
 [ "$CHOST" = "$CTARGET" ] && subpackages="gcc-gdb gcc-doc"
 replaces="libstdc++ binutils"
 options="!strip !tracedeps"
+depends="$depends so:libc.musl-x86_64.so.1 so:libgcc_s.so.1 so:libgmp.so.10 so:libisl.so.23 so:libmpc.so.3 so:libmpfr.so.6 so:libstdc++.so.6 so:libz.so.1"

 : "${LANG_CXX:=true}"
 : "${LANG_D:=true}"
@@ -319,7 +320,7 @@ build() {
 	i586-*-*-*)		_arch_configure="--with-arch=pentium-m --with-fpmath=sse --with-tune=generic --enable-cld";;
 	s390x-*-*-*)		_arch_configure="--with-arch=z196 --with-tune=zEC12 --with-zarch --with-long-double-128 --enable-decimal-float";;
 	riscv64-*-*-*)		_arch_configure="--with-arch=rv64gc --with-abi=lp64d --enable-autolink-libatomic";;
-	loongarch64-*-*-*)      _arch_configure="--with-arch=la64v1.0 --with-abi=lp64d";;
+	loongarch64-*-*-*)      _arch_configure="--with-arch=loongarch64 --with-abi=lp64d";;
 	esac

 	case "$CTARGET_ARCH" in
@@ -472,9 +473,7 @@ package() {

 	# move ada runtime libs
 	if $LANG_ADA; then
-		local libgnat_static=
-		[ "$CHOST" = "$CTARGET" ] && libgnat_static="libgna*.a"
-		for i in $(find "$pkgdir"/$_gcclibdir/adalib/ -type f -maxdepth 1 \( -name "libgna*.so" -o -name "$libgnat_static" \) ); do
+		for i in $(find "$pkgdir"/$_gcclibdir/adalib/ -type f -maxdepth 1 \( -name "libgna*.so" -o -name "libgna*.a" \) ); do
 			mv "$i" "$pkgdir"/usr/lib/
 			ln -s ../../../../${i##*/} $i
 		done
@@ -487,6 +486,9 @@ package() {
 		# libcc1 does not depend on target, don't ship it
 		rm -rf "$pkgdir"/usr/lib/libcc1.so*

+		# These are moved into packages with arch=$CTARGET_ARCH so remove
+		# cross prefix
+		#mv "$pkgdir"/usr/$CTARGET/lib/*.so.* "$pkgdir"/usr/lib/ # FIXME

 		# fixup gcc library symlinks to be linker scripts so
 		# linker finds the libs from relocated sysroot
@@ -568,9 +570,8 @@ libcxx_dev() {
 gpp() {
 	pkgdesc="GNU C++ standard library and compiler"
 	depends="libstdc++-dev$_target=$_gccrel gcc$_target=$_gccrel musl-dev"
-	[ "$CHOST" = "$CTARGET" ] && depends="$depends libstdc++=$_gccrel"
-
 	depends="$depends so:libc.musl-x86_64.so.1 so:libgmp.so.10 so:libisl.so.23 so:libmpc.so.3 so:libmpfr.so.6 so:libz.so.1"
+	[ "$CHOST" = "$CTARGET" ] && depends="$depends libstdc++=$_gccrel"

 	amove $_gcclibexec/cc1plus
 	amove usr/bin/*++
@@ -34,19 +34,20 @@ _pkgsnap="${pkgver##*_git}"
 [ "$CHOST" != "$CTARGET" ] && _target="-$CTARGET_ARCH" || _target=""

 pkgname=gcc-x86
-pkgrel=5
+pkgrel=4
 pkgdesc="Stage2 cross-compiler for x86"
 url="https://gcc.gnu.org"
 arch="x86_64"
 license="GPL-2.0-or-later AND LGPL-2.1-or-later"
 _gccrel=$pkgver-r$pkgrel
-depends="binutils-x86 mpc1 so:libc.musl-x86_64.so.1 so:libgcc_s.so.1 so:libgmp.so.10 so:libisl.so.23 so:libmpc.so.3 so:libmpfr.so.6 so:libstdc++.so.6 so:libz.so.1"
+depends="binutils-x86 mpc1"
 makedepends_build="gcc g++ bison flex texinfo gawk zip gmp-dev mpfr-dev mpc1-dev zlib-dev"
 makedepends_host="linux-headers gmp-dev mpfr-dev mpc1-dev isl-dev zlib-dev musl-dev-x86 binutils-x86"
 subpackages="g++-x86:gpp libstdc++-dev-x86:libcxx_dev"
 [ "$CHOST" = "$CTARGET" ] && subpackages="gcc-gdb gcc-doc"
 replaces="libstdc++ binutils"
 options="!strip !tracedeps"
+depends="$depends so:libc.musl-x86_64.so.1 so:libgcc_s.so.1 so:libgmp.so.10 so:libisl.so.23 so:libmpc.so.3 so:libmpfr.so.6 so:libstdc++.so.6 so:libz.so.1"

 : "${LANG_CXX:=true}"
 : "${LANG_D:=true}"
@@ -319,7 +320,7 @@ build() {
 	i586-*-*-*)		_arch_configure="--with-arch=pentium-m --with-fpmath=sse --with-tune=generic --enable-cld";;
 	s390x-*-*-*)		_arch_configure="--with-arch=z196 --with-tune=zEC12 --with-zarch --with-long-double-128 --enable-decimal-float";;
 	riscv64-*-*-*)		_arch_configure="--with-arch=rv64gc --with-abi=lp64d --enable-autolink-libatomic";;
-	loongarch64-*-*-*)      _arch_configure="--with-arch=la64v1.0 --with-abi=lp64d";;
+	loongarch64-*-*-*)      _arch_configure="--with-arch=loongarch64 --with-abi=lp64d";;
 	esac

 	case "$CTARGET_ARCH" in
@@ -472,9 +473,7 @@ package() {

 	# move ada runtime libs
 	if $LANG_ADA; then
-		local libgnat_static=
-		[ "$CHOST" = "$CTARGET" ] && libgnat_static="libgna*.a"
-		for i in $(find "$pkgdir"/$_gcclibdir/adalib/ -type f -maxdepth 1 \( -name "libgna*.so" -o -name "$libgnat_static" \) ); do
+		for i in $(find "$pkgdir"/$_gcclibdir/adalib/ -type f -maxdepth 1 \( -name "libgna*.so" -o -name "libgna*.a" \) ); do
 			mv "$i" "$pkgdir"/usr/lib/
 			ln -s ../../../../${i##*/} $i
 		done
@@ -487,6 +486,9 @@ package() {
 		# libcc1 does not depend on target, don't ship it
 		rm -rf "$pkgdir"/usr/lib/libcc1.so*

+		# These are moved into packages with arch=$CTARGET_ARCH so remove
+		# cross prefix
+		#mv "$pkgdir"/usr/$CTARGET/lib/*.so.* "$pkgdir"/usr/lib/ # FIXME

 		# fixup gcc library symlinks to be linker scripts so
 		# linker finds the libs from relocated sysroot
@@ -568,9 +570,8 @@ libcxx_dev() {
 gpp() {
 	pkgdesc="GNU C++ standard library and compiler"
 	depends="libstdc++-dev$_target=$_gccrel gcc$_target=$_gccrel musl-dev"
-	[ "$CHOST" = "$CTARGET" ] && depends="$depends libstdc++=$_gccrel"
-
 	depends="$depends so:libc.musl-x86_64.so.1 so:libgmp.so.10 so:libisl.so.23 so:libmpc.so.3 so:libmpfr.so.6 so:libz.so.1"
+	[ "$CHOST" = "$CTARGET" ] && depends="$depends libstdc++=$_gccrel"

 	amove $_gcclibexec/cc1plus
 	amove usr/bin/*++
@@ -34,19 +34,21 @@ _pkgsnap="${pkgver##*_git}"
 [ "$CHOST" != "$CTARGET" ] && _target="-$CTARGET_ARCH" || _target=""

 pkgname=gcc-x86_64
-pkgrel=5
+pkgrel=4
 pkgdesc="Stage2 cross-compiler for x86_64"
 url="https://gcc.gnu.org"
 arch="aarch64"
 license="GPL-2.0-or-later AND LGPL-2.1-or-later"
 _gccrel=$pkgver-r$pkgrel
-depends="binutils-x86_64 mpc1 so:libc.musl-aarch64.so.1 so:libgcc_s.so.1 so:libgmp.so.10 so:libisl.so.23 so:libmpc.so.3 so:libmpfr.so.6 so:libstdc++.so.6 so:libz.so.1"
+depends="binutils-x86_64 mpc1"
 makedepends_build="gcc g++ bison flex texinfo gawk zip gmp-dev mpfr-dev mpc1-dev zlib-dev"
 makedepends_host="linux-headers gmp-dev mpfr-dev mpc1-dev isl-dev zlib-dev musl-dev-x86_64 binutils-x86_64"
 subpackages="g++-x86_64:gpp libstdc++-dev-x86_64:libcxx_dev"
 [ "$CHOST" = "$CTARGET" ] && subpackages="gcc-gdb gcc-doc"
 replaces="libstdc++ binutils"
 options="!strip !tracedeps"
+depends="$depends so:libc.musl-aarch64.so.1 so:libgcc_s.so.1 so:libgmp.so.10 so:libisl.so.23 so:libmpc.so.3 so:libmpfr.so.6 so:libstdc++.so.6 so:libz.so.1"
+

 : "${LANG_CXX:=true}"
 : "${LANG_D:=true}"
@@ -319,7 +321,7 @@ build() {
 	i586-*-*-*)		_arch_configure="--with-arch=pentium-m --with-fpmath=sse --with-tune=generic --enable-cld";;
 	s390x-*-*-*)		_arch_configure="--with-arch=z196 --with-tune=zEC12 --with-zarch --with-long-double-128 --enable-decimal-float";;
 	riscv64-*-*-*)		_arch_configure="--with-arch=rv64gc --with-abi=lp64d --enable-autolink-libatomic";;
-	loongarch64-*-*-*)      _arch_configure="--with-arch=la64v1.0 --with-abi=lp64d";;
+	loongarch64-*-*-*)      _arch_configure="--with-arch=loongarch64 --with-abi=lp64d";;
 	esac

 	case "$CTARGET_ARCH" in
@@ -472,9 +474,7 @@ package() {

 	# move ada runtime libs
 	if $LANG_ADA; then
-		local libgnat_static=
-		[ "$CHOST" = "$CTARGET" ] && libgnat_static="libgna*.a"
-		for i in $(find "$pkgdir"/$_gcclibdir/adalib/ -type f -maxdepth 1 \( -name "libgna*.so" -o -name "$libgnat_static" \) ); do
+		for i in $(find "$pkgdir"/$_gcclibdir/adalib/ -type f -maxdepth 1 \( -name "libgna*.so" -o -name "libgna*.a" \) ); do
 			mv "$i" "$pkgdir"/usr/lib/
 			ln -s ../../../../${i##*/} $i
 		done
@@ -487,6 +487,9 @@ package() {
 		# libcc1 does not depend on target, don't ship it
 		rm -rf "$pkgdir"/usr/lib/libcc1.so*

+		# These are moved into packages with arch=$CTARGET_ARCH so remove
+		# cross prefix
+		#mv "$pkgdir"/usr/$CTARGET/lib/*.so.* "$pkgdir"/usr/lib/ # FIXME

 		# fixup gcc library symlinks to be linker scripts so
 		# linker finds the libs from relocated sysroot
@@ -568,10 +571,10 @@ libcxx_dev() {
 gpp() {
 	pkgdesc="GNU C++ standard library and compiler"
 	depends="libstdc++-dev$_target=$_gccrel gcc$_target=$_gccrel musl-dev"
-	[ "$CHOST" = "$CTARGET" ] && depends="$depends libstdc++=$_gccrel"
-
 	depends="$depends so:libc.musl-aarch64.so.1 so:libgmp.so.10 so:libisl.so.23 so:libmpc.so.3 so:libmpfr.so.6 so:libz.so.1"

+	[ "$CHOST" = "$CTARGET" ] && depends="$depends libstdc++=$_gccrel"
+
 	amove $_gcclibexec/cc1plus
 	amove usr/bin/*++
 }
@@ -3,7 +3,7 @@

 pkgname=grub-efi-x86
 pkgver=2.12
-pkgrel=7
+pkgrel=6

 _arch="x86"
 _mirror="http://dl-4.alpinelinux.org/alpine/"
@@ -22,5 +22,5 @@ package() {
 }

 sha512sums="
-8a44b4d48c804fb2c62c3d75c85f86a108f1446d3b1f194cde3c1b3ce7653825379d5733fdf8e08013afcea0d9c879438556d8cbbfb7d5cd6c41b98ab7216492  grub-efi-2.12-r7-x86-edge.apk
+bad54187b4fbb9f78f2d619ff9a652a4927c557070c2c39334fd9900ae5aeb956144055602ca56295d7966c2d10090ef142a073dd67eb14f7b41ba0d54c78d4d  grub-efi-2.12-r6-x86-edge.apk
 "
@@ -8,7 +8,7 @@ fi

 pkgname=musl-aarch64
 pkgver=1.2.5
-pkgrel=9
+pkgrel=8
 arch="x86_64"
 subpackages="musl-dev-aarch64:package_dev"

@@ -57,6 +57,6 @@ package_dev() {
 }

 sha512sums="
-0f874d6c7be3a69a69553d99c4b50ede6e3b92811052c13a36d8dd35955817f437f77e185d624804526d36e8cc6e99be4eedf8c2d3bcf09340068b1e41da5a49  musl-1.2.5-r9-aarch64-edge.apk
-2b85e131b5b8829a02ca5d6ab9bf3e897468834e6db9e5d54127037b5951f5c3ca06964d225d7d4376637ae77467c4001cbcc7f179705a6a206587ac8d7cd266  musl-dev-1.2.5-r9-aarch64-edge.apk
+9cdb30e50d99d377ef8ef3bc41fc6ecd0ae7bc744c6c29ba97afd1ff072271d78c9a36947cebdf944e907b5181bacf165345824234380511d4cc3b535c730673  musl-1.2.5-r8-aarch64-edge.apk
+5638f321b0e76bdb68d3e641ab5bcf4b0f66365aedfbec52b09fc9eafcaf210797c2cbd8166254c3633e3d597d8118838443d32e0af45d689467a237e1cf479e  musl-dev-1.2.5-r8-aarch64-edge.apk
 "
@@ -8,7 +8,7 @@ fi

 pkgname=musl-armhf
 pkgver=1.2.5
-pkgrel=9
+pkgrel=8
 arch="x86_64"
 subpackages="musl-dev-armhf:package_dev"

@@ -57,6 +57,6 @@ package_dev() {
 }

 sha512sums="
-10f462174d0fa0caaa4e4b767848b2d3a89c70617aca562cf0cd310ee2119eee8638b9eb2909a0756ee8e8952236624c1bacaac314b2d1146cf1c47b4c9b409d  musl-1.2.5-r9-armhf-edge.apk
-b9305bbe13d94de869d354f3657f59f1e08e897c2b6b0d0419a1dc384f00160dbf56df52b75196f238bcee62dd2e7e613755a91ee6e28776f6df38e5e9203de1  musl-dev-1.2.5-r9-armhf-edge.apk
+18a970c5ef74e306ffa6031ae5f75a9cc3c52a9cd4c4706c94631696cf52d5af5024548d658176546c559c99dfad321e0ce87eddcc92a4aff40293e61313f921  musl-1.2.5-r8-armhf-edge.apk
+c8bcb213d113fde24ed72f67d46e19cc842fbae223aaa02b635d53ba4c7ea39869243b24dada8a248e8c93e1e9c8b35424be39bcfd25136d3b18250cab820638  musl-dev-1.2.5-r8-armhf-edge.apk
 "
@@ -8,7 +8,7 @@ fi

 pkgname=musl-armv7
 pkgver=1.2.5
-pkgrel=9
+pkgrel=8
 arch="x86_64"
 subpackages="musl-dev-armv7:package_dev"

@@ -57,6 +57,6 @@ package_dev() {
 }

 sha512sums="
-874994ef577a9651b444ddab90f8ac248b7b2ef8c4b0b7dda38d4ff2200e76a737e9dc27b63da5e7fd4022d18829badcdf99969cc52752d710ec598460cbe03d  musl-1.2.5-r9-armv7-edge.apk
-945a53e8ac24889bcc1bee2b9235fa743c6f653ca0f1611176797ae242eb26c19d3521ead290e9a759ffff38135073c6d2677879c891499c3a50f7f23ab0cead  musl-dev-1.2.5-r9-armv7-edge.apk
+4aad1e994572ae8b364e926c9213dbc2f6759fb9308290837cbcba31c4005a9dfc16fb2600953dd23e3f49b9a549865bc818e875d8dd8ef8f9075a114a7dca2d  musl-1.2.5-r8-armv7-edge.apk
+69359b6d47b94560657c7c97709ea2bcc3b31e4454bb247721d39d20daa1520178cca789f68126d4235f1e10ed1a7a7ce598b199323898d0c6b714342608ab0d  musl-dev-1.2.5-r8-armv7-edge.apk
 "
@@ -8,7 +8,7 @@ fi

 pkgname=musl-riscv64
 pkgver=1.2.5
-pkgrel=9
+pkgrel=8
 arch="x86_64"
 subpackages="musl-dev-riscv64:package_dev"

@@ -57,6 +57,6 @@ package_dev() {
 }

 sha512sums="
-eb1e36d35decc8df6c383845e73a703bb5e0f322ca4ba8c346a54652f6d3c9c46d1eef901031ccfaa3a52a132963a67f35f791480f5918c091f3141775e1b1b9  musl-1.2.5-r9-riscv64-edge.apk
-0cfa1711bc803674fb6504ed7466d73c2e35b735cbd78a5348bafd48973ed89afb877d966202d822f5e7d1064e99c1cc8452672478e3c6f30bac611328462c57  musl-dev-1.2.5-r9-riscv64-edge.apk
+41e2ab47c4ee0cd3fde7867be24eaff3f0346ae66b0e4a268b2638e243ba3e55db6782f9633d6ee08018eb608134908439c498e4c8a6cc43b6f607ed2af0f41b  musl-1.2.5-r8-riscv64-edge.apk
+f9f31edbd65a2c920c4936be66c6e822081ac13a1b08bf7fda7205105bb77fcd18484a73f42857ab947e88310b093c02cedc1b097490b4ba610ff9a78c60ab15  musl-dev-1.2.5-r8-riscv64-edge.apk
 "
@@ -8,7 +8,7 @@ fi

 pkgname=musl-x86
 pkgver=1.2.5
-pkgrel=9
+pkgrel=8
 arch="x86_64"
 subpackages="musl-dev-x86:package_dev"

@@ -57,6 +57,6 @@ package_dev() {
 }

 sha512sums="
-809a21a20c1c0558c717b566c2fa53af05bb5eab0ca44bc1616b746f89fb4bf9ea05a733a6f4d6b674cd8d531c2734d3d44e38460c4939ac8e24423c91ad8e57  musl-1.2.5-r9-x86-edge.apk
-be193ac93468095cbecd9fbc84ee16b9fc2f5e7f5181b6759669cb180cdd31daf1b094eb9585e1ddc9b27be7cedc931a51eaca09c1dce191826f8b6f1c15587d  musl-dev-1.2.5-r9-x86-edge.apk
+57242b717ccfa0dd5dae74f6b440b1258fc4900c30b569b7fa46930e38cc1ca1c28cbb9c24239c67909fd26644a82c87ef19a41ce3c5a47e0f4c2e749d24eb32  musl-1.2.5-r8-x86-edge.apk
+d3df9a8bb1a5b61cc84f805e0e1926dd52fae77929b5839ffe37c694a7a494728166aff52a37b3ce4fe24065c6886098bff91ddf9f365e636b3fd1dc0e0332ac  musl-dev-1.2.5-r8-x86-edge.apk
 "
@@ -8,7 +8,7 @@ fi

 pkgname=musl-x86_64
 pkgver=1.2.5
-pkgrel=9
+pkgrel=8
 arch="aarch64"
 subpackages="musl-dev-x86_64:package_dev"

@@ -57,6 +57,6 @@ package_dev() {
 }

 sha512sums="
-b762a06e161cfbdf3a62c155dd6b0d11d81b81543a2381b7ea0ccd56320f9ed14c52a19dd76033594cfefd3b5da20517a2fda3a7c94d7e43c0f378912237b62f  musl-1.2.5-r9-x86_64-edge.apk
-396a982f454b377df901bc465ec5e5ba8b91c2e9e9b6cd52ae28f83f4b5fbd673e7c79657ffa94d0d164e80d77dac813c5b7c51914fabcae3167d0bbc182b01a  musl-dev-1.2.5-r9-x86_64-edge.apk
+fa2d127eaf56c9bcd93e40ab8c2499123d534f65319232b76f12ffdd0798ed2f0218802cae0373f9255996fdfa194f04bb92d1e05c9b0a659fae4b7a533094eb  musl-1.2.5-r8-x86_64-edge.apk
+4fcd12befeaa57c3961e4291d37ed9a57043879af6de32f65db3b860616d0c1b76a545099c03350603fddebd8360beae552655ea6df9046712bda290c51d3e05  musl-dev-1.2.5-r8-x86_64-edge.apk
 "
@@ -2,8 +2,8 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-alcatel-idol347-downstream
 pkgdesc="Alcatel OneTouch Idol 3 (4.7) (Downstream)"
-pkgver=2
-pkgrel=0
+pkgver=1
+pkgrel=2
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
@@ -21,5 +21,5 @@ package() {
 }

 sha512sums="
-131bddf782050fd8301ebd242a5b19cd70c520f03fe2e8a2f0b7afba60cc3dc0330f3765395de70553fc172a116a02a9512c3fc189303cb09609e4adac76a799  deviceinfo
+2b6ba0e6e6d8f90d907a7a8089718c8a1ff8ee3ad0ea17f204e2e9fa2a514a06af9c2b91b7bfb0b8b8362ba2d44b53aad52fd88d506682f1f61b9fe6c19d206e  deviceinfo
 "
@@ -20,6 +20,7 @@ deviceinfo_flash_method="fastboot"
 deviceinfo_kernel_cmdline="console=ttyHSL0,115200,n8 androidboot.console=ttyHSL0 androidboot.hardware=qcom msm_rtb.filter=0x237 ehci-hcd.park=3 androidboot.bootdevice=7824900.sdhci lpm_levels.sleep_disabled=1 earlyprintk androidboot.bootloader=L1BGC0C0BG00"
 deviceinfo_generate_bootimg="true"
 deviceinfo_bootimg_qcdt="false"
+deviceinfo_bootimg_mtk_mkimage="false"
 deviceinfo_bootimg_dtb_second="false"
 deviceinfo_flash_offset_base="0x80000000"
 deviceinfo_flash_offset_kernel="0x00008000"
@@ -3,7 +3,7 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-samsung-coreprimevelte-downstream
 pkgdesc="Samsung Galaxy Core Prime VE LTE downstream"
-pkgver=3
+pkgver=2
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -24,6 +24,6 @@ package() {
 }

 sha512sums="
-00c8780dbc77e62e7d57a2b3e879881076204f3e58d50555778aa68feb0157f5b4207fdabbb4627888eeeda6a35182e8e199e49e4050244a60ce4e9e2d84bd99  deviceinfo
+ec654952ea328489ced4268a78272977cca1a9356d86ea9794f5a0aa9387d7daeb1125419388a4ade0ea86cc6893178601eb7aa18a5886970a775e5ad78a59ba  deviceinfo
 4854cc57b86e1199dbc165110514e672dabf45044fe9f7ebbde5b2b24768fb5497273b5f38612cf2dfeffc9bf0648c725114b4fa01165bf7fb02f7d741ee5806  90-coreprimevelte.conf
 "
@@ -20,6 +20,7 @@ deviceinfo_create_initfs_extra="true"
 deviceinfo_flash_method="heimdall-bootimg"
 deviceinfo_generate_bootimg="true"
 deviceinfo_bootimg_qcdt="true"
+deviceinfo_bootimg_mtk_mkimage="false"
 deviceinfo_bootimg_dtb_second="false"
 deviceinfo_bootimg_pxa="true"
 deviceinfo_flash_offset_base="0x10000000"
@@ -2,7 +2,7 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-samsung-m0-downstream
 pkgdesc="Samsung Galaxy S III"
-pkgver=5
+pkgver=4
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -39,6 +39,6 @@ nonfree_firmware() {
 }

 sha512sums="
-e43ad5a25aa5b0c499a8f7001feb236e428a185df0e51bf0b72f82550965e3050d10f8a4e6b0f92b11feec6f4bee734fac78bcbe8f55d8290d2544bd7ec3e811  deviceinfo
+8e72ed82c9cfa5e1a95aa480392264a69a9fe5a6e0b3e40dde4fdd7ca157b20ea673d2183fc02d0e98d4971a94fc625c0df6a8065527173d1653b1c90d1ed232  deviceinfo
 1376f0eb7c6ba459ca5c44b3eb7e9919d9c5f48d71ec30c006d1b4843e31cdade9f980415a166e977b2567b26f4e87d4554ee1143fdc62453d60a93bed129d06  90-android-touch-dev.rules
 "
@@ -21,6 +21,7 @@ deviceinfo_flash_method="heimdall-bootimg"
 deviceinfo_kernel_cmdline="console=ttySAC2,115200 buildvariant=userdebug"
 deviceinfo_generate_bootimg="true"
 deviceinfo_bootimg_qcdt="false"
+deviceinfo_bootimg_mtk_mkimage="false"
 deviceinfo_bootimg_dtb_second="false"
 deviceinfo_flash_offset_base="0x10000000"
 deviceinfo_flash_offset_kernel="0x00008000"
@@ -2,8 +2,8 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-samsung-on7xelte-downstream
 pkgdesc="Samsung Galaxy J7 Prime"
-pkgver=2
-pkgrel=0
+pkgver=1
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -52,7 +52,7 @@ lightdm() {
 }

 sha512sums="
-eb8a2cfc57044f901b3ce75eda0001b58d5132ea52155d5e4bfa7361c1a19021759c0182c5ac01100145902dbebaaaf7965ded45487c6b4d0860a7d799d4cf94  deviceinfo
+d342e7d79922d2e4a313e6c0ad20172e841886aa9517522460699da0dc66cd83cfeab986e468b0427ebcd64d54ffbc39cf3ba56c5d839b560e34cbe6e36526f1  deviceinfo
 baee319b6d2f49a15680b0f322ec3e398a071d73fbf7713d14f26a1d027f8950457a482ac3f019605af3dfcf25bbb33ebaa0ffde181f7f96d911d56251c81eef  lightdm.conf
 efbe3d6217854c0131e61f9f3722100d349cb0673f4923bc3d56dae30a6346b0c33e676a39fc4c080150f6ea9457bf268abf870eea916a7d5daae1a22642a2b8  mount-efs.rc-init
 3e5bb764529010d2b6b1f2759a7799f665d140aebcee2dd63433e68cd4282e09b5d3b34fb7c21e737595b406501e7f02ece4592651c60e4c2b9419de4aedb438  samsungipcd.rc-conf
@@ -21,6 +21,7 @@ deviceinfo_flash_method="heimdall-bootimg"
 deviceinfo_kernel_cmdline="androidboot.selinux=permissive androidboot.selinux=permissive"
 deviceinfo_generate_bootimg="true"
 deviceinfo_bootimg_qcdt="true"
+deviceinfo_bootimg_mtk_mkimage="false"
 deviceinfo_bootimg_dtb_second="false"
 deviceinfo_flash_pagesize="2048"
 deviceinfo_flash_offset_base="0x10000000"
@@ -2,7 +2,7 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-xiaomi-cepheus-downstream
 pkgdesc="Xiaomi Mi 9"
-pkgver=2
+pkgver=1
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -25,5 +25,5 @@ package() {
 }

 sha512sums="
-f71fef16c5a10a49b5ff56971a50224bc4a3c59075276ce2c4fc4f94307d3e39e006942d9f5fe4711058b0ce83b1df44e491efb9b67781662e042878556fe03d  deviceinfo
+ee52ac16542a599f397fba5ddbb82028d666dec7f509a4b9298df248ac98a129c7f2eb4452282c5de38f7f97516da6ba70ea027a0fea075881f6a7f5d2ca10c7  deviceinfo
 "
@@ -22,6 +22,7 @@ deviceinfo_flash_method="fastboot"
 deviceinfo_kernel_cmdline="console=ttyMSM0,115200n8 earlycon=msm_geni_serial,0xa90000 androidboot.hardware=qcom androidboot.console=ttyMSM0 androidboot.memcg=1 lpm_levels.sleep_disabled=1 video=vfb:640x400,bpp=32,memsize=3072000 msm_rtb.filter=0x237 service_locator.enable=1 swiotlb=2048 loop.max_part=7 androidboot.usbcontroller=a600000.dwc3 buildvariant=user"
 deviceinfo_generate_bootimg="true"
 deviceinfo_bootimg_qcdt="false"
+deviceinfo_bootimg_mtk_mkimage="false"
 deviceinfo_bootimg_dtb_second="false"
 deviceinfo_flash_pagesize="4096"
 deviceinfo_flash_offset_base="0x00000000"
@@ -2,8 +2,8 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-xiaomi-wt88047-downstream
 pkgdesc="Xiaomi Redmi 2 (Downstream)"
-pkgver=2
-pkgrel=0
+pkgver=1
+pkgrel=3
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
@@ -21,5 +21,5 @@ package() {
 }

 sha512sums="
-2b101a3143cf3201bb20e8896ecf432bb4b7e6127eb82dd598f9e225338f7b510fe6658701656a5eed5969d691ff699424bda5f27b8a112115f3ab7e33439a68  deviceinfo
+30d1e79a3cafe22a307ace6a4897077e21e93a3433a8c2c636368fb037328d82a22009f6631c8c74481fe030fff9fef846b90a93ecadbc44484558ceb1a4b78f  deviceinfo
 "
@@ -21,6 +21,7 @@ deviceinfo_flash_method="fastboot"
 deviceinfo_kernel_cmdline="console=ttyHSL0,115200,n8 androidboot.console=ttyHSL0 androidboot.hardware=qcom msm_rtb.filter=0x237 ehci-hcd.park=3 androidboot.bootdevice=7824900.sdhci lpm_levels.sleep_disabled=1 loop.max_part=7 phy-msm-usb.floated_charger_enable=1 buildvariant=userdebug"
 deviceinfo_generate_bootimg="true"
 deviceinfo_bootimg_qcdt="true"
+deviceinfo_bootimg_mtk_mkimage="false"
 deviceinfo_bootimg_dtb_second="false"
 deviceinfo_flash_offset_base="0x80000000"
 deviceinfo_flash_offset_kernel="0x00008000"
@@ -2,8 +2,8 @@
 # Maintainer: Luca Weiss <luca@lucaweiss.eu>
 pkgname=device-fairphone-fp4
 pkgdesc="Fairphone 4"
-pkgver=4
-pkgrel=0
+pkgver=3
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -73,7 +73,7 @@ openrc() {
 sha512sums="
 2c16ba75e0077b2b1eaefa4c73b287475505a1aeb291ec29316d41cc094277320f9d2aaabfd91eb1dc0f488ab2d61a94faef16e7afe0f1e226779113761b9a37  81-libssc-fairphone-fp4.rules
 2974ccc172bf1299daeb0bc746879b3a1db1fbc3a2b163a02a6554fed6ed9f733144bcf976cd2441c5664d496dcce3ae943f4314c653470dc07dda0de5ad632b  90-feedbackd-aw8695.rules
-97629090e9d08391ec9ee9f84cf40b9710c9dffc09609f056a27869acc8f87e176765f6e8f9800ef29872df8f48a2e085eeaaaf69f38f8a97ecb1d19ac9c79eb  deviceinfo
+9549f105f865d230e7b67819c96b7e06a5ed4d5808f083099a408934ffbacdb412984b861f6756fa4fde94b51e6a268b8d2ce9fed6f13ee3e8041bb96492310a  deviceinfo
 6a3d620f2cc60308a62ff651ffb00a5ee1f092131cca9d33b6afd61c8a372a3fd7d46540162213593107e0943b33f3f0119d003d43dcd06dbde757390a6c1729  hexagonrpcd.confd
 52bb7ed829caa4dcff9728bd6e3cdf118b3c7ee7dfe90df0d4e6422dd67bf3258ae2a4d2dc7599da4182fbd8eb47a0e1d20c58198dc17f2bf178b8f01a8887f7  modules-initfs
 "
@@ -26,6 +26,7 @@ deviceinfo_flash_method="fastboot"

 deviceinfo_generate_bootimg="true"
 deviceinfo_bootimg_qcdt="false"
+deviceinfo_bootimg_mtk_mkimage="false"
 deviceinfo_bootimg_dtb_second="false"
 deviceinfo_flash_pagesize="4096"
 deviceinfo_flash_offset_base="0x00000000"
@@ -2,8 +2,8 @@
 # Maintainer: Richard Acayan <mailingradian@gmail.com>
 pkgname=device-google-sargo
 pkgdesc="Google Pixel 3a"
-pkgver=7
-pkgrel=0
+pkgver=6
+pkgrel=5
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -84,7 +84,7 @@ sha512sums="
 f700af3145b79d1ef9edfb22982899b25cabfb212f9620dcbd3a2e6f44b5ad591e0a66056c6fcd66c3fde89a2b5f551e8a8fe2e65cf0e2a48adec57c027d7825  10-unl0kr-msm.conf
 089ce0acba4e1d789e337bedfca7570796a6416e7230ae9b8fc6b625747a40dbb064b1a707877cd6b7bdc73844c6571316e2ec0746a77060f13d98c52fdbfc00  81-libssc-google-sargo.rules
 016d398155f2344417f5e5649a361719ba6e53e593c501b5df39114cdd284302b9bf8686a39817aee0c08fec95b3ab613c181d6cc9596299aaf7fd05dbe0c3dd  90-feedbackd-drv2624.rules
-ad032b1a35cfcd4fc0c8df988430ee97b711e785b86cca68b7552b23a9a2e2b6b97c327e3415a575db47ad6c1f86ded18df5553acaae63010057d89b8c16135e  deviceinfo
+8af19da4e4a4a59c49263722065229fae849c3273af313300b7ea1b8fe008c6e55cfd060b91909306dd600134e2494f740adda245707dbcff84b1ab2f37dbde7  deviceinfo
 b6208c254b6e44ac4f6d748a38cc6b05da0db2c90235ada2011b138b82ccc3372687df2f5ad97e885e9eea135216a3c52266a08a7f4eb323e62e799f6f82ec7b  hexagonrpcd-adsp-sensorspd.confd
 3213a3586c25cef843a47e2446179ff73acad6421826a64bedb6b9800d30673503d0ea6b3fcc8cfbdcdcaf0926755a489323fce9d14d4411799e6988144b3518  modules-initfs
 2972005a9cf6ca57061965075593dddfa8ee479bc6c21cd41851b1a14768cb1cddbd31a17975ae17adc36d40d294ccbc6bf83defbd69fc7b363f638d8564fbbc  no-hexagonrpcd-on-suspend.sh
@@ -22,6 +22,7 @@ deviceinfo_screen_height="2220"
 deviceinfo_flash_method="fastboot"
 deviceinfo_generate_bootimg="true"
 deviceinfo_bootimg_qcdt="false"
+deviceinfo_bootimg_mtk_mkimage="false"
 deviceinfo_bootimg_dtb_second="false"
 deviceinfo_flash_pagesize="4096"
 deviceinfo_flash_offset_base="0x00000000"
@@ -4,7 +4,7 @@
 pkgname=device-oneplus-enchilada
 pkgdesc="OnePlus 6"
 pkgver=14
-pkgrel=4
+pkgrel=3
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -53,7 +53,6 @@ nonfree_firmware() {
 	"

 	install -Dm644 "$srcdir"/81-libssc-oneplus-enchilada.rules -t "$subpkgdir"/usr/lib/udev/rules.d/
-	install -Dm644 q6voiced.conf "$subpkgdir"/etc/conf.d/q6voiced
 }

 nonfree_firmware_openrc() {
@@ -61,6 +60,7 @@ nonfree_firmware_openrc() {
 	replaces="hexagonrpcd-openrc"
 	install="$subpkgname.post-install $subpkgname.post-upgrade"

+	install -Dm644 q6voiced.conf "$subpkgdir"/etc/conf.d/q6voiced
 	install -Dm644 "$srcdir"/hexagonrpcd.confd "$subpkgdir"/etc/conf.d/hexagonrpcd-sdsp
 }

@@ -4,7 +4,7 @@
 pkgname=device-oneplus-fajita
 pkgdesc="OnePlus 6T"
 pkgver=14
-pkgrel=3
+pkgrel=2
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -53,7 +53,6 @@ nonfree_firmware() {
 	"

 	install -Dm644 "$srcdir"/81-libssc-oneplus-fajita.rules -t "$subpkgdir"/usr/lib/udev/rules.d/
-	install -Dm644 q6voiced.conf "$subpkgdir"/etc/conf.d/q6voiced
 }

 nonfree_firmware_openrc() {
@@ -61,6 +60,7 @@ nonfree_firmware_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
 }

@@ -2,7 +2,7 @@
 # Maintainer: Arnav Singh <me@arnavion.dev>
 # Co-Maintainer: Jan Jasper de Kroon <jajadekroon@gmail.com>
 pkgname=device-pine64-pinephone
-pkgver=8
+pkgver=7
 pkgrel=0
 pkgdesc="PINE64 PinePhone"
 url="https://postmarketos.org"
@@ -259,7 +259,7 @@ d66ecef1fa5481ff138fe4e12b194903ceacab9d0649e716049f32e56ec6d9be09b97e2ff769ebc5
 967e3a43c7e91ed37fc932a7c580cd168ca11d8ec7f60ff60ece7f286e5144f27faead95162fa7d571a2317ed0da970fd86f5bc9ed0235a25c0be9182d42d64d  90-pinephone.conf
 420ee1d7522d4d56c2909580fd6ba7580483ca5455b13eb6d22e700063ce0c1a5c6d2f5b161dfce0d777636fe9a712aa82f38a0585f2feabea3785b02bae7515  setup-modem.sh
 1f573b4a6686dac30b6e20507ec6590764a9e9e60c5373bda3838b1f25370b447a3220670710c43a64eb518a4aa54d4ab3beb942513ef269e596a73653c6528e  sun50i-a64-psci.dts
-551ace3a724fbe15ebc43ed948f1df111ef42fd3c03797c654d4e14ee65a1b3388c1a6a05c492a96bdff03ee978ef2c2e1c889d324d529eb156cf3d487e8e2a9  uboot-script.cmd
+c509254a94bef7ecf51ecba2f54cd4a3058dede820f9501750005ae43c026b1737a3b7bb30089e3a6f08c64e4e85250887e892dff51884c3159afeaa6e0b4105  uboot-script.cmd
 f28902517bebe16f7ddbdbf9f4c52d5c97319e3b5ba7326ba96ed0e094d3d2a39c87061326893cdc34336bbfd56de084b2f217918ebba7ca6a080088cd0bd409  uboot-user.cmd
 efab4887136826089f2b7aa676bff751d68e56010d5a38e74a007a1c587fb23c899c4090b4543ab4e4b6793e545401afab33078193f9f731e6d2a0884d0cd70b  HiFi.conf
 6e54def33c91121ead0121a05ca7eb003155cd50a70833765ce4322d901ec05fef26057396732ce01f715178bfb21118ef2a7d21c5d4fd3fe119c53f3d05c3b3  PinePhone.conf
@@ -51,7 +51,7 @@ gpio set 115


 echo Loading user script
-setenv user_scriptaddr 0x50f00000
+setenv user_scriptaddr 0x50700000
 load mmc ${mmc_bootdev}:1 ${user_scriptaddr} user.scr
 if test $? -eq 0; then source ${user_scriptaddr}; else echo No user script found; fi

@@ -2,7 +2,7 @@
 # Maintainer: Nikita Travkin <nikita@trvn.ru>
 pkgname=device-samsung-gt58
 pkgdesc="Samsung Galaxy Tab A 8.0 (2015)"
-pkgver=8
+pkgver=7
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -47,7 +47,7 @@ phosh() {
 }

 sha512sums="
-019715a54be2de3426b14aaff69fb399591f6a151eb2681841affb708c98b8993d277bb81a5ef5f0ecb057bfdce6c6aaf97ac9e4769285c45dfb38c4c875404b  deviceinfo
+3597027a39462451a80eb781d17382a0fb4618eeaf61392af6998c94a68c52a85ec1df8bc2ac6a30b71e53c38ab52b640052c97b66e2e8eeb4e55c95858ce308  deviceinfo
 8071b89c832619c74d3bb50d638653aeaab99fee209cde425a7e8425d46d424bad9e8ab76d2d7360bd4c7ff093a712d51c3ca1b6086e1f70812224bbb115b04f  modules-initfs
 ed612b090c1ee512fc257368082fe0c88ca6c98a9d673ece68593739c7a41b4f9dca5d9360de6f84d206f297feba480a9f1982301132e08a14a5ff920a2675a6  phoc.ini
 "
@@ -24,6 +24,7 @@ deviceinfo_flash_method="fastboot"
 deviceinfo_kernel_cmdline="earlycon console=ttyMSM0,115200"
 deviceinfo_generate_bootimg="true"
 deviceinfo_generate_extlinux_config="true"
+deviceinfo_bootimg_mtk_mkimage="false"
 deviceinfo_bootimg_dtb_second="false"
 deviceinfo_flash_offset_base="0x80000000"
 deviceinfo_flash_offset_kernel="0x00080000"
@@ -2,8 +2,8 @@
 # Maintainer: Newbyte <newbyte@disroot.org>
 pkgname=device-samsung-m0
 pkgdesc="Samsung Galaxy S III"
-pkgver=9
-pkgrel=0
+pkgver=8
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
@@ -53,7 +53,7 @@ nonfree_firmware() {
 }

 sha512sums="
-dacebfb86685b67476a6046b1c979530de97a9471c218349bc3b2b02fdd640b4cc2c54656c40c58731164bb06e90f53edca2200762262a3094f3ba5381e05dee  deviceinfo
+768ec2afc4a8b782fdfece54f4ddc9898f3b24a30b45ff0d3f7ef5f5a26fdcca2028d3fd4449029ea09f195cbcd7291318b835b0236e0ae70396c9d5741c326f  deviceinfo
 caa81e8ab6753c0ca24c22fb6742288765dfbf2469b8b8c35c5789edfcee546ef1c3b14ad6e540c417f434258399300f17d312b58157635eafab134587ef94cc  Midas.conf
 21f64c9104ec5780fffde8ba7ce57583592469694d07dd5e2de4173d7c9f99ba57fb28bb5bcfbbce921be9c4ead9d31980e948533162fe12424c2037145debb1  HiFi.conf
 56a2bdffc273cb0a581192e65378ff50e71c7bc8a696af7d5e7c165a53c005aae104c4514c68afb668454c5a94ce78bd509f8a40e3401d67e16636b1ed81d051  modules-load.conf
@@ -25,6 +25,7 @@ deviceinfo_create_initfs_extra="true"
 deviceinfo_flash_method="heimdall-bootimg"
 deviceinfo_generate_bootimg="true"
 deviceinfo_bootimg_qcdt="false"
+deviceinfo_bootimg_mtk_mkimage="false"
 deviceinfo_bootimg_dtb_second="false"
 deviceinfo_flash_offset_base="0x10000000"
 deviceinfo_flash_offset_kernel="0x00008000"
@@ -5,7 +5,7 @@
 pkgname=device-shift-axolotl
 pkgdesc="SHIFT6mq"
 pkgver=15
-pkgrel=2
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -52,7 +52,6 @@ nonfree_firmware() {
 	"

 	install -Dm644 "$srcdir"/81-libssc-shift-axolotl.rules -t "$subpkgdir"/usr/lib/udev/rules.d/
-	install -Dm644 q6voiced.conf "$subpkgdir"/etc/conf.d/q6voiced
 }

 nonfree_firmware_openrc() {
@@ -60,6 +59,7 @@ nonfree_firmware_openrc() {
 	replaces="hexagonrpcd-openrc"
 	install="$subpkgname.post-install $subpkgname.post-upgrade"

+	install -Dm644 q6voiced.conf "$subpkgdir"/etc/conf.d/q6voiced
 	install -Dm644 "$srcdir"/hexagonrpcd.confd "$subpkgdir"/etc/conf.d/hexagonrpcd-sdsp
 }

@@ -2,8 +2,8 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-xiaomi-beryllium
 pkgdesc="Xiaomi Poco F1"
-pkgver=12
-pkgrel=1
+pkgver=11
+pkgrel=3
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -47,17 +47,19 @@ nonfree_firmware() {
 		soc-qcom-sdm845-modem
 		hexagonrpcd
 	"
+	mkdir "$subpkgdir"

 	install -Dm644 81-libssc-xiaomi-beryllium.rules \
 		"$subpkgdir"/etc/udev/rules.d/81-libssc-xiaomi-beryllium.rules
-	install -Dm644 q6voiced.conf "$subpkgdir"/etc/conf.d/q6voiced
 }

 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
 	install -Dm644 "$srcdir"/hexagonrpcd.confd "$subpkgdir"/etc/conf.d/hexagonrpcd-sdsp
 }

@@ -74,7 +76,7 @@ kernel_ebbg() {
 }

 sha512sums="
-7210020cb4b745cd064f24b51cfa17e91d888a913ebf5cabf2b65162efc3f328c487174343a0cd7549512cb4ad165a2c6215454a71757d4e3f54bfd4613ba809  deviceinfo
+2cb2a7203bd4a758007c41e06f0c0319ff2bd51714798dba91828238615fe668c05ddfd96754afbf7a9bd7822c47608e012c2b891cb9e26b32f2558b9dc69978  deviceinfo
 52079045a0c1f48628d891bf8867f5c1802152fce8e2c4bd787630f1f5e4c9b386bfc373e464cb053688350ac678dbc3c407a76a31a1ae700ca67764d0d384f1  hexagonrpcd.confd
 cab76675b9c48eb1ce0691b31667d17ee73ecf21439a7f7c9c2ba96344e3bf4ad713ebc685298d6e32ad589ba26f429cd6b0d200338b50d136ad1a29758e4214  modules-initfs.ebbg
 175a7d859956a029b91a1105b93c4113b07ab5cfe932294dd369808059ed03471625f64ce90e5146a65c0bb26417470d8f7c02e48dfacf2d016ce5b2c28cee76  modules-initfs.tianma
@@ -28,6 +28,7 @@ deviceinfo_flash_method="fastboot"
 deviceinfo_kernel_cmdline="console=ttyMSM0,115200"
 deviceinfo_generate_bootimg="true"
 deviceinfo_bootimg_qcdt="false"
+deviceinfo_bootimg_mtk_mkimage="false"
 deviceinfo_bootimg_dtb_second="false"
 deviceinfo_flash_offset_base="0x00000000"
 deviceinfo_flash_offset_kernel="0x00008000"
@@ -2,7 +2,7 @@
 # Maintainer: Jianhua Lu <lujianhua000@gmail.com>
 pkgname=device-xiaomi-elish
 pkgdesc="Xiaomi Mi Pad 5 Pro"
-pkgver=5
+pkgver=4
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -100,7 +100,7 @@ sha512sums="
 d0e8f2e378130130ac72703aed957f7638e2dd75acf4aa421e1b4592c6cb6d296b652db0d9c242be4e56326760ce18d28c1e36ae553d0b7a7f91e12ab0353f22  81-libssc-xiaomi-elish.rules
 7b5def03dc5da28c7449719f0619f9d9ddbd988235b8591304ae4fea0989189d65ca1bc0d43664115f595137ba7896359b1b5f48fd6e350cac5d41ef9b1df869  elish.conf
 ed9a509f70715fd6c6614ee5fddbdb0ed2aa69f4a2983af9dbec26bdeb18fe93e3d1a65e03c618550c61da1416c79eb9440fb1bcd4961f85059b27904c4395cc  HiFi.conf
-476d5e8a406865b940787ea501398ea59c0f42df62a54261856ff98303ba6c21cf5a1add64fccf49111de4bb7605486ec769416d2ab6c5395961b57d5a037fe6  deviceinfo
+c8130d9a740437608c0ed56263ff5424e12f78ca71dd71c683fdcafe856b980fc14b492e964e177d06dcc4048466da6f29dd6f0dc85d021a0f963fdbf33e26c5  deviceinfo
 7d5a1b8c43b15d1711225f4680a67f365ca6515ddbf8239902c7886a20cf06d7da0f195760108ddeb4b039866e1c415981d413dee15eed4423a256d40a46a516  hexagonrpcd.confd
 c76604b9449dd471645eed22fdfbf167c64336e1833fbd5d37efe1ae331afe608f36099e045fdf0b3b72d62d57bc8fa15a07f6300d167963ecbe4eac6ebff83c  modules-initfs
 "
@@ -28,6 +28,7 @@ deviceinfo_flash_method="fastboot"
 deviceinfo_kernel_cmdline="quiet"
 deviceinfo_generate_bootimg="true"
 deviceinfo_bootimg_qcdt="false"
+deviceinfo_bootimg_mtk_mkimage="false"
 deviceinfo_bootimg_dtb_second="false"
 deviceinfo_flash_offset_base="0x00000000"
 deviceinfo_flash_offset_kernel="0x00008000"
@@ -2,10 +2,11 @@
 # Maintainer: Clayton Craft <clayton@craftyguy.net>
 # Co-Maintainer: jane400 <jane400@postmarketos.org>
 pkgname=firmware-lenovo-21bx
-pkgver=3
+pkgver=2
 pkgrel=0
 # these are renamed when new versions are released by lenovo
 _vid_filename=n3hdr20w # "Qualcomm Graphics Driver" v30.0.3851.4800
+_bt_filename=n3hww14w # "Qualcomm Bluetooth Driver" v1.0.3638.8101
 pkgdesc="Firmware for the Lenovo Thinkpad X13s (21bx)"
 url="https://pcsupport.lenovo.com/us/en/products/laptops-and-netbooks/thinkpad-x-series-laptops/thinkpad-x13s-type-21bx-21by/downloads/driver-list"
 arch="aarch64"
@@ -14,6 +15,7 @@ options="!check !strip !archcheck !tracedeps pmb:cross-native"
 makedepends="innoextract"
 source="
 	https://download.lenovo.com/pccbbs/mobiles/$_vid_filename.exe
+	hpnv21.b8c-$pkgver-$pkgrel::https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/plain/qca/hpnv21.b8c?id=77a11ffc5a0aaaadc870793d02f6c6781ee9f598
 	"

 build() {
@@ -25,7 +27,10 @@ package() {
 	_name_upper="$(echo "$_vid_filename" | tr [:lower:] [:upper:])"
 	install -Dm644 "$srcdir"/code\$GetExtractPath\$/"$_name_upper"/drivers/qcvss8280.mbn \
 		-t "$pkgdir"/lib/firmware/qcom/sc8280xp/LENOVO/21BX/
+	install -Dm644 "$srcdir/hpnv21.b8c-$pkgver-$pkgrel" \
+		"$pkgdir"/lib/firmware/qca/hpnv21.b8c
 }
 sha512sums="
 d569333b6819024d2142f0330688a0ed3c9f3dfd5d75ab1488d42412f7c8bdb6b83d43b7fa5543fb03a071e23d28d37f86e40272d61c7a14992c4663fc1aa1e6  n3hdr20w.exe
+21ed990e9df480e920267f8b41e68bc34a687d566f8776df65be720de468e9bf0a900d1636264f8aed8d5b2cc541a79b81af1bf06a1eee544f2d74dbb5292162  hpnv21.b8c-2-0
 "
@@ -3,7 +3,7 @@ pkgname=linux-pine64-pinephonepro
 pkgver=6.11.11
 _pkgver=6.11
 _tagdate=20241206-0145
-pkgrel=1
+pkgrel=0
 pkgdesc="Mainline kernel for the pinephone pro"
 arch="aarch64"
 _flavor="${pkgname#linux-}"
@@ -72,5 +72,5 @@ package() {

 sha512sums="
 065ceac6e0e6f3b7b939977084a1ac5aeabbff0273c61e50d0c2374825e0b1b41511592e54cb74a3d3d59a17fd5cc90018f6612062eb0f6b78dde29dd1aeade9  linux-ppp-6.11-20241206-0145.tar.gz
-9e68b276f86b59cd9960b8d287530c8e7780fafa0ee5389225339671861666dff1a66fff225e0d4d4f1de949cd2449bc3dd5499ef8ad6519d5b596776f148207  config-pine64-pinephonepro.aarch64
+e50a1db963c6b2de860a2cc3fed0dc5087a057aa5717058dd527d66f8277be3865fe7ea7d0dbed0d5e611546fcf80ac8af159c3bb95b07907625b4645d7b8f30  config-pine64-pinephonepro.aarch64
 "
@@ -5275,7 +5275,7 @@ CONFIG_LEDS_SGM3140=m
 #
 # RGB LED drivers
 #
-CONFIG_LEDS_GROUP_MULTICOLOR=m
+# CONFIG_LEDS_GROUP_MULTICOLOR is not set
 # CONFIG_LEDS_KTD202X is not set
 # CONFIG_LEDS_NCP5623 is not set
 # CONFIG_LEDS_PWM_MULTICOLOR is not set
@@ -1,8 +1,8 @@
 # Maintainer: Adam Thiede <me@adamthiede.com>
 # Co-Maintainer: Jenneron <jenneron@protonmail.com>
 pkgname=linux-postmarketos-mediatek-mt8173
-pkgver=6.12.9
-pkgrel=0
+pkgver=6.12.6
+pkgrel=1
 pkgdesc="Mainline kernel fork for Mediatek MT8173 devices"
 arch="aarch64"
 _carch="arm64"
@@ -66,7 +66,7 @@ package() {
 }

 sha512sums="
-3538c19b22f1810849e01ad7005f39b0c4e1e2de99f3168bb6a35ad9d51d7ec7b22a8203890e7b073bff83951f930245d5857a86cef80454800136a53047ff37  linux-6.12.9.tar.xz
-d442faaff1a9352c36c81ccd01f6d5322a28a6df8f4e735b866611cd127576320e75a6aa3bb731a273f6d48933ad47e305602510b731158abc17dc98b89ac437  config-postmarketos-mediatek-mt8173.aarch64
+35fcfc5044b1bf892b6432a330df26c5601f78f78f416400359f5e08c448255bcf424de611e67ff7ac72d014884d5f3c6c2bddb20d08dd47469df5c0424832f9  linux-6.12.6.tar.xz
+a1e2d31578e2398c156b3a11c3bfed6d2ecfa737d3a120e1f80144703bcc3f00c30ffb075a7a246ee3cc3272049c8f11b3f5c7d2b3d62f609cc102a980f1c44f  config-postmarketos-mediatek-mt8173.aarch64
 c86f8dfc32165a32381d45a4c8b6811ebf43f01b5d8a48fbe227cf5084cfefe24b32264c1c150cb49115db4759a2d21ad48b37dcaac78367d226e9cc2a5ba849  fix-mmc-order.patch
 "
@@ -1,20 +1,23 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 6.12.9 Kernel Configuration
+# Linux/arm64 6.12.6 Kernel Configuration
 #
-CONFIG_CC_VERSION_TEXT="aarch64-alpine-linux-musl-gcc (Alpine 14.2.0) 14.2.0"
+CONFIG_CC_VERSION_TEXT="gcc (Alpine 14.2.0) 14.2.0"
 CONFIG_CC_IS_GCC=y
 CONFIG_GCC_VERSION=140200
 CONFIG_CLANG_VERSION=0
 CONFIG_AS_IS_GNU=y
-CONFIG_AS_VERSION=24200
+CONFIG_AS_VERSION=24301
 CONFIG_LD_IS_BFD=y
-CONFIG_LD_VERSION=24200
+CONFIG_LD_VERSION=24301
 CONFIG_LLD_VERSION=0
 CONFIG_RUSTC_VERSION=0
 CONFIG_RUSTC_LLVM_VERSION=0
+CONFIG_CC_CAN_LINK=y
+CONFIG_CC_CAN_LINK_STATIC=y
 CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y
 CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=y
+CONFIG_TOOLS_SUPPORT_RELR=y
 CONFIG_CC_HAS_ASM_INLINE=y
 CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y
 CONFIG_PAHOLE_VERSION=0
@@ -773,6 +776,7 @@ CONFIG_HAVE_ARCH_PREL32_RELOCATIONS=y
 CONFIG_ARCH_USE_MEMREMAP_PROT=y
 # CONFIG_LOCK_EVENT_COUNTS is not set
 CONFIG_ARCH_HAS_RELR=y
+CONFIG_RELR=y
 CONFIG_ARCH_HAS_MEM_ENCRYPT=y
 CONFIG_HAVE_PREEMPT_DYNAMIC=y
 CONFIG_HAVE_PREEMPT_DYNAMIC_KEY=y
@@ -1903,6 +1907,7 @@ CONFIG_ARM_SCMI_TRANSPORT_OPTEE=y
 # ARM SCMI NXP i.MX Vendor Protocols
 #
 # CONFIG_IMX_SCMI_BBM_EXT is not set
+# CONFIG_IMX_SCMI_MISC_EXT is not set
 # end of ARM SCMI NXP i.MX Vendor Protocols

 # CONFIG_ARM_SCMI_POWER_CONTROL is not set
@@ -1943,7 +1948,6 @@ CONFIG_EFI_EARLYCON=y
 # end of EFI (Extensible Firmware Interface) Support

 # CONFIG_TEE_STMM_EFI is not set
-# CONFIG_IMX_SCMI_MISC_DRV is not set
 CONFIG_ARM_PSCI_FW=y
 # CONFIG_ARM_PSCI_CHECKER is not set

@@ -3132,7 +3136,7 @@ CONFIG_JOYSTICK_XPAD=m
 CONFIG_JOYSTICK_XPAD_FF=y
 CONFIG_JOYSTICK_XPAD_LEDS=y
 # CONFIG_JOYSTICK_PSXPAD_SPI is not set
-CONFIG_JOYSTICK_PXRC=m
+# CONFIG_JOYSTICK_PXRC is not set
 # CONFIG_JOYSTICK_QWIIC is not set
 # CONFIG_JOYSTICK_FSIA6B is not set
 # CONFIG_JOYSTICK_SENSEHAT is not set
@@ -5119,19 +5123,7 @@ CONFIG_FB_MODE_HELPERS=y
 #
 # Backlight & LCD device support
 #
-CONFIG_LCD_CLASS_DEVICE=y
-# CONFIG_LCD_L4F00242T03 is not set
-# CONFIG_LCD_LMS283GF05 is not set
-# CONFIG_LCD_LTV350QV is not set
-# CONFIG_LCD_ILI922X is not set
-# CONFIG_LCD_ILI9320 is not set
-# CONFIG_LCD_TDO24M is not set
-# CONFIG_LCD_VGG2432A4 is not set
-# CONFIG_LCD_PLATFORM is not set
-# CONFIG_LCD_AMS369FG06 is not set
-# CONFIG_LCD_LMS501KF03 is not set
-# CONFIG_LCD_HX8357 is not set
-# CONFIG_LCD_OTM3225A is not set
+# CONFIG_LCD_CLASS_DEVICE is not set
 CONFIG_BACKLIGHT_CLASS_DEVICE=y
 # CONFIG_BACKLIGHT_KTD253 is not set
 # CONFIG_BACKLIGHT_KTD2801 is not set
@@ -5168,10 +5160,7 @@ CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
 # CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER is not set
 # end of Console display driver support

-CONFIG_LOGO=y
-CONFIG_LOGO_LINUX_MONO=y
-CONFIG_LOGO_LINUX_VGA16=y
-CONFIG_LOGO_LINUX_CLUT224=y
+# CONFIG_LOGO is not set
 # end of Graphics support

 # CONFIG_DRM_ACCEL is not set
@@ -5615,7 +5604,7 @@ CONFIG_SND_AUDIO_GRAPH_CARD2=m
 CONFIG_SND_VIRTIO=m
 CONFIG_HID_SUPPORT=y
 CONFIG_HID=y
-CONFIG_HID_BATTERY_STRENGTH=y
+# CONFIG_HID_BATTERY_STRENGTH is not set
 CONFIG_HIDRAW=y
 CONFIG_UHID=m
 CONFIG_HID_GENERIC=y
@@ -5626,7 +5615,7 @@ CONFIG_HID_GENERIC=y
 CONFIG_HID_A4TECH=m
 CONFIG_HID_ACCUTOUCH=m
 CONFIG_HID_ACRUX=m
-CONFIG_HID_ACRUX_FF=y
+# CONFIG_HID_ACRUX_FF is not set
 CONFIG_HID_APPLE=m
 CONFIG_HID_APPLEIR=m
 CONFIG_HID_ASUS=m
@@ -5641,7 +5630,7 @@ CONFIG_HID_COUGAR=m
 CONFIG_HID_MACALLY=m
 CONFIG_HID_PRODIKEYS=m
 CONFIG_HID_CMEDIA=m
-CONFIG_HID_CP2112=m
+# CONFIG_HID_CP2112 is not set
 CONFIG_HID_CREATIVE_SB0540=m
 CONFIG_HID_CYPRESS=m
 CONFIG_HID_DRAGONRISE=m
@@ -5650,18 +5639,18 @@ CONFIG_HID_EMS_FF=m
 CONFIG_HID_ELAN=m
 CONFIG_HID_ELECOM=m
 CONFIG_HID_ELO=m
-CONFIG_HID_EVISION=m
+# CONFIG_HID_EVISION is not set
 CONFIG_HID_EZKEY=m
-CONFIG_HID_FT260=m
+# CONFIG_HID_FT260 is not set
 CONFIG_HID_GEMBIRD=m
 CONFIG_HID_GFRM=m
 CONFIG_HID_GLORIOUS=m
 CONFIG_HID_HOLTEK=m
 # CONFIG_HOLTEK_FF is not set
 CONFIG_HID_VIVALDI_COMMON=m
-CONFIG_HID_GOODIX_SPI=y
+# CONFIG_HID_GOODIX_SPI is not set
 CONFIG_HID_GOOGLE_HAMMER=m
-CONFIG_HID_GOOGLE_STADIA_FF=m
+# CONFIG_HID_GOOGLE_STADIA_FF is not set
 CONFIG_HID_VIVALDI=m
 CONFIG_HID_GT683R=m
 CONFIG_HID_KEYTOUCH=m
@@ -5682,7 +5671,7 @@ CONFIG_HID_LED=m
 CONFIG_HID_LENOVO=m
 CONFIG_HID_LETSKETCH=m
 CONFIG_HID_LOGITECH=m
-CONFIG_HID_LOGITECH_DJ=m
+# CONFIG_HID_LOGITECH_DJ is not set
 CONFIG_HID_LOGITECH_HIDPP=m
 # CONFIG_LOGITECH_FF is not set
 # CONFIG_LOGIRUMBLEPAD2_FF is not set
@@ -5697,11 +5686,10 @@ CONFIG_HID_MICROSOFT=m
 CONFIG_HID_MONTEREY=m
 CONFIG_HID_MULTITOUCH=m
 CONFIG_HID_NINTENDO=m
-CONFIG_NINTENDO_FF=y
+# CONFIG_NINTENDO_FF is not set
 CONFIG_HID_NTI=m
 CONFIG_HID_NTRIG=m
-CONFIG_HID_NVIDIA_SHIELD=m
-# CONFIG_NVIDIA_SHIELD_FF is not set
+# CONFIG_HID_NVIDIA_SHIELD is not set
 CONFIG_HID_ORTEK=m
 CONFIG_HID_PANTHERLORD=m
 # CONFIG_PANTHERLORD_FF is not set
@@ -5710,13 +5698,12 @@ CONFIG_HID_PETALYNX=m
 CONFIG_HID_PICOLCD=m
 CONFIG_HID_PICOLCD_FB=y
 CONFIG_HID_PICOLCD_BACKLIGHT=y
-CONFIG_HID_PICOLCD_LCD=y
 CONFIG_HID_PICOLCD_LEDS=y
 CONFIG_HID_PICOLCD_CIR=y
 CONFIG_HID_PLANTRONICS=m
 CONFIG_HID_PLAYSTATION=m
-CONFIG_PLAYSTATION_FF=y
-CONFIG_HID_PXRC=m
+# CONFIG_PLAYSTATION_FF is not set
+# CONFIG_HID_PXRC is not set
 CONFIG_HID_RAZER=m
 CONFIG_HID_PRIMAX=m
 CONFIG_HID_RETRODE=m
@@ -5739,7 +5726,7 @@ CONFIG_HID_SMARTJOYPLUS=m
 # CONFIG_SMARTJOYPLUS_FF is not set
 CONFIG_HID_TIVO=m
 CONFIG_HID_TOPSEED=m
-CONFIG_HID_TOPRE=y
+# CONFIG_HID_TOPRE is not set
 CONFIG_HID_THINGM=m
 CONFIG_HID_THRUSTMASTER=m
 # CONFIG_THRUSTMASTER_FF is not set
@@ -5747,7 +5734,7 @@ CONFIG_HID_UDRAW_PS3=m
 CONFIG_HID_U2FZERO=m
 CONFIG_HID_WACOM=m
 CONFIG_HID_WIIMOTE=m
-CONFIG_HID_WINWING=m
+# CONFIG_HID_WINWING is not set
 CONFIG_HID_XINMO=m
 CONFIG_HID_ZEROPLUS=m
 # CONFIG_ZEROPLUS_FF is not set
@@ -5762,14 +5749,14 @@ CONFIG_HID_MCP2221=m
 #
 # HID-BPF support
 #
-CONFIG_HID_BPF=y
+# CONFIG_HID_BPF is not set
 # end of HID-BPF support

 #
 # USB HID support
 #
 CONFIG_USB_HID=y
-CONFIG_HID_PID=y
+# CONFIG_HID_PID is not set
 CONFIG_USB_HIDDEV=y
 # end of USB HID support

@@ -7095,7 +7082,7 @@ CONFIG_IIO_CONSUMERS_PER_TRIGGER=2
 # CONFIG_DMARD10 is not set
 # CONFIG_FXLS8962AF_I2C is not set
 # CONFIG_FXLS8962AF_SPI is not set
-CONFIG_HID_SENSOR_ACCEL_3D=m
+# CONFIG_HID_SENSOR_ACCEL_3D is not set
 # CONFIG_IIO_CROS_EC_ACCEL_LEGACY is not set
 # CONFIG_IIO_ST_ACCEL_3AXIS is not set
 # CONFIG_IIO_KX022A_SPI is not set
@@ -7266,8 +7253,7 @@ CONFIG_IIO_CROS_EC_SENSORS=m
 #
 # Hid Sensor IIO Common
 #
-CONFIG_HID_SENSOR_IIO_COMMON=m
-CONFIG_HID_SENSOR_IIO_TRIGGER=m
+# CONFIG_HID_SENSOR_IIO_COMMON is not set
 # end of Hid Sensor IIO Common

 #
@@ -7380,7 +7366,7 @@ CONFIG_IIO_ST_SENSORS_CORE=m
 # CONFIG_ADXRS450 is not set
 # CONFIG_BMG160 is not set
 # CONFIG_FXAS21002C is not set
-CONFIG_HID_SENSOR_GYRO_3D=m
+# CONFIG_HID_SENSOR_GYRO_3D is not set
 # CONFIG_MPU3050_I2C is not set
 # CONFIG_IIO_ST_GYRO_3AXIS is not set
 # CONFIG_ITG3200 is not set
@@ -7409,7 +7395,7 @@ CONFIG_HID_SENSOR_GYRO_3D=m
 # CONFIG_HDC100X is not set
 # CONFIG_HDC2010 is not set
 # CONFIG_HDC3020 is not set
-CONFIG_HID_SENSOR_HUMIDITY=m
+# CONFIG_HID_SENSOR_HUMIDITY is not set
 # CONFIG_HTS221 is not set
 # CONFIG_HTU21 is not set
 # CONFIG_SI7005 is not set
@@ -7468,7 +7454,7 @@ CONFIG_SENSORS_ISL29018=m
 # CONFIG_SENSORS_ISL29028 is not set
 # CONFIG_ISL29125 is not set
 # CONFIG_ISL76682 is not set
-CONFIG_HID_SENSOR_ALS=m
+# CONFIG_HID_SENSOR_ALS is not set
 # CONFIG_HID_SENSOR_PROX is not set
 # CONFIG_JSA1212 is not set
 # CONFIG_ROHM_BU27008 is not set
@@ -7516,7 +7502,7 @@ CONFIG_VCNL4000=m
 # CONFIG_BMC150_MAGN_I2C is not set
 # CONFIG_BMC150_MAGN_SPI is not set
 # CONFIG_MAG3110 is not set
-CONFIG_HID_SENSOR_MAGNETOMETER_3D=m
+# CONFIG_HID_SENSOR_MAGNETOMETER_3D is not set
 # CONFIG_MMC35240 is not set
 CONFIG_IIO_ST_MAGN_3AXIS=m
 CONFIG_IIO_ST_MAGN_I2C_3AXIS=m
@@ -7538,8 +7524,8 @@ CONFIG_IIO_ST_MAGN_SPI_3AXIS=m
 #
 # Inclinometer sensors
 #
-CONFIG_HID_SENSOR_INCLINOMETER_3D=m
-CONFIG_HID_SENSOR_DEVICE_ROTATION=m
+# CONFIG_HID_SENSOR_INCLINOMETER_3D is not set
+# CONFIG_HID_SENSOR_DEVICE_ROTATION is not set
 # end of Inclinometer sensors

 #
@@ -7552,7 +7538,7 @@ CONFIG_HID_SENSOR_DEVICE_ROTATION=m
 #
 # Linear and angular position sensors
 #
-CONFIG_HID_SENSOR_CUSTOM_INTEL_HINGE=m
+# CONFIG_HID_SENSOR_CUSTOM_INTEL_HINGE is not set
 # end of Linear and angular position sensors

 #
@@ -7645,7 +7631,7 @@ CONFIG_MPL3115=m
 #
 # CONFIG_LTC2983 is not set
 # CONFIG_MAXIM_THERMOCOUPLE is not set
-CONFIG_HID_SENSOR_TEMP=m
+# CONFIG_HID_SENSOR_TEMP is not set
 # CONFIG_MLX90614 is not set
 # CONFIG_MLX90632 is not set
 # CONFIG_MLX90635 is not set
@@ -1,46 +0,0 @@
-From 7e1ea84748d49b328213db529b524216600a9419 Mon Sep 17 00:00:00 2001
-From: Frank Oltmanns <frank@oltmanns.dev>
-Date: Mon, 30 Dec 2024 19:12:53 +0100
-Subject: [PATCH] HACK: remoteproc: qcom: disable in-kernel PD mapper
-
-Somehow enabling in-kernel PD mapper (introduced in 5b9f51b200dcb
-"remoteproc: qcom: enable in-kernel PD mapper"), breaks the bottom mic
-on xiaomi-beryllium (Poco F1) and distorts audio on OP6 (and possibly
-OP6T). Temporarily disable it and log the rprocs in use until we better
-understand what causes the issue.
-
-Link: pmaports#3353
-Link: pmaports#3320
-Link: pmaports#3245
-Link: pmaports#3253
-
-Signed-off-by: Frank Oltmanns <frank@oltmanns.dev>
---
- drivers/remoteproc/qcom_common.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/drivers/remoteproc/qcom_common.c b/drivers/remoteproc/qcom_common.c
-index 8c8688f99f0ab..0b4e8eb7622d9 100644
--- a/drivers/remoteproc/qcom_common.c
-+++ b/drivers/remoteproc/qcom_common.c
-@@ -583,6 +583,8 @@ static void pdm_notify_unprepare(struct rproc_subdev *subdev)
-  */
- void qcom_add_pdm_subdev(struct rproc *rproc, struct qcom_rproc_pdm *pdm)
- {
-+	printk(KERN_INFO "aborting qcom_add_pdm_subdev, name %s\n", rproc->name);
-+	return;
- 	pdm->dev = &rproc->dev;
- 	pdm->index = rproc->index;
- 
-@@ -602,6 +604,8 @@ EXPORT_SYMBOL_GPL(qcom_add_pdm_subdev);
-  */
- void qcom_remove_pdm_subdev(struct rproc *rproc, struct qcom_rproc_pdm *pdm)
- {
-+	printk(KERN_INFO "aborting qcom_remove_pdm_subdev, name %s\n", rproc->name);
-+	return;
- 	rproc_remove_subdev(rproc, &pdm->subdev);
- }
- EXPORT_SYMBOL_GPL(qcom_remove_pdm_subdev);
-- 
-2.47.1
-
@@ -6,7 +6,7 @@
 _flavor="postmarketos-qcom-sdm845"
 pkgname=linux-$_flavor
 pkgver=6.13.0_rc2
-pkgrel=2
+pkgrel=1
 pkgdesc="Mainline Kernel fork for SDM845 devices"
 arch="aarch64"
 _carch="arm64"
@@ -24,7 +24,6 @@ _tag="sdm845-6.13-rc2-r2"
 source="
 	linux-$_tag.tar.gz::https://gitlab.com/sdm845-mainline/linux/-/archive/$_tag/linux-$_tag.tar.gz
 	$_config
-	0001-HACK-remoteproc-qcom-disable-in-kernel-PD-mapper.patch
 "
 builddir="$srcdir/linux-$_tag"

@@ -74,5 +73,4 @@ package() {
 sha512sums="
 af8b5e960248adf5da95571e964e664c8e329bf610a567b43fa22fc8a853b6e321192cb39667492ac86d8ac48e75b1e47eb546017937c9d0aeb11485e70797d3  linux-sdm845-6.13-rc2-r2.tar.gz
 4c663896c0bc76858a91cbe6d64461ebebe5beb42a14320479e2291761dd9bfb01fd68047b2813df24f697f1f7465f63c3ca5777f5bca9d26552366e851400d6  config-postmarketos-qcom-sdm845.aarch64
-a107cada98c5902aaf193bbc80d19276cf286c5094c7e8587a6d5756929d91f46b555efbf48f4b7b85c1feb8c71b989fbb49b26b2c7a8f7ec2ee1385c20b9d03  0001-HACK-remoteproc-qcom-disable-in-kernel-PD-mapper.patch
 "
@@ -3,7 +3,7 @@
 pkgname=soc-qcom-msm8916
 pkgdesc="Common package for Qualcomm MSM8916 devices"
 pkgver=21
-pkgrel=3
+pkgrel=2
 url="https://postmarketos.org"
 license="BSD-3-Clause"
 arch="aarch64 armv7"
@@ -75,14 +75,13 @@ rproc_all() {

 	mkdir -p "$subpkgdir"/boot
 	echo all > "$subpkgdir"/boot/lk2nd_rproc_mode
-	install -Dm644 q6voiced.conf "$subpkgdir"/etc/conf.d/q6voiced
 }

 rproc_all_openrc() {
 	install_if="$pkgname-rproc-all=$pkgver-r$pkgrel openrc"
 	install="$subpkgname.post-install"

-	mkdir -p "$subpkgdir"
+	install -Dm644 q6voiced.conf "$subpkgdir"/etc/conf.d/q6voiced
 }

 samsung_modem_workaround() {
@@ -2,7 +2,7 @@
 pkgname=soc-qcom-msm8953
 pkgdesc="Common package for Qualcomm MSM8953 devices"
 pkgver=11
-pkgrel=1
+pkgrel=0
 url="https://postmarketos.org"
 license="BSD-3-Clause"
 arch="aarch64"
@@ -45,7 +45,7 @@ modem() {
 		rmtfs
 	"

-	install -Dm644 "$srcdir"/q6voiced.conf "$subpkgdir"/etc/conf.d/q6voiced
+	mkdir -p "$subpkgdir"
 }

 modem_openrc() {
@@ -56,7 +56,7 @@ modem_openrc() {
 		rmtfs-openrc
 	"

-	mkdir -p "$subpkgdir"
+	install -Dm644 "$srcdir"/q6voiced.conf "$subpkgdir"/etc/conf.d/q6voiced
 }

 gpu() {
@@ -3,7 +3,7 @@

 pkgname=device-alcatel-5010d
 pkgdesc="Alcatel OneTouch Pixi 4 (5) 5010D"
-pkgver=2
+pkgver=1
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -26,5 +26,5 @@ package() {
 }

 sha512sums="
-85aecca5fd8867154718359b34d2d833329966c053fa454c55a3f241cd1c9fc963ff5f94eeff53d5513d435fd06f8c88837bf2959ee64feae6a9daeaa0eb8360  deviceinfo
+7116820f1b172f6d478d6155f6ff39dfe94237e6641f769eea11314185bc6d5aafc6197b36be99477191eb208dd4edf6c91953f9c64c538152a61b7b61af6980  deviceinfo
 "
@@ -20,6 +20,7 @@ deviceinfo_flash_method="fastboot"
 deviceinfo_kernel_cmdline="bootopt=64S3,32S1,32S1"
 deviceinfo_generate_bootimg="true"
 deviceinfo_bootimg_qcdt="false"
+deviceinfo_bootimg_mtk_mkimage="false"
 deviceinfo_bootimg_dtb_second="false"
 deviceinfo_flash_offset_base="0x80000000"
 deviceinfo_flash_offset_kernel="0x00008000"
@@ -1,8 +1,8 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-amazon-austin
 pkgdesc="Amazon Fire 7 (2017)"
-pkgver=2
-pkgrel=0
+pkgver=1
+pkgrel=3
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
@@ -25,5 +25,5 @@ package() {
 }

 sha512sums="
-60f7d369b40daa351c27759f633680997017c5808c0469e012e20050db4d70ecb9c7071d383fb7f3e5bcada35435cd31ab77251a8a2a80ef3eee5fe9c38f5b56  deviceinfo
+7996497bcd36f7c49ffc83392bc7528f9c8e911356e8eb890d537be2fd3bbef13a678b53b8f57a955503b128a0182db3ed5c95182c616a317d2e43ad6e603640  deviceinfo
 "
@@ -21,6 +21,7 @@ deviceinfo_flash_method="fastboot"
 deviceinfo_kernel_cmdline="bootopt=64S3,32N2,32N2 loglevel=4 rootwait ro fsck.repair=yes net.ifnames=0 ipv6.disable=1"
 deviceinfo_generate_bootimg="true"
 deviceinfo_bootimg_qcdt="false"
+deviceinfo_bootimg_mtk_mkimage="false"
 deviceinfo_bootimg_dtb_second="false"
 deviceinfo_flash_offset_base="0x80000000"
 deviceinfo_flash_offset_kernel="0x00008000"
@@ -1,7 +1,7 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-amazon-ford
 pkgdesc="Amazon Fire 7 (2015)"
-pkgver=2
+pkgver=1
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -30,6 +30,6 @@ package() {
 }

 sha512sums="
-a88bef0bd60a4cfbb79bc6f3f821c92653d3afddc880e68ca40ee245b63a8819776102a2131382287dbbe58da3ddb83147dd95c3b63fa4d51f671a6166e129fa  deviceinfo
+7c716707290d3589ae9d01b2e8c4e25fbce94499e2341601ee72520c17fa84e4ab21ce024647a30f6eebb55a6b0fea564a050a1d68287b5388779b9e28c28ef1  deviceinfo
 f3d0b7d44f549100b3402fb287e80654279ae962a6b7721f3dc676324bdcf5c104391f9e4f3c5eac5733eff0ad467aa959a5f66553e7668c08124a1609ed3145  90-android-touch-dev.rules
 "
@@ -21,6 +21,7 @@ deviceinfo_flash_method="fastboot"
 deviceinfo_kernel_cmdline="androidboot.selinux=permissive androidboot.hardware=mt8127"
 deviceinfo_generate_bootimg="true"
 deviceinfo_bootimg_qcdt="false"
+deviceinfo_bootimg_mtk_mkimage="false"
 deviceinfo_bootimg_dtb_second="false"
 deviceinfo_flash_pagesize="2048"
 deviceinfo_flash_offset_base="0x80000000"
@@ -1,7 +1,7 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-amazon-karnak
 pkgdesc="Amazon Fire HD 8 (2018)"
-pkgver=2
+pkgver=1
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -24,5 +24,5 @@ package() {
 }

 sha512sums="
-8c6c875ee69d2e935221735612689de8b947f3ce56a46898cb4389b1938f4fc3833c3a681124229f40edfcf6d4bf88eeaf7a8df1b09ae6fce28a95bf9d3ded6c  deviceinfo
+d9c4201c928e7cfd6fa1c178b4d1159c889511a35d90486c103ffd2d5ac9d1666883fceab02babf4bf8dce34263a46b0f9f53f39b219d0c57c80751e2d86a329  deviceinfo
 "
@@ -21,6 +21,7 @@ deviceinfo_flash_method="fastboot"
 deviceinfo_kernel_cmdline="bootopt=64S3,32N2,64N2 androidboot.selinux=permissive loop.max_part=7 buildvariant=eng"
 deviceinfo_generate_bootimg="true"
 deviceinfo_bootimg_qcdt="false"
+deviceinfo_bootimg_mtk_mkimage="false"
 deviceinfo_bootimg_dtb_second="false"
 deviceinfo_flash_pagesize="2048"
 deviceinfo_header_version="0"
@@ -1,7 +1,7 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-amazon-mantis
 pkgdesc="Amazon Fire TV Stick 4K"
-pkgver=2
+pkgver=1
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -24,5 +24,5 @@ package() {
 }

 sha512sums="
-56da9bba99d1c16a18ae1dbabdf7a38b9d6f28f12fd3c2c9a938abf11cdd1fcc281c0a735144e93d79288574eff1ac5f6ec51907dc3625b99697ea435d920bd8  deviceinfo
+2e2da6fe61efcb17b9ccd0512843db924f0b2eca98e0b1e92d76a667b2ceecfb4c52402122fe6c584dcf3a43f33dc47c6a51371548a741420e2f35d481f65fa1  deviceinfo
 "
@@ -20,6 +20,7 @@ deviceinfo_screen_height="1080"
 deviceinfo_flash_method="fastboot"
 deviceinfo_generate_bootimg="true"
 deviceinfo_bootimg_qcdt="false"
+deviceinfo_bootimg_mtk_mkimage="false"
 deviceinfo_bootimg_dtb_second="false"
 deviceinfo_flash_pagesize="2048"
 deviceinfo_flash_offset_base="0x40000000"
@@ -1,7 +1,7 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-amazon-soho
 pkgdesc="Amazon Kindle Fire HD (3rd Generation)"
-pkgver=2
+pkgver=1
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -33,7 +33,7 @@ nonfree_firmware() {
 }

 sha512sums="
-81b7b05d57d9c85bc3ad84fb398916c8d9cfc2d67b04ac7d47d244038b621b1a8dfccedb50c359b9bb5359fc2171a3f75fd0be609ca8c8b1250ee1859aaee29d  deviceinfo
+8b965e229cef643c03f86f53575176cc38537afcfb5199725a9e085a5ba88e2e0803e7522667d5f7a0085bea363b829779162f326a503e5d1a14718fdfbe8fde  deviceinfo
 1aca985770246b9ca140996a498815b5c9ca3458a6cb84db85825344f01deda8b1de7c88e2e0c610df636ad2179faac7fd90d9992add51186a6449f2d43a3f71  initfs-hook.sh
 b031a2bd8e0e206196df9bfa5299c7172ce5d185c77a148422269e2c8a556769b5f6e29dcfe3f4e50968f8a860a8f927a6fcab2021d48e8912c3d5e76b50d61b  amazon-omap-boot-hack.sh
 61e8becbf6fa7c1c6c42e481083f5981ae7af33a48cbc53e817d8ac2c6a8e4f67a54b32ae3b8f5f25f7b412165a849dc93a629110dc47b0d16927bf2a12eb7e1  modules-load.conf
@@ -21,6 +21,7 @@ deviceinfo_flash_method="fastboot"
 deviceinfo_kernel_cmdline="console=tty0 mem=1G vmalloc=496M init=/init"
 deviceinfo_generate_bootimg="true"
 deviceinfo_bootimg_qcdt="false"
+deviceinfo_bootimg_mtk_mkimage="false"
 deviceinfo_bootimg_dtb_second="false"
 deviceinfo_mkinitfs_postprocess="/usr/share/mkinitfs/amazon-omap-boot-hack.sh"
 deviceinfo_flash_offset_base="0x80000000"
@@ -1,7 +1,7 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-amazon-tate
 pkgdesc="Amazon Kindle Fire HD (2nd Generation)"
-pkgver=2
+pkgver=1
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -29,7 +29,7 @@ package() {
 }

 sha512sums="
-c252950bbe603045e3eb76a19f70c6590365b6324050cf7d00ee048321bac67ebfc6fb7d2b24a5798d197259acd29ec55ebc466f8a848ee93f8c09b6483146e0  deviceinfo
+2e06c09046be664bbba5d55aafb06aceafbf41777bf116caa508d461190d546cc7ceae5160f0582dee20d88b5998837c00ffc3de928d1e5892bb32485523ce79  deviceinfo
 1aca985770246b9ca140996a498815b5c9ca3458a6cb84db85825344f01deda8b1de7c88e2e0c610df636ad2179faac7fd90d9992add51186a6449f2d43a3f71  initfs-hook.sh
 a5027ac9f113018d55e4c5fc065b0498d0a50df099a348fe38d6b841087aa285a8d67b400b9fe88007f41d0fd79c2fe69d62300af6963ecb40c5fb2353cbabf1  amazon-omap-boot-hack.sh
 "
@@ -22,6 +22,7 @@ deviceinfo_flash_method="fastboot"
 deviceinfo_kernel_cmdline="console=tty0 ignore_loglevel mem=1G init=/init"
 deviceinfo_generate_bootimg="true"
 deviceinfo_bootimg_qcdt="false"
+deviceinfo_bootimg_mtk_mkimage="false"
 deviceinfo_bootimg_dtb_second="false"
 deviceinfo_mkinitfs_postprocess="/usr/share/mkinitfs/amazon-omap-boot-hack.sh"
 deviceinfo_flash_offset_base="0x80000000"
@@ -1,8 +1,7 @@
 # Reference: <https://postmarketos.org/devicepkg>
-# Maintainer: Aster Boese <asterboese@mailbox.org>
-pkgname=device-apple-n61
+pkgname=device-apple-iphone6
 pkgdesc="Apple iPhone 6"
-pkgver=2
+pkgver=1
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -14,8 +13,6 @@ depends="
 "
 makedepends="devicepkg-dev"
 source="deviceinfo modules-initfs"
-provides="device-apple-iphone6=$pkgver-r$pkgrel"
-replaces="device-apple-iphone6"

 build() {
 	devicepkg_build $startdir $pkgname
@@ -26,6 +23,6 @@ package() {
 }

 sha512sums="
-7500439e30455b5116d6f8cfb3b50abc51947c358e0ff506ca457c6eccc70abd0d3c48355e82d2e97ead2971403cc861722b5f13d72baf7398bc3d878ef306bf  deviceinfo
+6ce8dcaecdcce3ae01742b21aadddb88ad7e892b3f8067f236168a0ebd9ca8ecb7fa6b3e52311d6cbb63ff420df3d87a72e0446cd93873c0a7cc14c8fbcd7191  deviceinfo
 f4df83d543efb5748743f56fbfeddc6734ad341fb623f796faa74b4f42cadfd9a7b1aea2bd3a6f7aa3f284bcb34c05b2ec2a1704ad6e88b043f92dc0de14a573  modules-initfs
 "
@@ -5,7 +5,7 @@
 deviceinfo_format_version="0"
 deviceinfo_name="Apple iPhone 6"
 deviceinfo_manufacturer="Apple"
-deviceinfo_codename="apple-n61"
+deviceinfo_codename="apple-iphone6"
 deviceinfo_year="2014"
 deviceinfo_arch="aarch64"

@@ -1,7 +1,7 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-asus-p024
 pkgdesc="ASUS ZenPad 8.0"
-pkgver=2
+pkgver=1
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -29,6 +29,6 @@ package() {
 }

 sha512sums="
-56b44a131a7555f5a8b178856419baefae7ae924f30ebebb396b9a119cacfd3affc03dae330f93570400fb2dcf5b1a0f6fe0ff490414120903ff8b479425f9c8  deviceinfo
+efedbf63729981da4ed75477be062ce9f2fe77eb0ed1f8586cc8abf093fabad5a1f962c37eee125237e3706a3f9b643b079c843aaba4efbd02b35e26edb54246  deviceinfo
 b0086498d472a02c9ef806d46bae3791ccaf8f94359bca2a420dd578e596b24ced3c089b631952f2b4379e067260a4ee8c424d6f94edd94245b94d3f79f5c9b4  brightness
 "
@@ -22,6 +22,7 @@ deviceinfo_flash_method="fastboot"
 deviceinfo_kernel_cmdline="androidboot.hardware=qcom msm_rtb.filter=0x237 ehci-hcd.park=3 androidboot.bootdevice=7824900.sdhci lpm_levels.sleep_disabled=1 androidboot.selinux=enforcing buildvariant=userdebug"
 deviceinfo_generate_bootimg="true"
 deviceinfo_bootimg_qcdt="true"
+deviceinfo_bootimg_mtk_mkimage="false"
 deviceinfo_bootimg_dtb_second="false"
 deviceinfo_flash_offset_base="0x80000000"
 deviceinfo_flash_offset_kernel="0x00008000"
@@ -1,8 +1,8 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-asus-sparrow
 pkgdesc="ASUS ZenWatch 2"
-pkgver=3
-pkgrel=0
+pkgver=2
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
@@ -47,5 +47,5 @@ nonfree_firmware() {
 }

 sha512sums="
-ace09511ebb1b5b4df826b9964c19e9f5109aef9c218e64716db1c682660a6981d792ebb1cd52d88cf67012112310c3bb28e8b3bba633254513f5d27f80c756c  deviceinfo
+4602de536a4fdf37338302be92a6fbe2c5b7ac7c5a526c953e3d174ec54e276794854e3c1f1cd236f6314cc5fc26da932225d12be32c449ce999aa883a44952d  deviceinfo
 "
@@ -26,6 +26,7 @@ deviceinfo_kernel_cmdline_downstream="console=ttyHSL0,115200,n8 androidboot.cons
 deviceinfo_generate_bootimg="true"
 deviceinfo_generate_extlinux_config="true"
 deviceinfo_bootimg_qcdt="false"
+deviceinfo_bootimg_mtk_mkimage="false"
 deviceinfo_bootimg_dtb_second="false"
 deviceinfo_flash_pagesize="2048"
 deviceinfo_flash_offset_base="0x00000000"
@@ -1,7 +1,7 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-asus-x00p
 pkgdesc="Asus Max M1"
-pkgver=2
+pkgver=1
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -28,6 +28,6 @@ package() {
 }

 sha512sums="
-c403a7bd0f352cf6f9e3fba653a3d45d53341d9b23e0f09442fdd4695210aff3063382bc163f85c2731d87125d67c33f3a6155aaf78487bc4499f9b9d787bd07  deviceinfo
+ece85df3931736b933e934a46ec6aa2a84fb7511d2c6000a60b5f9064f4d8a0d53b11c7356de6bee3d57e29776b67000c50c5a88311ce0490857effcbb60aebd  deviceinfo
 23d8031d87e3e01a76886d0ad091c51f3146cd2ded947f32e47bcf84413882c3be0fcbdd559a7fc3d3372c42510c276d37741e836ca9aa4549142e43a625cc79  initfs-hook.sh
 "
@@ -19,6 +19,7 @@ deviceinfo_flash_method="fastboot"
 deviceinfo_kernel_cmdline="androidboot.hardware=qcom msm_rtb.filter=0x237 ehci-hcd.park=3 lpm_levels.sleep_disabled=1 androidboot.bootdevice=7824900.sdhci loop.max_part=7 androidboot.init_fatal_reboot_target=recovery buildvariant=userdebug"
 deviceinfo_generate_bootimg="true"
 deviceinfo_bootimg_qcdt="false"
+deviceinfo_bootimg_mtk_mkimage="false"
 deviceinfo_bootimg_dtb_second="false"
 deviceinfo_flash_pagesize="2048"
 deviceinfo_flash_offset_base="0x80000000"
@@ -1,33 +0,0 @@
-# Reference: <https://postmarketos.org/devicepkg>
-# Maintainer: Ferass El Hafidi <funderscore@postmarketos.org>
-pkgname=device-bananapi-bpi-cm4-cm4io
-pkgdesc="BananaPi BPI-CM4IO Baseboard with BPI-CM4"
-pkgver=1
-pkgrel=0
-url="https://postmarketos.org"
-license="MIT"
-arch="aarch64"
-options="!check !archcheck"
-depends="postmarketos-base u-boot-bananapi-bpi-cm4 soc-amlogic-s905 linux-postmarketos-amlogic"
-makedepends="devicepkg-dev"
-subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
-source="deviceinfo modules-initfs"
-
-build() {
-	devicepkg_build $startdir $pkgname
-}
-
-package() {
-	devicepkg_package $startdir $pkgname
-}
-
-nonfree_firmware() {
-	pkgdesc="vdec firmware"
-	depends="linux-firmware-meson"
-	mkdir "$subpkgdir"
-}
-
-sha512sums="
-86d5fa7949be1199361f76ba91704ff9d70f2a8cd68bf927bbded3b7592c1ada240762385c02320c42f763a8c92c4c1c578540655b3baf0e108b30f37b01fce6  deviceinfo
-52948c2884a6f6384e12b7a598f70878526d0d3293c214425170145231144ec7de805c038641741a4a5d75b50e554f6a3fa3769784a674217ed032f9b6a233c8  modules-initfs
-"
@@ -1,31 +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="BananaPi BPI-CM4IO Baseboard with BPI-CM4"
-deviceinfo_manufacturer="BananaPi"
-deviceinfo_codename="bananapi-bpi-cm4-cm4io"
-deviceinfo_dtb="amlogic/meson-g12b-bananapi-cm4-cm4io"
-deviceinfo_year="2023"
-deviceinfo_arch="aarch64"
-deviceinfo_disable_dhcpd="true"
-deviceinfo_partition_type="msdos"
-
-# Device related
-deviceinfo_gpu_accelerated="true"
-deviceinfo_chassis="desktop"
-deviceinfo_keyboard="true"
-deviceinfo_external_storage="true"
-deviceinfo_screen_width="1920"
-deviceinfo_screen_height="1080"
-
-# Bootloader related
-deviceinfo_flash_method="none"
-deviceinfo_sd_embed_firmware_step_size="512"
-deviceinfo_sd_embed_firmware="u-boot/bananapi-bpi-cm4/u-boot.bin.sd-stripped.bin:1"
-deviceinfo_boot_part_start="4096"
-deviceinfo_generate_extlinux_config="true"
-# Kernel options
-deviceinfo_kernel_cmdline="quiet loglevel=2"
-
@@ -1,3 +0,0 @@
-meson_drm
-meson_dw_hdmi
-display_connector
@@ -1,7 +1,7 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-bq-frieza
 pkgdesc="BQ Aquarius M10 FHD"
-pkgver=2
+pkgver=1
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -24,5 +24,5 @@ package() {
 }

 sha512sums="
-30913b0deacc0891c143da4be3d05957544a2c3c2be545876c24a78de2006f1a95e8db184e031688e3e9aaec38747d6902ea1e55acbd84bc8cc5afdf016c3164  deviceinfo
+9f1ef103e8debbd9ee230b37e1b977ccf00b9dd873c158d91cb2bdcf6c97d6e6a9573725cc898d1ef5520f5e12ae40eb9e855906db90174947e5a4859b3a9cc5  deviceinfo
 "
@@ -22,6 +22,7 @@ deviceinfo_flash_method="fastboot"
 deviceinfo_kernel_cmdline="bootopt=64S3,32N2,64N2 datapart=/dev/disk/by-partlabel/userdata fixrtc rootdelay=5"
 deviceinfo_generate_bootimg="true"
 deviceinfo_bootimg_qcdt="false"
+deviceinfo_bootimg_mtk_mkimage="false"
 deviceinfo_bootimg_dtb_second="false"
 deviceinfo_flash_pagesize="2048"
 deviceinfo_flash_offset_base="0x40078000"
@@ -1,7 +1,7 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-bq-vegetahd
 pkgdesc="BQ Aquaris E5 HD"
-pkgver=2
+pkgver=1
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -29,5 +29,5 @@ package() {
 }

 sha512sums="
-c746b4547c89e1359c5c4da933db049e9ec766081f08b73f6ef4b1942ae670ee4ae8abf38c15756ade22602575543a73738a780fcfb0e178cf7dba5ba4e08896  deviceinfo
+575bca5e9012f045096a99e0c1ef617dde0002201856cecf37ebb222acfdd5b7d912e42b115e6ff80dfdeac7ad9d3e6d24a91d0c780cc8e5cd9a7c4a458a4dea  deviceinfo
 "
@@ -20,8 +20,7 @@ deviceinfo_screen_height="720"
 deviceinfo_flash_method="fastboot"
 deviceinfo_generate_bootimg="true"
 deviceinfo_bootimg_qcdt="false"
-deviceinfo_bootimg_mtk_label_kernel="KERNEL"
-deviceinfo_bootimg_mtk_label_ramdisk="ROOTFS"
+deviceinfo_bootimg_mtk_mkimage="true"
 deviceinfo_bootimg_dtb_second="false"
 deviceinfo_flash_pagesize="2048"
 deviceinfo_header_version="0"
@@ -2,7 +2,7 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-epson-embt2ws
 pkgdesc="Epson Moverio BT-200"
-pkgver=2
+pkgver=1
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -35,7 +35,7 @@ package() {
 }

 sha512sums="
-8a4f612172384c498d472e322829774902a7c1acd40646bb393662c2b5de9fc24a2f058718950efd8aea2c5b765ebb50ea99ef8ac60955dcabf5cf065e5de73a  deviceinfo
+9b4b61df13463565f18044672690ffd559d89121dda8b84930f7f78829f18565e4c91d5e5eb921a035825abdd7aa18f0aa2bf99edfd432e631f277cf17eb1c4e  deviceinfo
 e6d26536578432bd1d9123d3b3eb621e39d5475e5ce9086c42fae213be6fa05d56bd6b42d08f6f5afccffe5b01ca940239c11b8046e0be1a5962ac95a0b0dfa4  modules-initfs
 2c3a39107dd6c061d001d11211b816fc0e1fb060e0bcbf0fcf057d7910a7dcc4d1d06c6b0572ee0d616f1d06679ca48872395f62c1f44f5460cceefbbd2b5050  sdboot.cmd
 "
@@ -24,9 +24,5 @@ deviceinfo_boot_filesystem="fat32"
 deviceinfo_getty="ttyS2;115200"
 deviceinfo_no_framebuffer="true"

-# for using the sdboot.scr mechanism to chainload stuff from internal u-boot,
-# GPT does not work, if a standalone u-boot install is used, GPT is ok.
-deviceinfo_partition_type="msdos"
-
 deviceinfo_sd_embed_firmware_step_size="512"
 deviceinfo_sd_embed_firmware="u-boot/epson-embt2ws/MLO:256,u-boot/epson-embt2ws/u-boot.img:512"
@@ -1,7 +1,7 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-fairphone-fp1
 pkgdesc="Fairphone 1"
-pkgver=2
+pkgver=1
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -20,5 +20,5 @@ package() {
 }

 sha512sums="
-642eb26651708945d5cf14e1823f664cf43d6c066bd18cd766bd8c363cc4d9764dccb19ed3e7c4d34236e9832214ac8abfcbea04b31adeb020654aef641080ed  deviceinfo
+01d34ac04c3f461a98fd7562119dae59a5228d70e8ce1694a56faf1e91881c5de716dff15ffae6a4e6c34b85f8ebf1f2a8dee4aab2be7afab40fa2bbac0b7c85  deviceinfo
 "
@@ -21,8 +21,7 @@ deviceinfo_screen_height="960"
 deviceinfo_flash_method="fastboot"
 deviceinfo_generate_bootimg="true"
 deviceinfo_bootimg_qcdt="false"
-deviceinfo_bootimg_mtk_label_kernel="KERNEL"
-deviceinfo_bootimg_mtk_label_ramdisk="ROOTFS"
+deviceinfo_bootimg_mtk_mkimage="true"
 deviceinfo_bootimg_dtb_second="false"
 deviceinfo_flash_offset_base="0x10000000"
 deviceinfo_flash_offset_kernel="0x00008000"
@@ -1,7 +1,7 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-fairphone-fp3
 pkgdesc="Fairphone 3"
-pkgver=4
+pkgver=3
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -72,6 +72,6 @@ mainline_firmware() {
 }

 sha512sums="
-f535cfa90bb2b5e6914810b9dae62136cfabcfa45d8324a5d89d41ce4876b1813a3c6d7bbec9c646177ca2641d7d3dcce2449d71ae7465fcad77d71525b81e4a  deviceinfo
+c00ac239649dda6d639f7ba47d1b539361d31a7683820e00ab56f6729dde6f7f8d35c8b4a2258b14f53b176e0000c26ca081541f5f1ce633d7c4f4238d6b9568  deviceinfo
 c56e5b11dc5ecaba8bb5ff0e06a1f2746942eebb0336257e44e673e849f440a6800e5b30e297e5827fb540778e4400daa31b76f521b3e804279c0c2b3329267f  modules-initfs.mainline
 "
@@ -27,6 +27,7 @@ deviceinfo_kernel_cmdline_mainline="console=ttyMSM0,115200"
 deviceinfo_generate_bootimg="true"
 deviceinfo_generate_extlinux_config="true"
 deviceinfo_bootimg_qcdt="false"
+deviceinfo_bootimg_mtk_mkimage="false"
 deviceinfo_bootimg_dtb_second="false"
 deviceinfo_flash_fastboot_partition_vbmeta="vbmeta"
 deviceinfo_flash_offset_base="0x80000000"
@@ -2,7 +2,7 @@
 # Maintainer: Luca Weiss <luca@lucaweiss.eu>
 pkgname=device-fairphone-fp5
 pkgdesc="Fairphone 5"
-pkgver=6
+pkgver=5
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -73,7 +73,7 @@ openrc() {
 sha512sums="
 f700af3145b79d1ef9edfb22982899b25cabfb212f9620dcbd3a2e6f44b5ad591e0a66056c6fcd66c3fde89a2b5f551e8a8fe2e65cf0e2a48adec57c027d7825  10-unl0kr.conf
 2c16ba75e0077b2b1eaefa4c73b287475505a1aeb291ec29316d41cc094277320f9d2aaabfd91eb1dc0f488ab2d61a94faef16e7afe0f1e226779113761b9a37  81-libssc-fairphone-fp5.rules
-5e4877277bcf3e4f232e96b1edf0bb598b8f16c4820d2db321f502ea9aa339c405458ecd9642c838e4dc4e2dc59d0c57fadd4bc5a9a81c915772b4f244bf1e6d  deviceinfo
+3062dc927b0521512782b34b0a12739aa455794bc49c25d423cf584b6f264f2cef8629bcc70b194d0e58712a21f64aa2c3b61336a904fe9173991f42b9c94f89  deviceinfo
 206c7b2616b61c1f7630933d036875985e78cfc23e6a175795b328d251684abeceb06373da4ae211f6f7dd7e45fb3b3238bb8a4b5698906be626d8d918adf5b3  hexagonrpcd.confd
 165ae7e1dbb5fb709e2f7b457dafa5df5b755c1199ea0f011b7e519ab49bc676ddeff92a3152629125e66d3dbbe5a70384364191000a1fdf860977e2ed43de54  modules-initfs
 f39b6e5de6d9bfefc841e887b92bb5a92d02d1de46fd376ca83871b7a9cf0da5297d7201457b2bb12c302887bb0a9d328604ff910ebda8022ac71ad120b11a3c  HiFi.conf
@@ -26,6 +26,7 @@ deviceinfo_flash_method="fastboot"

 deviceinfo_generate_bootimg="true"
 deviceinfo_bootimg_qcdt="false"
+deviceinfo_bootimg_mtk_mkimage="false"
 deviceinfo_bootimg_dtb_second="false"
 deviceinfo_flash_pagesize="4096"
 deviceinfo_flash_offset_base="0x00000000"
@@ -1,7 +1,7 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-fly-iq4404
 pkgdesc="Fly Spark"
-pkgver=2
+pkgver=1
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -21,5 +21,5 @@ package() {


 sha512sums="
-58cf8cdbfc8aa5cb6420d19247b1c9e4edbebc585974bffbf5f7146c9eb315c1960d4fdc1db42bfd8b4eea0e8a82a686cfd1257fdde27f2414f8b3fb833355ae  deviceinfo
+ca6e7d9b3e234007b7a7fbfd2cfcfd2a796d89619735dda8db87377c9c098e3931cdb35004f87f2391d8f275f6bcfdae58db2f45cb39366e40a5503af0732967  deviceinfo
 "
@@ -20,8 +20,7 @@ deviceinfo_flash_method="fastboot"
 deviceinfo_generate_bootimg="true"
 deviceinfo_bootimg_qcdt="false"
 deviceinfo_bootimg_dtb_second="false"
-deviceinfo_bootimg_mtk_label_kernel="KERNEL"
-deviceinfo_bootimg_mtk_label_ramdisk="ROOTFS"
+deviceinfo_bootimg_mtk_mkimage="true"
 deviceinfo_flash_offset_base="0x80100000"
 deviceinfo_flash_offset_kernel="0x00008000"
 deviceinfo_flash_offset_ramdisk="0x04000000"
@@ -1,7 +1,7 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-google-bonito
 pkgdesc="Google Pixel 3a XL"
-pkgver=4
+pkgver=3
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -71,7 +71,7 @@ nonfree_firmware() {

 sha512sums="
 016d398155f2344417f5e5649a361719ba6e53e593c501b5df39114cdd284302b9bf8686a39817aee0c08fec95b3ab613c181d6cc9596299aaf7fd05dbe0c3dd  90-feedbackd-drv2624.rules
-e417f9a4da0dd595e34c520c10aef89e480336d9d57b66284a98777afce1dbc3dcda30f8a3a1c625b5e5e19aae4a95f28e00ca47e5d0e993ca922da5107bd837  deviceinfo
+e04b8da50199066badd5f7f381fb1ae84f0ee1b800e3136f3712647bd1ce909ab89c83e0811d546580cf58ac55c0ac8b5144912a3bff24af7a5f9979df5e4698  deviceinfo
 1eb5f138619f499fab31ea64f63ee9f8984f195528708ec6a01ddc533c74cfb71d1442b97905ae15db24b8faac259fa3e89db357ca9c747ce3ee598c2d681639  modules-initfs
 3a4a9322839d4b3ef9d79668a37840a9f444954759ae3c512e694051d2f9a2573db42ad6c4c1a5c75eeb861232a27ba1a8cef9b503decd54ead25a96e3dd6f98  q6voiced.conf
 "
@@ -23,6 +23,7 @@ deviceinfo_screen_height="2160"
 deviceinfo_flash_method="fastboot"
 deviceinfo_generate_bootimg="true"
 deviceinfo_bootimg_qcdt="false"
+deviceinfo_bootimg_mtk_mkimage="false"
 deviceinfo_bootimg_dtb_second="false"
 deviceinfo_flash_pagesize="4096"
 deviceinfo_flash_offset_base="0x00000000"
@@ -1,7 +1,7 @@
 # Maintainer: Segfault <awarnecke002@hotmail.com>
 pkgname=device-htc-flounder
 pkgdesc="Google Nexus 9"
-pkgver=2
+pkgver=1
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -31,5 +31,5 @@ nonfree_firmware() {
 }

 sha512sums="
-996af1fb808f4064f1590e8092f595a3914e098068980c4d44fc2c6d559c4187c1966e86bcd4aefc32c0f19eae3f9e2506b7e3d3ab13cd1568dedfec70f09ab9  deviceinfo
+91501e12adbb13d5f70a24abdd6eb51f4f671c22b6a25405af7032d2902226527e862736af18e95e278d46b6266ca58f130fb9fe0d8c553251b8e2e85345a7e4  deviceinfo
 "
@@ -23,6 +23,7 @@ deviceinfo_flash_method="fastboot"
 deviceinfo_kernel_cmdline="console=ttyS0,115200"
 deviceinfo_generate_bootimg="true"
 deviceinfo_bootimg_qcdt="false"
+deviceinfo_bootimg_mtk_mkimage="false"
 deviceinfo_bootimg_dtb_second="false"
 deviceinfo_flash_pagesize="2048"
 deviceinfo_header_version="0"