systemd/systemd: lower systemd-resolved provider_priority

Currently we do not package the configurations needed to use systemd-resolved as a replacement for openresolv. Without this patch current systems that have wireguard-tools installed will automatically pull systemd-resolved. See https://gitlab.alpinelinux.org/alpine/aports/-/merge_requests/80058/diffs
linux-postmarketos-mediatek-mt8173: upgrade to 6.13.5 (MR 6262)
2025-02-28 01:23:22 -05:00 · 2025-02-27 23:39:19 +01:00 · 2025-02-27 12:06:55 -08:00 · 2025-02-27 09:57:13 -08:00 · 2025-02-27 09:48:03 -08:00 · 2025-02-27 17:00:24 +00:00
1259 changed files with 52102 additions and 39575 deletions
@@ -43,7 +43,7 @@ update_linux_next() {
 	# shellcheck source=/dev/null
 	pkgver=$(. device/testing/linux-next/APKBUILD; echo "$pkgver")

-	curl -s "https://gitlab.com/linux-kernel/linux-next/-/tags?format=atom" | grep -oP "(?<=<title>)[^<]+" | tail -n +2 > /tmp/tags
+	curl -s https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git/refs/tags/ | grep -oE "<a href='.*'>(.*)</a>.*\.tar\.gz</a>" | awk -F'[<>]' '{print $3}' > /tmp/tags

 	latest=$(grep -v "v" < /tmp/tags | head -n1)
 	if [ -z "$latest" ]; then
@@ -71,6 +71,7 @@ update_linux_next() {

 	echo "Updating linux-next from $pkgver to $new_pkgver..."
 	sed -i -e "s/pkgver=$pkgver/pkgver=$new_pkgver/" device/testing/linux-next/APKBUILD
+	sed -i -e "s/^pkgrel=.*/pkgrel=0/" device/testing/linux-next/APKBUILD

 	# Update the checksums
 	pmbootstrap checksum linux-next
@@ -110,14 +110,32 @@ if __name__ == "__main__":
    # FIXME: this should probably be more generic, if other repos are added later?
    if systemd_pkgs:
        common.run_pmbootstrap(["config", "systemd", "always"])
+        # To fix the ERROR: Chroot 'native' is for the 'edge' channel, but you are on the
+        # 'systemd-edge' channel. Run 'pmbootstrap zap' to delete your chroots and try again.
+        # To do this automatically, run 'pmbootstrap config auto_zap_misconfigured_chroots yes'.
+        common.run_pmbootstrap(["config", "auto_zap_misconfigured_chroots", "yes"])
+
+        # filter out packages that can't be built for arch
+        # (Iterate over copy of `systemd_pkgs`, because we modify it in this loop)
+        for package in systemd_pkgs.copy():
+            apkbuild_path = pmb.helpers.pmaports.find(package, True, True, with_extra_repos="enabled")
+            apkbuild = pmb.parse._apkbuild.apkbuild(pathlib.Path(apkbuild_path, "APKBUILD"))
+            if not pmb.helpers.pmaports.check_arches(apkbuild["arch"], arch):
+                print(f"(extra-repos/systemd) {package}: not enabled for {arch}, skipping")
+                systemd_pkgs.remove(package)
+
+        # No packages: skip build
+        if len(systemd_pkgs) == 0:
+            print(f"no packages changed, which can be built for {arch}")

-        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)
+            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)
@@ -24,8 +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
+	./device/community/soc-qcom/call_audio_idle_suspend_workaround.sh

 	$(find . -path './main/postmarketos-ui-*/*.sh')
 	$(find . -path './main/postmarketos-ui-*/*.pre-install')
@@ -14,9 +14,6 @@ import pmb.parse._apkbuild
 from pmb.core.pkgrepo import pkgrepo_default_path, pkgrepo_iglob, pkgrepo_relative_path
 from pmb.core.arch import Arch

-# Cache for codeowners_parse
-codeowners_parsed = {}
-
 # Don't complain if these nicknames are the only maintainers of an APKBUILD,
 # because they are actually a group of people
 gitlab_groups = [
@@ -102,72 +99,12 @@ def test_aports_device_kernel():
                               f" <https://postmarketos.org/devicepkg>): {path}")


-def codeowners_parse():
-    global codeowners_parsed
-
-    pattern_prev = None
-    aports = pkgrepo_default_path()
-
-    with open(aports / "CODEOWNERS") as h:
-        for line in h:
-            line = line.rstrip()
-            if not line or line.startswith("#"):
-                continue
-
-            pattern_nicks = line.split()
-            assert len(pattern_nicks) > 1, f"CODEOWNERS line without nicks: {line}"
-
-            pattern = pattern_nicks[0]
-            if pattern.endswith("/"):
-                pattern += "*"
-
-            nicks = []
-            for word in pattern_nicks[1:]:
-                if word.startswith("@"):
-                    nicks += [word]
-            codeowners_parsed[pattern] = nicks
-
-            if pattern_prev:
-                assert pattern_prev <= pattern, "CODEOWNERS: please order entries alphabetically"
-            pattern_prev = pattern
-
-
-def require_enough_codeowners_entries(path, maintainers):
-    """
-    :param path: full path to an APKBUILD (e.g. /home/user/…/APKBUILD)
-    :param maintainers: list of one or more maintainers
-    """
-
-    _, path = pkgrepo_relative_path(path)
-
-    nicks = set()
-    for pattern, pattern_nicks in codeowners_parsed.items():
-        if fnmatch.fnmatch(path, pattern):
-            for nick in pattern_nicks:
-                nicks.add(nick)
-
-    print(f"{path}:")
-    print(f"  APKBUILD: {maintainers}")
-    print(f"  CODEOWNERS: {nicks}")
-
-    if len(nicks) < len(maintainers):
-        for nick in nicks:
-            if nick in gitlab_groups:
-                print(f"  -> {nick} is a group")
-                return
-
-    assert len(nicks) >= len(maintainers), \
-        f"{path}: make sure that each maintainer is listed in CODEOWNERS!"
-
-
 # @pytest.mark.xfail # Not all aports have been updated yet
 def test_aports_maintained():
    """
    Ensure that aports in /device/{main,community} have "Maintainer:" and
-    "Co-Maintainer:" (only required for main) listed in their APKBUILDs. Also
-    check that at least as many are listed in CODEOWNERS.
+    "Co-Maintainer:" (only required for main) listed in their APKBUILDs.
    """
-    codeowners_parse()

    for path in pkgrepo_iglob("device/main/*/APKBUILD"):
        if 'firmware-' in path.parent.name:
@@ -175,14 +112,12 @@ def test_aports_maintained():
        maintainers = pmb.parse._apkbuild.maintainers(path)
        assert maintainers and len(maintainers) >= 2, \
            f"{path} in main needs at least 1 Maintainer and 1 Co-Maintainer"
-        require_enough_codeowners_entries(path, maintainers)

    for path in pkgrepo_iglob("device/community/*/APKBUILD"):
        if 'firmware-' in path.parent.name:
            continue
        maintainers = pmb.parse._apkbuild.maintainers(path)
        assert maintainers, f"{path} in community needs at least 1 Maintainer"
-        require_enough_codeowners_entries(path, maintainers)


 def test_aports_unmaintained():
@@ -10,6 +10,7 @@ expected_directories = [
    "device/community",
    "device/main",
    "device/testing",
+    "extra-repos/systemd",
    "main",
    "modem",
    "non-free",
@@ -25,6 +25,7 @@ def test_aports_firmware():
        "firmware-samsung-maguro",  # Depends on firmware-aosp-broadcom-wlan
        "firmware-xiaomi-ferrari",  # Depends on soc-qcom-msm8916
        "firmware-xiaomi-willow",  # Doesn't build, source link is dead (pma#1212)
+        "firmware-samsung-i9105p", # Depends on firmware-aosp-broadcom-wlan
    ]

    for path in pkgrepo_iglob("**/firmware-*/APKBUILD", recursive=True):
@@ -23,6 +23,9 @@ def test_aports_kernel():
        apkbuild = pmb.parse.apkbuild(path)
        aport_name = os.path.basename(os.path.dirname(path))

+        if aport_name == "linux-pam":
+            continue  # This package isn't a linux kernel!
+
        if "pmb:cross-native" not in apkbuild["options"]:
            raise RuntimeError(f"{aport_name}: \"pmb:cross-native\" missing in"
                               " options= line")
@@ -12,3 +12,8 @@ indent_style = tab
 end_of_line = lf
 trim_trailing_whitespace = true
 insert_final_newline = true
+
+# Forked from Alpine
+[extra-repos/systemd/networkmanager/networkmanager.rules]
+indent_style = space
+indent_size = 4
@@ -31,7 +31,7 @@ workflow:
 wiki:
  stage: lint
  rules:
-    - if: $CI_PIPELINE_SOURCE == "merge_request_event" || $CI_COMMIT_REF_PROTECTED == "false"
+    - if: &mr_rule $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: $CI_PIPELINE_SOURCE == "merge_request_event" || $CI_COMMIT_REF_PROTECTED == "false"
+    - if: *mr_rule
      changes:
        - .ci/*
        - .ci/*/*
@@ -58,7 +58,7 @@ shellcheck-grep:
  stage: lint
  image: alpine:edge
  rules:
-    - if: $CI_PIPELINE_SOURCE == "merge_request_event" || $CI_COMMIT_REF_PROTECTED == "false"
+    - if: *mr_rule
  script:
    - .ci/lib/gitlab_prepare_ci.sh
    - .ci/shellcheck.sh
@@ -69,7 +69,7 @@ editor-config:
  stage: lint
  image: alpine:edge
  rules:
-    - if: $CI_PIPELINE_SOURCE == "merge_request_event" || $CI_COMMIT_REF_PROTECTED == "false"
+    - if: *mr_rule
  script:
    - .ci/lib/gitlab_prepare_ci.sh
    - .ci/ec.sh
@@ -78,7 +78,7 @@ editor-config:
 pytest-commits:
  stage: lint
  rules:
-    - if: $CI_PIPELINE_SOURCE == "merge_request_event" || $CI_COMMIT_REF_PROTECTED == "false"
+    - if: *mr_rule
  script:
    - .ci/lib/gitlab_prepare_ci.sh
    - .ci/pytest.sh
@@ -95,7 +95,7 @@ pytest-commits:
 aport-lint:
  stage: lint
  rules:
-    - if: $CI_PIPELINE_SOURCE == "merge_request_event" || $CI_COMMIT_REF_PROTECTED == "false"
+    - if: *mr_rule
  script:
    - .ci/lib/gitlab_prepare_ci.sh
    - .ci/apkbuild-lint.sh
@@ -105,9 +105,12 @@ aport-lint:
 kernel-kconfig:
  stage: lint
  rules:
-    - if: $CI_PIPELINE_SOURCE == "merge_request_event" || $CI_COMMIT_REF_PROTECTED == "false"
+    - if: *mr_rule
      changes:
        - kconfigcheck.toml
