kde6-rc/*: add KDE6 rc 2 packages

kde6-rc/*: add KDE6 rc 1 packages
kde6-beta/*: add KDE6 beta 2 packages
2024-02-08 16:36:14 +00:00 · 2024-02-01 17:52:58 +01:00 · 2024-02-01 17:52:58 +01:00 · 2024-02-01 17:52:58 +01:00
1944 changed files with 33728 additions and 134203 deletions
@@ -62,22 +62,16 @@ if grep -qr $POSTMARKETOS_WALLPAPER_PATH \
 	--exclude-dir='device-pine64-pinetab' \
 	--exclude-dir='device-oneplus-kebab' \
 	--exclude-dir='device-xiaomi-willow' \
+	--exclude-dir='device-nokia-n900' \
 	-- device; then
 	echo "ERROR: Please don't include configuration files that set the default wallpaper in device-specific packages!"
 	grep --color=always -r $POSTMARKETOS_WALLPAPER_PATH \
 		--exclude-dir='device-pine64-pinetab' \
 		--exclude-dir='device-oneplus-kebab' \
 		--exclude-dir='device-xiaomi-willow' \
+		--exclude-dir='device-nokia-n900' \
 		-- device
 	exit_code=1
 fi

-OPENRC_SERVICE_FILES=$(find . -name '*.initd')
-# shellcheck disable=SC2086
-if grep -q 'before wpa_supplicant' $OPENRC_SERVICE_FILES; then
-	echo "ERROR: Please use 'before wlan' in OpenRC service files! This ensures compatibility with both wpa_supplicant and iwd."
-	grep --color=always 'before wpa_supplicant' $OPENRC_SERVICE_FILES
-	exit_code=1
-fi
-
 exit "$exit_code"
@@ -16,7 +16,8 @@ import pmb.parse
 import pmb.parse.version
 import pmb.helpers.logging

-def get_package_contents(args, package, revision, check=True):
+
+def get_package_version(args, package, revision, check=True):
    # Redirect stderr to /dev/null, so git doesn't complain about files not
    # existing in upstream branch for new packages
    stderr = None
@@ -39,15 +40,6 @@ def get_package_contents(args, package, revision, check=True):
            handle.write(apkbuild_content)
        parsed = pmb.parse.apkbuild(tempdir + "/APKBUILD", False, False)

-    return parsed
-
-
-def get_package_version(args, package, revision, check=True):
-    """ returns version in the format "{pkgver}-r{pkgrel}", or None if no 
-        matching package is found """
-    parsed = get_package_contents(args, package, revision, check)
-    if parsed is None:
-        return None
    return parsed["pkgver"] + "-r" + parsed["pkgrel"]


@@ -120,40 +112,6 @@ def check_versions(args, packages):
                print(f"- {package}: {head} (HEAD) (new package)")
            continue

-        # Check pkgver follows expected format for device packages
-        pkgver = head.rpartition('-r')[0]
-        if package.startswith('device-') and not pkgver.isdigit():
-            print(f" - {package}: invalid pkgver \"{pkgver}\""
-                  "See: https://wiki.postmarketos.org/wiki/Packaging#device_packages_and_other_packages_without_sources")
-            error = True
-
-        # Additional checks for device packages
-        if package.startswith('device-'):
-            head_parsed = get_package_contents(args, package, "HEAD", False)
-            upstream_parsed = get_package_contents(args, package, commit, False)
-
-            # checksums did not change
-            if head_parsed["sha512sums"] == upstream_parsed["sha512sums"]:
-                # Check that pkgver did not change
-                if head_parsed["pkgver"] != upstream_parsed["pkgver"]:
-                    print(f" - {package}: pkgver should not change when package source checksums did not change."
-                          "See: https://wiki.postmarketos.org/wiki/Packaging#device_packages_and_other_packages_without_sources")
-                    error = True
-                # We do not check for a bumped pkgrel, because not everything
-                # needs it, e.g: pmb_recommends
-            # checksums changed
-            else:
-                # Check that pkgrel was reset to 0
-                if head_parsed["pkgrel"] != "0":
-                    print(f" - {package}: pkgrel should be 0 when package source checksums change."
-                          "See: https://wiki.postmarketos.org/wiki/Packaging#device_packages_and_other_packages_without_sources")
-                    error = True
-                # Check that pkgver was changed
-                if head_parsed["pkgver"] == upstream_parsed["pkgver"]:
-                    print(f" - {package}: pkgver should change when package source checksums change."
-                          "See: https://wiki.postmarketos.org/wiki/Packaging#device_packages_and_other_packages_without_sources")
-                    error = True
-
        # Compare head and upstream versions
        result = pmb.parse.version.compare(head, upstream)
        if result != 1:
@@ -106,7 +106,7 @@ def main():
    # Ask to adjust the wiki
    if error:
        print("*** Wiki check failed!")
-        print("Thank you for porting postmarketOS to a new device! \\o/")
+        print("Thank you for porting postmarketOS to a new device! \o/")
        print("")
        print("Now it's time to add some documentation:")
        print("1) Create a device specific wiki page as described here:")
@@ -59,11 +59,6 @@ def get_upstream_branch():
        channels.cfg from master to retrieve the 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"]
@@ -135,28 +130,27 @@ def get_changed_packages_sanity_check(count):
        return

    branch = get_upstream_branch()
-    print(f"""
-ERROR: Too many packages have changed!
-
-This is a sanity check, so we don't end up building packages that
-have not been modified. CI won't run for more than three hours
-anyway.
-
-Your options:
-a) If you *did not* modify everything listed above, then rebase
-   your branch on the official postmarketOS/pmaports.git {branch}
-   branch. Feel free to ask in the chat for help if you need any.
-b) If you *did* modify all these packages, and you assume that
-   they will build within one hour: skip this sanity check by
-   adding '[ci:ignore-count]' to the commit message of the last
-   commit in the merge request (then force push).
-c) If you *did* modify all these packages, and you are sure that
-   they won't build in time, please add '[ci:skip-build]' to the
-   commit message (then force push). Make sure that all packages
-   build with 'pmbootstrap build --strict'!
-
-Thank you and sorry for the inconvenience.
-    """)
+    print()
+    print("ERROR: Too many packages have changed!")
+    print()
+    print("This is a sanity check, so we don't end up building packages that")
+    print("have not been modified. CI won't run for more than three hours")
+    print("anyway.")
+    print()
+    print("Your options:")
+    print("a) If you *did not* modify everything listed above, then rebase")
+    print(f"   your branch on the official postmarketOS/pmaports.git {branch}")
+    print("   branch. Feel free to ask in the chat for help if you need any.")
+    print("b) If you *did* modify all these packages, and you assume that")
+    print("   they will build within one hour: skip this sanity check by")
+    print("   adding '[ci:ignore-count]' to the commit message (then force")
+    print("   push).")
+    print("c) If you *did* modify all these packages, and you are sure that")
+    print("   they won't build in time, please add '[ci:skip-build]' to the")
+    print("   commit message (then force push). Make sure that all packages")
+    print("   build with 'pmbootstrap build --strict'!")
+    print()
+    print("Thank you and sorry for the inconvenience.")

    sys.exit(1)

@@ -11,4 +11,4 @@ fi
 set -x

 # shellcheck disable=SC2046
-ruff check --ignore E501,F401,E722,W605 $(find .ci -name '*.py')
+ruff --ignore E501,F401,E722,W605 $(find .ci -name '*.py')
@@ -15,7 +15,9 @@ fi
 # Shell: shellcheck
 sh_files="
 	./main/mdss-fb-init-hack/mdss-fb-init-hack.sh
+	./main/osk-sdl/unlock.sh
 	./main/postmarketos-base/rootfs-usr-lib-firmwareload.sh
+	./main/postmarketos-base-ui/rootfs-usr-lib-NetworkManager-dispatcher.d-50-dns-filter.sh
 	./main/postmarketos-base-ui/rootfs-usr-lib-NetworkManager-dispatcher.d-50-tethering.sh
 	./main/postmarketos-installkernel/installkernel-pmos
 	./main/postmarketos-initramfs/init.sh
@@ -23,6 +25,7 @@ sh_files="
 	./main/postmarketos-mkinitfs-hook-debug-shell/20-debug-shell.sh
 	./main/postmarketos-mkinitfs-hook-debug-shell/setup_usb_storage.sh
 	./main/postmarketos-mkinitfs-hook-netboot/netboot.sh
+	./main/postmarketos-update-kernel/update-kernel.sh
 	./main/ttyescape/*.post-install
 	./main/unl0kr/unlock.sh
 	./main/msm-firmware-loader/*.post-install
@@ -34,7 +34,7 @@ def path_pmbootstrap():
            return directory

    # Symlink not set up properly
-    print("ERROR: unable to find path to pmbootstrap.py. Try setting 'PMBOOTSTRAP_CMD'.")
+    print("ERROR: 'pmbootstrap' is not a symlink to pmbootstrap.py")
    sys.exit(1)


@@ -1,32 +1,30 @@
 #!/usr/bin/env python3
-# Copyright 2024 Oliver Smith
+# Copyright 2021 Oliver Smith
 # SPDX-License-Identifier: GPL-3.0-or-later

-import fnmatch
 import glob
-import os
 import pytest
 import sys
+import os

 import add_pmbootstrap_to_import_path
 import pmb.parse
 import pmb.parse._apkbuild

-# 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 = [
-    "@sdm845-mainline",
-]
-

 def device_dependency_check(apkbuild, path):
    """ Raise an error if a device package has a dependency that is not allowed
        (e.g. because it should be in a subpackage instead). """

    for depend in apkbuild["depends"]:
+        if depend == "linux-firmware-none":
+            continue
+        if (depend.startswith("firmware-") or
+                depend.startswith("linux-firmware")):
+            raise RuntimeError("Firmware package '" + depend + "' found in"
+                               " depends of " + path + ". These go into"
+                               " subpackages now, see"
+                               " <https://postmarketos.org/devicepkg>.")
        if depend == "mesa-dri-gallium":
            raise RuntimeError(f"{path}: mesa-dri-gallium shouldn't be in"
                               " depends anymore (see pmaports!3478)")
@@ -48,7 +46,7 @@ def test_aports_device(args):
            raise RuntimeError("Missing 'postmarketos-base' in depends of " +
                               path)

-        # Depends: Must not have specific packages
+        # Depends: Must not have firmware packages
        for depend in apkbuild["depends"]:
            device_dependency_check(apkbuild, path)

@@ -61,6 +59,14 @@ def test_aports_device(args):
        if "!archcheck" not in apkbuild["options"]:
            raise RuntimeError("!archcheck missing in options= line: " + path)

+        if deviceinfo["flash_kernel_on_update"] == "true" \
+                and "postmarketos-update-kernel" not in apkbuild["depends"]:
+            raise RuntimeError(
+                "Deviceinfo indicates this device supports automatic kernel"
+                " flashing on update, but doesn't depend on"
+                " 'postmarketos-update-kernel'. Please add the missing"
+                " dependency.")
+

 def test_aports_device_kernel(args):
    """
@@ -102,84 +108,23 @@ def test_aports_device_kernel(args):
                               path)


-def codeowners_parse(args):
-    global codeowners_parsed
-
-    pattern_prev = None
-
-    with open(f"{args.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(args, path, maintainers):
-    """
-    :param path: full path to an APKBUILD (e.g. /home/user/…/APKBUILD)
-    :param maintainers: list of one or more maintainers
-    """
-    path = os.path.relpath(path, args.aports)
-
-    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!"
-
-
 def test_aports_maintained(args):
    """
    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(args)
-
    for path in glob.iglob(f"{args.aports}/device/main/*/APKBUILD"):
        if '/firmware-' in path:
            continue
        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(args, path, maintainers)

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


 def test_aports_unmaintained(args):
