systemd/gnome-session: remove

gnome-session now has systemd session support upstream in Alpine:
https://gitlab.alpinelinux.org/alpine/aports/-/commit/6c70d4e5d4077419315832a2acab82883b0797ed

.ci/grep.sh

@@ -2,6 +2,8 @@
 # Description: check various bad patterns with grep
 # https://postmarketos.org/pmb-ci
 
+exit_code=0
+
 if [ "$(id -u)" = 0 ]; then
 	set -x
 	apk -q add grep
@@ -12,7 +14,7 @@ fi
 if grep -qr '(CHANGEME!)' -- *; then
 	echo "ERROR: Please replace '(CHANGEME!)' in the following files:"
 	grep --color=always -r '(CHANGEME!)' -- *
-	exit 1
+	exit_code=1
 fi
 
 # DTBs installed to /usr/share/db
@@ -23,7 +25,7 @@ if grep -qr 'INSTALL_DTBS_PATH="$pkgdir"/usr/share/dtb' device/; then
 	echo 'ERROR: Files that need fixing:'
 	# shellcheck disable=SC2016
 	grep --color=always -r 'INSTALL_DTBS_PATH="$pkgdir"/usr/share/dtb' device/
-	exit 1
+	exit_code=1
 fi
 
 
@@ -31,24 +33,51 @@ fi
 if grep -qr '/etc/postmarketos-mkinitfs' -- *; then
 	echo "ERROR: Please replace '/etc/postmarketos-mkinitfs' with '/usr/share/mkinitfs' in the following files:"
 	grep --color=always -r '/etc/postmarketos-mkinitfs' -- *
-	exit 1
+	exit_code=1
 fi
 if grep -qr '/usr/share/postmarketos-mkinitfs' -- *; then
 	echo "ERROR: Please replace '/usr/share/postmarketos-mkinitfs' with '/usr/share/mkinitfs' in the following files:"
 	grep --color=always -r '/usr/share/postmarketos-mkinitfs' -- *
-	exit 1
+	exit_code=1
 fi
 
 # Direct sourcing of deviceinfo
 if grep --exclude='source_deviceinfo' -qEr 'source /etc/deviceinfo|\. /etc/deviceinfo' -- *; then
 	echo 'ERROR: Please source the source_deviceinfo script instead of sourcing deviceinfo directly!'
 	grep --color=always --exclude='rootfs-usr-share-misc-source_deviceinfo' -Er 'source /etc/deviceinfo|\. /etc/deviceinfo' -- *
-	exit 1
+	exit_code=1
 fi
 
 # Removed deviceinfo variable
 if grep -qr 'deviceinfo_modules_initfs' -- *; then
 	echo 'ERROR: deviceinfo_modules_initfs variable has been removed. Use "modules-initfs" file instead.'
 	grep --color=always -r 'deviceinfo_modules_initfs' -- *
-	exit 1
+	exit_code=1
 fi
+
+POSTMARKETOS_WALLPAPER_PATH='/usr/share/wallpapers/postmarketos.jpg'
+# The excluded devices are "grandfathered in". New devices should not be added here.
+# See https://gitlab.com/postmarketOS/pmaports/-/issues/2529
+if grep -qr $POSTMARKETOS_WALLPAPER_PATH \
+	--exclude-dir='device-pine64-pinetab' \
+	--exclude-dir='device-oneplus-kebab' \
+	--exclude-dir='device-xiaomi-willow' \
+	-- device; then
+	echo "ERROR: Please don't include configuration files that set the default wallpaper in device-specific packages!"
+	grep --color=always -r $POSTMARKETOS_WALLPAPER_PATH \
+		--exclude-dir='device-pine64-pinetab' \
+		--exclude-dir='device-oneplus-kebab' \
+		--exclude-dir='device-xiaomi-willow' \
+		-- device
+	exit_code=1
+fi
+
+OPENRC_SERVICE_FILES=$(find . -name '*.initd')
+# shellcheck disable=SC2086
+if grep -q 'before wpa_supplicant' $OPENRC_SERVICE_FILES; then
+	echo "ERROR: Please use 'before wlan' in OpenRC service files! This ensures compatibility with both wpa_supplicant and iwd."
+	grep --color=always 'before wpa_supplicant' $OPENRC_SERVICE_FILES
+	exit_code=1
+fi
+
+exit "$exit_code"

.ci/lib/build_changed_aports.py

@@ -15,6 +15,9 @@ import pmb.helpers.pmaports
 
 def build_strict(packages, arch):
     common.run_pmbootstrap(["build_init"])
+    common.run_pmbootstrap(["config", "mirrors_postmarketos",
+                            "http://mirror.postmarketos.org/postmarketos/staging/systemd/"])
+    common.run_pmbootstrap(["config", "systemd", "always"])
     common.run_pmbootstrap(["--details-to-stdout", "--no-ccache", "build",
                             "--strict", "--force",
                             "--arch", arch, ] + list(packages))