+      allow_failure: true
+    - if: *mr_rule
+      changes:
        - device/*/linux-*/config-*
  script:
    - .ci/lib/gitlab_prepare_ci.sh
@@ -130,7 +133,7 @@ mr-settings:
 .build:
  stage: build
  rules:
-    - if: $CI_PIPELINE_SOURCE == "merge_request_event" || $CI_COMMIT_REF_PROTECTED == "false"
+    - if: *mr_rule
  before_script:
    - *global_before_scripts
    - .ci/lib/gitlab_prepare_ci.sh
@@ -154,21 +157,25 @@ build-x86:

 build-aarch64:
  extends: .build
+  tags: [arm64]
  script:
    - .ci/build-aarch64.sh

 build-armv7:
  extends: .build
+  tags: [qemu]
  script:
    - .ci/build-armv7.sh

 build-armhf:
  extends: .build
+  tags: [qemu]
  script:
    - .ci/build-armhf.sh

 build-riscv64:
  extends: .build
+  tags: [qemu]
  script:
    - .ci/build-riscv64.sh

@@ -39,6 +39,9 @@
 * [ ] 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
@@ -1,14 +1,10 @@
 {
    "subject_format": {
        "pass": [
-            "^(([a-z]+\\/[a-z\\-0-9*{}]+),?)+: [A-Za-z\\/\\-0-9*{}\\(\\)\\.,_&:=' ]+( \\(MR \\d+\\)|)$",
-            "^CI: [a-z-0-9*{}\\(\\)\\.,_ ][A-Za-z\\/\\-0-9*{}\\(\\)\\.,_ ]+( \\(MR \\d+\\)|)$",
-            "^mrhlpr.json: [a-z-0-9*{}\\(\\)\\.,_ ][A-Za-z\\/\\-0-9*{}\\(\\)\\.,_ ]+( \\(MR \\d+\\)|)$",
-            "^pmaports.cfg: [a-z-0-9*{}\\(\\)\\.,_ ][A-Za-z\\/\\-0-9*{}\\(\\)\\.,_ ]+( \\(MR \\d+\\)|)$"
-        ],
-        "unknown": [
-            "^[a-z-0-9_.*{}\\/]+: [a-z-0-9*{}\\(\\)\\.,_ ][A-Za-z\\/\\-0-9*{}\\(\\)\\.,_ ]+( \\(MR \\d+\\)|)$"
+            "^(([a-z]+\\/\\)?\\([a-z\\-0-9*{}]+),?)+: [a-z][A-Za-z\\/\\-0-9*{}\\.,_&:=' ]+( \\(MR \\d+\\)|)$",
+            "^CI: [a-z-0-9*{}\\(\\)\\.,_ ][A-Za-z\\/\\-0-9*{}\\.,_ ]+( \\(MR \\d+\\)|)$",
+            "^mrhlpr.json: [a-z-0-9*{}\\(\\)\\.,_ ][A-Za-z\\/\\-0-9*{}\\.,_ ]+( \\(MR \\d+\\)|)$",
+            "^pmaports.cfg: [a-z-0-9*{}\\(\\)\\.,_ ][A-Za-z\\/\\-0-9*{}\\.,_ ]+( \\(MR \\d+\\)|)$"
        ]
    }
 }
-
@@ -0,0 +1 @@
+https://postmarketos.org/funding.json
@@ -34,8 +34,9 @@ device/*/*-qcom-msm8916/			@Minecrell @TravMurav
 device/*/*-qcom-msm8953/			@barni2000 @alikates @vipaoL @jiaxyga
 device/*/*-qcom-sdm670/				@flamingradian
 device/*/*-qcom-sdm845/				@sdm845-mainline
-device/*/*-qcom-sm6350/				@z3ntu
+device/*/*-qcom-sm7150/				@Adrian @jiaxyga @ungeskriptet
 device/*/*-qcom-sm8250/				@jianhua
+device/*/*-qcom/					@calebccff
 device/*/*-samsung-a3/				@Mis012 @TravMurav @Minecrell
 device/*/*-samsung-a5/				@Minecrell @minlexx
 device/*/*-samsung-a51/				@manoedinata
@@ -58,17 +59,19 @@ device/*/*-videostrong-kii-pro/			@funderscore
 device/*/*-wileyfox-crackling/			@TravMurav @Minecrell
 device/*/*-xiaomi-beryllium/			@joelselvaraj
 device/*/*-xiaomi-daisy/			@joelselvaraj @alikates
+device/*/*-xiaomi-davinci/			@Adrian @ArianK16a
 device/*/*-xiaomi-elish/			@jianhua
 device/*/*-xiaomi-markw/			@vipaoL
 device/*/*-xiaomi-mido/				@barni2000
 device/*/*-xiaomi-scorpio/			@Tooniis
+device/*/*-xiaomi-surya/			@jiaxyga @ungeskriptet
 device/*/*-xiaomi-tissot/			@jiaxyga @barni2000
 device/*/*-xiaomi-vince/			@M0Rf30
 device/*/*-xiaomi-wt88047/			@Minecrell
 device/*/*-xiaomi-ysl/				@barni2000
 device/*/alsa-ucm-conf-cros/			@WeirdTreeThing
 device/*/alsa-ucm-conf-qcom-sdm670/		@flamingradian
-device/*/device-fairphone-*/			@z3ntu
+device/*/device-apple-n61/			@JustSoup321
 device/*/device-generic-x86_64/			@craftyguy @ollieparanoid
 device/*/device-google-nyan-big/		@jenneron
 device/*/device-google-nyan-blaze/		@jenneron
@@ -88,12 +91,12 @@ device/*/device-postmarketos-trailblazer/	@calebccff
 device/*/device-qcom-msm8909/			@wonderfulShrineMaidenOfParadise
 device/*/device-qemu-aarch64/			@Minecrell @ollieparanoid
 device/*/device-qemu-amd64/			@Minecrell @ollieparanoid
-device/*/device-qemu-riscv64/			@Minecrell @z3ntu
+device/*/device-qemu-riscv64/			@Minecrell
 device/*/device-qualcomm-sdm845/		@calebccff
 device/*/device-raspberry-pi3/			@fossdd
 device/*/device-samsung-chagallwifi/		@Grimler
 device/*/device-samsung-coreprimevelte/		@legolivesmatter @balejk
-device/*/device-samsung-j5y17lte/	@andrisas
+device/*/device-samsung-j5y17lte/		@andrisas
 device/*/device-samsung-klimtlte/		@Grimler
 device/*/device-samsung-lt01/			@knuxify
 device/*/device-samsung-m0/			@Newbyte
@@ -113,6 +116,7 @@ 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
@@ -130,7 +134,7 @@ device/*/linux-postmarketos-rockchip/		@QC8086
 device/*/linux-postmarketos-stericsson/		@Newbyte
 device/*/linux-samsung-chagallwifi/		@Grimler
 device/*/linux-samsung-coreprimevelte/		@legolivesmatter @balejk
-device/*/linux-samsung-j5y17lte/	@andrisas
+device/*/linux-samsung-j5y17lte/		@andrisas
 device/*/linux-samsung-klimtlte/		@Grimler
 device/*/oem-amd/				@craftyguy
 device/*/oem-intel/				@craftyguy
@@ -149,6 +153,8 @@ main/postmarketos*gnome*/			@pabloyoyoista @Newbyte @fossdd
 main/postmarketos-initramfs/			@calebccff @craftyguy
 main/postmarketos-ui-i3wm/			@fossdd
 main/postmarketos-ui-phosh/			@pabloyoyoista @Newbyte @fossdd
+main/postmarketos-ui-plasma-bigscreen/		@PureTryOut
+main/postmarketos-ui-plasma-desktop/		@PureTryOut
 main/postmarketos-ui-plasma-mobile/		@PureTryOut
 main/shutdown-clear-rtc-wakealarm/		@Arnavion
 main/ttyescape/					@calebccff
@@ -15,7 +15,7 @@ branch_aports=3.21-stable
 mirrordir_alpine=v3.21

 [v24.06]
-description=Old release (supported until 2025-01-23)
+description=Old release (unsupported)
 branch_pmaports=v24.06
 branch_aports=3.20-stable
 mirrordir_alpine=v3.20
@@ -8,7 +8,7 @@ fi

 pkgname=busybox-static-aarch64
 pkgver=1.37.0
-pkgrel=10
+pkgrel=14

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

 sha512sums="
-b71a091d7ae6ee459dd0c51409793214a2285ee83c2621e289e198187ed642222d6f842f08661a8c72f96c9a0dc7271d5a47ab6794e2551f185d68f515bde598  busybox-static-1.37.0-r10-aarch64-edge.apk
+8f1f521eceb24a5f66e18e022b1151e96b40378051aaed911dc22e68dbffc5998c8f2bac3935423371c7e707f8931e97873c91c39d56dc2e34292567b3caceaf  busybox-static-1.37.0-r14-aarch64-edge.apk
 "
@@ -8,7 +8,7 @@ fi

 pkgname=busybox-static-armhf
 pkgver=1.37.0
-pkgrel=10
+pkgrel=14

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

 sha512sums="
-88abaead7eace4910199e0cc76bc16bce762d61b2e10e1bc2a631d38e56458f5cb95f98f09d09f346229f9c6c982d3b0b3f907315f54e0e92b83dcc3b839d8bf  busybox-static-1.37.0-r10-armhf-edge.apk
+ce7dfd41a149faed98ae5ae08695223b57e8104a47c9c4c0e956a8c7cbd7fbc6b53b247f2c0f0633d72aa0aba8688f6ecfdd9784722b655f3c29dc1a2557f3e1  busybox-static-1.37.0-r14-armhf-edge.apk
 "
@@ -8,7 +8,7 @@ fi

 pkgname=busybox-static-armv7
 pkgver=1.37.0
-pkgrel=10
+pkgrel=14

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

 sha512sums="
-5bbeb8a0331f25569acc32d574290ec430f0a2a74190550b3913f3e7366082a76b9755c0d52bec57659a2bbd1af3f4fe5928ec988b283a2e731c902cd5e7aa85  busybox-static-1.37.0-r10-armv7-edge.apk
+2f7003d0de894299a0260efd97bddfabd8d14d0e4b624445a77367036ad33c7ad65a85ee758969e671599ded5ee5674bda755c570ca4d9e95bba9c02b5788b8f  busybox-static-1.37.0-r14-armv7-edge.apk
 "
@@ -5,7 +5,7 @@

 pkgname=ccache-cross-symlinks
 pkgver=3
-pkgrel=0
+pkgrel=1
 pkgdesc="Enable ccache for cross-compilers with symlinks"
 url="https://ccache.samba.org/"
 arch="noarch"