@@ -6,10 +6,10 @@ import stat

 expected_directories = [
    "cross",
-    "device/archived",
    "device/community",
    "device/main",
    "device/testing",
+    "device/unmaintained",
    "main",
    "modem",
    "non-free",
@@ -30,7 +30,7 @@ def test_directories():
 # Ensure no file in pmaports are executable.
 # see https://gitlab.com/postmarketOS/pmaports/-/issues/593.
 def test_executable_files():
-    for file in glob.iglob("[!temp]**/**/*", recursive=True):
+    for file in glob.iglob("**/*", recursive=True):
        if os.path.isdir(file) or os.path.islink(file):
            continue
            # still check other less common inode types
@@ -1,4 +1,3 @@
 {
-  "SpacesAftertabs": true,
-  "Exclude": ["temp"]
+  "SpacesAftertabs": true
 }
@@ -7,7 +7,7 @@
 # Top-most EditorConfig file.
 root = true

-[{**.{md,ini,sh,rules,nft},**/APKBUILD,CODEOWNERS}]
+[{**.{md,ini,sh,rules,nft},**/APKBUILD}]
 indent_style = tab
 end_of_line = lf
 trim_trailing_whitespace = true
@@ -2,34 +2,35 @@

 # global settings
 image: alpine:edge
-before_script: &global_before_scripts
-  - apk upgrade -U
 after_script:
  - .ci/lib/move_logs.sh $CI_PROJECT_DIR
 stages:
  - lint
  - build

-# This defines the rules for when a pipeline should run.
-workflow:
-  rules:
-    # Don't run branch pipeline if an MR is open (only the MR pipeline will run)
-    - if: $CI_COMMIT_BRANCH && $CI_OPEN_MERGE_REQUESTS && $CI_PIPELINE_SOURCE == "push"
-      when: never
-    # Run for merge requests
-    - if: $CI_PIPELINE_SOURCE == "merge_request_event"
-    # Run scheduled pipeline for autoupdate
-    - if: $CI_PIPELINE_SOURCE == "schedule"
+# defaults for "only"
+# We need to run the CI jobs in a "merge request specific context", if CI is
+# running in a merge request. Otherwise the environment variable that holds the
+# merge request ID is not available. This means, we must set the "only"
+# variable accordingly - and if we only do it for one job, all other jobs will
+# not get executed. So have the defaults here, and use them in all jobs that
+# should run on both the master branch, and in merge requests.
+# https://docs.gitlab.com/ee/ci/merge_request_pipelines/index.html#excluding-certain-jobs
+.only-default: &only-default
+  only:
+    - master
+    - merge_requests
+    - tags

 # device documentation
 wiki:
  stage: lint
-  rules:
-    - if: $CI_PIPELINE_SOURCE == "merge_request_event" || $CI_COMMIT_REF_PROTECTED == "false"
-      changes:
-        - .ci/**/*
-        - .gitlab-ci.yml
-        - device/*/device-*/*
+  <<: *only-default
+  only:
+    refs:
+      - merge_requests
+    changes:
+      - device/*/device-*/*
  script:
    - .ci/lib/gitlab_prepare_ci.sh
    - .ci/wiki.sh
@@ -37,12 +38,16 @@ wiki:
 # testcases linting
 ruff:
  stage: lint
-  rules:
-    - if: $CI_PIPELINE_SOURCE == "merge_request_event" || $CI_COMMIT_REF_PROTECTED == "false"
-      changes:
-        - .ci/*
-        - .ci/*/*
-        - .gitlab-ci.yml
+  <<: *only-default
+  only:
+    refs:
+      - merge_requests
+    changes:
+      - .ci/*
+      - .ci/*/*
+  before_script:
+    - "echo 'https://dl-cdn.alpinelinux.org/alpine/edge/testing' >> /etc/apk/repositories"
+    - apk -q add ruff
  script:
    - .ci/lib/gitlab_prepare_ci.sh
    - .ci/ruff.sh
@@ -50,9 +55,8 @@ ruff:
 # shellcheck and various grep checks
 shellcheck-grep:
  stage: lint
+  <<: *only-default
  image: alpine:edge
-  rules:
-    - if: $CI_PIPELINE_SOURCE == "merge_request_event" || $CI_COMMIT_REF_PROTECTED == "false"
  script:
    - .ci/lib/gitlab_prepare_ci.sh
    - .ci/shellcheck.sh
@@ -61,9 +65,8 @@ shellcheck-grep:

 editor-config:
  stage: lint
+  <<: *only-default
  image: alpine:edge
-  rules:
-    - if: $CI_PIPELINE_SOURCE == "merge_request_event" || $CI_COMMIT_REF_PROTECTED == "false"
  script:
    - .ci/lib/gitlab_prepare_ci.sh
    - .ci/ec.sh
@@ -71,8 +74,7 @@ editor-config:
 # aports checks (generic)
 pytest-commits:
  stage: lint
-  rules:
-    - if: $CI_PIPELINE_SOURCE == "merge_request_event" || $CI_COMMIT_REF_PROTECTED == "false"
+  <<: *only-default
  script:
    - .ci/lib/gitlab_prepare_ci.sh
    - .ci/pytest.sh
@@ -88,21 +90,23 @@ pytest-commits:
 # APKBUILD linting
 aport-lint:
  stage: lint
-  rules:
-    - if: $CI_PIPELINE_SOURCE == "merge_request_event" || $CI_COMMIT_REF_PROTECTED == "false"
  script:
    - .ci/lib/gitlab_prepare_ci.sh
    - .ci/apkbuild-lint.sh
+  only:
+    - merge_requests
  allow_failure: true

 # kernel kconfig check
 kernel-kconfig:
  stage: lint
-  rules:
-    - if: $CI_PIPELINE_SOURCE == "merge_request_event" || $CI_COMMIT_REF_PROTECTED == "false"
-      changes:
-        - device/*/linux-*/config-*
-        - main/linux-*/config-*
+  only:
+    refs:
+      - master
+      - merge_requests
+    changes:
+      - device/*/linux-*/config-*
+      - main/linux-*/config-*
  script:
    - .ci/lib/gitlab_prepare_ci.sh
    - .ci/kconfig.sh
@@ -111,10 +115,9 @@ kernel-kconfig:
 # (Checks for "Allow commits from members who can merge to the target branch")
 mr-settings:
  stage: lint
-  rules:
-    - if: $CI_PIPELINE_SOURCE == "merge_request_event"
+  only:
+    - merge_requests
  before_script:
-    - *global_before_scripts
    - apk -q add python3
  script:
    - wget -q "https://gitlab.com/postmarketOS/ci-common/-/raw/master/check_mr_settings.py"
@@ -123,10 +126,8 @@ mr-settings:
 # build changed aports
 .build:
  stage: build
-  rules:
-    - if: $CI_PIPELINE_SOURCE == "merge_request_event" || $CI_COMMIT_REF_PROTECTED == "false"
+  <<: *only-default
  before_script:
-    - *global_before_scripts
    - .ci/lib/gitlab_prepare_ci.sh
  after_script:
    - cp -r /home/pmos/.local/var/pmbootstrap/packages/ packages/ || true
@@ -1,12 +1,6 @@
 <!--
 	Thank you for using postmarketOS! In order to speed up process of resolving your issue,
-	we would like you to fill in the following form.
-
-	*** NOTE FOR CONFIDENTIAL ISSUES: ***
-	A lot of people can read confidential pmaports issues! If you want to
-	submit something that only the postmarketOS Core Team can see, write to
-		team@postmarketos.org
-	instead of opening an issue here!
+	we would like you to fill in the following :
 -->
 ### Describe your issue
 #### What's the expected behaviour?
@@ -28,6 +22,7 @@
 -->
 * [ ] edge (`master` branch)
 * [ ] `v23.12`
+* [ ] `v23.06` (supported until 2024-01-18)

 * [ ] I confirm that the issue still is present after running `sudo apk upgrade -a`

@@ -1,128 +1,62 @@
 # https://docs.gitlab.com/ee/user/project/code_owners.html
-# Put groups like @sdm845-mainline into test_device.py:gitlab_groups.
-# Order lines alphabetically!

-device/*/*-amlogic-s905*/			@funderscore
-device/*/*-arrow-db410c/			@Minecrell
-device/*/*-asus-me176c/				@Minecrell
-device/*/*-ayn-odin/				@jenneron
-device/*/*-bq-paella/				@Minecrell
-device/*/*-bq-tenshi/				@fossdd
-device/*/*-google-gru/				@jenneron
-device/*/*-google-kukui/			@jenneron @binarycraft
-device/*/*-google-oak/				@jenneron @adamthiede
-device/*/*-google-trogdor/			@jenneron
-device/*/*-google-veyron/			@jenneron
-device/*/*-google-x64cros/			@jenneron @JustSoup321 @alpernebbi
 device/*/*-htc-golfu/				@Newbyte
+device/*/*-pine64-pinephone/			@craftyguy @milesalan @bshah @proycon @anjandev @StacyHarper @Arnavion
 device/*/*-htc-m8qlul/				@Newbyte
-device/*/*-kobo-clara/				@akemnade
-device/*/*-lenovo-21bx/				@craftyguy
-device/*/*-lenovo-a6000/			@jenneron @Minecrell
-device/*/*-lenovo-a6010/			@jenneron @Minecrell
-device/*/*-librecomputer-lafrite/		@funderscore
-device/*/*-librecomputer-lepotato/		@funderscore
-device/*/*-librecomputer-solitude/		@Newbyte @funderscore
-device/*/*-motorola-harpia/			@Minecrell
-device/*/*-nokia-n900/				@sicelo @Danct12
-device/*/*-pine64-pinebookpro/			@QC8086
-device/*/*-pine64-pinephone/			@craftyguy @milesalan @proycon @anjandev @StacyHarper @Arnavion @PsychoGame
-device/*/*-pine64-pinephonepro/			@PsychoGame
-device/*/*-pine64-rockpro64/			@PureTryOut
-device/*/*-purism-librem5/			@craftyguy @alistair23 @Newbyte
-device/*/*-qcom-msm8916/			@Minecrell @TravMurav
-device/*/*-qcom-sdm845/				@sdm845-mainline
-device/*/*-qcom-sm6350/				@z3ntu
-device/*/*-samsung-a3/				@Mis012 @TravMurav @Minecrell
-device/*/*-samsung-a5/				@Minecrell @minlexx
-device/*/*-samsung-e7/				@wonderfulShrineMaidenOfParadise
-device/*/*-samsung-espresso10/			@MightyM17
-device/*/*-samsung-espresso7/			@MightyM17 @antoni.aloytorrens
-device/*/*-samsung-grandmax/			@wonderfulShrineMaidenOfParadise
-device/*/*-samsung-gt510/			@TravMurav
-device/*/*-samsung-gt58/			@TravMurav
-device/*/*-samsung-j5/				@wonderfulShrineMaidenOfParadise
-device/*/*-samsung-j5x/				@wonderfulShrineMaidenOfParadise
-device/*/*-samsung-serranove/			@Minecrell
-device/*/*-tolino-shine2hd/			@akemnade
-device/*/*-videostrong-kii-pro/			@funderscore
-device/*/*-wileyfox-crackling/			@TravMurav @Minecrell
-device/*/*-xiaomi-beryllium/			@joelselvaraj
-device/*/*-xiaomi-daisy/			@joelselvaraj @alikates
-device/*/*-xiaomi-markw/			@vipaoL
-device/*/*-xiaomi-mido/				@barni2000
-device/*/*-xiaomi-scorpio/			@Tooniis
-device/*/*-xiaomi-tissot/			@jiaxyga @barni2000
-device/*/*-xiaomi-vince/			@M0Rf30
-device/*/*-xiaomi-wt88047/			@Minecrell
-device/*/*-xiaomi-ysl/				@barni2000
-device/*/alsa-ucm-conf-cros/			@WeirdTreeThing
-device/*/device-fairphone-*/			@z3ntu
-device/*/device-generic-x86_64/			@craftyguy @ollieparanoid
-device/*/device-google-nyan-big/		@jenneron
-device/*/device-google-nyan-blaze/		@jenneron
-device/*/device-google-peach-pi/		@jenneron
-device/*/device-google-peach-pit/		@jenneron
-device/*/device-google-snow/			@jenneron
-device/*/device-huawei-plank/			@gtrxAC
+device/*/*-purism-librem5/			@craftyguy @bshah
 device/*/device-lg-judyln/			@Newbyte
-device/*/device-lg-judyp/			@jenneron
-device/*/device-microsoft-surface-rt/		@jenneron @jethrob
-device/*/device-nvidia-tegra-armv7/		@clamor-s @okias @mschwalm @nokun
-device/*/device-odroid-xu4/			@Grimler
+device/*/device-samsung-m0/			@Newbyte
+device/*/linux-postmarketos-exynos4/		@Newbyte
+device/*/linux-postmarketos-qcom-msm8939/	@Newbyte
+device/*/linux-postmarketos-stericsson/		@Newbyte
+device/*/*-qcom-sdm845/				@sdm845-mainline
+device/*/*-xiaomi-beryllium/			@joelselvaraj
 device/*/device-oneplus-enchilada/		@calebccff
 device/*/device-oneplus-fajita/			@calebccff
-device/*/device-qemu-aarch64/			@Minecrell @ollieparanoid
-device/*/device-qemu-amd64/			@Minecrell @ollieparanoid
-device/*/device-qemu-riscv64/			@Minecrell @z3ntu
-device/*/device-qualcomm-sdm845/		@calebccff
-device/*/device-samsung-chagallwifi/		@Grimler
-device/*/device-samsung-coreprimevelte/		@legolivesmatter @balejk
-device/*/device-samsung-j5y17lte/	@andrisas
-device/*/device-samsung-klimtlte/		@Grimler
-device/*/device-samsung-lt01/			@knuxify
-device/*/device-samsung-m0/			@Newbyte
-device/*/device-samsung-manta/			@jenneron @alexmrqt
-device/*/device-shift-axolotl/			@amartinz @calebccff @dylanvanassche
-device/*/firmware-google-veyron-brcm/		@jenneron
-device/*/firmware-odroid-xu4/			@Grimler
 device/*/firmware-oneplus-sdm845/		@calebccff
-device/*/firmware-powervr-gx6250/		@jenneron
-device/*/kobo-epdc-extractor/			@akemnade
-device/*/linux-google-nyan/			@jenneron
+device/*/device-shift-axolotl/			@amartinz @calebccff @dylanvanassche
+device/*/*-lenovo-21bx/				@craftyguy
+device/*/*-lenovo-a6010/			@jenneron
+device/*/*-lenovo-a6000/			@jenneron
+device/*/device-microsoft-surface-rt/		@jenneron
+device/*/device-google-nyan-big/		@jenneron
+device/*/device-google-peach-pi/		@jenneron
 device/*/linux-google-veyron/			@jenneron
-device/*/linux-huawei-plank/			@gtrxAC
-device/*/linux-postmarketos-allwinner/		@Arnavion @PsychoGame
-device/*/linux-postmarketos-amlogic/		@funderscore @exkc
-device/*/linux-postmarketos-exynos4/		@Newbyte @ThiagaoPlusPlus
 device/*/linux-postmarketos-exynos5/		@jenneron @Grimler
-device/*/linux-postmarketos-grate/		@clamor-s @jenneron @jethrob
-device/*/linux-postmarketos-imx-ereader/	@akemnade
-device/*/linux-postmarketos-mediatek-mt8173/	@jenneron @adamthiede
-device/*/linux-postmarketos-mediatek-mt8183/	@jenneron @binarycraft
-device/*/linux-postmarketos-omap/		@MightyM17 @Sicelo
-device/*/linux-postmarketos-qcom-msm8939/	@Newbyte
-device/*/linux-postmarketos-qcom-msm8953/	@M0Rf30 @Ultra-azu @barni2000
-device/*/linux-postmarketos-qcom-msm8996/	@Tooniis
-device/*/linux-postmarketos-qcom-sc7180/	@jenneron
-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-klimtlte/		@Grimler
-device/*/oem-amd/				@craftyguy
-device/*/oem-intel/				@craftyguy
 device/*/soc-mediatek-mt8183/			@jenneron
-device/*/soc-qcom-msm8953/			@barni2000
-device/*/soc-qcom-msm8996/			@Tooniis
-device/*/soc-qcom-sc7180/			@jenneron
-device/*/soc-rockchip-rk3399/			@jenneron
-device/*/soc-samsung-exynos4412/		@Newbyte
-device/*/u-boot-librem5/			@craftyguy @alistair23 @Newbyte
-device/*/u-boot-pinebookpro/			@QC8086
-device/*/u-boot-pinephone/			@Arnavion @PsychoGame
-device/*/wl1251-cal/				@Danct12
-main/postmarketos-ui-plasma-mobile/		@PureTryOut
-main/shutdown-clear-rtc-wakealarm/		@Arnavion
+device/*/linux-google-nyan/			@jenneron
+device/*/linux-postmarketos-mediatek-mt8173/	@jenneron
+device/*/linux-postmarketos-mediatek-mt8183/	@jenneron @binarycraft
+device/*/device-google-nyan-blaze/		@jenneron
+device/*/firmware-powervr-gx6250/		@jenneron
+device/*/device-google-snow/			@jenneron
+device/*/firmware-google-veyron-brcm/		@jenneron
+device/*/device-google-peach-pit/		@jenneron
+device/*/device-lg-judyp/			@jenneron
+device/*/linux-postmarketos-grate/		@clamor95 @jenneron
+device/*/device-samsung-chagallwifi/		@Grimler
+device/*/device-odroid-xu4/			@Grimler
+device/*/device-samsung-klimtlte/		@Grimler
+device/*/linux-samsung-klimtlte/		@Grimler
+device/*/firmware-odroid-xu4/			@Grimler
+device/*/linux-samsung-chagallwifi/		@Grimler
+device/*/device-huawei-plank/			@gtrxAC
+device/*/linux-huawei-plank/			@gtrxAC
+device/*/device-samsung-coreprimevelte/		@legolivesmatter @balejk
+device/*/linux-samsung-coreprimevelte/		@legolivesmatter @balejk
+device/*/linux-postmarketos-allwinner/		@Arnavion
+device/*/u-boot-pinephone/			@Arnavion
+
+main/postmarketos-update-depthcharge-kernel/	@jenneron
+main/osk-sdl/					@craftyguy
+main/postmarketos-ui-plasma-mobile/		@bshah
 main/ttyescape/					@calebccff
+main/shutdown-clear-rtc-wakealarm/		@Arnavion
+device/*/u-boot-librem5/			@craftyguy @bshah
+device/*/alsa-ucm-conf-google-kukui/		@jenneron @binarycraft
+device/*/alsa-ucm-conf-google-gru/		@jenneron
+device/*/*-videostrong-kii-pro/			@vitali64yt
+device/*/*-amlogic-s905*/			@vitali64yt
+device/*/linux-postmarketos-amlogic/		@vitali64yt @exkc
+
+# vim: ts=8 sw=4 et
@@ -8,12 +8,6 @@ branch_pmaports=master
 branch_aports=master
 mirrordir_alpine=edge

-[v24.06]
-description=Upcoming stable release (DO NOT USE)
-branch_pmaports=v24.06
-branch_aports=3.20-stable
-mirrordir_alpine=v3.20
-
 [v23.12]
 description=Latest release / Recommended for best stability
 branch_pmaports=v23.12
@@ -8,7 +8,7 @@ fi

 pkgname=busybox-static-aarch64
 pkgver=1.36.1
-pkgrel=26
+pkgrel=19

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

 sha512sums="
-0f5f1eb32691016183d9a3011c5643f70a1cdc9f49b1ffefce732cff960cfea4d0db1670564fff5504654bb2f07857e62e5dd076fb40d2c361c441854e5d5e5c  busybox-static-1.36.1-r26-aarch64-edge.apk
+e246cc87054326712af4f41f3cffb0913b822f43e7a75cdcc96fcb659776cc1d5bf4c1c37d5e324b16037cd1ba2868b17eedf7929ef1c2d10ede12e9787a1006  busybox-static-1.36.1-r19-aarch64-edge.apk
 "
@@ -8,7 +8,7 @@ fi

 pkgname=busybox-static-armhf
 pkgver=1.36.1
-pkgrel=26
+pkgrel=19

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

 sha512sums="
-ad4db0c989c1a4773f75411c2749bcc8d25756d20396cdb6bfa59bd5ed14164928c602e9833101e584b28490971f6d43973a9c7de9c544693aef40dbe183cabc  busybox-static-1.36.1-r26-armhf-edge.apk
+8b4cbf99a93a20f8a08dbf907ef4fbf250664717ce99deebb49564ccdaa76f16a036d793ca06fdbcc43e4508d92ee9fb90bff81c932754cfa6581cafcf3899c6  busybox-static-1.36.1-r19-armhf-edge.apk
 "
@@ -8,7 +8,7 @@ fi

 pkgname=busybox-static-armv7
 pkgver=1.36.1
-pkgrel=26
+pkgrel=19

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

 sha512sums="
-f6664d29ecb22e396133116210d792e101fa552b4f4d2295de19af460830bbb151a2d3c4a7b7bbe1596d7b3ed85042f10dae49d78ae4e6ac053ed565f9043c01  busybox-static-1.36.1-r26-armv7-edge.apk
+0d51014e838faf36ffa93b3f91abeb351f1a38f367afd3a31b64273aabd722984680b2495db1f68d7e4fe826e2cbe06c6e6492faca99dc52bb20d2c789c79264  busybox-static-1.36.1-r19-armv7-edge.apk
 "
@@ -1,61 +0,0 @@
-From c4f484f465a32e796ae384aa3f90e79fa218b4e9 Mon Sep 17 00:00:00 2001
-From: Jingyun Hua <huajingyun@loongson.cn>
-Date: Mon, 7 Aug 2023 15:25:58 +0800
-Subject: [PATCH] loongarch disable multilib support
-
-Signed-off-by: Jingyun Hua <huajingyun@loongson.cn>
---
- gcc/config/loongarch/linux.h    | 10 +---------
- gcc/config/loongarch/t-linux    | 18 +++---------------
- 3 files changed, 5 insertions(+), 25 deletions(-)
-
-diff --git a/gcc/config/loongarch/linux.h b/gcc/config/loongarch/linux.h
-index 9059d2441..23eaff0cc 100644
--- a/gcc/config/loongarch/linux.h
-+++ b/gcc/config/loongarch/linux.h
-@@ -22,15 +22,7 @@ along with GCC; see the file COPYING3.  If not see
-  * can work in a multilib environment.  */
- 
- #if defined(LA_DISABLE_MULTILIB) && defined(LA_DISABLE_MULTIARCH)
-
-  #if DEFAULT_ABI_BASE == ABI_BASE_LP64D
-    #define ABI_LIBDIR "lib64"
-  #elif DEFAULT_ABI_BASE == ABI_BASE_LP64F
-    #define ABI_LIBDIR "lib64/f32"
-  #elif DEFAULT_ABI_BASE == ABI_BASE_LP64S
-    #define ABI_LIBDIR "lib64/sf"
-  #endif
-
-+    #define ABI_LIBDIR "lib"
- #endif
- 
- #ifndef ABI_LIBDIR
-diff --git a/gcc/config/loongarch/t-linux b/gcc/config/loongarch/t-linux
-index e40da1792..f72c6e878 100644
--- a/gcc/config/loongarch/t-linux
-+++ b/gcc/config/loongarch/t-linux
-@@ -36,18 +36,6 @@ else
- endif
- 
- # Don't define MULTILIB_OSDIRNAMES if multilib is disabled.
-ifeq ($(filter LA_DISABLE_MULTILIB,$(tm_defines)),)
-
-    MULTILIB_OSDIRNAMES = \
-      mabi.lp64d=../lib64$\
-      $(call if_multiarch,:loongarch64-linux-gnu)
-
-    MULTILIB_OSDIRNAMES += \
-      mabi.lp64f=../lib64/f32$\
-      $(call if_multiarch,:loongarch64-linux-gnuf32)
-
-    MULTILIB_OSDIRNAMES += \
-      mabi.lp64s=../lib64/sf$\
-      $(call if_multiarch,:loongarch64-linux-gnusf)
-
-endif
-+    MULTILIB_OSDIRNAMES =  mabi.lp64d=../lib
-+    MULTILIB_OSDIRNAMES += mabi.lp64f=../lib
-+    MULTILIB_OSDIRNAMES += mabi.lp64s=../lib
-- 
-2.41.0
-
@@ -24,7 +24,7 @@ CBUILDROOT="/"
 _cross_configure="--disable-bootstrap --with-sysroot=/usr/$CTARGET"

 pkgname=gcc-aarch64
-pkgver=13.2.1_git20240309
+pkgver=13.2.1_git20231014
 # i.e. 13.2.1, must match gcc/BASE-VER
 _pkgbase="${pkgver%%_git*}"
 # date component from snapshots
@@ -46,7 +46,6 @@ makedepends_host="linux-headers gmp-dev mpfr-dev mpc1-dev isl-dev zlib-dev musl-
 subpackages="g++-aarch64:gpp libstdc++-dev-aarch64:libcxx_dev"
 [ "$CHOST" = "$CTARGET" ] && subpackages="gcc-gdb gcc-doc$_target"
 replaces="libstdc++ binutils"
-options="!strip"

 : "${LANG_CXX:=true}"
 : "${LANG_D:=true}"
@@ -144,7 +143,7 @@ case "$CARCH" in
 # GDC hasn't been ported to PowerPC
 # See libphobos/configure.tgt in GCC sources for supported targets
 # riscv fails with: error: static assert  "unimplemented"
-ppc64le|riscv64|loongarch64)	LANG_D=false ;;
+ppc64le|riscv64)	LANG_D=false ;;
 # GDC does currently not work on 32-bit musl architectures.
 # This is a known upstream issue.
 # See: https://github.com/dlang/druntime/pull/3383
@@ -156,7 +155,6 @@ case "$CTARGET_ARCH" in
 arm*)		_libitm=false ;;
 mips*)		_libitm=false ;;
 riscv64)	_libitm=false ;;
-loongarch64)	_libitm=false ;;
 esac

 # Internal libffi fails to build on MIPS at the moment, need to
@@ -164,7 +162,6 @@ esac
 # the internal libffi.
 case "$CTARGET_ARCH" in
 mips*)		LANG_GO=false ;;
-loongarch64)	LANG_GO=false ;;
 esac

 # Fortran uses libquadmath if toolchain has __float128
@@ -189,11 +186,6 @@ riscv64)
 LANG_ADA=false;;
 esac

-case "$CTARGET_ARCH" in
-loongarch64)
-LANG_ADA=false;;
-esac
-
 _languages=c
 if $LANG_CXX; then
 	_languages="$_languages,c++"
@@ -277,7 +269,6 @@ source="https://dev.alpinelinux.org/archive/gcc/${_pkgbase%%.*}-$_pkgsnap/gcc-${
 	0033-libphobos-do-not-use-LFS64-symbols.patch
 	0034-libgo-fix-lfs64-use.patch
 	0036-PR110792-Early-clobber-issues-with-rot32di2-on-i386.patch