.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,30 +59,9 @@ def get_upstream_branch():
         channels.cfg from master to retrieve the upstream branch.
 
         :returns: branch name, e.g. "v20.05" """
-    global cache
-    if "upstream_branch" in cache:
-        return cache["upstream_branch"]
 
-    # Get channel (e.g. "stable") from pmaports.cfg
-    # https://postmarketos.org/pmaports.cfg
-    pmaports_dir = get_pmaports_dir()
-    pmaports_cfg = configparser.ConfigParser()
-    pmaports_cfg.read(f"{pmaports_dir}/pmaports.cfg")
-    channel = pmaports_cfg["pmaports"]["channel"]
-
-    # Get branch_pmaports (e.g. "v20.05") from channels.cfg
-    # https://postmarketos.org/channels.cfg
-    channels_cfg_str = run_git(["show", "upstream/master:channels.cfg"])
-    channels_cfg = configparser.ConfigParser()
-    channels_cfg.read_string(channels_cfg_str)
-    assert channel in channels_cfg, \
-        f"Channel '{channel}' from pmaports.cfg in your branch is unknown." \
-        " This appears to be an old branch, consider recreating your change" \
-        " on top of master."
-
-    ret = channels_cfg[channel]["branch_pmaports"]
-    cache["upstream_branch"] = ret
-    return ret
+    # HACK for master_staging_systemd branch
+    return "master_staging_systemd"
 
 
 def get_changed_files(removed=True):

.ci/ruff.sh

@@ -4,11 +4,11 @@
 
 if [ "$(id -u)" = 0 ]; then
 	set -x
-	apk -q add py3-flake8
+	apk -q add ruff
 	exec su "${TESTUSER:-build}" -c "sh -e $0"
 fi
 
 set -x
 
 # shellcheck disable=SC2046
-flake8 --ignore E501,F401,E722,W504,W605 $(find .ci -name '*.py')
+ruff --ignore E501,F401,E722,W605 $(find .ci -name '*.py')

.ci/shellcheck.sh

@@ -15,9 +15,7 @@ fi
 # Shell: shellcheck
 sh_files="
 	./main/mdss-fb-init-hack/mdss-fb-init-hack.sh
-	./main/osk-sdl/unlock.sh
 	./main/postmarketos-base/rootfs-usr-lib-firmwareload.sh
-	./main/postmarketos-base-ui/rootfs-usr-lib-NetworkManager-dispatcher.d-50-dns-filter.sh
 	./main/postmarketos-base-ui/rootfs-usr-lib-NetworkManager-dispatcher.d-50-tethering.sh
 	./main/postmarketos-installkernel/installkernel-pmos
 	./main/postmarketos-initramfs/init.sh
@@ -25,7 +23,6 @@ sh_files="
 	./main/postmarketos-mkinitfs-hook-debug-shell/20-debug-shell.sh
 	./main/postmarketos-mkinitfs-hook-debug-shell/setup_usb_storage.sh
 	./main/postmarketos-mkinitfs-hook-netboot/netboot.sh
-	./main/postmarketos-update-kernel/update-kernel.sh
 	./main/ttyescape/*.post-install
 	./main/unl0kr/unlock.sh
 	./main/msm-firmware-loader/*.post-install

.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

@@ -10,6 +10,7 @@ expected_directories = [
     "device/main",
     "device/testing",
     "device/unmaintained",
+    "extra-repos/systemd",
     "main",
     "modem",
     "non-free",
@@ -30,7 +31,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

@@ -20,6 +20,9 @@ def test_aports_kernel(args):
         apkbuild = pmb.parse.apkbuild(path)
         aport_name = os.path.basename(os.path.dirname(path))
 
+        if aport_name == "linux-pam":
+            continue  # This package isn't a linux kernel!
+
         if "pmb:cross-native" not in apkbuild["options"]:
             raise RuntimeError(f"{aport_name}: \"pmb:cross-native\" missing in"
                                " options= line")

.ecrc

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

.editorconfig

@@ -7,8 +7,13 @@
 # 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
 insert_final_newline = true
+
+# Forked from Alpine
+[extra-repos/systemd/networkmanager/networkmanager.rules]
+indent_style = space
+indent_size = 4

.gitlab-ci.yml

@@ -1,61 +1,58 @@
 ---
 
 # global settings
-image: alpine:latest
+image: alpine:edge
+before_script: &global_before_scripts
+  - apk upgrade -U
 after_script:
   - .ci/lib/move_logs.sh $CI_PROJECT_DIR
 stages:
   - lint
   - build
 
-# 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
+    - if: $CI_PIPELINE_SOURCE == "schedule"
 
 # 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
 
 # testcases linting
-flake8:
+ruff:
   stage: lint
-  <<: *only-default
-  only:
-    refs:
-      - merge_requests
-    changes:
-      - .ci/*
-      - .ci/*/*
-  before_script:
-    - apk -q add py-flake8
+  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/flake8.sh
+    - .ci/ruff.sh
 
 # 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
@@ -64,8 +61,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
@@ -73,7 +71,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
@@ -89,23 +88,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
@@ -114,9 +111,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"
@@ -125,8 +123,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
@@ -141,11 +141,6 @@ build-x86_64:
   script:
     - .ci/build-x86_64.sh
 
-build-x86:
-  extends: .build
-  script:
-    - .ci/build-x86.sh
-
 build-aarch64:
   extends: .build
   script:
@@ -155,13 +150,3 @@ build-armv7:
   extends: .build
   script:
     - .ci/build-armv7.sh
-
-build-armhf:
-  extends: .build
-  script:
-    - .ci/build-armhf.sh
-
-build-riscv64:
-  extends: .build
-  script:
-    - .ci/build-riscv64.sh

CODEOWNERS

@@ -1,59 +1,121 @@
 # 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
 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/*/*-lenovo-21bx/				@craftyguy
+device/*/*-lenovo-a6000/			@jenneron @Minecrell
+device/*/*-lenovo-a6010/			@jenneron @Minecrell
+device/*/*-librecomputer-lafrite/		@funderscore
+device/*/*-librecomputer-lepotato/		@funderscore
+device/*/*-librecomputer-solitude/		@Newbyte @funderscore
+device/*/*-motorola-harpia/			@Minecrell
+device/*/*-nokia-n900/				@sicelo @Danct12
+device/*/*-pine64-pinebookpro/			@QC8086
+device/*/*-pine64-pinephone/			@craftyguy @milesalan @proycon @anjandev @StacyHarper @Arnavion @PsychoGame
+device/*/*-pine64-pinephonepro/			@PsychoGame
+device/*/*-pine64-rockpro64/			@PureTryOut
+device/*/*-purism-librem5/			@craftyguy @alistair23 @Newbyte
+device/*/*-qcom-msm8916/			@Minecrell @TravMurav
 device/*/*-qcom-sdm845/				@sdm845-mainline
+device/*/*-qcom-sm6350/				@z3ntu
+device/*/*-samsung-a3/				@Mis012 @TravMurav @Minecrell
+device/*/*-samsung-a5/				@Minecrell @minlexx
+device/*/*-samsung-e7/				@wonderfulShrineMaidenOfParadise
+device/*/*-samsung-espresso10/			@MightyM17
+device/*/*-samsung-espresso7/			@MightyM17 @antoni.aloytorrens
+device/*/*-samsung-grandmax/			@wonderfulShrineMaidenOfParadise
+device/*/*-samsung-gt510/			@TravMurav
+device/*/*-samsung-gt58/			@TravMurav
+device/*/*-samsung-serranove/			@Minecrell
+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/		@clamor95 @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-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/*/device-samsung-j5y17lte/	@andrisas
+device/*/device-samsung-klimtlte/		@Grimler
+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/*/linux-google-nyan/			@jenneron
+device/*/linux-google-veyron/			@jenneron
+device/*/linux-huawei-plank/			@gtrxAC
+device/*/linux-postmarketos-allwinner/		@Arnavion @PsychoGame
+device/*/linux-postmarketos-amlogic/		@funderscore @exkc
+device/*/linux-postmarketos-exynos4/		@Newbyte @ThiagaoPlusPlus
+device/*/linux-postmarketos-exynos5/		@jenneron @Grimler
+device/*/linux-postmarketos-grate/		@clamor95 @jenneron @jethrob
+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
+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
-
-main/postmarketos-update-depthcharge-kernel/	@jenneron
-main/osk-sdl/					@craftyguy
+device/*/linux-samsung-j5y17lte/	@andrisas
+device/*/linux-samsung-klimtlte/		@Grimler
+device/*/oem-amd/				@craftyguy
+device/*/oem-intel/				@craftyguy
+device/*/soc-mediatek-mt8183/			@jenneron
+device/*/soc-qcom-msm8953/			@barni2000
+device/*/soc-qcom-msm8996/			@Tooniis
+device/*/soc-qcom-sc7180/			@jenneron
+device/*/soc-rockchip-rk3399/			@jenneron
+device/*/soc-samsung-exynos4412/		@Newbyte
+device/*/u-boot-librem5/			@craftyguy @alistair23 @Newbyte
+device/*/u-boot-pinebookpro/			@QC8086
+device/*/u-boot-pinephone/			@Arnavion @PsychoGame
+device/*/wl1251-cal/				@Danct12
 main/postmarketos-ui-plasma-mobile/		@bshah
+main/shutdown-clear-rtc-wakealarm/		@Arnavion
 main/ttyescape/					@calebccff
-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

channels.cfg

@@ -15,7 +15,7 @@ branch_aports=3.19-stable
 mirrordir_alpine=v3.19
 
 [v23.06]
-description=Old release (supported until 2024-01-18)
+description=Old release (unsupported)
 branch_pmaports=v23.06
 branch_aports=3.18-stable
 mirrordir_alpine=v3.18

cross/busybox-static-aarch64/APKBUILD

@@ -8,7 +8,7 @@ fi
 
 pkgname=busybox-static-aarch64
 pkgver=1.36.1
-pkgrel=18
+pkgrel=26
 
 _arch="aarch64"
 _mirror="http://dl-4.alpinelinux.org/alpine/"
@@ -32,5 +32,5 @@ package() {
 }
 
 sha512sums="
-08f68b23bd880be12f95c5e1f071891f6b658fe7576f63d54e71d7390e4afc58de01813b2ea628f2b062830a89b0f69e8bd8a2b15fdb08bb9aba9e2a08971b0b  busybox-static-1.36.1-r18-aarch64-edge.apk
+0f5f1eb32691016183d9a3011c5643f70a1cdc9f49b1ffefce732cff960cfea4d0db1670564fff5504654bb2f07857e62e5dd076fb40d2c361c441854e5d5e5c  busybox-static-1.36.1-r26-aarch64-edge.apk
 "

cross/busybox-static-armhf/APKBUILD

@@ -8,7 +8,7 @@ fi
 
 pkgname=busybox-static-armhf
 pkgver=1.36.1
-pkgrel=18
+pkgrel=26
 
 _arch="armhf"
 _mirror="http://dl-4.alpinelinux.org/alpine/"
@@ -32,5 +32,5 @@ package() {
 }
 
 sha512sums="
-20b11081b5d1f25298fd4d8dfde51062f5c65060f5b53840eaad6fb69b94d64c5f5e522c9286f9a56cef4a9c88bdf53dcd385f47451b1563faf2058f1ea928cb  busybox-static-1.36.1-r18-armhf-edge.apk
+ad4db0c989c1a4773f75411c2749bcc8d25756d20396cdb6bfa59bd5ed14164928c602e9833101e584b28490971f6d43973a9c7de9c544693aef40dbe183cabc  busybox-static-1.36.1-r26-armhf-edge.apk
 "

cross/busybox-static-armv7/APKBUILD

@@ -8,7 +8,7 @@ fi
 
 pkgname=busybox-static-armv7
 pkgver=1.36.1
-pkgrel=18
+pkgrel=26
 
 _arch="armv7"
 _mirror="http://dl-4.alpinelinux.org/alpine/"
@@ -32,5 +32,5 @@ package() {
 }
 
 sha512sums="
-8f2fa87d979bdbe88eef0b9dece61001998df960e025902854b2af415b96d63ce9831dbe44d5c32b671c313efdfe9e22743a26de73febcc92d8d45d944ad66c0  busybox-static-1.36.1-r18-armv7-edge.apk
+f6664d29ecb22e396133116210d792e101fa552b4f4d2295de19af460830bbb151a2d3c4a7b7bbe1596d7b3ed85042f10dae49d78ae4e6ac053ed565f9043c01  busybox-static-1.36.1-r26-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=0
+pkgrel=3
 
 _arch="x86"
 _mirror="http://dl-4.alpinelinux.org/alpine/"
@@ -22,5 +22,5 @@ package() {
 }
 
 sha512sums="
-2958746c0c05271d3bb27912973ddf9180bbf060f9909037f0b9dcf3da2036dd81b69a37e1c43414def0e26942f83bccab04554ae6ddd6b3b9dc94d5e3744ac4  grub-efi-2.12-r0-x86-edge.apk
+4bd0750236a556ad833c27892a55624a324e8ec7cadb0b7287cabd3a9cdded836357ae959aea7ba828be8727b86c6ed4844a1572b68ad3ce3f3e6f913e43ae72  grub-efi-2.12-r3-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=5
+pkgver=1.2.5
+pkgrel=0
 arch="x86_64"
 subpackages="musl-dev-aarch64:package_dev"
 
@@ -57,6 +57,6 @@ package_dev() {
 }
 
 sha512sums="
-478704707b55072b9be8747e8c3bf3a20832d0329f63429fae2048e6b9a0674e31e92b4c1b8af87f65f84270711fef6b7ce54653448e580e532fa2c94e3761e1  musl-1.2.4_git20230717-r5-aarch64-edge.apk
-24471c9d781ce9920d06ab79296afb30ce61563729bb319ee8cd8feb960d1c05e5f96edb9464fcdb95b6c16fde788400408dd2e768e69ce13cc15ad3be54a969  musl-dev-1.2.4_git20230717-r5-aarch64-edge.apk
+dddd12728842e84bf7d532901d9b9e26e2c8c86e25a3625329586c9088ec9b3825ce3e512c56b7e875b923905308b89494d31d7ca05ebda5485bd00de3954236  musl-1.2.5-r0-aarch64-edge.apk
+061e68319d2069c211169d7f39b1da572a4c0ab56f8cfe5267c024921ea0e5f44ecc1cca6051bebaa9c83d067f0fd2cbc6b6b73d0e3075410eaf889a25cc82b4  musl-dev-1.2.5-r0-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=5
+pkgver=1.2.5
+pkgrel=0
 arch="x86_64"
 subpackages="musl-dev-armhf:package_dev"
 
@@ -57,6 +57,6 @@ package_dev() {
 }
 
 sha512sums="
-c0bdfbfc2c1f475c17850e7462cf286e9d8ce874deb03d536d208fcdeb45b35c761737f693be3be9711c15547cd9d2bbafae45280fc9b0291192c2489da0790f  musl-1.2.4_git20230717-r5-armhf-edge.apk
-1197968b53adca7c482d23ea2ca99d21fe905b554b83c30b960a4e64dda6ff40009745cd18621bd363b4994ccbc8b9b763b6c3105f6f6283dc8ee1305ab7206e  musl-dev-1.2.4_git20230717-r5-armhf-edge.apk
+4d76f479017b6f666c36782183f3bdb3e58a48f7400cd125c129e380a8654cf99f685f8d3e97b51cb0199b59720a320e251dd9b89fe55ef8f542a043ab3e7355  musl-1.2.5-r0-armhf-edge.apk
+7fa4e9ed4acb6292d46939a63e572eb92085e577bbfce75139a3ebef910434230fcbbb7a236efde7ad6d150d84e31c46edcfe835f4102cb9e68f062eb8488a1e  musl-dev-1.2.5-r0-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=5
+pkgver=1.2.5
+pkgrel=0
 arch="x86_64"
 subpackages="musl-dev-armv7:package_dev"
 
@@ -57,6 +57,6 @@ package_dev() {
 }
 
 sha512sums="
-5236dadbdb41e9543426592cf7e64e548fec59742e4943a99bb18e3cb93c9ae1287c9ac34c2de7fcb58bd1f94df4313324e8afa1160acc4929fb91f06754c77c  musl-1.2.4_git20230717-r5-armv7-edge.apk
-1877267544198d867752d02cb8cbe6672c4bd1fcd20ac8e5e4c614675b31921f3da9bc2a68f769fbd726ffc0c7125406387e01a9ebf49d0e56d49e1ce257e71d  musl-dev-1.2.4_git20230717-r5-armv7-edge.apk
+74e482403f77b9d302a4bb0ad6b86a18e81b5be0eb987296a4b0033c996e474b86eac079abc52bd8f02723aa242ea2a74e61bbd0eee036fbf79a21ae250a6e04  musl-1.2.5-r0-armv7-edge.apk
+02321d629aaa3712546b01645f1eb308f5e25e49bc3c2c42eff3a7cf84cd60327c6bc9818ebeb7d1d9556ddfaa2e132fdab0dc2142eec4df3a799e3402329c49  musl-dev-1.2.5-r0-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=5
+pkgver=1.2.5
+pkgrel=0
 arch="x86_64"
 subpackages="musl-dev-riscv64:package_dev"
 
@@ -57,6 +57,6 @@ package_dev() {
 }
 
 sha512sums="
-3f924270fb0ec0fa8fb5a23f0f9d6d9148affcac89cae413940dc04465d375415fcf0aff734754e2ac0b9ba2113c10f836b186908d75cdccec4d923eacafb961  musl-1.2.4_git20230717-r5-riscv64-edge.apk
-76ae321a9d3895f8367968226a6a492b268ae582a83e74d4152cf88dd48aaa79814532e8e1a057cba7c29b926f48d2309f2c12a16b991649cb8f713455aa5501  musl-dev-1.2.4_git20230717-r5-riscv64-edge.apk
+c11fb5eed8dab05504d88660a4750981a40020a1609b4ec4f9184cf7645283893e7cafc48da471012a4095699d371517cc9e09c0ec73fef4612280c95feebca2  musl-1.2.5-r0-riscv64-edge.apk
+77eba42ed78e680419f838f47a9a9f17d42288259540b70792af23b22f85ba1d2f87958e7db77b11b43629d8593fa58a02902453ecb0a46dd7c33cfca750b820  musl-dev-1.2.5-r0-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=5
+pkgver=1.2.5
+pkgrel=0
 arch="x86_64"
 subpackages="musl-dev-x86:package_dev"
 
@@ -57,6 +57,6 @@ package_dev() {
 }
 
 sha512sums="
-c93eec26b3bd7b2bc5c8859d71a9dfcfc3c0d346183d97b8600d57270585ce57ac9f84dd633b8d8ae4eae0324aa6f8e98c67a0bdd33e2e8994d721e208e07a3c  musl-1.2.4_git20230717-r5-x86-edge.apk
-77723100d0b2ae558816e4b9eb86c07d9ed64c69a84d6a07904d0806646e800a0f81b3a158948d5681394b9e3304a10bd0ca26445f5d4630f921bb87328d3afe  musl-dev-1.2.4_git20230717-r5-x86-edge.apk
+7403427bbe6683739ce00c0396dc4bfa8fce2f3e4957d12bc6c31bfb1a60bafca9e7ba266d1ba7ca469ab3738874965cf25e8f3bd838c002b4e5aad702a79e18  musl-1.2.5-r0-x86-edge.apk
+f5b0dfe7543bd7d1de3bfc8617c61fb7287227ea4dd9a722bfd4ec99e8a9405826973375a81a380b04bcba419c18e292cf60aaf1c9503eec3b420ed7adbacd68  musl-dev-1.2.5-r0-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=5
+pkgver=1.2.5
+pkgrel=0
 arch="aarch64"
 subpackages="musl-dev-x86_64:package_dev"
 
@@ -57,6 +57,6 @@ package_dev() {
 }
 
 sha512sums="
-4ea90456fcff08cb7c9065f4c790c5d0a3b2b17224f2490f6954c2de7ddb64559a6e1f0df1f13629da5d8f619fc1d9737a6982bb438120641bf1d717004e2688  musl-1.2.4_git20230717-r5-x86_64-edge.apk
-0ce4a260cb8c6fc9d412d5164d848ee6155d4ea4fca9dff89d5b08b8e2c0fcde5e635846ca762be54a6df139aa178902fc2594ffe76f94ae1e5414a67f0707a3  musl-dev-1.2.4_git20230717-r5-x86_64-edge.apk
+8bb997e077850195621916ee0722be7e054086fa5c2907c7d290ee8892910c073e3aece13a2839589966987711f4af6b2f4bffdc6c45d636a24655ef9cbec101  musl-1.2.5-r0-x86_64-edge.apk
+5d93191c3c9bf03b466dc169b57e519f0165c6551d117ae09538907c57a49f58afa3c9225aafc7a61625f224276eff4ee2dbe79d65cf684d03a46c24dd78aa4c  musl-dev-1.2.5-r0-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.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/.shared-patches/linux/linux3.7to4.5-ARM64-remove-Sun-Solaris-style-flag-on-section.patch

@@ -0,0 +1,12 @@
+diff --git a/arch/arm64/mm/proc.S b/arch/arm64/mm/proc.S
+index d2f2cedf..7e2cbc74 100644
+--- a/arch/arm64/mm/proc.S
++++ b/arch/arm64/mm/proc.S
+@@ -171,7 +171,6 @@ ENTRY(cpu_do_switch_mm)
+ 	ret
+ ENDPROC(cpu_do_switch_mm)
+ 
+-	.section ".text.init", #alloc, #execinstr
+ 
+ /*
+  *	__cpu_setup

device/community/alsa-ucm-conf-cros/APKBUILD

@@ -0,0 +1,20 @@
+# Maintainer: WeirdTreeThing <bradyn127@protonmail.com>
+pkgname=alsa-ucm-conf-cros
+pkgver=0.5
+pkgrel=0
+pkgdesc="ALSA UCM configuration for Chrome OS devices"
+url="https://github.com/WeirdTreeThing/alsa-ucm-conf-cros"
+arch="noarch"
+depends="alsa-ucm-conf"
+replaces="alsa-ucm-conf alsa-ucm-conf-google-kukui"
+license="BSD-3-Clause"
+options="!check"
+source="$pkgname-$pkgver.tar.gz::$url/archive/refs/tags/$pkgver.tar.gz"
+
+package() {
+	mkdir -p "$pkgdir"/usr/share/alsa/
+	cp -r ucm2 "$pkgdir"/usr/share/alsa
+}
+sha512sums="
+844f23b640bbdbcef83f9cc11444ee80bfc83095d7917f5c12c2e3b99f120fd014c74c91deae02ec0f2210115270e518977fdef77dca5a3ab5d8df53e5ec62b1  alsa-ucm-conf-cros-0.5.tar.gz
+"

device/community/alsa-ucm-conf-google-kukui/APKBUILD

@@ -1,40 +0,0 @@
-# Maintainer: Jenneron <jenneron@protonmail.com>
-pkgname=alsa-ucm-conf-google-kukui
-pkgver=1
-pkgrel=3
-pkgdesc="ALSA Use Case Manager configuration for Google Kukui Chromebooks"
-url="https://alsa-project.org"
-arch="aarch64"
-license="BSD-3-Clause"
-source="
-	mt8183_da7219_HiFi.conf
-	mt8183_da7219_rt1015p.conf
-	mt8183_mt6358_HiFi.conf
-	mt8183_mt6358_ts3a227_max98357.conf
-"
-options="!check" # no tests
-depends="alsa-ucm-conf"
-replaces="alsa-ucm-conf"
-
-package() {
-	install -Dm644 mt8183_da7219_HiFi.conf \
-		"$pkgdir"/usr/share/alsa/ucm2/conf.d/mt8183_da7219_r/HiFi.conf
-	install -Dm644 mt8183_da7219_rt1015p.conf \
-		"$pkgdir"/usr/share/alsa/ucm2/conf.d/mt8183_da7219_r/mt8183_da7219_rt1015p.conf
-	install -Dm644 mt8183_mt6358_HiFi.conf \
-		"$pkgdir"/usr/share/alsa/ucm2/conf.d/mt8183_mt6358_t/HiFi.conf
-	install -Dm644 mt8183_mt6358_ts3a227_max98357.conf \
-		"$pkgdir"/usr/share/alsa/ucm2/conf.d/mt8183_mt6358_t/mt8183_mt6358_ts3a227_max98357.conf
-
-	ln -s /usr/share/alsa/ucm2/conf.d/mt8183_da7219_r \
-		"$pkgdir"/usr/share/alsa/ucm2/mt8183_da7219_r
-	ln -s /usr/share/alsa/ucm2/conf.d/mt8183_mt6358_t \
-		"$pkgdir"/usr/share/alsa/ucm2/mt8183_mt6358_t
-}
-
-sha512sums="
-d998860ca82ec9277a7b660dbdc644fc8ec84d5f3703dc72eac44a6b70b61ea9f733eeae94d21d9d2cadf25f95e951ce3c804593b4f0a4c715770b4b422d4ca7  mt8183_da7219_HiFi.conf
-c8ce246275beaa3e89eb4e06bed825935122c9f6a9fff9f8e3188dec47f37db92d908148cd7551785de5282c13386134bd6daf8ed033de122218b698d67bab33  mt8183_da7219_rt1015p.conf
-749180019ca12ec342604fc6924aa60c5f4ff2892ce22d2199b78d707947a8b91e71fa7a71643f3475bf2dba6e94c36e4fc57cb98f7a96519c83106b08ebc5c3  mt8183_mt6358_HiFi.conf
-c8ce246275beaa3e89eb4e06bed825935122c9f6a9fff9f8e3188dec47f37db92d908148cd7551785de5282c13386134bd6daf8ed033de122218b698d67bab33  mt8183_mt6358_ts3a227_max98357.conf
-"

device/community/alsa-ucm-conf-google-kukui/mt8183_da7219_HiFi.conf

@@ -1,81 +0,0 @@
-SectionVerb {
-	EnableSequence [
-		cdev "hw:mt8183da7219rt1"
-		cset "name='Headphone Volume' 0"
-#		cset "name='UL3_CH1 ADDA_UL_CH1' 0"
-#		cset "name='UL3_CH2 ADDA_UL_CH2' 0"
-		cset "name='I2S3_CH1 DL1_CH1' 1"
-		cset "name='I2S3_CH2 DL1_CH2' 1"
-		cset "name='MTKAIF_DMIC' 1"
-		cset "name='Mt6358 Mic Type Mux' 2"
-		cset "name='UL3_CH1 ADDA_UL_CH1' 1"
-		cset "name='UL3_CH2 ADDA_UL_CH2' 1"
-	]
-	DisableSequence [
-	]
-}
-SectionDevice."Headphone" {
-	Value {
-		PlaybackPCM "hw:mt8183da7219rt1,0"
-		JackDev "mt8183_da7219_rt1015p Headset Jack"
-		JackSwitch "2"
-	}
-
-	ConflictingDevice [
-		"Speaker"
-	]
-
-	EnableSequence [
-		cdev "hw:mt8183da7219rt1"
-		cset "name='I2S3_CH1 DL1_CH1' 1"
-		cset "name='I2S3_CH2 DL1_CH2' 1"
-	]
-	DisableSequence [
-		cdev "hw:mt8183da7219rt1"
-		cset "name='I2S3_CH1 DL1_CH1' 0"
-		cset "name='I2S3_CH2 DL1_CH2' 0"
-	]
-}
-SectionDevice."Speaker" {
-	Value {
-		PlaybackPCM "hw:mt8183da7219rt1,0"
-		DspName "speaker_eq"
-	}
-
-	ConflictingDevice [
-		"Headphone"
-	]
-
-	EnableSequence [
-		cdev "hw:mt8183da7219rt1"
-		cset "name='I2S3_CH1 DL1_CH1' 1"
-		cset "name='I2S3_CH2 DL1_CH2' 1"
-	]
-	DisableSequence [
-		cdev "hw:mt8183da7219rt1"
-		cset "name='I2S3_CH1 DL1_CH1' 0"
-		cset "name='I2S3_CH2 DL1_CH2' 0"
-	]
-}
-
-SectionDevice."Internal Mic" {
-	Value {
-		CapturePCM "hw:mt8183da7219rt1,5"
-		CaptureChannelMap "0 1 -1 -1 -1 -1 -1 -1 -1 -1 -1"
-		IntrinsicSensitivity "-600"
-	}
-	EnableSequence [
-		cdev "hw:mt8183da7219rt1"
-		cset "name='MTKAIF_DMIC' 1"
-		cset "name='Mt6358 Mic Type Mux' 2"
-		cset "name='UL3_CH1 ADDA_UL_CH1' 1"
-		cset "name='UL3_CH2 ADDA_UL_CH2' 1"
-	]
-	DisableSequence [
-		cdev "hw:mt8183da7219rt1"
-		cset "name='MTKAIF_DMIC' 0"
-		cset "name='Mt6358 Mic Type Mux' 0"
-		cset "name='UL3_CH1 ADDA_UL_CH1' 0"
-		cset "name='UL3_CH2 ADDA_UL_CH2' 0"
-	]
-}

device/community/alsa-ucm-conf-google-kukui/mt8183_da7219_rt1015p.conf

@@ -1,8 +0,0 @@
-Syntax 2
-
-Comment "Kukui internal card"
-
-SectionUseCase."HiFi" {
-	File "HiFi.conf"
-	Comment "Default"
-}

device/community/alsa-ucm-conf-google-kukui/mt8183_mt6358_HiFi.conf

@@ -1,144 +0,0 @@
-SectionVerb {
-	EnableSequence [
-		cdev "hw:mt8183mt6358ts3"
-		cset "name='Headphone Volume' 0"
-		cset "name='ADDA_DL_CH1 DL1_CH1' 0"
-		cset "name='ADDA_DL_CH2 DL1_CH2' 0"
-		cset "name='HPL Mux' 0"
-		cset "name='HPR Mux' 0"
-		cset "name='I2S3_CH1 DL1_CH1' 1"
-		cset "name='I2S3_CH2 DL1_CH2' 1"
-		cset "name='MTKAIF_DMIC' 1"
-		cset "name='Mic Type Mux' 2"
-		cset "name='UL3_CH1 ADDA_UL_CH1' 1"
-		cset "name='UL3_CH2 ADDA_UL_CH2' 1"
-# from headset mic - does not work -see below
-#		cset "name='PGA L Mux' 0"
-#		cset "name='ADC L Mux' 0"
-#		cset "name='PGA Volume' 0"
-	]
-
-	DisableSequence [
-	]
-}
-
-SectionDevice."Headphones" {
-	Comment	"Headphones"
-
-	Value {
-		PlaybackPCM "hw:mt8183mt6358ts3,0"
-		JackControl "mt8183_mt6358_ts3a227_max98357 Headset Jack"
-	}
-
-	ConflictingDevice [
-		"Speaker"
-	]
-
-	EnableSequence [
-		cdev "hw:mt8183mt6358ts3"
-		cset "name='ADDA_DL_CH1 DL1_CH1' 1"
-		cset "name='ADDA_DL_CH2 DL1_CH2' 1"
-		cset "name='HPL Mux' 2"
-		cset "name='HPR Mux' 2"
-	]
-
-	DisableSequence [
-		cdev "hw:mt8183mt6358ts3"
-		cset "name='ADDA_DL_CH1 DL1_CH1' 0"
-		cset "name='ADDA_DL_CH2 DL1_CH2' 0"
-		cset "name='HPL Mux' 0"
-		cset "name='HPR Mux' 0"
-	]
-}
-
-SectionDevice."Speaker" {
-	Comment "Speaker"
-
-	Value {
-		PlaybackPCM "hw:mt8183mt6358ts3,0"
-		DspName "speaker_eq"
-	}
-
-	ConflictingDevice [
-		"Headphones"
-	]
-
-	EnableSequence [
-		cdev "hw:mt8183mt6358ts3"
-		cset "name='I2S3_CH1 DL1_CH1' 1"
-		cset "name='I2S3_CH2 DL1_CH2' 1"
-	]
-
-	DisableSequence [
-		cdev "hw:mt8183mt6358ts3"
-		cset "name='I2S3_CH1 DL1_CH1' 0"
-		cset "name='I2S3_CH2 DL1_CH2' 0"
-	]
-}
-
-# headset mic does not work for some reason - if enabled there is no signal
-# from it and after switching back to internal mic even that does not give
-# any signal anymore
-#SectionDevice."HeadsetMic" {
-#	Comment	"Headset Microphone"
-#
-#	Value {
-#		CapturePCM "hw:mt8183mt6358ts3,5"
-#		# i guess this one is chromeos specific and not used otherwise
-#		CaptureChannelMap "0 0 -1 -1 -1 -1 -1 -1 -1 -1 -1"
-#		JackControl "mt8183_mt6358_ts3a227_max98357 Headset Jack"
-#	}
-#
-#	ConflictingDevice [
-#		"InternalMic"
-#	]
-#
-#	EnableSequence [
-#		cdev "hw:mt8183mt6358ts3"
-#		cset "name='PGA L Mux' 2"
-#		cset "name='ADC L Mux' 2"
-#		cset "name='Mic Type Mux' 1"
-#		cset "name='PGA Volume' 4"
-#		cset "name='UL3_CH1 ADDA_UL_CH1' 1"
-#	]
-#
-#	DisableSequence [
-#		cdev "hw:mt8183mt6358ts3"
-#		cset "name='PGA L Mux' 0"
-#		cset "name='ADC L Mux' 0"
-#		cset "name='Mic Type Mux' 0"
-#		cset "name='PGA Volume' 0"
-#		cset "name='UL3_CH1 ADDA_UL_CH1' 0"
-#	]
-#}
-
-SectionDevice."InternalMic" {
-	Comment	"Intrernal Microphone"
-
-	Value {
-		CapturePCM "hw:mt8183mt6358ts3,5"
-		# i guess those two are chromeos specific and not used otherwise
-		CaptureChannelMap "0 1 -1 -1 -1 -1 -1 -1 -1 -1 -1"
-		IntrinsicSensitivity "-2600"
-	}
-
-# from headset mic - does not work -see above
-#	ConflictingDevice [
-#		"HeadsetMic"
-#	]
-
-	EnableSequence [
-		cdev "hw:mt8183mt6358ts3"
-		cset "name='MTKAIF_DMIC' 1"
-		cset "name='Mic Type Mux' 2"
-		cset "name='UL3_CH1 ADDA_UL_CH1' 1"
-		cset "name='UL3_CH2 ADDA_UL_CH2' 1"
-	]
-
-	DisableSequence [
-		cdev "hw:mt8183mt6358ts3"
-		cset "name='MTKAIF_DMIC' 0"
-		cset "name='UL3_CH1 ADDA_UL_CH1' 0"
-		cset "name='UL3_CH2 ADDA_UL_CH2' 0"
-	]
-}

device/community/device-arrow-db410c/APKBUILD

@@ -2,8 +2,8 @@
 # Maintainer: Minecrell <minecrell@minecrell.net>
 pkgname=device-arrow-db410c
 pkgdesc="Arrow DragonBoard 410c"
-pkgver=3
-pkgrel=3
+pkgver=4
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -32,6 +32,6 @@ nonfree_firmware() {
 }
 
 sha512sums="
-b8bb88f11bf7f5889a0159e63fac5e38e7ca68a11aa3b89294ee6bc4f6f56a02964d213ce418d7bd5231fb977e4d62a555d587807f5a3ad0d40fb1b5798a6f7d  deviceinfo
+9e4e3c89c6328c60a3e6a02bae30e79863a512760be04177c710827788970963be3679602e288ddee1a4a054e0e80d707ad53d15db6918998680119882e3eab8  deviceinfo
 ccd6758cb4954eb0a96c7fb15e732e8147414f8edc498d9faf7d04ddef85d817733669ec1a6003e623e8392f3f6bb85f71160efe4e82f27e300d58aa6f5c8549  modules-initfs
 "

device/community/device-arrow-db410c/deviceinfo

@@ -23,6 +23,7 @@ deviceinfo_getty="ttyMSM0;115200"
 deviceinfo_flash_method="fastboot"
 deviceinfo_kernel_cmdline="earlycon console=ttyMSM0,115200 PMOS_NO_OUTPUT_REDIRECT"
 deviceinfo_generate_bootimg="true"
+deviceinfo_generate_extlinux_config="true"
 deviceinfo_bootimg_dtb_second="true"
 deviceinfo_flash_offset_base="0x80000000"
 deviceinfo_flash_offset_kernel="0x00080000"
@@ -31,4 +32,4 @@ deviceinfo_flash_offset_second="0x00f00000"
 deviceinfo_flash_offset_tags="0x01e00000"
 deviceinfo_flash_pagesize="2048"
 deviceinfo_flash_sparse="true"
-deviceinfo_flash_fastboot_partition_system="rootfs"
+deviceinfo_flash_fastboot_partition_rootfs="rootfs"

device/community/device-asus-me176c/APKBUILD

@@ -3,7 +3,7 @@
 pkgname=device-asus-me176c
 pkgdesc="ASUS MeMO Pad 7 (ME176C(X))"
 pkgver=6
-pkgrel=3
+pkgrel=4
 _commit=3155254999ac36c3051a2118c415de25a072c0f6
 url="https://postmarketos.org"
 license="MIT"

device/community/device-bq-paella/APKBUILD

@@ -2,8 +2,8 @@
 # Maintainer: Minecrell <minecrell@minecrell.net>
 pkgname=device-bq-paella
 pkgdesc="BQ Aquaris X5"
-pkgver=7
-pkgrel=1
+pkgver=8
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -38,6 +38,6 @@ nonfree_firmware() {
 }
 
 sha512sums="
-b33c075d49febd0bcff4c696214e39f134f7e05dc4770f60bfff52fb7e7b432b53ef69803ac32957e921d45cb7a35cc205112f6691dbdfd1a5032c89d34789fa  deviceinfo
+ae1d413f189856d5f9ccc6a3a64e6cd719ad3cf7e4d1f5b358201037f7fcad2098a33eedfb83278ecf80073bdfbfd49cc796b43da4992f7b2bd3a6dbaa266c40  deviceinfo
 ebf6a40372329116a25df1407e671365bb2bf0613f61f0a572fc77890fb0a1760259ab35ed9f002ef2a5c6ee8836bc7bbeb50bf5ac3de14c11e6d96872ad3644  modules-initfs
 "

device/community/device-bq-paella/deviceinfo

@@ -23,6 +23,7 @@ deviceinfo_getty="ttyMSM0;115200"
 deviceinfo_flash_method="fastboot"
 deviceinfo_kernel_cmdline="earlycon console=ttyMSM0,115200 PMOS_NO_OUTPUT_REDIRECT"
 deviceinfo_generate_bootimg="true"
+deviceinfo_generate_extlinux_config="true"
 deviceinfo_flash_offset_base="0x80000000"
 deviceinfo_flash_offset_kernel="0x00080000"
 deviceinfo_flash_offset_ramdisk="0x02000000"

device/community/device-fairphone-fp4/APKBUILD

@@ -3,7 +3,7 @@
 pkgname=device-fairphone-fp4
 pkgdesc="Fairphone 4"
 pkgver=2
-pkgrel=0
+pkgrel=3
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -15,7 +15,6 @@ depends="
 	mesa-vulkan-freedreno
 	mkbootimg
 	postmarketos-base
-	postmarketos-update-kernel
 	qbootctl
 	qbootctl-openrc
 	swclock-offset
@@ -52,6 +51,7 @@ nonfree_firmware() {
 		firmware-fairphone-fp4-ipa
 		firmware-fairphone-fp4-modem
 		firmware-fairphone-fp4-wlan
+		firmware-qcom-adreno-a630
 		linux-firmware-ath10k
 		msm-modem
 		msm-modem-uim-selection

device/community/device-generic-x86_64/APKBUILD

@@ -1,8 +1,9 @@
 # Maintainer: Clayton Craft <clayton@craftyguy.net>
+# Co-Maintainer: Oliver Smith <ollieparanoid@postmarketos.org>
 pkgname=device-generic-x86_64
 pkgdesc="Generic x86_64 system, with EFI"
-pkgver=9
-pkgrel=0
+pkgver=13
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="x86_64"
@@ -21,11 +22,13 @@ install="$pkgname.post-install $pkgname.post-upgrade"
 subpackages="
 	$pkgname-kernel-edge:kernel_edge
 	$pkgname-kernel-lts:kernel_lts
-	$pkgname-mesa
 "
 _pmb_recommends="
-	oem-intel
+	firmware-ath6kl
+	firmware-b43xx
+	linux-firmware
 	oem-amd
+	oem-intel
 "
 provides="device-tablet-x64uefi=$pkgver-r$pkgrel device-tablet-x86uefi=$pkgver-r$pkgrel"
 replaces="device-tablet-x64uefi device-tablet-x86uefi"
@@ -38,14 +41,6 @@ package() {
 	devicepkg_package $startdir $pkgname
 }
 
-mesa() {
-	install_if="$pkgname=$pkgver-r$pkgrel mesa-gl"
-	provides="device-tablet-x64uefi-mesa=$pkgver-r$pkgrel device-tablet-x86uefi-mesa=$pkgver-r$pkgrel"
-	replaces="device-tablet-x64uefi-mesa device-tablet-x86uefi-mesa"
-	depends="mesa-dri-gallium"
-	mkdir "$subpkgdir"
-}
-
 kernel_edge() {
 	pkgdesc="Alpine Edge kernel"
 	provides="device-tablet-x64uefi-kernel-edge=$pkgver-r$pkgrel device-tablet-x86uefi-kernel-edge=$pkgver-r$pkgrel"
@@ -63,6 +58,6 @@ kernel_lts() {
 }
 
 sha512sums="
-33f0450413c7b364390fdc715578b41389bced5ff69f04a2128155f5ad828ed0e1cc17a20b610eccf4bd99560e21be91e362faaa72e9decad4623f8669e8ab7a  deviceinfo
-d65ca12564ef032507c19359643794a14579fd1d065777f9042d40d38aad4d40d99c10aae9a3acd7799f4ad95651b6ca9d83335501d08869dc391f3050df4d1f  modules-initfs
+e9dfcd70ccfb9a0fdaa0cdc52faf3be96d6de8af8c60a758bb703c515b0648cec4552e0eaf56e5168b0004cd3fc4b28118abb05dad2c581d3579a2e9134862cb  deviceinfo
+cf9ad3e80b43aa799a8123289e3ab77f6a1c37cee3d48db737688b93afd4f1094db76008ec0f28358c35dd1e115c4fabf9452f9abee76481a2630f02e3ae0953  modules-initfs
 "

device/community/device-generic-x86_64/deviceinfo

@@ -10,14 +10,15 @@ deviceinfo_year="1999"
 deviceinfo_arch="x86_64"
 
 # Device related
-deviceinfo_chassis="tablet"
-deviceinfo_keyboard="false"
+# 'desktop' type (which would include laptops) is probably the most common for
+# this generic device
+deviceinfo_chassis="desktop"
 deviceinfo_external_storage="true"
 deviceinfo_gpu_accelerated="true"
 
 # Bootloader related
 deviceinfo_flash_method="none"
-deviceinfo_kernel_cmdline="PMOS_FORCE_PARTITION_RESIZE"
+deviceinfo_kernel_cmdline="PMOS_FORCE_PARTITION_RESIZE quiet"
 deviceinfo_partition_type="gpt"
 deviceinfo_boot_filesystem="fat32"
 deviceinfo_generate_systemd_boot="true"

device/community/device-generic-x86_64/modules-initfs

@@ -2,14 +2,15 @@ ahci
 ehci_hcd
 ehci_pci
 hid-multitouch
+hid_generic
 i2c_hid_acpi
-i915
 jbd2
 libahci
 libata
 mbcache
 mmc_block
 mmc_core
+nvme
 scsi_mod
 sd
 sd_mod
@@ -18,5 +19,6 @@ sg
 uas
 usb
 usb_storage
+usbhid
 xhci_hcd
 xhci_pci

device/community/device-google-gru/APKBUILD

@@ -3,7 +3,7 @@
 pkgname=device-google-gru
 pkgdesc="Google Gru Chromebooks"
 pkgver=5
-pkgrel=5
+pkgrel=7
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -15,7 +15,6 @@ depends="
 	linux-postmarketos-rockchip
 	postmarketos-base
 	postmarketos-cros-common
-	postmarketos-update-depthcharge-kernel
 	soc-rockchip-rk3399
 "
 makedepends="devicepkg-dev"

device/community/device-google-kukui/APKBUILD

@@ -3,18 +3,17 @@
 pkgname=device-google-kukui
 pkgdesc="Google Kukui Chromebooks"
 pkgver=6
-pkgrel=3
+pkgrel=6
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
 options="!check !archcheck"
 depends="
-	alsa-ucm-conf-google-kukui
+	alsa-ucm-conf-cros
 	depthcharge-tools
 	linux-postmarketos-mediatek-mt8183>=6.1.28-r0
 	postmarketos-base
 	postmarketos-cros-common
-	postmarketos-update-depthcharge-kernel
 	soc-mediatek-mt8183
 "
 makedepends="devicepkg-dev"

device/community/device-google-oak/APKBUILD

@@ -1,9 +1,10 @@
 # Reference: <https://postmarketos.org/devicepkg>
-# Maintainer: Jenneron <jenneron@protonmail.com>
+# Maintainer: Adam Thiede <me@adamthiede.com>
+# Co-Maintainer: Jenneron <jenneron@protonmail.com>
 pkgname=device-google-oak
 pkgdesc="Google Oak Chromebooks"
 pkgver=4
-pkgrel=3
+pkgrel=6
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -14,7 +15,6 @@ depends="
 	linux-postmarketos-mediatek-mt8173
 	postmarketos-base
 	postmarketos-cros-common
-	postmarketos-update-depthcharge-kernel
 "
 makedepends="devicepkg-dev"
 source="deviceinfo modules-initfs"

device/community/device-google-peach-pit/APKBUILD

@@ -2,8 +2,8 @@
 # Maintainer: Jenneron <jenneron@protonmail.com>
 pkgname=device-google-peach-pit
 pkgdesc="Samsung Chromebook 2 (11.6 inch)"
-pkgver=5
-pkgrel=0
+pkgver=6
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
@@ -14,7 +14,6 @@ depends="
 	linux-postmarketos-exynos5
 	postmarketos-base
 	postmarketos-cros-common
-	postmarketos-update-depthcharge-kernel
 "
 makedepends="devicepkg-dev"
 source="
@@ -59,7 +58,7 @@ nonfree_firmware() {
 
 sha512sums="
 cbeb0f1fdf4357763eae7ede0b28923ae39c18aa187894baa778bdb20afa728aa97cad63b957d799ffcd1130ae40c3b796e293a2a1c97d9a68bf132ec6ce6d13  deviceinfo
-a1fd6b4964b0bd4c66983430528f5906eea5cc9ddbe8485ba17e97496652240d0a93dbd3af34ecd3c273b7172202b8dcb24e0b5fa372512d01affec3914a023d  modules-initfs
+e12a68f919182cb4e6812a5dd13fce8dc15266d2ac16aa5f0a31034f111cb403c020ebaaa4d94309f4baf2f71379327c57c08029e27c506d152695e9a2b04b2b  modules-initfs
 e53ca475830930ecfc1fd537702e850e2abcb66fbed521cb6c3a2918d762649254bd0244ec93a47b20dfc593ec3afc9bdebdec1759a7bc96dcbe4800f40893da  90-tap-to-click.conf
 6fe67c8f2e09e3e37297eebaf2a86a32671923a5fd4d18e5aeb10e580fb998e4ddb4a691531a0c8f4b4e70c6f0f7e91008dd836ffca8026d59862c6e829fd996  Peach-Pit-I2S-MAX98090.conf
 194b6169168b40592cf1e6b5f3b21aaa24a602869d7aec358cd5e1f06de34e9b0fe3da094e438ef2d3ab5be80275e6c0b6afe7ce92e2365a70e8b5a21a873234  HiFi.conf

device/community/device-google-peach-pit/modules-initfs

@@ -4,3 +4,5 @@ drm-kms-helper
 cros-ec-keyb
 sbs-battery
 tps65090-charger
+uas
+sd-mod

device/community/device-google-snow/APKBUILD

@@ -2,8 +2,8 @@
 # Maintainer: Jenneron <jenneron@protonmail.com>
 pkgname=device-google-snow
 pkgdesc="Samsung Chromebook"
-pkgver=4
-pkgrel=3
+pkgver=6
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
@@ -14,25 +14,16 @@ depends="
 	linux-postmarketos-exynos5
 	postmarketos-base
 	postmarketos-cros-common
-	postmarketos-update-depthcharge-kernel
 "
 makedepends="devicepkg-dev"
 source="
 	deviceinfo
 	modules-initfs
-	i3wm/xorg.conf.d/90-tap-to-click.conf
-	modprobe.d/mali.conf
 	ucm/HiFi.conf
 	ucm/Snow-I2S-MAX98090.conf
-	mpv/mpv.conf.wayland
-	mpv/mpv.conf.xorg
 	sway/foot/foot.ini
-	sway/tinydm/10-no-hardware-cursor.sh
 "
 subpackages="
-	$pkgname-i3wm
-	$pkgname-mpv-wayland:mpv_wayland
-	$pkgname-mpv-xorg:mpv_xorg
 	$pkgname-nonfree-firmware:nonfree_firmware
 	$pkgname-sway
 "
@@ -44,10 +35,6 @@ build() {
 package() {
 	devicepkg_package $startdir $pkgname
 
-	# Block panfrost probe as it causes segfault in X11
-	install -Dm644 "$srcdir"/mali.conf \
-		"$pkgdir"/etc/modprobe.d/mali.conf
-
 	# Alsa UCM configs
 	install -Dm644 "$srcdir"/Snow-I2S-MAX98090.conf \
 		"$pkgdir"/usr/share/alsa/ucm2/conf.d/Snow-I2S-MAX980/Snow-I2S-MAX98090.conf
@@ -55,25 +42,6 @@ package() {
 		"$pkgdir"/usr/share/alsa/ucm2/conf.d/Snow-I2S-MAX980/HiFi.conf
 }
 
-i3wm() {
-	install_if="$pkgname=$pkgver-r$pkgrel postmarketos-ui-i3wm"
-	install -D -m644 "$srcdir"/90-tap-to-click.conf \
-		"$subpkgdir"/etc/X11/xorg.conf.d/90-tap-to-click.conf
-}
-
-mpv_wayland() {
-	# Looks like wayland libs are installed with some x11 UIs too, so match wlroots here
-	install_if="$pkgname=$pkgver-r$pkgrel mpv wlroots"
-	install -Dm644 "$srcdir"/mpv.conf.wayland \
-		"$subpkgdir"/etc/mpv/mpv.conf
-}
-
-mpv_xorg() {
-	install_if="$pkgname=$pkgver-r$pkgrel mpv xorg-server"
-	install -Dm644 "$srcdir"/mpv.conf.xorg \
-		"$subpkgdir"/etc/mpv/mpv.conf
-}
-
 nonfree_firmware() {
 	pkgdesc="WiFi/BT and MFC firmware"
 	depends="linux-firmware-mrvl linux-firmware-s5p-mfc"
@@ -84,19 +52,12 @@ sway() {
 	install_if="$pkgname=$pkgver-r$pkgrel postmarketos-ui-sway"
 	install -Dm644 "$srcdir"/foot.ini \
 		"$subpkgdir"/etc/skel/.config/foot/foot.ini
-	install -Dm755 "$srcdir"/10-no-hardware-cursor.sh \
-		"$subpkgdir"/etc/tinydm.d/env-wayland.d/10-no-hardware-cursor.sh
 }
 
 sha512sums="
-4be0a2e0ff5d5189b9adbea995b111724cf686eda3c191fac405757facee4621297314bb4d2015e8dc72b29f30d47d2e00253d70d64c51a02a5177cb4d4959cd  deviceinfo
-a1fd6b4964b0bd4c66983430528f5906eea5cc9ddbe8485ba17e97496652240d0a93dbd3af34ecd3c273b7172202b8dcb24e0b5fa372512d01affec3914a023d  modules-initfs
-e53ca475830930ecfc1fd537702e850e2abcb66fbed521cb6c3a2918d762649254bd0244ec93a47b20dfc593ec3afc9bdebdec1759a7bc96dcbe4800f40893da  90-tap-to-click.conf
-c5fdd5a39a41044343d937a1ad31cc6bb893f19a329beb4ce09249064cac066d643c84ffcbfcd794113c228c5a56e28c82812092751546b49ab31142dc8245b1  mali.conf
+8f12e32794f68ecc312ef9edde380bffc73f931cf210c8e0a5552f47b325f0f6648a95986ae17ad0a32245308dfd3c1e381377b67e6b96eeae18f97b83621f92  deviceinfo
+e12a68f919182cb4e6812a5dd13fce8dc15266d2ac16aa5f0a31034f111cb403c020ebaaa4d94309f4baf2f71379327c57c08029e27c506d152695e9a2b04b2b  modules-initfs
 8a8f593694528a9323ef4a0aff7e9c6ad45608957eb042d425663f682885c2f95eb01db4fe87b7c43a90de48f3e5f8b10cab4b13c547b5b0d31b924fcb083cad  HiFi.conf
 b163535da7626e3866faa45768c3888f69f90c98d694650e16a7594a03eb91391e166931eb487901217d983bb2dc4e49b99a2a5531740a7d87f8f4f5c3d0cf59  Snow-I2S-MAX98090.conf
-8f9dc3c7caeab6c5321dc2bf498f1a03a793f23cb776763316bc356b9d433d7a3337e61154069464dcda200bf390b99f3be8f657a40c6d2f6be3cbc6fb751080  mpv.conf.wayland
-d6bc39df48ba0e985a796426039205335adf1c91b9c150b05a4239339fc78b1748b3a83c699de69e9a5829f29573a323f40788da58ed15b1951de1eab7e31c3d  mpv.conf.xorg
 61c56cf84cf88371a2238845db1f8283c7eb7b417dec8c51d71e51fb96899bb026c0ee22dc94a43537a56477fb0db59de960949add4b0ce90552a1286e6afe69  foot.ini
-8ddd237b14e8eea34b8716d155cdf199cf681b1287b482c8e184656d6d0440f018a2d46478c8b45eb790a1e71cfcfefd0f66798cd0b226647f11088549cfae64  10-no-hardware-cursor.sh
 "

device/community/device-google-snow/deviceinfo

@@ -16,8 +16,6 @@ deviceinfo_keyboard="true"
 deviceinfo_external_storage="true"
 deviceinfo_screen_width="1366"
 deviceinfo_screen_height="768"
-
-# DRM is available, so all UIs can work with software rendering
 deviceinfo_gpu_accelerated="true"
 
 # Bootloader related

device/community/device-google-snow/i3wm/xorg.conf.d/90-tap-to-click.conf

@@ -1,6 +0,0 @@
-Section "InputClass"
-        Identifier "touchpad"
-        MatchIsTouchpad "on"
-        Driver "libinput"
-        Option "Tapping" "on"
-EndSection

device/community/device-google-snow/modprobe.d/mali.conf

@@ -1 +0,0 @@
-blacklist panfrost

device/community/device-google-snow/modules-initfs

@@ -4,3 +4,5 @@ drm-kms-helper
 cros-ec-keyb
 sbs-battery
 tps65090-charger
+uas
+sd-mod

device/community/device-google-snow/mpv/mpv.conf.wayland

@@ -1,3 +0,0 @@
-vo=wlshm
-profile=sw-fast
-ytdl-format="bestvideo[height<=?720]+bestaudio/best"

device/community/device-google-snow/mpv/mpv.conf.xorg

@@ -1,3 +0,0 @@
-vo=x11
-profile=sw-fast
-ytdl-format="bestvideo[height<=?720]+bestaudio/best"

device/community/device-google-snow/sway/tinydm/10-no-hardware-cursor.sh

@@ -1,5 +0,0 @@
-#!/bin/sh
-
-# A workaround for missing cursor issue
-
-export WLR_NO_HARDWARE_CURSORS=1

device/community/device-google-trogdor/APKBUILD

@@ -3,7 +3,7 @@
 pkgname=device-google-trogdor
 pkgdesc="Google Trogdor Chromebooks"
 pkgver=1
-pkgrel=3
+pkgrel=5
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -15,7 +15,6 @@ depends="
 	linux-postmarketos-qcom-sc7180
 	postmarketos-base
 	postmarketos-cros-common
-	postmarketos-update-depthcharge-kernel
 	soc-qcom-sc7180
 "
 makedepends="devicepkg-dev"

device/community/device-google-veyron/APKBUILD

@@ -3,7 +3,7 @@
 pkgname=device-google-veyron
 pkgdesc="Google Veyron Chromebooks"
 pkgver=5
-pkgrel=4
+pkgrel=6
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
@@ -14,7 +14,6 @@ depends="
 	linux-google-veyron
 	postmarketos-base
 	postmarketos-cros-common
-	postmarketos-update-depthcharge-kernel
 "
 subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
 makedepends="devicepkg-dev"

device/community/device-google-x64cros/APKBUILD

@@ -1,31 +1,34 @@
 # Reference: <https://postmarketos.org/devicepkg>
 # Maintainer: JustSoup321 <brandonboese@protonmail.com>
 # Co-Maintainer: Alper Nebi Yasak <alpernebiyasak@gmail.com>
+# Co-Maintainer: Jenneron <jenneron@protonmail.com>
 pkgname=device-google-x64cros
 pkgdesc="Google Chromebooks with x64 CPU"
-pkgver=3
-pkgrel=1
+pkgver=7
+pkgrel=3
 url="https://postmarketos.org"
 license="MIT"
 arch="x86_64"
 options="!check !archcheck"
 depends="
-	alsa-ucm-conf
+	alsa-ucm-conf-cros
 	depthcharge-tools
 	postmarketos-base
 	postmarketos-cros-common
-	postmarketos-update-depthcharge-kernel
-	sof-bin
 	systemd-boot
 	"
 makedepends="devicepkg-dev"
+install="$pkgname.post-install $pkgname.post-upgrade"
 subpackages="
-	$pkgname-libva
 	$pkgname-kernel-lts:kernel_lts
 	$pkgname-kernel-edge:kernel_edge
-	$pkgname-vulkan
 	"
 source="deviceinfo modules-initfs"
+_pmb_recommends="
+	linux-firmware-rtw88
+	oem-intel
+	oem-amd
+"
 
 build() {
 	devicepkg_build $startdir $pkgname
@@ -35,12 +38,6 @@ package() {
 	devicepkg_package $startdir $pkgname
 }
 
-libva() {
-	install_if="$pkgname=$pkgver-r$pkgrel libva"
-	depends="intel-media-driver libva-intel-driver"
-	mkdir "$subpkgdir"
-}
-
 kernel_edge() {
 	pkgdesc="Alpine Edge kernel"
 	depends="linux-edge"
@@ -53,13 +50,7 @@ kernel_lts() {
 	devicepkg_subpackage_kernel $startdir $pkgname $subpkgname
 }
 
-vulkan() {
-	install_if="$pkgname=$pkgver-r$pkgrel vulkan-loader"
-	depends="mesa-vulkan-intel"
-	mkdir "$subpkgdir"
-}
-
 sha512sums="
 9260fe8df64e284f137f77844562d2f08e28d72d36a50772b0216cd7d68eeb41d0cdb650d0f0d1ad04c3906991aba0561c36813a2beb62cedf16f616c9ccedb9  deviceinfo
-9606a2f61bfd9e0a2ea04fbe45e25093b702fd5b5cccf9f4f50768ee3b501251d8d3e1605485e5ec8f485b4bff7e44fe20d488f80736837654a9951391a97789  modules-initfs
+1b3bbfcdc6642488304653aef996dddf7a354e7279f2c735ac7aec404e598948423630fcaa2cac87e2c0aef033ecfc57a7a91154f9dac9a85411db7bad62e677  modules-initfs
 "

device/community/device-google-x64cros/device-google-x64cros.post-install

@@ -0,0 +1,9 @@
+#!/bin/sh
+
+# Only display this message if none of the `oem-*` packages are installed
+if ! grep -Ex "oem-\b(\?|amd|intel)" /etc/apk/world 2>/dev/null; then
+	echo "* NOTE: This package no longer automatically installs OEM-specific drivers and firmware."
+	echo "* You will likely need to install one or both of these manually, depending on your hardware."
+	echo "* For AMD: apk add oem-amd"
+	echo "* For Intel: apk add oem-intel"
+fi

device/community/device-google-x64cros/device-google-x64cros.post-upgrade

@@ -0,0 +1 @@
+device-google-x64cros.post-install

device/community/device-google-x64cros/modules-initfs

@@ -14,3 +14,5 @@ ehci_hcd
 uas
 xhci_pci
 ehci_pci
+sdhci_pci
+mmc_block

device/community/device-lenovo-a6000/APKBUILD

@@ -3,8 +3,8 @@
 # Co-Maintainer: Minecrell <minecrell@minecrell.net>
 pkgname=device-lenovo-a6000
 pkgdesc="Lenovo A6000"
-pkgver=7
-pkgrel=2
+pkgver=8
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -46,7 +46,7 @@ phosh() {
 }
 
 sha512sums="
-9e9c07835778b92178b8057df5530915a58f8aeb729274e24025a0ba8ee563269836f7790ad40f055fd85564dfa14a812306a6e7caf35369f5ffb522d2004611  deviceinfo
+09836576cf3dc54afa8f7d8f3d5117ba08fa2dbc58b792062a3a55bae73041c8adbc934682e96d1dc98dd2e1d14fa1fe175801f0e387ea747b1d3df076cc0bc8  deviceinfo
 d433b8376b6e89daf4eac2073cb33627bdcacdcd48b6d4990cc698627dcf3c951bb1874951bc4631ea6b89d22c6002b9d02b77ff24992106061fcecc22fa5f25  modules-initfs
 10d4ee62e5f7a9e4c368c460dd4c3ef282476e47d8cc40e4e3b83e971d04c493b801e5628ebdfe721f869e2fd68c521cf192cba1a973c8e03a61445534a28811  phoc.ini
 "

device/community/device-lenovo-a6000/deviceinfo

@@ -23,6 +23,7 @@ deviceinfo_getty="ttyMSM0;115200"
 deviceinfo_flash_method="fastboot"
 deviceinfo_kernel_cmdline="earlycon console=ttyMSM0,115200 PMOS_NO_OUTPUT_REDIRECT"
 deviceinfo_generate_bootimg="true"
+deviceinfo_generate_extlinux_config="true"
 deviceinfo_flash_offset_base="0x80000000"
 deviceinfo_flash_offset_kernel="0x00080000"
 deviceinfo_flash_offset_ramdisk="0x02000000"

device/community/device-lenovo-a6010/APKBUILD

@@ -3,8 +3,8 @@
 # Co-Maintainer: Minecrell <minecrell@minecrell.net>
 pkgname=device-lenovo-a6010
 pkgdesc="Lenovo A6010"
-pkgver=7
-pkgrel=2
+pkgver=8
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -46,7 +46,7 @@ phosh() {
 }
 
 sha512sums="
-94429cc24e90642b0110c10098eccff67ac585caf34471d1664a05a1bb55a9428cde35f776ffad64ebe02fce761c74c89d749e4be9ecd127db1e4ee8a2ff2435  deviceinfo
+49d72c36be47a98ae4474e5f21f3eb96a069d085639d3fbcaa738ee05ac85ab47b7f9d229185a1dbe338489d5d091164f5c904065bdfdb2703aa817b19ecf5ab  deviceinfo
 258464e46872cf221f7ac367766f9b8ead5d5dccbd71f3df5a5555127a42448906247ff2519d1750eec53b3ed37ae96c2409369d7cb8e2fffeb202a8f69bba53  modules-initfs
 10d4ee62e5f7a9e4c368c460dd4c3ef282476e47d8cc40e4e3b83e971d04c493b801e5628ebdfe721f869e2fd68c521cf192cba1a973c8e03a61445534a28811  phoc.ini
 "

device/community/device-lenovo-a6010/deviceinfo

@@ -23,6 +23,7 @@ deviceinfo_getty="ttyMSM0;115200"
 deviceinfo_flash_method="fastboot"
 deviceinfo_kernel_cmdline="earlycon console=ttyMSM0,115200 PMOS_NO_OUTPUT_REDIRECT"
 deviceinfo_generate_bootimg="true"
+deviceinfo_generate_extlinux_config="true"
 deviceinfo_flash_offset_base="0x80000000"
 deviceinfo_flash_offset_kernel="0x00080000"
 deviceinfo_flash_offset_ramdisk="0x02000000"

device/community/device-microsoft-surface-rt/APKBUILD

@@ -1,32 +1,26 @@
 # Reference: <https://postmarketos.org/devicepkg>
 # Maintainer: Jenneron <jenneron@protonmail.com>
+# Co-Maintainer: Jethrob <jeybee@hotmail.com>
 pkgname=device-microsoft-surface-rt
 pkgdesc="Microsoft Surface RT"
-pkgver=6
-pkgrel=7
+pkgver=7
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
 # pmb:strict: avoid grub-related install error during build with pmbootstrap
 options="!check !archcheck pmb:strict"
-depends="postmarketos-base
-	linux-postmarketos-grate
+depends="
 	alsa-ucm-conf
+	linux-postmarketos-grate
+	postmarketos-base
 "
 makedepends="devicepkg-dev grub grub-efi"
 subpackages="
 	$pkgname-nonfree-firmware:nonfree_firmware
 	$pkgname-x11
-	$pkgname-phosh
-"
-source="
-	deviceinfo
-	modules-initfs
-	grub.cfg
-	initfs-hook.sh
-	pointercal
-	phoc.ini
 "
+source="deviceinfo modules-initfs"
 
 build() {
 	devicepkg_build $startdir $pkgname
@@ -50,11 +44,6 @@ build() {
 package() {
 	devicepkg_package $startdir $pkgname
 
-	install -Dm644 "$srcdir"/pointercal \
-		"$pkgdir"/etc/pointercal
-
-	install -D "$srcdir"/grub.cfg \
-		"$pkgdir"/boot/grub/grub.cfg
 	install -D "$srcdir"/bootarm.efi \
 		"$pkgdir"/boot/EFI/Boot/bootarm.efi
 }
@@ -71,17 +60,7 @@ x11() {
 	mkdir "$subpkgdir"
 }
 
-phosh() {
-	install_if="$pkgname postmarketos-ui-phosh"
-	install -Dm644 "$srcdir"/phoc.ini \
-		"$subpkgdir"/etc/phosh/phoc.ini
-}
-
 sha512sums="
-8ab7c1720255720fc81a7895ba4e5f5a03789132323e82047229e6f133f0270a29e766c0496ab620d41e3090e1ef6e77c346bd5a111ade3d59c3a630380409e6  deviceinfo
+4585b96c10b86012d2ce33c623adf4f64a77219372a17e79ff3617bed1b18617f0965a4d9ea859dc7ecc6892970cbc9327936ce9413787e991d77ad57ec94ba6  deviceinfo
 67ff4306270b7e6e292ddb48ac5fcb1472840d8eaa412f9cd989442fb20139ee3c844fd1ca5c5b923c7980403d945999a77fc6617127059e56e22bdc8dca2bf8  modules-initfs
-40b507176edce2d141ff707aecad6f8d9636b828084e84d0015886d5e371127285bc80398fc13c1b88a7740c5b4694d2011286138249c95d27db0d9df3ca102f  grub.cfg
-0c7640df35d29a5c2e168d1e54b73a90d903e51b16d67ad08c3ccb41972209086844357f82cf6a2b6de977ebfb7e1099da01db71dc0733e90662ba315f0cd1d0  initfs-hook.sh
-34f6eb789d4688985a262c519017e0712a90ca5acf89e6b3f39e33792a7982155261c6b4f0dbf41595b512da9dc7c9002adb69a550e80be349a374d086799916  pointercal
-064129c96a617d3e7bfc56f399b9b46ca3d56325c3777ab28b1f7de242e8199cf33c03a9a071c83a833180a12d9d2abb5d32174f0d8d792a370e6320ec4d7808  phoc.ini
 "

device/community/device-microsoft-surface-rt/deviceinfo

@@ -7,19 +7,17 @@ deviceinfo_name="Microsoft Surface RT"
 deviceinfo_manufacturer="Microsoft"
 deviceinfo_codename="microsoft-surface-rt"
 deviceinfo_year="2012"
-deviceinfo_dtb="tegra30-microsoft-surface-rt-efi"
 deviceinfo_arch="armv7"
 
 # Device related
 deviceinfo_chassis="tablet"
 deviceinfo_keyboard="true"
 deviceinfo_external_storage="true"
-deviceinfo_screen_width="1366"
-deviceinfo_screen_height="768"
-deviceinfo_dev_internal_storage="/dev/mmcblk0"
-deviceinfo_dev_internal_storage_repartition="true"
 
 # Bootloader related
 deviceinfo_flash_method="none"
+deviceinfo_dtb="tegra30-microsoft-surface-rt-efi"
+deviceinfo_kernel_cmdline="cpuidle.off=1 console=ttyS0,115200 PMOS_NO_OUTPUT_REDIRECT PMOS_FORCE_PARTITION_RESIZE"
+deviceinfo_generate_grub_config="true"
 deviceinfo_generate_bootimg="false"
 deviceinfo_boot_filesystem="fat32"

device/community/device-motorola-harpia/APKBUILD

@@ -2,8 +2,8 @@
 # Maintainer: Minecrell <minecrell@minecrell.net>
 pkgname=device-motorola-harpia
 pkgdesc="Motorola Moto G4 Play"
-pkgver=8
-pkgrel=2
+pkgver=9
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -41,6 +41,6 @@ nonfree_firmware() {
 }
 
 sha512sums="
-53b3a15b67cb81b50afb095172748e6c562a78854b83b59f519bb3915ffdcbc833b494336222f3005f5ac9c8d39afec03097a1ae9003d2f4478f3d0dfdf8d924  deviceinfo
+aebe4b604357b068fb8fd2c67ba68db12f0d81a807afddb58fbd92706c29100753656f8a1f7f33bea19540e24fe2a6e0bf47d3e608a6c817d41647c62a8fcca9  deviceinfo
 525a3e20672a7dff26b885b99ee157e0ece33efa10db34c90aed45dc47d7f1c2e90d7082dc84f2724892f199b5adaca04d5864f0aa1d1e4b8ea695f840346d60  modules-initfs
 "

device/community/device-motorola-harpia/deviceinfo

@@ -23,6 +23,7 @@ deviceinfo_getty="ttyMSM0;115200"
 deviceinfo_flash_method="fastboot"
 deviceinfo_kernel_cmdline="earlycon console=ttyMSM0,115200 PMOS_NO_OUTPUT_REDIRECT"
 deviceinfo_generate_bootimg="true"
+deviceinfo_generate_extlinux_config="true"
 deviceinfo_flash_offset_base="0x80000000"
 deviceinfo_flash_offset_kernel="0x00080000"
 deviceinfo_flash_offset_ramdisk="0x02000000"

device/community/device-nokia-n900/APKBUILD

@@ -2,20 +2,20 @@
 # Maintainer: Sicelo <absicsz@gmail.com>
 # Co-Maintainer: Danct12 <danct12@disroot.org>
 pkgname=device-nokia-n900
-pkgver=10
+pkgver=24
 pkgrel=0
 pkgdesc="Nokia N900"
 url="https://postmarketos.org"
 arch="armv7"
 license="MIT"
-depends="postmarketos-base linux-postmarketos-omap u-boot-tools kbd kbd-bkeymaps ofono alsa-utils"
+depends="postmarketos-base linux-postmarketos-omap u-boot-tools kbd kbd-bkeymaps
+	ofono alsa-utils linux-firmware-ti-connectivity wl1251-cal wl1251-cal-openrc"
 makedepends="devicepkg-dev u-boot-tools kbd kbd-bkeymaps"
 install="$pkgname.pre-upgrade $pkgname.post-install"
 subpackages="
 	$pkgname-x11
 	$pkgname-xkeyboard-config:xkeyboard_config
 	$pkgname-i3wm
-	$pkgname-nonfree-firmware:nonfree_firmware
 "
 source="
 	10-initfs-keymap.files
@@ -45,10 +45,11 @@ source="
 	modem-load.conf
 	modem-opts.conf
 	modules.blocklist
-	n900-wlan-data.initd
 	pointercal
+	proxishot.sh
 	uboot-script.cmd
 	udev/10-nokia-modem.rules
+	udev/80-feedbackd-twl4030.rules
 	udev/90-touchscreen-dev.rules
 	upower.conf
 	x11-keymap
@@ -93,13 +94,8 @@ package() {
 		"$pkgdir"/etc/udev/rules.d/90-touchscreen-dev.rules
 	install -D -m644 "$srcdir"/10-nokia-modem.rules \
 		"$pkgdir"/etc/udev/rules.d/10-nokia-modem.rules
-
-	# ACPI
-	mkdir "$pkgdir"/etc/acpi
-	install -D -m755 "$srcdir"/acpi_handler.sh \
-		"$pkgdir"/etc/acpi/handler.sh
-	install -D -m644 "$srcdir"/acpi.map \
-		"$pkgdir"/etc/acpi.map
+	install -Dm644 "$srcdir"/80-feedbackd-twl4030.rules \
+		"$pkgdir"/usr/lib/udev/rules.d/80-feedbackd-twl4030.rules
 
 	# Keymap
 	install -D -m644 "$srcdir"/keymaps/rx51_us.bmap.gz \
@@ -130,13 +126,20 @@ package() {
 
 x11() {
 	install_if="$pkgname=$pkgver-r$pkgrel xorg-server"
-	depends="xset xinput"
+	depends="xset xinput scrot"
+	mkdir "$pkgdir"/etc/acpi
+	install -D -m755 "$srcdir"/acpi_handler.sh \
+		"$pkgdir"/etc/acpi/handler.sh
+	install -D -m644 "$srcdir"/acpi.map \
+		"$pkgdir"/etc/acpi.map
 	install -D -m644 "$srcdir"/40-xkb.conf \
 		"$subpkgdir"/etc/X11/xorg.conf.d/40-xkb.conf
 	install -D -m644 "$srcdir"/xorg.conf \
 		"$subpkgdir"/etc/X11/xorg.conf.d/11-n900.conf
 	install -Dm755 "$srcdir"/lock.sh \
 		"$pkgdir"/usr/bin/lock.sh
+	install -Dm755 "$srcdir"/proxishot.sh \
+		"$pkgdir"/usr/bin/proxishot.sh
 }
 
 xkeyboard_config() {
@@ -148,7 +151,7 @@ xkeyboard_config() {
 
 i3wm() {
 	install_if="$pkgname=$pkgver-r$pkgrel postmarketos-ui-i3wm"
-	depends="unclutter-xfixes feh i3blocks rxvt-unicode upower"
+	depends="unclutter-xfixes i3blocks rxvt-unicode upower brightnessctl"
 	install -D -m644 "$srcdir"/i3wm.conf \
 		"$subpkgdir"/etc/skel/.config/i3/config
 	install -D -m644 "$srcdir"/i3blocks.conf \
@@ -174,20 +177,11 @@ upower() {
 		"$subpkgdir"/etc/UPower/UPower.conf
 }
 
-nonfree_firmware() {
-	pkgdesc="Wifi firmware"
-	depends="linux-firmware-ti-connectivity wl1251-cal"
-	install="$subpkgname.post-install"
-	triggers="$subpkgname.trigger=/lib/firmware/ti-connectivity"
-
-	install -Dm755 "$srcdir/n900-wlan-data.initd" "$subpkgdir/etc/init.d/n900-wlan-data"
-}
-
 sha512sums="
 6b475c12eca8563be48c562a1cb4ad8ca6a05d70fc54b21288b2dd7435a80a6f53351aa870db96d5bbecf1b1c5cb00dfe35f5066e6d3fd0ad0369e66aeef5a21  10-initfs-keymap.files
 4656d3b3ced0a86e2d6315c89322899f646a689e9cb64609aa8ad5a676b23d93706d8a37f3be6f6b12c6b1e8501b7d26ecafecf27322333850513a6805c61910  10-initfs-keymap.sh
-b3612348af1465c6dc21ce30153fc7e2cce3ae7f9bf9ff34d5a560e173e174275c1701dd7c45337fa56caaadb252b9494bddf997a698d665d3a8c01cde6955c7  acpi.map
-ac2f8a50280f7d5f8c5ce3ab50d00f1a4c8c1415890347542c684b6e24874a23d57a8f48c62451c46466996decc58276d737bdb892f8b284881d3760948b09bb  acpi_handler.sh
+2e6c324c2a0627fb37ee2feff249d6c828116a9c1a32d572481dddc12648c98b726eb3a475838398742f76a60e3f2249d7707502360473b8bf2e794bf22f57ce  acpi.map
+ff51909873160c2d4c6f0c0119b6d4a02751df29f571b8596b4bc8b04ce2541913c11a583b0e5dabd43f240752a8131da45db0ddff194860f4c11198599686a1  acpi_handler.sh
 5b87071834313a389f83d29f86f6e3ea108d0921f17dc918be7a46de7e74c73a4418044ef600a0fbf72c8fad22b7730dcd5bfe3d6d01d76bf01556f8540f0b32  asound.state.headset
 67acc17a33bc75113300393b4a5bba15319014032407e774d079abf310368e75f4f697dbb4856ba2d2d8ea184b056bb33561f42918de3ee91ab6a77df89a133c  asound.state.speakers
 3d55e34b95791636e44a5f41754f3d0de039dbba41f7a556d43a95c9e64afcfa930046b4b96b40020b6f196096ffba93514682927e32fa4488686fdd19c6da5a  backlight-enable.sh
@@ -195,7 +189,7 @@ e6bbac8de1a198ba716f44ade76606e1e0adcc574156b855ac41be5eb5308389d3277fd89cc34b11
 2463008d270ed09342f15b51f24ea455bd884021f95397991b85616b6840a6608d91cd1fc43186094f5c3d1bd25e88c16aa9ead07b018aea3d93cd2359bba0b1  deviceinfo
 f48b8dd7297d03008f73e1ecd55b77ace535ecb03f9bdf021123b96fb5f4fb491ff4c532e226b835c8118fa8d505cc4c635a2b604a3e42a162746021552a551c  modules-initfs
 826a3790b49324c1e61c75b6c0ffc043a2a1d7c13a8c554fb5eae4977af47a1ca93d70ef8c783d712b953b70e18ae58fa4c6a49bf97263398a01a0c4f91ebc8f  i3blocks.conf
-2b26f551b86c5d71119a518d18b49c3c6a9a6cfcc1ce4f19bb533ce415c698b1b3f200071e3f54b1abb11d8ae1add348e0a3f01ce21805607dd7beebdebf72c0  i3wm.conf
+506accabcf9fb3e2a270228ea53fdcb57f51092d6e7126a631af8eed697cd882cc805b19cf255422284bec12c928b58219d173a4a790d784db5335a059b6bb4f  i3wm.conf
 0b80af9fd1f36e6bc06bdfdf48352897234ac7457210649016665da8570a5a64b8a0841b4fbeb64fd7054a5246a64718cf4412f8a53024ce39b28a80984972d8  protip_shell.sh
 6c6a70667f37807089adbb343c09d1f62d47b8e6c9c0a54f44790b822f8bff3dccae73341ef736b799fd6740bbd6e1f48e6e122c2e08520f71f6ad7434a47d2c  battery-bq27200
 d9ef88c714e9fce8822f63b7a9d7fc3e1ed472c8c876b44ba524d44efea322839f13ddd2fa652420608427ecf7279bfaac302c9b67667f32796ca21da332164d  calendar
@@ -207,14 +201,15 @@ dc585e11bf4e06e36c5c62bcc024eaacecc30437d9da5257df14be05e247a2f2bc208874be3058ed
 082a5166e38296b097e873b0b4aeaf007e594d3bf4470c74e91ee3efedcf28ad25cd55c23dd63e460339898ae08e77e111b0e1092fa5e661db90bb40732103a1  rx51_it.map
 6e4e8b10a41d0957968736f5d780f14c7070b03913d80859cb07180e9cec9a36bbc9c639748765e48962772640974f5491627520cc36bd3d6c9d01748f9ddaff  rx51_ptes.map
 e440ed7a3070c17e003b86b72dbe6d8194d01b577ca8dd56dd066f216b6dda32bb965c780950f1789a66f7c948290016b048da9f1cf63aba9e11d7e7fd6873ba  rx51_us.map
-caf9f4c45d11c28e1a6681255fafe5a286b0c417737fac1ca0ee37d3f82fd65c1712f5180375d7813fa308dfdca91d96876b5ce5b05b55ac14cfc31303b1ea5f  lock.sh
+6cb3ad1253ceb682d5241e6661a4313cb88b16cbf855f45513b7320584cab062e6c6f472b4ba89ccf76c66493ea76dc3a7bed516b403e324a6fa5657621c7a09  lock.sh
 157b27feebcfddf800a1ffd8c6e369d2b58e5db25b1a44b4443dada8d9fe74abb91d036b9f0e97769bbafbdc72020b5637313682c6932fe7b0bddb9ebebbad42  modem-load.conf
 695feac7f69a0ec8c5e007cdb651adcc3492f1c6236e7fd183edec2a5e25cb957d3ace630ea5fdb87fd703e35ac368f1d097c2f881ecb52c9cfd433564db2a6c  modem-opts.conf
-72b1554929843990a7665fdf1e45f7ef304fc45d3fa3b1082dcb9dd6cb9d3e9f6799659a8e2fdbd24a809319654543d1c20a0528856002c3de319d5546e2af8b  modules.blocklist
-b50e7f37ffb1fa0bb782b117a4e8bcfdb722b6127c3e5d643e90cd901a1f4e65e77a0773ed418673c8195595347482be0c8096f5a723e840315ad61ccd043b66  n900-wlan-data.initd
+862ebc7cd2d7a1b3d41b10701b8418308c89eb0732eb99c42ec1091d48e08db9421727f67a3272b7309549798d59afb1b8d7d2fa48d1447b208fcb2329472d4d  modules.blocklist
 143c21f0b18a016d37cb44178e9daea09f128a90769b48353c03c3f245cb9b1f7e773b9ccee084973fc78ddd7a18c2642e54888a85bda7c7daecddc9a8c62eff  pointercal
+134f51d20decc0c63ab08010931a0b410b70d2f85bf6899f2ff137b1680f59f706a6287d01f5fbb41fa5309125df75a430d0783149bd1a6a1bca07d22f4f6a21  proxishot.sh
 239a54ae5c5effb53ccf4d658652c0462da57604b16b77a63627a17caa171caf82e3d1769f9c5afea8756415acbbf3b73db9b57715fce6c70ea3f29e5c6ac84a  uboot-script.cmd
 9e72035c88632d12895534e5aa5746f2c130c7dcdafa8702748d62b71ed0e1b5911b6e1f07f9b9e39b6072bbb662f66aead585baa1dcacb7d8c8953ca89b6762  10-nokia-modem.rules
+03079030237440080e833dbfeff80327c1ad6a8129c6c730b401a3052cd00a986783ec3473a526b14ae73ba1f20653b4c7b2a6590839bfe6cc156bbbc3b7bb74  80-feedbackd-twl4030.rules
 c6012aef28b096141b924fced226ec99fb93eb53b69c064a8887d8fecdf8dc08a3ba3db399e18d88374c6ef4c59013a30699c7e4d76e5cb771040582573a0527  90-touchscreen-dev.rules
 d46adf47194c02b434cb46751003e67ee008d60978458e69b1f59dc709a7135a70f542918c29e359ba8308bdeda58a21e8efa446d06625511af05403db90e455  upower.conf
 c7837e6688f09c7d650ac7479b8881d4bad709480a71a1dea8b5bba4f4215d6b48a3aebd3f58923bbd48813559478d4ef137dcc9838d321722e141f0aa6a6085  x11-keymap

device/community/device-nokia-n900/acpi.map

@@ -1,15 +1,12 @@
 # FORMAT: "<EV_XXX>" <type> "<input.h name>" <keycode> <value> <script under /etc/acpi>
 # hint: "evtest /dev/input/eventX" is very helpful!
 
-"EV_SW" 0x05 "SW_CAMERA_LENS_COVER" 9 1 CAM_LID_OPEN
-"EV_SW" 0x05 "SW_CAMERA_LENS_COVER" 9 0 CAM_LID_CLOSE
+"EV_SW" 0x05 "SW_CAMERA_LENS_COVER" 9 0 CAM_LID_OPEN
+"EV_SW" 0x05 "SW_CAMERA_LENS_COVER" 9 1 CAM_LID_CLOSE
 
 "EV_SW" 0x05 "SW_KEYPAD_SLIDE" 10 1 KP_SLIDE_OPEN
 "EV_SW" 0x05 "SW_KEYPAD_SLIDE" 10 0 KP_SLIDE_CLOSE
 
-"EV_SW" 0x05 "SW_FRONT_PROXIMITY" 11 1 FRNT_PRXY_ON
-"EV_SW" 0x05 "SW_FRONT_PROXIMITY" 11 0 FRNT_PRXY_OFF
-
 "EV_KEY" 0x01 "KEY_SCREENLOCK" 152 0 SCRNLCK_UP
 "EV_KEY" 0x01 "KEY_SCREENLOCK" 152 1 SCRNLCK_DWN
 
@@ -19,15 +16,9 @@
 "EV_KEY" 0x01 "KEY_CAMERA_FOCUS" 528 0 CAM_FOCUS_UP
 "EV_KEY" 0x01 "KEY_CAMERA_FOCUS" 528 1 CAM_FOCUS_DWN
 
-"EV_KEY" 0x01 "KEY_POWER" 116 0 PWR_BTN_UP
-"EV_KEY" 0x01 "KEY_POWER" 116 1 PWR_BTN_DWN
-
 "EV_SW" 0x05 "SW_HEADPHONE_INSERT" 2 1 HEADPHONE_INSERT
 "EV_SW" 0x05 "SW_HEADPHONE_INSERT" 2 0 HEADPHONE_REMOVE
 "EV_SW" 0x05 "SW_MICROPHONE_INSERT" 2 1 MICROPHONE_INSERT
 "EV_SW" 0x05 "SW_MICROPHONE_INSERT" 2 0 MICROPHONE_REMOVE
 "EV_SW" 0x05 "SW_VIDEOOUT_INSERT" 2 1 VIDEOOUT_INSERT
 "EV_SW" 0x05 "SW_VIDEOOUT_INSERT" 2 0 VIDEOOUT_REMOVE
-
-"EV_KEY" 0x01 "KEY_VOLUMEUP" 66 1 VOL_UP
-"EV_KEY" 0x01 "KEY_VOLUMEDOWN" 65 1 VOL_DWN

device/community/device-nokia-n900/acpi_handler.sh

@@ -1,5 +1,6 @@
 #!/bin/ash
 
+user=$( getent passwd 10000 | cut -d: -f1 )
 cmd=$( echo $0 | awk '{i=split($0,a,"/"); print a[i]}' )
 
 function adjust_keypad_bl {
@@ -10,13 +11,15 @@ function adjust_keypad_bl {
 
 case $cmd in
 	KP_SLIDE_OPEN)
-		adjust_keypad_bl 255
+		adjust_keypad_bl 63
+		su $user -c 'DISPLAY=:0.0 /usr/bin/xset dpms force on'
+		su $user -c 'DISPLAY=:0.0 /usr/bin/xinput enable "TSC2005 touchscreen"'
 		;;
 	KP_SLIDE_CLOSE)
 		adjust_keypad_bl 0
 		;;
 	CAM_BTN_DWN)
-		echo "Not implemented yet"
+		USER_USER="$user" /usr/bin/proxishot.sh
 		;;
 	CAM_BTN_UP)
 		echo "Not implemented yet"
@@ -33,58 +36,32 @@ case $cmd in
 	CAM_LID_OPEN)
 		echo "Not implemented yet"
 		;;
-	FRNT_PRXY_OFF)
-		echo "Not implemented yet"
-		;;
-	FRNT_PRXY_ON)
-		echo "Not implemented yet"
-		;;
-	KP_SLIDE_CLOSE)
-		echo "Not implemented yet"
-		;;
-	KP_SLIDE_OPEN)
-		echo "Not implemented yet"
-		;;
 	SCRNLCK_DWN)
-		echo "Not implemented yet"
+		su $user -c "DISPLAY=:0 /usr/bin/lock.sh"
 		;;
 	SCRNLCK_UP)
 		echo "Not implemented yet"
 		;;
-		HEADPHONE_INSERT)
-				alsactl restore -f /var/lib/alsa/asound.state.headset
-				;;
-		HEADPHONE_REMOVE)
-				alsactl restore -f /var/lib/alsa/asound.state.speakers
-				;;
-		MICROPHONE_INSERT)
-				echo "Not implemented yet"
-				;;
-		MICROPHONE_REMOVE)
-				echo "Not implemented yet"
-				;;
-		PWR_BTN_DWN)
-				echo "Not implemented yet"
-				;;
-		PWR_BTN_UP)
-				echo "Not implemented yet"
-				;;
-		VIDEOOUT_INSERT)
-				echo "Not implemented yet"
-				;;
-		VIDEOOUT_REMOVE)
-				echo "Not implemented yet"
-				;;
-		VOL_DWN)
-				echo "Not implemented yet"
-				;;
-		VOL_UP)
-				echo "Not implemented yet"
-				;;
+	HEADPHONE_INSERT)
+		alsactl restore -f /var/lib/alsa/asound.state.headset
+		;;
+	HEADPHONE_REMOVE)
+		alsactl restore -f /var/lib/alsa/asound.state.speakers
+		;;
+	MICROPHONE_INSERT)
+		echo "Not implemented yet"
+		;;
+	MICROPHONE_REMOVE)
+		echo "Not implemented yet"
+		;;
+	VIDEOOUT_INSERT)
+		echo "Not implemented yet"
+		;;
+	VIDEOOUT_REMOVE)
+		echo "Not implemented yet"
+		;;
 	*)
 		echo "Unknown event"
 		exit 1
 		;;
 esac
-
-

device/community/device-nokia-n900/device-nokia-n900-nonfree-firmware.post-install

@@ -1,3 +0,0 @@
-#!/bin/sh
-
-rc-update add n900-wlan-data boot

device/community/device-nokia-n900/device-nokia-n900-nonfree-firmware.trigger

@@ -1,5 +0,0 @@
-#!/bin/sh
-
-[ -f /lib/firmware/ti-connectivity/wl1251-nvs.bin ] && n900-update-wl1251
-
-exit 0

device/community/device-nokia-n900/i3wm/i3wm.conf

@@ -60,9 +60,6 @@ mode "command" {
 # Enter command mode
 bindsym Shift+space mode "command"
 
-# This is the slidey button on the side
-bindsym XF86ScreenSaver exec --no-startup-id lock.sh
-
 # Pressing the power button offers reboot, shutdown, or suspend choice
 bindsym XF86PowerOff exec --no-startup-id i3-nagbar \
         -m 'Choose Power Button Action:' \
@@ -70,6 +67,13 @@ bindsym XF86PowerOff exec --no-startup-id i3-nagbar \
         -B 'Suspend' 'loginctl suspend' \
         -B 'Shutdown' 'loginctl poweroff'
 
+bindsym XF86AudioRaiseVolume exec --no-startup-id amixer set PCM 5%+
+bindsym XF86AudioLowerVolume exec --no-startup-id amixer set PCM 5%-
+
+# Adjust display brightness using Shift + Volume buttons in 10% steps
+bindsym Shift+XF86AudioRaiseVolume exec --no-startup-id brightnessctl --quiet --class=backlight set +10%
+bindsym Shift+XF86AudioLowerVolume exec --no-startup-id brightnessctl --quiet --class=backlight set 10%-
+
 # Start i3bar to display a workspace bar (plus the system information i3status
 # finds out, if available)
 bar {
@@ -85,9 +89,9 @@ bar {
         }
 }
 
-# Wallpaper
-exec_always --no-startup-id feh --bg-fill /usr/share/wallpapers/postmarketos.jpg
-
 # Hide mouse cursor
 exec --no-startup-id unclutter-xfixes --fork
-
+# Do not handle gpio_key events as they are handled by acpid
+exec --no-startup-id xinput disable gpio_keys
+# Turn display off after 2 minutes of idle
+exec --no-startup-id xset dpms 0 0 120

device/community/device-nokia-n900/lock.sh

@@ -1,14 +1,17 @@
 #!/bin/sh
 
-FILE=~/.screenoff
-if [ -f $FILE ]; then
-	xinput set-prop 8 "Device Enabled" 1
-	xset dpms force on
-	rm "$FILE"
-else
-	xinput set-prop 8 "Device Enabled" 0
-	# Turn screen off twice (sometimes it does not work on first run)
-	xset dpms force off
-	xset dpms force off
-	touch "$FILE"
+display=off
+if xset q | grep -iq "monitor is on"; then
+	display=on
 fi
+
+case "$display" in
+	off)
+		xinput enable "TSC2005 touchscreen"
+		xset dpms force on
+		;;
+	on)
+		xinput disable "TSC2005 touchscreen"
+		xset dpms force off
+		;;
+esac

device/community/device-nokia-n900/modules.blocklist

@@ -7,3 +7,6 @@ blacklist omap3_isp
 blacklist hci_nokia
 blacklist hci_uart
 blacklist ehci_omap
+# do not autoload leds_gpio used by the debug leds, since it is now initialized
+# in ON state, interfering with the keyboard backlight
+blacklist leds_gpio

device/community/device-nokia-n900/n900-wlan-data.initd

@@ -1,20 +0,0 @@
-#!/sbin/openrc-run
-description="Update N900 WLAN calibration data"
-
-depend()
-{
-	before modules
-	after localmount
-}
-
-start()
-{
-	if [ ! -f /var/lib/n900_cal/done ]
-	then
-		n900-update-wl1251
-		mkdir -p /var/lib/n900_cal
-		touch /var/lib/n900_cal/done
-	fi
-
-	eend $?
-}

device/community/device-nokia-n900/proxishot.sh

@@ -0,0 +1,12 @@
+#!/bin/sh
+# Take a screenshot if the proximity sensor is covered.
+# NB: pass the user's username in USER_USER environment variable when calling
+# this script.
+/usr/bin/evtest --query /dev/input/by-path/platform-gpio_keys-event \
+	EV_SW SW_FRONT_PROXIMITY
+# return value of `10` means the sensor is in the set state, i.e.
+# proximity = near. see `man 1 evtest`
+if [ "$?" = "10" ]; then
+	su "$USER_USER" -c "/bin/mkdir -p ~/Screenshots"
+	su "$USER_USER" -c 'cd ~/Screenshots && DISPLAY=:0 /usr/bin/scrot "%Y-%m-%d_%H-%M-%S.png"'
+fi

device/community/device-nokia-n900/udev/80-feedbackd-twl4030.rules

@@ -0,0 +1 @@
+SUBSYSTEM=="input", KERNEL=="event*", ENV{ID_INPUT}=="1", ATTRS{name}=="twl4030:vibrator", TAG+="uaccess", ENV{FEEDBACKD_TYPE}="vibra"

device/community/device-nvidia-tegra-armv7/APKBUILD

@@ -6,8 +6,8 @@
 
 pkgname=device-nvidia-tegra-armv7
 pkgdesc="NVIDIA Tegra ARMv7"
-pkgver=1.1
-pkgrel=1
+pkgver=2
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
@@ -45,6 +45,6 @@ x11() {
 }
 
 sha512sums="
-e8d7c637130642a5ee5438e7f401c1870ecd1dcdca0305ab73fabf3d8548db5f054aeeacaf48abc46189bc1efdcbb5549e8afed263880e07b4932aee418041fc  deviceinfo
+b5f81887b9d78906a880d89b862dbe445129e8444fa7e41b17deaa0ff494e25455bf47f5864a219ae394b660f63061c01c00ef370e88086367a3efcbf12a4f91  deviceinfo
 8ea2030fb0c1ae181778b86dc36ed71a904dd51e1fb08114c2a124a693fc7b464cfbb14efa8422db716fb9a647afa367df094abcc14f1ccc51af8b9063de8847  modules-initfs
 "

device/community/device-nvidia-tegra-armv7/deviceinfo

@@ -16,8 +16,6 @@ deviceinfo_chassis="tablet"
 deviceinfo_external_storage="true"
 
 # Bootloader related
-deviceinfo_flash_method="fastboot-bootpart"
-deviceinfo_flash_fastboot_partition_kernel="system"
-deviceinfo_flash_fastboot_partition_system="userdata"
+deviceinfo_flash_method="none"
 deviceinfo_generate_extlinux_config="true"
 deviceinfo_kernel_cmdline="console=ttyS0,115200n8 rw gpt"

device/community/device-odroid-xu4/APKBUILD

@@ -3,8 +3,8 @@
 
 pkgname=device-odroid-xu4
 pkgdesc="ODROID XU4"
-pkgver=0.2
-pkgrel=2
+pkgver=1
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"

device/community/device-oneplus-enchilada/APKBUILD

@@ -4,7 +4,7 @@
 pkgname=device-oneplus-enchilada
 pkgdesc="OnePlus 6"
 pkgver=13
-pkgrel=0
+pkgrel=3
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -13,7 +13,6 @@ depends="
 	linux-postmarketos-qcom-sdm845
 	mkbootimg
 	postmarketos-base
-	postmarketos-update-kernel
 	soc-qcom-sdm845
 	soc-qcom-sdm845-ucm
 	soc-qcom-sdm845-qbootctl
@@ -43,7 +42,6 @@ nonfree_firmware() {
 	pkgdesc="Modem, WiFi and GPU Firmware, also needed for osk-sdl"
 	depends="
 		firmware-oneplus-sdm845>=9
-		firmware-oneplus-sdm845-initramfs
 		hexagonrpcd
 		soc-qcom-sdm845-nonfree-firmware
 		soc-qcom-sdm845-modem