@@ -15,7 +15,7 @@ options="!check"

 package() {
 	# Keep in sync with pmb.config.build_device_architectures
-	local _archs="armhf armv7 aarch64 x86_64 x86"
+	local _archs="armhf armv7 aarch64 x86_64 x86 riscv64"

 	local _bins="c++ cc cpp g++ gcc clang clang++"
 	mkdir -p "$pkgdir/usr/lib/ccache/bin"
@@ -20,7 +20,7 @@

 pkgname=crossdirect
 pkgver=5.2.0
-pkgrel=0
+pkgrel=1
 pkgdesc="Wrappers to launch native cross compilers in foreign chroots"
 url="https://postmarketOS.org"
 arch="all"
@@ -31,7 +31,7 @@ source="cargo.sh crossdirect.c rustc.sh rust-qemu-linker.sh"
 build() {
 	cd "$srcdir"
 	# Architectures and binaries
-	_archs="x86_64 armhf armv7 aarch64"
+	_archs="x86_64 armhf armv7 aarch64 riscv64"
 	for _arch in $_archs; do
 		[ "$_arch" == "$CARCH" ] && continue
 		_hostspec="$(arch_to_hostspec $_arch)"
@@ -48,7 +48,7 @@ build() {

 package() {
 	# Architectures and binaries
-	_archs="x86_64 armhf armv7 aarch64"
+	_archs="x86_64 armhf armv7 aarch64 riscv64"
 	_bins="c++ cc cpp g++ gcc clang clang++"

 	# Rust wrappers
@@ -34,20 +34,19 @@ _pkgsnap="${pkgver##*_git}"
 [ "$CHOST" != "$CTARGET" ] && _target="-$CTARGET_ARCH" || _target=""

 pkgname=gcc-aarch64
-pkgrel=4
+pkgrel=5
 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"
+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"
 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}"
@@ -320,7 +319,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=loongarch64 --with-abi=lp64d";;
+	loongarch64-*-*-*)      _arch_configure="--with-arch=la64v1.0 --with-abi=lp64d";;
 	esac

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

 	# move ada runtime libs
 	if $LANG_ADA; then
-		for i in $(find "$pkgdir"/$_gcclibdir/adalib/ -type f -maxdepth 1 \( -name "libgna*.so" -o -name "libgna*.a" \) ); do
+		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
 			mv "$i" "$pkgdir"/usr/lib/
 			ln -s ../../../../${i##*/} $i
 		done
@@ -486,9 +487,6 @@ 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
@@ -570,9 +568,10 @@ libcxx_dev() {
 gpp() {
 	pkgdesc="GNU C++ standard library and compiler"
 	depends="libstdc++-dev$_target=$_gccrel gcc$_target=$_gccrel musl-dev"
-	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"

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

 pkgname=gcc-armhf
-pkgrel=4
+pkgrel=5
 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"
+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"
 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}"
@@ -320,7 +319,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=loongarch64 --with-abi=lp64d";;
+	loongarch64-*-*-*)      _arch_configure="--with-arch=la64v1.0 --with-abi=lp64d";;
 	esac

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

 	# move ada runtime libs
 	if $LANG_ADA; then
-		for i in $(find "$pkgdir"/$_gcclibdir/adalib/ -type f -maxdepth 1 \( -name "libgna*.so" -o -name "libgna*.a" \) ); do
+		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
 			mv "$i" "$pkgdir"/usr/lib/
 			ln -s ../../../../${i##*/} $i
 		done
@@ -486,9 +487,6 @@ 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
@@ -570,9 +568,10 @@ libcxx_dev() {
 gpp() {
 	pkgdesc="GNU C++ standard library and compiler"
 	depends="libstdc++-dev$_target=$_gccrel gcc$_target=$_gccrel musl-dev"
-	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"

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

 pkgname=gcc-armv7
-pkgrel=4
+pkgrel=5
 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"
+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"
 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}"
@@ -320,7 +319,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=loongarch64 --with-abi=lp64d";;
+	loongarch64-*-*-*)      _arch_configure="--with-arch=la64v1.0 --with-abi=lp64d";;
 	esac

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

 	# move ada runtime libs
 	if $LANG_ADA; then
-		for i in $(find "$pkgdir"/$_gcclibdir/adalib/ -type f -maxdepth 1 \( -name "libgna*.so" -o -name "libgna*.a" \) ); do
+		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
 			mv "$i" "$pkgdir"/usr/lib/
 			ln -s ../../../../${i##*/} $i
 		done
@@ -486,9 +487,6 @@ 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
@@ -570,9 +568,10 @@ libcxx_dev() {
 gpp() {
 	pkgdesc="GNU C++ standard library and compiler"
 	depends="libstdc++-dev$_target=$_gccrel gcc$_target=$_gccrel musl-dev"
-	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"

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

 pkgname=gcc-riscv64
-pkgrel=4
+pkgrel=5
 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"
+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"
 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}"
@@ -320,7 +319,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=loongarch64 --with-abi=lp64d";;
+	loongarch64-*-*-*)      _arch_configure="--with-arch=la64v1.0 --with-abi=lp64d";;
 	esac

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

 	# move ada runtime libs
 	if $LANG_ADA; then
-		for i in $(find "$pkgdir"/$_gcclibdir/adalib/ -type f -maxdepth 1 \( -name "libgna*.so" -o -name "libgna*.a" \) ); do
+		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
 			mv "$i" "$pkgdir"/usr/lib/
 			ln -s ../../../../${i##*/} $i
 		done
@@ -486,9 +487,6 @@ 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
@@ -570,9 +568,10 @@ libcxx_dev() {
 gpp() {
 	pkgdesc="GNU C++ standard library and compiler"
 	depends="libstdc++-dev$_target=$_gccrel gcc$_target=$_gccrel musl-dev"
-	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"

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

 pkgname=gcc-x86
-pkgrel=4
+pkgrel=5
 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"
+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"
 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}"
@@ -320,7 +319,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=loongarch64 --with-abi=lp64d";;
+	loongarch64-*-*-*)      _arch_configure="--with-arch=la64v1.0 --with-abi=lp64d";;
 	esac

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

 	# move ada runtime libs
 	if $LANG_ADA; then
-		for i in $(find "$pkgdir"/$_gcclibdir/adalib/ -type f -maxdepth 1 \( -name "libgna*.so" -o -name "libgna*.a" \) ); do
+		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
 			mv "$i" "$pkgdir"/usr/lib/
 			ln -s ../../../../${i##*/} $i
 		done
@@ -486,9 +487,6 @@ 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
@@ -570,9 +568,10 @@ libcxx_dev() {
 gpp() {
 	pkgdesc="GNU C++ standard library and compiler"
 	depends="libstdc++-dev$_target=$_gccrel gcc$_target=$_gccrel musl-dev"
-	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"

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

 pkgname=gcc-x86_64
-pkgrel=4
+pkgrel=5
 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"
+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"
 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}"
@@ -321,7 +319,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=loongarch64 --with-abi=lp64d";;
+	loongarch64-*-*-*)      _arch_configure="--with-arch=la64v1.0 --with-abi=lp64d";;
 	esac

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

 	# move ada runtime libs
 	if $LANG_ADA; then
-		for i in $(find "$pkgdir"/$_gcclibdir/adalib/ -type f -maxdepth 1 \( -name "libgna*.so" -o -name "libgna*.a" \) ); do
+		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
 			mv "$i" "$pkgdir"/usr/lib/
 			ln -s ../../../../${i##*/} $i
 		done
@@ -487,9 +487,6 @@ 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
@@ -571,10 +568,10 @@ libcxx_dev() {
 gpp() {
 	pkgdesc="GNU C++ standard library and compiler"
 	depends="libstdc++-dev$_target=$_gccrel gcc$_target=$_gccrel musl-dev"
-	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"

+	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"
+
 	amove $_gcclibexec/cc1plus
 	amove usr/bin/*++
 }
@@ -3,7 +3,7 @@

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

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

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

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

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

 sha512sums="
-9cdb30e50d99d377ef8ef3bc41fc6ecd0ae7bc744c6c29ba97afd1ff072271d78c9a36947cebdf944e907b5181bacf165345824234380511d4cc3b535c730673  musl-1.2.5-r8-aarch64-edge.apk
-5638f321b0e76bdb68d3e641ab5bcf4b0f66365aedfbec52b09fc9eafcaf210797c2cbd8166254c3633e3d597d8118838443d32e0af45d689467a237e1cf479e  musl-dev-1.2.5-r8-aarch64-edge.apk
+8276aa0ce7368b87bf97f37d600639d475c059b984061125c6b648d2fecb838d87c8de9f19af32bad5862845c05368ccec0b328af3beb0fedc89a7ec0fb3babb  musl-1.2.5-r10-aarch64-edge.apk
+2da7a285fee8a1f2386d4a75cbf3c75cfbbaf88c617d50af0e0440fcd5d9825183772bb13f55f885137d6519c606791d3a8c576c5202818b2289f0db4c98720d  musl-dev-1.2.5-r10-aarch64-edge.apk
 "
@@ -8,7 +8,7 @@ fi

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

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

 sha512sums="
-18a970c5ef74e306ffa6031ae5f75a9cc3c52a9cd4c4706c94631696cf52d5af5024548d658176546c559c99dfad321e0ce87eddcc92a4aff40293e61313f921  musl-1.2.5-r8-armhf-edge.apk
-c8bcb213d113fde24ed72f67d46e19cc842fbae223aaa02b635d53ba4c7ea39869243b24dada8a248e8c93e1e9c8b35424be39bcfd25136d3b18250cab820638  musl-dev-1.2.5-r8-armhf-edge.apk
+18e90cbe16c8084cbf8d91b36decde0d520778946258d4c84908e639741843d21b7e9e610f007e5126dcc6a3ba2289a862bc18cfd9b21d3bc64161483a5704cf  musl-1.2.5-r10-armhf-edge.apk
+7b46a6eb791beb511d9d40c5de3fc08d9b2fbf82b0538dfb171cdafd16d719687d3bb55e718a0f1eefcd0a8342d81fcb258928a3209ab1a874015054f5ffe501  musl-dev-1.2.5-r10-armhf-edge.apk
 "
@@ -8,7 +8,7 @@ fi

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

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

 sha512sums="
-4aad1e994572ae8b364e926c9213dbc2f6759fb9308290837cbcba31c4005a9dfc16fb2600953dd23e3f49b9a549865bc818e875d8dd8ef8f9075a114a7dca2d  musl-1.2.5-r8-armv7-edge.apk
-69359b6d47b94560657c7c97709ea2bcc3b31e4454bb247721d39d20daa1520178cca789f68126d4235f1e10ed1a7a7ce598b199323898d0c6b714342608ab0d  musl-dev-1.2.5-r8-armv7-edge.apk
+cfd51c4655b612815af1e888228244640a4516dd8edd7a75131d6634c96d8ea6028e780b3c3e870dd22c4f89788f9f12594b4900a8df287161059687f1630857  musl-1.2.5-r10-armv7-edge.apk
+88f482c389479817700a5b2c8609bae9d152303b92b1a9c7bd464aa990975b7bd0990c7b185d6c66ecd0c3c0c5f7579fc52a618d4393e511e112c8992d682693  musl-dev-1.2.5-r10-armv7-edge.apk
 "
@@ -8,7 +8,7 @@ fi

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

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

 sha512sums="
-41e2ab47c4ee0cd3fde7867be24eaff3f0346ae66b0e4a268b2638e243ba3e55db6782f9633d6ee08018eb608134908439c498e4c8a6cc43b6f607ed2af0f41b  musl-1.2.5-r8-riscv64-edge.apk
-f9f31edbd65a2c920c4936be66c6e822081ac13a1b08bf7fda7205105bb77fcd18484a73f42857ab947e88310b093c02cedc1b097490b4ba610ff9a78c60ab15  musl-dev-1.2.5-r8-riscv64-edge.apk
+4c76e3c4e94ab96d49c51ad01205e846280f851cff06b8c6ab8269d2ac99bbede29da9600fa60130c266d95da21bccdb00ad4b18123964774835e8014611e53e  musl-1.2.5-r10-riscv64-edge.apk
+27e6923fb43b1cd87b15e42edec6c658b7983b4e8c001bb67f5fc79cb124a46af92440e75676460eb3bed3a7acdd5ad142f03ba7dd040aae056431b8cc56818d  musl-dev-1.2.5-r10-riscv64-edge.apk
 "
@@ -8,7 +8,7 @@ fi

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

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

 sha512sums="
-57242b717ccfa0dd5dae74f6b440b1258fc4900c30b569b7fa46930e38cc1ca1c28cbb9c24239c67909fd26644a82c87ef19a41ce3c5a47e0f4c2e749d24eb32  musl-1.2.5-r8-x86-edge.apk
-d3df9a8bb1a5b61cc84f805e0e1926dd52fae77929b5839ffe37c694a7a494728166aff52a37b3ce4fe24065c6886098bff91ddf9f365e636b3fd1dc0e0332ac  musl-dev-1.2.5-r8-x86-edge.apk
+7d53c9b8d328860e09e5e5835be9632e9ee6effb6ce4203817b12139a1c4c69ac71495bb575e696b16e9a1dde830729af1b5b4d9308bf2e4be0995f2d7e2843b  musl-1.2.5-r10-x86-edge.apk
+5d048109d3360c526216a6f47446c5e9315fed76ae24bc8238d08dcac80edd22ac3de9ae4fda8fc42fd2c70c676e8673811eddb991bf08ea500bf4ccd10e2a3e  musl-dev-1.2.5-r10-x86-edge.apk
 "
@@ -8,7 +8,7 @@ fi

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

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

 sha512sums="
-fa2d127eaf56c9bcd93e40ab8c2499123d534f65319232b76f12ffdd0798ed2f0218802cae0373f9255996fdfa194f04bb92d1e05c9b0a659fae4b7a533094eb  musl-1.2.5-r8-x86_64-edge.apk
-4fcd12befeaa57c3961e4291d37ed9a57043879af6de32f65db3b860616d0c1b76a545099c03350603fddebd8360beae552655ea6df9046712bda290c51d3e05  musl-dev-1.2.5-r8-x86_64-edge.apk
+5d8ee4ca49019bf728f855cd296e36ac8ba9c16dc85f56c7b8bb6804788656584464ed9828f1eb5a14c1da1ca77906fae9d93174c44d03e003b6e1c2d1f445a6  musl-1.2.5-r10-x86_64-edge.apk
+788290a474910e15611f8a9165470fd5a633a579ca3a6f89f5f550864303949dedb286c6f0108db5490e8e05d0ce0dcfd749555b63b624ea8fcaffd9a0b201b9  musl-dev-1.2.5-r10-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=1
-pkgrel=2
+pkgver=2
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
@@ -21,5 +21,5 @@ package() {
 }

 sha512sums="
-2b6ba0e6e6d8f90d907a7a8089718c8a1ff8ee3ad0ea17f204e2e9fa2a514a06af9c2b91b7bfb0b8b8362ba2d44b53aad52fd88d506682f1f61b9fe6c19d206e  deviceinfo
+131bddf782050fd8301ebd242a5b19cd70c520f03fe2e8a2f0b7afba60cc3dc0330f3765395de70553fc172a116a02a9512c3fc189303cb09609e4adac76a799  deviceinfo
 "
@@ -20,7 +20,6 @@ deviceinfo_flash_method="fastboot"
 deviceinfo_kernel_cmdline="console=ttyHSL0,115200,n8 androidboot.console=ttyHSL0 androidboot.hardware=qcom msm_rtb.filter=0x237 ehci-hcd.park=3 androidboot.bootdevice=7824900.sdhci lpm_levels.sleep_disabled=1 earlyprintk androidboot.bootloader=L1BGC0C0BG00"
 deviceinfo_generate_bootimg="true"
 deviceinfo_bootimg_qcdt="false"
-deviceinfo_bootimg_mtk_mkimage="false"
 deviceinfo_bootimg_dtb_second="false"
 deviceinfo_flash_offset_base="0x80000000"
 deviceinfo_flash_offset_kernel="0x00008000"
@@ -1,3 +1,4 @@
+# Archived: unmaintained port, only for testing. Use generic/mainline port (qcom-msm8953)
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-lenovo-kuntao
 pkgdesc="Lenovo P2"
@@ -1,5 +1,5 @@
 # Reference: <https://postmarketos.org/devicepkg>
-# Maintainer: Clayton Craft <clayton@craftyguy.net>
+# Archived: Not actively maintained, hw is very rare/unlikely to be used by anyone, and port is outdated/broken
 pkgname=device-purism-librem5dev
 pkgdesc="Purism Librem 5 Devkit"
 pkgver=2
@@ -3,7 +3,7 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-samsung-coreprimevelte-downstream
 pkgdesc="Samsung Galaxy Core Prime VE LTE downstream"
-pkgver=2
+pkgver=3
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -24,6 +24,6 @@ package() {
 }

 sha512sums="
-ec654952ea328489ced4268a78272977cca1a9356d86ea9794f5a0aa9387d7daeb1125419388a4ade0ea86cc6893178601eb7aa18a5886970a775e5ad78a59ba  deviceinfo
+00c8780dbc77e62e7d57a2b3e879881076204f3e58d50555778aa68feb0157f5b4207fdabbb4627888eeeda6a35182e8e199e49e4050244a60ce4e9e2d84bd99  deviceinfo
 4854cc57b86e1199dbc165110514e672dabf45044fe9f7ebbde5b2b24768fb5497273b5f38612cf2dfeffc9bf0648c725114b4fa01165bf7fb02f7d741ee5806  90-coreprimevelte.conf
 "
@@ -20,7 +20,6 @@ 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=4
+pkgver=5
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -39,6 +39,6 @@ nonfree_firmware() {
 }

 sha512sums="
-8e72ed82c9cfa5e1a95aa480392264a69a9fe5a6e0b3e40dde4fdd7ca157b20ea673d2183fc02d0e98d4971a94fc625c0df6a8065527173d1653b1c90d1ed232  deviceinfo
+e43ad5a25aa5b0c499a8f7001feb236e428a185df0e51bf0b72f82550965e3050d10f8a4e6b0f92b11feec6f4bee734fac78bcbe8f55d8290d2544bd7ec3e811  deviceinfo
 1376f0eb7c6ba459ca5c44b3eb7e9919d9c5f48d71ec30c006d1b4843e31cdade9f980415a166e977b2567b26f4e87d4554ee1143fdc62453d60a93bed129d06  90-android-touch-dev.rules
 "
@@ -21,7 +21,6 @@ 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=1
-pkgrel=1
+pkgver=2
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -52,7 +52,7 @@ lightdm() {
 }

 sha512sums="
-d342e7d79922d2e4a313e6c0ad20172e841886aa9517522460699da0dc66cd83cfeab986e468b0427ebcd64d54ffbc39cf3ba56c5d839b560e34cbe6e36526f1  deviceinfo
+eb8a2cfc57044f901b3ce75eda0001b58d5132ea52155d5e4bfa7361c1a19021759c0182c5ac01100145902dbebaaaf7965ded45487c6b4d0860a7d799d4cf94  deviceinfo
 baee319b6d2f49a15680b0f322ec3e398a071d73fbf7713d14f26a1d027f8950457a482ac3f019605af3dfcf25bbb33ebaa0ffde181f7f96d911d56251c81eef  lightdm.conf
 efbe3d6217854c0131e61f9f3722100d349cb0673f4923bc3d56dae30a6346b0c33e676a39fc4c080150f6ea9457bf268abf870eea916a7d5daae1a22642a2b8  mount-efs.rc-init
 3e5bb764529010d2b6b1f2759a7799f665d140aebcee2dd63433e68cd4282e09b5d3b34fb7c21e737595b406501e7f02ece4592651c60e4c2b9419de4aedb438  samsungipcd.rc-conf
@@ -21,7 +21,6 @@ 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=1
+pkgver=2
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -25,5 +25,5 @@ package() {
 }

 sha512sums="
-ee52ac16542a599f397fba5ddbb82028d666dec7f509a4b9298df248ac98a129c7f2eb4452282c5de38f7f97516da6ba70ea027a0fea075881f6a7f5d2ca10c7  deviceinfo
+f71fef16c5a10a49b5ff56971a50224bc4a3c59075276ce2c4fc4f94307d3e39e006942d9f5fe4711058b0ce83b1df44e491efb9b67781662e042878556fe03d  deviceinfo
 "
@@ -22,7 +22,6 @@ 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"
@@ -1,4 +1,4 @@
-# Maintainer: Alejandro Tafalla <alikates@dnyon.com>
+# Archived: unmaintained port, only for testing. Use generic/mainline port (qcom-msm8953)
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-xiaomi-daisy
 pkgdesc="Xiaomi Mi A2 Lite"
@@ -1,4 +1,4 @@
-# Maintainer: Victor Pavlov (vipaoL) <vipaolmail@gmail.com>
+# Archived: unmaintained port, only for testing. Use generic/mainline port (qcom-msm8953)
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-xiaomi-markw
 pkgdesc="Xiaomi Redmi 4 Prime"
@@ -1,4 +1,4 @@
-# Maintainer: Barnabas Czeman <trabarni@gmail.com>
+# Archived: unmaintained port, only for testing. Use generic/mainline port (qcom-msm8953)
 pkgname=device-xiaomi-mido
 pkgdesc="Xiaomi Redmi Note 4X"
 pkgver=9
@@ -1,4 +1,4 @@
-# Maintainer: Barnabas Czeman <trabarni@gmail.com>
+# Archived: unmaintained port, only for testing. Use generic/mainline port (qcom-msm8953)
 # Reference: <https://postmarketos.org/devicepkg>

 pkgname=device-xiaomi-onclite
@@ -1,4 +1,4 @@
-# Maintainer: Barnabas Czeman <trabarni@gmail.com>
+# Archived: unmaintained port, only for testing. Use generic/mainline port (qcom-msm8953)
 # Reference: <https://postmarketos.org/devicepkg>

 pkgname=device-xiaomi-rosy
@@ -1,5 +1,4 @@
-# Maintainer: Danila Tikhonov (JIaxyga) <danila@jiaxyga.com>
-# Co-Maintainer: Barnabas Czeman <trabarni@gmail.com>
+# Archived: unmaintained port, only for testing. Use generic/mainline port (qcom-msm8953)
 # Reference: <https://postmarketos.org/devicepkg>

 pkgname=device-xiaomi-tissot
@@ -1,4 +1,4 @@
-# Maintainer: m0rf30 <morf3089@gmail.com>
+# Archived: unmaintained port, only for testing. Use generic/mainline port (qcom-msm8953)
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-xiaomi-vince
 pkgdesc="Xiaomi Redmi 5 Plus"
@@ -2,8 +2,8 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-xiaomi-wt88047-downstream
 pkgdesc="Xiaomi Redmi 2 (Downstream)"
-pkgver=1
-pkgrel=3
+pkgver=2
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
@@ -21,5 +21,5 @@ package() {
 }

 sha512sums="
-30d1e79a3cafe22a307ace6a4897077e21e93a3433a8c2c636368fb037328d82a22009f6631c8c74481fe030fff9fef846b90a93ecadbc44484558ceb1a4b78f  deviceinfo
+2b101a3143cf3201bb20e8896ecf432bb4b7e6127eb82dd598f9e225338f7b510fe6658701656a5eed5969d691ff699424bda5f27b8a112115f3ab7e33439a68  deviceinfo
 "
@@ -21,7 +21,6 @@ deviceinfo_flash_method="fastboot"
 deviceinfo_kernel_cmdline="console=ttyHSL0,115200,n8 androidboot.console=ttyHSL0 androidboot.hardware=qcom msm_rtb.filter=0x237 ehci-hcd.park=3 androidboot.bootdevice=7824900.sdhci lpm_levels.sleep_disabled=1 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"
@@ -1,4 +1,4 @@
-# Maintainer: Barnabas Czeman <trabarni@gmail.com>
+# Archived: unmaintained port, only for testing. Use generic/mainline port (qcom-msm8953)
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-xiaomi-ysl
 pkgdesc="Xiaomi Redmi S2/Y2"
@@ -1,4 +1,4 @@
-# Maintainer: Alejandro Tafalla <alikates@dnyon.com>
+# Archived: unmaintained port, only for testing. Use generic/mainline port (qcom-msm8953)
 pkgname=firmware-xiaomi-daisy
 pkgver=2
 pkgrel=2
@@ -1,5 +1,4 @@
-# Maintainer: vipaoL <vipaolmail@gmail.com>
-
+# Archived: unmaintained port, only for testing. Use generic/mainline port (qcom-msm8953)
 pkgname=firmware-xiaomi-markw
 pkgver=2
 pkgrel=2
@@ -1,4 +1,4 @@
-# Maintainer: Barnabas Czeman <trabarni@gmail.com>
+# Archived: unmaintained port, only for testing. Use generic/mainline port (qcom-msm8953)
 pkgname=firmware-xiaomi-mido
 pkgver=3
 pkgrel=1
@@ -1,4 +1,4 @@
-# Maintainer: Barnabas Czeman <trabarni@gmail.com>
+# Archived: unmaintained port, only for testing. Use generic/mainline port (qcom-msm8953)
 pkgname=firmware-xiaomi-onclite
 pkgver=2
 pkgrel=2
@@ -1,4 +1,4 @@
-# Maintainer: Barnabas Czeman <trabarni@gmail.com>
+# Archived: unmaintained port, only for testing. Use generic/mainline port (qcom-msm8953)
 pkgname=firmware-xiaomi-rosy
 pkgver=1
 pkgrel=1
@@ -1,6 +1,4 @@
-# Maintainer: Danila Tikhonov (JIaxyga) <danila@jiaxyga.com>
-# Co-Maintainer: Barnabas Czeman <trabarni@gmail.com>
-
+# Archived: unmaintained port, only for testing. Use generic/mainline port (qcom-msm8953)
 pkgname=firmware-xiaomi-tissot
 pkgver=2
 pkgrel=2
@@ -1,4 +1,4 @@
-# Maintainer: m0rf30 <morf3089@gmail.com>
+# Archived: unmaintained port, only for testing. Use generic/mainline port (qcom-msm8953)
 pkgname=firmware-xiaomi-vince
 pkgver=4
 pkgrel=2
@@ -1,4 +1,4 @@
-# Maintainer: Barnabas Czeman <trabarni@gmail.com>
+# Archived: unmaintained port, only for testing. Use generic/mainline port (qcom-msm8953)
 pkgname=firmware-xiaomi-ysl
 pkgver=3
 pkgrel=2
@@ -0,0 +1,26 @@
+# Maintainer: Danila Tikhonov <danila@jiaxyga.com>
+# Co-Maintainer: Jens Reidel <adrian@travitia.xyz>
+
+pkgname=alsa-ucm-conf-qcom-sm7150
+pkgver=1.2.11_git20240810
+pkgrel=0
+pkgdesc="ALSA UCM configuration for SM7150 devices"
+url="https://github.com/sm7150-mainline/alsa-ucm-conf"
+arch="aarch64"
+license="BSD-3-Clause"
+provides="alsa-ucm-conf"
+provider_priority=1
+_commit="dedbb209ed983a869b7aaceb883f8896c82d2296"
+source="$pkgname-$_commit.tar.gz::https://github.com/sm7150-mainline/alsa-ucm-conf/archive/$_commit.tar.gz"
+options="!check"
+builddir="$srcdir/alsa-ucm-conf-$_commit"
+
+package() {
+	# install audio config files
+	mkdir -p "$pkgdir"/usr/share/alsa
+	cp -r ucm2 "$pkgdir"/usr/share/alsa/
+}
+
+sha512sums="
+4c873c3e5b372f7075a38b8fd33723b47cf0ed2013b5ddccec64a4edc587d2f121eb80b930fa6d1ce98dd9ad55043eb1e3e152f1451f4491bc667353548acee7  alsa-ucm-conf-qcom-sm7150-dedbb209ed983a869b7aaceb883f8896c82d2296.tar.gz
+"
@@ -0,0 +1,27 @@
+# Maintainer: Caleb Connolly (kalube) <caleb@connolly.tech>
+# Co-Maintainer: Joel Selvaraj <joelselvaraj.oss@gmail.com>
+pkgname=alsa-ucm-conf-sdm845
+pkgver=1
+pkgrel=0
+pkgdesc="ALSA UCM configuration for Qualcomm SDM845 devices"
+url="https://postmarketos.org"
+arch="aarch64"
+license="BSD-3-Clause"
+provides="alsa-ucm-conf"
+provider_priority=1
+replaces="soc-qcom-sdm845-ucm"
+_commit="70d89261a7d30273fba9c6e67a072699f9f88151"
+source="$pkgname-$_commit.tar.gz::https://gitlab.com/sdm845-mainline/alsa-ucm-conf/-/archive/$_commit/alsa-ucm-conf-$_commit.tar.gz"
+options="!check"
+builddir="$srcdir/$pkgname-$_commit"
+
+package() {
+	# install audio config files
+	mkdir -p "$pkgdir"/usr/share/alsa
+	cp -r "$srcdir/alsa-ucm-conf-$_commit"/ucm2 \
+		"$pkgdir"/usr/share/alsa/
+}
+
+sha512sums="
+f6d03f3b03f944b29b588464e2e26f4f4cc185368714f9e623c1211174ea172efb81a765980c9a289112f5bf8c5c4aafdfd87c0094890069fc3d7c73b29456bc  alsa-ucm-conf-sdm845-70d89261a7d30273fba9c6e67a072699f9f88151.tar.gz
+"
@@ -2,7 +2,7 @@
 # Maintainer: Luca Weiss <luca@lucaweiss.eu>
 pkgname=device-fairphone-fp4
 pkgdesc="Fairphone 4"
-pkgver=3
+pkgver=4
 pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
@@ -19,7 +19,7 @@ depends="
 	firmware-fairphone-fp4-modem
 	firmware-fairphone-fp4-wlan
 	firmware-qcom-adreno-a630
-	hexagonrpcd
+	hexagonrpcd>=0.3.2-r3
 	hexagonrpcd-openrc
 	linux-firmware-ath10k
 	linux-postmarketos-qcom-sm6350
@@ -38,7 +38,6 @@ depends="
 	tqftpserv-openrc
 "
 makedepends="devicepkg-dev"
-replaces="hexagonrpcd-openrc"
 subpackages="$pkgname-openrc"
 source="
 	81-libssc-fairphone-fp4.rules
@@ -60,12 +59,13 @@ package() {
 	install -Dm644 "$srcdir"/90-feedbackd-aw8695.rules \
 		"$pkgdir"/usr/lib/udev/rules.d/90-feedbackd-aw8695.rules
 	install -Dm644 "$srcdir"/hexagonrpcd.confd \
-		"$pkgdir"/etc/conf.d/hexagonrpcd-adsp-sensorspd
+		"$pkgdir"/usr/share/hexagonrpcd/hexagonrpcd-adsp-sensorspd.conf
 }

 openrc() {
 	install_if="$pkgname=$pkgver-r$pkgrel openrc"
 	install="$subpkgname.post-install $subpkgname.post-upgrade"
+	depends="hexagonrpcd-openrc"

 	mkdir -p "$subpkgdir"
 }
@@ -73,7 +73,7 @@ openrc() {
 sha512sums="
 2c16ba75e0077b2b1eaefa4c73b287475505a1aeb291ec29316d41cc094277320f9d2aaabfd91eb1dc0f488ab2d61a94faef16e7afe0f1e226779113761b9a37  81-libssc-fairphone-fp4.rules
 2974ccc172bf1299daeb0bc746879b3a1db1fbc3a2b163a02a6554fed6ed9f733144bcf976cd2441c5664d496dcce3ae943f4314c653470dc07dda0de5ad632b  90-feedbackd-aw8695.rules
-9549f105f865d230e7b67819c96b7e06a5ed4d5808f083099a408934ffbacdb412984b861f6756fa4fde94b51e6a268b8d2ce9fed6f13ee3e8041bb96492310a  deviceinfo
+97629090e9d08391ec9ee9f84cf40b9710c9dffc09609f056a27869acc8f87e176765f6e8f9800ef29872df8f48a2e085eeaaaf69f38f8a97ecb1d19ac9c79eb  deviceinfo
 6a3d620f2cc60308a62ff651ffb00a5ee1f092131cca9d33b6afd61c8a372a3fd7d46540162213593107e0943b33f3f0119d003d43dcd06dbde757390a6c1729  hexagonrpcd.confd
 52bb7ed829caa4dcff9728bd6e3cdf118b3c7ee7dfe90df0d4e6422dd67bf3258ae2a4d2dc7599da4182fbd8eb47a0e1d20c58198dc17f2bf178b8f01a8887f7  modules-initfs
 "
@@ -26,7 +26,6 @@ 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 @@
 # Co-Maintainer: Oliver Smith <ollieparanoid@postmarketos.org>
 pkgname=device-generic-x86_64
 pkgdesc="Generic x86_64 system, with EFI"
-pkgver=16
-pkgrel=0
+pkgver=17
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="x86_64"
@@ -12,6 +12,7 @@ depends="
 	alsa-ucm-conf
 	postmarketos-base
 	systemd-boot
+	unl0kr-fbforcerefresh
 "
 makedepends="devicepkg-dev"
 source="
@@ -70,6 +71,6 @@ kernel_lts() {

 sha512sums="
 e9dfcd70ccfb9a0fdaa0cdc52faf3be96d6de8af8c60a758bb703c515b0648cec4552e0eaf56e5168b0004cd3fc4b28118abb05dad2c581d3579a2e9134862cb  deviceinfo
-e464ef0ad4a4c34d2d53f69c4612b612ea878a77c9efdef69b0f842edf701036c8218809fd63aac286d6a08ae07f39e568199fc3e38d145e716c1723e7215019  modules-initfs
+7f0e1dab2eaf0616220a06a658245a297f2627f1b6a492ccf3bb9922c5b40aa6fd320c4ec5f909557bfc9b38985ef6bc58a67dd87fc46e0d9d35addbcfb2683d  modules-initfs
 9599a10679a43929e4ed2ea22269a0716219163817574d48db4dc1cb21a0fcf17ea54d77d5fd8efd034905c421ecb3eaa600a72927d683983ce48d1159329881  30-gpu-i915-firmware.files
 "
@@ -12,6 +12,7 @@ mbcache
 mmc_block
 mmc_core
 nvme
+psmouse
 scsi_mod
 sd
 sd_mod
@@ -3,7 +3,7 @@
 pkgname=device-google-gru
 pkgdesc="Google Gru Chromebooks"
 pkgver=8
-pkgrel=0
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -11,14 +11,13 @@ options="!check !archcheck"
 depends="
 	alsa-ucm-conf-google-gru
 	depthcharge-tools
-	eudev-hwids>=3.2.12-r0
 	linux-postmarketos-rockchip
 	postmarketos-base
 	postmarketos-cros-common
 	soc-rockchip-rk3399
 "
 makedepends="devicepkg-dev"
-subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
+subpackages="$pkgname-nonfree-firmware:nonfree_firmware $pkgname-openrc"
 source="deviceinfo modules-initfs"

 # provides and replaces to switch old installations to this package
@@ -51,6 +50,11 @@ nonfree_firmware() {
 	mkdir "$subpkgdir"
 }

+openrc() {
+	install_if="$pkgname=$pkgvar-r$pkgrel openrc"
+	depends="eudev-hwids>=3.2.12-r0"
+	mkdir "$subpkgdir"
+}

 sha512sums="
 d0d5e47e7bc6f63f92669a315611c36972e2f06a32c1339ac551f23db023331fb6e1cdbbe4dc2022596aaf8083967951c43585a3aa32c4fddc8d8987bc20c092  deviceinfo
@@ -2,90 +2,78 @@
 # Maintainer: Richard Acayan <mailingradian@gmail.com>
 pkgname=device-google-sargo
 pkgdesc="Google Pixel 3a"
-pkgver=6
-pkgrel=5
+pkgver=9
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
 options="!check !archcheck"
 depends="
 	alsa-ucm-conf-qcom-sdm670
+	firmware-google-sargo
+	hexagonrpcd
+	linux-firmware-ath10k
+	linux-firmware-qca
+	linux-firmware-qcom
 	linux-postmarketos-qcom-sdm670
 	make-dynpart-mappings
 	mkbootimg
 	postmarketos-base
-	soc-qcom-sdm845
-	soc-qcom-sdm845-qbootctl
+	soc-qcom
+	soc-qcom-modem
+	soc-qcom-qbootctl
+	unl0kr-fbforcerefresh
 "
 makedepends="devicepkg-dev"
 source="
-	10-unl0kr-msm.conf
 	81-libssc-google-sargo.rules
 	90-feedbackd-drv2624.rules
 	deviceinfo
-	hexagonrpcd-adsp-sensorspd.confd
+	hexagonrpcd.confd
 	modules-initfs
 	no-hexagonrpcd-on-suspend.sh
 	q6voiced.conf
 "
-subpackages="
-	$pkgname-nonfree-firmware:nonfree_firmware
-	$pkgname-nonfree-firmware-openrc:nonfree_firmware_openrc
-	"
+subpackages="$pkgname-openrc"

 build() {
 	devicepkg_build $startdir $pkgname
 }

 package() {
+	replaces="$pkgname-nonfree-firmware"
 	devicepkg_package $startdir $pkgname

 	install -Dm644 "$srcdir"/90-feedbackd-drv2624.rules \
 		-t "$pkgdir"/usr/lib/udev/rules.d
-	install -Dm644 "$srcdir"/10-unl0kr-msm.conf \
-		"$pkgdir"/etc/unl0kr.conf.d/10-unl0kr-msm.conf
-}
-
-nonfree_firmware() {
-	pkgdesc="Proprietary firmware blobs for the Google Pixel 3a"
-	depends="
-		firmware-google-sargo
-		hexagonrpcd
-		linux-firmware-ath10k
-		linux-firmware-qca
-		linux-firmware-qcom
-		soc-qcom-sdm845-modem
-		soc-qcom-sdm845-nonfree-firmware
-	"
 	# Sensors depend on ADSP firmware and the sensors registry served over FastRPC.
+	install -Dm644 "$srcdir"/hexagonrpcd.confd \
+		"$pkgdir"/usr/share/hexagonrpcd/hexagonrpcd-adsp-sensorspd.conf
 	install -Dm644 "$srcdir"/81-libssc-google-sargo.rules \
-		"$subpkgdir"/usr/lib/udev/rules.d/81-libssc-google-sargo.rules
+		"$pkgdir"/usr/lib/udev/rules.d/81-libssc-google-sargo.rules
+
+	# The q6voiced configuration can only be used if the ADSP is brought up
+	# via non-free firmware.
+	install -Dm644 "$srcdir"/q6voiced.conf "$pkgdir"/etc/conf.d/q6voiced
 }

-nonfree_firmware_openrc() {
-	replaces="hexagonrpcd-openrc"
-	install_if="$pkgname-nonfree-firmware=$pkgver-r$pkgrel openrc"
+openrc() {
+	install_if="$pkgname=$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"
+	depends="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
-	# The q6voiced configuration can only be used if the ADSP is brought up
-	# via non-free firmware.
-	install -Dm644 "$srcdir"/q6voiced.conf "$subpkgdir"/etc/conf.d/q6voiced
-	# Sensors depend on ADSP firmware and the sensors registry served over FastRPC.
-	install -Dm644 "$srcdir"/hexagonrpcd-adsp-sensorspd.confd \
-		"$subpkgdir"/etc/conf.d/hexagonrpcd-adsp-sensorspd
 }

 sha512sums="
-f700af3145b79d1ef9edfb22982899b25cabfb212f9620dcbd3a2e6f44b5ad591e0a66056c6fcd66c3fde89a2b5f551e8a8fe2e65cf0e2a48adec57c027d7825  10-unl0kr-msm.conf
 089ce0acba4e1d789e337bedfca7570796a6416e7230ae9b8fc6b625747a40dbb064b1a707877cd6b7bdc73844c6571316e2ec0746a77060f13d98c52fdbfc00  81-libssc-google-sargo.rules
 016d398155f2344417f5e5649a361719ba6e53e593c501b5df39114cdd284302b9bf8686a39817aee0c08fec95b3ab613c181d6cc9596299aaf7fd05dbe0c3dd  90-feedbackd-drv2624.rules
-8af19da4e4a4a59c49263722065229fae849c3273af313300b7ea1b8fe008c6e55cfd060b91909306dd600134e2494f740adda245707dbcff84b1ab2f37dbde7  deviceinfo
-b6208c254b6e44ac4f6d748a38cc6b05da0db2c90235ada2011b138b82ccc3372687df2f5ad97e885e9eea135216a3c52266a08a7f4eb323e62e799f6f82ec7b  hexagonrpcd-adsp-sensorspd.confd
+ad032b1a35cfcd4fc0c8df988430ee97b711e785b86cca68b7552b23a9a2e2b6b97c327e3415a575db47ad6c1f86ded18df5553acaae63010057d89b8c16135e  deviceinfo
+b6208c254b6e44ac4f6d748a38cc6b05da0db2c90235ada2011b138b82ccc3372687df2f5ad97e885e9eea135216a3c52266a08a7f4eb323e62e799f6f82ec7b  hexagonrpcd.confd
 3213a3586c25cef843a47e2446179ff73acad6421826a64bedb6b9800d30673503d0ea6b3fcc8cfbdcdcaf0926755a489323fce9d14d4411799e6988144b3518  modules-initfs
 2972005a9cf6ca57061965075593dddfa8ee479bc6c21cd41851b1a14768cb1cddbd31a17975ae17adc36d40d294ccbc6bf83defbd69fc7b363f638d8564fbbc  no-hexagonrpcd-on-suspend.sh
 3a4a9322839d4b3ef9d79668a37840a9f444954759ae3c512e694051d2f9a2573db42ad6c4c1a5c75eeb861232a27ba1a8cef9b503decd54ead25a96e3dd6f98  q6voiced.conf
@@ -22,7 +22,6 @@ 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"
@@ -3,7 +3,7 @@
 pkgname=device-google-trogdor
 pkgdesc="Google Trogdor Chromebooks"
 pkgver=4
-pkgrel=0
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -11,7 +11,6 @@ options="!check !archcheck"
 depends="
 	alsa-ucm-conf
 	depthcharge-tools
-	eudev-hwids
 	linux-postmarketos-qcom-sc7180
 	postmarketos-base
 	postmarketos-cros-common
@@ -42,6 +41,11 @@ nonfree_firmware() {
 	mkdir "$subpkgdir"
 }

+openrc() {
+	install_if="$pkgname=$pkgver-r$pkgrel openrc"
+	depends="eudev-hwids"
+	mkdir "$subpkgdir"
+}

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


 sha512sums="
-abeebda841ae33d50008b891b4a29ccf4a7cf7be240b5913b701409e8621aa7210f685543b8ab7a9778b311359a197b4429af2b559716fa130d3af8447bef61d  deviceinfo
+d6a214d98ef6502ebed97dd2b774d9d7de1ac969d6d17513f413234e9698bd860248345520eb15f6b54fb0e06a793ba974f8548d397c9a72db31ecd506038008  deviceinfo
 be3e804fa538d9d377c637094dcf95e503e8a156fa71676a9e78abc0e290595dfdaa70b5642df721ebcdd3daa04d14e0c61d9bab6f78cb1dbd669404abc3a56d  modules-initfs
 "
@@ -27,3 +27,4 @@ deviceinfo_cgpt_kpart_size="32768"
 deviceinfo_depthcharge_board="veyron"
 deviceinfo_generate_depthcharge_image="true"
 deviceinfo_generate_extlinux_config="true"
+deviceinfo_create_initfs_extra="true"
@@ -4,7 +4,7 @@
 # Co-Maintainer: Jenneron <jenneron@protonmail.com>
 pkgname=device-google-x64cros
 pkgdesc="Google Chromebooks with x64 CPU"
-pkgver=11
+pkgver=12
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -81,5 +81,5 @@ sha512sums="
 38c53d91a60d0402d4cc5428d65e1e8c26360c481c70b34593b1812c87241c32e91904a3bd31fbfe507f7fdb8b50c909eaad8c4c3a37ca962760567329f7f6ee  00-amdgpu-firmware.files
 c17f5c505e0e280a9e51ac1b4264e7703b744fd3831d75ce95f41be4755ae4ccd24b7ca09ba1e236df499a5e748c64a0d2054c9d55d8c8c713fa8c5646ed9a3c  00-i915-firmware.files
 514ff5c946633dccaa569fed51743c669ea9942af4dd891ad001ba08bba07fca92503e29304f3eb71c16bc2f2436e1879ff0bf56d99666e4dcf9635c8605da2e  deviceinfo
-1b3bbfcdc6642488304653aef996dddf7a354e7279f2c735ac7aec404e598948423630fcaa2cac87e2c0aef033ecfc57a7a91154f9dac9a85411db7bad62e677  modules-initfs
+a6e5a9de9fe010966523606f2fcab1c44004228b4e050f777dcb1160fb3e32cda8096925543522216c2eb354f8ce2f8d4e206d98b077fbd6fb840de94e84c706  modules-initfs
 "
@@ -16,3 +16,5 @@ xhci_pci
 ehci_pci
 sdhci_pci
 mmc_block
+nvme
+nvme_core
@@ -2,7 +2,7 @@
 # Maintainer: Sicelo <absicsz@gmail.com>
 # Co-Maintainer: Danct12 <danct12@disroot.org>
 pkgname=device-nokia-n900
-pkgver=37
+pkgver=41
 pkgrel=0
 pkgdesc="Nokia N900"
 url="https://postmarketos.org"
@@ -10,6 +10,7 @@ arch="armv7"
 license="MIT"
 depends="
 	alsa-utils
+	evtest
 	kbd
 	kbd-bkeymaps
 	linux-firmware-ti-connectivity
@@ -43,9 +44,9 @@ source="
 	device-nokia-n900.start
 	deviceinfo
 	modules-initfs
+	i3wm/config-checker
 	i3wm/i3blocks.conf
 	i3wm/i3wm.conf
-	i3wm/protip_shell.sh
 	i3wm/scripts/battery-bq27200
 	i3wm/scripts/calendar
 	i3wm/scripts/ofono
@@ -69,8 +70,8 @@ source="
 	udev/90-touchscreen-dev.rules
 	upower.conf
 	x11-keymap
-	xdefaults
 	xorg.conf
+	xresources
 "
 options="!check !archcheck"

@@ -148,7 +149,7 @@ package() {

 x11() {
 	install_if="$pkgname=$pkgver-r$pkgrel xorg-server"
-	depends="xset xinput scrot"
+	depends="xset xinput scrot xrdb"
 	mkdir "$pkgdir"/etc/acpi
 	install -D -m755 "$srcdir"/acpi_handler.sh \
 		"$pkgdir"/etc/acpi/handler.sh
@@ -159,11 +160,11 @@ x11() {
 	install -D -m644 "$srcdir"/xorg.conf \
 		"$subpkgdir"/etc/X11/xorg.conf.d/11-n900.conf
 	install -Dm755 "$srcdir"/lock.sh \
-		"$pkgdir"/usr/bin/lock.sh
+		"$subpkgdir"/usr/bin/lock.sh
 	install -Dm755 "$srcdir"/proxishot.sh \
-		"$pkgdir"/usr/bin/proxishot.sh
-	install -D -m644 "$srcdir"/xdefaults \
-		"$subpkgdir"/etc/skel/.Xdefaults
+		"$subpkgdir"/usr/bin/proxishot.sh
+	install -Dm644 "$srcdir"/xresources \
+		"$subpkgdir"/usr/share/X11/Xresources-mobile
 }

 xkeyboard_config() {
@@ -177,19 +178,19 @@ i3wm() {
 	install_if="$pkgname=$pkgver-r$pkgrel postmarketos-ui-i3wm"
 	depends="unclutter-xfixes i3blocks rxvt-unicode upower brightnessctl"
 	install -D -m644 "$srcdir"/i3wm.conf \
-		"$subpkgdir"/etc/skel/.config/i3/config
+		"$subpkgdir"/etc/xdg/i3/config
 	install -D -m644 "$srcdir"/i3blocks.conf \
-		"$subpkgdir"/etc/skel/.config/i3blocks/config
+		"$subpkgdir"/etc/xdg/i3blocks/config
 	install -D -m755 "$srcdir"/battery-bq27200 \
-		"$subpkgdir"/etc/skel/.config/i3blocks/battery-bq27200
+		"$subpkgdir"/usr/share/i3blocks/battery-bq27200
 	install -D -m755 "$srcdir"/ofono \
-		"$subpkgdir"/etc/skel/.config/i3blocks/ofono
+		"$subpkgdir"/usr/share/i3blocks/ofono
 	install -D -m755 "$srcdir"/calendar \
-		"$subpkgdir"/etc/skel/.config/i3blocks/calendar
+		"$subpkgdir"/usr/share/i3blocks/calendar
 	install -D -m755 "$srcdir"/wifi \
-		"$subpkgdir"/etc/skel/.config/i3blocks/wifi
-	install -D -m755 "$srcdir"/protip_shell.sh \
-		"$subpkgdir"/etc/skel/.protip_shell.sh
+		"$subpkgdir"/usr/share/i3blocks/wifi
+	install -D -m755 "$srcdir"/config-checker \
+		"$subpkgdir"/usr/bin/i3-config-checker
 }

 upower() {
@@ -217,11 +218,11 @@ ff51909873160c2d4c6f0c0119b6d4a02751df29f571b8596b4bc8b04ce2541913c11a583b0e5dab
 344ec50cee2a4d864debad12810a83070ab8257f9f07dcfa9be3eea1d8b26f3ab4fbe322fe05a384152b40fc5e1481df51d191624c7062186dd70f95a0784ea8  bq27k-options.conf
 c5b8e03ca9f720a794f2593a3e938640cbd91ac44dd761079bbf4614a0d288a9d7b72de8ed2493c062dc9f37be580bea529f454d2335f55b7a9f4d14024b42a9  bq27k-monitor.sh
 e6bbac8de1a198ba716f44ade76606e1e0adcc574156b855ac41be5eb5308389d3277fd89cc34b119fbc33d9801ab9f79a6ff213392596bff40bc17e931c05ef  device-nokia-n900.start
-40aaeb44941a988ab8ec58d331bc6cd42c4a23c6b6e8fc302f9216a38b46baab38d0a0137606a5b7959a51326983c03d684615c5ba9c58b0e36314ec8c49cfbb  deviceinfo
+34b41ddd4d0312cc632087d19ca881f7c75b885e3e977add1b20ad414901f075f3fca12bdfe2ba9b3f24baf1e99f8279f61887db4c4b70b4cb4bac76f358bc99  deviceinfo
 f48b8dd7297d03008f73e1ecd55b77ace535ecb03f9bdf021123b96fb5f4fb491ff4c532e226b835c8118fa8d505cc4c635a2b604a3e42a162746021552a551c  modules-initfs
-826a3790b49324c1e61c75b6c0ffc043a2a1d7c13a8c554fb5eae4977af47a1ca93d70ef8c783d712b953b70e18ae58fa4c6a49bf97263398a01a0c4f91ebc8f  i3blocks.conf
-506accabcf9fb3e2a270228ea53fdcb57f51092d6e7126a631af8eed697cd882cc805b19cf255422284bec12c928b58219d173a4a790d784db5335a059b6bb4f  i3wm.conf
-0b80af9fd1f36e6bc06bdfdf48352897234ac7457210649016665da8570a5a64b8a0841b4fbeb64fd7054a5246a64718cf4412f8a53024ce39b28a80984972d8  protip_shell.sh
+d7d1599a9952fd02d3cfbeaa6b3307251e765f98a9eb723237c94f585831cc8f11d9d30dbc0352e3b008224dec12b820cf86fa28a5e5ac303cfd03d80b8872f5  config-checker
+a8152e94262629e11abdd8809d187c3b7ed1866a6128fb1f435e17e72120536ac8114262e66df6decb2627743027f2b923ddbe8a94e3e844099b6fad02ec252b  i3blocks.conf
+26261d6291c4cc476a36a11291a3676413ecc4fc6ee76394fead14e0c8955d28e782d4a26180034637fcf176c41f8a345886daf242eebf7e91dfd6a4bd29edbe  i3wm.conf
 6c6a70667f37807089adbb343c09d1f62d47b8e6c9c0a54f44790b822f8bff3dccae73341ef736b799fd6740bbd6e1f48e6e122c2e08520f71f6ad7434a47d2c  battery-bq27200
 d9ef88c714e9fce8822f63b7a9d7fc3e1ed472c8c876b44ba524d44efea322839f13ddd2fa652420608427ecf7279bfaac302c9b67667f32796ca21da332164d  calendar
 82038d38f94cb975a8d38914afca49b64957446bef7490ab684efa1df47ede2ea1c769045789bb9fded673345eea01911fbbf85fdb54c28685cad8022bfaafac  ofono
@@ -245,6 +246,6 @@ e440ed7a3070c17e003b86b72dbe6d8194d01b577ca8dd56dd066f216b6dda32bb965c780950f178
 c6012aef28b096141b924fced226ec99fb93eb53b69c064a8887d8fecdf8dc08a3ba3db399e18d88374c6ef4c59013a30699c7e4d76e5cb771040582573a0527  90-touchscreen-dev.rules
 9b99feee42dd6bdd122769994c786d3127c41e0aa3321f19c82a9d3845cf07b522908621a31cbddd9599fe18c5c37127d9b4be4255cd7fa8e0e8983bf73eb41b  upower.conf
 c7837e6688f09c7d650ac7479b8881d4bad709480a71a1dea8b5bba4f4215d6b48a3aebd3f58923bbd48813559478d4ef137dcc9838d321722e141f0aa6a6085  x11-keymap
-183dfdd545ba05e216209b1abe45e4af4e0ee16b2e73cff0e7ea7b9524ee35a1cf85213a77f32a1a94287aee6546885dbd71c6de1f4f1a1e2961e638ff27cdf6  xdefaults
 a91f98daa60efa2beb2ff6b405097f92edca5f1bbb9e7675499139be52ca2570712f8f06f9032ef29f636f99c8f8da8b992f746eab6424aac04260c16158bcc2  xorg.conf
+183dfdd545ba05e216209b1abe45e4af4e0ee16b2e73cff0e7ea7b9524ee35a1cf85213a77f32a1a94287aee6546885dbd71c6de1f4f1a1e2961e638ff27cdf6  xresources
 "
@@ -15,8 +15,6 @@ deviceinfo_arch="armv7"
 deviceinfo_keyboard="true"
 deviceinfo_keymaps="us/rx51_us ch/rx51_ch it/rx51_it fi/rx51_fi se/rx51_se"
 deviceinfo_external_storage="true"
-deviceinfo_screen_width="800"
-deviceinfo_screen_height="480"
 deviceinfo_swap_size_recommended="1024"

 # Bootloader related
@@ -0,0 +1,7 @@
+#!/bin/sh
+if [ ! -f "$HOME"/.config/i3/config ]; then
+    pkill -f i3-config-wizard
+    touch "$HOME"/.config/i3/config
+    pkill -f i3-config-wizard
+fi
+exit 0
@@ -1,20 +1,18 @@
-command=/usr/libexec/i3blocks/$BLOCK_NAME
-
 [battery-bq27200]
-command=~/.config/i3blocks/battery-bq27200
+command=/usr/share/i3blocks/battery-bq27200
 label=BAT:
 interval=10

 [ofono]
-command=~/.config/i3blocks/ofono
+command=/usr/share/i3blocks/ofono
 label=M:
 interval=10

 [wifi]
-command=~/.config/i3blocks/wifi
+command=/usr/share/i3blocks/wifi
 label=W:
 interval=10

 [calendar]
-command=~/.config/i3blocks/calendar
+command=/usr/share/i3blocks/calendar
 interval=10
@@ -33,7 +33,7 @@ mode "mpd" {
 }

 mode "command" {
-        bindsym t exec urxvt -e ~/.protip_shell.sh; mode "default"
+        bindsym t exec urxvt; mode "default"
        bindsym d exec dmenu_run; mode "default"
        bindsym q mode "default"
        bindsym k kill; mode "default"
@@ -89,6 +89,10 @@ bar {
        }
 }

+# ensure there is an i3 config in $HOME to prevent the wizard from trying to create one
+exec --no-startup-id i3-config-checker
+# Apply Xresources
+exec --no-startup-id xrdb -merge /usr/share/X11/Xresources-mobile
 # Hide mouse cursor
 exec --no-startup-id unclutter-xfixes --fork
 # Do not handle gpio_key events as they are handled by acpid
@@ -1,8 +0,0 @@
-#!/bin/sh
-
-(
-	green="\033[32m"
-	reset="\033[0m"
-	echo -e "${green}PROTIP:${reset} ^i (ctrl+i) does autocompletion"
-)
-exec sh
@@ -1,2 +0,0 @@
-[quirks]
-fbdev_force_refresh=true
@@ -3,65 +3,55 @@

 pkgname=device-oneplus-enchilada
 pkgdesc="OnePlus 6"
-pkgver=14
-pkgrel=3
+pkgver=15
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
 options="!check !archcheck"
 depends="
+	firmware-oneplus-sdm845>=9
+	hexagonrpcd>=0.3.2-r3
 	linux-postmarketos-qcom-sdm845
 	mkbootimg
 	postmarketos-base
-	soc-qcom-sdm845
-	soc-qcom-sdm845-ucm
-	soc-qcom-sdm845-qbootctl
+	alsa-ucm-conf-sdm845
+	soc-qcom
+	soc-qcom-modem
+	soc-qcom-qbootctl
+	unl0kr-fbforcerefresh
 "
 makedepends="devicepkg-dev"
 source="
-	10-unl0kr.conf
 	deviceinfo
 	hexagonrpcd.confd
 	modules-initfs
 	q6voiced.conf
 	81-libssc-oneplus-enchilada.rules
 "
-subpackages="
-	$pkgname-nonfree-firmware:nonfree_firmware
-	$pkgname-nonfree-firmware-openrc:nonfree_firmware_openrc
-	$pkgname-pmtest
-"
+subpackages="$pkgname-pmtest $pkgname-openrc"

 build() {
 	devicepkg_build $startdir $pkgname
 }

 package() {
+	replaces="$pkgname-nonfree-firmware"
 	devicepkg_package $startdir $pkgname

-	install -Dm644 "$srcdir"/10-unl0kr.conf \
-		"$pkgdir"/etc/unl0kr.conf.d/10-unl0kr.conf
+	install -Dm644 "$srcdir"/81-libssc-oneplus-enchilada.rules \
+		-t "$pkgdir"/usr/lib/udev/rules.d/
+	install -Dm644 "$srcdir"/q6voiced.conf \
+		"$pkgdir"/etc/conf.d/q6voiced
+	install -Dm644 "$srcdir"/hexagonrpcd.confd \
+		"$pkgdir"/usr/share/hexagonrpcd/hexagonrpcd-sdsp.conf
 }

-nonfree_firmware() {
-	pkgdesc="Modem, WiFi and GPU Firmware, also needed for osk-sdl"
-	depends="
-		firmware-oneplus-sdm845>=9
-		hexagonrpcd
-		soc-qcom-sdm845-nonfree-firmware
-		soc-qcom-sdm845-modem
-	"
-
-	install -Dm644 "$srcdir"/81-libssc-oneplus-enchilada.rules -t "$subpkgdir"/usr/lib/udev/rules.d/
-}
-
-nonfree_firmware_openrc() {
-	install_if="$pkgname-nonfree-firmware=$pkgver-r$pkgrel openrc"
-	replaces="hexagonrpcd-openrc"
+openrc() {
+	install_if="$pkgname=$pkgver-r$pkgrel 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
+	depends="hexagonrpcd-openrc"
+	mkdir -p "$subpkgdir"
 }

 pmtest() {
@@ -73,7 +63,6 @@ pmtest() {
 }

 sha512sums="
-e957b7b0ed219eaa56be6c6b976b60886f73970703fdebf045800154ee652affee4e19654b3ac4244b29bcf6760ad3db6cb87143dc9c4673e905800d751103d1  10-unl0kr.conf
 83fc698ebeda6245abc2a653eeff97b3b996d06dd7731386a07d102937f9b005c7277e0dece05ff359d9ff109a1d9ed7791fc510b146354df179804aadb5642c  deviceinfo
 c8d3026e9f803ea823e35f83dab66fa8545e99af9655576476c194567113084d78200feab46f84983a2dad608ca55c0a4a66e36406c6d64023c0aec59307d146  hexagonrpcd.confd
 ea8709aa214cffaefb1d486c0c47044537446faebff16efb3b015623f043f730b7121e401c676e43aa8868bd6c630fc8a2d7dbf5fb082490e9b5493e0405b66d  modules-initfs
@@ -1 +0,0 @@
-device-oneplus-enchilada-nonfree-firmware-openrc.post-install
@@ -0,0 +1 @@
+device-oneplus-enchilada-openrc.post-install
@@ -1,2 +0,0 @@
-[quirks]
-fbdev_force_refresh=true
@@ -3,8 +3,8 @@

 pkgname=device-oneplus-fajita
 pkgdesc="OnePlus 6T"
-pkgver=14
-pkgrel=2
+pkgver=15
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -13,13 +13,13 @@ depends="
 	linux-postmarketos-qcom-sdm845
 	mkbootimg
 	postmarketos-base
-	soc-qcom-sdm845
-	soc-qcom-sdm845-ucm
-	soc-qcom-sdm845-qbootctl
+	alsa-ucm-conf-sdm845
+	soc-qcom
+	soc-qcom-qbootctl
+	unl0kr-fbforcerefresh
 "
 makedepends="devicepkg-dev"
 source="
-	10-unl0kr.conf
 	deviceinfo
 	hexagonrpcd.confd
 	modules-initfs
@@ -39,29 +39,28 @@ build() {
 package() {
 	devicepkg_package $startdir $pkgname

-	install -Dm644 "$srcdir"/10-unl0kr.conf \
-		"$pkgdir"/etc/unl0kr.conf.d/10-unl0kr.conf
 }

 nonfree_firmware() {
 	pkgdesc="Modem, WiFi and GPU Firmware, also needed for osk-sdl"
 	depends="
 		firmware-oneplus-sdm845>=9
-		hexagonrpcd
-		soc-qcom-sdm845-nonfree-firmware
-		soc-qcom-sdm845-modem
+		hexagonrpcd>=0.3.2-r3
+		soc-qcom-modem
 	"

 	install -Dm644 "$srcdir"/81-libssc-oneplus-fajita.rules -t "$subpkgdir"/usr/lib/udev/rules.d/
+	install -Dm644 q6voiced.conf "$subpkgdir"/etc/conf.d/q6voiced
+	install -Dm644 "$srcdir"/hexagonrpcd.confd \
+		"$subpkgdir"/usr/share/hexagonrpcd/hexagonrpcd-sdsp.conf
 }

 nonfree_firmware_openrc() {
 	install_if="$pkgname-nonfree-firmware=$pkgver-r$pkgrel openrc"
 	install="$subpkgname.post-install $subpkgname.post-upgrade"
-	replaces="hexagonrpcd-openrc"
+	depends="hexagonrpcd-openrc"

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

 pmtest() {
@@ -73,7 +72,6 @@ pmtest() {
 }

 sha512sums="
-e957b7b0ed219eaa56be6c6b976b60886f73970703fdebf045800154ee652affee4e19654b3ac4244b29bcf6760ad3db6cb87143dc9c4673e905800d751103d1  10-unl0kr.conf
 07e3d79715befccd1e7393908c06f88ac8468d1ce6cb96138e3a04e6f8274889db169f5daf05b04b633bcc9e85d11ea5c2017b84bc0ae86a8fad80b05794d0d8  deviceinfo
 6b5308471fcbb938ac00d6e9a3f8e61073bda1d608f2edf1a2aba4b256dd3f76b1ccee0873dcaa8dc4a8db304d433360a56fe447d70f57ba068428b75ddea236  hexagonrpcd.confd
 ea8709aa214cffaefb1d486c0c47044537446faebff16efb3b015623f043f730b7121e401c676e43aa8868bd6c630fc8a2d7dbf5fb082490e9b5493e0405b66d  modules-initfs
@@ -3,14 +3,13 @@
 pkgname=device-pine64-pinebookpro
 pkgdesc="PINE64 Pinebook Pro"
 pkgver=16
-pkgrel=7
+pkgrel=8
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
 options="!check !archcheck"
 depends="
 	alsa-ucm-conf>=1.2.7
-	eudev-hwids
 	linux-postmarketos-rockchip>=5.14
 	nvme-cli
 	postmarketos-base>=25-r1
@@ -58,6 +57,7 @@ nonfree_firmware() {
 openrc() {
 	install_if="$pkgname=$pkgver-r$pkgrel openrc"
 	install="$subpkgname.post-install $subpkgname.post-upgrade"
+	depends="eudev-hwids"

 	mkdir -p "$subpkgdir"
 }
				`@@ -1 +0,0 @@`
				`device-oneplus-enchilada-nonfree-firmware-openrc.post-install`
				`@@ -0,0 +1 @@`
				`device-oneplus-enchilada-openrc.post-install`