-	0037-loongarch-disable-multilib-support.patch
 	"

 # secfixes:
@@ -337,7 +328,6 @@ 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";;
 	esac

 	case "$CTARGET_ARCH" in
@@ -693,6 +683,10 @@ go() {
 	depends="gcc=$_gccrel libgo=$_gccrel !go"
 	install="$pkgname-go.post-install"

+	# See https://lists.alpinelinux.org/~alpine/devel/%3C33KG0XO61I4IL.2Z7RTAZ5J3SY6%408pit.net%3E
+	provides="go-bootstrap"
+	provider_priority=1 # lowest, see community/go
+
 	mkdir -p "$subpkgdir"/$_gcclibexec \
 		"$subpkgdir"/usr/lib \
 		"$subpkgdir"/usr/bin
@@ -793,7 +787,7 @@ gdb() {
 }

 sha512sums="
-2d1e0374ebdee526f0549319fc9c364968c52a0d4aaa16759f00453cb083fe58d8f463c47d97f3bb74a0a92e251989eb75a50ee5800b4569978c72d25446b44e  gcc-13-20240309.tar.xz
+406673a62deba759fc0532a801b3f57cabf894ea328587b23e62a707ba5767b0e3ae9b3f86bf3c6fcf13e8a3c30bc470e6598b625c8231efb629034211c162c2  gcc-13-20231014.tar.xz
 1ecffba1b07d60e1b4422302b032bbea918b674c8e12b30aa6965b544d700ce86b61e9f7b8d402c6caf59257f491a394dd0912f0948565d6eae9335ee54f3b35  0001-posix_memalign.patch
 163f282455b6a4df33f011bcd8b0440566ba0ffaeeab30d8ac52d39948980a56881ca0eff60687129d59556389a58b9d64e7768750bd70b1fe0fedbc9fc30dc2  0002-gcc-poison-system-directories.patch
 3f24bb6a50d3c45b71ea05590e32fe3e69b91377ab185352891d5035c76ed193117c6d0b314a4c364bcf136b9a9dd5c926d6c7c30ab436976c121ebfea8d3ddd  0003-specs-turn-on-Wl-z-now-by-default.patch
@@ -829,5 +823,4 @@ b325035cb7122d79c6b42ca6d3fc9e02319ed2f7cddb0639dff25d2798d2ce63812cd623462cdf95
 c474f34e6f9a4239d486a65141a133dbe8ce91427d502a57a9fd6eb403478a2b5715ba74f24c1cc0761e16eec77ba2c1ca921fb7d7bc1e040fc3703fc9559e75  0033-libphobos-do-not-use-LFS64-symbols.patch
 c4482ffc36e7894b2140800159f4cbc9a3e9011e43a69b69f4fa92d5a11e2ee645c7e21df4423dd1e0636e8890849a5719647bfbdf84f951d638f8f488cb718c  0034-libgo-fix-lfs64-use.patch
 cc1e10ac6e72db816f09325e301103109cc212a6f3de3ce0b9b038d149233c467319d203941695dbf3d7b9e2dcbbcd17609cdb056e831fcc323cd592423882d8  0036-PR110792-Early-clobber-issues-with-rot32di2-on-i386.patch
-d834f5f95f4ebe70ec0af0748c8632c99a4f57b69dc14db1a38becdfcb03406b32febf39f772f37bd145538147099fa7433edce845e14ee77cd8f38fd9774fc1  0037-loongarch-disable-multilib-support.patch
 "
@@ -1,61 +0,0 @@
-From c4f484f465a32e796ae384aa3f90e79fa218b4e9 Mon Sep 17 00:00:00 2001
-From: Jingyun Hua <huajingyun@loongson.cn>
-Date: Mon, 7 Aug 2023 15:25:58 +0800
-Subject: [PATCH] loongarch disable multilib support
-
-Signed-off-by: Jingyun Hua <huajingyun@loongson.cn>
---
- gcc/config/loongarch/linux.h    | 10 +---------
- gcc/config/loongarch/t-linux    | 18 +++---------------
- 3 files changed, 5 insertions(+), 25 deletions(-)
-
-diff --git a/gcc/config/loongarch/linux.h b/gcc/config/loongarch/linux.h
-index 9059d2441..23eaff0cc 100644
--- a/gcc/config/loongarch/linux.h
-+++ b/gcc/config/loongarch/linux.h
-@@ -22,15 +22,7 @@ along with GCC; see the file COPYING3.  If not see
-  * can work in a multilib environment.  */
- 
- #if defined(LA_DISABLE_MULTILIB) && defined(LA_DISABLE_MULTIARCH)
-
-  #if DEFAULT_ABI_BASE == ABI_BASE_LP64D
-    #define ABI_LIBDIR "lib64"
-  #elif DEFAULT_ABI_BASE == ABI_BASE_LP64F
-    #define ABI_LIBDIR "lib64/f32"
-  #elif DEFAULT_ABI_BASE == ABI_BASE_LP64S
-    #define ABI_LIBDIR "lib64/sf"
-  #endif
-
-+    #define ABI_LIBDIR "lib"
- #endif
- 
- #ifndef ABI_LIBDIR
-diff --git a/gcc/config/loongarch/t-linux b/gcc/config/loongarch/t-linux
-index e40da1792..f72c6e878 100644
--- a/gcc/config/loongarch/t-linux
-+++ b/gcc/config/loongarch/t-linux
-@@ -36,18 +36,6 @@ else
- endif
- 
- # Don't define MULTILIB_OSDIRNAMES if multilib is disabled.
-ifeq ($(filter LA_DISABLE_MULTILIB,$(tm_defines)),)
-
-    MULTILIB_OSDIRNAMES = \
-      mabi.lp64d=../lib64$\
-      $(call if_multiarch,:loongarch64-linux-gnu)
-
-    MULTILIB_OSDIRNAMES += \
-      mabi.lp64f=../lib64/f32$\
-      $(call if_multiarch,:loongarch64-linux-gnuf32)
-
-    MULTILIB_OSDIRNAMES += \
-      mabi.lp64s=../lib64/sf$\
-      $(call if_multiarch,:loongarch64-linux-gnusf)
-
-endif
-+    MULTILIB_OSDIRNAMES =  mabi.lp64d=../lib
-+    MULTILIB_OSDIRNAMES += mabi.lp64f=../lib
-+    MULTILIB_OSDIRNAMES += mabi.lp64s=../lib
-- 
-2.41.0
-
@@ -24,7 +24,7 @@ CBUILDROOT="/"
 _cross_configure="--disable-bootstrap --with-sysroot=/usr/$CTARGET"

 pkgname=gcc-armhf
-pkgver=13.2.1_git20240309
+pkgver=13.2.1_git20231014
 # i.e. 13.2.1, must match gcc/BASE-VER
 _pkgbase="${pkgver%%_git*}"
 # date component from snapshots
@@ -46,7 +46,6 @@ makedepends_host="linux-headers gmp-dev mpfr-dev mpc1-dev isl-dev zlib-dev musl-
 subpackages="g++-armhf:gpp libstdc++-dev-armhf:libcxx_dev"
 [ "$CHOST" = "$CTARGET" ] && subpackages="gcc-gdb gcc-doc$_target"
 replaces="libstdc++ binutils"
-options="!strip"

 : "${LANG_CXX:=true}"
 : "${LANG_D:=true}"
@@ -144,7 +143,7 @@ case "$CARCH" in
 # GDC hasn't been ported to PowerPC
 # See libphobos/configure.tgt in GCC sources for supported targets
 # riscv fails with: error: static assert  "unimplemented"
-ppc64le|riscv64|loongarch64)	LANG_D=false ;;
+ppc64le|riscv64)	LANG_D=false ;;
 # GDC does currently not work on 32-bit musl architectures.
 # This is a known upstream issue.
 # See: https://github.com/dlang/druntime/pull/3383
@@ -156,7 +155,6 @@ case "$CTARGET_ARCH" in
 arm*)		_libitm=false ;;
 mips*)		_libitm=false ;;
 riscv64)	_libitm=false ;;
-loongarch64)	_libitm=false ;;
 esac

 # Internal libffi fails to build on MIPS at the moment, need to
@@ -164,7 +162,6 @@ esac
 # the internal libffi.
 case "$CTARGET_ARCH" in
 mips*)		LANG_GO=false ;;
-loongarch64)	LANG_GO=false ;;
 esac

 # Fortran uses libquadmath if toolchain has __float128
@@ -189,11 +186,6 @@ riscv64)
 LANG_ADA=false;;
 esac

-case "$CTARGET_ARCH" in
-loongarch64)
-LANG_ADA=false;;
-esac
-
 _languages=c
 if $LANG_CXX; then
 	_languages="$_languages,c++"
@@ -277,7 +269,6 @@ source="https://dev.alpinelinux.org/archive/gcc/${_pkgbase%%.*}-$_pkgsnap/gcc-${
 	0033-libphobos-do-not-use-LFS64-symbols.patch
 	0034-libgo-fix-lfs64-use.patch
 	0036-PR110792-Early-clobber-issues-with-rot32di2-on-i386.patch
-	0037-loongarch-disable-multilib-support.patch
 	"

 # secfixes:
@@ -337,7 +328,6 @@ 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";;
 	esac

 	case "$CTARGET_ARCH" in
@@ -693,6 +683,10 @@ go() {
 	depends="gcc=$_gccrel libgo=$_gccrel !go"
 	install="$pkgname-go.post-install"

+	# See https://lists.alpinelinux.org/~alpine/devel/%3C33KG0XO61I4IL.2Z7RTAZ5J3SY6%408pit.net%3E
+	provides="go-bootstrap"
+	provider_priority=1 # lowest, see community/go
+
 	mkdir -p "$subpkgdir"/$_gcclibexec \
 		"$subpkgdir"/usr/lib \
 		"$subpkgdir"/usr/bin
@@ -793,7 +787,7 @@ gdb() {
 }

 sha512sums="
-2d1e0374ebdee526f0549319fc9c364968c52a0d4aaa16759f00453cb083fe58d8f463c47d97f3bb74a0a92e251989eb75a50ee5800b4569978c72d25446b44e  gcc-13-20240309.tar.xz
+406673a62deba759fc0532a801b3f57cabf894ea328587b23e62a707ba5767b0e3ae9b3f86bf3c6fcf13e8a3c30bc470e6598b625c8231efb629034211c162c2  gcc-13-20231014.tar.xz
 1ecffba1b07d60e1b4422302b032bbea918b674c8e12b30aa6965b544d700ce86b61e9f7b8d402c6caf59257f491a394dd0912f0948565d6eae9335ee54f3b35  0001-posix_memalign.patch
 163f282455b6a4df33f011bcd8b0440566ba0ffaeeab30d8ac52d39948980a56881ca0eff60687129d59556389a58b9d64e7768750bd70b1fe0fedbc9fc30dc2  0002-gcc-poison-system-directories.patch
 3f24bb6a50d3c45b71ea05590e32fe3e69b91377ab185352891d5035c76ed193117c6d0b314a4c364bcf136b9a9dd5c926d6c7c30ab436976c121ebfea8d3ddd  0003-specs-turn-on-Wl-z-now-by-default.patch
@@ -829,5 +823,4 @@ b325035cb7122d79c6b42ca6d3fc9e02319ed2f7cddb0639dff25d2798d2ce63812cd623462cdf95
 c474f34e6f9a4239d486a65141a133dbe8ce91427d502a57a9fd6eb403478a2b5715ba74f24c1cc0761e16eec77ba2c1ca921fb7d7bc1e040fc3703fc9559e75  0033-libphobos-do-not-use-LFS64-symbols.patch
 c4482ffc36e7894b2140800159f4cbc9a3e9011e43a69b69f4fa92d5a11e2ee645c7e21df4423dd1e0636e8890849a5719647bfbdf84f951d638f8f488cb718c  0034-libgo-fix-lfs64-use.patch
 cc1e10ac6e72db816f09325e301103109cc212a6f3de3ce0b9b038d149233c467319d203941695dbf3d7b9e2dcbbcd17609cdb056e831fcc323cd592423882d8  0036-PR110792-Early-clobber-issues-with-rot32di2-on-i386.patch
-d834f5f95f4ebe70ec0af0748c8632c99a4f57b69dc14db1a38becdfcb03406b32febf39f772f37bd145538147099fa7433edce845e14ee77cd8f38fd9774fc1  0037-loongarch-disable-multilib-support.patch
 "
@@ -1,61 +0,0 @@
-From c4f484f465a32e796ae384aa3f90e79fa218b4e9 Mon Sep 17 00:00:00 2001
-From: Jingyun Hua <huajingyun@loongson.cn>
-Date: Mon, 7 Aug 2023 15:25:58 +0800
-Subject: [PATCH] loongarch disable multilib support
-
-Signed-off-by: Jingyun Hua <huajingyun@loongson.cn>
---
- gcc/config/loongarch/linux.h    | 10 +---------
- gcc/config/loongarch/t-linux    | 18 +++---------------
- 3 files changed, 5 insertions(+), 25 deletions(-)
-
-diff --git a/gcc/config/loongarch/linux.h b/gcc/config/loongarch/linux.h
-index 9059d2441..23eaff0cc 100644
--- a/gcc/config/loongarch/linux.h
-+++ b/gcc/config/loongarch/linux.h
-@@ -22,15 +22,7 @@ along with GCC; see the file COPYING3.  If not see
-  * can work in a multilib environment.  */
- 
- #if defined(LA_DISABLE_MULTILIB) && defined(LA_DISABLE_MULTIARCH)
-
-  #if DEFAULT_ABI_BASE == ABI_BASE_LP64D
-    #define ABI_LIBDIR "lib64"
-  #elif DEFAULT_ABI_BASE == ABI_BASE_LP64F
-    #define ABI_LIBDIR "lib64/f32"
-  #elif DEFAULT_ABI_BASE == ABI_BASE_LP64S
-    #define ABI_LIBDIR "lib64/sf"
-  #endif
-
-+    #define ABI_LIBDIR "lib"
- #endif
- 
- #ifndef ABI_LIBDIR
-diff --git a/gcc/config/loongarch/t-linux b/gcc/config/loongarch/t-linux
-index e40da1792..f72c6e878 100644
--- a/gcc/config/loongarch/t-linux
-+++ b/gcc/config/loongarch/t-linux
-@@ -36,18 +36,6 @@ else
- endif
- 
- # Don't define MULTILIB_OSDIRNAMES if multilib is disabled.
-ifeq ($(filter LA_DISABLE_MULTILIB,$(tm_defines)),)
-
-    MULTILIB_OSDIRNAMES = \
-      mabi.lp64d=../lib64$\
-      $(call if_multiarch,:loongarch64-linux-gnu)
-
-    MULTILIB_OSDIRNAMES += \
-      mabi.lp64f=../lib64/f32$\
-      $(call if_multiarch,:loongarch64-linux-gnuf32)
-
-    MULTILIB_OSDIRNAMES += \
-      mabi.lp64s=../lib64/sf$\
-      $(call if_multiarch,:loongarch64-linux-gnusf)
-
-endif
-+    MULTILIB_OSDIRNAMES =  mabi.lp64d=../lib
-+    MULTILIB_OSDIRNAMES += mabi.lp64f=../lib
-+    MULTILIB_OSDIRNAMES += mabi.lp64s=../lib
-- 
-2.41.0
-
@@ -24,7 +24,7 @@ CBUILDROOT="/"
 _cross_configure="--disable-bootstrap --with-sysroot=/usr/$CTARGET"

 pkgname=gcc-armv7
-pkgver=13.2.1_git20240309
+pkgver=13.2.1_git20231014
 # i.e. 13.2.1, must match gcc/BASE-VER
 _pkgbase="${pkgver%%_git*}"
 # date component from snapshots
@@ -46,7 +46,6 @@ makedepends_host="linux-headers gmp-dev mpfr-dev mpc1-dev isl-dev zlib-dev musl-
 subpackages="g++-armv7:gpp libstdc++-dev-armv7:libcxx_dev"
 [ "$CHOST" = "$CTARGET" ] && subpackages="gcc-gdb gcc-doc$_target"
 replaces="libstdc++ binutils"
-options="!strip"

 : "${LANG_CXX:=true}"
 : "${LANG_D:=true}"
@@ -144,7 +143,7 @@ case "$CARCH" in
 # GDC hasn't been ported to PowerPC
 # See libphobos/configure.tgt in GCC sources for supported targets
 # riscv fails with: error: static assert  "unimplemented"
-ppc64le|riscv64|loongarch64)	LANG_D=false ;;
+ppc64le|riscv64)	LANG_D=false ;;
 # GDC does currently not work on 32-bit musl architectures.
 # This is a known upstream issue.
 # See: https://github.com/dlang/druntime/pull/3383
@@ -156,7 +155,6 @@ case "$CTARGET_ARCH" in
 arm*)		_libitm=false ;;
 mips*)		_libitm=false ;;
 riscv64)	_libitm=false ;;
-loongarch64)	_libitm=false ;;
 esac

 # Internal libffi fails to build on MIPS at the moment, need to
@@ -164,7 +162,6 @@ esac
 # the internal libffi.
 case "$CTARGET_ARCH" in
 mips*)		LANG_GO=false ;;
-loongarch64)	LANG_GO=false ;;
 esac

 # Fortran uses libquadmath if toolchain has __float128
@@ -189,11 +186,6 @@ riscv64)
 LANG_ADA=false;;
 esac

-case "$CTARGET_ARCH" in
-loongarch64)
-LANG_ADA=false;;
-esac
-
 _languages=c
 if $LANG_CXX; then
 	_languages="$_languages,c++"
@@ -277,7 +269,6 @@ source="https://dev.alpinelinux.org/archive/gcc/${_pkgbase%%.*}-$_pkgsnap/gcc-${
 	0033-libphobos-do-not-use-LFS64-symbols.patch
 	0034-libgo-fix-lfs64-use.patch
 	0036-PR110792-Early-clobber-issues-with-rot32di2-on-i386.patch
-	0037-loongarch-disable-multilib-support.patch
 	"

 # secfixes:
@@ -337,7 +328,6 @@ 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";;
 	esac

 	case "$CTARGET_ARCH" in
