postmarketos-ui-{gnome*,phosh}: Move shared pmb_recommends to ui-gnome-base (MR 3700)

These apps are useful to have on the full GNOME desktop too.

.ci/apkbuild-lint.sh

@@ -0,0 +1,22 @@
+#!/bin/sh -e
+# Description: run apkbuild-lint on modified APKBUILDs
+# Options: native
+# Use 'native' because it requires git commit history.
+# https://postmarketos.org/pmb-ci
+
+if [ "$(id -u)" = 0 ]; then
+	set -x
+	wget "https://gitlab.com/postmarketOS/ci-common/-/raw/master/install_pmbootstrap.sh"
+	sh ./install_pmbootstrap.sh
+	exec su "${TESTUSER:-pmos}" -c "sh -e $0"
+fi
+
+# Wrap pmbootstrap to use this repository for --aports
+pmaports="$(cd $(dirname $0)/..; pwd -P)"
+_pmbootstrap="$(command -v pmbootstrap)"
+pmbootstrap() {
+	"$_pmbootstrap" --aports="$pmaports" "$@"
+}
+
+.ci/lib/apkbuild_linting.py
+

.ci/build-aarch64.sh

@@ -0,0 +1 @@
+lib/build_changed_aports.sh

.ci/build-armhf.sh

@@ -0,0 +1 @@
+lib/build_changed_aports.sh

.ci/build-armv7.sh

@@ -0,0 +1 @@
+lib/build_changed_aports.sh

.ci/build-riscv64.sh

@@ -0,0 +1 @@
+lib/build_changed_aports.sh

.ci/build-x86.sh

@@ -0,0 +1 @@
+lib/build_changed_aports.sh

.ci/build-x86_64.sh

@@ -0,0 +1 @@
+lib/build_changed_aports.sh

.ci/build.sh

@@ -1,8 +0,0 @@
-#!/bin/sh -e
-# Convenience wrapper for short arch-specific build jobs in .gitlab-ci.yml
-
-export PYTHONUNBUFFERED=1
-JOB_ARCH="${CI_JOB_NAME#build-}"
-
-set -x
-su pmos -c ".ci/build_changed_aports.py $JOB_ARCH"

.ci/check-dtb-install-location.sh

@@ -1,7 +0,0 @@
-#!/bin/sh -e
-
-if grep -r 'INSTALL_DTBS_PATH="$pkgdir"/usr/share/dtb'; then
-	echo 'Please do not install dtbs to /usr/share/dtb!'
-	echo 'Unless you have a good reason not to, please put them in /boot/dtbs'
-	exit 1
-fi

.ci/commits.sh

@@ -0,0 +1,20 @@
+#!/bin/sh -e
+# Copyright 2022 Oliver Smith
+# SPDX-License-Identifier: GPL-3.0-or-later
+# Description: check pkgver/pkgrel bumps, amount of changed pkgs etc
+# Options: native
+# Use 'native' because it requires git commit history.
+# https://postmarketos.org/pmb-ci
+
+if [ "$(id -u)" = 0 ]; then
+	set -x
+	# In .gitlab-ci.yml currently .ci/pytest.sh runs before this and
+	# already downloads and runs install_pmbootstrap.sh.
+	if ! [ -e install_pmbootstrap.sh ]; then
+		wget "https://gitlab.com/postmarketOS/ci-common/-/raw/master/install_pmbootstrap.sh"
+		sh ./install_pmbootstrap.sh
+	fi
+	exec su "${TESTUSER:-pmos}" -c "sh -e $0"
+fi
+
+.ci/lib/check_changed_aports_versions.py

.ci/ec.sh

@@ -0,0 +1,13 @@
+#!/bin/sh -e
+# Description: editorconfig-checker: lint for trailing whitespaces etc.
+# https://postmarketos.org/pmb-ci
+
+if [ "$(id -u)" = 0 ]; then
+	set -x
+	apk -q add \
+		editorconfig-checker
+	exec su "${TESTUSER:-build}" -c "sh -e $0"
+fi
+
+set -x
+ec

.ci/flake8.sh

@@ -0,0 +1,14 @@
+#!/bin/sh -e
+# Description: lint CI related python scripts/tests
+# https://postmarketos.org/pmb-ci
+
+if [ "$(id -u)" = 0 ]; then
+	set -x
+	apk -q add py3-flake8
+	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')

.ci/grep.sh

@@ -0,0 +1,24 @@
+#!/bin/sh -e
+# Description: check various bad patterns with grep
+# https://postmarketos.org/pmb-ci
+
+if [ "$(id -u)" = 0 ]; then
+	set -x
+	apk -q add grep
+	exec su "${TESTUSER:-build}" -c "sh -e $0"
+fi
+
+# Find CHANGEMEs in APKBUILDs
+if grep -qr '(CHANGEME!)' *; then
+	echo "ERROR: Please replace '(CHANGEME!)' in the following files:"
+	grep --color=always -r '(CHANGEME!)' *
+	exit 1
+fi
+
+# DTBs installed to /usr/share/db
+# FIXME: doesn't pass currently, fix it and enable it afterwards
+# if grep -r 'INSTALL_DTBS_PATH="$pkgdir"/usr/share/dtb'; then
+# 	echo 'Please do not install dtbs to /usr/share/dtb!'
+# 	echo 'Unless you have a good reason not to, please put them in /boot/dtbs'
+# 	exit 1
+# fi

.ci/kconfig.sh

@@ -0,0 +1,22 @@
+#!/bin/sh -e
+# Description: check all kernel configs with 'pmbootstrap kconfig check'
+# Options: native
+# Use 'native' because it requires running pmbootstrap.
+# https://postmarketos.org/pmb-ci
+
+if [ "$(id -u)" = 0 ]; then
+	set -x
+	wget "https://gitlab.com/postmarketOS/ci-common/-/raw/master/install_pmbootstrap.sh"
+	sh ./install_pmbootstrap.sh
+	exec su "${TESTUSER:-pmos}" -c "sh -e $0"
+fi
+
+# Wrap pmbootstrap to use this repository for --aports
+pmaports="$(cd $(dirname $0)/..; pwd -P)"
+_pmbootstrap="$(command -v pmbootstrap)"
+pmbootstrap() {
+	"$_pmbootstrap" --aports="$pmaports" "$@"
+}
+
+set -x
+pmbootstrap kconfig check

.ci/lib/add_pmbootstrap_to_import_path

@@ -0,0 +1 @@
+../testcases/add_pmbootstrap_to_import_path

.ci/lib/build_changed_aports.py

@@ -7,7 +7,7 @@ import sys
 import common
 
 # pmbootstrap
-import testcases.add_pmbootstrap_to_import_path
+import add_pmbootstrap_to_import_path
 import pmb.parse
 import pmb.parse._apkbuild
 import pmb.helpers.pmaports

.ci/lib/build_changed_aports.sh

@@ -0,0 +1,19 @@
+#!/bin/sh -e
+# Description: build modified packages for this architecture
+# Options: native slow
+# https://postmarketos.org/pmb-ci
+
+if [ "$(id -u)" = 0 ]; then
+	set -x
+	wget "https://gitlab.com/postmarketOS/ci-common/-/raw/master/install_pmbootstrap.sh"
+	sh ./install_pmbootstrap.sh
+	exec su "${TESTUSER:-pmos}" -c "sh -e $0"
+fi
+
+export PYTHONUNBUFFERED=1
+
+# Get the architecture from the symlink we are running
+arch="$(echo "$0" | cut -d '-' -f 2 | cut -d '.' -f 1)"
+
+set -x
+.ci/lib/build_changed_aports.py "$arch"

.ci/lib/check_changed_aports_versions.py

@@ -11,7 +11,7 @@ import subprocess
 import common
 
 # pmbootstrap
-import testcases.add_pmbootstrap_to_import_path  # noqa
+import add_pmbootstrap_to_import_path  # noqa
 import pmb.parse
 import pmb.parse.version
 import pmb.helpers.logging

.ci/lib/check_devices_in_wiki.py

@@ -1,5 +1,5 @@
 #!/usr/bin/env python3
-# Copyright 2021 Oliver Smith
+# Copyright 2022 Oliver Smith
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 import argparse
@@ -13,7 +13,7 @@ def get_devices():
     """:returns: list of all devices"""
     ret = []
     pmaports = (os.path.realpath(os.path.join(os.path.dirname(__file__) +
-                "/..")))
+                "/../..")))
     for path in glob.glob(pmaports + "/device/*/device-*/"):
         device = os.path.dirname(path).split("device-", 1)[1]
 
@@ -110,7 +110,7 @@ def main():
         print("")
         print("Now it's time to add some documentation:")
         print("1) Create a device specific wiki page as described here:")
-        print("   <https://wiki.postmarketos.org/wiki/Help:Device_Page>")
+        print("   https://wiki.postmarketos.org/wiki/Help:Device_Page")
         print("2) Set 'booting = yes' in the infobox of your device page.")
         print("3) Run these tests again with an empty commit in your MR:")
         print("   $ git commit --allow-empty -m 'run tests again'")

.ci/lib/common.py

@@ -17,7 +17,7 @@ def get_pmaports_dir():
     global cache
     if "pmaports_dir" in cache:
         return cache["pmaports_dir"]
-    ret = os.path.realpath(os.path.join(os.path.dirname(__file__) + "/.."))
+    ret = os.path.realpath(os.path.join(os.path.dirname(__file__) + "/../.."))
     cache["pmaports_dir"] = ret
     return ret
 

.ci/lib/gitlab_prepare_ci.sh

@@ -0,0 +1,17 @@
+#!/bin/sh -e
+# Copyright 2022 Oliver Smith
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+if ! mount | grep -q /proc/sys/fs/binfmt_misc; then
+	echo "Mounting binfmt_misc"
+	mount -t binfmt_misc none /proc/sys/fs/binfmt_misc
+fi
+
+if id "build" > /dev/null 2>&1; then
+	echo "User 'build' exists already"
+else
+	echo "Creating build user"
+	adduser -D build
+	chown -R build:build .
+	echo 'build ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers
+fi

.ci/pytest.sh

@@ -1,10 +1,21 @@
 #!/bin/sh -e
-# Copyright 2021 Oliver Smith
+# Copyright 2022 Oliver Smith
 # SPDX-License-Identifier: GPL-3.0-or-later
+# Description: lint with various python tests
+# Options: native
+# Use 'native' because it requires pmbootstrap.
+# https://postmarketos.org/pmb-ci
 
-# Require pmbootstrap
-if ! command -v pmbootstrap > /dev/null; then
-	echo "ERROR: pmbootstrap needs to be installed."
+if [ "$(id -u)" = 0 ]; then
+	set -x
+	wget "https://gitlab.com/postmarketOS/ci-common/-/raw/master/install_pmbootstrap.sh"
+	sh ./install_pmbootstrap.sh pytest
+	exec su "${TESTUSER:-pmos}" -c "sh -e $0"
+fi
+
+# Require pytest to be installed on the host system
+if [ -z "$(command -v pytest)" ]; then
+	echo "ERROR: pytest command not found, make sure it is in your PATH."
 	exit 1
 fi
 

.ci/shellcheck.sh

@@ -1,16 +1,15 @@
 #!/bin/sh -e
-# Copyright 2021 Oliver Smith
+# Copyright 2022 Oliver Smith
 # SPDX-License-Identifier: GPL-3.0-or-later
+# Description: lint all shell scripts
+# https://postmarketos.org/pmb-ci
 
-set -e
-DIR="$(cd "$(dirname "$0")" && pwd -P)"
-cd "$DIR/.."
+DIR="$(cd "$(dirname "$0")/.." && pwd -P)"
 
-# Find CHANGEMEs in APKBUILDs
-if grep -qr '(CHANGEME!)' *; then
-	echo "ERROR: Please replace '(CHANGEME!)' in the following files:"
-	grep --color=always -r '(CHANGEME!)' *
-	exit 1
+if [ "$(id -u)" = 0 ]; then
+	set -x
+	apk -q add shellcheck
+	exec su "${TESTUSER:-build}" -c "sh -e $0"
 fi
 
 # Shell: shellcheck
@@ -24,11 +23,10 @@ sh_files="
 	./main/postmarketos-mkinitfs-hook-debug-shell/20-debug-shell.sh
 	./main/postmarketos-mkinitfs-hook-netboot/netboot.sh
 	./main/postmarketos-update-kernel/update-kernel.sh
-	./main/swclock-offset/swclock-offset-boot.sh
-	./main/swclock-offset/swclock-offset-shutdown.sh
 	./main/ttyescape/*.post-install
 	./main/unl0kr/unlock.sh
 	./main/msm-firmware-loader/*.post-install
+	./device/community/soc-qcom-sdm845/call_audio_idle_suspend_workaround.sh
 
 	$(find . -path './main/postmarketos-ui-*/*.sh')
 	$(find . -path './main/postmarketos-ui-*/*.pre-install')
@@ -44,8 +42,9 @@ sh_files="
 
 	$(find . -path '.ci/*.sh')
 "
+
 for file in $sh_files; do
 	echo "Test with shellcheck: $file"
-	cd "$DIR/../$(dirname "$file")"
+	cd "$DIR/$(dirname "$file")"
 	shellcheck -e SC1008 -x "$(basename "$file")"
 done

.ci/testcases/test_deviceinfo.py

