device-nokia-sparkler: add pmos.force-load-modules to kernel cmd

add pmos.force-load-modules to kernel cmd
this fixes: The screen flashes brightness, but the old content (lk2nd bootscreen) remains on the screen, and then it hangs.

.ci/autoupdate.sh

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

.ci/grep.sh

@@ -72,4 +72,19 @@ if grep -qr $POSTMARKETOS_WALLPAPER_PATH \
 	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
+
+if grep -qEr 'PMOS_NO_OUTPUT_REDIRECT' -- *; then
+	echo "ERROR: PMOS_NO_OUTPUT_REDIRECT is deprecated and doesn't do anything."
+	echo "Please remove it from the following files:"
+	grep --color=always -Er 'PMOS_NO_OUTPUT_REDIRECT' -- *
+	exit_code=1
+fi
+
 exit "$exit_code"

.ci/lib/check_changed_aports_versions.py

@@ -16,8 +16,7 @@ import pmb.parse
 import pmb.parse.version
 import pmb.helpers.logging
 
-
-def get_package_version(args, package, revision, check=True):
+def get_package_contents(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
@@ -40,6 +39,15 @@ def get_package_version(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"]
 
 
@@ -112,6 +120,40 @@ 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:

.ci/lib/check_devices_in_wiki.py

@@ -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:")

.ci/lib/common.py

@@ -59,6 +59,11 @@ 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"]
@@ -130,27 +135,28 @@ def get_changed_packages_sanity_check(count):
         return
 
     branch = get_upstream_branch()
-    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.")
+    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.
+    """)
 
     sys.exit(1)
 

.ci/ruff.sh

@@ -11,4 +11,4 @@ fi
 set -x
 
 # shellcheck disable=SC2046
-ruff --ignore E501,F401,E722,W605 $(find .ci -name '*.py')
+ruff check --ignore E501,F401,E722,W605 $(find .ci -name '*.py')

.ci/shellcheck.sh

@@ -21,10 +21,8 @@ sh_files="
 	./main/postmarketos-installkernel/installkernel-pmos
 	./main/postmarketos-initramfs/init.sh
 	./main/postmarketos-initramfs/init_functions.sh
-	./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

.ci/testcases/add_pmbootstrap_to_import_path/__init__.py

@@ -34,7 +34,7 @@ def path_pmbootstrap():
             return directory
 
     # Symlink not set up properly
-    print("ERROR: 'pmbootstrap' is not a symlink to pmbootstrap.py")
+    print("ERROR: unable to find path to pmbootstrap.py. Try setting 'PMBOOTSTRAP_CMD'.")
     sys.exit(1)
 
 

.ci/testcases/test_device.py

@@ -1,30 +1,32 @@
 #!/usr/bin/env python3
-# Copyright 2021 Oliver Smith
+# Copyright 2024 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)")
@@ -46,7 +48,7 @@ def test_aports_device(args):
             raise RuntimeError("Missing 'postmarketos-base' in depends of " +
                                path)
 
-        # Depends: Must not have firmware packages
+        # Depends: Must not have specific packages
         for depend in apkbuild["depends"]:
             device_dependency_check(apkbuild, path)
 
@@ -59,14 +61,6 @@ 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):
     """
@@ -108,23 +102,84 @@ 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.
+    "Co-Maintainer:" (only required for main) listed in their APKBUILDs. Also
+    check that at least as many are listed in CODEOWNERS.
     """
+    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):

.ci/testcases/test_directory_structure.py

@@ -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("**/*", recursive=True):
+    for file in glob.iglob("[!temp]**/**/*", recursive=True):
         if os.path.isdir(file) or os.path.islink(file):
             continue
             # still check other less common inode types

.ci/testcases/test_kernel.py

@@ -6,6 +6,8 @@ import glob
 import pytest
 import sys
 import os
+import re
+from pathlib import Path
 
 import add_pmbootstrap_to_import_path
 import pmb.parse
@@ -40,3 +42,9 @@ def test_aports_kernel(args):
                 if "pmb:kconfigcheck-community" not in apkbuild["options"]:
                     raise RuntimeError(f"{aport_name}: \"pmb:kconfigcheck-community\" missing in"
                                        " options= line, required for all community/main devices.")
+
+        # check for postmarketos-installkernel in makedepends when installing kernel with make
+        if bool(re.search("make z?install", Path(path).read_text(encoding="utf-8"))):
+            if "postmarketos-installkernel" not in apkbuild["makedepends"]:
+                raise RuntimeError(f"{aport_name}: \"postmarketos-installkernel\" missing in"
+                                   " makedepends, required when using make install/zinstall.")

.ecrc

@@ -1,3 +1,4 @@
 {
-  "SpacesAftertabs": true
+  "SpacesAftertabs": true,
+  "Exclude": ["temp"]
 }

.editorconfig

@@ -7,7 +7,7 @@
 # Top-most EditorConfig file.
 root = true
 
-[{**.{md,ini,sh,rules,nft},**/APKBUILD}]
+[{**.{md,ini,sh,rules,nft},**/APKBUILD,CODEOWNERS}]
 indent_style = tab
 end_of_line = lf
 trim_trailing_whitespace = true

.gitlab-ci.yml

@@ -1,36 +1,36 @@
 ---
 
 # global settings
-image: alpine:edge
+image: alpine:latest
+before_script: &global_before_scripts
+  - apk upgrade -U
 after_script:
   - .ci/lib/move_logs.sh $CI_PROJECT_DIR
 stages:
   - lint
   - build
+  - autoupdate
 
-# 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
+# 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 or manually triggered pipeline
+    - if: $CI_PIPELINE_SOURCE == "schedule" || $CI_PIPELINE_SOURCE == "web"
 
 # device documentation
 wiki:
   stage: lint
-  <<: *only-default
-  only:
-    refs:
-      - merge_requests
-    changes:
-      - device/*/device-*/*
+  rules:
+    - if: $CI_PIPELINE_SOURCE == "merge_request_event" || $CI_COMMIT_REF_PROTECTED == "false"
+      changes:
+        - .ci/**/*
+        - .gitlab-ci.yml
+        - device/*/device-*/*
   script:
     - .ci/lib/gitlab_prepare_ci.sh
     - .ci/wiki.sh
@@ -38,16 +38,12 @@ wiki:
 # testcases linting
 ruff:
   stage: lint
-  <<: *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
+  rules:
+    - if: $CI_PIPELINE_SOURCE == "merge_request_event" || $CI_COMMIT_REF_PROTECTED == "false"
+      changes:
+        - .ci/*
+        - .ci/*/*
+        - .gitlab-ci.yml
   script:
     - .ci/lib/gitlab_prepare_ci.sh
     - .ci/ruff.sh
@@ -55,8 +51,9 @@ 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
@@ -65,8 +62,9 @@ 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
@@ -74,7 +72,8 @@ editor-config:
 # aports checks (generic)
 pytest-commits:
   stage: lint
-  <<: *only-default
+  rules:
+    - if: $CI_PIPELINE_SOURCE == "merge_request_event" || $CI_COMMIT_REF_PROTECTED == "false"
   script:
     - .ci/lib/gitlab_prepare_ci.sh
     - .ci/pytest.sh
@@ -90,23 +89,21 @@ 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
-  only:
-    refs:
-      - master
-      - merge_requests
-    changes:
-      - device/*/linux-*/config-*
-      - main/linux-*/config-*
+  rules:
+    - if: $CI_PIPELINE_SOURCE == "merge_request_event" || $CI_COMMIT_REF_PROTECTED == "false"
+      changes:
+        - device/*/linux-*/config-*
+        - main/linux-*/config-*
   script:
     - .ci/lib/gitlab_prepare_ci.sh
     - .ci/kconfig.sh
@@ -115,9 +112,10 @@ kernel-kconfig:
 # (Checks for "Allow commits from members who can merge to the target branch")
 mr-settings:
   stage: lint
-  only:
-    - merge_requests
+  rules:
+    - if: $CI_PIPELINE_SOURCE == "merge_request_event"
   before_script:
+    - *global_before_scripts
     - apk -q add python3
   script:
     - wget -q "https://gitlab.com/postmarketOS/ci-common/-/raw/master/check_mr_settings.py"
@@ -126,8 +124,10 @@ mr-settings:
 # build changed aports
 .build:
   stage: build
-  <<: *only-default
+  rules:
+    - if: $CI_PIPELINE_SOURCE == "merge_request_event" || $CI_COMMIT_REF_PROTECTED == "false"
   before_script:
+    - *global_before_scripts
     - .ci/lib/gitlab_prepare_ci.sh
   after_script:
     - cp -r /home/pmos/.local/var/pmbootstrap/packages/ packages/ || true
@@ -166,3 +166,22 @@ build-riscv64:
   extends: .build
   script:
     - .ci/build-riscv64.sh
+
+auto-update:
+  stage: autoupdate
+  rules:
+    # This variable is set in the scheduled pipeline configuration. It should be a space separated list of
+    # package names to update.
+    - if: $AUTOUPDATE_PACKAGES != null && $CI_PIPELINE_SOURCE == "schedule" || $CI_PIPELINE_SOURCE == "web"
+  before_script:
+    - .ci/lib/gitlab_prepare_ci.sh
+  script:
+    - .ci/autoupdate.sh "$AUTOUPDATE_PACKAGES"
+  after_script:
+    - .ci/lib/move_logs.sh $CI_PROJECT_DIR
+  artifacts:
+    when: on_failure
+    paths:
+      - log.txt
+      - log_testsuite_pmaports.txt
+      - pmbootstrap.cfg

.gitlab/issue_templates/Default.md

@@ -1,6 +1,12 @@
 <!--
 	Thank you for using postmarketOS! In order to speed up process of resolving your issue,
-	we would like you to fill in the following :
+	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!
 -->
 ### Describe your issue
 #### What's the expected behaviour?
@@ -21,8 +27,8 @@
 	Replace space inside `[ ]` with `x` to fill the checkbox
 -->
 * [ ] edge (`master` branch)
-* [ ] `v23.12`
-* [ ] `v23.06` (supported until 2024-01-18)
+* [ ] `v24.06`
+* [ ] `v23.12` (supported until 2024-07-16)
 
 * [ ] I confirm that the issue still is present after running `sudo apk upgrade -a`
 

CODEOWNERS

@@ -1,63 +1,133 @@
 # 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/*/*-purism-librem5/			@craftyguy @bshah
-device/*/device-lg-judyln/			@Newbyte
-device/*/device-samsung-m0/			@Newbyte
-device/*/linux-postmarketos-exynos4/		@Newbyte
-device/*/linux-postmarketos-qcom-msm8939/	@Newbyte
-device/*/linux-postmarketos-stericsson/		@Newbyte
+device/*/*-kobo-clara/				@akemnade
+device/*/*-lenovo-21bx/				@craftyguy @jane400
+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/*/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-oneplus-enchilada/		@calebccff
 device/*/device-oneplus-fajita/			@calebccff
-device/*/firmware-oneplus-sdm845/		@calebccff
-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-postmarketos-exynos5/		@jenneron @Grimler
-device/*/soc-mediatek-mt8183/			@jenneron
-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-postmarketos-trailblazer/	@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-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
 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/*/linux-google-veyron/			@jenneron
+device/*/linux-huawei-plank/			@gtrxAC
+device/*/linux-next/				@calebccff
+device/*/linux-postmarketos-allwinner/		@Arnavion @PsychoGame
+device/*/linux-postmarketos-amlogic/		@funderscore @exkc
+device/*/linux-postmarketos-exynos4/		@Newbyte @ThiagaoPlusPlus
+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
-
-main/postmarketos-update-depthcharge-kernel/	@jenneron
-main/postmarketos-ui-plasma-mobile/		@bshah
-main/ttyescape/					@calebccff
+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*gnome*/			@pabloyoyoista @Newbyte
+main/postmarketos-initramfs/			@calebccff @craftyguy
+main/postmarketos-ui-phosh/			@pabloyoyoista @Newbyte
+main/postmarketos-ui-plasma-mobile/		@PureTryOut
 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
+main/ttyescape/					@calebccff

channels.cfg

@@ -8,8 +8,14 @@ branch_pmaports=master
 branch_aports=master
 mirrordir_alpine=edge
 
-[v23.12]
+[v24.06]
 description=Latest release / Recommended for best stability
+branch_pmaports=v24.06
+branch_aports=3.20-stable
+mirrordir_alpine=v3.20
+
+[v23.12]
+description=Old release (supported until 2024-07-16)
 branch_pmaports=v23.12
 branch_aports=3.19-stable
 mirrordir_alpine=v3.19

cross/busybox-static-aarch64/APKBUILD

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

cross/busybox-static-armhf/APKBUILD

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

cross/busybox-static-armv7/APKBUILD

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

cross/gcc-aarch64/0037-loongarch-disable-multilib-support.patch

@@ -0,0 +1,61 @@
+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
+

cross/gcc-aarch64/APKBUILD

@@ -24,7 +24,7 @@ CBUILDROOT="/"
 _cross_configure="--disable-bootstrap --with-sysroot=/usr/$CTARGET"
 
 pkgname=gcc-aarch64
-pkgver=13.2.1_git20231014
+pkgver=13.2.1_git20240309
 # i.e. 13.2.1, must match gcc/BASE-VER
 _pkgbase="${pkgver%%_git*}"
 # date component from snapshots
@@ -46,6 +46,7 @@ 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}"
@@ -143,7 +144,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)	LANG_D=false ;;
+ppc64le|riscv64|loongarch64)	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
@@ -155,6 +156,7 @@ 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
@@ -162,6 +164,7 @@ esac
 # the internal libffi.
 case "$CTARGET_ARCH" in
 mips*)		LANG_GO=false ;;
+loongarch64)	LANG_GO=false ;;
 esac
 
 # Fortran uses libquadmath if toolchain has __float128
@@ -186,6 +189,11 @@ riscv64)
 LANG_ADA=false;;
 esac
 
+case "$CTARGET_ARCH" in
+loongarch64)
+LANG_ADA=false;;
+esac
+
 _languages=c
 if $LANG_CXX; then
 	_languages="$_languages,c++"
@@ -269,6 +277,7 @@ 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:
@@ -328,6 +337,7 @@ build() {
 	i586-*-*-*)		_arch_configure="--with-arch=pentium-m --with-fpmath=sse --with-tune=generic --enable-cld";;
 	s390x-*-*-*)		_arch_configure="--with-arch=z196 --with-tune=zEC12 --with-zarch --with-long-double-128 --enable-decimal-float";;
 	riscv64-*-*-*)		_arch_configure="--with-arch=rv64gc --with-abi=lp64d --enable-autolink-libatomic";;
+	loongarch64-*-*-*)      _arch_configure="--with-arch=loongarch64 --with-abi=lp64d";;
 	esac
 
 	case "$CTARGET_ARCH" in
@@ -683,10 +693,6 @@ 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
@@ -787,7 +793,7 @@ gdb() {
 }
 
 sha512sums="
-406673a62deba759fc0532a801b3f57cabf894ea328587b23e62a707ba5767b0e3ae9b3f86bf3c6fcf13e8a3c30bc470e6598b625c8231efb629034211c162c2  gcc-13-20231014.tar.xz
+2d1e0374ebdee526f0549319fc9c364968c52a0d4aaa16759f00453cb083fe58d8f463c47d97f3bb74a0a92e251989eb75a50ee5800b4569978c72d25446b44e  gcc-13-20240309.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
@@ -823,4 +829,5 @@ 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
 "

cross/gcc-armhf/0037-loongarch-disable-multilib-support.patch

@@ -0,0 +1,61 @@
+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
+

cross/gcc-armhf/APKBUILD

@@ -24,7 +24,7 @@ CBUILDROOT="/"
 _cross_configure="--disable-bootstrap --with-sysroot=/usr/$CTARGET"
 
 pkgname=gcc-armhf
-pkgver=13.2.1_git20231014
+pkgver=13.2.1_git20240309
 # i.e. 13.2.1, must match gcc/BASE-VER
 _pkgbase="${pkgver%%_git*}"
 # date component from snapshots
@@ -46,6 +46,7 @@ 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}"
@@ -143,7 +144,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)	LANG_D=false ;;
+ppc64le|riscv64|loongarch64)	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
@@ -155,6 +156,7 @@ 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
@@ -162,6 +164,7 @@ esac
 # the internal libffi.
 case "$CTARGET_ARCH" in
 mips*)		LANG_GO=false ;;
+loongarch64)	LANG_GO=false ;;
 esac
 
 # Fortran uses libquadmath if toolchain has __float128
@@ -186,6 +189,11 @@ riscv64)
 LANG_ADA=false;;
 esac
 
+case "$CTARGET_ARCH" in
+loongarch64)
+LANG_ADA=false;;
+esac
+
 _languages=c
 if $LANG_CXX; then
 	_languages="$_languages,c++"
@@ -269,6 +277,7 @@ 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:
@@ -328,6 +337,7 @@ build() {
 	i586-*-*-*)		_arch_configure="--with-arch=pentium-m --with-fpmath=sse --with-tune=generic --enable-cld";;
 	s390x-*-*-*)		_arch_configure="--with-arch=z196 --with-tune=zEC12 --with-zarch --with-long-double-128 --enable-decimal-float";;
 	riscv64-*-*-*)		_arch_configure="--with-arch=rv64gc --with-abi=lp64d --enable-autolink-libatomic";;
+	loongarch64-*-*-*)      _arch_configure="--with-arch=loongarch64 --with-abi=lp64d";;
 	esac
 
 	case "$CTARGET_ARCH" in
@@ -683,10 +693,6 @@ 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
@@ -787,7 +793,7 @@ gdb() {
 }
 
 sha512sums="
-406673a62deba759fc0532a801b3f57cabf894ea328587b23e62a707ba5767b0e3ae9b3f86bf3c6fcf13e8a3c30bc470e6598b625c8231efb629034211c162c2  gcc-13-20231014.tar.xz
+2d1e0374ebdee526f0549319fc9c364968c52a0d4aaa16759f00453cb083fe58d8f463c47d97f3bb74a0a92e251989eb75a50ee5800b4569978c72d25446b44e  gcc-13-20240309.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
@@ -823,4 +829,5 @@ 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
 "

cross/gcc-armv7/0037-loongarch-disable-multilib-support.patch

@@ -0,0 +1,61 @@
+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
+

cross/gcc-armv7/APKBUILD

@@ -24,7 +24,7 @@ CBUILDROOT="/"
 _cross_configure="--disable-bootstrap --with-sysroot=/usr/$CTARGET"
 
 pkgname=gcc-armv7
-pkgver=13.2.1_git20231014
+pkgver=13.2.1_git20240309
 # i.e. 13.2.1, must match gcc/BASE-VER
 _pkgbase="${pkgver%%_git*}"
 # date component from snapshots
@@ -46,6 +46,7 @@ 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}"
@@ -143,7 +144,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)	LANG_D=false ;;
+ppc64le|riscv64|loongarch64)	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
@@ -155,6 +156,7 @@ 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
@@ -162,6 +164,7 @@ esac
 # the internal libffi.
 case "$CTARGET_ARCH" in
 mips*)		LANG_GO=false ;;
+loongarch64)	LANG_GO=false ;;
 esac
 
 # Fortran uses libquadmath if toolchain has __float128
@@ -186,6 +189,11 @@ riscv64)
 LANG_ADA=false;;
 esac
 
+case "$CTARGET_ARCH" in
+loongarch64)
+LANG_ADA=false;;
+esac
+
 _languages=c
 if $LANG_CXX; then
 	_languages="$_languages,c++"
@@ -269,6 +277,7 @@ 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:
@@ -328,6 +337,7 @@ build() {
 	i586-*-*-*)		_arch_configure="--with-arch=pentium-m --with-fpmath=sse --with-tune=generic --enable-cld";;
 	s390x-*-*-*)		_arch_configure="--with-arch=z196 --with-tune=zEC12 --with-zarch --with-long-double-128 --enable-decimal-float";;
 	riscv64-*-*-*)		_arch_configure="--with-arch=rv64gc --with-abi=lp64d --enable-autolink-libatomic";;
+	loongarch64-*-*-*)      _arch_configure="--with-arch=loongarch64 --with-abi=lp64d";;
 	esac
 
 	case "$CTARGET_ARCH" in
@@ -683,10 +693,6 @@ 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
@@ -787,7 +793,7 @@ gdb() {
 }
 
 sha512sums="
-406673a62deba759fc0532a801b3f57cabf894ea328587b23e62a707ba5767b0e3ae9b3f86bf3c6fcf13e8a3c30bc470e6598b625c8231efb629034211c162c2  gcc-13-20231014.tar.xz
+2d1e0374ebdee526f0549319fc9c364968c52a0d4aaa16759f00453cb083fe58d8f463c47d97f3bb74a0a92e251989eb75a50ee5800b4569978c72d25446b44e  gcc-13-20240309.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
@@ -823,4 +829,5 @@ 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
 "

cross/gcc-riscv64/0037-loongarch-disable-multilib-support.patch

@@ -0,0 +1,61 @@
+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
+

cross/gcc-riscv64/APKBUILD

@@ -24,7 +24,7 @@ CBUILDROOT="/"
 _cross_configure="--disable-bootstrap --with-sysroot=/usr/$CTARGET"
 
 pkgname=gcc-riscv64
-pkgver=13.2.1_git20231014
+pkgver=13.2.1_git20240309
 # i.e. 13.2.1, must match gcc/BASE-VER
 _pkgbase="${pkgver%%_git*}"
 # date component from snapshots
@@ -46,6 +46,7 @@ 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}"
@@ -143,7 +144,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)	LANG_D=false ;;
+ppc64le|riscv64|loongarch64)	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
@@ -155,6 +156,7 @@ 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
@@ -162,6 +164,7 @@ esac
 # the internal libffi.
 case "$CTARGET_ARCH" in
 mips*)		LANG_GO=false ;;
+loongarch64)	LANG_GO=false ;;
 esac
 
 # Fortran uses libquadmath if toolchain has __float128
@@ -186,6 +189,11 @@ riscv64)
 LANG_ADA=false;;
 esac
 
+case "$CTARGET_ARCH" in
+loongarch64)
+LANG_ADA=false;;
+esac
+
 _languages=c
 if $LANG_CXX; then
 	_languages="$_languages,c++"
@@ -269,6 +277,7 @@ 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:
@@ -328,6 +337,7 @@ build() {
 	i586-*-*-*)		_arch_configure="--with-arch=pentium-m --with-fpmath=sse --with-tune=generic --enable-cld";;
 	s390x-*-*-*)		_arch_configure="--with-arch=z196 --with-tune=zEC12 --with-zarch --with-long-double-128 --enable-decimal-float";;
 	riscv64-*-*-*)		_arch_configure="--with-arch=rv64gc --with-abi=lp64d --enable-autolink-libatomic";;
+	loongarch64-*-*-*)      _arch_configure="--with-arch=loongarch64 --with-abi=lp64d";;
 	esac
 
 	case "$CTARGET_ARCH" in
@@ -683,10 +693,6 @@ 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
@@ -787,7 +793,7 @@ gdb() {
 }
 
 sha512sums="
-406673a62deba759fc0532a801b3f57cabf894ea328587b23e62a707ba5767b0e3ae9b3f86bf3c6fcf13e8a3c30bc470e6598b625c8231efb629034211c162c2  gcc-13-20231014.tar.xz
+2d1e0374ebdee526f0549319fc9c364968c52a0d4aaa16759f00453cb083fe58d8f463c47d97f3bb74a0a92e251989eb75a50ee5800b4569978c72d25446b44e  gcc-13-20240309.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
@@ -823,4 +829,5 @@ 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
 "

cross/gcc-x86/0037-loongarch-disable-multilib-support.patch

@@ -0,0 +1,61 @@
+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
+

cross/gcc-x86/APKBUILD

@@ -24,7 +24,7 @@ CBUILDROOT="/"
 _cross_configure="--disable-bootstrap --with-sysroot=/usr/$CTARGET"
 
 pkgname=gcc-x86
-pkgver=13.2.1_git20231014
+pkgver=13.2.1_git20240309
 # i.e. 13.2.1, must match gcc/BASE-VER
 _pkgbase="${pkgver%%_git*}"
 # date component from snapshots
@@ -46,6 +46,7 @@ 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}"
@@ -143,7 +144,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)	LANG_D=false ;;
+ppc64le|riscv64|loongarch64)	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
@@ -155,6 +156,7 @@ 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
@@ -162,6 +164,7 @@ esac
 # the internal libffi.
 case "$CTARGET_ARCH" in
 mips*)		LANG_GO=false ;;
+loongarch64)	LANG_GO=false ;;
 esac
 
 # Fortran uses libquadmath if toolchain has __float128
@@ -186,6 +189,11 @@ riscv64)
 LANG_ADA=false;;
 esac
 
+case "$CTARGET_ARCH" in
+loongarch64)
+LANG_ADA=false;;
+esac
+
 _languages=c
 if $LANG_CXX; then
 	_languages="$_languages,c++"
@@ -269,6 +277,7 @@ 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:
@@ -328,6 +337,7 @@ build() {
 	i586-*-*-*)		_arch_configure="--with-arch=pentium-m --with-fpmath=sse --with-tune=generic --enable-cld";;
 	s390x-*-*-*)		_arch_configure="--with-arch=z196 --with-tune=zEC12 --with-zarch --with-long-double-128 --enable-decimal-float";;
 	riscv64-*-*-*)		_arch_configure="--with-arch=rv64gc --with-abi=lp64d --enable-autolink-libatomic";;
+	loongarch64-*-*-*)      _arch_configure="--with-arch=loongarch64 --with-abi=lp64d";;
 	esac
 
 	case "$CTARGET_ARCH" in
@@ -683,10 +693,6 @@ 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
@@ -787,7 +793,7 @@ gdb() {
 }
 
 sha512sums="
-406673a62deba759fc0532a801b3f57cabf894ea328587b23e62a707ba5767b0e3ae9b3f86bf3c6fcf13e8a3c30bc470e6598b625c8231efb629034211c162c2  gcc-13-20231014.tar.xz
+2d1e0374ebdee526f0549319fc9c364968c52a0d4aaa16759f00453cb083fe58d8f463c47d97f3bb74a0a92e251989eb75a50ee5800b4569978c72d25446b44e  gcc-13-20240309.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
@@ -823,4 +829,5 @@ 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
 "

cross/gcc-x86_64/0037-loongarch-disable-multilib-support.patch

@@ -0,0 +1,61 @@
+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
+

cross/gcc-x86_64/APKBUILD

@@ -24,7 +24,7 @@ CBUILDROOT="/"
 _cross_configure="--disable-bootstrap --with-sysroot=/usr/$CTARGET"
 
 pkgname=gcc-x86_64
-pkgver=13.2.1_git20231014
+pkgver=13.2.1_git20240309
 # i.e. 13.2.1, must match gcc/BASE-VER
 _pkgbase="${pkgver%%_git*}"
 # date component from snapshots
@@ -46,6 +46,7 @@ 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}"
@@ -143,7 +144,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)	LANG_D=false ;;
+ppc64le|riscv64|loongarch64)	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
@@ -155,6 +156,7 @@ 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
@@ -162,6 +164,7 @@ esac
 # the internal libffi.
 case "$CTARGET_ARCH" in
 mips*)		LANG_GO=false ;;
+loongarch64)	LANG_GO=false ;;
 esac
 
 # Fortran uses libquadmath if toolchain has __float128
@@ -186,6 +189,11 @@ riscv64)
 LANG_ADA=false;;
 esac
 
+case "$CTARGET_ARCH" in
+loongarch64)
+LANG_ADA=false;;
+esac
+
 _languages=c
 if $LANG_CXX; then
 	_languages="$_languages,c++"
@@ -269,6 +277,7 @@ 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:
@@ -328,6 +337,7 @@ build() {
 	i586-*-*-*)		_arch_configure="--with-arch=pentium-m --with-fpmath=sse --with-tune=generic --enable-cld";;
 	s390x-*-*-*)		_arch_configure="--with-arch=z196 --with-tune=zEC12 --with-zarch --with-long-double-128 --enable-decimal-float";;
 	riscv64-*-*-*)		_arch_configure="--with-arch=rv64gc --with-abi=lp64d --enable-autolink-libatomic";;
+	loongarch64-*-*-*)      _arch_configure="--with-arch=loongarch64 --with-abi=lp64d";;
 	esac
 
 	case "$CTARGET_ARCH" in
@@ -683,10 +693,6 @@ 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
@@ -787,7 +793,7 @@ gdb() {
 }
 
 sha512sums="
-406673a62deba759fc0532a801b3f57cabf894ea328587b23e62a707ba5767b0e3ae9b3f86bf3c6fcf13e8a3c30bc470e6598b625c8231efb629034211c162c2  gcc-13-20231014.tar.xz
+2d1e0374ebdee526f0549319fc9c364968c52a0d4aaa16759f00453cb083fe58d8f463c47d97f3bb74a0a92e251989eb75a50ee5800b4569978c72d25446b44e  gcc-13-20240309.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
@@ -823,4 +829,5 @@ 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
 "

cross/grub-efi-x86/APKBUILD

@@ -3,7 +3,7 @@
 
 pkgname=grub-efi-x86
 pkgver=2.12
-pkgrel=1
+pkgrel=5
 
 _arch="x86"
 _mirror="http://dl-4.alpinelinux.org/alpine/"
@@ -22,5 +22,5 @@ package() {
 }
 
 sha512sums="
-775d65b51f3438dc05ee26e5a10ae348a045b85b072a3d14714bc89181ba5d26a92e6991b8dafb00a4ff639e8be455b1f2ba5f044b4fa0c4f650a7ab455c4bc2  grub-efi-2.12-r1-x86-edge.apk
+3cc14376ad5dc2a4d8488d49199d1257c5024c8c4afcbcdf67a0cd7a66e75962191850cca4248ce13abf060b4d9e2fd0966ef6adeb38a00d58c9e4054eec1e9d  grub-efi-2.12-r5-x86-edge.apk
 "

cross/musl-aarch64/APKBUILD

@@ -7,8 +7,8 @@ if [ -z "$(type -t arch_to_hostspec)" ]; then
 fi
 
 pkgname=musl-aarch64
-pkgver=1.2.4_git20230717
-pkgrel=6
+pkgver=1.2.5
+pkgrel=1
 arch="x86_64"
 subpackages="musl-dev-aarch64:package_dev"
 
@@ -57,6 +57,6 @@ package_dev() {
 }
 
 sha512sums="
-a1c38269eba0a3a5c211dba3e24827147ccd80ed86f68454f348e632e22909c892a2fe82a5d9f417094135c2b3a7e45f7e5eb7e83b81a40a28e4c432684c2ff7  musl-1.2.4_git20230717-r6-aarch64-edge.apk
-94fd969172f8832e1b5faa89413585be28304738fb90607eec1dd0a923785705bb87f7d885cd8e6b7cf882de12fc28e167122199f2cfc0c034c0e9303734cfc6  musl-dev-1.2.4_git20230717-r6-aarch64-edge.apk
+5ad546aca584d77f6fcf7d92bc5e6432d8c32b3db2922a4099423649e674b5c149464bd0048021e50b18398a00382bbeb6a0a598148bea4fa6d783f5c4c4445d  musl-1.2.5-r1-aarch64-edge.apk
+b6fed1441c0eacfea0061967915a876ce0af79b83511d9b05ae7e7cf489d88e36a544fa7f7512f390429d7d0217b672c04a83dfceea603ce0e86d2a47c50f4cc  musl-dev-1.2.5-r1-aarch64-edge.apk
 "

cross/musl-armhf/APKBUILD

@@ -7,8 +7,8 @@ if [ -z "$(type -t arch_to_hostspec)" ]; then
 fi
 
 pkgname=musl-armhf
-pkgver=1.2.4_git20230717
-pkgrel=6
+pkgver=1.2.5
+pkgrel=1
 arch="x86_64"
 subpackages="musl-dev-armhf:package_dev"
 
@@ -57,6 +57,6 @@ package_dev() {
 }
 
 sha512sums="
-19cba9cf31a372db4cc1b606cacdd2ba8eb83ac6a9b5d8c1a85bbab9407ebf91c4e4469d2185b4b2c9fdd4c70a6389465b8fbd683a5ddef9fede02d530d82cce  musl-1.2.4_git20230717-r6-armhf-edge.apk
-5be3d5dfc2f82881882207d57421272308e5a5c30792b22a445a8c9c5ec408a1662c17d5fcf52ebcf6542f4608a160a53a34ee1deb8f905f28d4c4fc09c3ad93  musl-dev-1.2.4_git20230717-r6-armhf-edge.apk
+148883dfd80bb670df4c6a919aaf3334d203a87fac98df8046a920a2e4c1c3439347f5653abc2994e9a9fe2946764395cd83e2f2437ab903e37f8ad3fcc6637a  musl-1.2.5-r1-armhf-edge.apk
+052f4f3ff6974aadbe90c1a69c4b29a1fefc25d2f2f794b3d55ed49b79a94dab900592a65b3c80ae9824580eab4fb99cb2cfdf9399354e74a1804871d97774a0  musl-dev-1.2.5-r1-armhf-edge.apk
 "

cross/musl-armv7/APKBUILD

@@ -7,8 +7,8 @@ if [ -z "$(type -t arch_to_hostspec)" ]; then
 fi
 
 pkgname=musl-armv7
-pkgver=1.2.4_git20230717
-pkgrel=6
+pkgver=1.2.5
+pkgrel=1
 arch="x86_64"
 subpackages="musl-dev-armv7:package_dev"
 
@@ -57,6 +57,6 @@ package_dev() {
 }
 
 sha512sums="
-3f037e34426a55809f2754b1231e095175c8ae5cb0be93b33cbd5f45b77379b8b38b57447e499e51fd40caac4da89dab7161ba458139357228460a85019f42d2  musl-1.2.4_git20230717-r6-armv7-edge.apk
-232d14471b6bb9864524725c8b3c8318070ed3ebf818f69c834a06dee805cc5b8d79609b4916911022050c0e25f3a4d1802b70f9bef471eaebc919d1824138ca  musl-dev-1.2.4_git20230717-r6-armv7-edge.apk
+f3da7602184940c3ca4ddc973fd127fe08eb5e9141cf4c22cf49ccf131ef836b7f697f20dc64c7e18661f88779354c8b93c14521d18fb2e83d10638c3c8ed7d5  musl-1.2.5-r1-armv7-edge.apk
+b2678887dfc565691d92c1604137d984c5ce68f7c39c1ec2fd7200d4df4f818d4690c323f93b76ca1d4498a5dc36dff61959e06cc749099c706f85601d915d8e  musl-dev-1.2.5-r1-armv7-edge.apk
 "

cross/musl-riscv64/APKBUILD

@@ -7,8 +7,8 @@ if [ -z "$(type -t arch_to_hostspec)" ]; then
 fi
 
 pkgname=musl-riscv64
-pkgver=1.2.4_git20230717
-pkgrel=6
+pkgver=1.2.5
+pkgrel=1
 arch="x86_64"
 subpackages="musl-dev-riscv64:package_dev"
 
@@ -57,6 +57,6 @@ package_dev() {
 }
 
 sha512sums="
-13e080ba64be5e1cbaeb4af678f07b33e898918eccdea3e18e3e82bee5f0420bef3f69b1dd336f33c1b88ac34502cae81c9d021d6a658f212404a65bed2e3784  musl-1.2.4_git20230717-r6-riscv64-edge.apk
-926e219793a8ab447b89c22c23eab96e086bbe14c85ed2260fc2998bdd66138769e63704cb28c7dae8ad1d406049b11071653836375513f77f02aab372578d3f  musl-dev-1.2.4_git20230717-r6-riscv64-edge.apk
+822f24faaf2285174742788da0dceef3bada4dbd0db9f67362876b3c0ab6bc647a0f2f0cc70e2e28dbb90121f08b65640a344e7cae8416a84bfb389db32e7d9c  musl-1.2.5-r1-riscv64-edge.apk
+04ac4a81d713f71b68082767ce2afab3ce458730664c140f49a0b33f257666a6b4289c5b53935fe16345f8445a458e5307511773651c4574526cfaaf232c239a  musl-dev-1.2.5-r1-riscv64-edge.apk
 "

cross/musl-x86/APKBUILD

@@ -7,8 +7,8 @@ if [ -z "$(type -t arch_to_hostspec)" ]; then
 fi
 
 pkgname=musl-x86
-pkgver=1.2.4_git20230717
-pkgrel=6
+pkgver=1.2.5
+pkgrel=1
 arch="x86_64"
 subpackages="musl-dev-x86:package_dev"
 
@@ -57,6 +57,6 @@ package_dev() {
 }
 
 sha512sums="
-6663204c5f1c67b6814996f1a112a483672bebc3568d9e1fdcb19ad03098c874ced19f22bf7a69c96a8ff1ff2859aec87b0872fefa1a6d265e8cadba0b31264c  musl-1.2.4_git20230717-r6-x86-edge.apk
-f367e5537822ba63ba41a5c5276c306398ba346a8953323cba6122ec67083213819f09ca31ce55b720a43be82b1409e07688f73bc60a9cdb1938684825f31f7b  musl-dev-1.2.4_git20230717-r6-x86-edge.apk
+53a30a57f0db29e8d73d7190590fce18a19bcd358f9b0f3d4fa0b8821dad4ed5f1065c3c07dbc373a23cbd98c9a9dc1c2c2d864ac88eefd53dc5f89d8e57ed67  musl-1.2.5-r1-x86-edge.apk
+e9178fcfe27bdc7568c35889cff8cf20829f67460fd6dc22a6ca0465063a809081ee1267b4275432d23d1e7d457a4b207a0ff11c678233c4e430a1173d4ccea8  musl-dev-1.2.5-r1-x86-edge.apk
 "

cross/musl-x86_64/APKBUILD

@@ -7,8 +7,8 @@ if [ -z "$(type -t arch_to_hostspec)" ]; then
 fi
 
 pkgname=musl-x86_64
-pkgver=1.2.4_git20230717
-pkgrel=6
+pkgver=1.2.5
+pkgrel=1
 arch="aarch64"
 subpackages="musl-dev-x86_64:package_dev"
 
@@ -57,6 +57,6 @@ package_dev() {
 }
 
 sha512sums="
-8c8bd31b545625fc9f2dc7315a6f57d316e1f0fe933e0e40b41359bb4e151b1b5cb9077b3b247673099c3314e4252771d08f2e3cfdec1e43b37588fb5ce7df60  musl-1.2.4_git20230717-r6-x86_64-edge.apk
-811d830ad37bafe1ffcf8f485e30ca2c5f3ea70879b6606b59a35caa789d2d2944b0995d8864ea9a444d214fbb9ca2facf53f4363adadeb3f3cc5b14b31ea57d  musl-dev-1.2.4_git20230717-r6-x86_64-edge.apk
+5506970c66b6da294d32961e94cadc6926a7405915a3d4dd519ed8c2aae829f2fbfaab2ccc8d0794f4aa102aa3e8cbd62099aa54668a11ac0c5072f59befece6  musl-1.2.5-r1-x86_64-edge.apk
+bd2602e59831ba860a548c8281bb62be3382b4035f18c9e36350be644db61a762a413e1d696697d402a57d4bc565faf86c2a212e27c9b9a890d765f794bbe829  musl-dev-1.2.5-r1-x86_64-edge.apk
 "

device/.shared-patches/linux/linux3.0-8933-1-replace-Sun-Solaris-style-flag-on-section.patch

@@ -0,0 +1,70 @@
+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
+

device/.shared-patches/linux/linux3.0-fix-piggy.lzma.S.patch

@@ -0,0 +1,22 @@
+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
+

device/.shared-patches/linux/linux3.0-fix-piggy.lzo.S.patch

@@ -0,0 +1,22 @@
+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
+

device/.shared-patches/linux/linux3.4-fix-piggy.gzip.S.patch

@@ -0,0 +1,10 @@
+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"

device/archived/device-alcatel-idol347-downstream/APKBUILD

@@ -1,4 +1,4 @@
-# Unmaintained: Downstream port, only for testing. Use mainline port (alcatel-idol347)!
+# Archived: Downstream port, only for testing. Use mainline port (alcatel-idol347)!
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-alcatel-idol347-downstream
 pkgdesc="Alcatel OneTouch Idol 3 (4.7) (Downstream)"

device/archived/device-bq-paella-downstream/APKBUILD

@@ -1,4 +1,4 @@
-# Unmaintained: Downstream port, only for testing. Use mainline port (bq-paella)!
+# Archived: Downstream port, only for testing. Use mainline port (bq-paella)!
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-bq-paella-downstream
 pkgdesc="BQ Aquaris X5 (Downstream)"

device/archived/device-htc-flounder-downstream/APKBUILD

@@ -1,8 +1,8 @@
-# Unmaintained: Downstream port, only for testing. Use mainline port (htc-flounder)!
+# Archived: Downstream port, only for testing. Use mainline port (htc-flounder)!
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-htc-flounder-downstream
 pkgdesc="Google Nexus 9"
-pkgver=0.1
+pkgver=1
 pkgrel=0
 url="https://postmarketos.org"
 license="gpl-v3"

device/archived/device-huawei-kiwi-downstream/APKBUILD

@@ -1,4 +1,4 @@
-# Unmaintained: Downstream port, only for testing. Use mainline port (huawei-kiwi)!
+# Archived: Downstream port, only for testing. Use mainline port (huawei-kiwi)!
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-huawei-kiwi-downstream
 pkgdesc="Huawei Honor 5X (Downstream)"

device/archived/device-kobo-clara-downstream/APKBUILD

@@ -0,0 +1,46 @@
+# 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
+"

device/archived/device-kobo-clara-downstream/deviceinfo

@@ -0,0 +1,28 @@
+# 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"

device/archived/device-motorola-ocean-downstream/APKBUILD

@@ -1,9 +1,9 @@
-# Unmaintained: Downstream port, only for testing. Use mainline port (motorola-ocean)!
+# Archived: Downstream port, only for testing. Use mainline port (motorola-ocean)!
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-motorola-ocean-downstream
 pkgdesc="Motorola Moto G7 Power"
-pkgver=0.1
-pkgrel=2
+pkgver=1
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"

device/archived/device-oneplus-cheeseburger-downstream/APKBUILD

@@ -1,9 +1,9 @@
-# Unmaintained: Downstream port, only for reference. Use mainline port (oneplus-cheeseburger)!
+# Archived: Downstream port, only for reference. Use mainline port (oneplus-cheeseburger)!
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-oneplus-cheeseburger-downstream
 pkgdesc="OnePlus 5 (Downstream)"
 pkgver=3
-pkgrel=1
+pkgrel=2
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -13,7 +13,6 @@ depends="
 	msm-fb-refresher
 	mkbootimg
 	postmarketos-base
-	postmarketos-update-kernel
 "
 makedepends="devicepkg-dev"
 source="deviceinfo"

device/archived/device-oneplus-dumpling-downstream/APKBUILD

@@ -1,9 +1,9 @@
-# Unmaintained: Downstream port, only for reference. Use mainline port (oneplus-dumpling)!
+# Archived: Downstream port, only for reference. Use mainline port (oneplus-dumpling)!
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-oneplus-dumpling-downstream
 pkgdesc="OnePlus 5T (Downstream)"
 pkgver=3
-pkgrel=1
+pkgrel=2
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -13,7 +13,6 @@ depends="
 	msm-fb-refresher
 	mkbootimg
 	postmarketos-base
-	postmarketos-update-kernel
 "
 makedepends="devicepkg-dev"
 source="deviceinfo"

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

@@ -1,4 +1,4 @@
-# Unmaintained: Downstream port, only for testing. Use mainline port (samsung-a5lte)!
+# Archived: Downstream port, only for testing. Use mainline port (samsung-a5lte)!
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-samsung-a5lte-downstream
 pkgdesc="Samsung Galaxy A5 (SM-A500F)"

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

@@ -1,4 +1,4 @@
-# Unmaintained: Downstream port, only for testing. Use mainline port (samsung-a5ulte)!
+# Archived: Downstream port, only for testing. Use mainline port (samsung-a5ulte)!
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-samsung-a5ulte-downstream
 pkgdesc="Samsung Galaxy A5 (SM-A500FU)"

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

@@ -1,9 +1,9 @@
-# Unmaintained: Downstream port, only for testing. Use mainline port (samsung-coreprimevelte)!
-# This kernel is used only for bringing up new features, thus unmaintained
+# Archived: Downstream port, only for testing. Use mainline port (samsung-coreprimevelte)!
+# This kernel is used only for bringing up new features, thus archived
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-samsung-coreprimevelte-downstream
 pkgdesc="Samsung Galaxy Core Prime VE LTE downstream"
-pkgver=0.1
+pkgver=1
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"

device/archived/device-samsung-espresso10-downstream/APKBUILD

@@ -1,9 +1,9 @@
-# Unmaintained: Downstream port, only for testing. Use mainline port (samsung-espresso10/samsung-espresso7)!
+# Archived: Downstream port, only for testing. Use mainline port (samsung-espresso10/samsung-espresso7)!
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-samsung-espresso10-downstream
 pkgdesc="Samsung Galaxy Tab 2 (10.1 inch)"
-pkgver=0.2
-pkgrel=1
+pkgver=1
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"

device/archived/device-samsung-expressatt-downstream/APKBUILD

@@ -1,14 +1,14 @@
-# Unmaintained: Downstream port
+# Archived: Downstream port
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-samsung-expressatt-downstream
 pkgdesc="Samsung Galaxy Express SGH-I437"
-pkgver=0.2
-pkgrel=0
+pkgver=1
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
 options="!check !archcheck"
-depends="postmarketos-base linux-samsung-expressatt mkbootimg"
+depends="postmarketos-base linux-samsung-expressatt-downstream mkbootimg"
 makedepends="devicepkg-dev"
 source="deviceinfo"
 

device/archived/device-samsung-janice-downstream/APKBUILD

@@ -1,4 +1,4 @@
-# Unmaintained: Downstream port, only for reference. Use mainline port (samsung-janice)!
+# Archived: Downstream port, only for reference. Use mainline port (samsung-janice)!
 # Reference: <https://postmarketos.org/devicepkg>
 
 pkgname=device-samsung-janice-downstream

device/archived/device-samsung-klte-downstream/APKBUILD

@@ -1,9 +1,9 @@
-# Unmaintained: Downstream port, only for testing. Use mainline port (samsung-klte)!
+# Archived: Downstream port, only for testing. Use mainline port (samsung-klte)!
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-samsung-klte-downstream
 pkgdesc="Samsung Galaxy S5 (SM-G900F)"
 pkgver=1
-pkgrel=3
+pkgrel=2
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"

device/archived/device-samsung-lt01wifi-downstream/APKBUILD

@@ -1,13 +1,19 @@
+# Archived: Downstream port, only for testing. Use mainline port (samsung-lt01)!
 # Reference: <https://postmarketos.org/devicepkg>
-pkgname=device-samsung-lt01wifi
+pkgname=device-samsung-lt01wifi-downstream
 pkgdesc="Samsung Galaxy Tab 3 8.0"
-pkgver=0.1
-pkgrel=14
+pkgver=1
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
 options="!check !archcheck"
-depends="postmarketos-base linux-samsung-lt01wifi mkbootimg"
+depends="
+	postmarketos-base
+	postmarketos-initramfs-minimal
+	linux-samsung-lt01wifi-downstream
+	mkbootimg
+"
 makedepends="devicepkg-dev"
 subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
 source="deviceinfo
@@ -24,12 +30,12 @@ package() {
 
 nonfree_firmware() {
 	pkgdesc="Wifi firmware"
-	depends="firmware-samsung-lt01wifi"
+	depends="firmware-samsung-lt01wifi-downstream"
 	mkdir "$subpkgdir"
 }
 
 sha512sums="
-6e527a8506854fa59d83514962cbed0d6404aa1cf547780d88a543a1e133a1366b3d8ab5b4362b84881b1902bebb661ecf1378935d5d73092c989de812f14e06  deviceinfo
+b6d8953f5717b81fd1cb6d34e0f5539480b348a52194bbd3e6d83c3ae9e77bc2d948b05303c93ecbd7121f7affd476a9522c32c1a55fd7cee4ae0ca1bc0b88a0  deviceinfo
 af036fe35011db078379dbb2e8c16c86546f0a4fcb3d1bcee3502bb1ea5b38f3ec5a9fa8cd1ca8ed8b89592a7f572d6072781289845303e0bf85fc2de4ead9fb  modules-load.conf
 594d6059ba1b06bce65538d26ce80cf2ce840786605b86e993ffaef858837507c033c0f95b7bcd9914ae7ea3cd2a9e43e32ec879db7c908219ad62d38b4e426a  modprobe.conf
 "

device/archived/device-samsung-lt01wifi-downstream/deviceinfo

@@ -4,7 +4,7 @@
 deviceinfo_format_version="0"
 deviceinfo_name="Samsung Galaxy Tab 3 8.0"
 deviceinfo_manufacturer="Samsung"
-deviceinfo_codename="samsung-lt01wifi"
+deviceinfo_codename="samsung-lt01wifi-downstream"
 deviceinfo_year="2013"
 deviceinfo_arch="armv7"
 

device/archived/device-samsung-m0-downstream/APKBUILD

@@ -1,9 +1,9 @@
-# Unmaintained: Downstream port, only for testing. Use mainline port (samsung-m0/samsung-m3)!
+# Archived: Downstream port, only for testing. Use mainline port (samsung-m0/samsung-m3)!
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-samsung-m0-downstream
 pkgdesc="Samsung Galaxy S III"
 pkgver=3
-pkgrel=3
+pkgrel=4
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
@@ -12,6 +12,7 @@ depends="
 	linux-samsung-m0-downstream
 	mkbootimg
 	postmarketos-base
+	postmarketos-initramfs-minimal
 	"
 makedepends="devicepkg-dev"
 install="$pkgname.post-install"

device/archived/device-samsung-on7xelte-downstream/APKBUILD

@@ -0,0 +1,59 @@
+# 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
+"

device/archived/device-samsung-on7xelte-downstream/deviceinfo

@@ -0,0 +1,33 @@
+# 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"

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

@@ -1,10 +1,10 @@
-# Unmaintained: Downstream port, only for testing. Use mainline port (shift-axolotl)!
-# This kernel is mostly used for bringing up new features on mainline, thus unmaintained
+# Archived: Downstream port, only for testing. Use mainline port (shift-axolotl)!
+# This kernel is mostly used for bringing up new features on mainline, thus archived
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-shift-axolotl-downstream
 pkgdesc="SHIFT6mq downstream"
 pkgver=1
-pkgrel=0
+pkgrel=2
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -14,7 +14,6 @@ depends="
 	mkbootimg
 	msm-fb-refresher
 	postmarketos-base
-	postmarketos-update-kernel
 "
 makedepends="devicepkg-dev"
 source="deviceinfo"
@@ -28,5 +27,5 @@ package() {
 }
 
 sha512sums="
-3a60faa3024b6a066e5f5319c0e651ffe4980be51cc1b848a946b96cd861be16d651dc2184993eca89f28fe442a39a1a78f67753dc1bb295cab4bdaaa6f2fe49  deviceinfo
+75bc9e4b1225f3988bef27763d5961160e3dbdb25260327c0390290827b8e946a27ed7f8b0a810f89d696112ca9d220652c8789cbc86f898d2292dd0ae2f61e4  deviceinfo
 "

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

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

device/archived/device-xiaomi-cepheus-downstream/APKBUILD

@@ -1,9 +1,9 @@
-# Unmaintained: Downstream port, only for reference.
+# Archived: Downstream port, only for reference.
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-xiaomi-cepheus-downstream
 pkgdesc="Xiaomi Mi 9"
-pkgver=0.1
-pkgrel=3
+pkgver=1
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"