@@ -693,6 +683,10 @@ go() {
 	depends="gcc=$_gccrel libgo=$_gccrel !go"
 	install="$pkgname-go.post-install"

+	# See https://lists.alpinelinux.org/~alpine/devel/%3C33KG0XO61I4IL.2Z7RTAZ5J3SY6%408pit.net%3E
+	provides="go-bootstrap"
+	provider_priority=1 # lowest, see community/go
+
 	mkdir -p "$subpkgdir"/$_gcclibexec \
 		"$subpkgdir"/usr/lib \
 		"$subpkgdir"/usr/bin
@@ -793,7 +787,7 @@ gdb() {
 }

 sha512sums="
-2d1e0374ebdee526f0549319fc9c364968c52a0d4aaa16759f00453cb083fe58d8f463c47d97f3bb74a0a92e251989eb75a50ee5800b4569978c72d25446b44e  gcc-13-20240309.tar.xz
+406673a62deba759fc0532a801b3f57cabf894ea328587b23e62a707ba5767b0e3ae9b3f86bf3c6fcf13e8a3c30bc470e6598b625c8231efb629034211c162c2  gcc-13-20231014.tar.xz
 1ecffba1b07d60e1b4422302b032bbea918b674c8e12b30aa6965b544d700ce86b61e9f7b8d402c6caf59257f491a394dd0912f0948565d6eae9335ee54f3b35  0001-posix_memalign.patch
 163f282455b6a4df33f011bcd8b0440566ba0ffaeeab30d8ac52d39948980a56881ca0eff60687129d59556389a58b9d64e7768750bd70b1fe0fedbc9fc30dc2  0002-gcc-poison-system-directories.patch
 3f24bb6a50d3c45b71ea05590e32fe3e69b91377ab185352891d5035c76ed193117c6d0b314a4c364bcf136b9a9dd5c926d6c7c30ab436976c121ebfea8d3ddd  0003-specs-turn-on-Wl-z-now-by-default.patch
@@ -829,5 +823,4 @@ b325035cb7122d79c6b42ca6d3fc9e02319ed2f7cddb0639dff25d2798d2ce63812cd623462cdf95
 c474f34e6f9a4239d486a65141a133dbe8ce91427d502a57a9fd6eb403478a2b5715ba74f24c1cc0761e16eec77ba2c1ca921fb7d7bc1e040fc3703fc9559e75  0033-libphobos-do-not-use-LFS64-symbols.patch
 c4482ffc36e7894b2140800159f4cbc9a3e9011e43a69b69f4fa92d5a11e2ee645c7e21df4423dd1e0636e8890849a5719647bfbdf84f951d638f8f488cb718c  0034-libgo-fix-lfs64-use.patch
 cc1e10ac6e72db816f09325e301103109cc212a6f3de3ce0b9b038d149233c467319d203941695dbf3d7b9e2dcbbcd17609cdb056e831fcc323cd592423882d8  0036-PR110792-Early-clobber-issues-with-rot32di2-on-i386.patch
-d834f5f95f4ebe70ec0af0748c8632c99a4f57b69dc14db1a38becdfcb03406b32febf39f772f37bd145538147099fa7433edce845e14ee77cd8f38fd9774fc1  0037-loongarch-disable-multilib-support.patch
 "
@@ -1,61 +0,0 @@
-From c4f484f465a32e796ae384aa3f90e79fa218b4e9 Mon Sep 17 00:00:00 2001
-From: Jingyun Hua <huajingyun@loongson.cn>
-Date: Mon, 7 Aug 2023 15:25:58 +0800
-Subject: [PATCH] loongarch disable multilib support
-
-Signed-off-by: Jingyun Hua <huajingyun@loongson.cn>
---
- gcc/config/loongarch/linux.h    | 10 +---------
- gcc/config/loongarch/t-linux    | 18 +++---------------
- 3 files changed, 5 insertions(+), 25 deletions(-)
-
-diff --git a/gcc/config/loongarch/linux.h b/gcc/config/loongarch/linux.h
-index 9059d2441..23eaff0cc 100644
--- a/gcc/config/loongarch/linux.h
-+++ b/gcc/config/loongarch/linux.h
-@@ -22,15 +22,7 @@ along with GCC; see the file COPYING3.  If not see
-  * can work in a multilib environment.  */
- 
- #if defined(LA_DISABLE_MULTILIB) && defined(LA_DISABLE_MULTIARCH)
-
-  #if DEFAULT_ABI_BASE == ABI_BASE_LP64D
-    #define ABI_LIBDIR "lib64"
-  #elif DEFAULT_ABI_BASE == ABI_BASE_LP64F
-    #define ABI_LIBDIR "lib64/f32"
-  #elif DEFAULT_ABI_BASE == ABI_BASE_LP64S
-    #define ABI_LIBDIR "lib64/sf"
-  #endif
-
-+    #define ABI_LIBDIR "lib"
- #endif
- 
- #ifndef ABI_LIBDIR
-diff --git a/gcc/config/loongarch/t-linux b/gcc/config/loongarch/t-linux
-index e40da1792..f72c6e878 100644
--- a/gcc/config/loongarch/t-linux
-+++ b/gcc/config/loongarch/t-linux
-@@ -36,18 +36,6 @@ else
- endif
- 
- # Don't define MULTILIB_OSDIRNAMES if multilib is disabled.
-ifeq ($(filter LA_DISABLE_MULTILIB,$(tm_defines)),)
-
-    MULTILIB_OSDIRNAMES = \
-      mabi.lp64d=../lib64$\
-      $(call if_multiarch,:loongarch64-linux-gnu)
-
-    MULTILIB_OSDIRNAMES += \
-      mabi.lp64f=../lib64/f32$\
-      $(call if_multiarch,:loongarch64-linux-gnuf32)
-
-    MULTILIB_OSDIRNAMES += \
-      mabi.lp64s=../lib64/sf$\
-      $(call if_multiarch,:loongarch64-linux-gnusf)
-
-endif
-+    MULTILIB_OSDIRNAMES =  mabi.lp64d=../lib
-+    MULTILIB_OSDIRNAMES += mabi.lp64f=../lib
-+    MULTILIB_OSDIRNAMES += mabi.lp64s=../lib
-- 
-2.41.0
-
@@ -24,7 +24,7 @@ CBUILDROOT="/"
 _cross_configure="--disable-bootstrap --with-sysroot=/usr/$CTARGET"

 pkgname=gcc-riscv64
-pkgver=13.2.1_git20240309
+pkgver=13.2.1_git20231014
 # i.e. 13.2.1, must match gcc/BASE-VER
 _pkgbase="${pkgver%%_git*}"
 # date component from snapshots
@@ -46,7 +46,6 @@ makedepends_host="linux-headers gmp-dev mpfr-dev mpc1-dev isl-dev zlib-dev musl-
 subpackages="g++-riscv64:gpp libstdc++-dev-riscv64:libcxx_dev"
 [ "$CHOST" = "$CTARGET" ] && subpackages="gcc-gdb gcc-doc$_target"
 replaces="libstdc++ binutils"
-options="!strip"

 : "${LANG_CXX:=true}"
 : "${LANG_D:=true}"
@@ -144,7 +143,7 @@ case "$CARCH" in
 # GDC hasn't been ported to PowerPC
 # See libphobos/configure.tgt in GCC sources for supported targets
 # riscv fails with: error: static assert  "unimplemented"
-ppc64le|riscv64|loongarch64)	LANG_D=false ;;
+ppc64le|riscv64)	LANG_D=false ;;
 # GDC does currently not work on 32-bit musl architectures.
 # This is a known upstream issue.
 # See: https://github.com/dlang/druntime/pull/3383
@@ -156,7 +155,6 @@ case "$CTARGET_ARCH" in
 arm*)		_libitm=false ;;
 mips*)		_libitm=false ;;
 riscv64)	_libitm=false ;;
-loongarch64)	_libitm=false ;;
 esac

 # Internal libffi fails to build on MIPS at the moment, need to
@@ -164,7 +162,6 @@ esac
 # the internal libffi.
 case "$CTARGET_ARCH" in
 mips*)		LANG_GO=false ;;
-loongarch64)	LANG_GO=false ;;
 esac

 # Fortran uses libquadmath if toolchain has __float128
@@ -189,11 +186,6 @@ riscv64)
 LANG_ADA=false;;
 esac

-case "$CTARGET_ARCH" in
-loongarch64)
-LANG_ADA=false;;
-esac
-
 _languages=c
 if $LANG_CXX; then
 	_languages="$_languages,c++"
@@ -277,7 +269,6 @@ source="https://dev.alpinelinux.org/archive/gcc/${_pkgbase%%.*}-$_pkgsnap/gcc-${
 	0033-libphobos-do-not-use-LFS64-symbols.patch
 	0034-libgo-fix-lfs64-use.patch
 	0036-PR110792-Early-clobber-issues-with-rot32di2-on-i386.patch
-	0037-loongarch-disable-multilib-support.patch
 	"

 # secfixes:
@@ -337,7 +328,6 @@ 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";;
 	esac

 	case "$CTARGET_ARCH" in
@@ -693,6 +683,10 @@ go() {
 	depends="gcc=$_gccrel libgo=$_gccrel !go"
 	install="$pkgname-go.post-install"

+	# See https://lists.alpinelinux.org/~alpine/devel/%3C33KG0XO61I4IL.2Z7RTAZ5J3SY6%408pit.net%3E
+	provides="go-bootstrap"
+	provider_priority=1 # lowest, see community/go
+
 	mkdir -p "$subpkgdir"/$_gcclibexec \
 		"$subpkgdir"/usr/lib \
 		"$subpkgdir"/usr/bin
@@ -793,7 +787,7 @@ gdb() {
 }

 sha512sums="
-2d1e0374ebdee526f0549319fc9c364968c52a0d4aaa16759f00453cb083fe58d8f463c47d97f3bb74a0a92e251989eb75a50ee5800b4569978c72d25446b44e  gcc-13-20240309.tar.xz
+406673a62deba759fc0532a801b3f57cabf894ea328587b23e62a707ba5767b0e3ae9b3f86bf3c6fcf13e8a3c30bc470e6598b625c8231efb629034211c162c2  gcc-13-20231014.tar.xz
 1ecffba1b07d60e1b4422302b032bbea918b674c8e12b30aa6965b544d700ce86b61e9f7b8d402c6caf59257f491a394dd0912f0948565d6eae9335ee54f3b35  0001-posix_memalign.patch
 163f282455b6a4df33f011bcd8b0440566ba0ffaeeab30d8ac52d39948980a56881ca0eff60687129d59556389a58b9d64e7768750bd70b1fe0fedbc9fc30dc2  0002-gcc-poison-system-directories.patch
 3f24bb6a50d3c45b71ea05590e32fe3e69b91377ab185352891d5035c76ed193117c6d0b314a4c364bcf136b9a9dd5c926d6c7c30ab436976c121ebfea8d3ddd  0003-specs-turn-on-Wl-z-now-by-default.patch
@@ -829,5 +823,4 @@ b325035cb7122d79c6b42ca6d3fc9e02319ed2f7cddb0639dff25d2798d2ce63812cd623462cdf95
 c474f34e6f9a4239d486a65141a133dbe8ce91427d502a57a9fd6eb403478a2b5715ba74f24c1cc0761e16eec77ba2c1ca921fb7d7bc1e040fc3703fc9559e75  0033-libphobos-do-not-use-LFS64-symbols.patch
 c4482ffc36e7894b2140800159f4cbc9a3e9011e43a69b69f4fa92d5a11e2ee645c7e21df4423dd1e0636e8890849a5719647bfbdf84f951d638f8f488cb718c  0034-libgo-fix-lfs64-use.patch
 cc1e10ac6e72db816f09325e301103109cc212a6f3de3ce0b9b038d149233c467319d203941695dbf3d7b9e2dcbbcd17609cdb056e831fcc323cd592423882d8  0036-PR110792-Early-clobber-issues-with-rot32di2-on-i386.patch
-d834f5f95f4ebe70ec0af0748c8632c99a4f57b69dc14db1a38becdfcb03406b32febf39f772f37bd145538147099fa7433edce845e14ee77cd8f38fd9774fc1  0037-loongarch-disable-multilib-support.patch
 "
@@ -1,61 +0,0 @@
-From c4f484f465a32e796ae384aa3f90e79fa218b4e9 Mon Sep 17 00:00:00 2001
-From: Jingyun Hua <huajingyun@loongson.cn>
-Date: Mon, 7 Aug 2023 15:25:58 +0800
-Subject: [PATCH] loongarch disable multilib support
-
-Signed-off-by: Jingyun Hua <huajingyun@loongson.cn>
---
- gcc/config/loongarch/linux.h    | 10 +---------
- gcc/config/loongarch/t-linux    | 18 +++---------------
- 3 files changed, 5 insertions(+), 25 deletions(-)
-
-diff --git a/gcc/config/loongarch/linux.h b/gcc/config/loongarch/linux.h
-index 9059d2441..23eaff0cc 100644
--- a/gcc/config/loongarch/linux.h
-+++ b/gcc/config/loongarch/linux.h
-@@ -22,15 +22,7 @@ along with GCC; see the file COPYING3.  If not see
-  * can work in a multilib environment.  */
- 
- #if defined(LA_DISABLE_MULTILIB) && defined(LA_DISABLE_MULTIARCH)
-
-  #if DEFAULT_ABI_BASE == ABI_BASE_LP64D
-    #define ABI_LIBDIR "lib64"
-  #elif DEFAULT_ABI_BASE == ABI_BASE_LP64F
-    #define ABI_LIBDIR "lib64/f32"
-  #elif DEFAULT_ABI_BASE == ABI_BASE_LP64S
-    #define ABI_LIBDIR "lib64/sf"
-  #endif
-
-+    #define ABI_LIBDIR "lib"
- #endif
- 
- #ifndef ABI_LIBDIR
-diff --git a/gcc/config/loongarch/t-linux b/gcc/config/loongarch/t-linux
-index e40da1792..f72c6e878 100644
--- a/gcc/config/loongarch/t-linux
-+++ b/gcc/config/loongarch/t-linux
-@@ -36,18 +36,6 @@ else
- endif
- 
- # Don't define MULTILIB_OSDIRNAMES if multilib is disabled.
-ifeq ($(filter LA_DISABLE_MULTILIB,$(tm_defines)),)
-
-    MULTILIB_OSDIRNAMES = \
-      mabi.lp64d=../lib64$\
-      $(call if_multiarch,:loongarch64-linux-gnu)
-
-    MULTILIB_OSDIRNAMES += \
-      mabi.lp64f=../lib64/f32$\
-      $(call if_multiarch,:loongarch64-linux-gnuf32)
-
-    MULTILIB_OSDIRNAMES += \
-      mabi.lp64s=../lib64/sf$\
-      $(call if_multiarch,:loongarch64-linux-gnusf)
-
-endif
-+    MULTILIB_OSDIRNAMES =  mabi.lp64d=../lib
-+    MULTILIB_OSDIRNAMES += mabi.lp64f=../lib
-+    MULTILIB_OSDIRNAMES += mabi.lp64s=../lib
-- 
-2.41.0
-
@@ -24,7 +24,7 @@ CBUILDROOT="/"
 _cross_configure="--disable-bootstrap --with-sysroot=/usr/$CTARGET"

 pkgname=gcc-x86
-pkgver=13.2.1_git20240309
+pkgver=13.2.1_git20231014
 # i.e. 13.2.1, must match gcc/BASE-VER
 _pkgbase="${pkgver%%_git*}"
 # date component from snapshots
@@ -46,7 +46,6 @@ makedepends_host="linux-headers gmp-dev mpfr-dev mpc1-dev isl-dev zlib-dev musl-
 subpackages="g++-x86:gpp libstdc++-dev-x86:libcxx_dev"
 [ "$CHOST" = "$CTARGET" ] && subpackages="gcc-gdb gcc-doc$_target"
 replaces="libstdc++ binutils"
-options="!strip"

 : "${LANG_CXX:=true}"
 : "${LANG_D:=true}"
@@ -144,7 +143,7 @@ case "$CARCH" in
 # GDC hasn't been ported to PowerPC
 # See libphobos/configure.tgt in GCC sources for supported targets
 # riscv fails with: error: static assert  "unimplemented"
-ppc64le|riscv64|loongarch64)	LANG_D=false ;;
+ppc64le|riscv64)	LANG_D=false ;;
 # GDC does currently not work on 32-bit musl architectures.
 # This is a known upstream issue.
 # See: https://github.com/dlang/druntime/pull/3383
@@ -156,7 +155,6 @@ case "$CTARGET_ARCH" in
 arm*)		_libitm=false ;;
 mips*)		_libitm=false ;;
 riscv64)	_libitm=false ;;
-loongarch64)	_libitm=false ;;
 esac

 # Internal libffi fails to build on MIPS at the moment, need to
@@ -164,7 +162,6 @@ esac
 # the internal libffi.
 case "$CTARGET_ARCH" in
 mips*)		LANG_GO=false ;;
-loongarch64)	LANG_GO=false ;;
 esac

 # Fortran uses libquadmath if toolchain has __float128
@@ -189,11 +186,6 @@ riscv64)
 LANG_ADA=false;;
 esac

-case "$CTARGET_ARCH" in
-loongarch64)
-LANG_ADA=false;;
-esac
-
 _languages=c
 if $LANG_CXX; then
 	_languages="$_languages,c++"
@@ -277,7 +269,6 @@ source="https://dev.alpinelinux.org/archive/gcc/${_pkgbase%%.*}-$_pkgsnap/gcc-${
 	0033-libphobos-do-not-use-LFS64-symbols.patch
 	0034-libgo-fix-lfs64-use.patch
 	0036-PR110792-Early-clobber-issues-with-rot32di2-on-i386.patch
-	0037-loongarch-disable-multilib-support.patch
 	"

 # secfixes:
@@ -337,7 +328,6 @@ 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";;
 	esac

 	case "$CTARGET_ARCH" in