@@ -17,12 +17,15 @@ def deviceinfo_obsolete(info):
     Test for obsolete options used in the deviceinfo file. They must still be
     defined in pmbootstrap's config/__init__.py.
     """
-    obsolete_options = ["weston_pixman_type"]
+    obsolete_options = [
+        "usb_rndis_function",
+        "weston_pixman_type",
+    ]
     for option in obsolete_options:
-        if info[option]:
-            raise RuntimeError("option '" + option + "' is obsolete, please"
-                               " remove it (reasons for removal are at"
-                               " <https://postmarketos.org/deviceinfo>)")
+        if option in info and info[option]:
+            raise RuntimeError(f"option {option} is obsolete, please rename"
+                               " or remove it (see reasons for removal of at"
+                               " https://postmarketos.org/deviceinfo)")
 
 
 def test_deviceinfo(args):

.ci/testcases/test_firmware.py

@@ -15,6 +15,7 @@ def test_aports_firmware(args):
     """
 
     excluded = [
+        "firmware-motorola-ali",  # Depends on firmware-qcom-adreno-a530
         "firmware-motorola-potter",  # Depends on soc-qcom-msm8916-ucm
         "firmware-oneplus-msm8998",  # Depends on soc-qcom-sdm845-nonfree-firmware
         "firmware-xiaomi-sagit",  # Depends on soc-qcom-sdm845-nonfree-firmware

.ci/testcases/test_source.py

@@ -1,11 +1,13 @@
 #!/usr/bin/env python3
-# Copyright 2021 Oliver Smith
+# Copyright 2022 Oliver Smith
 # SPDX-License-Identifier: GPL-3.0-or-later
+# Various checks on source= in the APKBUILDs
 
 import glob
+import logging
+import os
 import pytest
 import sys
-import os
 
 import add_pmbootstrap_to_import_path
 import pmb.parse
@@ -21,12 +23,13 @@ def parse_source_from_checksums(args, apkbuild_path):
     to parse shell code (like in postmarketos-base).
 
     :param apkbuild_path: full path to the APKBUILD
-    :returns: list of parsed "source" files, e.g.:
-              ["first.patch", "second.patch"]
+    :returns: dict of parsed "source" filenames and checksums, e.g.:
+              {"first.patch": "b4dc4f3…",
+               "second.patch": "b4dc4f3…"}
     """
     start = 'sha512sums="'
     in_block = False
-    ret = []
+    ret = {}
 
     with open(apkbuild_path, encoding="utf-8") as handle:
         for line in handle.readlines():
@@ -43,18 +46,21 @@ def parse_source_from_checksums(args, apkbuild_path):
                 continue
 
             try:
-                _, filename = line.rstrip().split("  ", 2)
+                checksum, filename = line.rstrip().split("  ", 2)
             except ValueError:
                 raise ValueError("Failed to parse checksums. Try to delete the"
                                  " checksums and generate them again with"
                                  f" 'pmbootstrap checksum': {apkbuild_path}")
 
+            # Cut off 'sha512sums="' if the first checksum is in that line
+            if checksum.startswith(start):
+                checksum = checksum[len(start):]
+
             # Find end
             if filename.endswith('"'):
-                ret += [filename[:-1]]
-                break
+                filename = filename[:-1]
 
-            ret += [filename]
+            ret[filename] = checksum
     return ret
 
 
@@ -97,3 +103,50 @@ def test_aports_unreferenced_files(args):
                     and rel_file_path not in subpackage_installs \
                     and rel_file_path not in trigger_sources:
                 raise RuntimeError(f"{apkbuild_path}: found unreferenced file: {rel_file_path}")
+
+
+def test_distfiles_conflict(args):
+    """
+    Make sure that each filename mentioned in any source= of any APKBUILD
+    always has the same checksum. This is important because apk caches
+    downloaded source files in a flat distfiles directory. So if two APKBUILDs
+    both download a file with the same filename but different checksum, and the
+    user builds both after each other, abuild will fail on the second build
+    with a checksum error.
+    """
+    source_all = {}
+    for apkbuild_path in glob.iglob(f"{args.aports}/**/APKBUILD", recursive=True):
+        source = parse_source_from_checksums(args, apkbuild_path)
+        dir_path = os.path.dirname(apkbuild_path)
+        apkbuild_rel = os.path.relpath(apkbuild_path, args.aports)
+        for filename, checksum in source.items():
+            # Files bundled with the APKBUILD don't get copied to the distfiles
+            # cache, so not relevant for this check. Use glob.glob here and not
+            # iglob, because we don't want an iterator.
+            if glob.glob(f"{dir_path}/**/{filename}", recursive=True):
+                continue
+
+            # First time seeing this file
+            if filename not in source_all:
+                source_all[filename] = {"checksum": checksum,
+                                        "apkbuild_rel": apkbuild_rel}
+                continue
+
+            # Saw this file already with same checksum
+            if checksum == source_all[filename]["checksum"]:
+                continue
+
+            # Saw this file already with different checksum
+            logging.error("")
+            logging.error(f"ERROR: the source file '{filename}' has different"
+                          " checksums in the following files:")
+            logging.error(f"- {source_all[filename]['apkbuild_rel']}:")
+            logging.error(f"  {source_all[filename]['checksum']}")
+            logging.error(f"- {apkbuild_rel}:")
+            logging.error(f"  {checksum}")
+            logging.error("")
+            logging.error("Fix this by setting a different target filename in"
+                          " the package you modified:")
+            logging.error("https://wiki.alpinelinux.org/wiki/APKBUILD_Reference#source")
+            logging.error("")
+            raise RuntimeError(f"Conflict with source file '{filename}'")

.ci/wiki.sh

@@ -0,0 +1,15 @@
+#!/bin/sh -e
+# Description: verify devices are documented in the wiki
+# Options: native
+# Run natively so we don't need to set up a chroot, python3 is the only dep.
+# https://postmarketos.org/pmb-ci
+
+if [ "$(id -u)" = 0 ]; then
+	set -x
+	apk -q add \
+		python3
+	exec su "${TESTUSER:-build}" -c "sh -e $0"
+fi
+
+set -x
+.ci/lib/check_devices_in_wiki.py --booting

.gitignore

@@ -20,7 +20,6 @@ dist/
 downloads/
 eggs/
 .eggs/
-lib/
 lib64/
 parts/
 sdist/

.gitlab-ci.yml

@@ -3,7 +3,7 @@
 # global settings
 image: alpine:latest
 after_script:
-  - .ci/move_logs.sh $CI_PROJECT_DIR
+  - .ci/lib/move_logs.sh $CI_PROJECT_DIR
 stages:
   - lint
   - build
@@ -31,13 +31,12 @@ wiki:
       - merge_requests
     changes:
       - device/*/device-*/*
-  before_script:
-    - apk -q add python3
   script:
-    - .ci/check_devices_in_wiki.py --booting
+    - .ci/lib/gitlab_prepare_ci.sh
+    - .ci/wiki.sh
 
 # testcases linting
-testcases-linting:
+flake8:
   stage: lint
   <<: *only-default
   only:
@@ -49,38 +48,35 @@ testcases-linting:
   before_script:
     - apk -q add py-flake8
   script:
-    - flake8 --ignore E501,F401,E722,W504,W605
+    - .ci/lib/gitlab_prepare_ci.sh
+    - .ci/flake8.sh
 
-# shellcheck
-shellcheck:
+# shellcheck and various grep checks
+shellcheck-grep:
   stage: lint
   <<: *only-default
   image: alpine:edge
-  before_script:
-    - apk -q add shellcheck
   script:
+    - .ci/lib/gitlab_prepare_ci.sh
     - .ci/shellcheck.sh
+    - .ci/grep.sh
 
 editor-config:
   stage: lint
   <<: *only-default
   image: alpine:edge
-  before_script:
-    - apk -q add editorconfig-checker
   script:
-    - ec
+    - .ci/lib/gitlab_prepare_ci.sh
+    - .ci/ec.sh
 
 # aports checks (generic)
-aports-static:
+pytest-commits:
   stage: lint
   <<: *only-default
-  before_script:
-    - wget "https://gitlab.com/postmarketOS/ci-common/-/raw/master/install_pmbootstrap.sh"
-    - sh ./install_pmbootstrap.sh pytest
   script:
-    - su pmos -c ".ci/run_testcases.sh"
-    - su pmos -c ".ci/check_changed_aports_versions.py"
-    - su pmos -c ".ci/check-dtb-install-location.sh"
+    - .ci/lib/gitlab_prepare_ci.sh
+    - .ci/pytest.sh
+    - .ci/commits.sh
   artifacts:
     when: on_failure
     paths:
@@ -89,26 +85,12 @@ aports-static:
       - pmbootstrap.cfg
     expire_in: 1 week
 
-distfile-check:
-  stage: lint
-  <<: *only-default
-  before_script:
-    - apk -q add make findutils
-    - wget "https://gitlab.com/postmarketOS/ci-common/-/archive/master/ci-common-master.tar.bz2"
-    - tar -xf ci-common-master.tar.bz2
-    - mv ci-common-master/distfile-check/*.sh ci-common-master/distfile-check/Makefile .
-    - rm -r ci-common-master ci-common-master.tar.bz2
-  script:
-    - make -j999
-
 # APKBUILD linting
 aport-lint:
   stage: lint
-  before_script:
-    - wget "https://gitlab.com/postmarketOS/ci-common/-/raw/master/install_pmbootstrap.sh"
-    - sh ./install_pmbootstrap.sh
   script:
-    - su pmos -c ".ci/apkbuild-linting.py"
+    - .ci/lib/gitlab_prepare_ci.sh
+    - .ci/apkbuild-lint.sh
   only:
     - merge_requests
   allow_failure: true
@@ -123,11 +105,9 @@ kernel-kconfig:
     changes:
       - device/*/linux-*/config-*
       - main/linux-*/config-*
-  before_script:
-    - wget "https://gitlab.com/postmarketOS/ci-common/-/raw/master/install_pmbootstrap.sh"
-    - sh ./install_pmbootstrap.sh pytest
   script:
-    - su pmos -c "pmbootstrap kconfig check"
+    - .ci/lib/gitlab_prepare_ci.sh
+    - .ci/kconfig.sh
 
 # MR settings
 # (Checks for "Allow commits from members who can merge to the target branch")
@@ -146,10 +126,8 @@ mr-settings:
   stage: build
   <<: *only-default
   before_script:
-    - wget "https://gitlab.com/postmarketOS/ci-common/-/raw/master/install_pmbootstrap.sh"
-    - sh ./install_pmbootstrap.sh
-  script:
-    - .ci/build.sh
+    - .ci/lib/gitlab_prepare_ci.sh
+  after_script:
     - cp -r /home/pmos/.local/var/pmbootstrap/packages/ packages/ || true
   artifacts:
     expire_in: 1 week
@@ -159,18 +137,30 @@ mr-settings:
 
 build-x86_64:
   extends: .build
+  script:
+    - .ci/build-x86_64.sh
 
 build-x86:
   extends: .build
+  script:
+    - .ci/build-x86.sh
 
 build-aarch64:
   extends: .build
+  script:
+    - .ci/build-aarch64.sh
 
 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

@@ -29,7 +29,7 @@ device/*/linux-google-veyron/			@jenneron
 device/*/u-boot-peach-pi/			@jenneron
 device/*/device-google-cozmo/			@jenneron
 device/*/u-boot-veyron-speedy/			@jenneron
-device/*/device-google-juniper/			@jenneron
+device/*/device-google-juniper/			@jenneron @binarycraft
 device/*/u-boot-peach-pit/			@jenneron
 device/*/device-google-damu/			@jenneron
 device/*/u-boot-nyan-4gb/			@jenneron
@@ -37,7 +37,7 @@ device/*/device-google-kenzo/			@jenneron
 device/*/device-google-kodama/			@jenneron
 device/*/u-boot-snow/				@jenneron
 device/*/device-google-kevin/			@jenneron
-device/*/linux-postmarketos-exynos5/		@jenneron
+device/*/linux-postmarketos-exynos5/		@jenneron @Grimler
 device/*/device-google-krane/			@jenneron
 device/*/soc-mediatek-mt8183/			@jenneron
 device/*/u-boot-veyron-minnie/			@jenneron
@@ -45,6 +45,7 @@ device/*/device-google-fennel14/		@jenneron
 device/*/linux-google-nyan/			@jenneron
 device/*/device-google-willow/			@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-hana/			@jenneron
@@ -56,13 +57,27 @@ device/*/device-google-kakadu/			@jenneron
 device/*/firmware-google-veyron-brcm/		@jenneron
 device/*/device-google-peach-pit/		@jenneron
 device/*/device-lg-judyp/			@jenneron
+device/*/device-asus-tf201/			@clamor95
+device/*/device-asus-tf300t/			@clamor95
+device/*/device-asus-tf300tg/			@clamor95
+device/*/device-asus-tf700t/			@clamor95
+device/*/device-lg-p895/			@clamor95
+device/*/firmware-asus-transformer/		@clamor95 @jenneron
+device/*/firmware-lg-x3/			@clamor95
+device/*/linux-postmarketos-grate/		@clamor95 @jenneron
+device/*/device-samsung-chagallwifi		@Grimler
+device/*/device-odroid-xu4			@Grimler
+device/*/device-samsung-klimtlte		@Grimler
+device/*/linux-samsung-klimtlte			@Grimler
+device/*/firmware-odroid-xu4			@Grimler
+device/*/linux-samsung-chagallwifi		@Grimler
 
 main/postmarketos-update-depthcharge-kernel/	@jenneron
 main/osk-sdl/					@craftyguy
 main/postmarketos-ui-plasma-mobile/ 		@bshah
 main/ttyescape					@calebccff
 temp/u-boot-librem5/				@craftyguy @bshah
-temp/alsa-ucm-conf-google-kukui/		@jenneron
+temp/alsa-ucm-conf-google-kukui/		@jenneron @binarycraft
 temp/alsa-ucm-conf-google-gru/			@jenneron
 
 # vim: ts=8 sw=4 et

channels.cfg

@@ -8,6 +8,12 @@ branch_pmaports=master
 branch_aports=master
 mirrordir_alpine=edge
 
+[v22.12]
+description=Upcoming stable release (DO NOT USE)
+branch_pmaports=v22.12
+branch_aports=3.17-stable
+mirrordir_alpine=v3.17
+
 [v22.06]
 description=Latest release / Recommended for best stability
 branch_pmaports=v22.06

cross/busybox-static-aarch64/APKBUILD

@@ -8,7 +8,7 @@ fi
 
 pkgname=busybox-static-aarch64
 pkgver=1.35.0
-pkgrel=27
+pkgrel=29
 
 _arch="aarch64"
 _mirror="http://dl-4.alpinelinux.org/alpine/"
@@ -32,5 +32,5 @@ package() {
 }
 
 sha512sums="
-1df3f1400461a3b9c951be9bf4ade500af9b83b4a11025bb244224cee197753d95471a8373a2f5f45d343599f632629c005dc7eba2c3d558dfbcfa56063ed110  busybox-static-1.35.0-r27-aarch64-edge.apk
+990d9149099ae2f3a8856d4041e7aff2a44ca69ebf6a0332b2d738598710b09401a1693c3fead9295fa0a36580b447bdac74df71c2c241b0c156a79448d1b861  busybox-static-1.35.0-r29-aarch64-edge.apk
 "

cross/busybox-static-armhf/APKBUILD

@@ -8,7 +8,7 @@ fi
 
 pkgname=busybox-static-armhf
 pkgver=1.35.0
-pkgrel=27
+pkgrel=29
 
 _arch="armhf"
 _mirror="http://dl-4.alpinelinux.org/alpine/"
@@ -32,5 +32,5 @@ package() {
 }
 
 sha512sums="
-cdc8cfb4e013ad0761d2417fba91f75221d97074705bcd4f8ae7a64d0badadff2340595b5d03ff0e5ca608f543ce85f4ba82820a4fd501ecb758d77432afcf90  busybox-static-1.35.0-r27-armhf-edge.apk
+6b7b76b2413e99af3f2f373a17cef24604e0f4b0077e1e8ecc2858e17510f8f55029f61e3bf62f4bdbc5c95954d5a12d47790a23e9d08d04ac1f4b4acf6cc096  busybox-static-1.35.0-r29-armhf-edge.apk
 "

cross/busybox-static-armv7/APKBUILD

@@ -8,7 +8,7 @@ fi
 
 pkgname=busybox-static-armv7
 pkgver=1.35.0
-pkgrel=27
+pkgrel=29
 
 _arch="armv7"
 _mirror="http://dl-4.alpinelinux.org/alpine/"
@@ -32,5 +32,5 @@ package() {
 }
 
 sha512sums="
-65678aa673f8fb11d0a68b7d22203ab9ce2795fb6b3d47c117f8cbecf61305316bb0b0de12812df5d7fe2febe0630fd6ca3961434ffe8051da6a0e194c133cb4  busybox-static-1.35.0-r27-armv7-edge.apk
+c808618d9a3f8ae05846276982e06000211b725123d9118426854569a35506e03fa89d8a234994affb822dae7e03c1f50295c069716ac30294e1d137b6353ab1  busybox-static-1.35.0-r29-armv7-edge.apk
 "

cross/gcc-aarch64/0034-Use-generic-errstr.go-implementation-on-musl.patch

@@ -1,45 +1,204 @@
-From 5093aa99f9cdded2e1ddf67b7139da6fac36b0a6 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?S=C3=B6ren=20Tempel?= <soeren+git@soeren-tempel.net>
-Date: Mon, 19 Apr 2021 07:21:41 +0200
-Subject: [PATCH] Use generic errstr.go implementation on musl
+From b3840bdcc0eee2a4d099a9af52199944ade7acb9 Mon Sep 17 00:00:00 2001
+From: Ian Lance Taylor <iant@golang.org>
+Date: Tue, 29 Nov 2022 17:28:44 -0800
+Subject: [PATCH] syscall, runtime: always call XSI strerror_r
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
 
-glibc provides two version of strerror_r() depending on a feature test
-macro. The first is the XSI-compliant version which returns an int, the
-second is GNU-specific and returns a char pointer.
+This does the right thing for either glibc or musl on GNU/Linux.
 
-Similarity, gcc's libgo provides two implementations of Errstr() both of
-which use strerror_r(). On Linux, it is assumed that the GNU-specific
-strerror_r version is used. However, musl only provides the
-XSI-compliant version of strerror_r. This patch enables the generic
-Errstr() implementation which also uses the XSI-compliant version of
-strerror_r.
+Based on patch by Sören Tempel.
+
+Change-Id: If2969e131f0fae456d58b35d839d8abe191fcc59
+Reviewed-on: https://go-review.googlesource.com/c/gofrontend/+/454176
+Reviewed-by: Cherry Mui <cherryyz@google.com>
+Reviewed-by: Ian Lance Taylor <iant@google.com>
+TryBot-Bypass: Ian Lance Taylor <iant@google.com>
 ---
- libgo/go/syscall/errstr.go       | 1 -
- libgo/go/syscall/errstr_glibc.go | 2 +-
- 2 files changed, 1 insertion(+), 2 deletions(-)
+ libgo/Makefile.am                |  1 +
+ libgo/Makefile.in                |  6 +++++-
+ libgo/go/syscall/errstr.go       | 22 ++++++++-----------
+ libgo/go/syscall/errstr_glibc.go | 33 ----------------------------
+ libgo/runtime/go-strerror.c      | 37 ++++++++++++++++++++++++++++++++
+ 5 files changed, 52 insertions(+), 47 deletions(-)
+ delete mode 100644 libgo/go/syscall/errstr_glibc.go
+ create mode 100644 libgo/runtime/go-strerror.c
 
+diff --git a/libgo/Makefile.am b/libgo/Makefile.am
+index e0a1eec5..df568743 100644
+--- a/libgo/Makefile.am
++++ b/libgo/Makefile.am
+@@ -465,6 +465,7 @@ runtime_files = \
+ 	runtime/go-nanotime.c \
+ 	runtime/go-now.c \
+ 	runtime/go-nosys.c \
++	runtime/go-strerror.c \
+ 	runtime/go-reflect-call.c \
+ 	runtime/go-setenv.c \
+ 	runtime/go-signal.c \
+diff --git a/libgo/Makefile.in b/libgo/Makefile.in
+index 7bef5df9..f2f3f0fc 100644
+--- a/libgo/Makefile.in
++++ b/libgo/Makefile.in
+@@ -247,7 +247,7 @@ am__objects_4 = runtime/aeshash.lo runtime/go-assert.lo \
+ 	runtime/go-fieldtrack.lo runtime/go-matherr.lo \
+ 	runtime/go-memclr.lo runtime/go-memmove.lo \
+ 	runtime/go-memequal.lo runtime/go-nanotime.lo \
+-	runtime/go-now.lo runtime/go-nosys.lo \
++	runtime/go-now.lo runtime/go-nosys.lo runtime/go-strerror.lo \
+ 	runtime/go-reflect-call.lo runtime/go-setenv.lo \
+ 	runtime/go-signal.lo runtime/go-unsafe-pointer.lo \
+ 	runtime/go-unsetenv.lo runtime/go-unwind.lo \
+@@ -917,6 +917,7 @@ runtime_files = \
+ 	runtime/go-nanotime.c \
+ 	runtime/go-now.c \
+ 	runtime/go-nosys.c \
++	runtime/go-strerror.c \
+ 	runtime/go-reflect-call.c \
+ 	runtime/go-setenv.c \
+ 	runtime/go-signal.c \
+@@ -1390,6 +1391,8 @@ runtime/go-now.lo: runtime/$(am__dirstamp) \
+ 	runtime/$(DEPDIR)/$(am__dirstamp)
+ runtime/go-nosys.lo: runtime/$(am__dirstamp) \
+ 	runtime/$(DEPDIR)/$(am__dirstamp)
++runtime/go-strerror.lo: runtime/$(am__dirstamp) \
++	runtime/$(DEPDIR)/$(am__dirstamp)
+ runtime/go-reflect-call.lo: runtime/$(am__dirstamp) \
+ 	runtime/$(DEPDIR)/$(am__dirstamp)
+ runtime/go-setenv.lo: runtime/$(am__dirstamp) \
+@@ -1457,6 +1460,7 @@ distclean-compile:
+ @AMDEP_TRUE@@am__include@ @am__quote@runtime/$(DEPDIR)/go-reflect-call.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@runtime/$(DEPDIR)/go-setenv.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@runtime/$(DEPDIR)/go-signal.Plo@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@runtime/$(DEPDIR)/go-strerror.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@runtime/$(DEPDIR)/go-unsafe-pointer.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@runtime/$(DEPDIR)/go-unsetenv.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@runtime/$(DEPDIR)/go-unwind.Plo@am__quote@
 diff --git a/libgo/go/syscall/errstr.go b/libgo/go/syscall/errstr.go
-index 6c2441d364d..8f7c5538163 100644
+index 6c2441d3..9f688e2a 100644
 --- a/libgo/go/syscall/errstr.go
 +++ b/libgo/go/syscall/errstr.go
-@@ -5,7 +5,6 @@
+@@ -4,23 +4,19 @@
+ // Use of this source code is governed by a BSD-style
  // license that can be found in the LICENSE file.
  
- // +build !hurd
+-// +build !hurd
 -// +build !linux
- 
+-
  package syscall
  
+-//sysnb	strerror_r(errnum int, buf []byte) (err Errno)
+-//strerror_r(errnum _C_int, buf *byte, buflen Size_t) _C_int
++import "internal/bytealg"
++
++//extern go_strerror
++func go_strerror(_C_int, *byte, Size_t) _C_int
+ 
+ func Errstr(errnum int) string {
+-	for len := 128; ; len *= 2 {
+-		b := make([]byte, len)
+-		errno := strerror_r(errnum, b)
++	for size := 128; ; size *= 2 {
++		b := make([]byte, size)
++		errno := go_strerror(_C_int(errnum), &b[0], Size_t(len(b)))
+ 		if errno == 0 {
+-			i := 0
+-			for b[i] != 0 {
+-				i++
+-			}
++			i := bytealg.IndexByte(b, 0)
+ 			// Lowercase first letter: Bad -> bad, but
+ 			// STREAM -> STREAM.
+ 			if i > 1 && 'A' <= b[0] && b[0] <= 'Z' && 'a' <= b[1] && b[1] <= 'z' {
+@@ -29,7 +25,7 @@ func Errstr(errnum int) string {
+ 			return string(b[:i])
+ 		}
+ 		if errno != ERANGE {
+-			return "errstr failure"
++			return "strerror_r failure"
+ 		}
+ 	}
+ }
 diff --git a/libgo/go/syscall/errstr_glibc.go b/libgo/go/syscall/errstr_glibc.go
-index 5b19e6f202d..8dc60172186 100644
+deleted file mode 100644
+index 5b19e6f2..00000000
 --- a/libgo/go/syscall/errstr_glibc.go
-+++ b/libgo/go/syscall/errstr_glibc.go
-@@ -7,7 +7,7 @@
- // We use this rather than errstr.go because on GNU/Linux sterror_r
- // returns a pointer to the error message, and may not use buf at all.
- 
++++ /dev/null
+@@ -1,33 +0,0 @@
+-// errstr_glibc.go -- GNU/Linux and GNU/Hurd specific error strings.
+-
+-// Copyright 2010 The Go Authors. All rights reserved.
+-// Use of this source code is governed by a BSD-style
+-// license that can be found in the LICENSE file.
+-
+-// We use this rather than errstr.go because on GNU/Linux sterror_r
+-// returns a pointer to the error message, and may not use buf at all.
+-
 -// +build hurd linux
-+// +build hurd !linux
- 
- package syscall
- 
+-
+-package syscall
+-
+-import "unsafe"
+-
+-//sysnb	strerror_r(errnum int, b []byte) (errstr *byte)
+-//strerror_r(errnum _C_int, b *byte, len Size_t) *byte
+-
+-func Errstr(errnum int) string {
+-	a := make([]byte, 128)
+-	p := strerror_r(errnum, a)
+-	b := (*[1000]byte)(unsafe.Pointer(p))
+-	i := 0
+-	for b[i] != 0 {
+-		i++
+-	}
+-	// Lowercase first letter: Bad -> bad, but STREAM -> STREAM.
+-	if i > 1 && 'A' <= b[0] && b[0] <= 'Z' && 'a' <= b[1] && b[1] <= 'z' {
+-		c := b[0] + 'a' - 'A'
+-		return string(c) + string(b[1:i])
+-	}
+-	return string(b[:i])
+-}
+diff --git a/libgo/runtime/go-strerror.c b/libgo/runtime/go-strerror.c
+new file mode 100644
+index 00000000..13d1d91d
+--- /dev/null
++++ b/libgo/runtime/go-strerror.c
+@@ -0,0 +1,37 @@
++/* go-strerror.c -- wrapper around XSI-compliant strerror_r.
++
++   Copyright 2022 The Go Authors. All rights reserved.
++   Use of this source code is governed by a BSD-style
++   license that can be found in the LICENSE file.  */
++
++/* There are two version of strerror_r on GNU/Linux: a GNU-specific
++   and an XSI-compliant version.  The former version is only available
++   on glibc.  Since glibc 2.13, the XSI-compliant version is also
++   provided by glibc if _GNU_SOURCE is not defined.  Since the
++   entirety of gofrontend is compiled with _GNU_SOURCE, this file
++   exists to selectively undefine it and provides an alias to the
++   XSI-compliant version of strerror_r(3).  */
++
++#ifdef __linux__
++
++/* Force selection of XSI-compliant strerror_r by glibc.  */
++#undef XOPEN_SOURCE
++#define XOPEN_SOURCE 600
++#undef _POSIX_C_SOURCE
++#define _POSIX_C_SOURCE 200112L
++#undef _GNU_SOURCE
++
++#endif /* __linux__ */
++
++#include <string.h>
++
++#ifndef HAVE_STRERROR_R
++// Provided by go-nosys.c if not provided by libc itself.
++extern int strerror_r (int, char *, size_t);
++#endif
++
++int
++go_strerror (int errnum, char *buf, size_t buflen)
++{
++  return strerror_r (errnum, buf, buflen);
++}

cross/gcc-aarch64/0039-gcc-go-Use-int64-type-as-offset-argument-for-mmap.patch

@@ -1,22 +1,26 @@
-From 4b6240d5301ce04b8bbc3e2152915cbc7da80584 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?S=C3=B6ren=20Tempel?= <soeren+git@soeren-tempel.net>
-Date: Wed, 28 Sep 2022 17:30:14 +0200
-Subject: [PATCH] libgo: use _off_t for mmap offset argument
+From 5e658f4659c551330ea68f5667e4f951b218f32d Mon Sep 17 00:00:00 2001
+From: Ian Lance Taylor <iant@golang.org>
+Date: Wed, 26 Oct 2022 17:23:42 -0700
+Subject: [PATCH] runtime: use _libgo_off_t_type when calling C mmap
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
 
-On glibc-based systems, off_t is a 32-bit type on 32-bit systems and a
-64-bit type on 64-bit systems by default. However, on systems using musl
-libc off_t is unconditionally a 64-bit type. As such, it is insufficient
-to use a uintptr type for the mmap offset parameter.
+The last argument to the C mmap function is type off_t, not uintptr.
+On some 32-bit systems, off_t is larger than uintptr.
 
-Presently, the (incorrect) mmap declaration causes a libgo run-time
-failure on 32-bit musl systems (fatal error: runtime: cannot allocate
-memory). This commit fixes this run-time error.
+Based on patch by Sören Tempel.
+
+Change-Id: Ib6f9d5bcd4734f99a72889e2282b97ec3c8fbd34
+Reviewed-on: https://go-review.googlesource.com/c/gofrontend/+/445735
+Reviewed-by: Cherry Mui <cherryyz@google.com>
+Reviewed-by: Than McIntosh <thanm@google.com>
 ---
- libgo/go/runtime/mem_gccgo.go | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
+ libgo/go/runtime/mem_gccgo.go | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
 
 diff --git a/libgo/go/runtime/mem_gccgo.go b/libgo/go/runtime/mem_gccgo.go
-index fa3389d8..07bf325a 100644
+index fa3389d8..1e84f4f5 100644
 --- a/libgo/go/runtime/mem_gccgo.go
 +++ b/libgo/go/runtime/mem_gccgo.go
 @@ -15,7 +15,7 @@ import (
@@ -24,7 +28,7 @@ index fa3389d8..07bf325a 100644
  
  //extern mmap
 -func sysMmap(addr unsafe.Pointer, n uintptr, prot, flags, fd int32, off uintptr) unsafe.Pointer
-+func sysMmap(addr unsafe.Pointer, n uintptr, prot, flags, fd int32, off _off_t) unsafe.Pointer
++func sysMmap(addr unsafe.Pointer, n uintptr, prot, flags, fd int32, off _libgo_off_t_type) unsafe.Pointer
  
  //extern munmap
  func munmap(addr unsafe.Pointer, length uintptr) int32
@@ -33,7 +37,23 @@ index fa3389d8..07bf325a 100644
  
  func mmap(addr unsafe.Pointer, n uintptr, prot, flags, fd int32, off uintptr) (unsafe.Pointer, int) {
 -	p := sysMmap(addr, n, prot, flags, fd, off)
-+	p := sysMmap(addr, n, prot, flags, fd, _off_t(off))
++	p := sysMmap(addr, n, prot, flags, fd, _libgo_off_t_type(off))
  	if uintptr(p) == _MAP_FAILED {
  		return nil, errno()
  	}
+@@ -47,6 +47,7 @@ func mmap(addr unsafe.Pointer, n uintptr, prot, flags, fd int32, off uintptr) (u
+ 
+ // Don't split the stack as this method may be invoked without a valid G, which
+ // prevents us from allocating more stack.
++//
+ //go:nosplit
+ func sysAlloc(n uintptr, sysStat *sysMemStat) unsafe.Pointer {
+ 	p, err := mmap(nil, n, _PROT_READ|_PROT_WRITE, _MAP_ANON|_MAP_PRIVATE, mmapFD, 0)
+@@ -165,6 +166,7 @@ func sysHugePage(v unsafe.Pointer, n uintptr) {
+ 
+ // Don't split the stack as this function may be invoked without a valid G,
+ // which prevents us from allocating more stack.
++//
+ //go:nosplit
+ func sysFree(v unsafe.Pointer, n uintptr, sysStat *sysMemStat) {
+ 	sysStat.add(-int64(n))

cross/gcc-aarch64/APKBUILD

@@ -32,7 +32,7 @@ pkgver=${_pkgbase}_git${_pkgsnap}
 [ "$CHOST" != "$CTARGET" ] && _target="-$CTARGET_ARCH" || _target=""
 
 pkgname=gcc-aarch64
-pkgrel=4
+pkgrel=5
 pkgdesc="Stage2 cross-compiler for aarch64"
 url="https://gcc.gnu.org"
 arch="x86_64"
@@ -795,11 +795,11 @@ b40d7e4712c035674c993bbb55475290ec14523b3f0fd05493514bac4e9adaa6641faf815fc40ffc
 f060687adcd5297124e4000f1ba1e3fd5d7d124da04d948cbd0d4a6c69a90a2b29a4a0dbbe13a83ab6950724f434de012b681bdbcdf53c0100b40fe3d00f2f2f  0028-ada-libgnarl-compatibility-for-musl.patch
 5160bae68e20a1966c1f6d655ee98af759e9b9ee842718ae6007d467b418e1cf3b307528a0841477b5259671ce868521b06c0f2e947b7b8f3a398c53dd978252  0029-ada-musl-support-fixes.patch
 3c04b26554a78096296ca9542c77a91219bd26044dd2cb2006db4c1944889a97c215900b3828ba7e8c675162406db543605a815bdfbd915bf810663b1b253bdd  0033-gcc-go-link-to-libucontext.patch
-699dc3641099da6136dd3689f06c6553c03b3a85acf83a3fce1beb5425065b3e378535ca9e9100a120fdbafc34871d61c063fd5328a49cd87a15a989ed51706d  0034-Use-generic-errstr.go-implementation-on-musl.patch
+141c0428f988cbd102000d4db8d4150485f6da5c064469493ea378cd579bed99330658f41fe106c0d07d1c1aa436ec3f864403ed1ba79f791a1d727b42d46910  0034-Use-generic-errstr.go-implementation-on-musl.patch
 d9ba710f770e053c8f212e821817c188091a829658050b9ab5906388553ec60fec37943ea43c270e92a9014902949f3c98fc4639032d92b8145b375bb29e193e  0035-configure-Add-enable-autolink-libatomic-use-in-LINK_.patch
 ab90d8fdd977d6cd3da096a1c76d77be3e89a020b2127247771711a32eb608cceed21834ef488ab4b69bb0f408b098fdfb61630819e3d1a1e57d5af67800ee74  0036-configure-fix-detection-of-atomic-builtins-in-libato.patch
 8bc6823f0b3c66f7b73d7ddb64ffa6930463285c2e9a14a2bc1882bcc4271144eaa1107d713294699caf9481648163cbf43921a2b8e4ac0d55c78a804bae8a3d  0037-libgo-Recognize-off64_t-and-loff_t-definitions-of-mu.patch
-e9699f4721778869eb3a8fef2c679208ef5b98584892f30b0e1cb5dc1669f8158198d7792659b1b56c381baf62247d21990dcced9178547affd5d6bfb2d12548  0039-gcc-go-Use-int64-type-as-offset-argument-for-mmap.patch
+f0744c01859e67deed404c97e1870b2876935fdc467e51980373744936574c314d5d21134734c5d515e7f3cd3483ef98045b9bbcd81c568c6038fac96ffb5fa0  0039-gcc-go-Use-int64-type-as-offset-argument-for-mmap.patch
 d6dc1bfb881a313d167aaa5658790b0f55eea4336c408cfc6613dd5783440dafd0d37c43031a5f3e69be40f632e38371cd4fb6e5f0494ac4ea4d7d5025d2ae02  0041-go-gospec-forcibly-disable-fsplit-stack-support.patch
 684c6a6d52512b973429b6e709966439ac1e174f9e79a33d4a638b452245b457b34752b4b4034ba983f6a712f86522e7adf715bab00a6603f64a12139c5b1e39  0042-gcc-go-fix-build-error-with-SYS_SECCOMP.patch
 25014dfa99d96ee70ce0ad22e9f7974f0a51cc50b3b9c2db49df50774c8cd29e497ceed120486bee50be83bfb07f2009ed310eb9b0543f2795bd7359b87eadd2  0043-libstdc-do-not-throw-exceptions-for-non-C-locales-on.patch

cross/gcc-armhf/0034-Use-generic-errstr.go-implementation-on-musl.patch

@@ -1,45 +1,204 @@
-From 5093aa99f9cdded2e1ddf67b7139da6fac36b0a6 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?S=C3=B6ren=20Tempel?= <soeren+git@soeren-tempel.net>
-Date: Mon, 19 Apr 2021 07:21:41 +0200
-Subject: [PATCH] Use generic errstr.go implementation on musl
+From b3840bdcc0eee2a4d099a9af52199944ade7acb9 Mon Sep 17 00:00:00 2001
+From: Ian Lance Taylor <iant@golang.org>
+Date: Tue, 29 Nov 2022 17:28:44 -0800
+Subject: [PATCH] syscall, runtime: always call XSI strerror_r
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
 
-glibc provides two version of strerror_r() depending on a feature test
-macro. The first is the XSI-compliant version which returns an int, the
-second is GNU-specific and returns a char pointer.
+This does the right thing for either glibc or musl on GNU/Linux.
 
-Similarity, gcc's libgo provides two implementations of Errstr() both of
-which use strerror_r(). On Linux, it is assumed that the GNU-specific
-strerror_r version is used. However, musl only provides the
-XSI-compliant version of strerror_r. This patch enables the generic
-Errstr() implementation which also uses the XSI-compliant version of
-strerror_r.
+Based on patch by Sören Tempel.
+
+Change-Id: If2969e131f0fae456d58b35d839d8abe191fcc59
+Reviewed-on: https://go-review.googlesource.com/c/gofrontend/+/454176
+Reviewed-by: Cherry Mui <cherryyz@google.com>
+Reviewed-by: Ian Lance Taylor <iant@google.com>
+TryBot-Bypass: Ian Lance Taylor <iant@google.com>
 ---
- libgo/go/syscall/errstr.go       | 1 -
- libgo/go/syscall/errstr_glibc.go | 2 +-
- 2 files changed, 1 insertion(+), 2 deletions(-)
+ libgo/Makefile.am                |  1 +
+ libgo/Makefile.in                |  6 +++++-
+ libgo/go/syscall/errstr.go       | 22 ++++++++-----------
+ libgo/go/syscall/errstr_glibc.go | 33 ----------------------------
+ libgo/runtime/go-strerror.c      | 37 ++++++++++++++++++++++++++++++++
+ 5 files changed, 52 insertions(+), 47 deletions(-)
+ delete mode 100644 libgo/go/syscall/errstr_glibc.go
+ create mode 100644 libgo/runtime/go-strerror.c
 
+diff --git a/libgo/Makefile.am b/libgo/Makefile.am
+index e0a1eec5..df568743 100644
+--- a/libgo/Makefile.am
++++ b/libgo/Makefile.am
+@@ -465,6 +465,7 @@ runtime_files = \
+ 	runtime/go-nanotime.c \
+ 	runtime/go-now.c \
+ 	runtime/go-nosys.c \
++	runtime/go-strerror.c \
+ 	runtime/go-reflect-call.c \
+ 	runtime/go-setenv.c \
+ 	runtime/go-signal.c \
+diff --git a/libgo/Makefile.in b/libgo/Makefile.in
+index 7bef5df9..f2f3f0fc 100644
+--- a/libgo/Makefile.in
++++ b/libgo/Makefile.in
+@@ -247,7 +247,7 @@ am__objects_4 = runtime/aeshash.lo runtime/go-assert.lo \
+ 	runtime/go-fieldtrack.lo runtime/go-matherr.lo \
+ 	runtime/go-memclr.lo runtime/go-memmove.lo \
+ 	runtime/go-memequal.lo runtime/go-nanotime.lo \
+-	runtime/go-now.lo runtime/go-nosys.lo \
++	runtime/go-now.lo runtime/go-nosys.lo runtime/go-strerror.lo \
+ 	runtime/go-reflect-call.lo runtime/go-setenv.lo \
+ 	runtime/go-signal.lo runtime/go-unsafe-pointer.lo \
+ 	runtime/go-unsetenv.lo runtime/go-unwind.lo \
+@@ -917,6 +917,7 @@ runtime_files = \
+ 	runtime/go-nanotime.c \
+ 	runtime/go-now.c \
+ 	runtime/go-nosys.c \
++	runtime/go-strerror.c \
+ 	runtime/go-reflect-call.c \
+ 	runtime/go-setenv.c \
+ 	runtime/go-signal.c \
+@@ -1390,6 +1391,8 @@ runtime/go-now.lo: runtime/$(am__dirstamp) \
+ 	runtime/$(DEPDIR)/$(am__dirstamp)
+ runtime/go-nosys.lo: runtime/$(am__dirstamp) \
+ 	runtime/$(DEPDIR)/$(am__dirstamp)
++runtime/go-strerror.lo: runtime/$(am__dirstamp) \
++	runtime/$(DEPDIR)/$(am__dirstamp)
+ runtime/go-reflect-call.lo: runtime/$(am__dirstamp) \
+ 	runtime/$(DEPDIR)/$(am__dirstamp)
+ runtime/go-setenv.lo: runtime/$(am__dirstamp) \
+@@ -1457,6 +1460,7 @@ distclean-compile:
+ @AMDEP_TRUE@@am__include@ @am__quote@runtime/$(DEPDIR)/go-reflect-call.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@runtime/$(DEPDIR)/go-setenv.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@runtime/$(DEPDIR)/go-signal.Plo@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@runtime/$(DEPDIR)/go-strerror.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@runtime/$(DEPDIR)/go-unsafe-pointer.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@runtime/$(DEPDIR)/go-unsetenv.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@runtime/$(DEPDIR)/go-unwind.Plo@am__quote@
 diff --git a/libgo/go/syscall/errstr.go b/libgo/go/syscall/errstr.go
-index 6c2441d364d..8f7c5538163 100644
+index 6c2441d3..9f688e2a 100644
 --- a/libgo/go/syscall/errstr.go
 +++ b/libgo/go/syscall/errstr.go
-@@ -5,7 +5,6 @@
+@@ -4,23 +4,19 @@
+ // Use of this source code is governed by a BSD-style
  // license that can be found in the LICENSE file.
  
- // +build !hurd
+-// +build !hurd
 -// +build !linux
- 
+-
  package syscall
  
+-//sysnb	strerror_r(errnum int, buf []byte) (err Errno)
+-//strerror_r(errnum _C_int, buf *byte, buflen Size_t) _C_int
++import "internal/bytealg"
++
++//extern go_strerror
++func go_strerror(_C_int, *byte, Size_t) _C_int
+ 
+ func Errstr(errnum int) string {
+-	for len := 128; ; len *= 2 {
+-		b := make([]byte, len)
+-		errno := strerror_r(errnum, b)
++	for size := 128; ; size *= 2 {
++		b := make([]byte, size)
++		errno := go_strerror(_C_int(errnum), &b[0], Size_t(len(b)))
+ 		if errno == 0 {
+-			i := 0
+-			for b[i] != 0 {
+-				i++
+-			}
++			i := bytealg.IndexByte(b, 0)
+ 			// Lowercase first letter: Bad -> bad, but
+ 			// STREAM -> STREAM.
+ 			if i > 1 && 'A' <= b[0] && b[0] <= 'Z' && 'a' <= b[1] && b[1] <= 'z' {
+@@ -29,7 +25,7 @@ func Errstr(errnum int) string {
+ 			return string(b[:i])
+ 		}
+ 		if errno != ERANGE {
+-			return "errstr failure"
++			return "strerror_r failure"
+ 		}
+ 	}
+ }
 diff --git a/libgo/go/syscall/errstr_glibc.go b/libgo/go/syscall/errstr_glibc.go
-index 5b19e6f202d..8dc60172186 100644
+deleted file mode 100644
+index 5b19e6f2..00000000
 --- a/libgo/go/syscall/errstr_glibc.go
-+++ b/libgo/go/syscall/errstr_glibc.go
-@@ -7,7 +7,7 @@
- // We use this rather than errstr.go because on GNU/Linux sterror_r
- // returns a pointer to the error message, and may not use buf at all.
- 
++++ /dev/null
+@@ -1,33 +0,0 @@
+-// errstr_glibc.go -- GNU/Linux and GNU/Hurd specific error strings.
+-
+-// Copyright 2010 The Go Authors. All rights reserved.
+-// Use of this source code is governed by a BSD-style
+-// license that can be found in the LICENSE file.
+-
+-// We use this rather than errstr.go because on GNU/Linux sterror_r
+-// returns a pointer to the error message, and may not use buf at all.
+-
 -// +build hurd linux
-+// +build hurd !linux
- 
- package syscall
- 
+-
+-package syscall
+-
+-import "unsafe"
+-
+-//sysnb	strerror_r(errnum int, b []byte) (errstr *byte)
+-//strerror_r(errnum _C_int, b *byte, len Size_t) *byte
+-
+-func Errstr(errnum int) string {
+-	a := make([]byte, 128)
+-	p := strerror_r(errnum, a)
+-	b := (*[1000]byte)(unsafe.Pointer(p))
+-	i := 0
+-	for b[i] != 0 {
+-		i++
+-	}
+-	// Lowercase first letter: Bad -> bad, but STREAM -> STREAM.
+-	if i > 1 && 'A' <= b[0] && b[0] <= 'Z' && 'a' <= b[1] && b[1] <= 'z' {
+-		c := b[0] + 'a' - 'A'
+-		return string(c) + string(b[1:i])
+-	}
+-	return string(b[:i])
+-}
+diff --git a/libgo/runtime/go-strerror.c b/libgo/runtime/go-strerror.c
+new file mode 100644
+index 00000000..13d1d91d
+--- /dev/null
++++ b/libgo/runtime/go-strerror.c
+@@ -0,0 +1,37 @@
++/* go-strerror.c -- wrapper around XSI-compliant strerror_r.
++
++   Copyright 2022 The Go Authors. All rights reserved.
++   Use of this source code is governed by a BSD-style
++   license that can be found in the LICENSE file.  */
++
++/* There are two version of strerror_r on GNU/Linux: a GNU-specific
++   and an XSI-compliant version.  The former version is only available
++   on glibc.  Since glibc 2.13, the XSI-compliant version is also
++   provided by glibc if _GNU_SOURCE is not defined.  Since the
++   entirety of gofrontend is compiled with _GNU_SOURCE, this file
++   exists to selectively undefine it and provides an alias to the
++   XSI-compliant version of strerror_r(3).  */
++
++#ifdef __linux__
++
++/* Force selection of XSI-compliant strerror_r by glibc.  */
++#undef XOPEN_SOURCE
++#define XOPEN_SOURCE 600
++#undef _POSIX_C_SOURCE
++#define _POSIX_C_SOURCE 200112L
++#undef _GNU_SOURCE
++
++#endif /* __linux__ */
++
++#include <string.h>
++
++#ifndef HAVE_STRERROR_R
++// Provided by go-nosys.c if not provided by libc itself.
++extern int strerror_r (int, char *, size_t);
++#endif
++
++int
++go_strerror (int errnum, char *buf, size_t buflen)
++{
++  return strerror_r (errnum, buf, buflen);
++}

cross/gcc-armhf/0039-gcc-go-Use-int64-type-as-offset-argument-for-mmap.patch

@@ -1,22 +1,26 @@
-From 4b6240d5301ce04b8bbc3e2152915cbc7da80584 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?S=C3=B6ren=20Tempel?= <soeren+git@soeren-tempel.net>
-Date: Wed, 28 Sep 2022 17:30:14 +0200
-Subject: [PATCH] libgo: use _off_t for mmap offset argument
+From 5e658f4659c551330ea68f5667e4f951b218f32d Mon Sep 17 00:00:00 2001
+From: Ian Lance Taylor <iant@golang.org>
+Date: Wed, 26 Oct 2022 17:23:42 -0700
+Subject: [PATCH] runtime: use _libgo_off_t_type when calling C mmap
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
 
-On glibc-based systems, off_t is a 32-bit type on 32-bit systems and a
-64-bit type on 64-bit systems by default. However, on systems using musl
-libc off_t is unconditionally a 64-bit type. As such, it is insufficient
-to use a uintptr type for the mmap offset parameter.
+The last argument to the C mmap function is type off_t, not uintptr.
+On some 32-bit systems, off_t is larger than uintptr.
 
-Presently, the (incorrect) mmap declaration causes a libgo run-time
-failure on 32-bit musl systems (fatal error: runtime: cannot allocate
-memory). This commit fixes this run-time error.
+Based on patch by Sören Tempel.
+
+Change-Id: Ib6f9d5bcd4734f99a72889e2282b97ec3c8fbd34
+Reviewed-on: https://go-review.googlesource.com/c/gofrontend/+/445735
+Reviewed-by: Cherry Mui <cherryyz@google.com>
+Reviewed-by: Than McIntosh <thanm@google.com>
 ---
- libgo/go/runtime/mem_gccgo.go | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
+ libgo/go/runtime/mem_gccgo.go | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
 
 diff --git a/libgo/go/runtime/mem_gccgo.go b/libgo/go/runtime/mem_gccgo.go
-index fa3389d8..07bf325a 100644
+index fa3389d8..1e84f4f5 100644
 --- a/libgo/go/runtime/mem_gccgo.go
 +++ b/libgo/go/runtime/mem_gccgo.go
 @@ -15,7 +15,7 @@ import (
@@ -24,7 +28,7 @@ index fa3389d8..07bf325a 100644
  
  //extern mmap
 -func sysMmap(addr unsafe.Pointer, n uintptr, prot, flags, fd int32, off uintptr) unsafe.Pointer
-+func sysMmap(addr unsafe.Pointer, n uintptr, prot, flags, fd int32, off _off_t) unsafe.Pointer
++func sysMmap(addr unsafe.Pointer, n uintptr, prot, flags, fd int32, off _libgo_off_t_type) unsafe.Pointer
  
  //extern munmap
  func munmap(addr unsafe.Pointer, length uintptr) int32
@@ -33,7 +37,23 @@ index fa3389d8..07bf325a 100644
  
  func mmap(addr unsafe.Pointer, n uintptr, prot, flags, fd int32, off uintptr) (unsafe.Pointer, int) {
 -	p := sysMmap(addr, n, prot, flags, fd, off)
-+	p := sysMmap(addr, n, prot, flags, fd, _off_t(off))
++	p := sysMmap(addr, n, prot, flags, fd, _libgo_off_t_type(off))
  	if uintptr(p) == _MAP_FAILED {
  		return nil, errno()
  	}
+@@ -47,6 +47,7 @@ func mmap(addr unsafe.Pointer, n uintptr, prot, flags, fd int32, off uintptr) (u
+ 
+ // Don't split the stack as this method may be invoked without a valid G, which
+ // prevents us from allocating more stack.
++//
+ //go:nosplit
+ func sysAlloc(n uintptr, sysStat *sysMemStat) unsafe.Pointer {
+ 	p, err := mmap(nil, n, _PROT_READ|_PROT_WRITE, _MAP_ANON|_MAP_PRIVATE, mmapFD, 0)
+@@ -165,6 +166,7 @@ func sysHugePage(v unsafe.Pointer, n uintptr) {
+ 
+ // Don't split the stack as this function may be invoked without a valid G,
+ // which prevents us from allocating more stack.
++//
+ //go:nosplit
+ func sysFree(v unsafe.Pointer, n uintptr, sysStat *sysMemStat) {
+ 	sysStat.add(-int64(n))

cross/gcc-armhf/APKBUILD

@@ -32,7 +32,7 @@ pkgver=${_pkgbase}_git${_pkgsnap}
 [ "$CHOST" != "$CTARGET" ] && _target="-$CTARGET_ARCH" || _target=""
 
 pkgname=gcc-armhf
-pkgrel=4
+pkgrel=5
 pkgdesc="Stage2 cross-compiler for armhf"
 url="https://gcc.gnu.org"
 arch="x86_64"
@@ -795,11 +795,11 @@ b40d7e4712c035674c993bbb55475290ec14523b3f0fd05493514bac4e9adaa6641faf815fc40ffc
 f060687adcd5297124e4000f1ba1e3fd5d7d124da04d948cbd0d4a6c69a90a2b29a4a0dbbe13a83ab6950724f434de012b681bdbcdf53c0100b40fe3d00f2f2f  0028-ada-libgnarl-compatibility-for-musl.patch
 5160bae68e20a1966c1f6d655ee98af759e9b9ee842718ae6007d467b418e1cf3b307528a0841477b5259671ce868521b06c0f2e947b7b8f3a398c53dd978252  0029-ada-musl-support-fixes.patch
 3c04b26554a78096296ca9542c77a91219bd26044dd2cb2006db4c1944889a97c215900b3828ba7e8c675162406db543605a815bdfbd915bf810663b1b253bdd  0033-gcc-go-link-to-libucontext.patch
-699dc3641099da6136dd3689f06c6553c03b3a85acf83a3fce1beb5425065b3e378535ca9e9100a120fdbafc34871d61c063fd5328a49cd87a15a989ed51706d  0034-Use-generic-errstr.go-implementation-on-musl.patch
+141c0428f988cbd102000d4db8d4150485f6da5c064469493ea378cd579bed99330658f41fe106c0d07d1c1aa436ec3f864403ed1ba79f791a1d727b42d46910  0034-Use-generic-errstr.go-implementation-on-musl.patch
 d9ba710f770e053c8f212e821817c188091a829658050b9ab5906388553ec60fec37943ea43c270e92a9014902949f3c98fc4639032d92b8145b375bb29e193e  0035-configure-Add-enable-autolink-libatomic-use-in-LINK_.patch
 ab90d8fdd977d6cd3da096a1c76d77be3e89a020b2127247771711a32eb608cceed21834ef488ab4b69bb0f408b098fdfb61630819e3d1a1e57d5af67800ee74  0036-configure-fix-detection-of-atomic-builtins-in-libato.patch
 8bc6823f0b3c66f7b73d7ddb64ffa6930463285c2e9a14a2bc1882bcc4271144eaa1107d713294699caf9481648163cbf43921a2b8e4ac0d55c78a804bae8a3d  0037-libgo-Recognize-off64_t-and-loff_t-definitions-of-mu.patch
-e9699f4721778869eb3a8fef2c679208ef5b98584892f30b0e1cb5dc1669f8158198d7792659b1b56c381baf62247d21990dcced9178547affd5d6bfb2d12548  0039-gcc-go-Use-int64-type-as-offset-argument-for-mmap.patch
+f0744c01859e67deed404c97e1870b2876935fdc467e51980373744936574c314d5d21134734c5d515e7f3cd3483ef98045b9bbcd81c568c6038fac96ffb5fa0  0039-gcc-go-Use-int64-type-as-offset-argument-for-mmap.patch
 d6dc1bfb881a313d167aaa5658790b0f55eea4336c408cfc6613dd5783440dafd0d37c43031a5f3e69be40f632e38371cd4fb6e5f0494ac4ea4d7d5025d2ae02  0041-go-gospec-forcibly-disable-fsplit-stack-support.patch
 684c6a6d52512b973429b6e709966439ac1e174f9e79a33d4a638b452245b457b34752b4b4034ba983f6a712f86522e7adf715bab00a6603f64a12139c5b1e39  0042-gcc-go-fix-build-error-with-SYS_SECCOMP.patch
 25014dfa99d96ee70ce0ad22e9f7974f0a51cc50b3b9c2db49df50774c8cd29e497ceed120486bee50be83bfb07f2009ed310eb9b0543f2795bd7359b87eadd2  0043-libstdc-do-not-throw-exceptions-for-non-C-locales-on.patch

cross/gcc-armv7/0034-Use-generic-errstr.go-implementation-on-musl.patch

@@ -1,45 +1,204 @@
-From 5093aa99f9cdded2e1ddf67b7139da6fac36b0a6 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?S=C3=B6ren=20Tempel?= <soeren+git@soeren-tempel.net>
-Date: Mon, 19 Apr 2021 07:21:41 +0200
-Subject: [PATCH] Use generic errstr.go implementation on musl
+From b3840bdcc0eee2a4d099a9af52199944ade7acb9 Mon Sep 17 00:00:00 2001
+From: Ian Lance Taylor <iant@golang.org>
+Date: Tue, 29 Nov 2022 17:28:44 -0800
+Subject: [PATCH] syscall, runtime: always call XSI strerror_r
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
 
-glibc provides two version of strerror_r() depending on a feature test
-macro. The first is the XSI-compliant version which returns an int, the
-second is GNU-specific and returns a char pointer.
+This does the right thing for either glibc or musl on GNU/Linux.
 
-Similarity, gcc's libgo provides two implementations of Errstr() both of
-which use strerror_r(). On Linux, it is assumed that the GNU-specific
-strerror_r version is used. However, musl only provides the
-XSI-compliant version of strerror_r. This patch enables the generic
-Errstr() implementation which also uses the XSI-compliant version of
-strerror_r.
+Based on patch by Sören Tempel.
+
+Change-Id: If2969e131f0fae456d58b35d839d8abe191fcc59
+Reviewed-on: https://go-review.googlesource.com/c/gofrontend/+/454176
+Reviewed-by: Cherry Mui <cherryyz@google.com>
+Reviewed-by: Ian Lance Taylor <iant@google.com>
+TryBot-Bypass: Ian Lance Taylor <iant@google.com>
 ---
- libgo/go/syscall/errstr.go       | 1 -
- libgo/go/syscall/errstr_glibc.go | 2 +-
- 2 files changed, 1 insertion(+), 2 deletions(-)
+ libgo/Makefile.am                |  1 +
+ libgo/Makefile.in                |  6 +++++-
+ libgo/go/syscall/errstr.go       | 22 ++++++++-----------
+ libgo/go/syscall/errstr_glibc.go | 33 ----------------------------
+ libgo/runtime/go-strerror.c      | 37 ++++++++++++++++++++++++++++++++
+ 5 files changed, 52 insertions(+), 47 deletions(-)
+ delete mode 100644 libgo/go/syscall/errstr_glibc.go
+ create mode 100644 libgo/runtime/go-strerror.c
 
+diff --git a/libgo/Makefile.am b/libgo/Makefile.am
+index e0a1eec5..df568743 100644
+--- a/libgo/Makefile.am
++++ b/libgo/Makefile.am
+@@ -465,6 +465,7 @@ runtime_files = \
+ 	runtime/go-nanotime.c \
+ 	runtime/go-now.c \
+ 	runtime/go-nosys.c \
++	runtime/go-strerror.c \
+ 	runtime/go-reflect-call.c \
+ 	runtime/go-setenv.c \
+ 	runtime/go-signal.c \
+diff --git a/libgo/Makefile.in b/libgo/Makefile.in
+index 7bef5df9..f2f3f0fc 100644
+--- a/libgo/Makefile.in
++++ b/libgo/Makefile.in
+@@ -247,7 +247,7 @@ am__objects_4 = runtime/aeshash.lo runtime/go-assert.lo \
+ 	runtime/go-fieldtrack.lo runtime/go-matherr.lo \
+ 	runtime/go-memclr.lo runtime/go-memmove.lo \
+ 	runtime/go-memequal.lo runtime/go-nanotime.lo \
+-	runtime/go-now.lo runtime/go-nosys.lo \
++	runtime/go-now.lo runtime/go-nosys.lo runtime/go-strerror.lo \
+ 	runtime/go-reflect-call.lo runtime/go-setenv.lo \
+ 	runtime/go-signal.lo runtime/go-unsafe-pointer.lo \
+ 	runtime/go-unsetenv.lo runtime/go-unwind.lo \
+@@ -917,6 +917,7 @@ runtime_files = \
+ 	runtime/go-nanotime.c \
+ 	runtime/go-now.c \
+ 	runtime/go-nosys.c \
++	runtime/go-strerror.c \
+ 	runtime/go-reflect-call.c \
+ 	runtime/go-setenv.c \
+ 	runtime/go-signal.c \
+@@ -1390,6 +1391,8 @@ runtime/go-now.lo: runtime/$(am__dirstamp) \
+ 	runtime/$(DEPDIR)/$(am__dirstamp)
+ runtime/go-nosys.lo: runtime/$(am__dirstamp) \
+ 	runtime/$(DEPDIR)/$(am__dirstamp)
++runtime/go-strerror.lo: runtime/$(am__dirstamp) \
++	runtime/$(DEPDIR)/$(am__dirstamp)
+ runtime/go-reflect-call.lo: runtime/$(am__dirstamp) \
+ 	runtime/$(DEPDIR)/$(am__dirstamp)
+ runtime/go-setenv.lo: runtime/$(am__dirstamp) \
+@@ -1457,6 +1460,7 @@ distclean-compile:
+ @AMDEP_TRUE@@am__include@ @am__quote@runtime/$(DEPDIR)/go-reflect-call.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@runtime/$(DEPDIR)/go-setenv.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@runtime/$(DEPDIR)/go-signal.Plo@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@runtime/$(DEPDIR)/go-strerror.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@runtime/$(DEPDIR)/go-unsafe-pointer.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@runtime/$(DEPDIR)/go-unsetenv.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@runtime/$(DEPDIR)/go-unwind.Plo@am__quote@
 diff --git a/libgo/go/syscall/errstr.go b/libgo/go/syscall/errstr.go
-index 6c2441d364d..8f7c5538163 100644
+index 6c2441d3..9f688e2a 100644
 --- a/libgo/go/syscall/errstr.go
 +++ b/libgo/go/syscall/errstr.go
-@@ -5,7 +5,6 @@
+@@ -4,23 +4,19 @@
+ // Use of this source code is governed by a BSD-style
  // license that can be found in the LICENSE file.
  
- // +build !hurd
+-// +build !hurd
 -// +build !linux
- 
+-
  package syscall
  
+-//sysnb	strerror_r(errnum int, buf []byte) (err Errno)
+-//strerror_r(errnum _C_int, buf *byte, buflen Size_t) _C_int
++import "internal/bytealg"
++
++//extern go_strerror
++func go_strerror(_C_int, *byte, Size_t) _C_int
+ 
+ func Errstr(errnum int) string {
+-	for len := 128; ; len *= 2 {
+-		b := make([]byte, len)
+-		errno := strerror_r(errnum, b)
++	for size := 128; ; size *= 2 {
++		b := make([]byte, size)
++		errno := go_strerror(_C_int(errnum), &b[0], Size_t(len(b)))
+ 		if errno == 0 {
+-			i := 0
+-			for b[i] != 0 {
+-				i++
+-			}
++			i := bytealg.IndexByte(b, 0)
+ 			// Lowercase first letter: Bad -> bad, but
+ 			// STREAM -> STREAM.
+ 			if i > 1 && 'A' <= b[0] && b[0] <= 'Z' && 'a' <= b[1] && b[1] <= 'z' {
+@@ -29,7 +25,7 @@ func Errstr(errnum int) string {
+ 			return string(b[:i])
+ 		}
+ 		if errno != ERANGE {
+-			return "errstr failure"
++			return "strerror_r failure"
+ 		}
+ 	}
+ }
 diff --git a/libgo/go/syscall/errstr_glibc.go b/libgo/go/syscall/errstr_glibc.go
-index 5b19e6f202d..8dc60172186 100644
+deleted file mode 100644
+index 5b19e6f2..00000000
 --- a/libgo/go/syscall/errstr_glibc.go
-+++ b/libgo/go/syscall/errstr_glibc.go
-@@ -7,7 +7,7 @@
- // We use this rather than errstr.go because on GNU/Linux sterror_r
- // returns a pointer to the error message, and may not use buf at all.
- 
++++ /dev/null
+@@ -1,33 +0,0 @@
+-// errstr_glibc.go -- GNU/Linux and GNU/Hurd specific error strings.
+-
+-// Copyright 2010 The Go Authors. All rights reserved.
+-// Use of this source code is governed by a BSD-style
+-// license that can be found in the LICENSE file.
+-
+-// We use this rather than errstr.go because on GNU/Linux sterror_r
+-// returns a pointer to the error message, and may not use buf at all.
+-
 -// +build hurd linux
-+// +build hurd !linux
- 
- package syscall
- 
+-
+-package syscall
+-
+-import "unsafe"
+-
+-//sysnb	strerror_r(errnum int, b []byte) (errstr *byte)
+-//strerror_r(errnum _C_int, b *byte, len Size_t) *byte
+-
+-func Errstr(errnum int) string {
+-	a := make([]byte, 128)
+-	p := strerror_r(errnum, a)
+-	b := (*[1000]byte)(unsafe.Pointer(p))
+-	i := 0
+-	for b[i] != 0 {
+-		i++
+-	}
+-	// Lowercase first letter: Bad -> bad, but STREAM -> STREAM.
+-	if i > 1 && 'A' <= b[0] && b[0] <= 'Z' && 'a' <= b[1] && b[1] <= 'z' {
+-		c := b[0] + 'a' - 'A'
+-		return string(c) + string(b[1:i])
+-	}
+-	return string(b[:i])
+-}
+diff --git a/libgo/runtime/go-strerror.c b/libgo/runtime/go-strerror.c
+new file mode 100644
+index 00000000..13d1d91d
+--- /dev/null
++++ b/libgo/runtime/go-strerror.c
+@@ -0,0 +1,37 @@
++/* go-strerror.c -- wrapper around XSI-compliant strerror_r.
++
++   Copyright 2022 The Go Authors. All rights reserved.
++   Use of this source code is governed by a BSD-style
++   license that can be found in the LICENSE file.  */
++
++/* There are two version of strerror_r on GNU/Linux: a GNU-specific
++   and an XSI-compliant version.  The former version is only available
++   on glibc.  Since glibc 2.13, the XSI-compliant version is also
++   provided by glibc if _GNU_SOURCE is not defined.  Since the
++   entirety of gofrontend is compiled with _GNU_SOURCE, this file
++   exists to selectively undefine it and provides an alias to the
++   XSI-compliant version of strerror_r(3).  */
++
++#ifdef __linux__
++
++/* Force selection of XSI-compliant strerror_r by glibc.  */
++#undef XOPEN_SOURCE
++#define XOPEN_SOURCE 600
++#undef _POSIX_C_SOURCE
++#define _POSIX_C_SOURCE 200112L
++#undef _GNU_SOURCE
++
++#endif /* __linux__ */
++
++#include <string.h>
++
++#ifndef HAVE_STRERROR_R
++// Provided by go-nosys.c if not provided by libc itself.
++extern int strerror_r (int, char *, size_t);
++#endif
++
++int
++go_strerror (int errnum, char *buf, size_t buflen)
++{
++  return strerror_r (errnum, buf, buflen);
++}

cross/gcc-armv7/0039-gcc-go-Use-int64-type-as-offset-argument-for-mmap.patch

@@ -1,22 +1,26 @@
-From 4b6240d5301ce04b8bbc3e2152915cbc7da80584 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?S=C3=B6ren=20Tempel?= <soeren+git@soeren-tempel.net>
-Date: Wed, 28 Sep 2022 17:30:14 +0200
-Subject: [PATCH] libgo: use _off_t for mmap offset argument
+From 5e658f4659c551330ea68f5667e4f951b218f32d Mon Sep 17 00:00:00 2001
+From: Ian Lance Taylor <iant@golang.org>
+Date: Wed, 26 Oct 2022 17:23:42 -0700
+Subject: [PATCH] runtime: use _libgo_off_t_type when calling C mmap
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
 
-On glibc-based systems, off_t is a 32-bit type on 32-bit systems and a
-64-bit type on 64-bit systems by default. However, on systems using musl
-libc off_t is unconditionally a 64-bit type. As such, it is insufficient
-to use a uintptr type for the mmap offset parameter.
+The last argument to the C mmap function is type off_t, not uintptr.
+On some 32-bit systems, off_t is larger than uintptr.
 
-Presently, the (incorrect) mmap declaration causes a libgo run-time
-failure on 32-bit musl systems (fatal error: runtime: cannot allocate
-memory). This commit fixes this run-time error.
+Based on patch by Sören Tempel.
+
+Change-Id: Ib6f9d5bcd4734f99a72889e2282b97ec3c8fbd34
+Reviewed-on: https://go-review.googlesource.com/c/gofrontend/+/445735
+Reviewed-by: Cherry Mui <cherryyz@google.com>
+Reviewed-by: Than McIntosh <thanm@google.com>
 ---
- libgo/go/runtime/mem_gccgo.go | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
+ libgo/go/runtime/mem_gccgo.go | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
 
 diff --git a/libgo/go/runtime/mem_gccgo.go b/libgo/go/runtime/mem_gccgo.go
-index fa3389d8..07bf325a 100644
+index fa3389d8..1e84f4f5 100644
 --- a/libgo/go/runtime/mem_gccgo.go
 +++ b/libgo/go/runtime/mem_gccgo.go
 @@ -15,7 +15,7 @@ import (
@@ -24,7 +28,7 @@ index fa3389d8..07bf325a 100644
  
  //extern mmap
 -func sysMmap(addr unsafe.Pointer, n uintptr, prot, flags, fd int32, off uintptr) unsafe.Pointer
-+func sysMmap(addr unsafe.Pointer, n uintptr, prot, flags, fd int32, off _off_t) unsafe.Pointer
++func sysMmap(addr unsafe.Pointer, n uintptr, prot, flags, fd int32, off _libgo_off_t_type) unsafe.Pointer
  
  //extern munmap
  func munmap(addr unsafe.Pointer, length uintptr) int32
@@ -33,7 +37,23 @@ index fa3389d8..07bf325a 100644
  
  func mmap(addr unsafe.Pointer, n uintptr, prot, flags, fd int32, off uintptr) (unsafe.Pointer, int) {
 -	p := sysMmap(addr, n, prot, flags, fd, off)
-+	p := sysMmap(addr, n, prot, flags, fd, _off_t(off))
++	p := sysMmap(addr, n, prot, flags, fd, _libgo_off_t_type(off))
  	if uintptr(p) == _MAP_FAILED {
  		return nil, errno()
  	}
+@@ -47,6 +47,7 @@ func mmap(addr unsafe.Pointer, n uintptr, prot, flags, fd int32, off uintptr) (u
+ 
+ // Don't split the stack as this method may be invoked without a valid G, which
+ // prevents us from allocating more stack.
++//
+ //go:nosplit
+ func sysAlloc(n uintptr, sysStat *sysMemStat) unsafe.Pointer {
+ 	p, err := mmap(nil, n, _PROT_READ|_PROT_WRITE, _MAP_ANON|_MAP_PRIVATE, mmapFD, 0)
+@@ -165,6 +166,7 @@ func sysHugePage(v unsafe.Pointer, n uintptr) {
+ 
+ // Don't split the stack as this function may be invoked without a valid G,
+ // which prevents us from allocating more stack.
++//
+ //go:nosplit
+ func sysFree(v unsafe.Pointer, n uintptr, sysStat *sysMemStat) {
+ 	sysStat.add(-int64(n))

cross/gcc-armv7/APKBUILD

@@ -32,7 +32,7 @@ pkgver=${_pkgbase}_git${_pkgsnap}
 [ "$CHOST" != "$CTARGET" ] && _target="-$CTARGET_ARCH" || _target=""
 
 pkgname=gcc-armv7
-pkgrel=4
+pkgrel=5
 pkgdesc="Stage2 cross-compiler for armv7"
 url="https://gcc.gnu.org"
 arch="x86_64"
@@ -795,11 +795,11 @@ b40d7e4712c035674c993bbb55475290ec14523b3f0fd05493514bac4e9adaa6641faf815fc40ffc
 f060687adcd5297124e4000f1ba1e3fd5d7d124da04d948cbd0d4a6c69a90a2b29a4a0dbbe13a83ab6950724f434de012b681bdbcdf53c0100b40fe3d00f2f2f  0028-ada-libgnarl-compatibility-for-musl.patch
 5160bae68e20a1966c1f6d655ee98af759e9b9ee842718ae6007d467b418e1cf3b307528a0841477b5259671ce868521b06c0f2e947b7b8f3a398c53dd978252  0029-ada-musl-support-fixes.patch
 3c04b26554a78096296ca9542c77a91219bd26044dd2cb2006db4c1944889a97c215900b3828ba7e8c675162406db543605a815bdfbd915bf810663b1b253bdd  0033-gcc-go-link-to-libucontext.patch
-699dc3641099da6136dd3689f06c6553c03b3a85acf83a3fce1beb5425065b3e378535ca9e9100a120fdbafc34871d61c063fd5328a49cd87a15a989ed51706d  0034-Use-generic-errstr.go-implementation-on-musl.patch
+141c0428f988cbd102000d4db8d4150485f6da5c064469493ea378cd579bed99330658f41fe106c0d07d1c1aa436ec3f864403ed1ba79f791a1d727b42d46910  0034-Use-generic-errstr.go-implementation-on-musl.patch
 d9ba710f770e053c8f212e821817c188091a829658050b9ab5906388553ec60fec37943ea43c270e92a9014902949f3c98fc4639032d92b8145b375bb29e193e  0035-configure-Add-enable-autolink-libatomic-use-in-LINK_.patch
 ab90d8fdd977d6cd3da096a1c76d77be3e89a020b2127247771711a32eb608cceed21834ef488ab4b69bb0f408b098fdfb61630819e3d1a1e57d5af67800ee74  0036-configure-fix-detection-of-atomic-builtins-in-libato.patch
 8bc6823f0b3c66f7b73d7ddb64ffa6930463285c2e9a14a2bc1882bcc4271144eaa1107d713294699caf9481648163cbf43921a2b8e4ac0d55c78a804bae8a3d  0037-libgo-Recognize-off64_t-and-loff_t-definitions-of-mu.patch
-e9699f4721778869eb3a8fef2c679208ef5b98584892f30b0e1cb5dc1669f8158198d7792659b1b56c381baf62247d21990dcced9178547affd5d6bfb2d12548  0039-gcc-go-Use-int64-type-as-offset-argument-for-mmap.patch
+f0744c01859e67deed404c97e1870b2876935fdc467e51980373744936574c314d5d21134734c5d515e7f3cd3483ef98045b9bbcd81c568c6038fac96ffb5fa0  0039-gcc-go-Use-int64-type-as-offset-argument-for-mmap.patch
 d6dc1bfb881a313d167aaa5658790b0f55eea4336c408cfc6613dd5783440dafd0d37c43031a5f3e69be40f632e38371cd4fb6e5f0494ac4ea4d7d5025d2ae02  0041-go-gospec-forcibly-disable-fsplit-stack-support.patch
 684c6a6d52512b973429b6e709966439ac1e174f9e79a33d4a638b452245b457b34752b4b4034ba983f6a712f86522e7adf715bab00a6603f64a12139c5b1e39  0042-gcc-go-fix-build-error-with-SYS_SECCOMP.patch
 25014dfa99d96ee70ce0ad22e9f7974f0a51cc50b3b9c2db49df50774c8cd29e497ceed120486bee50be83bfb07f2009ed310eb9b0543f2795bd7359b87eadd2  0043-libstdc-do-not-throw-exceptions-for-non-C-locales-on.patch

cross/gcc-riscv64/0034-Use-generic-errstr.go-implementation-on-musl.patch

@@ -1,45 +1,204 @@
-From 5093aa99f9cdded2e1ddf67b7139da6fac36b0a6 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?S=C3=B6ren=20Tempel?= <soeren+git@soeren-tempel.net>
-Date: Mon, 19 Apr 2021 07:21:41 +0200
-Subject: [PATCH] Use generic errstr.go implementation on musl
+From b3840bdcc0eee2a4d099a9af52199944ade7acb9 Mon Sep 17 00:00:00 2001
+From: Ian Lance Taylor <iant@golang.org>
+Date: Tue, 29 Nov 2022 17:28:44 -0800
+Subject: [PATCH] syscall, runtime: always call XSI strerror_r
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
 
-glibc provides two version of strerror_r() depending on a feature test
-macro. The first is the XSI-compliant version which returns an int, the
-second is GNU-specific and returns a char pointer.
+This does the right thing for either glibc or musl on GNU/Linux.
 
-Similarity, gcc's libgo provides two implementations of Errstr() both of
-which use strerror_r(). On Linux, it is assumed that the GNU-specific
-strerror_r version is used. However, musl only provides the
-XSI-compliant version of strerror_r. This patch enables the generic
-Errstr() implementation which also uses the XSI-compliant version of
-strerror_r.
+Based on patch by Sören Tempel.
+
+Change-Id: If2969e131f0fae456d58b35d839d8abe191fcc59
+Reviewed-on: https://go-review.googlesource.com/c/gofrontend/+/454176
+Reviewed-by: Cherry Mui <cherryyz@google.com>
+Reviewed-by: Ian Lance Taylor <iant@google.com>
+TryBot-Bypass: Ian Lance Taylor <iant@google.com>
 ---
- libgo/go/syscall/errstr.go       | 1 -
- libgo/go/syscall/errstr_glibc.go | 2 +-
- 2 files changed, 1 insertion(+), 2 deletions(-)
+ libgo/Makefile.am                |  1 +
+ libgo/Makefile.in                |  6 +++++-
+ libgo/go/syscall/errstr.go       | 22 ++++++++-----------
+ libgo/go/syscall/errstr_glibc.go | 33 ----------------------------
+ libgo/runtime/go-strerror.c      | 37 ++++++++++++++++++++++++++++++++
+ 5 files changed, 52 insertions(+), 47 deletions(-)
+ delete mode 100644 libgo/go/syscall/errstr_glibc.go
+ create mode 100644 libgo/runtime/go-strerror.c
 
+diff --git a/libgo/Makefile.am b/libgo/Makefile.am
+index e0a1eec5..df568743 100644
+--- a/libgo/Makefile.am
++++ b/libgo/Makefile.am
+@@ -465,6 +465,7 @@ runtime_files = \
+ 	runtime/go-nanotime.c \
+ 	runtime/go-now.c \
+ 	runtime/go-nosys.c \
++	runtime/go-strerror.c \
+ 	runtime/go-reflect-call.c \
+ 	runtime/go-setenv.c \
+ 	runtime/go-signal.c \
+diff --git a/libgo/Makefile.in b/libgo/Makefile.in
+index 7bef5df9..f2f3f0fc 100644
+--- a/libgo/Makefile.in
++++ b/libgo/Makefile.in
+@@ -247,7 +247,7 @@ am__objects_4 = runtime/aeshash.lo runtime/go-assert.lo \
+ 	runtime/go-fieldtrack.lo runtime/go-matherr.lo \
+ 	runtime/go-memclr.lo runtime/go-memmove.lo \
+ 	runtime/go-memequal.lo runtime/go-nanotime.lo \
+-	runtime/go-now.lo runtime/go-nosys.lo \
++	runtime/go-now.lo runtime/go-nosys.lo runtime/go-strerror.lo \
+ 	runtime/go-reflect-call.lo runtime/go-setenv.lo \
+ 	runtime/go-signal.lo runtime/go-unsafe-pointer.lo \
+ 	runtime/go-unsetenv.lo runtime/go-unwind.lo \
+@@ -917,6 +917,7 @@ runtime_files = \
+ 	runtime/go-nanotime.c \
+ 	runtime/go-now.c \
+ 	runtime/go-nosys.c \
++	runtime/go-strerror.c \
+ 	runtime/go-reflect-call.c \
+ 	runtime/go-setenv.c \
+ 	runtime/go-signal.c \
+@@ -1390,6 +1391,8 @@ runtime/go-now.lo: runtime/$(am__dirstamp) \
+ 	runtime/$(DEPDIR)/$(am__dirstamp)
+ runtime/go-nosys.lo: runtime/$(am__dirstamp) \
+ 	runtime/$(DEPDIR)/$(am__dirstamp)
++runtime/go-strerror.lo: runtime/$(am__dirstamp) \
++	runtime/$(DEPDIR)/$(am__dirstamp)
+ runtime/go-reflect-call.lo: runtime/$(am__dirstamp) \
+ 	runtime/$(DEPDIR)/$(am__dirstamp)
+ runtime/go-setenv.lo: runtime/$(am__dirstamp) \
+@@ -1457,6 +1460,7 @@ distclean-compile:
+ @AMDEP_TRUE@@am__include@ @am__quote@runtime/$(DEPDIR)/go-reflect-call.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@runtime/$(DEPDIR)/go-setenv.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@runtime/$(DEPDIR)/go-signal.Plo@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@runtime/$(DEPDIR)/go-strerror.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@runtime/$(DEPDIR)/go-unsafe-pointer.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@runtime/$(DEPDIR)/go-unsetenv.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@runtime/$(DEPDIR)/go-unwind.Plo@am__quote@
 diff --git a/libgo/go/syscall/errstr.go b/libgo/go/syscall/errstr.go
-index 6c2441d364d..8f7c5538163 100644
+index 6c2441d3..9f688e2a 100644
 --- a/libgo/go/syscall/errstr.go
 +++ b/libgo/go/syscall/errstr.go
-@@ -5,7 +5,6 @@
+@@ -4,23 +4,19 @@
+ // Use of this source code is governed by a BSD-style
  // license that can be found in the LICENSE file.
  
- // +build !hurd
+-// +build !hurd
 -// +build !linux
- 
+-
  package syscall
  
+-//sysnb	strerror_r(errnum int, buf []byte) (err Errno)
+-//strerror_r(errnum _C_int, buf *byte, buflen Size_t) _C_int
++import "internal/bytealg"
++
++//extern go_strerror
++func go_strerror(_C_int, *byte, Size_t) _C_int
+ 
+ func Errstr(errnum int) string {
+-	for len := 128; ; len *= 2 {
+-		b := make([]byte, len)
+-		errno := strerror_r(errnum, b)
++	for size := 128; ; size *= 2 {
++		b := make([]byte, size)
++		errno := go_strerror(_C_int(errnum), &b[0], Size_t(len(b)))
+ 		if errno == 0 {
+-			i := 0
+-			for b[i] != 0 {
+-				i++
+-			}
++			i := bytealg.IndexByte(b, 0)
+ 			// Lowercase first letter: Bad -> bad, but
+ 			// STREAM -> STREAM.
+ 			if i > 1 && 'A' <= b[0] && b[0] <= 'Z' && 'a' <= b[1] && b[1] <= 'z' {
+@@ -29,7 +25,7 @@ func Errstr(errnum int) string {
+ 			return string(b[:i])
+ 		}
+ 		if errno != ERANGE {
+-			return "errstr failure"
++			return "strerror_r failure"
+ 		}
+ 	}
+ }
 diff --git a/libgo/go/syscall/errstr_glibc.go b/libgo/go/syscall/errstr_glibc.go
-index 5b19e6f202d..8dc60172186 100644
+deleted file mode 100644
+index 5b19e6f2..00000000
 --- a/libgo/go/syscall/errstr_glibc.go
-+++ b/libgo/go/syscall/errstr_glibc.go
-@@ -7,7 +7,7 @@
- // We use this rather than errstr.go because on GNU/Linux sterror_r
- // returns a pointer to the error message, and may not use buf at all.
- 
++++ /dev/null
+@@ -1,33 +0,0 @@
+-// errstr_glibc.go -- GNU/Linux and GNU/Hurd specific error strings.
+-
+-// Copyright 2010 The Go Authors. All rights reserved.
+-// Use of this source code is governed by a BSD-style
+-// license that can be found in the LICENSE file.
+-
+-// We use this rather than errstr.go because on GNU/Linux sterror_r
+-// returns a pointer to the error message, and may not use buf at all.
+-
 -// +build hurd linux
-+// +build hurd !linux
- 
- package syscall
- 
+-
+-package syscall
+-
+-import "unsafe"
+-
+-//sysnb	strerror_r(errnum int, b []byte) (errstr *byte)
+-//strerror_r(errnum _C_int, b *byte, len Size_t) *byte
+-
+-func Errstr(errnum int) string {
+-	a := make([]byte, 128)
+-	p := strerror_r(errnum, a)
+-	b := (*[1000]byte)(unsafe.Pointer(p))
+-	i := 0
+-	for b[i] != 0 {
+-		i++
+-	}
+-	// Lowercase first letter: Bad -> bad, but STREAM -> STREAM.
+-	if i > 1 && 'A' <= b[0] && b[0] <= 'Z' && 'a' <= b[1] && b[1] <= 'z' {
+-		c := b[0] + 'a' - 'A'
+-		return string(c) + string(b[1:i])
+-	}
+-	return string(b[:i])
+-}
+diff --git a/libgo/runtime/go-strerror.c b/libgo/runtime/go-strerror.c
+new file mode 100644
+index 00000000..13d1d91d
+--- /dev/null
++++ b/libgo/runtime/go-strerror.c
+@@ -0,0 +1,37 @@
++/* go-strerror.c -- wrapper around XSI-compliant strerror_r.
++
++   Copyright 2022 The Go Authors. All rights reserved.
++   Use of this source code is governed by a BSD-style
++   license that can be found in the LICENSE file.  */
++
++/* There are two version of strerror_r on GNU/Linux: a GNU-specific
++   and an XSI-compliant version.  The former version is only available
++   on glibc.  Since glibc 2.13, the XSI-compliant version is also
++   provided by glibc if _GNU_SOURCE is not defined.  Since the
++   entirety of gofrontend is compiled with _GNU_SOURCE, this file
++   exists to selectively undefine it and provides an alias to the
++   XSI-compliant version of strerror_r(3).  */
++
++#ifdef __linux__
++
++/* Force selection of XSI-compliant strerror_r by glibc.  */
++#undef XOPEN_SOURCE
++#define XOPEN_SOURCE 600
++#undef _POSIX_C_SOURCE
++#define _POSIX_C_SOURCE 200112L
++#undef _GNU_SOURCE
++
++#endif /* __linux__ */
++
++#include <string.h>
++
++#ifndef HAVE_STRERROR_R
++// Provided by go-nosys.c if not provided by libc itself.
++extern int strerror_r (int, char *, size_t);
++#endif
++
++int
++go_strerror (int errnum, char *buf, size_t buflen)
++{
++  return strerror_r (errnum, buf, buflen);
++}

cross/gcc-riscv64/0039-gcc-go-Use-int64-type-as-offset-argument-for-mmap.patch

@@ -1,22 +1,26 @@
-From 4b6240d5301ce04b8bbc3e2152915cbc7da80584 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?S=C3=B6ren=20Tempel?= <soeren+git@soeren-tempel.net>
-Date: Wed, 28 Sep 2022 17:30:14 +0200
-Subject: [PATCH] libgo: use _off_t for mmap offset argument
+From 5e658f4659c551330ea68f5667e4f951b218f32d Mon Sep 17 00:00:00 2001
+From: Ian Lance Taylor <iant@golang.org>
+Date: Wed, 26 Oct 2022 17:23:42 -0700
+Subject: [PATCH] runtime: use _libgo_off_t_type when calling C mmap
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
 
-On glibc-based systems, off_t is a 32-bit type on 32-bit systems and a
-64-bit type on 64-bit systems by default. However, on systems using musl
-libc off_t is unconditionally a 64-bit type. As such, it is insufficient
-to use a uintptr type for the mmap offset parameter.
+The last argument to the C mmap function is type off_t, not uintptr.
+On some 32-bit systems, off_t is larger than uintptr.
 
-Presently, the (incorrect) mmap declaration causes a libgo run-time
-failure on 32-bit musl systems (fatal error: runtime: cannot allocate
-memory). This commit fixes this run-time error.
+Based on patch by Sören Tempel.
+
+Change-Id: Ib6f9d5bcd4734f99a72889e2282b97ec3c8fbd34
+Reviewed-on: https://go-review.googlesource.com/c/gofrontend/+/445735
+Reviewed-by: Cherry Mui <cherryyz@google.com>
+Reviewed-by: Than McIntosh <thanm@google.com>
 ---
- libgo/go/runtime/mem_gccgo.go | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
+ libgo/go/runtime/mem_gccgo.go | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
 
 diff --git a/libgo/go/runtime/mem_gccgo.go b/libgo/go/runtime/mem_gccgo.go
-index fa3389d8..07bf325a 100644
+index fa3389d8..1e84f4f5 100644
 --- a/libgo/go/runtime/mem_gccgo.go
 +++ b/libgo/go/runtime/mem_gccgo.go
 @@ -15,7 +15,7 @@ import (
@@ -24,7 +28,7 @@ index fa3389d8..07bf325a 100644
  
  //extern mmap
 -func sysMmap(addr unsafe.Pointer, n uintptr, prot, flags, fd int32, off uintptr) unsafe.Pointer
-+func sysMmap(addr unsafe.Pointer, n uintptr, prot, flags, fd int32, off _off_t) unsafe.Pointer
++func sysMmap(addr unsafe.Pointer, n uintptr, prot, flags, fd int32, off _libgo_off_t_type) unsafe.Pointer
  
  //extern munmap
  func munmap(addr unsafe.Pointer, length uintptr) int32
@@ -33,7 +37,23 @@ index fa3389d8..07bf325a 100644
  
  func mmap(addr unsafe.Pointer, n uintptr, prot, flags, fd int32, off uintptr) (unsafe.Pointer, int) {
 -	p := sysMmap(addr, n, prot, flags, fd, off)
-+	p := sysMmap(addr, n, prot, flags, fd, _off_t(off))
++	p := sysMmap(addr, n, prot, flags, fd, _libgo_off_t_type(off))
  	if uintptr(p) == _MAP_FAILED {
  		return nil, errno()
  	}
+@@ -47,6 +47,7 @@ func mmap(addr unsafe.Pointer, n uintptr, prot, flags, fd int32, off uintptr) (u
+ 
+ // Don't split the stack as this method may be invoked without a valid G, which
+ // prevents us from allocating more stack.
++//
+ //go:nosplit
+ func sysAlloc(n uintptr, sysStat *sysMemStat) unsafe.Pointer {
+ 	p, err := mmap(nil, n, _PROT_READ|_PROT_WRITE, _MAP_ANON|_MAP_PRIVATE, mmapFD, 0)
+@@ -165,6 +166,7 @@ func sysHugePage(v unsafe.Pointer, n uintptr) {
+ 
+ // Don't split the stack as this function may be invoked without a valid G,
+ // which prevents us from allocating more stack.
++//
+ //go:nosplit
+ func sysFree(v unsafe.Pointer, n uintptr, sysStat *sysMemStat) {
+ 	sysStat.add(-int64(n))

cross/gcc-riscv64/APKBUILD

@@ -32,7 +32,7 @@ pkgver=${_pkgbase}_git${_pkgsnap}
 [ "$CHOST" != "$CTARGET" ] && _target="-$CTARGET_ARCH" || _target=""
 
 pkgname=gcc-riscv64
-pkgrel=4
+pkgrel=5
 pkgdesc="Stage2 cross-compiler for riscv64"
 url="https://gcc.gnu.org"
 arch="x86_64"
@@ -795,11 +795,11 @@ b40d7e4712c035674c993bbb55475290ec14523b3f0fd05493514bac4e9adaa6641faf815fc40ffc
 f060687adcd5297124e4000f1ba1e3fd5d7d124da04d948cbd0d4a6c69a90a2b29a4a0dbbe13a83ab6950724f434de012b681bdbcdf53c0100b40fe3d00f2f2f  0028-ada-libgnarl-compatibility-for-musl.patch
 5160bae68e20a1966c1f6d655ee98af759e9b9ee842718ae6007d467b418e1cf3b307528a0841477b5259671ce868521b06c0f2e947b7b8f3a398c53dd978252  0029-ada-musl-support-fixes.patch
 3c04b26554a78096296ca9542c77a91219bd26044dd2cb2006db4c1944889a97c215900b3828ba7e8c675162406db543605a815bdfbd915bf810663b1b253bdd  0033-gcc-go-link-to-libucontext.patch
-699dc3641099da6136dd3689f06c6553c03b3a85acf83a3fce1beb5425065b3e378535ca9e9100a120fdbafc34871d61c063fd5328a49cd87a15a989ed51706d  0034-Use-generic-errstr.go-implementation-on-musl.patch
+141c0428f988cbd102000d4db8d4150485f6da5c064469493ea378cd579bed99330658f41fe106c0d07d1c1aa436ec3f864403ed1ba79f791a1d727b42d46910  0034-Use-generic-errstr.go-implementation-on-musl.patch
 d9ba710f770e053c8f212e821817c188091a829658050b9ab5906388553ec60fec37943ea43c270e92a9014902949f3c98fc4639032d92b8145b375bb29e193e  0035-configure-Add-enable-autolink-libatomic-use-in-LINK_.patch
 ab90d8fdd977d6cd3da096a1c76d77be3e89a020b2127247771711a32eb608cceed21834ef488ab4b69bb0f408b098fdfb61630819e3d1a1e57d5af67800ee74  0036-configure-fix-detection-of-atomic-builtins-in-libato.patch
 8bc6823f0b3c66f7b73d7ddb64ffa6930463285c2e9a14a2bc1882bcc4271144eaa1107d713294699caf9481648163cbf43921a2b8e4ac0d55c78a804bae8a3d  0037-libgo-Recognize-off64_t-and-loff_t-definitions-of-mu.patch
-e9699f4721778869eb3a8fef2c679208ef5b98584892f30b0e1cb5dc1669f8158198d7792659b1b56c381baf62247d21990dcced9178547affd5d6bfb2d12548  0039-gcc-go-Use-int64-type-as-offset-argument-for-mmap.patch
+f0744c01859e67deed404c97e1870b2876935fdc467e51980373744936574c314d5d21134734c5d515e7f3cd3483ef98045b9bbcd81c568c6038fac96ffb5fa0  0039-gcc-go-Use-int64-type-as-offset-argument-for-mmap.patch
 d6dc1bfb881a313d167aaa5658790b0f55eea4336c408cfc6613dd5783440dafd0d37c43031a5f3e69be40f632e38371cd4fb6e5f0494ac4ea4d7d5025d2ae02  0041-go-gospec-forcibly-disable-fsplit-stack-support.patch
 684c6a6d52512b973429b6e709966439ac1e174f9e79a33d4a638b452245b457b34752b4b4034ba983f6a712f86522e7adf715bab00a6603f64a12139c5b1e39  0042-gcc-go-fix-build-error-with-SYS_SECCOMP.patch
 25014dfa99d96ee70ce0ad22e9f7974f0a51cc50b3b9c2db49df50774c8cd29e497ceed120486bee50be83bfb07f2009ed310eb9b0543f2795bd7359b87eadd2  0043-libstdc-do-not-throw-exceptions-for-non-C-locales-on.patch

device/community/device-lenovo-a6000/APKBUILD

@@ -3,7 +3,7 @@
 # Co-Maintainer: Minecrell <minecrell@minecrell.net>
 pkgname=device-lenovo-a6000
 pkgdesc="Lenovo A6000"
-pkgver=6
+pkgver=7
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -46,6 +46,6 @@ phosh() {
 }
 
 sha512sums="
-c860b43edd7dcc2b10a7ee1dc8b2b7e225c469db6f7d45231b78e4e8a76bbe242b65e40488dcae2503ecdc407844eee50964db7b8d3a392a8f3f064afe690b99  deviceinfo
+a73d36985ea77bf01493e8a4dae0e437a0e944254745d71fe8f6ecd5809497a7a93cbbddcde608d83fc5539def887feb0d9dd1920613acc51ec386f7dbdb0b1d  deviceinfo
 10d4ee62e5f7a9e4c368c460dd4c3ef282476e47d8cc40e4e3b83e971d04c493b801e5628ebdfe721f869e2fd68c521cf192cba1a973c8e03a61445534a28811  phoc.ini
 "

device/community/device-lenovo-a6000/deviceinfo

@@ -8,7 +8,7 @@ deviceinfo_codename="lenovo-a6000"
 deviceinfo_year="2015"
 deviceinfo_dtb="qcom/msm8916-wingtech-wt86518"
 deviceinfo_append_dtb="true"
-deviceinfo_modules_initfs="pm8916-lbc pm8916-bms-vm panel-wingtech-yassy-ili9881 panel-wingtech-tianma-hx8394d msm edt-ft5x06"
+deviceinfo_modules_initfs="pm8916-lbc pm8916-bms-vm panel-wingtech-yassy-ili9881 panel-wingtech-qimei-ili9881 panel-wingtech-tianma-hx8394d msm edt-ft5x06"
 deviceinfo_arch="aarch64"
 
 # Device related

device/community/device-lenovo-a6010/APKBUILD

@@ -3,7 +3,7 @@
 # Co-Maintainer: Minecrell <minecrell@minecrell.net>
 pkgname=device-lenovo-a6010
 pkgdesc="Lenovo A6010"
-pkgver=6
+pkgver=7
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -46,6 +46,6 @@ phosh() {
 }
 
 sha512sums="
-f5971257def301439b3786dada60333ad34b15b2221a296698cff7a0a8f7c5c6a54547c91bb024a883fe8f4f5f0b2926c044acc24e240ce1caeaf77697caad75  deviceinfo
+ab4d6460d45793c887b4e632b01e7a16a46b7aa3deee7d8b3c7bbc5d1397db54b492c212e15c49c588c1766a265882373324b3e861ce3e0258056a631220b4b5  deviceinfo
 10d4ee62e5f7a9e4c368c460dd4c3ef282476e47d8cc40e4e3b83e971d04c493b801e5628ebdfe721f869e2fd68c521cf192cba1a973c8e03a61445534a28811  phoc.ini
 "

device/community/device-lenovo-a6010/deviceinfo

@@ -8,7 +8,7 @@ deviceinfo_codename="lenovo-a6010"
 deviceinfo_year="2015"
 deviceinfo_dtb="qcom/msm8916-wingtech-wt86528"
 deviceinfo_append_dtb="true"
-deviceinfo_modules_initfs="pm8916-bms-vm panel-wingtech-yassy-ili9881 panel-wingtech-tianma-hx8394d msm edt-ft5x06"
+deviceinfo_modules_initfs="pm8916-bms-vm panel-wingtech-yassy-ili9881 panel-wingtech-qimei-ili9881 panel-wingtech-tianma-hx8394d msm edt-ft5x06"
 deviceinfo_arch="aarch64"
 
 # Device related

device/community/device-nokia-n900/APKBUILD

@@ -3,7 +3,7 @@
 # Co-Maintainer: Danct12 <danct12@disroot.org>
 pkgname=device-nokia-n900
 pkgver=8.3
-pkgrel=2
+pkgrel=3
 pkgdesc="Nokia N900"
 url="https://postmarketos.org"
 arch="armv7"
@@ -189,7 +189,7 @@ dc585e11bf4e06e36c5c62bcc024eaacecc30437d9da5257df14be05e247a2f2bc208874be3058ed
 e440ed7a3070c17e003b86b72dbe6d8194d01b577ca8dd56dd066f216b6dda32bb965c780950f1789a66f7c948290016b048da9f1cf63aba9e11d7e7fd6873ba  rx51_us.map
 b50e7f37ffb1fa0bb782b117a4e8bcfdb722b6127c3e5d643e90cd901a1f4e65e77a0773ed418673c8195595347482be0c8096f5a723e840315ad61ccd043b66  n900-wlan-data.initd
 143c21f0b18a016d37cb44178e9daea09f128a90769b48353c03c3f245cb9b1f7e773b9ccee084973fc78ddd7a18c2642e54888a85bda7c7daecddc9a8c62eff  pointercal
-3ae550b50f963695be30eb0e03c31fe7a92aad73174873efe5b73d446b74da5763b6fe9495b91bbdbe307723f6510ebc6639437904815e9251a094ce9bec5b11  uboot-script.cmd
+9aaae66ae159236346f67818c44da61aed84a63b3bac0c706492f198db82fc67c2378bcabaf260b695b980bf2faf144472f15355bb097b021551db9547f2e1bc  uboot-script.cmd
 9e72035c88632d12895534e5aa5746f2c130c7dcdafa8702748d62b71ed0e1b5911b6e1f07f9b9e39b6072bbb662f66aead585baa1dcacb7d8c8953ca89b6762  10-nokia-modem.rules
 c6012aef28b096141b924fced226ec99fb93eb53b69c064a8887d8fecdf8dc08a3ba3db399e18d88374c6ef4c59013a30699c7e4d76e5cb771040582573a0527  90-touchscreen-dev.rules
 737d9e57e219a0220c5b1943375f325309323344fdf06973546c7d88ed9aec857657abd6b7861669873574f865e1c99719d411e0564dbfebe028f9e77d308491  x11-keymap

device/community/device-nokia-n900/uboot-script.cmd

@@ -2,7 +2,7 @@ setenv mmcnum 0
 setenv mmcpart 1
 setenv mmctype ext2
 setenv setup_omap_atag 1
-setenv bootargs init=/init.sh rw console=tty0 console=ttyO2 PMOS_NO_OUTPUT_REDIRECT PMOS_FORCE_PARTITION_RESIZE
+setenv bootargs init=/init.sh rw console=tty0 console=ttyS2 PMOS_NO_OUTPUT_REDIRECT PMOS_FORCE_PARTITION_RESIZE
 setenv mmckernfile /uImage
 setenv mmcinitrdfile /uInitrd
 setenv mmcscriptfile

device/community/device-oneplus-enchilada/APKBUILD

@@ -3,8 +3,8 @@
 
 pkgname=device-oneplus-enchilada
 pkgdesc="OnePlus 6"
-pkgver=7
-pkgrel=1
+pkgver=8
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -51,5 +51,5 @@ phosh() {
 sha512sums="
 9b0603ceef02ec632ff333167b252743cc5461ae371b656a6468addf22d43ec10010d9348caebc9c21e2cdafb95af7bf6266ad405ac245779a325154d404bfde  deviceinfo
 65f74d29ab318b23f7ac8923a3661f2c4130049273a8c6be234ed2c8e00810b6a1254b54cf0932e42850a6d48f821dcd038900fbb836feeddfab2759afffae38  phoc.ini
-7f599f086dba97ac39ce98798969bc8e9c26dd3b062bb8f95852182df52814b70d49b701e27b43abeb3639b16ba053e416c14cf75e0bf4a9f2fe7c01fb0ac41c  q6voiced.conf
+fe9871c325a38c0cadc9631870801ec15ab9f5b786ee854325b93eb3d23e7d8b1ac4f1075572ffcd225d8ec514dec09b986972ddff12a89260c0218af6de7887  q6voiced.conf
 "

device/community/device-oneplus-enchilada/q6voiced.conf

@@ -1,2 +1,2 @@
 q6voice_card=0
-q6voice_device=3
+q6voice_device=6

device/community/device-oneplus-fajita/APKBUILD

@@ -3,8 +3,8 @@
 
 pkgname=device-oneplus-fajita
 pkgdesc="OnePlus 6T"
-pkgver=7
-pkgrel=1
+pkgver=8
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -19,7 +19,11 @@ depends="
 	soc-qcom-sdm845-qbootctl
 "
 makedepends="devicepkg-dev"
-source="deviceinfo phoc.ini"
+source="
+	deviceinfo
+	phoc.ini
+	q6voiced.conf
+"
 subpackages="$pkgname-nonfree-firmware:nonfree_firmware $pkgname-phosh"
 
 build() {
@@ -34,6 +38,8 @@ nonfree_firmware() {
 	pkgdesc="Modem, WiFi and GPU Firmware, also needed for osk-sdl"
 	depends="firmware-oneplus-sdm845 firmware-oneplus-sdm845-initramfs soc-qcom-sdm845-nonfree-firmware"
 	mkdir "$subpkgdir"
+
+	install -Dm644 q6voiced.conf "$subpkgdir"/etc/conf.d/q6voiced
 }
 
 phosh() {
@@ -45,4 +51,5 @@ phosh() {
 sha512sums="
 8561a33c0e7d5085186258a71d2fc44daa01b24d05781d53be87222b462059fee26baa2e004e799404606429629e56baad3778d74d1f725cec389f572c92155e  deviceinfo
 65f74d29ab318b23f7ac8923a3661f2c4130049273a8c6be234ed2c8e00810b6a1254b54cf0932e42850a6d48f821dcd038900fbb836feeddfab2759afffae38  phoc.ini
+fe9871c325a38c0cadc9631870801ec15ab9f5b786ee854325b93eb3d23e7d8b1ac4f1075572ffcd225d8ec514dec09b986972ddff12a89260c0218af6de7887  q6voiced.conf
 "

device/community/device-oneplus-fajita/q6voiced.conf

@@ -0,0 +1,2 @@
+q6voice_card=0
+q6voice_device=6

device/community/device-pine64-pinephonepro/90-modem-eg25.rules

@@ -6,7 +6,3 @@ SUBSYSTEMS=="usb", KERNEL=="ttyUSB[0-9]*", ATTRS{idVendor}=="2c7c", ATTRS{idProd
 
 ACTION=="add", SUBSYSTEM=="tty", ATTRS{idVendor}=="2c7c", ATTRS{idProduct}=="0125", ENV{.LOCAL_ifNum}=="02", RUN+="/usr/bin/pinephone_setup-modem '%E{DEVNAME}'"
 
-ACTION=="add", SUBSYSTEM=="usb", DRIVERS=="usb", ENV{DEVTYPE}=="usb_device", ATTRS{idVendor}=="2c7c", ATTRS{idProduct}=="0125", ATTRS{serial}=="0123456789ABCDEF", ATTR{power/persist}="1", ATTR{power/control}="on"
-
-ACTION=="add", SUBSYSTEM=="usb", DRIVERS=="usb", ENV{DEVTYPE}=="usb_device", ATTRS{idVendor}=="2c7c", ATTRS{idProduct}=="0125", ATTRS{serial}=="community_fw", ATTR{power/persist}="1", ATTR{power/control}="on"
-

device/community/device-pine64-pinephonepro/APKBUILD

@@ -2,8 +2,8 @@
 # Maintainer: Martijn Braam <martijn@brixit.nl>
 pkgname=device-pine64-pinephonepro
 pkgdesc="PINE64 PinePhone Pro"
-pkgver=3.3
-pkgrel=4
+pkgver=3.5
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -35,11 +35,12 @@ source="
 	deviceinfo
 	grub.cfg
 	grub_early.cfg
+	modemmanager.conf
+	ppkb.sh
+	setup-modem.sh
 	ucm/HiFi.conf
 	ucm/PINE64-PinePhonePro-.conf
 	ucm/VoiceCall.conf
-	ppkb.sh
-	setup-modem.sh
 	"
 
 build() {
@@ -99,6 +100,8 @@ package() {
 		"$pkgdir"/usr/bin/pinephone_setup-modem
 	install -Dm644 "$srcdir"/90-modem-eg25.rules -t \
 		"$pkgdir"/usr/lib/udev/rules.d/
+	install -Dm644 "$srcdir"/modemmanager.conf \
+		"$pkgdir"/etc/conf.d/modemmanager
 
 	# Keyboard config
 	install -Dm755 "$srcdir"/ppkb.sh "$pkgdir"/etc/profile.d/ppkb.sh
@@ -122,13 +125,14 @@ gnome() {
 
 sha512sums="
 2d68ffe143f633a86670f30e45dbad1cc313f219f22b7cd3319ab44bb7209c20cb29f2ff2c60c92390154af9c9a6815c4186be555364cf31552005eba024c0e7  51_keyboard.gschema.override
-fdfa807c0de33aee3deb09ee25c37a58fa970ce71483e52f21793717cb89adeb74f251ff1a2c2086361e3e58877f8b2e5643f24186b1a537acf9c16e3419313c  90-modem-eg25.rules
+98e9dcfb36dd5843ff441b148e3bffb70757c59601c5f01f55a584e8f017c7ca73f2275c1bff46e4236dd8174df36a43d10abf9b8dadee988b962036846dc6ed  90-modem-eg25.rules
 e591572d0bfc4d7d990fcc15bc82e78e60404becf62a38283b4ceee6f49a812b63eebbc5c304907330e33dce5f023edba26c9b86f1375affa3cf6b49fbd06539  deviceinfo
-eeddbd3712c7385ef8daea252d71f9f91f8be03be43dea4ce036ae7d7b8a38d199a709ae87b9aa8fe8a63f0201224dbda704fd4b95c8c7d3b4f9852ae4e95c11  grub.cfg
+065b88a825a2b32c66ffe2ef3b4004560f41cdeedbd1a9cdbdc7bc29d52b43c698e4cd6881ce80eacac56b4689176a697dbfd0a89b20afb06963af2970db99cc  grub.cfg
 0f9357d4eea089628fbceb1e3e96d21a3f4329aeb6743158a6f877f967ef274506404eba949d5f01b7e1adea149f9a3aef992a5e8cd4181f93ab00909b1c5ecd  grub_early.cfg
-1684514a6b814a83473e9da8855fd776cf3f31a2be1f8834c370f710428b4ee305559e275be52894d167ccd1e32f8f1c8586f8a072f19e44b46caec9f504d453  HiFi.conf
-9c6edbe7ea387baf9bfa6c4a46b28c4fe274ab0994e0a1640012048407e6679c437de43cc50e6778c9a852132eaa680de3fd4e0256d36455d1dd57aa729ac8be  PINE64-PinePhonePro-.conf
-deb360baf914e1c917403d5e26291b9e9d27426876232ab753e4ebfe367423206f1fc01b85d195aa69fb4b51bcaed023423d0fcc0d73fa1bedd5fbe7b17f0fb5  VoiceCall.conf
+c5006c38828eb519917d57756f7831c4552feffef2d4922a384073f6a551535f615ad397d784e313818e0b943e1f6212bcca0aff9ce37da60b29547b1631f24b  modemmanager.conf
 43f67e94491791685cdbb4874bb3034b1d297bdf3d23e7405c45ba8c58de72b4fb6a9943b79f46ef7b8f4dbc4d9db254ebec8eb3453d720a5a8fad277c6a9d88  ppkb.sh
 420ee1d7522d4d56c2909580fd6ba7580483ca5455b13eb6d22e700063ce0c1a5c6d2f5b161dfce0d777636fe9a712aa82f38a0585f2feabea3785b02bae7515  setup-modem.sh
+1684514a6b814a83473e9da8855fd776cf3f31a2be1f8834c370f710428b4ee305559e275be52894d167ccd1e32f8f1c8586f8a072f19e44b46caec9f504d453  HiFi.conf
+9c6edbe7ea387baf9bfa6c4a46b28c4fe274ab0994e0a1640012048407e6679c437de43cc50e6778c9a852132eaa680de3fd4e0256d36455d1dd57aa729ac8be  PINE64-PinePhonePro-.conf
+e4d721163a844c68c0240be62a4692e7b9983054aee6d717f70687b901f569c6008e0c64a5bddf37e20f41b3936b4ef80909d7cbf09feeb0813303b3b46de80f  VoiceCall.conf
 "

device/community/device-pine64-pinephonepro/grub.cfg

@@ -3,4 +3,5 @@ timeout=0
 menuentry "postmarketOS" {
 	linux ($root)/vmlinuz console=tty0 earlycon=uart8250,mmio32,0xff1a0000 console=ttyS2,115200 panic=10 coherent_pool=1M loglevel=1 mem_sleep_default=s2idle PMOS_NO_OUTPUT_REDIRECT PMOS_FORCE_PARTITION_RESIZE fw_devlink=off
 	initrd ($root)/initramfs
+	devicetree ($root)/dtbs-pine64-pinephonepro/rockchip/rk3399-pinephone-pro.dtb
 }

device/community/device-pine64-pinephonepro/modemmanager.conf

@@ -0,0 +1,6 @@
+# /etc/conf.d/modemmanager: config file for modemmanager
+
+# Add extra command line options to modemmanager, use with care
+# ModemManager --help for possible values
+# Use quick suspend/resume hooks for the EG25-G modem in the PinePhone
+modemmanager_opts="--test-quick-suspend-resume"

device/community/device-pine64-pinephonepro/ucm/VoiceCall.conf

@@ -40,8 +40,8 @@ SectionVerb {
 		cset "name='Mono ADC Capture Switch' on"
 
 		# Set capture volume to 0dB so modem audio doesn't overdrive the ADC
-		cset "name='ADC Capture Volume' 47"
-		cset "name='Mono ADC Capture Volume' 47"
+		cset "name='ADC Capture Volume' 160"
+		cset "name='Mono ADC Capture Volume' 160"
 
 		# The second 'Mono ADC' path does not have a 'Boost Gain',
 		# set this to 0dB so that the volume of the AIF1 and AIF2 paths is equal.

device/community/device-samsung-espresso10/APKBUILD

@@ -1,13 +1,14 @@
+# Maintainer: Mighty17 <mightymb17@gmail.com>
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-samsung-espresso10
 pkgdesc="Samsung Galaxy Tab 2 (10.1 inch)"
-pkgver=0.2
-pkgrel=5
+pkgver=1
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
 options="!check !archcheck"
-depends="postmarketos-base linux-samsung-espresso10 mkbootimg"
+depends="postmarketos-base postmarketos-update-kernel linux-postmarketos-omap mkbootimg"
 makedepends="devicepkg-dev"
 source="deviceinfo"
 subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
@@ -21,11 +22,11 @@ package() {
 }
 
 nonfree_firmware() {
-	pkgdesc="Wifi firmware"
-	depends="firmware-samsung-espresso10"
+	pkgdesc="$pkgdesc (WiFi firmware)"
+	depends="firmware-samsung-espresso"
 	mkdir "$subpkgdir"
 }
 
 sha512sums="
-bcb54d60d6cabe8cfc36c5c1164f377404a43ca9324e15b12d33162c75ad8cad46907ff3bc1be216ecadbd46c060527abf332376f19b28323e1ec8534eba853c  deviceinfo
+e0f270451abf1d3b67dad9f7a46cd399e08c74c52ac152dfffde46ec3151ef44982302d53e58dc48fd24e5a01f5796d36fc22a85d182bc0df8eaf3f880025579  deviceinfo
 "

device/community/device-samsung-espresso10/deviceinfo

@@ -0,0 +1,32 @@
+# Reference: <https://postmarketos.org/deviceinfo>
+# Please use double quotes only. You can source this file in shell scripts.
+
+deviceinfo_format_version="0"
+deviceinfo_name="Samsung Galaxy Tab 2 (10.1 inch)"
+deviceinfo_manufacturer="Samsung"
+deviceinfo_codename="samsung-espresso10"
+deviceinfo_year="2012"
+deviceinfo_dtb="omap4-samsung-espresso10"
+deviceinfo_append_dtb="true"
+deviceinfo_arch="armv7"
+deviceinfo_flash_kernel_on_update="true"
+
+# Device related
+deviceinfo_chassis="tablet"
+deviceinfo_keyboard="false"
+deviceinfo_external_storage="true"
+deviceinfo_screen_width="1280"
+deviceinfo_screen_height="800"
+deviceinfo_gpu_accelerated="false"
+
+# Bootloader related
+deviceinfo_flash_method="heimdall-bootimg"
+deviceinfo_generate_bootimg="true"
+deviceinfo_bootimg_qcdt="false"
+deviceinfo_flash_offset_base="0x40000000"
+deviceinfo_flash_offset_kernel="0x00008000"
+deviceinfo_flash_offset_ramdisk="0x01000000"
+deviceinfo_flash_offset_second="0x00f00000"
+deviceinfo_flash_offset_tags="0x00000100"
+deviceinfo_flash_pagesize="2048"
+deviceinfo_flash_heimdall_partition_system="FACTORYFS"

device/community/device-samsung-espresso7/APKBUILD

@@ -1,9 +1,9 @@
 # Maintainer: Mighty17 <mightymb17@gmail.com>
 # Co-Maintainer: Antoni Aloy <aaloytorrens@gmail.com>
 # Reference: <https://postmarketos.org/devicepkg>
-pkgname=device-samsung-espresso3g
+pkgname=device-samsung-espresso7
 pkgdesc="Samsung Galaxy Tab 2 (7.0 inch)"
-pkgver=3.1
+pkgver=1
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -13,6 +13,8 @@ depends="postmarketos-base postmarketos-update-kernel linux-postmarketos-omap mk
 makedepends="devicepkg-dev"
 source="deviceinfo"
 subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
+replaces="device-samsung-espresso3g"
+provides="device-samsung-espresso3g=$pkgver-r$pkgrel"
 
 build() {
 	devicepkg_build $startdir $pkgname
@@ -24,10 +26,10 @@ package() {
 
 nonfree_firmware() {
 	pkgdesc="$pkgdesc (WiFi firmware)"
-	depends="firmware-samsung-espresso3g"
+	depends="firmware-samsung-espresso"
 	mkdir "$subpkgdir"
 }
 
 sha512sums="
-641b86a92f203784852202165871d316c5fdd071c5069e23e76e95a9e9800ea7860a5022b9456c9632ff9aabf1af67e0c7db2bd777f81577d8969f7a3087358b  deviceinfo
+103fe306c0bf2c55a45256946dcd77356dc926abc854f40c11bf9a691f21c09148b7213bbe163666755f028164d31f070d677fc8197cb1dc2332afc6afb51b60  deviceinfo
 "

device/community/device-samsung-espresso7/deviceinfo

@@ -2,9 +2,9 @@
 # Please use double quotes only. You can source this file in shell scripts.
 
 deviceinfo_format_version="0"
-deviceinfo_name="Samsung Galaxy Tab 2 3g (7.0 inch)"
+deviceinfo_name="Samsung Galaxy Tab 2 (7.0 inch)"
 deviceinfo_manufacturer="Samsung"
-deviceinfo_codename="samsung-espresso3g"
+deviceinfo_codename="samsung-espresso7"
 deviceinfo_year="2012"
 deviceinfo_dtb="omap4-samsung-espresso7"
 deviceinfo_append_dtb="true"
@@ -30,4 +30,3 @@ deviceinfo_flash_offset_second="0x00f00000"
 deviceinfo_flash_offset_tags="0x00000100"
 deviceinfo_flash_pagesize="2048"
 deviceinfo_flash_heimdall_partition_system="FACTORYFS"
-deviceinfo_flash_heimdall_partition_dtbo="dtbo"

device/community/firmware-samsung-espresso/APKBUILD

@@ -1,7 +1,7 @@
-pkgname=firmware-samsung-espresso3g
-pkgver=2
+pkgname=firmware-samsung-espresso
+pkgver=1
 pkgrel=0
-pkgdesc="Samsung Galaxy Tab 2 Firmware"
+pkgdesc="Samsung Galaxy Tab Firmware"
 url="https://github.com/TheMuppets/proprietary_vendor_samsung"
 arch="armv7"
 license="proprietary"
@@ -20,7 +20,9 @@ done
 
 package() {
 	install -Dm644 "$srcdir/nvram_net.txt" \
-		"$pkgdir"/lib/firmware/postmarketos/brcm/"brcmfmac4330-sdio.samsung,espresso3g.txt"
+		"$pkgdir"/lib/firmware/postmarketos/brcm/"brcmfmac4330-sdio.samsung,espresso7.txt"
+	install -Dm644 "$srcdir/nvram_net.txt" \
+		"$pkgdir"/lib/firmware/postmarketos/brcm/"brcmfmac4330-sdio.samsung,espresso10.txt"
 	install -Dm644 "$srcdir/bcmdhd_sta.bin" \
 		"$pkgdir"/lib/firmware/postmarketos/brcm/"brcmfmac4330-sdio.bin"
 }

device/community/linux-nokia-n900/APKBUILD

@@ -2,8 +2,8 @@
 # Co-Maintainer: Danct12 <danct12@disroot.org>
 
 pkgname=linux-nokia-n900
-pkgver=5.15.74
-pkgrel=2
+pkgver=5.15.81
+pkgrel=0
 pkgdesc="Mainline kernel fork for Nokia N900"
 arch="armv7"
 url="https://kernel.org/"
@@ -65,8 +65,8 @@ package() {
 
 sha512sums="
 d25ad40b5bcd6a4c6042fd0fd84e196e7a58024734c3e9a484fd0d5d54a0c1d87db8a3c784eff55e43b6f021709dc685eb0efa18d2aec327e4f88a79f405705a  linux-5.15.tar.xz
-c48120c5067003deb6b6ee057a1e6a3b635e2c1ff72435ced83d894d1b4ee03ca792d72777185db94e844e7fb5a4a49a98e6c906eb2cfaef87b96b7c8de5f622  linux-5.15.74.patch.xz
-ad905d3cec379353ccde68392ac1a945ba2a8687895363cecde014bc785142de0eda53fc22f3b346f4fb7bc30ac9c914b3923fe9d71223b96fa76fec77c560f0  config-nokia-n900.armv7
+022a3c82eb31596f9dde69a4c71721284f4129c5efd95fcef0c102ae4f53a70487e3c1ce44d92197510e98fcb0884398fc5b866938f93e542b2b010a592c5c75  linux-5.15.81.patch.xz
+7fbbed5b6488cea6518c91147ae32c56bb113ff83c415d0564d5f442ccfaa7bd847a15351983b4d68c44a9fca764e34e6c3681086069d7cf6da467df6a4fce98  config-nokia-n900.armv7
 04a39253afd25a7de03dc45ff322161672005406543c44b97d2dc293f202de7de446aee9707a690a290641c55c7bed6e78bbe096ca323dd7d88d3207427c8d31  0001-ARM-dts-n900-increase-charge-current-limit-to-950mA.patch
 3cc2036ba264bd855358361aacb309ad1cf1660cb82a0978523508d1b3fe513676c58f6efc5bb64f7601b77392c19d2c609b6d83541db7e418c1737cff3973e8  0002-power-supply-bq27xxx-expose-battery-data-when-CI.patch
 991237276bee4ff7bca24cf3a26afe3f12a2a604452793ad905a605890f761ac98374b5509cfbcab33c7b7ccf3da5cc286e70afe27b8e201387f403bf5025ae9  0003-wip-Revert-dma-direct-Fix-potential-NULL-pointer-der.patch

device/community/linux-nokia-n900/config-nokia-n900.armv7

@@ -4852,7 +4852,7 @@ CONFIG_IIO_SW_TRIGGER=m
 # CONFIG_FXLS8962AF_SPI is not set
 CONFIG_IIO_ST_ACCEL_3AXIS=m
 CONFIG_IIO_ST_ACCEL_I2C_3AXIS=m
-CONFIG_IIO_ST_ACCEL_SPI_3AXIS=m
+# CONFIG_IIO_ST_ACCEL_SPI_3AXIS is not set
 # CONFIG_KXSD9 is not set
 # CONFIG_KXCJK1013 is not set
 # CONFIG_MC3230 is not set

device/community/linux-pine64-pinephonepro/APKBUILD

@@ -2,8 +2,10 @@
 # Co-Maintainer: Jan Jasper de Kroon <jajadekroon@gmail.com>
 
 pkgname=linux-pine64-pinephonepro
-pkgver=6.0.8
-pkgrel=0
+pkgver=6.1
+_pkgver=6.1
+_tagdate=20221212-1243
+pkgrel=1
 pkgdesc="Mainline kernel for the pinephone pro"
 arch="aarch64"
 _flavor="${pkgname#linux-}"
@@ -38,14 +40,17 @@ esac
 # Source
 _config="config-$_flavor.$CARCH"
 case $pkgver in
+	*.*rc*)  _kernver=$_pkgver
+	         _rc=1;;
 	*.*.*)	_kernver=${pkgver%.0};;
 	*.*)	_kernver=$pkgver;;
 esac
 source="
-	https://gitlab.com/pine64-org/linux/-/archive/ppp-$pkgver-ppkb/linux-ppp-$pkgver-ppkb.tar.gz
+	https://gitlab.com/pine64-org/linux/-/archive/ppp-$_kernver-$_tagdate/linux-ppp-$_kernver-$_tagdate.tar.gz
 	config-$_flavor.aarch64
+	stk3311-pinctl-patch.patch
 	"
-builddir="$srcdir/linux-ppp-$pkgver-ppkb"
+builddir="$srcdir/linux-ppp-$_kernver-$_tagdate"
 
 prepare() {
 	default_prepare
@@ -75,6 +80,7 @@ package() {
 
 
 sha512sums="
-b529b8f52b02919e1b9f59cb483fbed095da12dd74425cbf18075dd2e04d6e243a29a4b9ac9f6f9897f7e5a500cf25444333c5f25d62a4ff2e83876ca15b8d47  linux-ppp-6.0.8-ppkb.tar.gz
-dd72255f253da0f5ac88ea794a909425250f8db9eba878cf063c1646502bb60625d766cbb67cc9d6bc1464d397dead127d6860f7c274545c787f93f10191b1cc  config-pine64-pinephonepro.aarch64
+9fe6d47bcd8799a0d1ab4eb8bf0e3c52854b28f4de0f75789c4bb5aad48e76aea4edecfc36350623ed320f43b480c69aa2c83f4244c51f1c0d0cc7f610f5882b  linux-ppp-6.1-20221212-1243.tar.gz
+3223648b5269c902445297a4da4a29cea2e92ced6ca22c1a75cf02b71c21de650b605d6c0a1028f02889ba971bac2e17e0418668dbc020245b4396e52f8bebed  config-pine64-pinephonepro.aarch64
+b04b4081b5716802bfe6323f9b1c5fce503bef92e680e8ee49d3c1bc579bed5e79d23054db11f39620c055167a0444104423ec497bc7b60d7aaa115e2f7db775  stk3311-pinctl-patch.patch
 "

device/community/linux-pine64-pinephonepro/stk3311-pinctl-patch.patch

@@ -0,0 +1,13 @@
+diff --git a/arch/arm64/boot/dts/rockchip/rk3399-pinephone-pro.dts b/arch/arm64/boot/dts/rockchip/rk3399-pinephone-pro.dts
+index e50bb54a4209..fceb5934d592 100644
+--- a/arch/arm64/boot/dts/rockchip/rk3399-pinephone-pro.dts
++++ b/arch/arm64/boot/dts/rockchip/rk3399-pinephone-pro.dts
+@@ -1338,7 +1338,7 @@ display_pwren1: display-pwren1 {
+ 
+ 	stk3311 {
+ 		stk3311_int: stk3311-int {
+-			rockchip,pins = <4 RK_PD3 RK_FUNC_GPIO &pcfg_input_pull_up>;
++			rockchip,pins = <4 RK_PD3 RK_FUNC_GPIO &pcfg_input_enable>;
+ 		};
+ 	};
+ 

device/community/linux-postmarketos-exynos4/APKBUILD

@@ -4,7 +4,7 @@
 
 pkgname=linux-postmarketos-exynos4
 pkgver=6.0.2
-pkgrel=1
+pkgrel=2
 pkgdesc="Mainline kernel fork for Samsung Exynos4 devices"
 arch="armv7"
 _carch="arm"
@@ -92,7 +92,7 @@ package() {
 
 sha512sums="
 cee8ce158881ef84d475befec58f21f3e5e71e760b012db597204c5693501ec0de2904957ccbc6156bcc697125a44c45fdb0e9d11c844d245eab455b858944f0  linux-6.0.2.tar.xz
-0a57845e5bf8ee66cc9a5adc72a5d83fdc04ec58311412182790b9f1216bac67adae0244e414a8be91b009dfd60c442c326786ca40b5bb99a7c53142d6f1b0eb  config-postmarketos-exynos4.armv7
+3a23d005377877c4699c932a0f0f07d09152d4fe5d76264185589bea5c837aacdf46d03a113474c97cdd1ef1a20b811580e912d003c8dae98dbad4cbf1c3594c  config-postmarketos-exynos4.armv7
 1d2090c9d907674ec9e6b56d030b0f59d62b73e083689695ef61fd3354b1fe86b24ccb3c518b2d36034f1636beb221e9a19c9cbef283f2652cc8d444a4fa7528  0001-ARM-decompressor-Flush-tlb-before-swiching-domain-0-.patch
 8c7acab8e186441a23c80bb851658c3df69ec1e94ed6b4d546afe572609cbc350a6cd55cc7343656095a0f55fee0505c40b6de7642d367502561a26f600137e3  0002-ARM-dts-exynos-Add-reboot-modes-to-midas.patch
 f0295c808a2ec171976aaef137f2de0b7136e69cb342fd4b514af5b67e321e7e5779204e6d60d71e3213507113e2ec6e11bfcb0de2085b2085d226cbae2cdede  0003-mmc-core-Workaround-VTU00M-0xf1-FTL-metadata-corrupt.patch

device/community/linux-postmarketos-exynos4/config-postmarketos-exynos4.armv7

@@ -2,7 +2,7 @@
 # Automatically generated file; DO NOT EDIT.
 # Linux/arm 6.0.2 Kernel Configuration
 #
-CONFIG_CC_VERSION_TEXT="armv7-alpine-linux-musleabihf-gcc (Alpine 12.2.1_git20220924-r3) 12.2.1 20220924"
+CONFIG_CC_VERSION_TEXT="armv7-alpine-linux-musleabihf-gcc (Alpine 12.2.1_git20220924-r4) 12.2.1 20220924"
 CONFIG_CC_IS_GCC=y
 CONFIG_GCC_VERSION=120201
 CONFIG_CLANG_VERSION=0
@@ -65,7 +65,6 @@ CONFIG_IRQ_DOMAIN_HIERARCHY=y
 CONFIG_GENERIC_IRQ_IPI=y
 CONFIG_IRQ_FORCED_THREADING=y
 CONFIG_SPARSE_IRQ=y
-# CONFIG_GENERIC_IRQ_DEBUGFS is not set
 # end of IRQ subsystem
 
 CONFIG_GENERIC_IRQ_MULTI_HANDLER=y
@@ -137,7 +136,6 @@ CONFIG_RCU_NEED_SEGCBLIST=y
 CONFIG_LOG_BUF_SHIFT=17
 CONFIG_LOG_CPU_MAX_BUF_SHIFT=12
 CONFIG_PRINTK_SAFE_LOG_BUF_SHIFT=13
-CONFIG_PRINTK_INDEX=y
 CONFIG_GENERIC_SCHED_CLOCK=y
 
 #
@@ -170,7 +168,6 @@ CONFIG_CGROUP_DEVICE=y
 CONFIG_CGROUP_CPUACCT=y
 CONFIG_CGROUP_PERF=y
 # CONFIG_CGROUP_MISC is not set
-# CONFIG_CGROUP_DEBUG is not set
 CONFIG_SOCK_CGROUP_DATA=y
 CONFIG_NAMESPACES=y
 CONFIG_UTS_NS=y
@@ -231,7 +228,6 @@ CONFIG_IO_URING=y
 CONFIG_ADVISE_SYSCALLS=y
 CONFIG_MEMBARRIER=y
 CONFIG_KALLSYMS=y
-CONFIG_KALLSYMS_ALL=y
 CONFIG_KALLSYMS_BASE_RELATIVE=y
 CONFIG_ARCH_HAS_MEMBARRIER_SYNC_CORE=y
 CONFIG_KCMP=y
@@ -244,7 +240,6 @@ CONFIG_PERF_USE_VMALLOC=y
 # Kernel Performance Events And Counters
 #
 CONFIG_PERF_EVENTS=y
-# CONFIG_DEBUG_PERF_USE_VMALLOC is not set
 # end of Kernel Performance Events And Counters
 
 CONFIG_SYSTEM_DATA_VERIFICATION=y
@@ -445,14 +440,13 @@ CONFIG_SCHED_MC=y
 CONFIG_HAVE_ARM_SCU=y
 CONFIG_HAVE_ARM_ARCH_TIMER=y
 CONFIG_MCPM=y
-CONFIG_BIG_LITTLE=y
-# CONFIG_BL_SWITCHER is not set
+# CONFIG_BIG_LITTLE is not set
 CONFIG_VMSPLIT_3G=y
 # CONFIG_VMSPLIT_3G_OPT is not set
 # CONFIG_VMSPLIT_2G is not set
 # CONFIG_VMSPLIT_1G is not set
 CONFIG_PAGE_OFFSET=0xC0000000
-CONFIG_NR_CPUS=8
+CONFIG_NR_CPUS=4
 CONFIG_HOTPLUG_CPU=y
 # CONFIG_ARM_PSCI is not set
 CONFIG_ARCH_NR_GPIO=512
@@ -688,14 +682,12 @@ CONFIG_ARCH_HAS_STRICT_KERNEL_RWX=y
 CONFIG_STRICT_KERNEL_RWX=y
 CONFIG_ARCH_HAS_STRICT_MODULE_RWX=y
 CONFIG_STRICT_MODULE_RWX=y
-# CONFIG_LOCK_EVENT_COUNTS is not set
 CONFIG_ARCH_WANT_LD_ORPHAN_WARN=y
 CONFIG_HAVE_ARCH_PFN_VALID=y
 
 #
 # GCOV-based kernel profiling
 #
-# CONFIG_GCOV_KERNEL is not set
 CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y
 # end of GCOV-based kernel profiling
 
@@ -714,10 +706,11 @@ CONFIG_MODULE_UNLOAD=y
 # CONFIG_MODVERSIONS is not set
 # CONFIG_MODULE_SRCVERSION_ALL is not set
 # CONFIG_MODULE_SIG is not set
-CONFIG_MODULE_COMPRESS_NONE=y
+# CONFIG_MODULE_COMPRESS_NONE is not set
 # CONFIG_MODULE_COMPRESS_GZIP is not set
-# CONFIG_MODULE_COMPRESS_XZ is not set
+CONFIG_MODULE_COMPRESS_XZ=y
 # CONFIG_MODULE_COMPRESS_ZSTD is not set
+# CONFIG_MODULE_DECOMPRESS is not set
 # CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS is not set
 CONFIG_MODPROBE_PATH="/sbin/modprobe"
 CONFIG_MODULES_TREE_LOOKUP=y
@@ -734,7 +727,6 @@ CONFIG_BLK_DEV_THROTTLING=y
 # CONFIG_BLK_CGROUP_IOLATENCY is not set
 # CONFIG_BLK_CGROUP_IOCOST is not set
 # CONFIG_BLK_CGROUP_IOPRIO is not set
-CONFIG_BLK_DEBUG_FS=y
 # CONFIG_BLK_SED_OPAL is not set
 # CONFIG_BLK_INLINE_ENCRYPTION is not set
 
@@ -838,8 +830,6 @@ CONFIG_BOUNCE=y
 CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
 CONFIG_ARCH_WANT_GENERAL_HUGETLB=y
 CONFIG_CMA=y
-# CONFIG_CMA_DEBUG is not set
-# CONFIG_CMA_DEBUGFS is not set
 # CONFIG_CMA_SYSFS is not set
 CONFIG_CMA_AREAS=7
 CONFIG_GENERIC_EARLY_IOREMAP=y
@@ -847,7 +837,10 @@ CONFIG_GENERIC_EARLY_IOREMAP=y
 CONFIG_ARCH_HAS_CURRENT_STACK_POINTER=y
 CONFIG_VM_EVENT_COUNTERS=y
 # CONFIG_PERCPU_STATS is not set
-# CONFIG_GUP_TEST is not set
+
+#
+# GUP_TEST needs to have DEBUG_FS enabled
+#
 CONFIG_KMAP_LOCAL=y
 CONFIG_KMAP_LOCAL_NON_LINEAR_PTE_ARRAY=y
 # CONFIG_ANON_VMA_NAME is not set
@@ -1338,8 +1331,6 @@ CONFIG_BT_LE=y
 CONFIG_BT_LEDS=y
 # CONFIG_BT_MSFTEXT is not set
 # CONFIG_BT_AOSPEXT is not set
-CONFIG_BT_DEBUGFS=y
-# CONFIG_BT_SELFTEST is not set
 
 #
 # Bluetooth device drivers
@@ -1389,7 +1380,6 @@ CONFIG_CFG80211=m
 CONFIG_CFG80211_REQUIRE_SIGNED_REGDB=y
 CONFIG_CFG80211_USE_KERNEL_REGDB_KEYS=y
 CONFIG_CFG80211_DEFAULT_PS=y
-# CONFIG_CFG80211_DEBUGFS is not set
 CONFIG_CFG80211_CRDA_SUPPORT=y
 # CONFIG_CFG80211_WEXT is not set
 CONFIG_MAC80211=m
@@ -1399,7 +1389,6 @@ CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y
 CONFIG_MAC80211_RC_DEFAULT="minstrel_ht"
 # CONFIG_MAC80211_MESH is not set
 CONFIG_MAC80211_LEDS=y
-# CONFIG_MAC80211_DEBUGFS is not set
 # CONFIG_MAC80211_MESSAGE_TRACING is not set
 # CONFIG_MAC80211_DEBUG_MENU is not set
 CONFIG_MAC80211_STA_HASH_MAX_SIZE=0
@@ -1485,9 +1474,6 @@ CONFIG_FW_CACHE=y
 CONFIG_WANT_DEV_COREDUMP=y
 CONFIG_ALLOW_DEV_COREDUMP=y
 CONFIG_DEV_COREDUMP=y
-# CONFIG_DEBUG_DRIVER is not set
-# CONFIG_DEBUG_DEVRES is not set
-# CONFIG_DEBUG_TEST_DRIVER_REMOVE is not set
 # CONFIG_TEST_ASYNC_DRIVER_PROBE is not set
 CONFIG_GENERIC_CPU_AUTOPROBE=y
 CONFIG_GENERIC_CPU_VULNERABILITIES=y
@@ -1558,7 +1544,6 @@ CONFIG_ZRAM_DEF_COMP_LZORLE=y
 # CONFIG_ZRAM_DEF_COMP_LZO is not set
 CONFIG_ZRAM_DEF_COMP="lzo-rle"
 # CONFIG_ZRAM_WRITEBACK is not set
-# CONFIG_ZRAM_MEMORY_TRACKING is not set
 CONFIG_BLK_DEV_LOOP=y
 CONFIG_BLK_DEV_LOOP_MIN_COUNT=8
 # CONFIG_BLK_DEV_DRBD is not set
@@ -2046,7 +2031,6 @@ CONFIG_WLAN_VENDOR_QUANTENNA=y
 # CONFIG_WWAN is not set
 # end of Wireless WAN
 
-# CONFIG_NETDEVSIM is not set
 # CONFIG_NET_FAILOVER is not set
 # CONFIG_ISDN is not set
 
@@ -2408,7 +2392,6 @@ CONFIG_I2C_CROS_EC_TUNNEL=y
 
 # CONFIG_I3C is not set
 CONFIG_SPI=y
-# CONFIG_SPI_DEBUG is not set
 CONFIG_SPI_MASTER=y
 # CONFIG_SPI_MEM is not set
 
@@ -2467,7 +2450,6 @@ CONFIG_PTP_1588_CLOCK_OPTIONAL=y
 CONFIG_PINCTRL=y
 CONFIG_PINMUX=y
 CONFIG_PINCONF=y
-# CONFIG_DEBUG_PINCTRL is not set
 # CONFIG_PINCTRL_MCP23S08 is not set
 # CONFIG_PINCTRL_MICROCHIP_SGPIO is not set
 # CONFIG_PINCTRL_OCELOT is not set
@@ -2487,7 +2469,6 @@ CONFIG_ARCH_HAVE_CUSTOM_GPIO_H=y
 CONFIG_GPIOLIB=y
 CONFIG_GPIOLIB_FASTPATH_LIMIT=512
 CONFIG_OF_GPIO=y
-CONFIG_DEBUG_GPIO=y
 CONFIG_GPIO_CDEV=y
 CONFIG_GPIO_CDEV_V1=y
 
@@ -3486,7 +3467,6 @@ CONFIG_VIDEO_S5K6A3=m
 CONFIG_DRM=y
 CONFIG_DRM_MIPI_DSI=y
 # CONFIG_DRM_DEBUG_MM is not set
-# CONFIG_DRM_DEBUG_SELFTEST is not set
 CONFIG_DRM_KMS_HELPER=y
 CONFIG_DRM_FBDEV_EMULATION=y
 CONFIG_DRM_FBDEV_OVERALLOC=100
@@ -4372,9 +4352,7 @@ CONFIG_USB_HSIC_USB3503=y
 # end of USB Physical Layer drivers
 
 CONFIG_USB_GADGET=y
-# CONFIG_USB_GADGET_DEBUG is not set
 # CONFIG_USB_GADGET_DEBUG_FILES is not set
-# CONFIG_USB_GADGET_DEBUG_FS is not set
 CONFIG_USB_GADGET_VBUS_DRAW=2
 CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2
 
@@ -4712,7 +4690,6 @@ CONFIG_PL330_DMA=y
 # DMABUF options
 #
 CONFIG_SYNC_FILE=y
-# CONFIG_SW_SYNC is not set
 # CONFIG_UDMABUF is not set
 # CONFIG_DMABUF_MOVE_NOTIFY is not set
 # CONFIG_DMABUF_DEBUG is not set
@@ -4821,7 +4798,6 @@ CONFIG_CROS_EC_PROTO=y
 CONFIG_CROS_EC_CHARDEV=y
 CONFIG_CROS_EC_LIGHTBAR=y
 CONFIG_CROS_EC_VBC=y
-CONFIG_CROS_EC_DEBUGFS=y
 CONFIG_CROS_EC_SENSORHUB=y
 CONFIG_CROS_EC_SYSFS=y
 CONFIG_CROS_USBPD_NOTIFY=y
@@ -4886,7 +4862,6 @@ CONFIG_IOMMU_IO_PGTABLE_LPAE=y
 # CONFIG_IOMMU_IO_PGTABLE_ARMV7S is not set
 # end of Generic IOMMU Pagetable Support
 
-# CONFIG_IOMMU_DEBUGFS is not set
 CONFIG_IOMMU_DEFAULT_DMA_STRICT=y
 # CONFIG_IOMMU_DEFAULT_DMA_LAZY is not set
 # CONFIG_IOMMU_DEFAULT_PASSTHROUGH is not set
@@ -5517,7 +5492,6 @@ CONFIG_AK8975=y
 
 CONFIG_PWM=y
 CONFIG_PWM_SYSFS=y
-# CONFIG_PWM_DEBUG is not set
 # CONFIG_PWM_ATMEL_TCB is not set
 # CONFIG_PWM_CLK is not set
 # CONFIG_PWM_CROS_EC is not set
@@ -5626,16 +5600,16 @@ CONFIG_PM_OPP=y
 CONFIG_DCACHE_WORD_ACCESS=y
 # CONFIG_VALIDATE_FS_PARSER is not set
 CONFIG_FS_IOMAP=y
-CONFIG_EXT2_FS=y
+CONFIG_EXT2_FS=m
 # CONFIG_EXT2_FS_XATTR is not set
 # CONFIG_EXT3_FS is not set
-CONFIG_EXT4_FS=y
+CONFIG_EXT4_FS=m
 CONFIG_EXT4_FS_POSIX_ACL=y
 CONFIG_EXT4_FS_SECURITY=y
 # CONFIG_EXT4_DEBUG is not set
-CONFIG_JBD2=y
+CONFIG_JBD2=m
 # CONFIG_JBD2_DEBUG is not set
-CONFIG_FS_MBCACHE=y
+CONFIG_FS_MBCACHE=m
 # CONFIG_REISERFS_FS is not set
 # CONFIG_JFS_FS is not set
 # CONFIG_XFS_FS is not set
@@ -5670,12 +5644,12 @@ CONFIG_DNOTIFY=y
 CONFIG_INOTIFY_USER=y
 # CONFIG_FANOTIFY is not set
 # CONFIG_QUOTA is not set
-CONFIG_AUTOFS4_FS=y
+CONFIG_AUTOFS4_FS=m
 CONFIG_AUTOFS_FS=y
 CONFIG_FUSE_FS=m
 # CONFIG_CUSE is not set
 # CONFIG_VIRTIO_FS is not set
-CONFIG_OVERLAY_FS=y
+CONFIG_OVERLAY_FS=m
 # CONFIG_OVERLAY_FS_REDIRECT_DIR is not set
 CONFIG_OVERLAY_FS_REDIRECT_ALWAYS_FOLLOW=y
 # CONFIG_OVERLAY_FS_INDEX is not set
@@ -5913,7 +5887,7 @@ CONFIG_CRYPTO_SKCIPHER=y
 CONFIG_CRYPTO_SKCIPHER2=y
 CONFIG_CRYPTO_HASH=y
 CONFIG_CRYPTO_HASH2=y
-CONFIG_CRYPTO_RNG=y
+CONFIG_CRYPTO_RNG=m
 CONFIG_CRYPTO_RNG2=y
 CONFIG_CRYPTO_RNG_DEFAULT=m
 CONFIG_CRYPTO_AKCIPHER2=y
@@ -5960,7 +5934,7 @@ CONFIG_CRYPTO_GCM=m
 #
 # Block modes
 #
-CONFIG_CRYPTO_CBC=y
+CONFIG_CRYPTO_CBC=m
 # CONFIG_CRYPTO_CFB is not set
 CONFIG_CRYPTO_CTR=m
 # CONFIG_CRYPTO_CTS is not set
@@ -5985,7 +5959,7 @@ CONFIG_CRYPTO_HMAC=y
 #
 # Digest
 #
-CONFIG_CRYPTO_CRC32C=y
+CONFIG_CRYPTO_CRC32C=m
 CONFIG_CRYPTO_CRC32=m
 CONFIG_CRYPTO_XXHASH=m
 CONFIG_CRYPTO_BLAKE2B=m
@@ -6007,7 +5981,7 @@ CONFIG_CRYPTO_SHA3=m
 #
 # Ciphers
 #
-CONFIG_CRYPTO_AES=y
+CONFIG_CRYPTO_AES=m
 # CONFIG_CRYPTO_AES_TI is not set
 # CONFIG_CRYPTO_ANUBIS is not set
 # CONFIG_CRYPTO_ARC4 is not set
@@ -6015,7 +5989,7 @@ CONFIG_CRYPTO_AES=y
 # CONFIG_CRYPTO_CAMELLIA is not set
 # CONFIG_CRYPTO_CAST5 is not set
 # CONFIG_CRYPTO_CAST6 is not set
-CONFIG_CRYPTO_DES=y
+CONFIG_CRYPTO_DES=m
 # CONFIG_CRYPTO_FCRYPT is not set
 # CONFIG_CRYPTO_KHAZAD is not set
 # CONFIG_CRYPTO_CHACHA20 is not set
@@ -6057,8 +6031,8 @@ CONFIG_CRYPTO_USER_API_ENABLE_OBSOLETE=y
 # CONFIG_CRYPTO_STATS is not set
 CONFIG_CRYPTO_HASH_INFO=y
 CONFIG_CRYPTO_HW=y
-CONFIG_CRYPTO_DEV_EXYNOS_RNG=y
-CONFIG_CRYPTO_DEV_S5P=y
+CONFIG_CRYPTO_DEV_EXYNOS_RNG=m
+CONFIG_CRYPTO_DEV_S5P=m
 # CONFIG_CRYPTO_DEV_ATMEL_ECC is not set
 # CONFIG_CRYPTO_DEV_ATMEL_SHA204A is not set
 # CONFIG_CRYPTO_DEV_SAFEXCEL is not set
@@ -6067,7 +6041,7 @@ CONFIG_CRYPTO_DEV_S5P=y
 CONFIG_ASYMMETRIC_KEY_TYPE=y
 CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=y
 CONFIG_X509_CERTIFICATE_PARSER=y
-CONFIG_PKCS8_PRIVATE_KEY_PARSER=y
+CONFIG_PKCS8_PRIVATE_KEY_PARSER=m
 CONFIG_PKCS7_MESSAGE_PARSER=y
 # CONFIG_PKCS7_TEST_KEY is not set
 # CONFIG_SIGNED_PE_FILE_VERIFICATION is not set
@@ -6104,7 +6078,7 @@ CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y
 #
 # Crypto library routines
 #
-CONFIG_CRYPTO_LIB_AES=y
+CONFIG_CRYPTO_LIB_AES=m
 CONFIG_CRYPTO_LIB_ARC4=m
 CONFIG_CRYPTO_ARCH_HAVE_LIB_BLAKE2S=y
 CONFIG_CRYPTO_ARCH_HAVE_LIB_CHACHA=m
@@ -6112,7 +6086,7 @@ CONFIG_CRYPTO_LIB_CHACHA=m
 CONFIG_CRYPTO_ARCH_HAVE_LIB_CURVE25519=m
 CONFIG_CRYPTO_LIB_CURVE25519_GENERIC=m
 CONFIG_CRYPTO_LIB_CURVE25519=m
-CONFIG_CRYPTO_LIB_DES=y
+CONFIG_CRYPTO_LIB_DES=m
 CONFIG_CRYPTO_LIB_POLY1305_RSIZE=9
 CONFIG_CRYPTO_ARCH_HAVE_LIB_POLY1305=m
 CONFIG_CRYPTO_LIB_POLY1305=m
@@ -6193,7 +6167,6 @@ CONFIG_CMA_SIZE_SEL_MBYTES=y
 # CONFIG_CMA_SIZE_SEL_MAX is not set
 CONFIG_CMA_ALIGNMENT=8
 # CONFIG_DMA_API_DEBUG is not set
-# CONFIG_DMA_MAP_BENCHMARK is not set
 CONFIG_SGL_ALLOC=y
 CONFIG_CPU_RMAP=y
 CONFIG_DQL=y
@@ -6243,50 +6216,30 @@ CONFIG_PRINTK_TIME=y
 CONFIG_CONSOLE_LOGLEVEL_DEFAULT=7
 CONFIG_CONSOLE_LOGLEVEL_QUIET=4
 CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
-# CONFIG_BOOT_PRINTK_DELAY is not set
 CONFIG_DYNAMIC_DEBUG=y
 CONFIG_DYNAMIC_DEBUG_CORE=y
 CONFIG_SYMBOLIC_ERRNAME=y
 CONFIG_DEBUG_BUGVERBOSE=y
 # end of printk and dmesg options
 
-CONFIG_DEBUG_KERNEL=y
-CONFIG_DEBUG_MISC=y
+# CONFIG_DEBUG_KERNEL is not set
 
 #
 # Compile-time checks and compiler options
 #
-CONFIG_DEBUG_INFO=y
-# CONFIG_DEBUG_INFO_NONE is not set
-CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y
-# CONFIG_DEBUG_INFO_DWARF4 is not set
-# CONFIG_DEBUG_INFO_DWARF5 is not set
-# CONFIG_DEBUG_INFO_REDUCED is not set
-# CONFIG_DEBUG_INFO_COMPRESSED is not set
-# CONFIG_DEBUG_INFO_SPLIT is not set
-# CONFIG_GDB_SCRIPTS is not set
 CONFIG_FRAME_WARN=1024
 # CONFIG_STRIP_ASM_SYMS is not set
-# CONFIG_READABLE_ASM is not set
 # CONFIG_HEADERS_INSTALL is not set
 # CONFIG_DEBUG_SECTION_MISMATCH is not set
 CONFIG_SECTION_MISMATCH_WARN_ONLY=y
-# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
 # end of Compile-time checks and compiler options
 
 #
 # Generic Kernel Debugging Instruments
 #
-CONFIG_MAGIC_SYSRQ=y
-CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE=0x1
-CONFIG_MAGIC_SYSRQ_SERIAL=y
-CONFIG_MAGIC_SYSRQ_SERIAL_SEQUENCE=""
-CONFIG_DEBUG_FS=y
-CONFIG_DEBUG_FS_ALLOW_ALL=y
-# CONFIG_DEBUG_FS_DISALLOW_MOUNT is not set
-# CONFIG_DEBUG_FS_ALLOW_NONE is not set
+# CONFIG_MAGIC_SYSRQ is not set
+# CONFIG_DEBUG_FS is not set
 CONFIG_HAVE_ARCH_KGDB=y
-# CONFIG_KGDB is not set
 # CONFIG_UBSAN is not set
 CONFIG_HAVE_KCSAN_COMPILER=y
 # end of Generic Kernel Debugging Instruments
@@ -6294,35 +6247,20 @@ CONFIG_HAVE_KCSAN_COMPILER=y
 #
 # Networking Debugging
 #
-# CONFIG_NET_DEV_REFCNT_TRACKER is not set
-# CONFIG_NET_NS_REFCNT_TRACKER is not set
-# CONFIG_DEBUG_NET is not set
 # end of Networking Debugging
 
 #
 # Memory Debugging
 #
 # CONFIG_PAGE_EXTENSION is not set
-# CONFIG_DEBUG_PAGEALLOC is not set
 CONFIG_SLUB_DEBUG=y
 # CONFIG_SLUB_DEBUG_ON is not set
-# CONFIG_PAGE_OWNER is not set
 # CONFIG_PAGE_POISONING is not set
 # CONFIG_DEBUG_RODATA_TEST is not set
 # CONFIG_DEBUG_WX is not set
-# CONFIG_DEBUG_OBJECTS is not set
-# CONFIG_SHRINKER_DEBUG is not set
 CONFIG_HAVE_DEBUG_KMEMLEAK=y
-# CONFIG_DEBUG_KMEMLEAK is not set
-# CONFIG_DEBUG_STACK_USAGE is not set
-# CONFIG_SCHED_STACK_END_CHECK is not set
-# CONFIG_DEBUG_VM is not set
 CONFIG_ARCH_HAS_DEBUG_VIRTUAL=y
-# CONFIG_DEBUG_VIRTUAL is not set
 CONFIG_DEBUG_MEMORY_INIT=y
-# CONFIG_DEBUG_PER_CPU_MAPS is not set
-# CONFIG_DEBUG_KMAP_LOCAL is not set
-# CONFIG_DEBUG_HIGHMEM is not set
 CONFIG_HAVE_ARCH_KASAN=y
 CONFIG_HAVE_ARCH_KASAN_VMALLOC=y
 CONFIG_CC_HAS_KASAN_GENERIC=y
@@ -6332,81 +6270,46 @@ CONFIG_HAVE_ARCH_KFENCE=y
 # CONFIG_KFENCE is not set
 # end of Memory Debugging
 
-# CONFIG_DEBUG_SHIRQ is not set
-
 #
 # Debug Oops, Lockups and Hangs
 #
 # CONFIG_PANIC_ON_OOPS is not set
 CONFIG_PANIC_ON_OOPS_VALUE=0
 CONFIG_PANIC_TIMEOUT=0
-# CONFIG_SOFTLOCKUP_DETECTOR is not set
-# CONFIG_DETECT_HUNG_TASK is not set
-# CONFIG_WQ_WATCHDOG is not set
 # CONFIG_TEST_LOCKUP is not set
 # end of Debug Oops, Lockups and Hangs
 
 #
 # Scheduler Debugging
 #
-# CONFIG_SCHED_DEBUG is not set
-# CONFIG_SCHEDSTATS is not set
 # end of Scheduler Debugging
 
 # CONFIG_DEBUG_TIMEKEEPING is not set
-# CONFIG_DEBUG_PREEMPT is not set
 
 #
 # Lock Debugging (spinlocks, mutexes, etc...)
 #
 CONFIG_LOCK_DEBUGGING_SUPPORT=y
-# CONFIG_PROVE_LOCKING is not set
-# CONFIG_LOCK_STAT is not set
-# CONFIG_DEBUG_RT_MUTEXES is not set
-# CONFIG_DEBUG_SPINLOCK is not set
-# CONFIG_DEBUG_MUTEXES is not set
-# CONFIG_DEBUG_WW_MUTEX_SLOWPATH is not set
-# CONFIG_DEBUG_RWSEMS is not set
-# CONFIG_DEBUG_LOCK_ALLOC is not set
-# CONFIG_DEBUG_ATOMIC_SLEEP is not set
-# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
-# CONFIG_LOCK_TORTURE_TEST is not set
 # CONFIG_WW_MUTEX_SELFTEST is not set
-# CONFIG_SCF_TORTURE_TEST is not set
 # end of Lock Debugging (spinlocks, mutexes, etc...)
 
 # CONFIG_DEBUG_IRQFLAGS is not set
 CONFIG_STACKTRACE=y
 # CONFIG_WARN_ALL_UNSEEDED_RANDOM is not set
-# CONFIG_DEBUG_KOBJECT is not set
 
 #
 # Debug kernel data structures
 #
-# CONFIG_DEBUG_LIST is not set
-# CONFIG_DEBUG_PLIST is not set
-# CONFIG_DEBUG_SG is not set
-# CONFIG_DEBUG_NOTIFIERS is not set
 # CONFIG_BUG_ON_DATA_CORRUPTION is not set
 # end of Debug kernel data structures
 
-# CONFIG_DEBUG_CREDENTIALS is not set
-
 #
 # RCU Debugging
 #
-# CONFIG_RCU_SCALE_TEST is not set
-# CONFIG_RCU_TORTURE_TEST is not set
-# CONFIG_RCU_REF_SCALE_TEST is not set
 CONFIG_RCU_CPU_STALL_TIMEOUT=21
 CONFIG_RCU_EXP_CPU_STALL_TIMEOUT=0
-# CONFIG_RCU_TRACE is not set
-# CONFIG_RCU_EQS_DEBUG is not set
 # end of RCU Debugging
 
-# CONFIG_DEBUG_WQ_FORCE_RR_CPU is not set
-# CONFIG_CPU_HOTPLUG_STATE_CONTROL is not set
-# CONFIG_LATENCYTOP is not set
 CONFIG_HAVE_FUNCTION_TRACER=y
 CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
 CONFIG_HAVE_DYNAMIC_FTRACE=y
@@ -6424,12 +6327,10 @@ CONFIG_STRICT_DEVMEM=y
 #
 # arm Debugging
 #
-# CONFIG_ARM_PTDUMP_DEBUGFS is not set
 # CONFIG_UNWINDER_FRAME_POINTER is not set
 CONFIG_UNWINDER_ARM=y
 CONFIG_ARM_UNWIND=y
 CONFIG_DEBUG_USER=y
-# CONFIG_DEBUG_LL is not set
 CONFIG_DEBUG_LL_INCLUDE="mach/debug-macro.S"
 CONFIG_UNCOMPRESS_INCLUDE="debug/uncompress.h"
 # CONFIG_PID_IN_CONTEXTIDR is not set
@@ -6440,21 +6341,13 @@ CONFIG_UNCOMPRESS_INCLUDE="debug/uncompress.h"
 # Kernel Testing and Coverage
 #
 # CONFIG_KUNIT is not set
-# CONFIG_NOTIFIER_ERROR_INJECTION is not set
-# CONFIG_FAULT_INJECTION is not set
 CONFIG_ARCH_HAS_KCOV=y
 CONFIG_CC_HAS_SANCOV_TRACE_PC=y
 # CONFIG_KCOV is not set
 CONFIG_RUNTIME_TESTING_MENU=y
-# CONFIG_LKDTM is not set
 # CONFIG_TEST_MIN_HEAP is not set
 # CONFIG_TEST_DIV64 is not set
-# CONFIG_BACKTRACE_SELF_TEST is not set
-# CONFIG_TEST_REF_TRACKER is not set
-# CONFIG_RBTREE_TEST is not set
 # CONFIG_REED_SOLOMON_TEST is not set
-# CONFIG_INTERVAL_TREE_TEST is not set
-# CONFIG_PERCPU_TEST is not set
 # CONFIG_ATOMIC64_SELFTEST is not set
 # CONFIG_TEST_HEXDUMP is not set
 # CONFIG_STRING_SELFTEST is not set

device/community/linux-postmarketos-omap/0004-arm-dts-Add-espresso10-support.patch

@@ -5,7 +5,7 @@ Subject: [PATCH 3/3] arm/dts: Add espresso10 support
 
 ---
  arch/arm/boot/dts/Makefile                    |  1 +
- .../arm/boot/dts/omap4-samsung-espresso10.dts | 88 +++++++++++++++++++
+ .../arm/boot/dts/omap4-samsung-espresso10.dts | 103 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
  2 files changed, 89 insertions(+)
  create mode 100644 arch/arm/boot/dts/omap4-samsung-espresso10.dts
 
@@ -26,16 +26,31 @@ new file mode 100644
 index 000000000..3fa4b18bd
 --- /dev/null
 +++ b/arch/arm/boot/dts/omap4-samsung-espresso10.dts
-@@ -0,0 +1,88 @@
+@@ -0,0 +1,103 @@
 +// SPDX-License-Identifier: (GPL-2.0 OR MIT)
 +/dts-v1/;
 +
 +#include "omap4-samsung-espresso-common.dtsi"
-+
++#include <dt-bindings/power/summit,smb347-charger.h>
 +/ {
 +	model = "Samsung Galaxy Tab 2 (10 inch)";
 +	compatible = "samsung,espresso10", "ti,omap4430", "ti,omap4";
 +
++	i2c-gpio-5 {
++	       smb347: charger@6 {
++       	        compatible = "summit,smb347";
++               	reg = <0x6>; // 0x0C >> 1
++
++	               interrupt-parent = <&gpio2>;
++	               interrupts = <0 IRQ_TYPE_EDGE_BOTH>;
++
++	               summit,enable-usb-charging;
++	               summit,enable-charge-control = <SMB3XX_CHG_ENABLE_SW>;
++	               summit,chip-temperature-threshold-celsius = <120>;
++	               summit,usb-current-limit-microamp = <1800000>;
++	       };
++	};
++
 +	backlight: backlight {
 +		compatible = "pwm-backlight";
 +		pinctrl-names = "default";

device/community/linux-postmarketos-omap/0007-Revert-partially-Revert-usb-musb-Set-the-DT-node-on-the-child-device.patch

@@ -0,0 +1,28 @@
+From 954e4768ff5cfcc55974a3a3e684a458ebe7fec2 Mon Sep 17 00:00:00 2001
+From: dartvader316 <dartvader316-dev@pm.me>
+Date: Thu, 3 Nov 2022 18:43:14 +0300
+Subject: [PATCH] Revert "partially Revert "usb: musb: Set the DT node on the
+ child device""
+
+ espresso10 musb fix
+
+This reverts commit 239071064732bc4a30308cbba11014aa1aab550a.
+---
+ drivers/usb/musb/omap2430.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/drivers/usb/musb/omap2430.c b/drivers/usb/musb/omap2430.c
+index f571a65ae6ee..4a963cfa385b 100644
+--- a/drivers/usb/musb/omap2430.c
++++ b/drivers/usb/musb/omap2430.c
+@@ -327,6 +327,7 @@ static int omap2430_probe(struct platform_device *pdev)
+ 	musb->dev.parent		= &pdev->dev;
+ 	musb->dev.dma_mask		= &omap2430_dmamask;
+ 	musb->dev.coherent_dma_mask	= omap2430_dmamask;
++	device_set_of_node_from_dev(&musb->dev, &pdev->dev);
+ 
+ 	glue->dev			= &pdev->dev;
+ 	glue->musb			= musb;
+-- 
+GitLab
+

device/community/linux-postmarketos-omap/APKBUILD

@@ -3,8 +3,8 @@
 # Kernel config based on: arch/arm64/configs/omap2plus_defconfig
 
 pkgname=linux-postmarketos-omap
-pkgver=6.0.2
-pkgrel=1
+pkgver=6.1
+pkgrel=0
 pkgdesc="Mainline kernel fork for OMAP devices"
 arch="armv7"
 url="https://kernel.org/"
@@ -16,14 +16,20 @@ _carch="arm"
 _flavor="postmarketos-omap"
 _config="config-$_flavor.armv7"
 case $pkgver in
-	*.*.0)	_kernver=${pkgver%.0};;
-	*.*.*)	_kernver=${pkgver%.*}
-		_patch="
-		linux-$pkgver.patch.xz::https://cdn.kernel.org/pub/linux/kernel/v${pkgver%%.*}.x/patch-$pkgver.xz";;
-	*.*)	_kernver=$pkgver;;
+	*.*_rc*) _kernver=$_pkgver
+		_rc=1;;
+		*.*.0) _kernver=${pkgver%.0};;
+	*.*.*) _kernver=${pkgver%.*};;
+	*.*) _kernver=$pkgver;;
 esac
+if [ $_rc ]
+then
+	_kernsrc="https://git.kernel.org/torvalds/t/linux-$_kernver.tar.gz"
+else
+	_kernsrc="https://cdn.kernel.org/pub/linux/kernel/v${pkgver%%.*}.x/linux-$_kernver.tar.xz"
+fi
 source="
-	https://cdn.kernel.org/pub/linux/kernel/v${pkgver%%.*}.x/linux-$_kernver.tar.xz
+	$_kernsrc
 	$_patch
 	$_config
 	0001-Add-TWL6032-dtsi.patch
@@ -32,6 +38,7 @@ source="
 	0004-arm-dts-Add-espresso10-support.patch
 	0005-Add-TWL6030-power-driver-with-minimal-support-for-power-off.patch
 	0006-Add-TWL6030-power-button-support-to-twl-pwrbutton.patch
+	0007-Revert-partially-Revert-usb-musb-Set-the-DT-node-on-the-child-device.patch
 "
 builddir="$srcdir/linux-$_kernver"
 replaces="linux-samsung-espresso3g"
@@ -62,13 +69,13 @@ package() {
 
 
 sha512sums="
-bac41a7aeb6e809616cee2f13dcd1c45e829dfd1ccf60aee1dc4c46b1e28532f4485c7d819a32940de84fdfbf89db80a4e919bce8a74b2948c5a01551771b714  linux-6.0.tar.xz
-10b2c1af9cbf2335a1b449de3ee674c68ae2ae1ac4bdc27b6e7692c5152fb3cd096388044c0e0ee6054b106d6eface9af41d746adf8f8264d738e9c8f73a3784  linux-6.0.2.patch.xz
-1fb86c3982812ee3888e018df4de3ef203d6432821228784afd7c1779160a20229bedd3386fb9c3dd04f3a8c5b9d211df0df6c473874af815fd9b0490c86c97f  config-postmarketos-omap.armv7
+6ed2a73c2699d0810e54753715635736fc370288ad5ce95c594f2379959b0e418665cd71bc512a0273fe226fe90074d8b10d14c209080a6466498417a4fdda68  linux-6.1.tar.xz
+65da1e6bb7324fdd29ee2c954755b322ef99776dc39c4d7225f6415b5c6d682ca38ad96cec737980133c575241fdf53d12858496f0db742619fd385ea4e3cdca  config-postmarketos-omap.armv7
 727ff96d7d4701e93bf43db5d7bd872b4fbf1a8439edb4d84987a8f89e669d65b7a413740172b4a84df711b990d7e30b7880df5b9365496b7894d129cd4ebfa6  0001-Add-TWL6032-dtsi.patch
 cbabba85dc1e4de5ad2faaea8d87595ceef5af740a9b06f20aeb5ac5bff37747e17a11f77d66e3cde42e3fdb48134a37a98205e32109464a87ac7bb5e91fb34c  0002-arm-dts-Add-common-dtsi-for-espresso.patch
 b2c2d81bdfb4095a87d6821342127cc7c74bbc12a70786a81d64fd264b5487d522effab349fc1de2b01752cce494bf782d59021d4e95740aa1e3ff5de12632f7  0003-arm-dts-Add-espresso7-support.patch
-61a731933a4f4ef6e4e86007cfa5eafea907ebd2f96629d0abf4c747f15776b5fe571de558d9eb0c9793f7a28d70c4839b6f88332e21515a89df680a06396e1b  0004-arm-dts-Add-espresso10-support.patch
+1029debd9fa9fe357f725c42e901bcabb9a364f8b3fcf7986cc5506a078a075e22db3351dcbb607014af8a87a84d13b780e1e613924c8ad6a767ac8b8b763a94  0004-arm-dts-Add-espresso10-support.patch
 9dc84421cbc2ea7c2c37847d8704ff46dd4a485485bfa4a671167fdef4ac6f53a4e8f787aa774f3748299c374e7c7dc5d36fd4ba9b1a1a9697e0526f2bf3ece4  0005-Add-TWL6030-power-driver-with-minimal-support-for-power-off.patch
 fdf62d90b1381541743e9502160854a920c05050cc6f530769071e2eb362ba3c1f5c84afd140533d7aa3f318205e1b0b1c55387edc99a643e1593e634e740c10  0006-Add-TWL6030-power-button-support-to-twl-pwrbutton.patch
+5dea3463f13ebdaf17535a59ee5ffd98ad6d9d3750f6bcafc527699ead6cc4e6a3cf2aa161419c56d4bcec3a51ac2e3427a7883ce26137bec91440239645ec1e  0007-Revert-partially-Revert-usb-musb-Set-the-DT-node-on-the-child-device.patch
 "

device/community/linux-postmarketos-qcom-msm8916/APKBUILD

@@ -4,12 +4,12 @@
 
 _flavor="postmarketos-qcom-msm8916"
 pkgname=linux-$_flavor
-pkgver=6.0.2
+pkgver=6.1
 # When making kernel config changes please also submit a PR to
 # https://github.com/msm8916-mainline/linux/blob/master/kernel/configs/pmos.config
 # since the kernel config is regenerated on upgrades and all changes will be lost!
-pkgrel=1
-pkgdesc="Mainline kernel fork for Qualcomm MSM8916 devices"
+pkgrel=0
+pkgdesc="Mainline kernel fork for Qualcomm MSM8909/MSM8916/MSM8939 devices"
 arch="aarch64 armv7"
 url="https://github.com/msm8916-mainline/linux"
 license="GPL-2.0-only"
@@ -18,7 +18,6 @@ options="!strip !check !tracedeps
 	pmb:kconfigcheck-community
 "
 makedepends="
-	bash
 	bison
 	findutils
 	flex
@@ -29,6 +28,7 @@ makedepends="
 	perl
 	postmarketos-installkernel
 "
+replaces="linux-postmarketos-qcom-msm8909 linux-postmarketos-qcom-msm8939"
 
 # Architecture
 case "$CARCH" in
@@ -71,7 +71,7 @@ package() {
 }
 
 sha512sums="
-566fa5e8cc3a994c5e400e442894cc32dc0b37722351e17b96f9a6538889f3d5d586b5809b34a4638cc0bc52b0cda46d5fde73c6e1e67865f8671971e45de9e4  linux-postmarketos-qcom-msm8916-v6.0.2-msm8916.tar.gz
-26fd8b2b38a66f05c67e6200fef31a6cbea8fd99e2331c2960049b26a39bc91539e33d394c0b7286c20f030666c0ab8f439c4899226476a852647fbcd12d77bc  config-postmarketos-qcom-msm8916.aarch64
-315d1f6c666e320ea9a7c8c12223d0c9afe049e4fd752b4d06a61365d75a996f60c74c0b481eea102118cfde7a3a3cc549e01a99f342cf0e6fa9f66b78d34b03  config-postmarketos-qcom-msm8916.armv7
+409c96c891c098317545606765653e4168c1464261a65f872dc01b2d41823780a8c3a7e61455dfa705c5fb68c07c5528b42442816619b0f58e602231cb32fcc7  linux-postmarketos-qcom-msm8916-v6.1-msm8916.tar.gz
+8bb247d4aece1562c72083c9f6804b0fdff07b6160b2e361dee63d6e4be82f40e2ebbb4f1c33766d55deb5e5a94baa50de0aa373a8d5b4ddc5f3f5e4e7c3bb4c  config-postmarketos-qcom-msm8916.aarch64
+218d398a7898e6134704777666e290d9319ef600483735b6ad95e97ffc8db3a99ca5fddfce4b5263588d5f454db3b389203998a990ed2a42cb59eec2886bab01  config-postmarketos-qcom-msm8916.armv7
 "

device/community/linux-postmarketos-qcom-sdm845/APKBUILD

@@ -5,7 +5,7 @@
 
 _flavor="postmarketos-qcom-sdm845"
 pkgname=linux-$_flavor
-pkgver=6.1.0_rc3
+pkgver=6.1.0
 pkgrel=0
 pkgdesc="Mainline Kernel fork for SDM845 devices"
 arch="aarch64"
@@ -18,7 +18,7 @@ options="!strip !check !tracedeps
 makedepends="bash bison findutils flex installkernel openssl-dev perl"
 
 _config="config-$_flavor.$arch"
-_tag="sdm845-6.1.0_rc3"
+_tag="sdm845-6.1.0"
 
 # Source
 source="
@@ -55,6 +55,6 @@ package() {
 }
 
 sha512sums="
-a4096863f06d00edba6af76f89ea24047badba5d1d1363ba31701dd1088aab34c470a5552b8b3db4cb5d21065496ccac9aa59c05e4d15561d4cfb03706d8962e  linux-sdm845-6.1.0_rc3.tar.gz
-b2bcef118e3468187a26aa7ca4a79eea84292f69d7f9fecd943d752bb6d8fee44e1d504732f506350e37c9553881b051d4859e49c2e4f836242f43d881c37abe  config-postmarketos-qcom-sdm845.aarch64
+eabd65315e8372eef96628c71f9eec7ca3a5cdc7160c52f8a6abd5b6d8b12cc6b83ef551dfd51fad3f6239c993164053935e1c2408a758238cc5de53b9ce1b4e  linux-sdm845-6.1.0.tar.gz
+e8b12365070eff6ffcb96fc9d44f568ef584ccde1dab6911f2d2d6be4c6ffaa379d09485f104a09950c1e6f3078a179a0deae14e90e0b6f7a993e377590e7ca2  config-postmarketos-qcom-sdm845.aarch64
 "

device/community/linux-postmarketos-qcom-sdm845/config-postmarketos-qcom-sdm845.aarch64

@@ -1,8 +1,8 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 6.1.0-rc3 Kernel Configuration
+# Linux/arm64 6.1.0 Kernel Configuration
 #
-CONFIG_CC_VERSION_TEXT="aarch64-alpine-linux-musl-gcc (Alpine 12.2.1_git20220924-r3) 12.2.1 20220924"
+CONFIG_CC_VERSION_TEXT="aarch64-alpine-linux-musl-gcc (Alpine 12.2.1_git20220924-r5) 12.2.1 20220924"
 CONFIG_CC_IS_GCC=y
 CONFIG_GCC_VERSION=120201
 CONFIG_CLANG_VERSION=0
@@ -996,6 +996,7 @@ CONFIG_NET_UDP_TUNNEL=m
 # CONFIG_INET_AH is not set
 # CONFIG_INET_ESP is not set
 # CONFIG_INET_IPCOMP is not set
+CONFIG_INET_TABLE_PERTURB_ORDER=16
 CONFIG_INET_TUNNEL=m
 CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
@@ -4172,7 +4173,7 @@ CONFIG_DRM_KOMEDA=m
 # CONFIG_DRM_MGAG200 is not set
 # CONFIG_DRM_RCAR_DW_HDMI is not set
 CONFIG_DRM_RCAR_USE_LVDS=y
-CONFIG_DRM_RCAR_MIPI_DSI=m
+CONFIG_DRM_RCAR_USE_MIPI_DSI=y
 # CONFIG_DRM_QXL is not set
 # CONFIG_DRM_VIRTIO_GPU is not set
 CONFIG_DRM_MSM=y
@@ -7834,6 +7835,7 @@ CONFIG_RUNTIME_TESTING_MENU=y
 # CONFIG_TEST_BITMAP is not set
 # CONFIG_TEST_UUID is not set
 # CONFIG_TEST_XARRAY is not set
+# CONFIG_TEST_MAPLE_TREE is not set
 # CONFIG_TEST_RHASHTABLE is not set
 # CONFIG_TEST_SIPHASH is not set
 # CONFIG_TEST_IDA is not set

device/community/linux-postmarketos-qcom-sm6350/APKBUILD

@@ -2,8 +2,8 @@
 
 _flavor="postmarketos-qcom-sm6350"
 pkgname=linux-$_flavor
-pkgver=6.0.2
-pkgrel=1
+pkgver=6.1.0
+pkgrel=0
 pkgdesc="Mainline Kernel fork for SM6350 devices"
 arch="aarch64"
 _carch="arm64"
@@ -17,7 +17,7 @@ makedepends="bash bison findutils flex installkernel openssl-dev perl"
 
 _repo="linux"
 _config="config-$_flavor.$arch"
-_commit="acc6778273d102225893f2497645d7be0dd3f018"
+_commit="d36e74bfe9f8163bb7b9001f267490c91d954d77"
 
 # Source
 source="
@@ -54,6 +54,6 @@ package() {
 }
 
 sha512sums="
-2d3354a7ed040c5d894db8ea2e61abf868083a971c706f857ad0d50805c36ea766eb6c2201422c275052d7e9a28a10b05ccf1b45b641f9a3032d35f985b5705f  linux-acc6778273d102225893f2497645d7be0dd3f018.tar.gz
-9904188341e4fed13ca8a897c94097bce450f526f43a97d8ce83efce8f522423d17e30814d13f8a1a184189d5712d3994f399388ade17cbd7bdc6b1fa9437b35  config-postmarketos-qcom-sm6350.aarch64
+d9e7a0e80b48450b2bd20d788b6ae38279c94ed12275a4f5955872795df7c7a3fa425d2c66fe1fbcd161687579dc94748c0b9fbd606a894818c3a793292a7b90  linux-d36e74bfe9f8163bb7b9001f267490c91d954d77.tar.gz
+0b13f003cfa6e05594bc466d2d46ee09213a85d7bac353ae84ab06fc72d32050602b5b114f44c8afc40e617980d5c1fa3690077594c0e35fdc829d358b4a339f  config-postmarketos-qcom-sm6350.aarch64
 "

device/community/linux-postmarketos-qcom-sm6350/config-postmarketos-qcom-sm6350.aarch64

@@ -1,8 +1,8 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 6.0.2 Kernel Configuration
+# Linux/arm64 6.1.0 Kernel Configuration
 #
-CONFIG_CC_VERSION_TEXT="aarch64-alpine-linux-musl-gcc (Alpine 12.2.1_git20220924-r3) 12.2.1 20220924"
+CONFIG_CC_VERSION_TEXT="aarch64-alpine-linux-musl-gcc (Alpine 12.2.1_git20220924-r5) 12.2.1 20220924"
 CONFIG_CC_IS_GCC=y
 CONFIG_GCC_VERSION=120201
 CONFIG_CLANG_VERSION=0
@@ -157,7 +157,6 @@ CONFIG_CGROUPS=y
 CONFIG_PAGE_COUNTER=y
 # CONFIG_CGROUP_FAVOR_DYNMODS is not set
 CONFIG_MEMCG=y
-CONFIG_MEMCG_SWAP=y
 CONFIG_MEMCG_KMEM=y
 CONFIG_BLK_CGROUP=y
 CONFIG_CGROUP_WRITEBACK=y
@@ -281,30 +280,24 @@ CONFIG_ARCH_PROC_KCORE_TEXT=y
 # CONFIG_ARCH_SUNXI is not set
 # CONFIG_ARCH_ALPINE is not set
 # CONFIG_ARCH_APPLE is not set
-# CONFIG_ARCH_BCM2835 is not set
-# CONFIG_ARCH_BCM4908 is not set
-# CONFIG_ARCH_BCM_IPROC is not set
-# CONFIG_ARCH_BCMBCA is not set
+# CONFIG_ARCH_BCM is not set
 # CONFIG_ARCH_BERLIN is not set
 # CONFIG_ARCH_BITMAIN is not set
-# CONFIG_ARCH_BRCMSTB is not set
 # CONFIG_ARCH_EXYNOS is not set
 # CONFIG_ARCH_SPARX5 is not set
 # CONFIG_ARCH_K3 is not set
-# CONFIG_ARCH_LAYERSCAPE is not set
 # CONFIG_ARCH_LG1K is not set
 # CONFIG_ARCH_HISI is not set
 # CONFIG_ARCH_KEEMBAY is not set
 # CONFIG_ARCH_MEDIATEK is not set
 # CONFIG_ARCH_MESON is not set
 # CONFIG_ARCH_MVEBU is not set
-# CONFIG_ARCH_MXC is not set
+# CONFIG_ARCH_NXP is not set
 # CONFIG_ARCH_NPCM is not set
 CONFIG_ARCH_QCOM=y
 # CONFIG_ARCH_REALTEK is not set
 # CONFIG_ARCH_RENESAS is not set
 # CONFIG_ARCH_ROCKCHIP is not set
-# CONFIG_ARCH_S32 is not set
 # CONFIG_ARCH_SEATTLE is not set
 # CONFIG_ARCH_INTEL_SOCFPGA is not set
 # CONFIG_ARCH_SYNQUACER is not set
@@ -343,12 +336,14 @@ CONFIG_ARM64_ERRATUM_1165522=y
 CONFIG_ARM64_ERRATUM_1319367=y
 CONFIG_ARM64_ERRATUM_1530923=y
 CONFIG_ARM64_WORKAROUND_REPEAT_TLBI=y
+CONFIG_ARM64_ERRATUM_2441007=y
 CONFIG_ARM64_ERRATUM_1286807=y
 CONFIG_ARM64_ERRATUM_1463225=y
 CONFIG_ARM64_ERRATUM_1542419=y
 CONFIG_ARM64_ERRATUM_1508412=y
 CONFIG_ARM64_ERRATUM_2051678=y
 CONFIG_ARM64_ERRATUM_2077057=y
+CONFIG_ARM64_ERRATUM_2658417=y
 CONFIG_ARM64_WORKAROUND_TSB_FLUSH_FAILURE=y
 CONFIG_ARM64_ERRATUM_2054223=y
 CONFIG_ARM64_ERRATUM_2067961=y
@@ -404,7 +399,7 @@ CONFIG_KEXEC_FILE=y
 CONFIG_CRASH_DUMP=y
 CONFIG_TRANS_TABLE=y
 # CONFIG_XEN is not set
-CONFIG_FORCE_MAX_ZONEORDER=11
+CONFIG_ARCH_FORCE_MAX_ORDER=11
 CONFIG_UNMAP_KERNEL_AT_EL0=y
 CONFIG_MITIGATE_SPECTRE_BRANCH_HISTORY=y
 CONFIG_RODATA_FULL_DEFAULT_ENABLED=y
@@ -412,6 +407,7 @@ CONFIG_RODATA_FULL_DEFAULT_ENABLED=y
 CONFIG_ARM64_TAGGED_ADDR_ABI=y
 CONFIG_COMPAT=y
 CONFIG_KUSER_HELPERS=y
+# CONFIG_COMPAT_ALIGNMENT_FIXUPS is not set
 # CONFIG_ARMV8_DEPRECATED is not set
 
 #
@@ -574,29 +570,6 @@ CONFIG_ARCH_SUPPORTS_ACPI=y
 # CONFIG_ACPI is not set
 CONFIG_HAVE_KVM=y
 # CONFIG_VIRTUALIZATION is not set
-CONFIG_ARM64_CRYPTO=y
-CONFIG_CRYPTO_SHA256_ARM64=y
-# CONFIG_CRYPTO_SHA512_ARM64 is not set
-CONFIG_CRYPTO_SHA1_ARM64_CE=y
-CONFIG_CRYPTO_SHA2_ARM64_CE=y
-# CONFIG_CRYPTO_SHA512_ARM64_CE is not set
-# CONFIG_CRYPTO_SHA3_ARM64 is not set
-# CONFIG_CRYPTO_SM3_ARM64_CE is not set
-# CONFIG_CRYPTO_SM4_ARM64_CE is not set
-# CONFIG_CRYPTO_SM4_ARM64_CE_BLK is not set
-# CONFIG_CRYPTO_SM4_ARM64_NEON_BLK is not set
-CONFIG_CRYPTO_GHASH_ARM64_CE=y
-# CONFIG_CRYPTO_POLYVAL_ARM64_CE is not set
-# CONFIG_CRYPTO_CRCT10DIF_ARM64_CE is not set
-# CONFIG_CRYPTO_AES_ARM64 is not set
-CONFIG_CRYPTO_AES_ARM64_CE=y
-CONFIG_CRYPTO_AES_ARM64_CE_CCM=y
-CONFIG_CRYPTO_AES_ARM64_CE_BLK=y
-# CONFIG_CRYPTO_AES_ARM64_NEON_BLK is not set
-CONFIG_CRYPTO_CHACHA20_NEON=m
-CONFIG_CRYPTO_POLY1305_NEON=m
-# CONFIG_CRYPTO_NHPOLY1305_NEON is not set
-# CONFIG_CRYPTO_AES_ARM64_BS is not set
 
 #
 # General architecture-dependent options
@@ -664,9 +637,12 @@ CONFIG_HAVE_MOVE_PUD=y
 CONFIG_HAVE_MOVE_PMD=y
 CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y
 CONFIG_HAVE_ARCH_HUGE_VMAP=y
+CONFIG_HAVE_ARCH_HUGE_VMALLOC=y
 CONFIG_ARCH_WANT_HUGE_PMD_SHARE=y
 CONFIG_HAVE_MOD_ARCH_SPECIFIC=y
 CONFIG_MODULES_USE_ELF_RELA=y
+CONFIG_HAVE_SOFTIRQ_ON_OWN_STACK=y
+CONFIG_SOFTIRQ_ON_OWN_STACK=y
 CONFIG_ARCH_HAS_ELF_RANDOMIZE=y
 CONFIG_HAVE_ARCH_MMAP_RND_BITS=y
 CONFIG_ARCH_MMAP_RND_BITS=18
@@ -886,6 +862,7 @@ CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
 CONFIG_SPLIT_PTLOCK_CPUS=4
 CONFIG_ARCH_ENABLE_SPLIT_PMD_PTLOCK=y
 CONFIG_COMPACTION=y
+CONFIG_COMPACT_UNEVICTABLE_DEFAULT=1
 CONFIG_PAGE_REPORTING=y
 CONFIG_MIGRATION=y
 CONFIG_ARCH_ENABLE_HUGEPAGE_MIGRATION=y
@@ -928,6 +905,7 @@ CONFIG_ARCH_HAS_PTE_SPECIAL=y
 CONFIG_SECRETMEM=y
 # CONFIG_ANON_VMA_NAME is not set
 # CONFIG_USERFAULTFD is not set
+# CONFIG_LRU_GEN is not set
 
 #
 # Data Access Monitoring
@@ -976,6 +954,7 @@ CONFIG_NET_UDP_TUNNEL=m
 # CONFIG_INET_AH is not set
 # CONFIG_INET_ESP is not set
 # CONFIG_INET_IPCOMP is not set
+CONFIG_INET_TABLE_PERTURB_ORDER=16
 CONFIG_INET_TUNNEL=m
 CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
@@ -1297,7 +1276,6 @@ CONFIG_BRIDGE_VLAN_FILTERING=y
 CONFIG_VLAN_8021Q=m
 # CONFIG_VLAN_8021Q_GVRP is not set
 # CONFIG_VLAN_8021Q_MVRP is not set
-# CONFIG_DECNET is not set
 CONFIG_LLC=m
 # CONFIG_LLC2 is not set
 # CONFIG_ATALK is not set
@@ -1539,6 +1517,7 @@ CONFIG_EFI_ESRT=y
 CONFIG_EFI_PARAMS_FROM_FDT=y
 CONFIG_EFI_RUNTIME_WRAPPERS=y
 CONFIG_EFI_GENERIC_STUB=y
+# CONFIG_EFI_ZBOOT is not set
 CONFIG_EFI_ARMSTUB_DTB_LOADER=y
 # CONFIG_EFI_GENERIC_STUB_INITRD_CMDLINE_LOADER is not set
 # CONFIG_EFI_BOOTLOADER_CONTROL is not set
@@ -1698,7 +1677,6 @@ CONFIG_SCSI_LOWLEVEL=y
 # CONFIG_SCSI_DH is not set
 # end of SCSI device support
 
-CONFIG_HAVE_PATA_PLATFORM=y
 # CONFIG_ATA is not set
 CONFIG_MD=y
 # CONFIG_BLK_DEV_MD is not set
@@ -1900,6 +1878,7 @@ CONFIG_FIXED_PHY=y
 # CONFIG_DP83TD510_PHY is not set
 # CONFIG_VITESSE_PHY is not set
 # CONFIG_XILINX_GMII2RGMII is not set
+# CONFIG_PSE_CONTROLLER is not set
 CONFIG_MDIO_DEVICE=y
 CONFIG_MDIO_BUS=y
 CONFIG_FWNODE_MDIO=y
@@ -2065,6 +2044,7 @@ CONFIG_KEYBOARD_GPIO=y
 # CONFIG_KEYBOARD_MPR121 is not set
 # CONFIG_KEYBOARD_NEWTON is not set
 # CONFIG_KEYBOARD_OPENCORES is not set
+# CONFIG_KEYBOARD_PINEPHONE is not set
 # CONFIG_KEYBOARD_SAMSUNG is not set
 # CONFIG_KEYBOARD_STOWAWAY is not set
 # CONFIG_KEYBOARD_SUNKBD is not set
@@ -2149,6 +2129,7 @@ CONFIG_INPUT_TOUCHSCREEN=y
 # CONFIG_TOUCHSCREEN_TPS6507X is not set
 # CONFIG_TOUCHSCREEN_ZET6223 is not set
 # CONFIG_TOUCHSCREEN_ZFORCE is not set
+# CONFIG_TOUCHSCREEN_COLIBRI_VF50 is not set
 # CONFIG_TOUCHSCREEN_ROHM_BU21023 is not set
 # CONFIG_TOUCHSCREEN_IQS5XX is not set
 # CONFIG_TOUCHSCREEN_ZINITIX is not set
@@ -2414,6 +2395,7 @@ CONFIG_PINMUX=y
 CONFIG_PINCONF=y
 CONFIG_GENERIC_PINCONF=y
 # CONFIG_DEBUG_PINCTRL is not set
+# CONFIG_PINCTRL_CY8C95X0 is not set
 # CONFIG_PINCTRL_MCP23S08 is not set
 # CONFIG_PINCTRL_MICROCHIP_SGPIO is not set
 # CONFIG_PINCTRL_OCELOT is not set
@@ -2421,19 +2403,9 @@ CONFIG_GENERIC_PINCONF=y
 # CONFIG_PINCTRL_STMFX is not set
 # CONFIG_PINCTRL_SX150X is not set
 CONFIG_PINCTRL_MSM=y
-# CONFIG_PINCTRL_APQ8064 is not set
-# CONFIG_PINCTRL_APQ8084 is not set
-# CONFIG_PINCTRL_IPQ4019 is not set
-# CONFIG_PINCTRL_IPQ8064 is not set
 # CONFIG_PINCTRL_IPQ8074 is not set
 # CONFIG_PINCTRL_IPQ6018 is not set
-# CONFIG_PINCTRL_MSM8226 is not set
-# CONFIG_PINCTRL_MSM8660 is not set
-# CONFIG_PINCTRL_MSM8960 is not set
 # CONFIG_PINCTRL_MDM9607 is not set
-# CONFIG_PINCTRL_MDM9615 is not set
-# CONFIG_PINCTRL_MSM8X74 is not set
-# CONFIG_PINCTRL_MSM8909 is not set
 # CONFIG_PINCTRL_MSM8916 is not set
 # CONFIG_PINCTRL_MSM8953 is not set
 # CONFIG_PINCTRL_MSM8976 is not set
@@ -2450,12 +2422,10 @@ CONFIG_PINCTRL_QCOM_SPMI_PMIC=y
 # CONFIG_PINCTRL_SC8280XP is not set
 # CONFIG_PINCTRL_SDM660 is not set
 # CONFIG_PINCTRL_SDM845 is not set
-# CONFIG_PINCTRL_SDX55 is not set
 # CONFIG_PINCTRL_SM6115 is not set
 # CONFIG_PINCTRL_SM6125 is not set
 CONFIG_PINCTRL_SM6350=y
 # CONFIG_PINCTRL_SM6375 is not set
-# CONFIG_PINCTRL_SDX65 is not set
 # CONFIG_PINCTRL_SM8150 is not set
 # CONFIG_PINCTRL_SM8250 is not set
 # CONFIG_PINCTRL_SM8350 is not set
@@ -2499,7 +2469,6 @@ CONFIG_GPIO_CDEV_V1=y
 #
 # I2C GPIO expanders
 #
-# CONFIG_GPIO_ADP5588 is not set
 # CONFIG_GPIO_ADNP is not set
 # CONFIG_GPIO_GW_PLD is not set
 # CONFIG_GPIO_MAX7300 is not set
@@ -2615,7 +2584,6 @@ CONFIG_HWMON=y
 # CONFIG_SENSORS_ASC7621 is not set
 # CONFIG_SENSORS_AXI_FAN_CONTROL is not set
 # CONFIG_SENSORS_ARM_SCMI is not set
-# CONFIG_SENSORS_ASPEED is not set
 # CONFIG_SENSORS_ATXP1 is not set
 # CONFIG_SENSORS_CORSAIR_CPRO is not set
 # CONFIG_SENSORS_CORSAIR_PSU is not set
@@ -2652,6 +2620,7 @@ CONFIG_HWMON=y
 # CONFIG_SENSORS_MAX1668 is not set
 # CONFIG_SENSORS_MAX197 is not set
 # CONFIG_SENSORS_MAX31730 is not set
+# CONFIG_SENSORS_MAX31760 is not set
 # CONFIG_SENSORS_MAX6620 is not set
 # CONFIG_SENSORS_MAX6621 is not set
 # CONFIG_SENSORS_MAX6639 is not set
@@ -2699,10 +2668,10 @@ CONFIG_HWMON=y
 # CONFIG_SENSORS_SHT3x is not set
 # CONFIG_SENSORS_SHT4x is not set
 # CONFIG_SENSORS_SHTC1 is not set
-# CONFIG_SENSORS_SY7636A is not set
 # CONFIG_SENSORS_DME1737 is not set
 # CONFIG_SENSORS_EMC1403 is not set
 # CONFIG_SENSORS_EMC2103 is not set
+# CONFIG_SENSORS_EMC2305 is not set
 # CONFIG_SENSORS_EMC6W201 is not set
 # CONFIG_SENSORS_SMSC47M1 is not set
 # CONFIG_SENSORS_SMSC47M192 is not set
@@ -2854,6 +2823,7 @@ CONFIG_BCMA_POSSIBLE=y
 # CONFIG_MFD_MAX8997 is not set
 # CONFIG_MFD_MAX8998 is not set
 # CONFIG_MFD_MT6360 is not set
+# CONFIG_MFD_MT6370 is not set
 # CONFIG_MFD_MT6397 is not set
 # CONFIG_MFD_MENF21BMC is not set
 # CONFIG_MFD_VIPERBOARD is not set
@@ -2862,14 +2832,15 @@ CONFIG_BCMA_POSSIBLE=y
 # CONFIG_MFD_PCF50633 is not set
 # CONFIG_MFD_QCOM_RPM is not set
 CONFIG_MFD_SPMI_PMIC=y
+# CONFIG_MFD_SY7636A is not set
 # CONFIG_MFD_RT4831 is not set
 # CONFIG_MFD_RT5033 is not set
+# CONFIG_MFD_RT5120 is not set
 # CONFIG_MFD_RC5T583 is not set
 # CONFIG_MFD_RK808 is not set
 # CONFIG_MFD_RN5T618 is not set
 # CONFIG_MFD_SEC_CORE is not set
 # CONFIG_MFD_SI476X_CORE is not set
-# CONFIG_MFD_SIMPLE_MFD_I2C is not set
 # CONFIG_MFD_SM501 is not set
 # CONFIG_MFD_SKY81452 is not set
 # CONFIG_MFD_STMPE is not set
@@ -2972,7 +2943,6 @@ CONFIG_REGULATOR_QCOM_RPMH=y
 # CONFIG_REGULATOR_RTMV20 is not set
 # CONFIG_REGULATOR_RTQ6752 is not set
 # CONFIG_REGULATOR_SLG51000 is not set
-# CONFIG_REGULATOR_SY7636A is not set
 # CONFIG_REGULATOR_SY8106A is not set
 # CONFIG_REGULATOR_SY8824X is not set
 # CONFIG_REGULATOR_SY8827N is not set
@@ -3001,7 +2971,6 @@ CONFIG_REGULATOR_QCOM_RPMH=y
 CONFIG_DRM=y
 CONFIG_DRM_MIPI_DSI=y
 # CONFIG_DRM_DEBUG_MM is not set
-# CONFIG_DRM_DEBUG_SELFTEST is not set
 CONFIG_DRM_KMS_HELPER=y
 CONFIG_DRM_FBDEV_EMULATION=y
 CONFIG_DRM_FBDEV_OVERALLOC=100
@@ -3035,7 +3004,7 @@ CONFIG_DRM_SCHED=y
 # CONFIG_DRM_UDL is not set
 # CONFIG_DRM_RCAR_DW_HDMI is not set
 # CONFIG_DRM_RCAR_USE_LVDS is not set
-# CONFIG_DRM_RCAR_MIPI_DSI is not set
+# CONFIG_DRM_RCAR_USE_MIPI_DSI is not set
 CONFIG_DRM_MSM=y
 CONFIG_DRM_MSM_GPU_STATE=y
 CONFIG_DRM_MSM_MDSS=y
@@ -3297,6 +3266,7 @@ CONFIG_HID_APPLE=y
 # CONFIG_HID_UCLOGIC is not set
 # CONFIG_HID_WALTOP is not set
 # CONFIG_HID_VIEWSONIC is not set
+# CONFIG_HID_VRC2 is not set
 # CONFIG_HID_XIAOMI is not set
 # CONFIG_HID_GYRATION is not set
 # CONFIG_HID_ICADE is not set
@@ -3331,6 +3301,7 @@ CONFIG_HID_LOGITECH=y
 # CONFIG_HID_PETALYNX is not set
 # CONFIG_HID_PICOLCD is not set
 # CONFIG_HID_PLANTRONICS is not set
+# CONFIG_HID_PXRC is not set
 # CONFIG_HID_RAZER is not set
 # CONFIG_HID_PRIMAX is not set
 # CONFIG_HID_RETRODE is not set
@@ -3349,6 +3320,7 @@ CONFIG_HID_LOGITECH=y
 # CONFIG_HID_SMARTJOYPLUS is not set
 # CONFIG_HID_TIVO is not set
 # CONFIG_HID_TOPSEED is not set
+# CONFIG_HID_TOPRE is not set
 # CONFIG_HID_THINGM is not set
 # CONFIG_HID_THRUSTMASTER is not set
 # CONFIG_HID_UDRAW_PS3 is not set
@@ -3607,7 +3579,6 @@ CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_IO_ACCESSORS=y
 CONFIG_MMC_SDHCI_PLTFM=y
 # CONFIG_MMC_SDHCI_OF_ARASAN is not set
-# CONFIG_MMC_SDHCI_OF_ASPEED is not set
 # CONFIG_MMC_SDHCI_OF_AT91 is not set
 # CONFIG_MMC_SDHCI_OF_DWCMSHC is not set
 # CONFIG_MMC_SDHCI_CADENCE is not set
@@ -3636,7 +3607,7 @@ CONFIG_SCSI_UFS_QCOM=y
 # CONFIG_MEMSTICK is not set
 CONFIG_NEW_LEDS=y
 CONFIG_LEDS_CLASS=y
-# CONFIG_LEDS_CLASS_FLASH is not set
+CONFIG_LEDS_CLASS_FLASH=y
 # CONFIG_LEDS_CLASS_MULTICOLOR is not set
 # CONFIG_LEDS_BRIGHTNESS_HW_CHANGED is not set
 
@@ -3681,6 +3652,14 @@ CONFIG_LEDS_CLASS=y
 #
 # Flash and Torch LED drivers
 #
+# CONFIG_LEDS_AAT1290 is not set
+# CONFIG_LEDS_AS3645A is not set
+# CONFIG_LEDS_KTD2692 is not set
+# CONFIG_LEDS_LM3601X is not set
+CONFIG_LEDS_QCOM_FLASH=y
+# CONFIG_LEDS_RT4505 is not set
+# CONFIG_LEDS_RT8515 is not set
+# CONFIG_LEDS_SGM3140 is not set
 
 #
 # RGB LED drivers
@@ -3912,6 +3891,7 @@ CONFIG_COMMON_CLK=y
 # CONFIG_COMMON_CLK_XGENE is not set
 # CONFIG_COMMON_CLK_RS9_PCIE is not set
 # CONFIG_COMMON_CLK_VC5 is not set
+# CONFIG_COMMON_CLK_VC7 is not set
 # CONFIG_COMMON_CLK_FIXED_MMIO is not set
 CONFIG_QCOM_GDSC=y
 CONFIG_COMMON_CLK_QCOM=y
@@ -3928,6 +3908,7 @@ CONFIG_QCOM_CLK_RPMH=y
 # CONFIG_IPQ_LCC_806X is not set
 # CONFIG_IPQ_GCC_8074 is not set
 # CONFIG_MSM_GCC_8660 is not set
+# CONFIG_MSM_GCC_8909 is not set
 # CONFIG_MSM_GCC_8916 is not set
 # CONFIG_MSM_GCC_8939 is not set
 # CONFIG_MSM_GCC_8960 is not set
@@ -3960,6 +3941,7 @@ CONFIG_QCOM_CLK_RPMH=y
 # CONFIG_SC_GCC_8280XP is not set
 # CONFIG_SC_GPUCC_7180 is not set
 # CONFIG_SC_GPUCC_7280 is not set
+# CONFIG_SC_GPUCC_8280XP is not set
 # CONFIG_SC_LPASSCC_7280 is not set
 # CONFIG_SC_LPASS_CORECC_7180 is not set
 # CONFIG_SC_LPASS_CORECC_7280 is not set
@@ -3986,6 +3968,7 @@ CONFIG_SM_DISPCC_6350=y
 # CONFIG_SM_GCC_6115 is not set
 # CONFIG_SM_GCC_6125 is not set
 CONFIG_SM_GCC_6350=y
+# CONFIG_SM_GCC_6375 is not set
 # CONFIG_SM_GCC_8150 is not set
 # CONFIG_SM_GCC_8250 is not set
 # CONFIG_SM_GCC_8350 is not set
@@ -4001,6 +3984,7 @@ CONFIG_SM_GPUCC_6350=y
 # CONFIG_KPSS_XCC is not set
 # CONFIG_CLK_GFM_LPASS_SM8250 is not set
 # CONFIG_XILINX_VCU is not set
+# CONFIG_COMMON_CLK_XLNX_CLKWZRD is not set
 CONFIG_HWSPINLOCK=y
 CONFIG_HWSPINLOCK_QCOM=y
 
@@ -4039,6 +4023,7 @@ CONFIG_IOMMU_IO_PGTABLE_LPAE=y
 # CONFIG_IOMMU_IO_PGTABLE_LPAE_SELFTEST is not set
 CONFIG_IOMMU_IO_PGTABLE_ARMV7S=y
 # CONFIG_IOMMU_IO_PGTABLE_ARMV7S_SELFTEST is not set
+# CONFIG_IOMMU_IO_PGTABLE_DART is not set
 # end of Generic IOMMU Pagetable Support
 
 # CONFIG_IOMMU_DEBUGFS is not set
@@ -4192,7 +4177,6 @@ CONFIG_EXTCON=y
 # CONFIG_EXTCON_RT8973A is not set
 # CONFIG_EXTCON_SM5502 is not set
 # CONFIG_EXTCON_USB_GPIO is not set
-# CONFIG_EXTCON_USBC_TUSB320 is not set
 # CONFIG_MEMORY is not set
 CONFIG_IIO=y
 # CONFIG_IIO_BUFFER is not set
@@ -4228,6 +4212,7 @@ CONFIG_IIO=y
 # CONFIG_MMA8452 is not set
 # CONFIG_MMA9551 is not set
 # CONFIG_MMA9553 is not set
+# CONFIG_MSA311 is not set
 # CONFIG_MXC4005 is not set
 # CONFIG_MXC6255 is not set
 # CONFIG_STK8312 is not set
@@ -4258,6 +4243,7 @@ CONFIG_QCOM_VADC_COMMON=y
 # CONFIG_QCOM_SPMI_IADC is not set
 # CONFIG_QCOM_SPMI_VADC is not set
 CONFIG_QCOM_SPMI_ADC5=y
+# CONFIG_RICHTEK_RTQ6056 is not set
 # CONFIG_SD_ADC_MODULATOR is not set
 # CONFIG_TI_ADC081C is not set
 # CONFIG_TI_ADS1015 is not set
@@ -4286,6 +4272,7 @@ CONFIG_QCOM_SPMI_ADC5=y
 # Capacitance to digital converters
 #
 # CONFIG_AD7150 is not set
+# CONFIG_AD7746 is not set
 # end of Capacitance to digital converters
 
 #
@@ -4406,6 +4393,8 @@ CONFIG_QCOM_SPMI_ADC5=y
 # Inertial measurement units
 #
 # CONFIG_BMI160_I2C is not set
+# CONFIG_BOSCH_BNO055_SERIAL is not set
+# CONFIG_BOSCH_BNO055_I2C is not set
 # CONFIG_FXOS8700_I2C is not set
 # CONFIG_KMX61 is not set
 # CONFIG_INV_ICM42600_I2C is not set
@@ -4439,6 +4428,7 @@ CONFIG_QCOM_SPMI_ADC5=y
 # CONFIG_JSA1212 is not set
 # CONFIG_RPR0521 is not set
 # CONFIG_LTR501 is not set
+# CONFIG_LTRF216A is not set
 # CONFIG_LV0104CS is not set
 # CONFIG_MAX44000 is not set
 # CONFIG_MAX44009 is not set
@@ -4667,9 +4657,9 @@ CONFIG_ANDROID_BINDER_DEVICES="binder,hwbinder,vndbinder"
 # CONFIG_DAX is not set
 CONFIG_NVMEM=y
 CONFIG_NVMEM_SYSFS=y
-CONFIG_QCOM_QFPROM=y
-# CONFIG_NVMEM_SPMI_SDAM is not set
+CONFIG_NVMEM_QCOM_QFPROM=y
 # CONFIG_NVMEM_RMEM is not set
+# CONFIG_NVMEM_SPMI_SDAM is not set
 
 #
 # HW tracing support
@@ -5013,6 +5003,7 @@ CONFIG_CRYPTO_NULL2=y
 # CONFIG_CRYPTO_CRYPTD is not set
 CONFIG_CRYPTO_AUTHENC=y
 # CONFIG_CRYPTO_TEST is not set
+# end of Crypto core or helper
 
 #
 # Public-key cryptography
@@ -5025,72 +5016,15 @@ CONFIG_CRYPTO_DH=y
 # CONFIG_CRYPTO_ECRDSA is not set
 # CONFIG_CRYPTO_SM2 is not set
 # CONFIG_CRYPTO_CURVE25519 is not set
+# end of Public-key cryptography
 
 #
-# Authenticated Encryption with Associated Data
-#
-CONFIG_CRYPTO_CCM=m
-CONFIG_CRYPTO_GCM=m
-# CONFIG_CRYPTO_CHACHA20POLY1305 is not set
-# CONFIG_CRYPTO_AEGIS128 is not set
-# CONFIG_CRYPTO_SEQIV is not set
-CONFIG_CRYPTO_ECHAINIV=y
-
-#
-# Block modes
-#
-CONFIG_CRYPTO_CBC=y
-# CONFIG_CRYPTO_CFB is not set
-CONFIG_CRYPTO_CTR=m
-# CONFIG_CRYPTO_CTS is not set
-CONFIG_CRYPTO_ECB=m
-# CONFIG_CRYPTO_LRW is not set
-# CONFIG_CRYPTO_OFB is not set
-# CONFIG_CRYPTO_PCBC is not set
-CONFIG_CRYPTO_XTS=m
-# CONFIG_CRYPTO_KEYWRAP is not set
-# CONFIG_CRYPTO_ADIANTUM is not set
-# CONFIG_CRYPTO_HCTR2 is not set
-CONFIG_CRYPTO_ESSIV=y
-
-#
-# Hash modes
-#
-CONFIG_CRYPTO_CMAC=m
-CONFIG_CRYPTO_HMAC=y
-# CONFIG_CRYPTO_XCBC is not set
-# CONFIG_CRYPTO_VMAC is not set
-
-#
-# Digest
-#
-CONFIG_CRYPTO_CRC32C=y
-CONFIG_CRYPTO_CRC32=m
-CONFIG_CRYPTO_XXHASH=m
-CONFIG_CRYPTO_BLAKE2B=m
-CONFIG_CRYPTO_CRCT10DIF=y
-CONFIG_CRYPTO_CRC64_ROCKSOFT=y
-CONFIG_CRYPTO_GHASH=m
-# CONFIG_CRYPTO_POLY1305 is not set
-# CONFIG_CRYPTO_MD4 is not set
-CONFIG_CRYPTO_MD5=m
-# CONFIG_CRYPTO_MICHAEL_MIC is not set
-# CONFIG_CRYPTO_RMD160 is not set
-CONFIG_CRYPTO_SHA1=y
-CONFIG_CRYPTO_SHA256=y
-CONFIG_CRYPTO_SHA512=y
-# CONFIG_CRYPTO_SHA3 is not set
-# CONFIG_CRYPTO_SM3_GENERIC is not set
-# CONFIG_CRYPTO_STREEBOG is not set
-# CONFIG_CRYPTO_WP512 is not set
-
-#
-# Ciphers
+# Block ciphers
 #
 CONFIG_CRYPTO_AES=y
 # CONFIG_CRYPTO_AES_TI is not set
 # CONFIG_CRYPTO_ANUBIS is not set
-# CONFIG_CRYPTO_ARC4 is not set
+# CONFIG_CRYPTO_ARIA is not set
 # CONFIG_CRYPTO_BLOWFISH is not set
 # CONFIG_CRYPTO_CAMELLIA is not set
 # CONFIG_CRYPTO_CAST5 is not set
@@ -5098,13 +5032,76 @@ CONFIG_CRYPTO_AES=y
 CONFIG_CRYPTO_DES=m
 # CONFIG_CRYPTO_FCRYPT is not set
 # CONFIG_CRYPTO_KHAZAD is not set
-# CONFIG_CRYPTO_CHACHA20 is not set
 # CONFIG_CRYPTO_SEED is not set
-# CONFIG_CRYPTO_ARIA is not set
 # CONFIG_CRYPTO_SERPENT is not set
 # CONFIG_CRYPTO_SM4_GENERIC is not set
 # CONFIG_CRYPTO_TEA is not set
 # CONFIG_CRYPTO_TWOFISH is not set
+# end of Block ciphers
+
+#
+# Length-preserving ciphers and modes
+#
+# CONFIG_CRYPTO_ADIANTUM is not set
+# CONFIG_CRYPTO_ARC4 is not set
+# CONFIG_CRYPTO_CHACHA20 is not set
+CONFIG_CRYPTO_CBC=y
+# CONFIG_CRYPTO_CFB is not set
+CONFIG_CRYPTO_CTR=m
+# CONFIG_CRYPTO_CTS is not set
+CONFIG_CRYPTO_ECB=m
+# CONFIG_CRYPTO_HCTR2 is not set
+# CONFIG_CRYPTO_KEYWRAP is not set
+# CONFIG_CRYPTO_LRW is not set
+# CONFIG_CRYPTO_OFB is not set
+# CONFIG_CRYPTO_PCBC is not set
+CONFIG_CRYPTO_XTS=m
+# end of Length-preserving ciphers and modes
+
+#
+# AEAD (authenticated encryption with associated data) ciphers
+#
+# CONFIG_CRYPTO_AEGIS128 is not set
+# CONFIG_CRYPTO_CHACHA20POLY1305 is not set
+CONFIG_CRYPTO_CCM=m
+CONFIG_CRYPTO_GCM=m
+# CONFIG_CRYPTO_SEQIV is not set
+CONFIG_CRYPTO_ECHAINIV=y
+CONFIG_CRYPTO_ESSIV=y
+# end of AEAD (authenticated encryption with associated data) ciphers
+
+#
+# Hashes, digests, and MACs
+#
+CONFIG_CRYPTO_BLAKE2B=m
+CONFIG_CRYPTO_CMAC=m
+CONFIG_CRYPTO_GHASH=m
+CONFIG_CRYPTO_HMAC=y
+# CONFIG_CRYPTO_MD4 is not set
+CONFIG_CRYPTO_MD5=m
+# CONFIG_CRYPTO_MICHAEL_MIC is not set
+# CONFIG_CRYPTO_POLY1305 is not set
+# CONFIG_CRYPTO_RMD160 is not set
+CONFIG_CRYPTO_SHA1=y
+CONFIG_CRYPTO_SHA256=y
+CONFIG_CRYPTO_SHA512=y
+# CONFIG_CRYPTO_SHA3 is not set
+# CONFIG_CRYPTO_SM3_GENERIC is not set
+# CONFIG_CRYPTO_STREEBOG is not set
+# CONFIG_CRYPTO_VMAC is not set
+# CONFIG_CRYPTO_WP512 is not set
+# CONFIG_CRYPTO_XCBC is not set
+CONFIG_CRYPTO_XXHASH=m
+# end of Hashes, digests, and MACs
+
+#
+# CRCs (cyclic redundancy checks)
+#
+CONFIG_CRYPTO_CRC32C=y
+CONFIG_CRYPTO_CRC32=m
+CONFIG_CRYPTO_CRCT10DIF=y
+CONFIG_CRYPTO_CRC64_ROCKSOFT=y
+# end of CRCs (cyclic redundancy checks)
 
 #
 # Compression
@@ -5115,9 +5112,10 @@ CONFIG_CRYPTO_DEFLATE=y
 CONFIG_CRYPTO_LZ4=m
 # CONFIG_CRYPTO_LZ4HC is not set
 # CONFIG_CRYPTO_ZSTD is not set
+# end of Compression
 
 #
-# Random Number Generation
+# Random number generation
 #
 CONFIG_CRYPTO_ANSI_CPRNG=y
 CONFIG_CRYPTO_DRBG_MENU=y
@@ -5127,6 +5125,11 @@ CONFIG_CRYPTO_DRBG_HMAC=y
 CONFIG_CRYPTO_DRBG=y
 CONFIG_CRYPTO_JITTERENTROPY=y
 CONFIG_CRYPTO_KDF800108_CTR=y
+# end of Random number generation
+
+#
+# Userspace interface
+#
 CONFIG_CRYPTO_USER_API=y
 CONFIG_CRYPTO_USER_API_HASH=m
 CONFIG_CRYPTO_USER_API_SKCIPHER=m
@@ -5135,7 +5138,37 @@ CONFIG_CRYPTO_USER_API_RNG=y
 # CONFIG_CRYPTO_USER_API_AEAD is not set
 CONFIG_CRYPTO_USER_API_ENABLE_OBSOLETE=y
 # CONFIG_CRYPTO_STATS is not set
+# end of Userspace interface
+
 CONFIG_CRYPTO_HASH_INFO=y
+# CONFIG_CRYPTO_NHPOLY1305_NEON is not set
+CONFIG_CRYPTO_CHACHA20_NEON=m
+
+#
+# Accelerated Cryptographic Algorithms for CPU (arm64)
+#
+CONFIG_CRYPTO_GHASH_ARM64_CE=y
+CONFIG_CRYPTO_POLY1305_NEON=m
+CONFIG_CRYPTO_SHA1_ARM64_CE=y
+CONFIG_CRYPTO_SHA256_ARM64=y
+CONFIG_CRYPTO_SHA2_ARM64_CE=y
+# CONFIG_CRYPTO_SHA512_ARM64 is not set
+# CONFIG_CRYPTO_SHA512_ARM64_CE is not set
+# CONFIG_CRYPTO_SHA3_ARM64 is not set
+# CONFIG_CRYPTO_SM3_ARM64_CE is not set
+# CONFIG_CRYPTO_POLYVAL_ARM64_CE is not set
+# CONFIG_CRYPTO_AES_ARM64 is not set
+CONFIG_CRYPTO_AES_ARM64_CE=y
+CONFIG_CRYPTO_AES_ARM64_CE_BLK=y
+# CONFIG_CRYPTO_AES_ARM64_NEON_BLK is not set
+# CONFIG_CRYPTO_AES_ARM64_BS is not set
+# CONFIG_CRYPTO_SM4_ARM64_CE is not set
+# CONFIG_CRYPTO_SM4_ARM64_CE_BLK is not set
+# CONFIG_CRYPTO_SM4_ARM64_NEON_BLK is not set
+CONFIG_CRYPTO_AES_ARM64_CE_CCM=y
+# CONFIG_CRYPTO_CRCT10DIF_ARM64_CE is not set
+# end of Accelerated Cryptographic Algorithms for CPU (arm64)
+
 CONFIG_CRYPTO_HW=y
 # CONFIG_CRYPTO_DEV_ATMEL_ECC is not set
 # CONFIG_CRYPTO_DEV_ATMEL_SHA204A is not set
@@ -5190,6 +5223,7 @@ CONFIG_INDIRECT_PIO=y
 #
 # Crypto library routines
 #
+CONFIG_CRYPTO_LIB_UTILS=y
 CONFIG_CRYPTO_LIB_AES=y
 CONFIG_CRYPTO_LIB_ARC4=m
 CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=y
@@ -5207,7 +5241,6 @@ CONFIG_CRYPTO_LIB_SHA1=y
 CONFIG_CRYPTO_LIB_SHA256=y
 # end of Crypto library routines
 
-CONFIG_LIB_MEMNEQ=y
 # CONFIG_CRC_CCITT is not set
 CONFIG_CRC16=y
 CONFIG_CRC_T10DIF=y
@@ -5233,6 +5266,7 @@ CONFIG_LZO_COMPRESS=m
 CONFIG_LZO_DECOMPRESS=m
 CONFIG_LZ4_COMPRESS=m
 CONFIG_LZ4_DECOMPRESS=m
+CONFIG_ZSTD_COMMON=m
 CONFIG_ZSTD_COMPRESS=m
 CONFIG_ZSTD_DECOMPRESS=m
 CONFIG_XZ_DEC=y
@@ -5270,6 +5304,7 @@ CONFIG_DMA_DIRECT_REMAP=y
 # CONFIG_DMA_API_DEBUG is not set
 # CONFIG_DMA_MAP_BENCHMARK is not set
 CONFIG_SGL_ALLOC=y
+# CONFIG_FORCE_NR_CPUS is not set
 CONFIG_CPU_RMAP=y
 CONFIG_DQL=y
 CONFIG_GLOB=y
@@ -5324,6 +5359,7 @@ CONFIG_DEBUG_MISC=y
 # Compile-time checks and compiler options
 #
 CONFIG_DEBUG_INFO=y
+CONFIG_AS_HAS_NON_CONST_LEB128=y
 # CONFIG_DEBUG_INFO_NONE is not set
 CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y
 # CONFIG_DEBUG_INFO_DWARF4 is not set
@@ -5462,6 +5498,7 @@ CONFIG_STACKTRACE=y
 # CONFIG_DEBUG_SG is not set
 # CONFIG_DEBUG_NOTIFIERS is not set
 # CONFIG_BUG_ON_DATA_CORRUPTION is not set
+# CONFIG_DEBUG_MAPLE_TREE is not set
 # end of Debug kernel data structures
 
 # CONFIG_DEBUG_CREDENTIALS is not set
@@ -5532,6 +5569,7 @@ CONFIG_RUNTIME_TESTING_MENU=y
 # CONFIG_TEST_BITMAP is not set
 # CONFIG_TEST_UUID is not set
 # CONFIG_TEST_XARRAY is not set
+# CONFIG_TEST_MAPLE_TREE is not set
 # CONFIG_TEST_RHASHTABLE is not set
 # CONFIG_TEST_SIPHASH is not set
 # CONFIG_TEST_IDA is not set
@@ -5553,4 +5591,9 @@ CONFIG_RUNTIME_TESTING_MENU=y
 CONFIG_ARCH_USE_MEMTEST=y
 CONFIG_MEMTEST=y
 # end of Kernel Testing and Coverage
+
+#
+# Rust hacking
+#
+# end of Rust hacking
 # end of Kernel hacking

device/community/soc-qcom-sdm845/APKBUILD

@@ -2,7 +2,7 @@
 # Co-Maintainer: Joel Selvaraj <joelselvaraj.oss@gmail.com>
 pkgname=soc-qcom-sdm845
 pkgdesc="Common package for Qualcomm SDM845 devices"
-pkgver=12
+pkgver=14
 pkgrel=0
 url="https://postmarketos.org"
 license="BSD-3-Clause"
@@ -19,12 +19,14 @@ subpackages="
 	$pkgname-vulkan
 "
 
-_ucm_commit="f2a9fad117c2c86d693623fd47dee5b6f7385fe2"
+_ucm_commit="9ed12836b269764c4a853411d38ccb6abb70b383"
 source="
 	alsa-ucm-conf-$_ucm_commit.tar.gz::https://gitlab.com/sdm845-mainline/alsa-ucm-conf/-/archive/$_ucm_commit/alsa-ucm-conf-$_ucm_commit.tar.gz
 	90-feedbackd-pmi8998.rules
 	modemmanager.conf
 	UPower.conf
+	call_audio_idle_suspend_workaround.sh
+	call_audio_idle_suspend_workaround.initd
 "
 
 package() {
@@ -49,12 +51,21 @@ nonfree_firmware() {
 	msm-modem
 	msm-modem-uim-selection
 	bootmac
+	alsa-utils
 "
 	install="$subpkgname.post-install $subpkgname.post-upgrade"
 	mkdir "$subpkgdir"
 
 	install -Dm644 "$srcdir"/modemmanager.conf \
 		"$subpkgdir"/etc/conf.d/modemmanager
+
+	# Call Audio idle suspend workaround code
+	install -Dm755 "$srcdir"/call_audio_idle_suspend_workaround.sh \
+		"$subpkgdir"/usr/sbin/call_audio_idle_suspend_workaround
+
+	# Call Audio idle suspend workaround init script
+	install -Dm755 "$srcdir"/call_audio_idle_suspend_workaround.initd \
+		"$subpkgdir"/etc/init.d/call_audio_idle_suspend_workaround
 }
 
 ucm() {
@@ -81,8 +92,10 @@ vulkan() {
 }
 
 sha512sums="
-92fa44327488d8deca17be50c3e37538e7e25875b7da8d921058a732ce2dbe8bf6a4d88b2052eea56ffd9a54212babbae10e94fe5e8eed04cce7ce3a37c03833  alsa-ucm-conf-f2a9fad117c2c86d693623fd47dee5b6f7385fe2.tar.gz
+e55545b0b319bb0cb7e8c6ca961828f7e8c389f97b45492e0c432b9bbd5d3158359828e852ceac68cbead4f850c19e06ac565dac2dcae11d40486ba641e3e7ec  alsa-ucm-conf-9ed12836b269764c4a853411d38ccb6abb70b383.tar.gz
 4f2c22a3a3fc7d380e200ad977578107d81f0e7ade7918e03bdb15b60a564e8db5f47e13cce22f636d38fd3722696bb46076b8872dae0ca2d8a3838522a1f025  90-feedbackd-pmi8998.rules
 e33f41360ccc4900bb76a26cc7b46bde1fb90facdf45c4fbcebc80499386939948401cacd6df9f779eafab10f4ee77ee1fef3e7bd06f483f8c2a4a644c84f327  modemmanager.conf
 9d455b56558d453d501a1ad869ffa79f9952ed43485a9847d506db6a78bfcd9f9c9d855660ee1d368eb74f4429385ec166addc30d802261c75562e785fe84c52  UPower.conf
+aa5cdb138a3cdd0b15d2bbb60c7f67ae0280ddc7d0488cfe2fc44680095a43c1cdacc54d70a689f2117538e9bf1e42758d8c3ac542c9cb8e8dc6d6f3161b7577  call_audio_idle_suspend_workaround.sh
+1111d28b6e23163fb47fcfadc2ed3f83543ce0435c6be187a38d418cfe7821fe7905ac103969f3f7c115bd522d99c43efd52409835e292270a6ac9c34b5bee75  call_audio_idle_suspend_workaround.initd
 "

device/community/soc-qcom-sdm845/call_audio_idle_suspend_workaround.initd

@@ -0,0 +1,28 @@
+#!/sbin/openrc-run
+
+name="call_audio_idle_suspend_workaround"
+description="Disable pulseaudio suspend-on-idle module during call"
+pid="/run/call_audio_idle_suspend_workaround.pid"
+
+depend() {
+	need dbus
+}
+
+start() {
+	ebegin "Starting call audio idle suspend workaround"
+
+	userid=10000 # Default User ID in pmOS
+	user=$(getent passwd $userid | cut -d: -f1)
+	env_var="XDG_RUNTIME_DIR=/run/user/$userid"
+	cmd="/usr/sbin/call_audio_idle_suspend_workaround"
+
+	start-stop-daemon --start --exec "$cmd" --env "$env_var" --background --user $user --pidfile "$pid" --make-pidfile
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping call audio idle suspend workaround"
+
+	start-stop-daemon --stop --pidfile "$pid"
+	eend $?
+}

device/community/soc-qcom-sdm845/call_audio_idle_suspend_workaround.sh

@@ -0,0 +1,30 @@
+#!/bin/sh
+
+# dbus-monitor is run as a child process to this script. Kill child process too when the script terminates.
+trap 'pkill -9 -P $$ && exit 0' INT TERM
+
+interface=org.freedesktop.ModemManager1.Call
+member=StateChanged
+
+dbus-monitor --system "type='signal',interface='$interface',member='$member'" |
+	while read -r line; do
+		state=$(echo "$line" | awk '/\<int32\>/ {print $2}')
+		if [ -n "$state" ]; then
+			# Call State is based on https://www.freedesktop.org/software/ModemManager/doc/latest/ModemManager/ModemManager-Flags-and-Enumerations.html#MMCallState
+			if [ "$state" -eq '0' ] || [ "$state" -eq '3' ]; then
+				echo "Call Started"
+
+				# Unload module-suspend-on-idle when call begins
+				pactl unload-module module-suspend-on-idle
+			fi
+
+			if [ "$state" -eq '7' ]; then
+				echo "Call Ended"
+
+				# Reload module-suspend-on-idle after call ends
+				pactl load-module module-suspend-on-idle
+			fi
+		fi
+	done &
+
+wait

device/community/soc-qcom-sdm845/soc-qcom-sdm845-nonfree-firmware.post-install

@@ -2,3 +2,4 @@
 rc-update add tqftpserv boot
 rc-update add pd-mapper boot
 rc-update add q6voiced default
+rc-update add call_audio_idle_suspend_workaround default

device/main/device-purism-librem5/APKBUILD

@@ -1,11 +1,11 @@
 # Reference: <https://postmarketos.org/devicepkg>
 # Maintainer:  Clayton Craft <clayton@craftyguy.net>
-# Co-Maintainer: Bhushan Shah <bshah@kde.org>
+# Co-Maintainer: Alistair Francis <alistair@alistair23.me>
 pkgname=device-purism-librem5
 pkgdesc="Purism Librem 5 Phone"
-pkgver=1.34
-pkgrel=1
-_confver=52
+pkgver=1.37
+pkgrel=0
+_confver=54
 _purismrel=1
 # <librem5-base ver>.<purism release>
 _purismver=${_confver}pureos$_purismrel
@@ -42,8 +42,11 @@ source="
 	70-librem5-xwayland-accel.sh
 	0002-udev-cameras-use-correct-path-for-modprobe-on-Alpine.patch
 	l5-ship-mode.initd
+	l5-lockdown-support.initd
+	org.freedesktop.GeoClue2.service
 "
 subpackages="
+	$pkgname-geoclue
 	$pkgname-nonfree-firmware:nonfree_firmware
 	$pkgname-phosh
 	$pkgname-pulseaudio
@@ -61,6 +64,14 @@ build() {
 	devicepkg_build $startdir $pkgname
 }
 
+geoclue() {
+	pkgdesc="geoclue configuration for the Librem 5"
+	install_if="$pkgname geoclue"
+	replaces="geoclue"
+	install -Dm644 "$srcdir"/org.freedesktop.GeoClue2.service \
+		-t "$subpkgdir"/usr/share/dbus-1/system-services/
+}
+
 phosh() {
 	pkgdesc="Phosh support for the Librem 5"
 	install_if="$pkgname phosh"
@@ -127,7 +138,7 @@ package() {
 	for f in "$builddir"/debian/*.udev; do
 		# rename the udev rules, dropping the default prefix and (arbitrarily...) using "85-"
 		install -Dm644 "$f" \
-			"$pkgdir"/usr/lib/udev/rules.d/85-"$(basename ${f//librem5-base-defaults./})"
+			"$pkgdir"/usr/lib/udev/rules.d/85-"$(basename ${f//librem5-base-defaults./}).rules"
 	done
 
 	# Wifi / PM
@@ -150,6 +161,14 @@ package() {
 	install -D -m755 "$srcdir"/l5-ship-mode.initd \
 		"$pkgdir"/etc/init.d/l5-ship-mode
 
+	# lockdown support
+	install -Dm755 "$builddir"/default/lockdown-support/lockdown-support.sh \
+		-t "$pkgdir"/usr/sbin/
+	install -Dm755 "$builddir"/default/lockdown-support/modprobe.d/librem5-lsm9ds1.conf \
+		-t "$pkgdir"/etc/modprobe.d/
+	install -Dm755 "$srcdir"/l5-lockdown-support.initd \
+		"$pkgdir"/etc/init.d/l5-lockdown-support
+
 	devicepkg_package $startdir $pkgname
 }
 
@@ -160,7 +179,7 @@ nonfree_firmware() {
 }
 
 sha512sums="
-fb1bf84a36db29dcd70753e6f5b3d5b574f89efd2277676d89574400da84ca825fae548cbc3d76af1b3a8a38430fc611933ecb7c27ee78c47957313f057ce754  librem5-base-pureos-52pureos1.tar.gz
+bd479afaa9bfc96bfd0719654947ff031f060c988d20e5de8c170bf51ab32dd0ca9a499f24cdc95abf1a3bc131acdf94cd9aab12bd5eb43f222cb676f4efd19b  librem5-base-pureos-54pureos1.tar.gz
 2e72d9a084ecd6c96cafbbd8fda461ae8b2ebd14ffda601d9f36d73f08f04088213de17da078293ddd958d4c76d33148c7af6e252eb0709f6934855a55578509  00-mesa.sh
 8b6fa7b12c15f439c561901f3ffe24a1ef2a0c343401c0a79281060854ab29e08a1fb5e7adae8684b12aa9f535ed99e2dad993dce9724822cb0fbf2497dd86e5  70-wifi-pm.rules
 00355d9ad085a77e157f3c62eb4f1bcac2823d3b341e34d1128edbfb1444fba83e8eacd263ea61da9f6d853f1328ab7fbe5ea63bd08c8a1bc9b8eaf44ae1f1c6  77-mm-broadmobi-port-types.rules
@@ -170,9 +189,11 @@ ccb47fd421c5e35a8def8e6fb61dad99e42cf542690068a68f90c257e41d33f45f1069db0a8d8937
 a0740e405781ec6ef765fdc9f5700c95adbb241c45c97b9384ba68cdece662cb216ca5918640042f6e65a5d1b1a9099936382c99b49a44303f7b6d77a075a471  modules-load.d_librem5.conf
 8ef4ec7a9e9a4fb801d207e7d94b627aacc9243a93b0ec28e0823a6f44b8102416c040e4ddf499f87bb9dfa960cf6f627b008b79f197f6814b3fd881e18ae8ef  pcscd-librem5-reader.conf
 2618b40eebd3602066ee75ab85cbdbb4cfee498def9879c95a304f05a6eeedf1ab28c5dd9fa5efc8f88c790f49c96458c61d5dfe8a3ca0f96bcc0e244313ab01  pcscd-librem5.initd
-6971669a7ae4206f6d38f5050747ebc9ffb591a92921a00623e20bb9369ed25d6168dba719de0abec900f1dc5f2f02089a05b5f4e871d6a7cee5afcf38c581fc  uboot-script.cmd
+66960a2693a2ee9d09163e9fc7e28b3d19021bfc61d1d9643b4dc49ea69fe5e5a15144790fb647ce09db4ba6c060db0b5d4f8dd187140c9c21a8154d6dbeaa89  uboot-script.cmd
 1cbc65cf2cb8fad4b0332d012a0256a266205b9b64371f5c0dae09dbb7f1e45b254e8c43993b896097e9d7035a72d547d9bce1ab2133addc56a5abdb80b44616  xorg.conf
 fad386071fc45f9880a94cc8004fabd5d98b3e6a12606c98d8e72e0208f22ab54f03b921f5967a959782507e2bff67d2fa92e46d8cd242011a3afcdbda529279  70-librem5-xwayland-accel.sh
 b45749fcddfd65a302b502bcabfa5828d1b63e45d844fd50e44009a756b919db20fe9526102947c0f0dfcdffe4a037e5050fe1b24fb915933ce0837f49759378  0002-udev-cameras-use-correct-path-for-modprobe-on-Alpine.patch
 c723764d507ccd4b04aa5ce79b1d1ebc131873cdc37a943cb0f92b8a08a3c69eb9e0d31fcd4589fd8c40a9676bae9897e4f12ec2ebe4db8214ac85669ef35a53  l5-ship-mode.initd
+f4b314d553655f7975445ac0a33099923e20dabb082c07e2cf6a78e4118c143d777dd4ad2c09cbc388600bdefe8deb3073fbd15b238772ddf09c66ac46415590  l5-lockdown-support.initd
+fd91bcd8cecd509587f0a26d454157a1df094d2d86c75329d1002e9474946494d4d1b5407e055fbd5f21e22394eeb1bbd4b3439ae6925db50a3427b4fac101cf  org.freedesktop.GeoClue2.service
 "

device/main/device-purism-librem5/device-purism-librem5.post-install

@@ -6,6 +6,7 @@ sed -i 's|# nmea-socket=/var/run/gps-share.sock|nmea-socket=/var/run/gnss-share.
 rc-update -qq del gpsd
 rc-update -q add gnss-share
 rc-update -q add l5-ship-mode shutdown
+rc-update -q add l5-lockdown-support
 
 # Clean up any old, unneeded legacy u-boot images from /boot
 for f in uInitrd uImage; do

device/main/device-purism-librem5/l5-lockdown-support.initd

@@ -0,0 +1,9 @@
+#!/sbin/openrc-run
+name="Purism Librem 5 Lockdown Support"
+
+start()
+{
+	ebegin "Enabling lockdown support"
+        /usr/sbin/lockdown-support.sh
+	eend 0
+}

device/main/device-purism-librem5/org.freedesktop.GeoClue2.service

@@ -0,0 +1,5 @@
+[D-BUS Service]
+Name=org.freedesktop.GeoClue2
+Exec=/usr/libexec/geoclue --nmea-socket /var/run/gnss-share.sock
+User=geoclue
+SystemdService=geoclue.service

device/main/device-purism-librem5/uboot-script.cmd

@@ -19,14 +19,20 @@ fi
 
 setenv bootargs init=/init.sh rw console=ttymxc0,115200 cma=256M PMOS_NO_OUTPUT_REDIRECT PMOS_FORCE_PARTITION_RESIZE
 
-# select the correct dtb based on device revision
-# default to "-r2" if board_rev isn't set, since it'll boot on any librem5
-# revision
-dtb_file=imx8mq-librem5-r2.dtb
+# Select the correct dtb based on device revision
+# Default to "-r4" if board_rev isn't set, since there are apparently Evergreen
+# boards that either 1) identify as r4, 2) identify as r5 (or something else?),
+# or 3) don't identify as anything(?).
+# See: https://gitlab.com/postmarketOS/pmaports/-/issues/1643#note_1147248594
+dtb_file=imx8mq-librem5-r4.dtb
 if itest.s "x3" == "x$board_rev" ; then
         dtb_file=imx8mq-librem5-r3.dtb
-elif itest.s "x4" == "x$board_rev" ; then
-        dtb_file=imx8mq-librem5-r4.dtb
+elif itest.s "x2" == "x$board_rev" ; then
+        dtb_file=imx8mq-librem5-r2.dtb
+elif itest.s "x1" == "x$board_rev" ; then
+        dtb_file=imx8mq-librem5-r2.dtb
+elif itest.s "x0" == "x$board_rev" ; then
+        dtb_file=imx8mq-librem5-r2.dtb
 fi
 
 echo Loading DTB

device/main/device-qemu-riscv64/APKBUILD

@@ -0,0 +1,64 @@
+# Reference: <https://postmarketos.org/devicepkg>
+# Maintainer: Minecrell <minecrell@minecrell.net>
+# Co-Maintainer: Luca Weiss <luca@z3ntu.xyz>
+pkgname=device-qemu-riscv64
+pkgver=1
+pkgrel=0
+pkgdesc="Simulated device in QEMU (riscv64)"
+url="https://postmarketos.org"
+arch="riscv64"
+license="MIT"
+depends="postmarketos-base"
+makedepends="devicepkg-dev"
+subpackages="
+	$pkgname-kernel-edge:kernel_edge
+	$pkgname-mce
+	$pkgname-sway
+	$pkgname-weston
+	"
+
+source="
+	deviceinfo
+	mce-display-blanking.conf
+	weston.ini
+	"
+options="!check !archcheck"
+
+build() {
+	devicepkg_build $startdir $pkgname
+}
+
+package() {
+	devicepkg_package $startdir $pkgname
+}
+
+mce() {
+	pkgdesc="Prevents screen blanking for UI's using mce (Glacier, Asteroid)"
+	install_if="$pkgname=$pkgver-r$pkgrel mce"
+	install -Dm644 "$srcdir"/mce-display-blanking.conf \
+		"$subpkgdir"/etc/mce/50display-blanking.conf
+}
+
+sway() {
+	install_if="$pkgname=$pkgver-r$pkgrel postmarketos-ui-sway"
+	depends="postmarketos-ui-sway-logo-key-alt"
+	mkdir "$subpkgdir"
+}
+
+weston() {
+	install_if="$pkgname=$pkgver-r$pkgrel weston"
+	install -Dm644 "$srcdir"/weston.ini \
+		"$subpkgdir"/etc/xdg/weston/weston.ini
+}
+
+kernel_edge() {
+	pkgdesc="Alpine Edge kernel"
+	depends="linux-edge linux-firmware-none"
+	devicepkg_subpackage_kernel $startdir $pkgname $subpkgname
+}
+
+sha512sums="
+42341299cfd0f301f6dbd626efd115ca5f7d3e9893f45bcb0a3428fedac5f61be97d5c3a0682fb2d38c4ae01d841dcbb2d0eda39670ca31c372a9d5842b97950  deviceinfo
+99d32eed6c5cda59e91516e982c5bd5165ff718133e2411a0dbba04e2057d1dfad49a75e5cc67140d0e0adcbe1383671bd2892335929b782a5b19f5472e635ad  mce-display-blanking.conf
+de794566118f1744d068a94e6a75b61d43f6749a4b0871a5270fa7a2048164d609c71fcffa61845c2a7dd4cb5fbeb72c0e4f8b73b382f36d6ff0bcc9b8a5ae25  weston.ini
+"

device/main/device-qemu-riscv64/deviceinfo

@@ -0,0 +1,23 @@
+# Reference: <https://postmarketos.org/deviceinfo>
+# Please use double quotes only. You can source this file in shell scripts.
+
+deviceinfo_format_version="0"
+deviceinfo_name="QEMU riscv64"
+deviceinfo_manufacturer="QEMU"
+deviceinfo_codename="qemu-riscv64"
+deviceinfo_modules_initfs="virtio_pci virtio_blk virtio-gpu virtio_input evdev"
+deviceinfo_arch="riscv64"
+
+# Device related
+deviceinfo_gpu_accelerated="true"
+deviceinfo_chassis="vm"
+deviceinfo_keyboard="true"
+deviceinfo_external_storage="true"
+deviceinfo_screen_width="1024"
+deviceinfo_screen_height="768"
+deviceinfo_getty="ttyS0;230400"
+
+# Bootloader related
+deviceinfo_flash_method="none"
+deviceinfo_kernel_cmdline="console=tty1 console=ttyS0 PMOS_NO_OUTPUT_REDIRECT PMOS_FORCE_PARTITION_RESIZE"
+deviceinfo_disable_dhcpd="true"

device/main/device-qemu-riscv64/mce-display-blanking.conf

@@ -0,0 +1 @@
+/system/osso/dsm/display/display_never_blank=1

device/main/device-qemu-riscv64/weston.ini

@@ -0,0 +1,5 @@
+[core]
+xwayland=true
+backend=drm-backend.so
+[shell]
+background-image=/usr/share/wallpapers/postmarketos.jpg