@@ -693,6 +683,10 @@ go() {
 	depends="gcc=$_gccrel libgo=$_gccrel !go"
 	install="$pkgname-go.post-install"

+	# See https://lists.alpinelinux.org/~alpine/devel/%3C33KG0XO61I4IL.2Z7RTAZ5J3SY6%408pit.net%3E
+	provides="go-bootstrap"
+	provider_priority=1 # lowest, see community/go
+
 	mkdir -p "$subpkgdir"/$_gcclibexec \
 		"$subpkgdir"/usr/lib \
 		"$subpkgdir"/usr/bin
@@ -793,7 +787,7 @@ gdb() {
 }

 sha512sums="
-2d1e0374ebdee526f0549319fc9c364968c52a0d4aaa16759f00453cb083fe58d8f463c47d97f3bb74a0a92e251989eb75a50ee5800b4569978c72d25446b44e  gcc-13-20240309.tar.xz
+406673a62deba759fc0532a801b3f57cabf894ea328587b23e62a707ba5767b0e3ae9b3f86bf3c6fcf13e8a3c30bc470e6598b625c8231efb629034211c162c2  gcc-13-20231014.tar.xz
 1ecffba1b07d60e1b4422302b032bbea918b674c8e12b30aa6965b544d700ce86b61e9f7b8d402c6caf59257f491a394dd0912f0948565d6eae9335ee54f3b35  0001-posix_memalign.patch
 163f282455b6a4df33f011bcd8b0440566ba0ffaeeab30d8ac52d39948980a56881ca0eff60687129d59556389a58b9d64e7768750bd70b1fe0fedbc9fc30dc2  0002-gcc-poison-system-directories.patch
 3f24bb6a50d3c45b71ea05590e32fe3e69b91377ab185352891d5035c76ed193117c6d0b314a4c364bcf136b9a9dd5c926d6c7c30ab436976c121ebfea8d3ddd  0003-specs-turn-on-Wl-z-now-by-default.patch
@@ -829,5 +823,4 @@ b325035cb7122d79c6b42ca6d3fc9e02319ed2f7cddb0639dff25d2798d2ce63812cd623462cdf95
 c474f34e6f9a4239d486a65141a133dbe8ce91427d502a57a9fd6eb403478a2b5715ba74f24c1cc0761e16eec77ba2c1ca921fb7d7bc1e040fc3703fc9559e75  0033-libphobos-do-not-use-LFS64-symbols.patch
 c4482ffc36e7894b2140800159f4cbc9a3e9011e43a69b69f4fa92d5a11e2ee645c7e21df4423dd1e0636e8890849a5719647bfbdf84f951d638f8f488cb718c  0034-libgo-fix-lfs64-use.patch
 cc1e10ac6e72db816f09325e301103109cc212a6f3de3ce0b9b038d149233c467319d203941695dbf3d7b9e2dcbbcd17609cdb056e831fcc323cd592423882d8  0036-PR110792-Early-clobber-issues-with-rot32di2-on-i386.patch
-d834f5f95f4ebe70ec0af0748c8632c99a4f57b69dc14db1a38becdfcb03406b32febf39f772f37bd145538147099fa7433edce845e14ee77cd8f38fd9774fc1  0037-loongarch-disable-multilib-support.patch
 "
@@ -1,61 +0,0 @@
-From c4f484f465a32e796ae384aa3f90e79fa218b4e9 Mon Sep 17 00:00:00 2001
-From: Jingyun Hua <huajingyun@loongson.cn>
-Date: Mon, 7 Aug 2023 15:25:58 +0800
-Subject: [PATCH] loongarch disable multilib support
-
-Signed-off-by: Jingyun Hua <huajingyun@loongson.cn>
---
- gcc/config/loongarch/linux.h    | 10 +---------
- gcc/config/loongarch/t-linux    | 18 +++---------------
- 3 files changed, 5 insertions(+), 25 deletions(-)
-
-diff --git a/gcc/config/loongarch/linux.h b/gcc/config/loongarch/linux.h
-index 9059d2441..23eaff0cc 100644
--- a/gcc/config/loongarch/linux.h
-+++ b/gcc/config/loongarch/linux.h
-@@ -22,15 +22,7 @@ along with GCC; see the file COPYING3.  If not see
-  * can work in a multilib environment.  */
- 
- #if defined(LA_DISABLE_MULTILIB) && defined(LA_DISABLE_MULTIARCH)
-
-  #if DEFAULT_ABI_BASE == ABI_BASE_LP64D
-    #define ABI_LIBDIR "lib64"
-  #elif DEFAULT_ABI_BASE == ABI_BASE_LP64F
-    #define ABI_LIBDIR "lib64/f32"
-  #elif DEFAULT_ABI_BASE == ABI_BASE_LP64S
-    #define ABI_LIBDIR "lib64/sf"
-  #endif
-
-+    #define ABI_LIBDIR "lib"
- #endif
- 
- #ifndef ABI_LIBDIR
-diff --git a/gcc/config/loongarch/t-linux b/gcc/config/loongarch/t-linux
-index e40da1792..f72c6e878 100644
--- a/gcc/config/loongarch/t-linux
-+++ b/gcc/config/loongarch/t-linux
-@@ -36,18 +36,6 @@ else
- endif
- 
- # Don't define MULTILIB_OSDIRNAMES if multilib is disabled.
-ifeq ($(filter LA_DISABLE_MULTILIB,$(tm_defines)),)
-
-    MULTILIB_OSDIRNAMES = \
-      mabi.lp64d=../lib64$\
-      $(call if_multiarch,:loongarch64-linux-gnu)
-
-    MULTILIB_OSDIRNAMES += \
-      mabi.lp64f=../lib64/f32$\
-      $(call if_multiarch,:loongarch64-linux-gnuf32)
-
-    MULTILIB_OSDIRNAMES += \
-      mabi.lp64s=../lib64/sf$\
-      $(call if_multiarch,:loongarch64-linux-gnusf)
-
-endif
-+    MULTILIB_OSDIRNAMES =  mabi.lp64d=../lib
-+    MULTILIB_OSDIRNAMES += mabi.lp64f=../lib
-+    MULTILIB_OSDIRNAMES += mabi.lp64s=../lib
-- 
-2.41.0
-
@@ -24,7 +24,7 @@ CBUILDROOT="/"
 _cross_configure="--disable-bootstrap --with-sysroot=/usr/$CTARGET"

 pkgname=gcc-x86_64
-pkgver=13.2.1_git20240309
+pkgver=13.2.1_git20231014
 # i.e. 13.2.1, must match gcc/BASE-VER
 _pkgbase="${pkgver%%_git*}"
 # date component from snapshots
@@ -46,7 +46,6 @@ makedepends_host="linux-headers gmp-dev mpfr-dev mpc1-dev isl-dev zlib-dev musl-
 subpackages="g++-x86_64:gpp libstdc++-dev-x86_64:libcxx_dev"
 [ "$CHOST" = "$CTARGET" ] && subpackages="gcc-gdb gcc-doc$_target"
 replaces="libstdc++ binutils"
-options="!strip"

 : "${LANG_CXX:=true}"
 : "${LANG_D:=true}"
@@ -144,7 +143,7 @@ case "$CARCH" in
 # GDC hasn't been ported to PowerPC
 # See libphobos/configure.tgt in GCC sources for supported targets
 # riscv fails with: error: static assert  "unimplemented"
-ppc64le|riscv64|loongarch64)	LANG_D=false ;;
+ppc64le|riscv64)	LANG_D=false ;;
 # GDC does currently not work on 32-bit musl architectures.
 # This is a known upstream issue.
 # See: https://github.com/dlang/druntime/pull/3383
@@ -156,7 +155,6 @@ case "$CTARGET_ARCH" in
 arm*)		_libitm=false ;;
 mips*)		_libitm=false ;;
 riscv64)	_libitm=false ;;
-loongarch64)	_libitm=false ;;
 esac

 # Internal libffi fails to build on MIPS at the moment, need to
@@ -164,7 +162,6 @@ esac
 # the internal libffi.
 case "$CTARGET_ARCH" in
 mips*)		LANG_GO=false ;;
-loongarch64)	LANG_GO=false ;;
 esac

 # Fortran uses libquadmath if toolchain has __float128
@@ -189,11 +186,6 @@ riscv64)
 LANG_ADA=false;;
 esac

-case "$CTARGET_ARCH" in
-loongarch64)
-LANG_ADA=false;;
-esac
-
 _languages=c
 if $LANG_CXX; then
 	_languages="$_languages,c++"
@@ -277,7 +269,6 @@ source="https://dev.alpinelinux.org/archive/gcc/${_pkgbase%%.*}-$_pkgsnap/gcc-${
 	0033-libphobos-do-not-use-LFS64-symbols.patch
 	0034-libgo-fix-lfs64-use.patch
 	0036-PR110792-Early-clobber-issues-with-rot32di2-on-i386.patch
-	0037-loongarch-disable-multilib-support.patch
 	"

 # secfixes:
@@ -337,7 +328,6 @@ 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";;
 	esac

 	case "$CTARGET_ARCH" in
@@ -693,6 +683,10 @@ go() {
 	depends="gcc=$_gccrel libgo=$_gccrel !go"
 	install="$pkgname-go.post-install"

+	# See https://lists.alpinelinux.org/~alpine/devel/%3C33KG0XO61I4IL.2Z7RTAZ5J3SY6%408pit.net%3E
+	provides="go-bootstrap"
+	provider_priority=1 # lowest, see community/go
+
 	mkdir -p "$subpkgdir"/$_gcclibexec \
 		"$subpkgdir"/usr/lib \
 		"$subpkgdir"/usr/bin
@@ -793,7 +787,7 @@ gdb() {
 }

 sha512sums="
-2d1e0374ebdee526f0549319fc9c364968c52a0d4aaa16759f00453cb083fe58d8f463c47d97f3bb74a0a92e251989eb75a50ee5800b4569978c72d25446b44e  gcc-13-20240309.tar.xz
+406673a62deba759fc0532a801b3f57cabf894ea328587b23e62a707ba5767b0e3ae9b3f86bf3c6fcf13e8a3c30bc470e6598b625c8231efb629034211c162c2  gcc-13-20231014.tar.xz
 1ecffba1b07d60e1b4422302b032bbea918b674c8e12b30aa6965b544d700ce86b61e9f7b8d402c6caf59257f491a394dd0912f0948565d6eae9335ee54f3b35  0001-posix_memalign.patch
 163f282455b6a4df33f011bcd8b0440566ba0ffaeeab30d8ac52d39948980a56881ca0eff60687129d59556389a58b9d64e7768750bd70b1fe0fedbc9fc30dc2  0002-gcc-poison-system-directories.patch
 3f24bb6a50d3c45b71ea05590e32fe3e69b91377ab185352891d5035c76ed193117c6d0b314a4c364bcf136b9a9dd5c926d6c7c30ab436976c121ebfea8d3ddd  0003-specs-turn-on-Wl-z-now-by-default.patch
@@ -829,5 +823,4 @@ b325035cb7122d79c6b42ca6d3fc9e02319ed2f7cddb0639dff25d2798d2ce63812cd623462cdf95
 c474f34e6f9a4239d486a65141a133dbe8ce91427d502a57a9fd6eb403478a2b5715ba74f24c1cc0761e16eec77ba2c1ca921fb7d7bc1e040fc3703fc9559e75  0033-libphobos-do-not-use-LFS64-symbols.patch
 c4482ffc36e7894b2140800159f4cbc9a3e9011e43a69b69f4fa92d5a11e2ee645c7e21df4423dd1e0636e8890849a5719647bfbdf84f951d638f8f488cb718c  0034-libgo-fix-lfs64-use.patch
 cc1e10ac6e72db816f09325e301103109cc212a6f3de3ce0b9b038d149233c467319d203941695dbf3d7b9e2dcbbcd17609cdb056e831fcc323cd592423882d8  0036-PR110792-Early-clobber-issues-with-rot32di2-on-i386.patch
-d834f5f95f4ebe70ec0af0748c8632c99a4f57b69dc14db1a38becdfcb03406b32febf39f772f37bd145538147099fa7433edce845e14ee77cd8f38fd9774fc1  0037-loongarch-disable-multilib-support.patch
 "
@@ -3,7 +3,7 @@

 pkgname=grub-efi-x86
 pkgver=2.12
-pkgrel=3
+pkgrel=1

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

 sha512sums="
-4bd0750236a556ad833c27892a55624a324e8ec7cadb0b7287cabd3a9cdded836357ae959aea7ba828be8727b86c6ed4844a1572b68ad3ce3f3e6f913e43ae72  grub-efi-2.12-r3-x86-edge.apk
+775d65b51f3438dc05ee26e5a10ae348a045b85b072a3d14714bc89181ba5d26a92e6991b8dafb00a4ff639e8be455b1f2ba5f044b4fa0c4f650a7ab455c4bc2  grub-efi-2.12-r1-x86-edge.apk
 "
@@ -7,8 +7,8 @@ if [ -z "$(type -t arch_to_hostspec)" ]; then
 fi

 pkgname=musl-aarch64
-pkgver=1.2.5
-pkgrel=0
+pkgver=1.2.4_git20230717
+pkgrel=5
 arch="x86_64"
 subpackages="musl-dev-aarch64:package_dev"

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

 sha512sums="
-dddd12728842e84bf7d532901d9b9e26e2c8c86e25a3625329586c9088ec9b3825ce3e512c56b7e875b923905308b89494d31d7ca05ebda5485bd00de3954236  musl-1.2.5-r0-aarch64-edge.apk
-061e68319d2069c211169d7f39b1da572a4c0ab56f8cfe5267c024921ea0e5f44ecc1cca6051bebaa9c83d067f0fd2cbc6b6b73d0e3075410eaf889a25cc82b4  musl-dev-1.2.5-r0-aarch64-edge.apk
+478704707b55072b9be8747e8c3bf3a20832d0329f63429fae2048e6b9a0674e31e92b4c1b8af87f65f84270711fef6b7ce54653448e580e532fa2c94e3761e1  musl-1.2.4_git20230717-r5-aarch64-edge.apk
+24471c9d781ce9920d06ab79296afb30ce61563729bb319ee8cd8feb960d1c05e5f96edb9464fcdb95b6c16fde788400408dd2e768e69ce13cc15ad3be54a969  musl-dev-1.2.4_git20230717-r5-aarch64-edge.apk
 "
@@ -7,8 +7,8 @@ if [ -z "$(type -t arch_to_hostspec)" ]; then
 fi

 pkgname=musl-armhf
-pkgver=1.2.5
-pkgrel=0
+pkgver=1.2.4_git20230717
+pkgrel=5
 arch="x86_64"
 subpackages="musl-dev-armhf:package_dev"

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

 sha512sums="
-4d76f479017b6f666c36782183f3bdb3e58a48f7400cd125c129e380a8654cf99f685f8d3e97b51cb0199b59720a320e251dd9b89fe55ef8f542a043ab3e7355  musl-1.2.5-r0-armhf-edge.apk
-7fa4e9ed4acb6292d46939a63e572eb92085e577bbfce75139a3ebef910434230fcbbb7a236efde7ad6d150d84e31c46edcfe835f4102cb9e68f062eb8488a1e  musl-dev-1.2.5-r0-armhf-edge.apk
+c0bdfbfc2c1f475c17850e7462cf286e9d8ce874deb03d536d208fcdeb45b35c761737f693be3be9711c15547cd9d2bbafae45280fc9b0291192c2489da0790f  musl-1.2.4_git20230717-r5-armhf-edge.apk
+1197968b53adca7c482d23ea2ca99d21fe905b554b83c30b960a4e64dda6ff40009745cd18621bd363b4994ccbc8b9b763b6c3105f6f6283dc8ee1305ab7206e  musl-dev-1.2.4_git20230717-r5-armhf-edge.apk
 "
@@ -7,8 +7,8 @@ if [ -z "$(type -t arch_to_hostspec)" ]; then
 fi

 pkgname=musl-armv7
-pkgver=1.2.5
-pkgrel=0
+pkgver=1.2.4_git20230717
+pkgrel=5
 arch="x86_64"
 subpackages="musl-dev-armv7:package_dev"

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

 sha512sums="
-74e482403f77b9d302a4bb0ad6b86a18e81b5be0eb987296a4b0033c996e474b86eac079abc52bd8f02723aa242ea2a74e61bbd0eee036fbf79a21ae250a6e04  musl-1.2.5-r0-armv7-edge.apk
-02321d629aaa3712546b01645f1eb308f5e25e49bc3c2c42eff3a7cf84cd60327c6bc9818ebeb7d1d9556ddfaa2e132fdab0dc2142eec4df3a799e3402329c49  musl-dev-1.2.5-r0-armv7-edge.apk
+5236dadbdb41e9543426592cf7e64e548fec59742e4943a99bb18e3cb93c9ae1287c9ac34c2de7fcb58bd1f94df4313324e8afa1160acc4929fb91f06754c77c  musl-1.2.4_git20230717-r5-armv7-edge.apk
+1877267544198d867752d02cb8cbe6672c4bd1fcd20ac8e5e4c614675b31921f3da9bc2a68f769fbd726ffc0c7125406387e01a9ebf49d0e56d49e1ce257e71d  musl-dev-1.2.4_git20230717-r5-armv7-edge.apk
 "
@@ -7,8 +7,8 @@ if [ -z "$(type -t arch_to_hostspec)" ]; then
 fi

 pkgname=musl-riscv64
-pkgver=1.2.5
-pkgrel=0
+pkgver=1.2.4_git20230717
+pkgrel=5
 arch="x86_64"
 subpackages="musl-dev-riscv64:package_dev"

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

 sha512sums="
-c11fb5eed8dab05504d88660a4750981a40020a1609b4ec4f9184cf7645283893e7cafc48da471012a4095699d371517cc9e09c0ec73fef4612280c95feebca2  musl-1.2.5-r0-riscv64-edge.apk
-77eba42ed78e680419f838f47a9a9f17d42288259540b70792af23b22f85ba1d2f87958e7db77b11b43629d8593fa58a02902453ecb0a46dd7c33cfca750b820  musl-dev-1.2.5-r0-riscv64-edge.apk
+3f924270fb0ec0fa8fb5a23f0f9d6d9148affcac89cae413940dc04465d375415fcf0aff734754e2ac0b9ba2113c10f836b186908d75cdccec4d923eacafb961  musl-1.2.4_git20230717-r5-riscv64-edge.apk
+76ae321a9d3895f8367968226a6a492b268ae582a83e74d4152cf88dd48aaa79814532e8e1a057cba7c29b926f48d2309f2c12a16b991649cb8f713455aa5501  musl-dev-1.2.4_git20230717-r5-riscv64-edge.apk
 "
@@ -7,8 +7,8 @@ if [ -z "$(type -t arch_to_hostspec)" ]; then
 fi

 pkgname=musl-x86
-pkgver=1.2.5
-pkgrel=0
+pkgver=1.2.4_git20230717
+pkgrel=5
 arch="x86_64"
 subpackages="musl-dev-x86:package_dev"

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

 sha512sums="
-7403427bbe6683739ce00c0396dc4bfa8fce2f3e4957d12bc6c31bfb1a60bafca9e7ba266d1ba7ca469ab3738874965cf25e8f3bd838c002b4e5aad702a79e18  musl-1.2.5-r0-x86-edge.apk
-f5b0dfe7543bd7d1de3bfc8617c61fb7287227ea4dd9a722bfd4ec99e8a9405826973375a81a380b04bcba419c18e292cf60aaf1c9503eec3b420ed7adbacd68  musl-dev-1.2.5-r0-x86-edge.apk
+c93eec26b3bd7b2bc5c8859d71a9dfcfc3c0d346183d97b8600d57270585ce57ac9f84dd633b8d8ae4eae0324aa6f8e98c67a0bdd33e2e8994d721e208e07a3c  musl-1.2.4_git20230717-r5-x86-edge.apk
+77723100d0b2ae558816e4b9eb86c07d9ed64c69a84d6a07904d0806646e800a0f81b3a158948d5681394b9e3304a10bd0ca26445f5d4630f921bb87328d3afe  musl-dev-1.2.4_git20230717-r5-x86-edge.apk
 "
@@ -7,8 +7,8 @@ if [ -z "$(type -t arch_to_hostspec)" ]; then
 fi

 pkgname=musl-x86_64
-pkgver=1.2.5
-pkgrel=0
+pkgver=1.2.4_git20230717
+pkgrel=5
 arch="aarch64"
 subpackages="musl-dev-x86_64:package_dev"

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

 sha512sums="
-8bb997e077850195621916ee0722be7e054086fa5c2907c7d290ee8892910c073e3aece13a2839589966987711f4af6b2f4bffdc6c45d636a24655ef9cbec101  musl-1.2.5-r0-x86_64-edge.apk
-5d93191c3c9bf03b466dc169b57e519f0165c6551d117ae09538907c57a49f58afa3c9225aafc7a61625f224276eff4ee2dbe79d65cf684d03a46c24dd78aa4c  musl-dev-1.2.5-r0-x86_64-edge.apk
+4ea90456fcff08cb7c9065f4c790c5d0a3b2b17224f2490f6954c2de7ddb64559a6e1f0df1f13629da5d8f619fc1d9737a6982bb438120641bf1d717004e2688  musl-1.2.4_git20230717-r5-x86_64-edge.apk
+0ce4a260cb8c6fc9d412d5164d848ee6155d4ea4fca9dff89d5b08b8e2c0fcde5e635846ca762be54a6df139aa178902fc2594ffe76f94ae1e5414a67f0707a3  musl-dev-1.2.4_git20230717-r5-x86_64-edge.apk
 "
@@ -1,70 +0,0 @@
-From 3810f128e9ecf04cf07d243cd377fcb6046cfd73 Mon Sep 17 00:00:00 2001
-From: Newbyte <newbyte@postmarketos.org>
-Date: Tue, 30 Apr 2024 17:57:20 +0200
-Subject: [PATCH] ARM: 8933/1: replace Sun/Solaris style flag on section
-
-Taken from
-linux3.4-ARM-8933-1-replace-Sun-Solaris-style-flag-on-section.patch
-and adapted for the Exynos 4412 vendor sources.
---
- arch/arm/boot/bootp/init.S            | 2 +-
- arch/arm/boot/compressed/big-endian.S | 2 +-
- arch/arm/boot/compressed/head.S       | 2 +-
- arch/arm/mm/proc-v7.S                 | 2 +-
- 4 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/arch/arm/boot/bootp/init.S b/arch/arm/boot/bootp/init.S
-index 78b50807516..868eeeaaa46 100644
--- a/arch/arm/boot/bootp/init.S
-+++ b/arch/arm/boot/bootp/init.S
-@@ -16,7 +16,7 @@
-  *  size immediately following the kernel, we could build this into
-  *  a binary blob, and concatenate the zImage using the cat command.
-  */
-		.section .start,#alloc,#execinstr
-+		.section .start, "ax"
- 		.type	_start, #function
- 		.globl	_start
- 
-diff --git a/arch/arm/boot/compressed/big-endian.S b/arch/arm/boot/compressed/big-endian.S
-index 25ab26f1c6f..f22428e275f 100644
--- a/arch/arm/boot/compressed/big-endian.S
-+++ b/arch/arm/boot/compressed/big-endian.S
-@@ -5,7 +5,7 @@
-  *  Author: Nicolas Pitre
-  */
- 
-	.section ".start", #alloc, #execinstr
-+	.section ".start", "ax"
- 
- 	mrc	p15, 0, r0, c1, c0, 0	@ read control reg
- 	orr	r0, r0, #(1 << 7)	@ enable big endian mode
-diff --git a/arch/arm/boot/compressed/head.S b/arch/arm/boot/compressed/head.S
-index 63cfa2e9236..3cd67aa3855 100644
--- a/arch/arm/boot/compressed/head.S
-+++ b/arch/arm/boot/compressed/head.S
-@@ -112,7 +112,7 @@
- #endif
- 		.endm
- 
-		.section ".start", #alloc, #execinstr
-+		.section ".start", "ax"
- /*
-  * sort out different calling conventions
-  */
-diff --git a/arch/arm/mm/proc-v7.S b/arch/arm/mm/proc-v7.S
-index e1687990af9..a479702f198 100644
--- a/arch/arm/mm/proc-v7.S
-+++ b/arch/arm/mm/proc-v7.S
-@@ -519,7 +519,7 @@ __v7_setup_stack:
- 	string	cpu_elf_name, "v7"
- 	.align
- 
-	.section ".proc.info.init", #alloc, #execinstr
-+	.section ".proc.info.init", "ax"
- 
- 	/*
- 	 * Standard v7 proc info content
-- 
-2.44.0
-
@@ -1,22 +0,0 @@
-From c6b821b1281f7ce2b54aad3b0b2acd0e29039c8f Mon Sep 17 00:00:00 2001
-From: Stefan Hansson <newbyte@postmarketos.org>
-Date: Mon, 6 May 2024 10:59:58 +0200
-Subject: [PATCH] Fix lzma piggy
-
---
- arch/arm/boot/compressed/piggy.lzma.S | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/arch/arm/boot/compressed/piggy.lzma.S b/arch/arm/boot/compressed/piggy.lzma.S
-index d7e69cffbc0..cfea81ae8f4 100644
--- a/arch/arm/boot/compressed/piggy.lzma.S
-+++ b/arch/arm/boot/compressed/piggy.lzma.S
-@@ -1,4 +1,4 @@
-	.section .piggydata,#alloc
-+	.section .piggydata, "a"
- 	.globl	input_data
- input_data:
- 	.incbin	"arch/arm/boot/compressed/piggy.lzma"
-- 
-2.45.0
-
@@ -1,22 +0,0 @@
-From 6083916292864215fe4af6c0829186d5cc520f7f Mon Sep 17 00:00:00 2001
-From: Stefan Hansson <newbyte@postmarketos.org>
-Date: Mon, 6 May 2024 19:08:35 +0200
-Subject: [PATCH] Fix lzo piggy
-
---
- arch/arm/boot/compressed/piggy.lzo.S | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/arch/arm/boot/compressed/piggy.lzo.S b/arch/arm/boot/compressed/piggy.lzo.S
-index a425ad95..236976d8 100644
--- a/arch/arm/boot/compressed/piggy.lzo.S
-+++ b/arch/arm/boot/compressed/piggy.lzo.S
-@@ -1,4 +1,4 @@
-	.section .piggydata,#alloc
-+	.section .piggydata, "a"
- 	.globl	input_data
- input_data:
- 	.incbin	"arch/arm/boot/compressed/piggy.lzo"
-- 
-2.45.0
-
@@ -1,10 +0,0 @@
-diff --git a/arch/arm/boot/compressed/piggy.gzip.S b/arch/arm/boot/compressed/piggy.gzip.S
-index a68adf91a16..175ed02a6ac 100644
--- a/arch/arm/boot/compressed/piggy.gzip.S
-+++ b/arch/arm/boot/compressed/piggy.gzip.S
-@@ -1,4 +1,4 @@
-	.section .piggydata,#alloc
-+	.section .piggydata, "a"
- 	.globl	input_data
- input_data:
- 	.incbin	"arch/arm/boot/compressed/piggy.gzip"
@@ -1,46 +0,0 @@
-# Archived: Downstream port, maybe useful for EPDC performance improvement
-# needs special userspace to show up anything
-# Reference: <https://postmarketos.org/devicepkg>
-pkgname=device-kobo-clara-downstream
-pkgdesc="Kobo Clara HD downstream"
-pkgver=0.1
-pkgrel=0
-url="https://postmarketos.org"
-license="MIT"
-arch="armv7"
-options="!check !archcheck"
-depends="
-	postmarketos-base
-	u-boot-kobo-clara-downstream
-	u-boot-tools
-	linux-kobo-clara-downstream
-"
-makedepends="devicepkg-dev"
-subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
-
-source="
-	deviceinfo
-	uboot-script-downstream.cmd
-"
-
-build() {
-	devicepkg_build $startdir $pkgname
-}
-
-package() {
-	devicepkg_package $startdir $pkgname
-	mkimage -A arm -O linux -T script -n postmarketOS \
-		-d "$srcdir"/uboot-script-downstream.cmd "$srcdir/boot-downstream.scr"
-	install -Dm644 "$srcdir/boot-downstream.scr" "$pkgdir/boot/boot.scr"
-}
-
-nonfree_firmware() {
-	pkgdesc="Kobo Clara HD firmware"
-	depends="firmware-kobo-clara-downstream"
-	mkdir "$subpkgdir"
-}
-
-sha512sums="
-84b9e5385b7fd77af6891b31d7e95ec424645f741d54168d3d38f6f703071d622829d9f7cf5a29136bf6eb9ec5b2a50a05efe76ddc3e047bb4a69e197fbfde24  deviceinfo
-4bfc2714a2670efc451860bd97d36ba12559e00aed41afdde1ac3e01b41458390358ac7f6bc96a6dee6be6a34f534da52d845b02df0566b25f4868774ef69b1d  uboot-script-downstream.cmd
-"
@@ -1,28 +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="Kobo Clara HD"
-deviceinfo_manufacturer="Kobo"
-deviceinfo_codename="kobo-clara-downstream"
-deviceinfo_year="2018"
-deviceinfo_arch="armv7"
-deviceinfo_dtb="imx6sll-e60k02"
-
-# Device related
-deviceinfo_chassis="tablet"
-deviceinfo_keyboard="false"
-deviceinfo_external_storage="true"
-deviceinfo_screen_width="1072"
-deviceinfo_screen_height="1448"
-
-# Bootloader related
-deviceinfo_flash_method="none"
-deviceinfo_boot_part_start="49152"
-deviceinfo_getty="ttymxc0;115200"
-deviceinfo_generate_legacy_uboot_initfs="true"
-deviceinfo_no_framebuffer="true"
-
-deviceinfo_sd_embed_firmware_step_size="512"
-deviceinfo_sd_embed_firmware="u-boot/kobo-clara/u-boot.imx:2,firmware/kobo-clara/hwcfg+header.bin:1023,firmware/kobo-clara/ntxfw-E60K00+header.bin:1029,u-boot/kobo-clara/u-boot-env.bin:1536"
@@ -1,59 +0,0 @@
-# Archived: Downstream port, only for testing. Use mainline port (samsung-on7xelte)!
-# Reference: <https://postmarketos.org/devicepkg>
-pkgname=device-samsung-on7xelte-downstream
-pkgdesc="Samsung Galaxy J7 Prime"
-pkgver=1
-pkgrel=0
-url="https://postmarketos.org"
-license="MIT"
-arch="aarch64"
-options="!check !archcheck"
-depends="
-	linux-samsung-on7xelte
-	mkbootimg
-	msm-fb-refresher
-	postmarketos-base
-	samsungipcd
-"
-subpackages="$pkgname-nonfree-firmware:nonfree_firmware $pkgname-lightdm"
-makedepends="devicepkg-dev"
-install="$pkgname.post-install"
-source="
-	deviceinfo
-	lightdm.conf
-	mount-efs.rc-init
-	samsungipcd.rc-conf
-"
-
-build() {
-	devicepkg_build $startdir $pkgname
-}
-
-package() {
-	devicepkg_package $startdir $pkgname
-
-	# Mounting EFS Partition
-	install -Dm755 mount-efs.rc-init "$pkgdir"/etc/init.d/mount-efs
-
-	# Modem Configuration - samsungipcd
-	install -Dm644 samsungipcd.rc-conf "$pkgdir"/etc/conf.d/samsungipcd
-}
-
-nonfree_firmware() {
-	pkgdesc="Proprietary Firmware blobs"
-	depends="firmware-samsung-on7xelte"
-	mkdir "$subpkgdir"
-}
-
-lightdm() {
-	install_if="$pkgname=$pkgver-r$pkgrel lightdm"
-	install -Dm644 lightdm.conf \
-		"$subpkgdir"/etc/lightdm/lightdm.conf.d/00-on7xelte.conf
-}
-
-sha512sums="
-d342e7d79922d2e4a313e6c0ad20172e841886aa9517522460699da0dc66cd83cfeab986e468b0427ebcd64d54ffbc39cf3ba56c5d839b560e34cbe6e36526f1  deviceinfo
-baee319b6d2f49a15680b0f322ec3e398a071d73fbf7713d14f26a1d027f8950457a482ac3f019605af3dfcf25bbb33ebaa0ffde181f7f96d911d56251c81eef  lightdm.conf
-efbe3d6217854c0131e61f9f3722100d349cb0673f4923bc3d56dae30a6346b0c33e676a39fc4c080150f6ea9457bf268abf870eea916a7d5daae1a22642a2b8  mount-efs.rc-init
-3e5bb764529010d2b6b1f2759a7799f665d140aebcee2dd63433e68cd4282e09b5d3b34fb7c21e737595b406501e7f02ece4592651c60e4c2b9419de4aedb438  samsungipcd.rc-conf
-"
@@ -1,33 +0,0 @@
-# Reference: <https://postmarketos.org/deviceinfo>
-# Please use double quotes only. You can source this file in shell
-# scripts.
-
-deviceinfo_format_version="0"
-deviceinfo_name="Samsung Galaxy J7 Prime"
-deviceinfo_manufacturer="Samsung"
-deviceinfo_codename="samsung-on7xelte-downstream"
-deviceinfo_year="2016"
-deviceinfo_arch="aarch64"
-
-# Device related
-deviceinfo_chassis="handset"
-deviceinfo_keyboard="false"
-deviceinfo_external_storage="true"
-deviceinfo_screen_width="1080"
-deviceinfo_screen_height="1920"
-
-# Bootloader related
-deviceinfo_flash_method="heimdall-bootimg"
-deviceinfo_kernel_cmdline="androidboot.selinux=permissive androidboot.selinux=permissive"
-deviceinfo_generate_bootimg="true"
-deviceinfo_bootimg_qcdt="true"
-deviceinfo_bootimg_mtk_mkimage="false"
-deviceinfo_bootimg_dtb_second="false"
-deviceinfo_flash_pagesize="2048"
-deviceinfo_flash_offset_base="0x10000000"
-deviceinfo_flash_offset_kernel="0x00008000"
-deviceinfo_flash_offset_ramdisk="0x01000000"
-deviceinfo_flash_offset_second="0x00f00000"
-deviceinfo_flash_offset_tags="0x00000100"
-deviceinfo_flash_heimdall_partition_kernel="BOOT"
-deviceinfo_flash_heimdall_partition_rootfs="SYSTEM"
@@ -1,43 +0,0 @@
-# Archived: Only used by archived downstream kernel
-# Reference: <https://postmarketos.org/devicepkg>
-pkgname=firmware-samsung-on7xelte-downstream
-pkgver=1
-pkgrel=0
-pkgdesc="Samsung Galaxy J7 Prime Firmware"
-url="https://github.com/DevOtag-Open-Source/android_vendor_samsung_on7xelte"
-arch="aarch64"
-license="proprietary"
-options="!check !archcheck !tracedeps pmb:cross-native"
-
-_commit="51b221e521ff93e51c40366f0245d6815248f817"
-_repo="https://raw.githubusercontent.com/DevOtag-Open-Source/android_vendor_samsung_on7xelte/eleven/proprietary/"
-_prefix=$pkgname-$_commit
-
-_files_etc="bcmdhd_sta.bin nvram_net.txt"
-_files_vendor="mfc_fw.bin fimc_is_lib.bin bcm43438A1_V0068.0286.hcd setfile_4h5yc.bin setfile_imx258.bin"
-
-for _file in $_files_etc; do
-	source="$source $_prefix-$_file::$_repo/etc/wifi/$_file"
-done
-
-for _file in $_files_vendor; do
-	source="$source $_prefix-$_file::$_repo/vendor/firmware/$_file"
-done
-
-package() {
-	local file
-	for file in $_files_etc $_files_vendor; do
-		install -Dm644 "$srcdir/$_prefix-$file" \
-		"$pkgdir/lib/firmware/postmarketos/$file"
-	done
-
-}
-sha512sums="
-fa250eecbbea53e0a5dbe8317e9a40ee189d4f016122fedff93d299cd799b8f95761643ce4042709a83705189348cf5d5b5bcf74acbeb7d84dc30ec3a62ee6c5  firmware-samsung-on7xelte-downstream-51b221e521ff93e51c40366f0245d6815248f817-bcmdhd_sta.bin
-183fa0fc0bb87602154d23b6fcaf699f0556919b4a9625ff83df4ba2514beb79a1abcb4fb7d2d18e2d57bc726caea579715c377225c7efffb03a65fa5aa2ab56  firmware-samsung-on7xelte-downstream-51b221e521ff93e51c40366f0245d6815248f817-nvram_net.txt
-ef58a1c6bfebd7ef43cc16de834a8446cc373a3e304dac279c6d7f061bda80f96a9f5b9e2b6d21de7eb53f4abfddeb597306bbf2eed579b1441a247e29bf888e  firmware-samsung-on7xelte-downstream-51b221e521ff93e51c40366f0245d6815248f817-mfc_fw.bin
-2eacf2bac885578d1619978b33a9cf14357dda024705c7a88449b460aec08d94e499d5c5ff7f96862591dbf667729a3b0f772a3f00c0c06ebe07f9d227d89086  firmware-samsung-on7xelte-downstream-51b221e521ff93e51c40366f0245d6815248f817-fimc_is_lib.bin
-a86e5021f8c3e8fd4f568a412ae9052e70ada65cbf8cf46b7d6c27ec8ef6e925d0eeff843214451959e783b04a06803ed5bb39e064fbbaae7421e41dbb93d19e  firmware-samsung-on7xelte-downstream-51b221e521ff93e51c40366f0245d6815248f817-bcm43438A1_V0068.0286.hcd
-4da1d0b5cfd608a5d22d1b8b35c4b7bc6915a2da3a999d9d4c1a38404686c9aefb9508e90b4c84c7d88b6a715ff71b8de04c8959f7cc830c82cb45485ad152fc  firmware-samsung-on7xelte-downstream-51b221e521ff93e51c40366f0245d6815248f817-setfile_4h5yc.bin
-29d8601d4f77fe49a38ec974d7ad432f1815e55a7f9d011fcdaa45580653c395a7f89debdea7588f693a111043f9dee286948ed1e4fbb1b1b4807ec6799ba34f  firmware-samsung-on7xelte-downstream-51b221e521ff93e51c40366f0245d6815248f817-setfile_imx258.bin
-"
@@ -1 +0,0 @@
-../../.shared-patches/linux/linux3.4-ARM-8933-1-replace-Sun-Solaris-style-flag-on-section.patch
@@ -1 +0,0 @@
-../../.shared-patches/linux/linux3.4-fix-piggy.gzip.S.patch
@@ -1 +0,0 @@
-../../.shared-patches/linux/linux3.7to4.5-ARM64-remove-Sun-Solaris-style-flag-on-section.patch
@@ -1 +0,0 @@
-../../.shared-patches/linux/linux3.4-ARM-8933-1-replace-Sun-Solaris-style-flag-on-section.patch
@@ -1 +0,0 @@
-../../.shared-patches/linux/linux3.4-fix-piggy.gzip.S.patch
@@ -1 +0,0 @@
-../../.shared-patches/linux/linux3.7to4.5-ARM64-remove-Sun-Solaris-style-flag-on-section.patch
@@ -1 +0,0 @@
-../../.shared-patches/linux/linux3.4-ARM-8933-1-replace-Sun-Solaris-style-flag-on-section.patch
@@ -1 +0,0 @@
-../../.shared-patches/linux/linux3.4-fix-piggy.gzip.S.patch
@@ -1 +0,0 @@
-../../.shared-patches/linux/linux3.7to4.5-ARM64-remove-Sun-Solaris-style-flag-on-section.patch
@@ -1 +0,0 @@
-../../.shared-patches/linux/linux3.4-ARM-8933-1-replace-Sun-Solaris-style-flag-on-section.patch
@@ -1 +0,0 @@
-../../.shared-patches/linux/linux3.4-fix-piggy.gzip.S.patch
@@ -1 +0,0 @@
-../../.shared-patches/linux/linux3.7to4.5-ARM64-remove-Sun-Solaris-style-flag-on-section.patch
@@ -1 +0,0 @@
-../../.shared-patches/linux/linux3.4-ARM-8933-1-replace-Sun-Solaris-style-flag-on-section.patch
@@ -1 +0,0 @@
-../../.shared-patches/linux/linux3.4-fix-piggy.gzip.S.patch
@@ -1 +0,0 @@
-../../.shared-patches/linux/linux3.7to4.5-ARM64-remove-Sun-Solaris-style-flag-on-section.patch
@@ -1 +0,0 @@
-../../.shared-patches/linux/linux3.4-ARM-8933-1-replace-Sun-Solaris-style-flag-on-section.patch
@@ -1 +0,0 @@
-../../.shared-patches/linux/linux3.4-fix-piggy.gzip.S.patch
@@ -1 +0,0 @@
-../../.shared-patches/linux/linux3.7to4.5-ARM64-remove-Sun-Solaris-style-flag-on-section.patch
@@ -1 +0,0 @@
-../../.shared-patches/linux/linux3.0-8933-1-replace-Sun-Solaris-style-flag-on-section.patch
@@ -1 +0,0 @@
-../../.shared-patches/linux/linux3.4-fix-piggy.gzip.S.patch
@@ -1 +0,0 @@
-../../.shared-patches/linux/linux3.4-ARM-8933-1-replace-Sun-Solaris-style-flag-on-section.patch
@@ -1 +0,0 @@
-../../.shared-patches/linux/linux3.0-8933-1-replace-Sun-Solaris-style-flag-on-section.patch
@@ -1 +0,0 @@
-../../.shared-patches/linux/linux3.0-fix-piggy.lzo.S.patch
@@ -1 +0,0 @@
-../../.shared-patches/linux/linux3.4-fix-piggy.gzip.S.patch
@@ -1 +0,0 @@
-../../.shared-patches/linux/linux3.4-ARM-8933-1-replace-Sun-Solaris-style-flag-on-section.patch
@@ -1 +0,0 @@
-../../.shared-patches/linux/linux3.4-fix-piggy.gzip.S.patch
@@ -1,100 +0,0 @@
-From 3020e3a81b63e05891ef5d40f3acfbd00040ba17 Mon Sep 17 00:00:00 2001
-From: Nick Desaulniers <ndesaulniers@google.com>
-Date: Mon, 4 Nov 2019 19:31:45 +0100
-Subject: [PATCH] ARM: 8933/1: replace Sun/Solaris style flag on section
- directive
-
-It looks like a section directive was using "Solaris style" to declare
-the section flags. Replace this with the GNU style so that Clang's
-integrated assembler can assemble this directive.
-
-The modified instances were identified via:
-$ ag \.section | grep #
-
-Link: https://ftp.gnu.org/old-gnu/Manuals/gas-2.9.1/html_chapter/as_7.html#SEC119
-Link: https://github.com/ClangBuiltLinux/linux/issues/744
-Link: https://bugs.llvm.org/show_bug.cgi?id=43759
-Link: https://reviews.llvm.org/D69296
-
-Acked-by: Nicolas Pitre <nico@fluxnic.net>
-Reviewed-by: Ard Biesheuvel <ardb@kernel.org>
-Reviewed-by: Stefan Agner <stefan@agner.ch>
-Signed-off-by: Nick Desaulniers <ndesaulniers@google.com>
-Suggested-by: Fangrui Song <maskray@google.com>
-Suggested-by: Jian Cai <jiancai@google.com>
-Suggested-by: Peter Smith <peter.smith@linaro.org>
-Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
-[ partial backport to 3.4 ]
---
- arch/arm/boot/bootp/init.S            | 2 +-
- arch/arm/boot/compressed/big-endian.S | 2 +-
- arch/arm/boot/compressed/head.S       | 2 +-
- arch/arm/boot/compressed/piggy.lzma.S | 2 +-
- arch/arm/mm/proc-v7.S                 | 2 +-
- 5 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/arch/arm/boot/bootp/init.S b/arch/arm/boot/bootp/init.S
-index 78b508075161..868eeeaaa46e 100644
--- a/arch/arm/boot/bootp/init.S
-+++ b/arch/arm/boot/bootp/init.S
-@@ -16,7 +16,7 @@
-  *  size immediately following the kernel, we could build this into
-  *  a binary blob, and concatenate the zImage using the cat command.
-  */
-		.section .start,#alloc,#execinstr
-+		.section .start, "ax"
- 		.type	_start, #function
- 		.globl	_start
- 
-diff --git a/arch/arm/boot/compressed/big-endian.S b/arch/arm/boot/compressed/big-endian.S
-index 25ab26f1c6f0..f22428e275f8 100644
--- a/arch/arm/boot/compressed/big-endian.S
-+++ b/arch/arm/boot/compressed/big-endian.S
-@@ -5,7 +5,7 @@
-  *  Author: Nicolas Pitre
-  */
- 
-	.section ".start", #alloc, #execinstr
-+	.section ".start", "ax"
- 
- 	mrc	p15, 0, r0, c1, c0, 0	@ read control reg
- 	orr	r0, r0, #(1 << 7)	@ enable big endian mode
-diff --git a/arch/arm/boot/compressed/head.S b/arch/arm/boot/compressed/head.S
-index 77a716bdf4d3..b70606652d21 100644
--- a/arch/arm/boot/compressed/head.S
-+++ b/arch/arm/boot/compressed/head.S
-@@ -113,7 +113,7 @@
- #endif
- 		.endm
- 
-		.section ".start", #alloc, #execinstr
-+		.section ".start", "ax"
- /*
-  * sort out different calling conventions
-  */
-diff --git a/arch/arm/boot/compressed/piggy.lzma.S b/arch/arm/boot/compressed/piggy.lzma.S
-index d7e69cffbc0a..cfea81ae8f4b 100644
--- a/arch/arm/boot/compressed/piggy.lzma.S
-+++ b/arch/arm/boot/compressed/piggy.lzma.S
-@@ -1,4 +1,4 @@
-	.section .piggydata,#alloc
-+	.section .piggydata, "a"
- 	.globl	input_data
- input_data:
- 	.incbin	"arch/arm/boot/compressed/piggy.lzma"
-diff --git a/arch/arm/mm/proc-v7.S b/arch/arm/mm/proc-v7.S
-index 69363be2f241..321cb1c6a091 100644
--- a/arch/arm/mm/proc-v7.S
-+++ b/arch/arm/mm/proc-v7.S
-@@ -422,7 +422,7 @@ __v7_setup_stack:
- 	string	cpu_elf_name, "v7"
- 	.align
- 
-	.section ".proc.info.init", #alloc, #execinstr
-+	.section ".proc.info.init", "ax"
- 
- 	/*
- 	 * Standard v7 proc info content
-- 
-2.30.2
-
@@ -1 +0,0 @@
-../../.shared-patches/linux/linux3.0-8933-1-replace-Sun-Solaris-style-flag-on-section.patch
@@ -1 +0,0 @@
-../../.shared-patches/linux/linux3.0-fix-piggy.lzma.S.patch
@@ -1 +0,0 @@
-../../.shared-patches/linux/linux3.4-fix-piggy.gzip.S.patch
@@ -1 +0,0 @@
-../../.shared-patches/linux/linux3.0-8933-1-replace-Sun-Solaris-style-flag-on-section.patch
@@ -1 +0,0 @@
-../../.shared-patches/linux/linux3.4-fix-piggy.gzip.S.patch
@@ -1,25 +0,0 @@
-From 44b07494ad40ce82eaf7fc98c58d498b947f6772 Mon Sep 17 00:00:00 2001
-From: Eray Tutmaz <tarkanttmz261@gmail.com>
-Date: Thu, 19 Oct 2023 08:31:12 +0000
-Subject: [PATCH] Update file proc.S
-
---
- arch/arm64/mm/proc.S | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/arch/arm64/mm/proc.S b/arch/arm64/mm/proc.S
-index 4e778b132..4179312e5 100644
--- a/arch/arm64/mm/proc.S
-+++ b/arch/arm64/mm/proc.S
-@@ -186,7 +186,7 @@ ENTRY(cpu_do_switch_mm)
- 	ret
- ENDPROC(cpu_do_switch_mm)
- 
-	.section ".text.init", #alloc, #execinstr
-+
- 
- /*
-  *	__cpu_setup
-- 
-GitLab
-
@@ -1 +0,0 @@
-../../.shared-patches/linux/linux3.4-ARM-8933-1-replace-Sun-Solaris-style-flag-on-section.patch
@@ -1 +0,0 @@
-../../.shared-patches/linux/linux3.4-fix-piggy.gzip.S.patch
@@ -1 +0,0 @@
-../../.shared-patches/linux/linux3.7to4.5-ARM64-remove-Sun-Solaris-style-flag-on-section.patch
@@ -1,37 +0,0 @@
-# Archived: does weird things, not needed for mainline kernels
-# Reference: <https://postmarketos.org/devicepkg>
-pkgname=u-boot-kobo-clara-downstream
-pkgver=2016.03
-pkgrel=0
-pkgdesc="U-Boot for Kobo Clara HD"
-arch="armv7"
-_carch="arm"
-license="GPL-2.0"
-url="https://github.com/pmsourcedump/kobo_clara_uboot"
-options="!check"
-
-_repository="kobo_clara_uboot"
-_commit="5af329fef886e21b777426d7bf5c6162e2317de7"
-source="
-	$pkgname-$_commit.tar.gz::https://github.com/pmsourcedump/$_repository/archive/$_commit.tar.gz
-	u-boot-env.txt
-"
-
-builddir="$srcdir/$_repository-$_commit"
-
-build() {
-	make ARCH="$_carch" mx6sll_ntx_lpddr2_512m_config
-	make ARCH="$_carch"
-	tools/mkenvimage -p 0 -s 8192 -o u-boot-env.bin "$srcdir/u-boot-env.txt"
-}
-
-package() {
-	install -D -m644 "$builddir/u-boot.bin" "$pkgdir/usr/share/u-boot/kobo-clara/u-boot.bin"
-	install -D -m644 "$builddir/u-boot.imx" "$pkgdir/usr/share/u-boot/kobo-clara/u-boot.imx"
-	install -D -m644 "$builddir/u-boot-env.bin" "$pkgdir/usr/share/u-boot/kobo-clara/u-boot-env.bin"
-}
-
-sha512sums="
-1712f5a922b44a8b80e49e00969f0948cd62864adedfb419d9d2f6ccf765b432f8632787f7c6d1502ec0aa6afb7b27bf4193733c2345ff4a0378b43b5b10643a  u-boot-kobo-clara-downstream-5af329fef886e21b777426d7bf5c6162e2317de7.tar.gz
-43c006f8198ac61e5c73dd4a2d583c5ab1da76b76492be9bee385096bdf33e3a42c8058707e8c2f61342faae152ba57f5046909d9ed403f74589d6604f77eb0d  u-boot-env.txt
-"
@@ -1,20 +0,0 @@
-# Maintainer: WeirdTreeThing <bradyn127@protonmail.com>
-pkgname=alsa-ucm-conf-cros
-pkgver=0.5
-pkgrel=0
-pkgdesc="ALSA UCM configuration for Chrome OS devices"
-url="https://github.com/WeirdTreeThing/alsa-ucm-conf-cros"
-arch="noarch"
-depends="alsa-ucm-conf"
-replaces="alsa-ucm-conf alsa-ucm-conf-google-kukui"
-license="BSD-3-Clause"
-options="!check"
-source="$pkgname-$pkgver.tar.gz::$url/archive/refs/tags/$pkgver.tar.gz"
-
-package() {
-	mkdir -p "$pkgdir"/usr/share/alsa/
-	cp -r ucm2 "$pkgdir"/usr/share/alsa
-}
-sha512sums="
-844f23b640bbdbcef83f9cc11444ee80bfc83095d7917f5c12c2e3b99f120fd014c74c91deae02ec0f2210115270e518977fdef77dca5a3ab5d8df53e5ec62b1  alsa-ucm-conf-cros-0.5.tar.gz
-"
@@ -0,0 +1,41 @@
+# Maintainer: WeirdTreeThing <bradyn127@protonmail.com>
+# Co-Maintainer: Jenneron <jenneron@protonmail.com>
+pkgname=alsa-ucm-conf-google-kukui
+pkgver=2
+pkgrel=0
+pkgdesc="ALSA Use Case Manager configuration for Google Kukui Chromebooks"
+url="https://alsa-project.org"
+arch="aarch64"
+license="BSD-3-Clause"
+source="
+	mt8183_da7219_HiFi.conf
+	mt8183_da7219_rt1015p.conf
+	mt8183_mt6358_HiFi.conf
+	mt8183_mt6358_ts3a227_max98357.conf
+"
+options="!check" # no tests
+depends="alsa-ucm-conf"
+replaces="alsa-ucm-conf"
+
+package() {
+	install -Dm644 mt8183_da7219_HiFi.conf \
+		"$pkgdir"/usr/share/alsa/ucm2/conf.d/mt8183_da7219_r/HiFi.conf
+	install -Dm644 mt8183_da7219_rt1015p.conf \
+		"$pkgdir"/usr/share/alsa/ucm2/conf.d/mt8183_da7219_r/mt8183_da7219_rt1015p.conf
+	install -Dm644 mt8183_mt6358_HiFi.conf \
+		"$pkgdir"/usr/share/alsa/ucm2/conf.d/mt8183_mt6358_t/HiFi.conf
+	install -Dm644 mt8183_mt6358_ts3a227_max98357.conf \
+		"$pkgdir"/usr/share/alsa/ucm2/conf.d/mt8183_mt6358_t/mt8183_mt6358_ts3a227_max98357.conf
+
+	ln -s /usr/share/alsa/ucm2/conf.d/mt8183_da7219_r \
+		"$pkgdir"/usr/share/alsa/ucm2/mt8183_da7219_r
+	ln -s /usr/share/alsa/ucm2/conf.d/mt8183_mt6358_t \
+		"$pkgdir"/usr/share/alsa/ucm2/mt8183_mt6358_t
+}
+
+sha512sums="
+9755c2eaf4bc28a9f3734b6778550ebd77bbee8f6aa353642bc5a35d68e009a17b05d9b09f1c62fe592eb16a2d342e3d2abcda98f2c53142bd4905e4a883a88b  mt8183_da7219_HiFi.conf
+13ffff0471c29d4e624ba7089d8df811f6578bebc4a9da2e8e82e247430fd41dbc95204fdf1891cfb76f1d90303fcdb8501ecf47b8ca40c7429066bf2ff1379b  mt8183_da7219_rt1015p.conf
+3656cb0cc76994aab39bd0d0cfe283339bce0689448612f74a0d09a30b19516950132456945096a13bd5700d0e7f868c413e268ced810046ec70252ca8b07603  mt8183_mt6358_HiFi.conf
+171e9e3376e5bd56e133a5b19309f60f6326f052922064e6f95c53b4345ea12cc205adde7305a7bd840722a29b7fb393c71d2b39e60952b0979ecc2e5ec03efa  mt8183_mt6358_ts3a227_max98357.conf
+"
@@ -0,0 +1,90 @@
+SectionDevice."Speaker" {
+	Comment "Speaker"
+
+	Value {
+		PlaybackPCM "hw:${CardId},0"
+	}
+	EnableSequence [
+		cset "name='I2S3_CH1 DL1_CH1' 1"
+		cset "name='I2S3_CH2 DL1_CH2' 1"
+		cset "name='Speakers Switch' 1"
+	]
+	DisableSequence [
+		cset "name='I2S3_CH1 DL1_CH1' 0"
+		cset "name='I2S3_CH2 DL1_CH2' 0"
+		cset "name='Speakers Switch' 0"
+	]
+}
+
+SectionDevice."Headphones" {
+	Comment "Headphones"
+
+	Value {
+		PlaybackPCM "hw:${CardId},0"
+	}
+	EnableSequence [
+		cset "name='Playback Digital Switch' 1"
+		cset "name='Headphone Switch' 1"
+		cset "name='ST Mixer Out FilterL Out FilterL Switch' 1"
+		cset "name='Mixer Out FilterL DACL Switch' 1"
+		cset "name='ST Mixer Out FilterR Out FilterR Switch' 1"
+		cset "name='Mixer Out FilterR DACR Switch' 1"
+		cset "name='Out DACL Mux' DAIL"
+		cset "name='Out DACR Mux' DAIR"
+		cset "name='I2S3_CH1 DL1_CH1' 1"
+		cset "name='I2S3_CH2 DL1_CH2' 1"
+	]
+	DisableSequence [
+		cset "name='Playback Digital Switch' 0"
+		cset "name='Headphone Switch' 0"
+		cset "name='ST Mixer Out FilterL Out FilterL Switch' 0"
+		cset "name='Mixer Out FilterL DACL Switch' 0"
+		cset "name='ST Mixer Out FilterR Out FilterR Switch' 0"
+		cset "name='Mixer Out FilterR DACR Switch' 0"
+		cset "name='I2S3_CH1 DL1_CH1' 0"
+		cset "name='I2S3_CH2 DL1_CH2' 0"
+	]
+}
+
+SectionDevice."Mic" {
+	Comment "Internal Microphone"
+
+	Value {
+		CapturePCM "hw:${CardId},5"
+	}
+	EnableSequence [
+		cset "name='MTKAIF_DMIC' 1"
+		cset "name='Mt6358 Mic Type Mux' 2"
+		cset "name='UL3_CH1 ADDA_UL_CH1' 1"
+		cset "name='UL3_CH2 ADDA_UL_CH2' 1"
+	]
+	DisableSequence [
+		cset "name='MTKAIF_DMIC' 0"
+		cset "name='Mt6358 Mic Type Mux' 0"
+		cset "name='UL3_CH1 ADDA_UL_CH1' 0"
+		cset "name='UL3_CH2 ADDA_UL_CH2' 0"
+	]
+}
+
+SectionDevice."Headset" {
+	Comment "Headset Microphone"
+
+	Value {
+		CapturePCM "hw:${CardId},5"
+	}
+	EnableSequence [
+		cset "name='Capture Digital Switch' 1"
+		cset "name='Mixin Switch' 1"
+		cset "name='Mic Switch' 1"
+		cset "name='Mixer In Mic Switch' 1"
+		cset "name='Out DAIL Mux' ADC"
+		cset "name='UL3_CH1 I2S2_CH1' 1"
+	]
+	DisableSequence [
+		cset "name='Capture Digital Switch' 0"
+		cset "name='Mixin Switch' 0"
+		cset "name='Mic Switch' 0"
+		cset "name='Mixer In Mic Switch' 0"
+		cset "name='UL3_CH1 I2S2_CH1' 0"
+	]
+}
@@ -0,0 +1,24 @@
+Syntax 6
+
+SectionUseCase."HiFi" {
+	File "HiFi.conf"
+	Comment "Default"
+}
+
+BootSequence [
+	# Speaker
+	cset "name='I2S3_CH1 DL1_CH1' 1"
+	cset "name='I2S3_CH2 DL1_CH2' 1"
+	cset "name='Speakers Switch' 1"
+
+	# Internal Mic
+	cset "name='MTKAIF_DMIC' 1"
+	cset "name='Mt6358 Mic Type Mux' 2"
+	cset "name='UL3_CH1 ADDA_UL_CH1' 1"
+	cset "name='UL3_CH2 ADDA_UL_CH2' 1"
+
+	# Headset
+	cset "name='Headphone Volume' 56"
+	cset "name='Capture Digital Volume' 113"
+	cset "name='Mic Volume' 3"
+]
@@ -0,0 +1,86 @@
+SectionDevice."Speaker" {
+	Comment "Speaker"
+
+	Value {
+		PlaybackPCM "hw:${CardId},0"
+	}
+	EnableSequence [
+		cset "name='I2S3_CH1 DL1_CH1' 1"
+		cset "name='I2S3_CH2 DL1_CH2' 1"
+	]
+	DisableSequence [
+		cset "name='I2S3_CH1 DL1_CH1' 0"
+		cset "name='I2S3_CH2 DL1_CH2' 0"
+	]
+}
+
+SectionDevice."Mic" {
+	Comment "Internal Microphone"
+
+	Value {
+		CapturePCM "hw:${CardId},5"
+	}
+	EnableSequence [
+		cset "name='MTKAIF_DMIC' 1"
+		cset "name='Mic Type Mux' 2"
+		cset "name='UL3_CH1 ADDA_UL_CH1' 1"
+		cset "name='UL3_CH2 ADDA_UL_CH2' 1"
+	]
+	DisableSequence [
+		cset "name='MTKAIF_DMIC' 0"
+		cset "name='UL3_CH1 ADDA_UL_CH1' 0"
+		cset "name='UL3_CH2 ADDA_UL_CH2' 0"
+	]
+}
+
+If.krane {
+	Condition {
+		Type String
+		Haystack "${sys:firmware/devicetree/base/compatible}"
+		Needle "google,krane"
+	}
+	False {
+		SectionDevice."Headphones" {
+			Comment "Headphones"
+
+			Value {
+				PlaybackPCM "hw:${CardId},0"
+			}
+			EnableSequence [
+				cset "name='ADDA_DL_CH1 DL1_CH1' 1"
+                		cset "name='ADDA_DL_CH2 DL1_CH2' 1"
+                		cset "name='HPL Mux' 2"
+                		cset "name='HPR Mux' 2"
+			]
+			DisableSequence [
+				cset "name='ADDA_DL_CH1 DL1_CH1' 0"
+                		cset "name='ADDA_DL_CH2 DL1_CH2' 0"
+                		cset "name='HPL Mux' 0"
+                		cset "name='HPR Mux' 0"
+			]
+		}
+
+		SectionDevice."Headset" {
+			Comment "Headset Microphone"
+
+			Value {
+				CapturePCM "hw:${CardId},5"
+			}
+			EnableSequence [
+				cset "name='PGA L Mux' 2"
+                		cset "name='ADC L Mux' 2"
+                		cset "name='Mic Type Mux' 1"
+                		cset "name='PGA Volume' 4"
+                		cset "name='UL3_CH1 ADDA_UL_CH1' 1"
+			]
+			DisableSequence [
+				cset "name='PGA L Mux' 0"
+		                cset "name='ADC L Mux' 0"
+		                cset "name='Mic Type Mux' 0"
+                		cset "name='PGA Volume' 0"
+		                cset "name='UL3_CH1 ADDA_UL_CH1' 0"
+
+			]
+		}
+	}
+}
@@ -0,0 +1,31 @@
+Syntax 6
+
+SectionUseCase."HiFi" {
+	File "HiFi.conf"
+	Comment "Default"
+}
+
+BootSequence [
+	# Speakers
+	cset "name='I2S3_CH1 DL1_CH1' 1"
+	cset "name='I2S3_CH2 DL1_CH2' 1"
+
+	# Headphones
+	cset "name='Headphone Volume' 17"
+	cset "name='ADDA_DL_CH1 DL1_CH1' 0"
+	cset "name='ADDA_DL_CH2 DL1_CH2' 0"
+	cset "name='HPL Mux' 0"
+	cset "name='HPR Mux' 0"
+
+	# Internal Mic
+	cset "name='MTKAIF_DMIC' 1" 
+	cset "name='Mic Type Mux' 2"
+	cset "name='UL3_CH1 ADDA_UL_CH1' 1"
+	cset "name='UL3_CH2 ADDA_UL_CH2' 1"
+
+	# Headset Mic
+	cset "name='PGA L Mux' 0"
+	cset "name='ADC L Mux' 0"
+	cset "name='PGA Volume' 0"
+	cset "name='UL3_CH1 ADDA_UL_CH1' 0"
+]
@@ -2,8 +2,8 @@
 # Maintainer: Minecrell <minecrell@minecrell.net>
 pkgname=device-arrow-db410c
 pkgdesc="Arrow DragonBoard 410c"
-pkgver=4
-pkgrel=0
+pkgver=3
+pkgrel=4
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -32,6 +32,6 @@ nonfree_firmware() {
 }

 sha512sums="
-9e4e3c89c6328c60a3e6a02bae30e79863a512760be04177c710827788970963be3679602e288ddee1a4a054e0e80d707ad53d15db6918998680119882e3eab8  deviceinfo
+b8bb88f11bf7f5889a0159e63fac5e38e7ca68a11aa3b89294ee6bc4f6f56a02964d213ce418d7bd5231fb977e4d62a555d587807f5a3ad0d40fb1b5798a6f7d  deviceinfo
 ccd6758cb4954eb0a96c7fb15e732e8147414f8edc498d9faf7d04ddef85d817733669ec1a6003e623e8392f3f6bb85f71160efe4e82f27e300d58aa6f5c8549  modules-initfs
 "
@@ -23,7 +23,6 @@ deviceinfo_getty="ttyMSM0;115200"
 deviceinfo_flash_method="fastboot"
 deviceinfo_kernel_cmdline="earlycon console=ttyMSM0,115200 PMOS_NO_OUTPUT_REDIRECT"
 deviceinfo_generate_bootimg="true"
-deviceinfo_generate_extlinux_config="true"
 deviceinfo_bootimg_dtb_second="true"
 deviceinfo_flash_offset_base="0x80000000"
 deviceinfo_flash_offset_kernel="0x00080000"
@@ -32,4 +31,4 @@ deviceinfo_flash_offset_second="0x00f00000"
 deviceinfo_flash_offset_tags="0x01e00000"
 deviceinfo_flash_pagesize="2048"
 deviceinfo_flash_sparse="true"
-deviceinfo_flash_fastboot_partition_rootfs="rootfs"
+deviceinfo_flash_fastboot_partition_system="rootfs"
@@ -2,8 +2,8 @@
 # Maintainer: Minecrell <minecrell@minecrell.net>
 pkgname=device-bq-paella
 pkgdesc="BQ Aquaris X5"
-pkgver=8
-pkgrel=0
+pkgver=7
+pkgrel=2
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -38,6 +38,6 @@ nonfree_firmware() {
 }

 sha512sums="
-ae1d413f189856d5f9ccc6a3a64e6cd719ad3cf7e4d1f5b358201037f7fcad2098a33eedfb83278ecf80073bdfbfd49cc796b43da4992f7b2bd3a6dbaa266c40  deviceinfo
+b33c075d49febd0bcff4c696214e39f134f7e05dc4770f60bfff52fb7e7b432b53ef69803ac32957e921d45cb7a35cc205112f6691dbdfd1a5032c89d34789fa  deviceinfo
 ebf6a40372329116a25df1407e671365bb2bf0613f61f0a572fc77890fb0a1760259ab35ed9f002ef2a5c6ee8836bc7bbeb50bf5ac3de14c11e6d96872ad3644  modules-initfs
 "
@@ -23,7 +23,6 @@ deviceinfo_getty="ttyMSM0;115200"
 deviceinfo_flash_method="fastboot"
 deviceinfo_kernel_cmdline="earlycon console=ttyMSM0,115200 PMOS_NO_OUTPUT_REDIRECT"
 deviceinfo_generate_bootimg="true"
-deviceinfo_generate_extlinux_config="true"
 deviceinfo_flash_offset_base="0x80000000"
 deviceinfo_flash_offset_kernel="0x00080000"
 deviceinfo_flash_offset_ramdisk="0x02000000"
@@ -3,7 +3,7 @@
 pkgname=device-fairphone-fp4
 pkgdesc="Fairphone 4"
 pkgver=2
-pkgrel=3
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -15,6 +15,7 @@ depends="
 	mesa-vulkan-freedreno
 	mkbootimg
 	postmarketos-base
+	postmarketos-update-kernel
 	qbootctl
 	qbootctl-openrc
 	swclock-offset
@@ -51,7 +52,6 @@ nonfree_firmware() {
 		firmware-fairphone-fp4-ipa
 		firmware-fairphone-fp4-modem
 		firmware-fairphone-fp4-wlan
-		firmware-qcom-adreno-a630
 		linux-firmware-ath10k
 		msm-modem
 		msm-modem-uim-selection
@@ -3,7 +3,7 @@
 pkgname=device-google-gru
 pkgdesc="Google Gru Chromebooks"
 pkgver=5
-pkgrel=7
+pkgrel=6
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -15,6 +15,7 @@ depends="
 	linux-postmarketos-rockchip
 	postmarketos-base
 	postmarketos-cros-common
+	postmarketos-update-depthcharge-kernel
 	soc-rockchip-rk3399
 "
 makedepends="devicepkg-dev"
@@ -3,17 +3,18 @@
 pkgname=device-google-kukui
 pkgdesc="Google Kukui Chromebooks"
 pkgver=6
-pkgrel=6
+pkgrel=4
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
 options="!check !archcheck"
 depends="
-	alsa-ucm-conf-cros
+	alsa-ucm-conf-google-kukui
 	depthcharge-tools
 	linux-postmarketos-mediatek-mt8183>=6.1.28-r0
 	postmarketos-base
 	postmarketos-cros-common
+	postmarketos-update-depthcharge-kernel
 	soc-mediatek-mt8183
 "
 makedepends="devicepkg-dev"
@@ -1,10 +1,9 @@
 # Reference: <https://postmarketos.org/devicepkg>
-# Maintainer: Adam Thiede <me@adamthiede.com>
-# Co-Maintainer: Jenneron <jenneron@protonmail.com>
+# Maintainer: Jenneron <jenneron@protonmail.com>
 pkgname=device-google-oak
 pkgdesc="Google Oak Chromebooks"
 pkgver=4
-pkgrel=6
+pkgrel=4
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -15,6 +14,7 @@ depends="
 	linux-postmarketos-mediatek-mt8173
 	postmarketos-base
 	postmarketos-cros-common
+	postmarketos-update-depthcharge-kernel
 "
 makedepends="devicepkg-dev"
 source="deviceinfo modules-initfs"
@@ -2,7 +2,7 @@
 # Maintainer: Jenneron <jenneron@protonmail.com>
 pkgname=device-google-peach-pit
 pkgdesc="Samsung Chromebook 2 (11.6 inch)"
-pkgver=6
+pkgver=5
 pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
@@ -14,6 +14,7 @@ depends="
 	linux-postmarketos-exynos5
 	postmarketos-base
 	postmarketos-cros-common
+	postmarketos-update-depthcharge-kernel
 "
 makedepends="devicepkg-dev"
 source="
@@ -58,7 +59,7 @@ nonfree_firmware() {

 sha512sums="
 cbeb0f1fdf4357763eae7ede0b28923ae39c18aa187894baa778bdb20afa728aa97cad63b957d799ffcd1130ae40c3b796e293a2a1c97d9a68bf132ec6ce6d13  deviceinfo
-e12a68f919182cb4e6812a5dd13fce8dc15266d2ac16aa5f0a31034f111cb403c020ebaaa4d94309f4baf2f71379327c57c08029e27c506d152695e9a2b04b2b  modules-initfs
+a1fd6b4964b0bd4c66983430528f5906eea5cc9ddbe8485ba17e97496652240d0a93dbd3af34ecd3c273b7172202b8dcb24e0b5fa372512d01affec3914a023d  modules-initfs
 e53ca475830930ecfc1fd537702e850e2abcb66fbed521cb6c3a2918d762649254bd0244ec93a47b20dfc593ec3afc9bdebdec1759a7bc96dcbe4800f40893da  90-tap-to-click.conf
 6fe67c8f2e09e3e37297eebaf2a86a32671923a5fd4d18e5aeb10e580fb998e4ddb4a691531a0c8f4b4e70c6f0f7e91008dd836ffca8026d59862c6e829fd996  Peach-Pit-I2S-MAX98090.conf
 194b6169168b40592cf1e6b5f3b21aaa24a602869d7aec358cd5e1f06de34e9b0fe3da094e438ef2d3ab5be80275e6c0b6afe7ce92e2365a70e8b5a21a873234  HiFi.conf
@@ -4,5 +4,3 @@ drm-kms-helper
 cros-ec-keyb
 sbs-battery
 tps65090-charger
-uas
-sd-mod
@@ -2,8 +2,8 @@
 # Maintainer: Jenneron <jenneron@protonmail.com>
 pkgname=device-google-snow
 pkgdesc="Samsung Chromebook"
-pkgver=6
-pkgrel=1
+pkgver=4
+pkgrel=4
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
@@ -14,16 +14,25 @@ depends="
 	linux-postmarketos-exynos5
 	postmarketos-base
 	postmarketos-cros-common
+	postmarketos-update-depthcharge-kernel
 "
 makedepends="devicepkg-dev"
 source="
 	deviceinfo
 	modules-initfs
+	i3wm/xorg.conf.d/90-tap-to-click.conf
+	modprobe.d/mali.conf
 	ucm/HiFi.conf
 	ucm/Snow-I2S-MAX98090.conf
+	mpv/mpv.conf.wayland
+	mpv/mpv.conf.xorg
 	sway/foot/foot.ini
+	sway/tinydm/10-no-hardware-cursor.sh
 "
 subpackages="
+	$pkgname-i3wm
+	$pkgname-mpv-wayland:mpv_wayland
+	$pkgname-mpv-xorg:mpv_xorg
 	$pkgname-nonfree-firmware:nonfree_firmware
 	$pkgname-sway
 "
@@ -35,6 +44,10 @@ build() {
 package() {
 	devicepkg_package $startdir $pkgname

+	# Block panfrost probe as it causes segfault in X11
+	install -Dm644 "$srcdir"/mali.conf \
+		"$pkgdir"/etc/modprobe.d/mali.conf
+
 	# Alsa UCM configs
 	install -Dm644 "$srcdir"/Snow-I2S-MAX98090.conf \
 		"$pkgdir"/usr/share/alsa/ucm2/conf.d/Snow-I2S-MAX980/Snow-I2S-MAX98090.conf
@@ -42,6 +55,25 @@ package() {
 		"$pkgdir"/usr/share/alsa/ucm2/conf.d/Snow-I2S-MAX980/HiFi.conf
 }

+i3wm() {
+	install_if="$pkgname=$pkgver-r$pkgrel postmarketos-ui-i3wm"
+	install -D -m644 "$srcdir"/90-tap-to-click.conf \
+		"$subpkgdir"/etc/X11/xorg.conf.d/90-tap-to-click.conf
+}
+
+mpv_wayland() {
+	# Looks like wayland libs are installed with some x11 UIs too, so match wlroots here
+	install_if="$pkgname=$pkgver-r$pkgrel mpv wlroots"
+	install -Dm644 "$srcdir"/mpv.conf.wayland \
+		"$subpkgdir"/etc/mpv/mpv.conf
+}
+
+mpv_xorg() {
+	install_if="$pkgname=$pkgver-r$pkgrel mpv xorg-server"
+	install -Dm644 "$srcdir"/mpv.conf.xorg \
+		"$subpkgdir"/etc/mpv/mpv.conf
+}
+
 nonfree_firmware() {
 	pkgdesc="WiFi/BT and MFC firmware"
 	depends="linux-firmware-mrvl linux-firmware-s5p-mfc"
@@ -52,12 +84,19 @@ sway() {
 	install_if="$pkgname=$pkgver-r$pkgrel postmarketos-ui-sway"
 	install -Dm644 "$srcdir"/foot.ini \
 		"$subpkgdir"/etc/skel/.config/foot/foot.ini
+	install -Dm755 "$srcdir"/10-no-hardware-cursor.sh \
+		"$subpkgdir"/etc/tinydm.d/env-wayland.d/10-no-hardware-cursor.sh
 }

 sha512sums="
-8f12e32794f68ecc312ef9edde380bffc73f931cf210c8e0a5552f47b325f0f6648a95986ae17ad0a32245308dfd3c1e381377b67e6b96eeae18f97b83621f92  deviceinfo
-e12a68f919182cb4e6812a5dd13fce8dc15266d2ac16aa5f0a31034f111cb403c020ebaaa4d94309f4baf2f71379327c57c08029e27c506d152695e9a2b04b2b  modules-initfs
+4be0a2e0ff5d5189b9adbea995b111724cf686eda3c191fac405757facee4621297314bb4d2015e8dc72b29f30d47d2e00253d70d64c51a02a5177cb4d4959cd  deviceinfo
+a1fd6b4964b0bd4c66983430528f5906eea5cc9ddbe8485ba17e97496652240d0a93dbd3af34ecd3c273b7172202b8dcb24e0b5fa372512d01affec3914a023d  modules-initfs
+e53ca475830930ecfc1fd537702e850e2abcb66fbed521cb6c3a2918d762649254bd0244ec93a47b20dfc593ec3afc9bdebdec1759a7bc96dcbe4800f40893da  90-tap-to-click.conf
+c5fdd5a39a41044343d937a1ad31cc6bb893f19a329beb4ce09249064cac066d643c84ffcbfcd794113c228c5a56e28c82812092751546b49ab31142dc8245b1  mali.conf
 8a8f593694528a9323ef4a0aff7e9c6ad45608957eb042d425663f682885c2f95eb01db4fe87b7c43a90de48f3e5f8b10cab4b13c547b5b0d31b924fcb083cad  HiFi.conf
 b163535da7626e3866faa45768c3888f69f90c98d694650e16a7594a03eb91391e166931eb487901217d983bb2dc4e49b99a2a5531740a7d87f8f4f5c3d0cf59  Snow-I2S-MAX98090.conf
+8f9dc3c7caeab6c5321dc2bf498f1a03a793f23cb776763316bc356b9d433d7a3337e61154069464dcda200bf390b99f3be8f657a40c6d2f6be3cbc6fb751080  mpv.conf.wayland
+d6bc39df48ba0e985a796426039205335adf1c91b9c150b05a4239339fc78b1748b3a83c699de69e9a5829f29573a323f40788da58ed15b1951de1eab7e31c3d  mpv.conf.xorg
 61c56cf84cf88371a2238845db1f8283c7eb7b417dec8c51d71e51fb96899bb026c0ee22dc94a43537a56477fb0db59de960949add4b0ce90552a1286e6afe69  foot.ini
+8ddd237b14e8eea34b8716d155cdf199cf681b1287b482c8e184656d6d0440f018a2d46478c8b45eb790a1e71cfcfefd0f66798cd0b226647f11088549cfae64  10-no-hardware-cursor.sh
 "
Author	SHA1	Message	Date
Bart Ribbers	7446e0e23d	kde6-rc/*: add KDE6 rc 2 packages	2024-02-08 16:36:14 +00:00
Bart Ribbers	ed10ec8a0a	kde6-rc/*: add KDE6 rc 1 packages	2024-02-01 17:52:58 +01:00
Bart Ribbers	5903e65159	kde6-beta/*: add KDE6 beta 2 packages	2024-02-01 17:52:58 +01:00
Bart Ribbers	4820586982	kde6-beta/*: add KDE6 beta 1 packages	2024-02-01 17:52:58 +01:00
				`@@ -1 +0,0 @@`
				`../../.shared-patches/linux/linux3.4-ARM-8933-1-replace-Sun-Solaris-style-flag-on-section.patch`
				`@@ -1 +0,0 @@`
				`../../.shared-patches/linux/linux3.4-fix-piggy.gzip.S.patch`
				`@@ -1 +0,0 @@`
				`../../.shared-patches/linux/linux3.7to4.5-ARM64-remove-Sun-Solaris-style-flag-on-section.patch`
				`@@ -1 +0,0 @@`
				`../../.shared-patches/linux/linux3.0-8933-1-replace-Sun-Solaris-style-flag-on-section.patch`
				`@@ -1 +0,0 @@`
				`../../.shared-patches/linux/linux3.0-fix-piggy.lzo.S.patch`