DO NOT MERGE: tablet-x64eufi: adopt and move to community

Signed-off-by: Alistair Francis <alistair@alistair23.me>

[ci:skip-build] already built successfully in CI

.ci/apkbuild-lint.sh

@@ -12,7 +12,7 @@ if [ "$(id -u)" = 0 ]; then
 fi
 
 # Wrap pmbootstrap to use this repository for --aports
-pmaports="$(cd $(dirname $0)/..; pwd -P)"
+pmaports="$(cd "$(dirname "$0")"/..; pwd -P)"
 _pmbootstrap="$(command -v pmbootstrap)"
 pmbootstrap() {
 	"$_pmbootstrap" --aports="$pmaports" "$@"

.ci/commits.sh

@@ -1,5 +1,5 @@
 #!/bin/sh -e
-# Copyright 2022 Oliver Smith
+# Copyright 2023 Oliver Smith
 # SPDX-License-Identifier: GPL-3.0-or-later
 # Description: check pkgver/pkgrel bumps, amount of changed pkgs etc
 # Options: native

.ci/grep.sh

@@ -9,16 +9,32 @@ if [ "$(id -u)" = 0 ]; then
 fi
 
 # Find CHANGEMEs in APKBUILDs
-if grep -qr '(CHANGEME!)' *; then
+if grep -qr '(CHANGEME!)' -- *; then
 	echo "ERROR: Please replace '(CHANGEME!)' in the following files:"
-	grep --color=always -r '(CHANGEME!)' *
+	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
+# shellcheck disable=SC2016
+if grep -qr 'INSTALL_DTBS_PATH="$pkgdir"/usr/share/dtb' device/; then
+	echo 'ERROR: Please do not install dtbs to /usr/share/dtb!'
+	echo 'ERROR: Unless you have a good reason not to, please put them in /boot/dtbs'
+	echo 'ERROR: Files that need fixing:'
+	# shellcheck disable=SC2016
+	grep --color=always -r 'INSTALL_DTBS_PATH="$pkgdir"/usr/share/dtb' device/
+	exit 1
+fi
+
+
+# Find old mkinitfs paths (pre mkinitfs 2.0)
+if grep -qr '/etc/postmarketos-mkinitfs' -- *; then
+	echo "ERROR: Please replace '/etc/postmarketos-mkinitfs' with '/usr/share/mkinitfs' in the following files:"
+	grep --color=always -r '/etc/postmarketos-mkinitfs' -- *
+	exit 1
+fi
+if grep -qr '/usr/share/postmarketos-mkinitfs' -- *; then
+	echo "ERROR: Please replace '/usr/share/postmarketos-mkinitfs' with '/usr/share/mkinitfs' in the following files:"
+	grep --color=always -r '/usr/share/postmarketos-mkinitfs' -- *
+	exit 1
+fi

.ci/kconfig.sh

@@ -1,5 +1,5 @@
 #!/bin/sh -e
-# Description: check all kernel configs with 'pmbootstrap kconfig check'
+# Description: check modified kernel configs
 # Options: native
 # Use 'native' because it requires running pmbootstrap.
 # https://postmarketos.org/pmb-ci
@@ -11,12 +11,6 @@ if [ "$(id -u)" = 0 ]; then
 	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" "$@"
-}
+export PYTHONUNBUFFERED=1
 
-set -x
-pmbootstrap kconfig check
+.ci/lib/check_changed_kernels.py

.ci/lib/check_changed_kernels.py

@@ -0,0 +1,83 @@
+#!/usr/bin/env python3
+# Copyright 2023 Oliver Smith
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+import glob
+import tempfile
+import sys
+import subprocess
+
+# Same dir
+import common
+
+# pmbootstrap
+import add_pmbootstrap_to_import_path  # noqa
+import pmb.parse
+import pmb.helpers.logging
+
+
+def check_kconfig(args, pkgnames):
+    last_failed = None
+    for i in range(len(pkgnames)):
+        pkgname = pkgnames[i]
+        print(f"  ({i+1}/{len(pkgnames)}) {pkgname}")
+
+        apkbuild_path = pmb.helpers.pmaports.find(args, pkgname)
+        apkbuild = pmb.parse._apkbuild.apkbuild(f"{apkbuild_path}/APKBUILD")
+
+        options = []
+
+        for opt in apkbuild["options"]:
+            if "pmb:kconfigcheck" in opt:
+                options += [opt]
+
+        if len(options):
+            options.sort()
+            print(f'options="{" ".join(options)}"')
+
+        if "!pmb:kconfigcheck" in apkbuild["options"]:
+            print("skipped (!pmb:kconfigcheck)")
+            continue
+
+        if not pmb.parse.kconfig.check(args, pkgname, details=True):
+            last_failed = pkgname
+
+    return last_failed
+
+
+def show_error(last_failed):
+    print("")
+    print("Please adjust your kernel config. This is required for getting your"
+          " patch merged.")
+    print("")
+    print("Edit your kernel config:")
+    print(f"  pmbootstrap kconfig edit {last_failed}")
+    print("")
+    print("Test this kernel config again:")
+    print(f"  pmbootstrap kconfig check {last_failed}")
+    print("")
+    print("Run this check again (on all kernels you modified):")
+    print("  pmbootstrap ci kconfig")
+    print("")
+
+
+if __name__ == "__main__":
+    common.add_upstream_git_remote()
+    pkgnames = common.get_changed_kernels()
+    print(f"Changed kernels: {pkgnames}")
+
+    if len(pkgnames) == 0:
+        print("No kernels changed in this branch")
+        exit(0)
+
+    # Initialize args (so we can use pmbootstrap's kconfig parsing)
+    sys.argv = ["pmbootstrap", "kconfig", "check"]
+    args = pmb.parse.arguments()
+    pmb.helpers.logging.init(args)
+
+    print("Running kconfig check on changed kernels...")
+    last_failed = check_kconfig(args, pkgnames)
+
+    if last_failed:
+        show_error(last_failed)
+        exit(1)

.ci/lib/check_devices_in_wiki.py

@@ -1,5 +1,5 @@
 #!/usr/bin/env python3
-# Copyright 2022 Oliver Smith
+# Copyright 2023 Oliver Smith
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 import argparse

.ci/lib/common.py

@@ -190,3 +190,11 @@ def get_changed_packages():
         ret.add(os.path.basename(dirname))
 
     return ret
+
+
+def get_changed_kernels():
+    ret = []
+    for pkgname in get_changed_packages():
+        if pkgname.startswith("linux-"):
+            ret += [pkgname]
+    return ret

.ci/lib/gitlab_prepare_ci.sh

@@ -1,5 +1,5 @@
 #!/bin/sh -e
-# Copyright 2022 Oliver Smith
+# Copyright 2023 Oliver Smith
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 if ! mount | grep -q /proc/sys/fs/binfmt_misc; then

.ci/lib/move_logs.sh

@@ -3,7 +3,7 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 if [ -z "$1" ]; then
-	echo "usage: $(basename $0) \$CI_PROJECT_DIR"
+	echo "usage: $(basename "$0") \$CI_PROJECT_DIR"
 	exit 1
 fi
 

.ci/pytest.sh

@@ -1,5 +1,5 @@
 #!/bin/sh -e
-# Copyright 2022 Oliver Smith
+# Copyright 2023 Oliver Smith
 # SPDX-License-Identifier: GPL-3.0-or-later
 # Description: lint with various python tests
 # Options: native
@@ -20,7 +20,7 @@ if [ -z "$(command -v pytest)" ]; then
 fi
 
 # Wrap pmbootstrap to use this repository for --aports
-pmaports="$(cd $(dirname $0)/..; pwd -P)"
+pmaports="$(cd "$(dirname "$0")"/..; pwd -P)"
 _pmbootstrap="$(command -v pmbootstrap)"
 pmbootstrap() {
 	"$_pmbootstrap" --aports="$pmaports" "$@"
@@ -34,6 +34,7 @@ pmbootstrap -q shutdown
 # Make sure we have a valid device (pmbootstrap#1128)
 device="$(pmbootstrap config device)"
 deviceinfo="$pmaports/device/*/device-$device/deviceinfo"
+# shellcheck disable=SC2086
 if ! [ -e $deviceinfo ]; then
 	echo "ERROR: Could not find deviceinfo file for selected device '$device'."
 	echo "Expected path: $deviceinfo"

.ci/shellcheck.sh

@@ -1,5 +1,5 @@
 #!/bin/sh -e
-# Copyright 2022 Oliver Smith
+# Copyright 2023 Oliver Smith
 # SPDX-License-Identifier: GPL-3.0-or-later
 # Description: lint all shell scripts
 # https://postmarketos.org/pmb-ci
@@ -17,9 +17,10 @@ sh_files="
 	./main/mdss-fb-init-hack/mdss-fb-init-hack.sh
 	./main/osk-sdl/unlock.sh
 	./main/postmarketos-base/rootfs-usr-lib-firmwareload.sh
+	./main/postmarketos-base-ui/rootfs-etc-NetworkManager-dispatcher.d-99-dns-filter.sh
 	./main/postmarketos-installkernel/installkernel-pmos
-	./main/postmarketos-mkinitfs/init.sh
-	./main/postmarketos-mkinitfs/init_functions.sh
+	./main/postmarketos-initramfs/init.sh
+	./main/postmarketos-initramfs/init_functions.sh
 	./main/postmarketos-mkinitfs-hook-debug-shell/20-debug-shell.sh
 	./main/postmarketos-mkinitfs-hook-netboot/netboot.sh
 	./main/postmarketos-update-kernel/update-kernel.sh
@@ -40,7 +41,7 @@ sh_files="
 	$(find . -path './main/devicepkg-dev/*.sh')
 	$(find . -path './main/postmarketos-mvcfg/*.sh')
 
-	$(find . -path '.ci/*.sh')
+	$(find . -path './.ci/**.sh')
 "
 
 for file in $sh_files; do

.ci/testcases/add_pmbootstrap_to_import_path/__init__.py

@@ -15,8 +15,10 @@ def path_pmbootstrap():
         code from there.
         returns: pmbootstrap installation folder
     """
-    # Find 'pmbootstrap' executable
-    bin = shutil.which("pmbootstrap")
+    # This variable is set by pmbootstrap 1.52 and later
+    # If it's undefined, try to find 'pmbootstrap' in path
+    bin = os.environ.get("PMBOOTSTRAP_CMD") or shutil.which("pmbootstrap")
+
     if not bin:
         print("ERROR: 'pmbootstrap' not found in $PATH")
         sys.exit(1)

.ci/testcases/test_device.py

@@ -38,7 +38,11 @@ def test_aports_device(args):
         apkbuild = pmb.parse.apkbuild(path)
 
         # Depends: Require "postmarketos-base"
-        if "postmarketos-base" not in apkbuild["depends"]:
+        depend_flag = False
+        for dependency in apkbuild["depends"]:
+            if "postmarketos-base" == dependency or "postmarketos-base>" in dependency:
+                depend_flag = True
+        if not depend_flag:
             raise RuntimeError("Missing 'postmarketos-base' in depends of " +
                                path)
 

.ci/testcases/test_provides.py

@@ -1,5 +1,5 @@
 #!/usr/bin/env python3
-# Copyright 2022 Oliver Smith
+# Copyright 2023 Oliver Smith
 # SPDX-License-Identifier: GPL-3.0-or-later
 import glob
 import logging

.ci/testcases/test_source.py

@@ -1,5 +1,5 @@
 #!/usr/bin/env python3
-# Copyright 2022 Oliver Smith
+# Copyright 2023 Oliver Smith
 # SPDX-License-Identifier: GPL-3.0-or-later
 # Various checks on source= in the APKBUILDs
 

.ecrc

@@ -1,4 +1,3 @@
 {
-  "Version": "2.6.0",
   "SpacesAftertabs": true
 }

.githooks/pre-commit

@@ -0,0 +1,119 @@
+#!/bin/sh
+#
+# This hook checks that all local sources specified in the staged APKBUILDs
+# are staged too or already committed and that checksums are correct.
+#
+set -eu
+
+# Maximal allowed size (in bytes) of a file.
+FILE_SIZE_LIMIT=262144  # 256 kiB
+
+
+if ! command -v sha512sum >/dev/null; then
+	# macOS / BSDs (?) don't have sha512sum, but shasum.
+	alias sha512sum='shasum -a 512'
+fi
+
+error() {
+	printf '\033[0;31mpre-commit:\033[0m %s\n' "$1" >&2  # red
+}
+
+# Prints paths of created or modified files being committed.
+changed_files() {
+	git diff-index \
+		--name-only \
+		--cached \
+		--diff-filter=ACMR HEAD \
+		-- "$@"
+}
+
+# Prints file names and checksums (in format <SHA-512>:<filename>) of local
+# sources specified in the APKBUILD ($1).
+apkbuild_local_sources() {
+	apkbuild="$1"
+
+	set +eu
+	. "$apkbuild" || {
+		error "$apkbuild is invalid"
+		return 1
+	}
+	set -eu
+
+	status=0
+	: ${source:=""}
+	for src in $source; do
+		# Skip remote sources.
+		case "$src" in */*) continue;; esac
+
+		echo "$sha512sums" | awk -v src="$src" '
+				{ if ($2 == src) { ok=1; print($2 ":" $1) } }
+				END { if (ok != 1) exit 1 }' || {
+			status=1
+			error "${apkbuild%/*}: file \"$src\" is missing in \$sha512sums (hint: run pmbootstrap checksum)"
+		}
+	done
+
+	return $status
+}
+
+# check if given object is a symlink
+is_symlink() {
+	test "$(git ls-files --stage "$1" | awk '{print $1}')" = "120000"
+}
+
+# Checks that all local sources specified in the APKBUILD file ($1) are
+# available in git tree and checksums are correct.
+check_local_sources() {
+	local apkbuild="$1"
+	local startdir="${apkbuild%/*}"
+	local status=0
+	local checksum_act checksum_exp content filename line sources
+
+	sources=$(apkbuild_local_sources "$apkbuild")
+	for line in $sources; do
+		filename=${line%%:*}
+		checksum_exp=${line#*:}
+
+		if ! git cat-file -e ":$startdir/$filename" 2>/dev/null; then
+			error "$startdir: missing file \"$filename\""
+			status=1
+			continue
+		fi
+
+		if is_symlink ":$startdir/$filename"; then
+			continue
+		fi
+
+		checksum_act=$(git show ":$startdir/$filename" | sha512sum)
+		if [ "$checksum_act" != "$checksum_exp  -" ]; then
+			local cmd="pmbootstrap checksum $(basename "$startdir")"
+			error "$startdir: bad checksum for file \"$filename\" (hint: run $cmd)"
+			status=1
+		fi
+	done
+
+	return $status
+}
+
+# Checks if the file ($1) being committed is not bigger than FILE_SIZE_LIMIT.
+check_file_size() {
+	local path="$1"
+	local size
+
+	size=$(git cat-file -s ":$path")
+	if [ $size -gt $FILE_SIZE_LIMIT ]; then
+		local size_kb=$(( size / 1024 ))
+
+		error "file \"$path\" is quite big ($(( size / 1024 )) kiB), better put a remote url in source="
+		return 1
+	fi
+}
+
+
+for apkbuild in $(changed_files '**/APKBUILD'); do
+	check_local_sources "$apkbuild"
+done
+
+for path in $(changed_files); do
+	check_file_size "$path"
+done

.githooks/prepare-commit-msg

@@ -0,0 +1,49 @@
+#!/bin/sh
+#
+# This hook adds prefix "<repo>/<pkgname>: " to the commit message when
+# committing changes of a single package.
+#
+MSG_FILE="$1"
+SOURCE="$2"
+
+longest_common_prefix() {
+	awk -F/ '
+		(NR == 1) { split($0, prefix); prefix_len = NF }
+		(NR > 1) {
+			for (i = 1; i <= prefix_len; i++) {
+				if (prefix[i] != $i) {
+					prefix_len = i - 1; break
+				}
+			}
+		}
+		(prefix_len == 0) { exit }
+		END {
+			res = prefix[1]
+			for (i = 2; i <= prefix_len; i++) {
+				res = res FS prefix[i]
+			}
+			print(res)
+		}'
+}
+
+prepend_msg() {
+	local prefix="$1"
+
+	printf '%s\n%s\n' "$prefix" "$(cat "$MSG_FILE")" > "$MSG_FILE"
+}
+
+
+# Do nothing if message has been given using -m, template, merge etc.
+[ -z "$SOURCE" ] || exit 0
+
+lcp=$(git diff-index --name-only --cached HEAD | longest_common_prefix)
+
+case "$lcp" in
+	device/*/*) prepend_msg "$(echo "$lcp" | cut -d/ -f3): ";;
+	# Multiple packages touched for same device category
+	# More logic could be added to detect if they all belong to same device
+	device/*)  ;;
+	[^.]*/*) prepend_msg "$(echo "$lcp" | cut -d/ -f1-2): ";;
+esac
+
+exit 0

.gitlab/issue_templates/Default.md

@@ -0,0 +1,46 @@
+<!--
+	Thank you for using postmarketOS! In order to speed up process of resolving your issue,
+	we would like you to fill in the following :
+-->
+### Describe your issue
+#### What's the expected behaviour?
+
+#### What's the current behaviour?
+
+#### How to reproduce your issue?
+
+### What device are you using?
+<!--
+	Leave name of your device in vendor-codename format.
+	If unsure, check name in the device package or leave full name of device
+	PinePhone: which revision exactly? See https://wiki.pine64.org/index.php/PinePhone#Hardware_revisions
+-->
+
+### On what postmarketOS version did you encounter the issue?
+<!--
+	Replace space inside `[ ]` with `x` to fill the checkbox
+-->
+* [ ] edge (`master` branch)
+* [ ] `v22.12`
+
+* [ ] I confirm that the issue still is present after running `sudo apk upgrade -a`
+
+### On what environment did you encounter the issue?
+#### Environments
+* [ ] Phosh
+* [ ] Plasma Mobile
+* [ ] Sxmo (Wayland/Sway) **Please post the output of `sxmo_version.sh`**
+* [ ] Other: **Please fill out**
+### How did you get postmarketOS image?
+* [ ] from https://images.postmarketos.org
+* [ ] I built it using pmbootstrap
+* [ ] It was preinstalled on my device
+### What's the build date of the image? (in yyyy-mm-dd format)
+<!--
+	Notes:
+		can be left empty if unsure
+		If you downloaded image from images.postmarketos.org, date will be in yyyymmdd format
+-->
+
+### Additional information
+<!-- logs, etc. -- make use <details> for long listings -->

.mrhlpr.json

@@ -1,12 +1,7 @@
 {
     "subject_format": {
         "pass": [
-            "^[a-z]+/[a-z-0-9*{}]+: new aport(s|)( \\(MR \\d+\\)|)$",
-            "^[a-z]+/[a-z-0-9*{}]+: pkgrel bump( \\(MR \\d+\\)|)$",
-            "^[a-z-0-9*{}]+: new device \\([^\\)]+\\)( \\(MR \\d+\\)|)",
-            "^[a-z]+/[a-z-0-9*{}]+: upgrade to [0-9\\.a-z\\-_]+( \\(MR \\d+\\)|)$",
-            "^[a-z]+/[a-z-0-9*{}]+: remove( \\(MR \\d+\\)|)$",
-            "^[a-z]+/[a-z-0-9*{}]+: remove, upstreamed( \\(MR \\d+\\)|)$",
+            "^(([a-z]+\\/[a-z\\-0-9*{}]+),?)+: [A-Za-z\\/\\-0-9*{}\\(\\)\\.,_&:=' ]+( \\(MR \\d+\\)|)$",
             "^CI: [a-z-0-9*{}\\(\\)\\.,_ ][A-Za-z\\/\\-0-9*{}\\(\\)\\.,_ ]+( \\(MR \\d+\\)|)$",
             "^mrhlpr.json: [a-z-0-9*{}\\(\\)\\.,_ ][A-Za-z\\/\\-0-9*{}\\(\\)\\.,_ ]+( \\(MR \\d+\\)|)$",
             "^pmaports.cfg: [a-z-0-9*{}\\(\\)\\.,_ ][A-Za-z\\/\\-0-9*{}\\(\\)\\.,_ ]+( \\(MR \\d+\\)|)$"

CODEOWNERS

@@ -79,5 +79,8 @@ main/ttyescape					@calebccff
 temp/u-boot-librem5/				@craftyguy @bshah
 temp/alsa-ucm-conf-google-kukui/		@jenneron @binarycraft
 temp/alsa-ucm-conf-google-gru/			@jenneron
+device/*/*-videostrong-kii-pro/                 @vitali64yt
+device/*/*-amlogic-s905*                        @vitali64yt
+device/*/linux-postmarketos-amlogic/            @vitali64yt @exkc
 
 # vim: ts=8 sw=4 et

COMMITSTYLE.md

@@ -0,0 +1,89 @@
+# Policy for commits in pmaports
+
+This document defines policy for organising and titling commits for
+inclusion in pmaports.
+
+## Definitions
+
+### Device-specific package
+
+A device-specific package is used to apply configuration and
+functionality specifically for device support in postmarketOS.
+This is in contrast to other packages
+(e.g. main/postmarketos-ui-phosh) in postmarketOS that are used
+for configuring the distribution without consideration of the
+target device.
+
+## General policy
+
+We follow Alpine's aports commit style with some minor exceptions
+and additions. Alpine's commit style can be found here:
+https://gitlab.alpinelinux.org/alpine/aports/-/blob/master/COMMITSTYLE.md
+
+## Exceptions
+
+### Changes to packages inside of the device directory
+
+While Alpine has the policy of always prefixing package names with
+the name of the repository they are in, in the case of pmaports
+this can lead to excessively long commit titles due to the nested
+subfolders of the device directory. As such, commits changing
+packages inside of the device directory should omit the directory
+prefix, for example:
+
+	device-pine64-pinephone: description of change
+
+Or:
+
+	soc-qcom-msm8996: description of change
+
+If the commit only makes device-specific changes, the
+commit title can opt to use the following format:
+
+	manufacturer-codename: description of change
+
+### Moving devices between categories
+
+As we do not include directory prefixes in device-related commits,
+Alpine's commit style for moving packages does not apply. Instead,
+we do the following:
+
+	manufacturer-codename: move from category to category
+
+For example:
+
+	samsung-m0: move from testing to community
+
+## Additions
+
+### Forking packages from Alpine
+
+Run `pmbootstrap aportgen --fork-alpine package` and modify it.
+
+#### Template
+
+ - temp/package-name: fork from Alpine
+
+Example: temp/pulseaudio: fork from Alpine
+
+#### Rules
+
+One commit per forked package.
+
+### Adding new devices
+
+Adding a new device package and optionally also a device-specific
+Linux and firmware package.
+
+#### Template
+
+ - manufacturer-codename: new device
+
+Example: htc-m8qlul: new device
+
+#### Rules
+
+If the device has the option of making use of a device-specific
+kernel and/or firmware package, those packages should be included
+in the same commit that adds the device package. One device per
+commit.

README.md

@@ -6,3 +6,4 @@ Helpful resources:
 * [Alpine Linux aports](https://gitlab.alpinelinux.org/alpine/aports/)
 * [Alpine Linux package search](https://pkgs.alpinelinux.org/packages)
 * [postmarketOS package search](https://pkgs.postmarketos.org/packages)
+* [postmarketOS commit style](./COMMITSTYLE.md)

channels.cfg

@@ -15,7 +15,7 @@ branch_aports=3.17-stable
 mirrordir_alpine=v3.17
 
 [v22.06]
-description=Old release (supported until 2023-01-18)
+description=Old release (unsupported)
 branch_pmaports=v22.06
 branch_aports=3.16-stable
 mirrordir_alpine=v3.16

cross/binutils-aarch64/APKBUILD

@@ -7,23 +7,19 @@ CTARGET_ARCH=aarch64
 CTARGET="$(arch_to_hostspec $CTARGET_ARCH)"
 
 pkgname=binutils-aarch64
-pkgver=2.39
-pkgrel=3
+pkgver=2.40
+pkgrel=5
 pkgdesc="Tools necessary to build programs for aarch64 targets"
 url="https://www.gnu.org/software/binutils/"
 makedepends_build="bison flex texinfo"
-makedepends_host="zlib-dev"
+makedepends_host="zlib-dev zstd-dev"
 makedepends="$makedepends_build $makedepends_host"
 arch="x86_64"
-license="GPL-2.0 GPL-3.0-or-later LGPL-2.0 BSD"
+license="GPL-2.0-or-later AND LGPL-2.1-or-later AND BSD-3-Clause"
 subpackages="binutils-dev binutils-doc"
 source="https://ftp.gnu.org/gnu/binutils/binutils-$pkgver.tar.xz
 	binutils-ld-fix-static-linking.patch
-	gold-mips.patch
-	ld-bfd-mips.patch
 	0001-Revert-PR25882-.gnu.attributes-are-not-checked-for-s.patch
-	binutils-mips-disable-assert.patch
-	CVE-2022-38533.patch
 	"
 builddir="$srcdir/binutils-$pkgver"
 
@@ -59,19 +55,6 @@ build() {
 	local _gold_configure="--disable-gold"
 	local _plugin_configure="--enable-plugins"
 
-	case "$CARCH" in
-	riscv64)
-		# binutils creates empty textrels here
-		# https://sourceware.org/bugzilla/show_bug.cgi?id=25694
-		local no_textrels=""
-		;;
-	*)
-		# set -z text by default
-		# this is the default for linkers such as ld.lld too
-		local no_textrels="--enable-textrel-check=error"
-		;;
-	esac
-
 	if [ "$CHOST" != "$CTARGET" ]; then
 		_sysroot="$CBUILDROOT"
 		_cross_configure="--disable-install-libiberty"
@@ -90,11 +73,6 @@ build() {
 		_gold_configure="--disable-gold"
 	fi
 
-	case "$CTARGET_ARCH" in
-	mips*)  _hash_style_configure="--enable-default-hash-style=sysv" ;;
-	*)      _hash_style_configure="--enable-default-hash-style=gnu"	;;
-	esac
-
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -115,8 +93,7 @@ build() {
 		--enable-default-execstack=no \
 		$_cross_configure \
 		$_arch_configure \
-		$_hash_style_configure \
-		$no_textrels \
+		--enable-default-hash-style=gnu \
 		--with-pic \
 		--disable-werror \
 		--disable-nls \
@@ -140,30 +117,17 @@ package() {
 	fi
 }
 
-libs() {
-	pkgdesc="Runtime libraries from binutils - libbfd and libopcodes"
-
-	mkdir -p "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/lib/lib*.so "$subpkgdir"/usr/lib/
-}
-
 gold() {
 	pkgdesc="GNU binutils - gold linker"
 
 	if [ -e "$pkgdir"/usr/bin/ld.gold ]; then
-		mkdir -p "$subpkgdir"/usr/bin
-		mv "$pkgdir"/usr/bin/ld.gold "$subpkgdir"/usr/bin
+		amove usr/bin/ld.gold
 	fi
-	mkdir -p "$subpkgdir"/usr/$CTARGET/bin
-	mv "$pkgdir"/usr/$CTARGET/bin/ld.gold "$subpkgdir"/usr/$CTARGET/bin/ld.gold
+	amove usr/$CTARGET/bin/ld.gold
 }
 
 sha512sums="
-68e038f339a8c21faa19a57bbc447a51c817f47c2e06d740847c6e9cc3396c025d35d5369fa8c3f8b70414757c89f0e577939ddc0d70f283182504920f53b0a3  binutils-2.39.tar.xz
+a37e042523bc46494d99d5637c3f3d8f9956d9477b748b3b1f6d7dfbb8d968ed52c932e88a4e946c6f77b8f48f1e1b360ca54c3d298f17193f3b4963472f6925  binutils-2.40.tar.xz
 ecee33b0e435aa704af1c334e560f201638ff79e199aa11ed78a72f7c9b46f85fbb227af5748e735fd681d1965fcc42ac81b0c8824e540430ce0c706c81e8b49  binutils-ld-fix-static-linking.patch
-f55cf2e0bf82f97583a1abe10710e4013ecf7d64f1da2ef8659a44a06d0dd8beaf58dab98a183488ea137f03e32d62efc878d95f018f836f8cec870bc448556f  gold-mips.patch
-314d2ef9071c89940aa6c8118e8a1e2f191a5d0a4bf596da1ad9cc84f884d8bc7dea8bd7b9fc3f8f1bddd3fd41c6eb017e1e804044b3bf084df1ed9e6e095e2d  ld-bfd-mips.patch
 70ec22bd72ef6dddecfd970613387dd4a8cdc8730dd3cbf03d5a0c3a7c4d839383167bb06dad21bf7c235329fd44b5dc4aefe762f68544f17155cf002bf1be4a  0001-Revert-PR25882-.gnu.attributes-are-not-checked-for-s.patch
-609cd90d8b334eb309f586b17b9d335a08d3dbb6def7c3eb5c010028fcb681674031e5b9d853aa7a39a50304356a86afc184b85562b3f228f8197f4d29395c8f  binutils-mips-disable-assert.patch
-631726e557524633ace39c597acbc5ac39bfd25f7b292eee1f0b2a80a503f4ff799f027757d12d5a24b2fa3c07c7e14602d8a86d96e19876d6d0d5d1a02817e7  CVE-2022-38533.patch
 "

cross/binutils-aarch64/CVE-2022-38533.patch

@@ -1,22 +0,0 @@
-X-Git-Url: https://sourceware.org/git/?p=binutils-gdb.git;a=blobdiff_plain;f=bfd%2Fcoffcode.h;h=52027981c3f052d98e043cd0c877f0bb5da97c7f;hp=67aaf158ca1829fe63f0065f31a0b1009b227b36;hb=ef186fe54aa6d281a3ff8a9528417e5cc614c797;hpb=80075150727d653c39e9d037e15c6b87dcef08cd
-
-diff --git a/bfd/coffcode.h b/bfd/coffcode.h
-index 67aaf158ca1..52027981c3f 100644
---- a/bfd/coffcode.h
-+++ b/bfd/coffcode.h
-@@ -4302,10 +4302,13 @@ coff_set_section_contents (bfd * abfd,
- 
- 	rec = (bfd_byte *) location;
- 	recend = rec + count;
--	while (rec < recend)
-+	while (recend - rec >= 4)
- 	  {
-+	    size_t len = bfd_get_32 (abfd, rec);
-+	    if (len == 0 || len > (size_t) (recend - rec) / 4)
-+	      break;
-+	    rec += len * 4;
- 	    ++section->lma;
--	    rec += bfd_get_32 (abfd, rec) * 4;
- 	  }
- 
- 	BFD_ASSERT (rec == recend);

cross/binutils-aarch64/binutils-mips-disable-assert.patch

@@ -1,14 +0,0 @@
-diff -urN binutils-2.35.2.orig/bfd/elfxx-mips.c binutils-2.35.2/bfd/elfxx-mips.c
---- binutils-2.35.2.orig/bfd/elfxx-mips.c	2021-01-30 01:38:03.000000000 -0700
-+++ binutils-2.35.2/bfd/elfxx-mips.c	2021-05-13 17:35:34.706913601 -0600
-@@ -6744,8 +6744,10 @@
-      in the relocation.  */
-   if (h != NULL && ! SYMBOL_REFERENCES_LOCAL (info, &h->root))
-     {
-+#if 0
-       BFD_ASSERT (htab->root.target_os == is_vxworks
- 		  || h->global_got_area != GGA_NONE);
-+#endif
-       indx = h->root.dynindx;
-       if (SGI_COMPAT (output_bfd))
- 	defined_p = h->root.def_regular;

cross/binutils-aarch64/gold-mips.patch

@@ -1,39 +0,0 @@
-# DP: Fix gold on mips64 targets.
-
-gold/
-
-2016-08-09  Aurelien Jarno  <aurelien@aurel32.net>
-
-	* configure.tgt: Add mips64el*-*-*|mips64le*-*-* and mips64*-*-*.
-
- 
---- a/gold/configure.tgt
-+++ b/gold/configure.tgt
-@@ -153,6 +153,13 @@ aarch64*-*)
-  targ_big_endian=false
-  targ_extra_big_endian=true
-  ;;
-+mips*64*el*-*-*|mips*64*le*-*-*)
-+ targ_obj=mips
-+ targ_machine=EM_MIPS_RS3_LE
-+ targ_size=64
-+ targ_big_endian=false
-+ targ_extra_big_endian=true
-+ ;;
- mips*el*-*-*|mips*le*-*-*)
-  targ_obj=mips
-  targ_machine=EM_MIPS_RS3_LE
-@@ -160,6 +167,13 @@ mips*el*-*-*|mips*le*-*-*)
-  targ_big_endian=false
-  targ_extra_big_endian=true
-  ;;
-+mips*64*-*-*)
-+ targ_obj=mips
-+ targ_machine=EM_MIPS
-+ targ_size=64
-+ targ_big_endian=true
-+ targ_extra_big_endian=false
-+ ;;
- mips*-*-*)
-  targ_obj=mips
-  targ_machine=EM_MIPS

cross/binutils-aarch64/ld-bfd-mips.patch

@@ -1,19 +0,0 @@
---- ./ld/configure.tgt.orig
-+++ ./ld/configure.tgt
-@@ -541,12 +541,12 @@
- 			;;
- mips*-*-windiss)	targ_emul=elf32mipswindiss
- 			;;
--mips64*el-*-linux-*)	targ_emul=elf32ltsmipn32
--			targ_extra_emuls="elf32btsmipn32 elf32ltsmip elf32btsmip elf64ltsmip elf64btsmip"
-+mips64*el-*-linux-*)	targ_emul=elf64ltsmip
-+			targ_extra_emuls="elf32ltsmipn32 elf32btsmipn32 elf32ltsmip elf32btsmip elf64btsmip"
- 			targ_extra_libpath=$targ_extra_emuls
- 			;;
--mips64*-*-linux-*)	targ_emul=elf32btsmipn32
--			targ_extra_emuls="elf32ltsmipn32 elf32btsmip elf32ltsmip elf64btsmip elf64ltsmip"
-+mips64*-*-linux-*)	targ_emul=elf64btsmip
-+			targ_extra_emuls="elf32btsmipn32 elf32ltsmipn32 elf32btsmip elf32ltsmip elf64ltsmip"
- 			targ_extra_libpath=$targ_extra_emuls
- 			;;
- mips*el-*-linux-*)	targ_emul=elf32ltsmip

cross/binutils-armhf/APKBUILD

@@ -7,23 +7,19 @@ CTARGET_ARCH=armhf
 CTARGET="$(arch_to_hostspec $CTARGET_ARCH)"
 
 pkgname=binutils-armhf
-pkgver=2.39
-pkgrel=3
+pkgver=2.40
+pkgrel=5
 pkgdesc="Tools necessary to build programs for armhf targets"
 url="https://www.gnu.org/software/binutils/"
 makedepends_build="bison flex texinfo"
-makedepends_host="zlib-dev"
+makedepends_host="zlib-dev zstd-dev"
 makedepends="$makedepends_build $makedepends_host"
 arch="x86_64"
-license="GPL-2.0 GPL-3.0-or-later LGPL-2.0 BSD"
+license="GPL-2.0-or-later AND LGPL-2.1-or-later AND BSD-3-Clause"
 subpackages="binutils-dev binutils-doc"
 source="https://ftp.gnu.org/gnu/binutils/binutils-$pkgver.tar.xz
 	binutils-ld-fix-static-linking.patch
-	gold-mips.patch
-	ld-bfd-mips.patch
 	0001-Revert-PR25882-.gnu.attributes-are-not-checked-for-s.patch
-	binutils-mips-disable-assert.patch
-	CVE-2022-38533.patch
 	"
 builddir="$srcdir/binutils-$pkgver"
 
@@ -59,19 +55,6 @@ build() {
 	local _gold_configure="--disable-gold"
 	local _plugin_configure="--enable-plugins"
 
-	case "$CARCH" in
-	riscv64)
-		# binutils creates empty textrels here
-		# https://sourceware.org/bugzilla/show_bug.cgi?id=25694
-		local no_textrels=""
-		;;
-	*)
-		# set -z text by default
-		# this is the default for linkers such as ld.lld too
-		local no_textrels="--enable-textrel-check=error"
-		;;
-	esac
-
 	if [ "$CHOST" != "$CTARGET" ]; then
 		_sysroot="$CBUILDROOT"
 		_cross_configure="--disable-install-libiberty"
@@ -90,11 +73,6 @@ build() {
 		_gold_configure="--disable-gold"
 	fi
 
-	case "$CTARGET_ARCH" in
-	mips*)  _hash_style_configure="--enable-default-hash-style=sysv" ;;
-	*)      _hash_style_configure="--enable-default-hash-style=gnu"	;;
-	esac
-
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -115,8 +93,7 @@ build() {
 		--enable-default-execstack=no \
 		$_cross_configure \
 		$_arch_configure \
-		$_hash_style_configure \
-		$no_textrels \
+		--enable-default-hash-style=gnu \
 		--with-pic \
 		--disable-werror \
 		--disable-nls \
@@ -140,30 +117,17 @@ package() {
 	fi
 }
 
-libs() {
-	pkgdesc="Runtime libraries from binutils - libbfd and libopcodes"
-
-	mkdir -p "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/lib/lib*.so "$subpkgdir"/usr/lib/
-}
-
 gold() {
 	pkgdesc="GNU binutils - gold linker"
 
 	if [ -e "$pkgdir"/usr/bin/ld.gold ]; then
-		mkdir -p "$subpkgdir"/usr/bin
-		mv "$pkgdir"/usr/bin/ld.gold "$subpkgdir"/usr/bin
+		amove usr/bin/ld.gold
 	fi
-	mkdir -p "$subpkgdir"/usr/$CTARGET/bin
-	mv "$pkgdir"/usr/$CTARGET/bin/ld.gold "$subpkgdir"/usr/$CTARGET/bin/ld.gold
+	amove usr/$CTARGET/bin/ld.gold
 }
 
 sha512sums="
-68e038f339a8c21faa19a57bbc447a51c817f47c2e06d740847c6e9cc3396c025d35d5369fa8c3f8b70414757c89f0e577939ddc0d70f283182504920f53b0a3  binutils-2.39.tar.xz
+a37e042523bc46494d99d5637c3f3d8f9956d9477b748b3b1f6d7dfbb8d968ed52c932e88a4e946c6f77b8f48f1e1b360ca54c3d298f17193f3b4963472f6925  binutils-2.40.tar.xz
 ecee33b0e435aa704af1c334e560f201638ff79e199aa11ed78a72f7c9b46f85fbb227af5748e735fd681d1965fcc42ac81b0c8824e540430ce0c706c81e8b49  binutils-ld-fix-static-linking.patch
-f55cf2e0bf82f97583a1abe10710e4013ecf7d64f1da2ef8659a44a06d0dd8beaf58dab98a183488ea137f03e32d62efc878d95f018f836f8cec870bc448556f  gold-mips.patch
-314d2ef9071c89940aa6c8118e8a1e2f191a5d0a4bf596da1ad9cc84f884d8bc7dea8bd7b9fc3f8f1bddd3fd41c6eb017e1e804044b3bf084df1ed9e6e095e2d  ld-bfd-mips.patch
 70ec22bd72ef6dddecfd970613387dd4a8cdc8730dd3cbf03d5a0c3a7c4d839383167bb06dad21bf7c235329fd44b5dc4aefe762f68544f17155cf002bf1be4a  0001-Revert-PR25882-.gnu.attributes-are-not-checked-for-s.patch
-609cd90d8b334eb309f586b17b9d335a08d3dbb6def7c3eb5c010028fcb681674031e5b9d853aa7a39a50304356a86afc184b85562b3f228f8197f4d29395c8f  binutils-mips-disable-assert.patch
-631726e557524633ace39c597acbc5ac39bfd25f7b292eee1f0b2a80a503f4ff799f027757d12d5a24b2fa3c07c7e14602d8a86d96e19876d6d0d5d1a02817e7  CVE-2022-38533.patch
 "

cross/binutils-armhf/CVE-2022-38533.patch

@@ -1,22 +0,0 @@
-X-Git-Url: https://sourceware.org/git/?p=binutils-gdb.git;a=blobdiff_plain;f=bfd%2Fcoffcode.h;h=52027981c3f052d98e043cd0c877f0bb5da97c7f;hp=67aaf158ca1829fe63f0065f31a0b1009b227b36;hb=ef186fe54aa6d281a3ff8a9528417e5cc614c797;hpb=80075150727d653c39e9d037e15c6b87dcef08cd
-
-diff --git a/bfd/coffcode.h b/bfd/coffcode.h
-index 67aaf158ca1..52027981c3f 100644
---- a/bfd/coffcode.h
-+++ b/bfd/coffcode.h
-@@ -4302,10 +4302,13 @@ coff_set_section_contents (bfd * abfd,
- 
- 	rec = (bfd_byte *) location;
- 	recend = rec + count;
--	while (rec < recend)
-+	while (recend - rec >= 4)
- 	  {
-+	    size_t len = bfd_get_32 (abfd, rec);
-+	    if (len == 0 || len > (size_t) (recend - rec) / 4)
-+	      break;
-+	    rec += len * 4;
- 	    ++section->lma;
--	    rec += bfd_get_32 (abfd, rec) * 4;
- 	  }
- 
- 	BFD_ASSERT (rec == recend);

cross/binutils-armhf/binutils-mips-disable-assert.patch

@@ -1,14 +0,0 @@
-diff -urN binutils-2.35.2.orig/bfd/elfxx-mips.c binutils-2.35.2/bfd/elfxx-mips.c
---- binutils-2.35.2.orig/bfd/elfxx-mips.c	2021-01-30 01:38:03.000000000 -0700
-+++ binutils-2.35.2/bfd/elfxx-mips.c	2021-05-13 17:35:34.706913601 -0600
-@@ -6744,8 +6744,10 @@
-      in the relocation.  */
-   if (h != NULL && ! SYMBOL_REFERENCES_LOCAL (info, &h->root))
-     {
-+#if 0
-       BFD_ASSERT (htab->root.target_os == is_vxworks
- 		  || h->global_got_area != GGA_NONE);
-+#endif
-       indx = h->root.dynindx;
-       if (SGI_COMPAT (output_bfd))
- 	defined_p = h->root.def_regular;

cross/binutils-armhf/gold-mips.patch

@@ -1,39 +0,0 @@
-# DP: Fix gold on mips64 targets.
-
-gold/
-
-2016-08-09  Aurelien Jarno  <aurelien@aurel32.net>
-
-	* configure.tgt: Add mips64el*-*-*|mips64le*-*-* and mips64*-*-*.
-
- 
---- a/gold/configure.tgt
-+++ b/gold/configure.tgt
-@@ -153,6 +153,13 @@ aarch64*-*)
-  targ_big_endian=false
-  targ_extra_big_endian=true
-  ;;
-+mips*64*el*-*-*|mips*64*le*-*-*)
-+ targ_obj=mips
-+ targ_machine=EM_MIPS_RS3_LE
-+ targ_size=64
-+ targ_big_endian=false
-+ targ_extra_big_endian=true
-+ ;;
- mips*el*-*-*|mips*le*-*-*)
-  targ_obj=mips
-  targ_machine=EM_MIPS_RS3_LE
-@@ -160,6 +167,13 @@ mips*el*-*-*|mips*le*-*-*)
-  targ_big_endian=false
-  targ_extra_big_endian=true
-  ;;
-+mips*64*-*-*)
-+ targ_obj=mips
-+ targ_machine=EM_MIPS
-+ targ_size=64
-+ targ_big_endian=true
-+ targ_extra_big_endian=false
-+ ;;
- mips*-*-*)
-  targ_obj=mips
-  targ_machine=EM_MIPS

cross/binutils-armhf/ld-bfd-mips.patch

@@ -1,19 +0,0 @@
---- ./ld/configure.tgt.orig
-+++ ./ld/configure.tgt
-@@ -541,12 +541,12 @@
- 			;;
- mips*-*-windiss)	targ_emul=elf32mipswindiss
- 			;;
--mips64*el-*-linux-*)	targ_emul=elf32ltsmipn32
--			targ_extra_emuls="elf32btsmipn32 elf32ltsmip elf32btsmip elf64ltsmip elf64btsmip"
-+mips64*el-*-linux-*)	targ_emul=elf64ltsmip
-+			targ_extra_emuls="elf32ltsmipn32 elf32btsmipn32 elf32ltsmip elf32btsmip elf64btsmip"
- 			targ_extra_libpath=$targ_extra_emuls
- 			;;
--mips64*-*-linux-*)	targ_emul=elf32btsmipn32
--			targ_extra_emuls="elf32ltsmipn32 elf32btsmip elf32ltsmip elf64btsmip elf64ltsmip"
-+mips64*-*-linux-*)	targ_emul=elf64btsmip
-+			targ_extra_emuls="elf32btsmipn32 elf32ltsmipn32 elf32btsmip elf32ltsmip elf64ltsmip"
- 			targ_extra_libpath=$targ_extra_emuls
- 			;;
- mips*el-*-linux-*)	targ_emul=elf32ltsmip

cross/binutils-armv7/APKBUILD

@@ -7,23 +7,19 @@ CTARGET_ARCH=armv7
 CTARGET="$(arch_to_hostspec $CTARGET_ARCH)"
 
 pkgname=binutils-armv7
-pkgver=2.39
-pkgrel=3
+pkgver=2.40
+pkgrel=5
 pkgdesc="Tools necessary to build programs for armv7 targets"
 url="https://www.gnu.org/software/binutils/"
 makedepends_build="bison flex texinfo"
-makedepends_host="zlib-dev"
+makedepends_host="zlib-dev zstd-dev"
 makedepends="$makedepends_build $makedepends_host"
 arch="x86_64"
-license="GPL-2.0 GPL-3.0-or-later LGPL-2.0 BSD"
+license="GPL-2.0-or-later AND LGPL-2.1-or-later AND BSD-3-Clause"
 subpackages="binutils-dev binutils-doc"
 source="https://ftp.gnu.org/gnu/binutils/binutils-$pkgver.tar.xz
 	binutils-ld-fix-static-linking.patch
-	gold-mips.patch
-	ld-bfd-mips.patch
 	0001-Revert-PR25882-.gnu.attributes-are-not-checked-for-s.patch
-	binutils-mips-disable-assert.patch
-	CVE-2022-38533.patch
 	"
 builddir="$srcdir/binutils-$pkgver"
 
@@ -59,19 +55,6 @@ build() {
 	local _gold_configure="--disable-gold"
 	local _plugin_configure="--enable-plugins"
 
-	case "$CARCH" in
-	riscv64)
-		# binutils creates empty textrels here
-		# https://sourceware.org/bugzilla/show_bug.cgi?id=25694
-		local no_textrels=""
-		;;
-	*)
-		# set -z text by default
-		# this is the default for linkers such as ld.lld too
-		local no_textrels="--enable-textrel-check=error"
-		;;
-	esac
-
 	if [ "$CHOST" != "$CTARGET" ]; then
 		_sysroot="$CBUILDROOT"
 		_cross_configure="--disable-install-libiberty"
@@ -90,11 +73,6 @@ build() {
 		_gold_configure="--disable-gold"
 	fi
 
-	case "$CTARGET_ARCH" in
-	mips*)  _hash_style_configure="--enable-default-hash-style=sysv" ;;
-	*)      _hash_style_configure="--enable-default-hash-style=gnu"	;;
-	esac
-
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -115,8 +93,7 @@ build() {
 		--enable-default-execstack=no \
 		$_cross_configure \
 		$_arch_configure \
-		$_hash_style_configure \
-		$no_textrels \
+		--enable-default-hash-style=gnu \
 		--with-pic \
 		--disable-werror \
 		--disable-nls \
@@ -140,30 +117,17 @@ package() {
 	fi
 }
 
-libs() {
-	pkgdesc="Runtime libraries from binutils - libbfd and libopcodes"
-
-	mkdir -p "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/lib/lib*.so "$subpkgdir"/usr/lib/
-}
-
 gold() {
 	pkgdesc="GNU binutils - gold linker"
 
 	if [ -e "$pkgdir"/usr/bin/ld.gold ]; then
-		mkdir -p "$subpkgdir"/usr/bin
-		mv "$pkgdir"/usr/bin/ld.gold "$subpkgdir"/usr/bin
+		amove usr/bin/ld.gold
 	fi
-	mkdir -p "$subpkgdir"/usr/$CTARGET/bin
-	mv "$pkgdir"/usr/$CTARGET/bin/ld.gold "$subpkgdir"/usr/$CTARGET/bin/ld.gold
+	amove usr/$CTARGET/bin/ld.gold
 }
 
 sha512sums="
-68e038f339a8c21faa19a57bbc447a51c817f47c2e06d740847c6e9cc3396c025d35d5369fa8c3f8b70414757c89f0e577939ddc0d70f283182504920f53b0a3  binutils-2.39.tar.xz
+a37e042523bc46494d99d5637c3f3d8f9956d9477b748b3b1f6d7dfbb8d968ed52c932e88a4e946c6f77b8f48f1e1b360ca54c3d298f17193f3b4963472f6925  binutils-2.40.tar.xz
 ecee33b0e435aa704af1c334e560f201638ff79e199aa11ed78a72f7c9b46f85fbb227af5748e735fd681d1965fcc42ac81b0c8824e540430ce0c706c81e8b49  binutils-ld-fix-static-linking.patch
-f55cf2e0bf82f97583a1abe10710e4013ecf7d64f1da2ef8659a44a06d0dd8beaf58dab98a183488ea137f03e32d62efc878d95f018f836f8cec870bc448556f  gold-mips.patch
-314d2ef9071c89940aa6c8118e8a1e2f191a5d0a4bf596da1ad9cc84f884d8bc7dea8bd7b9fc3f8f1bddd3fd41c6eb017e1e804044b3bf084df1ed9e6e095e2d  ld-bfd-mips.patch
 70ec22bd72ef6dddecfd970613387dd4a8cdc8730dd3cbf03d5a0c3a7c4d839383167bb06dad21bf7c235329fd44b5dc4aefe762f68544f17155cf002bf1be4a  0001-Revert-PR25882-.gnu.attributes-are-not-checked-for-s.patch
-609cd90d8b334eb309f586b17b9d335a08d3dbb6def7c3eb5c010028fcb681674031e5b9d853aa7a39a50304356a86afc184b85562b3f228f8197f4d29395c8f  binutils-mips-disable-assert.patch
-631726e557524633ace39c597acbc5ac39bfd25f7b292eee1f0b2a80a503f4ff799f027757d12d5a24b2fa3c07c7e14602d8a86d96e19876d6d0d5d1a02817e7  CVE-2022-38533.patch
 "

cross/binutils-armv7/CVE-2022-38533.patch

@@ -1,22 +0,0 @@
-X-Git-Url: https://sourceware.org/git/?p=binutils-gdb.git;a=blobdiff_plain;f=bfd%2Fcoffcode.h;h=52027981c3f052d98e043cd0c877f0bb5da97c7f;hp=67aaf158ca1829fe63f0065f31a0b1009b227b36;hb=ef186fe54aa6d281a3ff8a9528417e5cc614c797;hpb=80075150727d653c39e9d037e15c6b87dcef08cd
-
-diff --git a/bfd/coffcode.h b/bfd/coffcode.h
-index 67aaf158ca1..52027981c3f 100644
---- a/bfd/coffcode.h
-+++ b/bfd/coffcode.h
-@@ -4302,10 +4302,13 @@ coff_set_section_contents (bfd * abfd,
- 
- 	rec = (bfd_byte *) location;
- 	recend = rec + count;
--	while (rec < recend)
-+	while (recend - rec >= 4)
- 	  {
-+	    size_t len = bfd_get_32 (abfd, rec);
-+	    if (len == 0 || len > (size_t) (recend - rec) / 4)
-+	      break;
-+	    rec += len * 4;
- 	    ++section->lma;
--	    rec += bfd_get_32 (abfd, rec) * 4;
- 	  }
- 
- 	BFD_ASSERT (rec == recend);

cross/binutils-armv7/binutils-mips-disable-assert.patch

@@ -1,14 +0,0 @@
-diff -urN binutils-2.35.2.orig/bfd/elfxx-mips.c binutils-2.35.2/bfd/elfxx-mips.c
---- binutils-2.35.2.orig/bfd/elfxx-mips.c	2021-01-30 01:38:03.000000000 -0700
-+++ binutils-2.35.2/bfd/elfxx-mips.c	2021-05-13 17:35:34.706913601 -0600
-@@ -6744,8 +6744,10 @@
-      in the relocation.  */
-   if (h != NULL && ! SYMBOL_REFERENCES_LOCAL (info, &h->root))
-     {
-+#if 0
-       BFD_ASSERT (htab->root.target_os == is_vxworks
- 		  || h->global_got_area != GGA_NONE);
-+#endif
-       indx = h->root.dynindx;
-       if (SGI_COMPAT (output_bfd))
- 	defined_p = h->root.def_regular;

cross/binutils-armv7/gold-mips.patch

@@ -1,39 +0,0 @@
-# DP: Fix gold on mips64 targets.
-
-gold/
-
-2016-08-09  Aurelien Jarno  <aurelien@aurel32.net>
-
-	* configure.tgt: Add mips64el*-*-*|mips64le*-*-* and mips64*-*-*.
-
- 
---- a/gold/configure.tgt
-+++ b/gold/configure.tgt
-@@ -153,6 +153,13 @@ aarch64*-*)
-  targ_big_endian=false
-  targ_extra_big_endian=true
-  ;;
-+mips*64*el*-*-*|mips*64*le*-*-*)
-+ targ_obj=mips
-+ targ_machine=EM_MIPS_RS3_LE
-+ targ_size=64
-+ targ_big_endian=false
-+ targ_extra_big_endian=true
-+ ;;
- mips*el*-*-*|mips*le*-*-*)
-  targ_obj=mips
-  targ_machine=EM_MIPS_RS3_LE
-@@ -160,6 +167,13 @@ mips*el*-*-*|mips*le*-*-*)
-  targ_big_endian=false
-  targ_extra_big_endian=true
-  ;;
-+mips*64*-*-*)
-+ targ_obj=mips
-+ targ_machine=EM_MIPS
-+ targ_size=64
-+ targ_big_endian=true
-+ targ_extra_big_endian=false
-+ ;;
- mips*-*-*)
-  targ_obj=mips
-  targ_machine=EM_MIPS

cross/binutils-armv7/ld-bfd-mips.patch

@@ -1,19 +0,0 @@
---- ./ld/configure.tgt.orig
-+++ ./ld/configure.tgt
-@@ -541,12 +541,12 @@
- 			;;
- mips*-*-windiss)	targ_emul=elf32mipswindiss
- 			;;
--mips64*el-*-linux-*)	targ_emul=elf32ltsmipn32
--			targ_extra_emuls="elf32btsmipn32 elf32ltsmip elf32btsmip elf64ltsmip elf64btsmip"
-+mips64*el-*-linux-*)	targ_emul=elf64ltsmip
-+			targ_extra_emuls="elf32ltsmipn32 elf32btsmipn32 elf32ltsmip elf32btsmip elf64btsmip"
- 			targ_extra_libpath=$targ_extra_emuls
- 			;;
--mips64*-*-linux-*)	targ_emul=elf32btsmipn32
--			targ_extra_emuls="elf32ltsmipn32 elf32btsmip elf32ltsmip elf64btsmip elf64ltsmip"
-+mips64*-*-linux-*)	targ_emul=elf64btsmip
-+			targ_extra_emuls="elf32btsmipn32 elf32ltsmipn32 elf32btsmip elf32ltsmip elf64ltsmip"
- 			targ_extra_libpath=$targ_extra_emuls
- 			;;
- mips*el-*-linux-*)	targ_emul=elf32ltsmip

cross/binutils-riscv64/APKBUILD

@@ -7,23 +7,19 @@ CTARGET_ARCH=riscv64
 CTARGET="$(arch_to_hostspec $CTARGET_ARCH)"
 
 pkgname=binutils-riscv64
-pkgver=2.39
-pkgrel=3
+pkgver=2.40
+pkgrel=5
 pkgdesc="Tools necessary to build programs for riscv64 targets"
 url="https://www.gnu.org/software/binutils/"
 makedepends_build="bison flex texinfo"
-makedepends_host="zlib-dev"
+makedepends_host="zlib-dev zstd-dev"
 makedepends="$makedepends_build $makedepends_host"
 arch="x86_64"
-license="GPL-2.0 GPL-3.0-or-later LGPL-2.0 BSD"
+license="GPL-2.0-or-later AND LGPL-2.1-or-later AND BSD-3-Clause"
 subpackages="binutils-dev binutils-doc"
 source="https://ftp.gnu.org/gnu/binutils/binutils-$pkgver.tar.xz
 	binutils-ld-fix-static-linking.patch
-	gold-mips.patch
-	ld-bfd-mips.patch
 	0001-Revert-PR25882-.gnu.attributes-are-not-checked-for-s.patch
-	binutils-mips-disable-assert.patch
-	CVE-2022-38533.patch
 	"
 builddir="$srcdir/binutils-$pkgver"
 
@@ -59,19 +55,6 @@ build() {
 	local _gold_configure="--disable-gold"
 	local _plugin_configure="--enable-plugins"
 
-	case "$CARCH" in
-	riscv64)
-		# binutils creates empty textrels here
-		# https://sourceware.org/bugzilla/show_bug.cgi?id=25694
-		local no_textrels=""
-		;;
-	*)
-		# set -z text by default
-		# this is the default for linkers such as ld.lld too
-		local no_textrels="--enable-textrel-check=error"
-		;;
-	esac
-
 	if [ "$CHOST" != "$CTARGET" ]; then
 		_sysroot="$CBUILDROOT"
 		_cross_configure="--disable-install-libiberty"
@@ -90,11 +73,6 @@ build() {
 		_gold_configure="--disable-gold"
 	fi
 
-	case "$CTARGET_ARCH" in
-	mips*)  _hash_style_configure="--enable-default-hash-style=sysv" ;;
-	*)      _hash_style_configure="--enable-default-hash-style=gnu"	;;
-	esac
-
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -115,8 +93,7 @@ build() {
 		--enable-default-execstack=no \
 		$_cross_configure \
 		$_arch_configure \
-		$_hash_style_configure \
-		$no_textrels \
+		--enable-default-hash-style=gnu \
 		--with-pic \
 		--disable-werror \
 		--disable-nls \
@@ -140,30 +117,17 @@ package() {
 	fi
 }
 
-libs() {
-	pkgdesc="Runtime libraries from binutils - libbfd and libopcodes"
-
-	mkdir -p "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/lib/lib*.so "$subpkgdir"/usr/lib/
-}
-
 gold() {
 	pkgdesc="GNU binutils - gold linker"
 
 	if [ -e "$pkgdir"/usr/bin/ld.gold ]; then
-		mkdir -p "$subpkgdir"/usr/bin
-		mv "$pkgdir"/usr/bin/ld.gold "$subpkgdir"/usr/bin
+		amove usr/bin/ld.gold
 	fi
-	mkdir -p "$subpkgdir"/usr/$CTARGET/bin
-	mv "$pkgdir"/usr/$CTARGET/bin/ld.gold "$subpkgdir"/usr/$CTARGET/bin/ld.gold
+	amove usr/$CTARGET/bin/ld.gold
 }
 
 sha512sums="
-68e038f339a8c21faa19a57bbc447a51c817f47c2e06d740847c6e9cc3396c025d35d5369fa8c3f8b70414757c89f0e577939ddc0d70f283182504920f53b0a3  binutils-2.39.tar.xz
+a37e042523bc46494d99d5637c3f3d8f9956d9477b748b3b1f6d7dfbb8d968ed52c932e88a4e946c6f77b8f48f1e1b360ca54c3d298f17193f3b4963472f6925  binutils-2.40.tar.xz
 ecee33b0e435aa704af1c334e560f201638ff79e199aa11ed78a72f7c9b46f85fbb227af5748e735fd681d1965fcc42ac81b0c8824e540430ce0c706c81e8b49  binutils-ld-fix-static-linking.patch
-f55cf2e0bf82f97583a1abe10710e4013ecf7d64f1da2ef8659a44a06d0dd8beaf58dab98a183488ea137f03e32d62efc878d95f018f836f8cec870bc448556f  gold-mips.patch
-314d2ef9071c89940aa6c8118e8a1e2f191a5d0a4bf596da1ad9cc84f884d8bc7dea8bd7b9fc3f8f1bddd3fd41c6eb017e1e804044b3bf084df1ed9e6e095e2d  ld-bfd-mips.patch
 70ec22bd72ef6dddecfd970613387dd4a8cdc8730dd3cbf03d5a0c3a7c4d839383167bb06dad21bf7c235329fd44b5dc4aefe762f68544f17155cf002bf1be4a  0001-Revert-PR25882-.gnu.attributes-are-not-checked-for-s.patch
-609cd90d8b334eb309f586b17b9d335a08d3dbb6def7c3eb5c010028fcb681674031e5b9d853aa7a39a50304356a86afc184b85562b3f228f8197f4d29395c8f  binutils-mips-disable-assert.patch
-631726e557524633ace39c597acbc5ac39bfd25f7b292eee1f0b2a80a503f4ff799f027757d12d5a24b2fa3c07c7e14602d8a86d96e19876d6d0d5d1a02817e7  CVE-2022-38533.patch
 "

cross/binutils-riscv64/CVE-2022-38533.patch

@@ -1,22 +0,0 @@
-X-Git-Url: https://sourceware.org/git/?p=binutils-gdb.git;a=blobdiff_plain;f=bfd%2Fcoffcode.h;h=52027981c3f052d98e043cd0c877f0bb5da97c7f;hp=67aaf158ca1829fe63f0065f31a0b1009b227b36;hb=ef186fe54aa6d281a3ff8a9528417e5cc614c797;hpb=80075150727d653c39e9d037e15c6b87dcef08cd
-
-diff --git a/bfd/coffcode.h b/bfd/coffcode.h
-index 67aaf158ca1..52027981c3f 100644
---- a/bfd/coffcode.h
-+++ b/bfd/coffcode.h
-@@ -4302,10 +4302,13 @@ coff_set_section_contents (bfd * abfd,
- 
- 	rec = (bfd_byte *) location;
- 	recend = rec + count;
--	while (rec < recend)
-+	while (recend - rec >= 4)
- 	  {
-+	    size_t len = bfd_get_32 (abfd, rec);
-+	    if (len == 0 || len > (size_t) (recend - rec) / 4)
-+	      break;
-+	    rec += len * 4;
- 	    ++section->lma;
--	    rec += bfd_get_32 (abfd, rec) * 4;
- 	  }
- 
- 	BFD_ASSERT (rec == recend);

cross/binutils-riscv64/binutils-mips-disable-assert.patch

@@ -1,14 +0,0 @@
-diff -urN binutils-2.35.2.orig/bfd/elfxx-mips.c binutils-2.35.2/bfd/elfxx-mips.c
---- binutils-2.35.2.orig/bfd/elfxx-mips.c	2021-01-30 01:38:03.000000000 -0700
-+++ binutils-2.35.2/bfd/elfxx-mips.c	2021-05-13 17:35:34.706913601 -0600
-@@ -6744,8 +6744,10 @@
-      in the relocation.  */
-   if (h != NULL && ! SYMBOL_REFERENCES_LOCAL (info, &h->root))
-     {
-+#if 0
-       BFD_ASSERT (htab->root.target_os == is_vxworks
- 		  || h->global_got_area != GGA_NONE);
-+#endif
-       indx = h->root.dynindx;
-       if (SGI_COMPAT (output_bfd))
- 	defined_p = h->root.def_regular;

cross/binutils-riscv64/gold-mips.patch

@@ -1,39 +0,0 @@
-# DP: Fix gold on mips64 targets.
-
-gold/
-
-2016-08-09  Aurelien Jarno  <aurelien@aurel32.net>
-
-	* configure.tgt: Add mips64el*-*-*|mips64le*-*-* and mips64*-*-*.
-
- 
---- a/gold/configure.tgt
-+++ b/gold/configure.tgt
-@@ -153,6 +153,13 @@ aarch64*-*)
-  targ_big_endian=false
-  targ_extra_big_endian=true
-  ;;
-+mips*64*el*-*-*|mips*64*le*-*-*)
-+ targ_obj=mips
-+ targ_machine=EM_MIPS_RS3_LE
-+ targ_size=64
-+ targ_big_endian=false
-+ targ_extra_big_endian=true
-+ ;;
- mips*el*-*-*|mips*le*-*-*)
-  targ_obj=mips
-  targ_machine=EM_MIPS_RS3_LE
-@@ -160,6 +167,13 @@ mips*el*-*-*|mips*le*-*-*)
-  targ_big_endian=false
-  targ_extra_big_endian=true
-  ;;
-+mips*64*-*-*)
-+ targ_obj=mips
-+ targ_machine=EM_MIPS
-+ targ_size=64
-+ targ_big_endian=true
-+ targ_extra_big_endian=false
-+ ;;
- mips*-*-*)
-  targ_obj=mips
-  targ_machine=EM_MIPS

cross/binutils-riscv64/ld-bfd-mips.patch

@@ -1,19 +0,0 @@
---- ./ld/configure.tgt.orig
-+++ ./ld/configure.tgt
-@@ -541,12 +541,12 @@
- 			;;
- mips*-*-windiss)	targ_emul=elf32mipswindiss
- 			;;
--mips64*el-*-linux-*)	targ_emul=elf32ltsmipn32
--			targ_extra_emuls="elf32btsmipn32 elf32ltsmip elf32btsmip elf64ltsmip elf64btsmip"
-+mips64*el-*-linux-*)	targ_emul=elf64ltsmip
-+			targ_extra_emuls="elf32ltsmipn32 elf32btsmipn32 elf32ltsmip elf32btsmip elf64btsmip"
- 			targ_extra_libpath=$targ_extra_emuls
- 			;;
--mips64*-*-linux-*)	targ_emul=elf32btsmipn32
--			targ_extra_emuls="elf32ltsmipn32 elf32btsmip elf32ltsmip elf64btsmip elf64ltsmip"
-+mips64*-*-linux-*)	targ_emul=elf64btsmip
-+			targ_extra_emuls="elf32btsmipn32 elf32ltsmipn32 elf32btsmip elf32ltsmip elf64ltsmip"
- 			targ_extra_libpath=$targ_extra_emuls
- 			;;
- mips*el-*-linux-*)	targ_emul=elf32ltsmip

cross/busybox-static-aarch64/APKBUILD

@@ -7,8 +7,8 @@ if [ -z "$(type -t arch_to_hostspec)" ]; then
 fi
 
 pkgname=busybox-static-aarch64
-pkgver=1.35.0
-pkgrel=30
+pkgver=1.36.0
+pkgrel=8
 
 _arch="aarch64"
 _mirror="http://dl-4.alpinelinux.org/alpine/"
@@ -32,5 +32,5 @@ package() {
 }
 
 sha512sums="
-d34c0d16d77bd18548e4b2764ab4bde59611480aaaab5a47f585158a91fad413ccfb7954d5ebcf4aa6e04fdda4621832f46e8b13e313ce1fd7b4b96b3298d425  busybox-static-1.35.0-r30-aarch64-edge.apk
+918c25a969447cc34a1c3d8176a3da560bc61d3b028206b08d0ef8cc1147756f0f8a2fff02a560a14062ddfffcbb264368502a0f24725992a5652ea0755ed24a  busybox-static-1.36.0-r8-aarch64-edge.apk
 "

cross/busybox-static-armhf/APKBUILD

@@ -7,8 +7,8 @@ if [ -z "$(type -t arch_to_hostspec)" ]; then
 fi
 
 pkgname=busybox-static-armhf
-pkgver=1.35.0
-pkgrel=30
+pkgver=1.36.0
+pkgrel=8
 
 _arch="armhf"
 _mirror="http://dl-4.alpinelinux.org/alpine/"
@@ -32,5 +32,5 @@ package() {
 }
 
 sha512sums="
-805bcf5416d70db8a68a90e85dbf9728213f4e996862ce9d4af3eea35ac25bc1bf6ecddb7dc18d2881dfda59ecfbc64bfbaf148022209f26eb034a10e65494aa  busybox-static-1.35.0-r30-armhf-edge.apk
+d6c6d8c34101406c7dd7a237a0b3201908a3180d95aa7905bc4c9bde88ea2427cc808a5456c49bd087ce9ed07cbeae9de62681b6cc98900d7ce66af5b73fc0c8  busybox-static-1.36.0-r8-armhf-edge.apk
 "

cross/busybox-static-armv7/APKBUILD

@@ -7,8 +7,8 @@ if [ -z "$(type -t arch_to_hostspec)" ]; then
 fi
 
 pkgname=busybox-static-armv7
-pkgver=1.35.0
-pkgrel=30
+pkgver=1.36.0
+pkgrel=8
 
 _arch="armv7"
 _mirror="http://dl-4.alpinelinux.org/alpine/"
@@ -32,5 +32,5 @@ package() {
 }
 
 sha512sums="
-1beffa9f0b7a93d72b793c3ebac99a6243ca1a385064388fe6189753210775ff65bd4be30a540b5e0fa85ea795b7e3ad42cf4f9446c52ca1db285eea59a84c1a  busybox-static-1.35.0-r30-armv7-edge.apk
+b7ebdf31d92ebf6d4a5eebc57a9f9e4d5246e2e325999631bcad71e019e3f6be9ebc2e46ff085a92cee5cd7bb106964ca1f17fd69da47e7b0438bde592dbd830  busybox-static-1.36.0-r8-armv7-edge.apk
 "

cross/gcc-aarch64/APKBUILD

@@ -32,14 +32,15 @@ pkgver=${_pkgbase}_git$_pkgsnap
 [ "$CHOST" != "$CTARGET" ] && _target="-$CTARGET_ARCH" || _target=""
 
 pkgname=gcc-aarch64
-pkgrel=8
+pkgrel=10
 pkgdesc="Stage2 cross-compiler for aarch64"
 url="https://gcc.gnu.org"
 arch="x86_64"
-license="GPL-2.0-or-later LGPL-2.1-or-later"
+license="GPL-2.0-or-later AND LGPL-2.1-or-later"
 _gccrel=$pkgver-r$pkgrel
 depends="binutils-aarch64 mpc1"
 makedepends_build="gcc g++ bison flex texinfo gawk zip gmp-dev mpfr-dev mpc1-dev zlib-dev"
+# XXX: build hack to upgrade live on builders
 makedepends_host="linux-headers gmp-dev mpfr-dev mpc1-dev isl-dev zlib-dev musl-dev-aarch64 binutils-aarch64"
 subpackages="g++-aarch64:gpp libstdc++-dev-aarch64:libcxx_dev"
 [ "$CHOST" = "$CTARGET" ] && subpackages="gcc-doc$_target"

cross/gcc-armhf/APKBUILD

@@ -32,14 +32,15 @@ pkgver=${_pkgbase}_git$_pkgsnap
 [ "$CHOST" != "$CTARGET" ] && _target="-$CTARGET_ARCH" || _target=""
 
 pkgname=gcc-armhf
-pkgrel=8
+pkgrel=10
 pkgdesc="Stage2 cross-compiler for armhf"
 url="https://gcc.gnu.org"
 arch="x86_64"
-license="GPL-2.0-or-later LGPL-2.1-or-later"
+license="GPL-2.0-or-later AND LGPL-2.1-or-later"
 _gccrel=$pkgver-r$pkgrel
 depends="binutils-armhf mpc1"
 makedepends_build="gcc g++ bison flex texinfo gawk zip gmp-dev mpfr-dev mpc1-dev zlib-dev"
+# XXX: build hack to upgrade live on builders
 makedepends_host="linux-headers gmp-dev mpfr-dev mpc1-dev isl-dev zlib-dev musl-dev-armhf binutils-armhf"
 subpackages="g++-armhf:gpp libstdc++-dev-armhf:libcxx_dev"
 [ "$CHOST" = "$CTARGET" ] && subpackages="gcc-doc$_target"

cross/gcc-armv7/APKBUILD

@@ -32,14 +32,15 @@ pkgver=${_pkgbase}_git$_pkgsnap
 [ "$CHOST" != "$CTARGET" ] && _target="-$CTARGET_ARCH" || _target=""
 
 pkgname=gcc-armv7
-pkgrel=8
+pkgrel=10
 pkgdesc="Stage2 cross-compiler for armv7"
 url="https://gcc.gnu.org"
 arch="x86_64"
-license="GPL-2.0-or-later LGPL-2.1-or-later"
+license="GPL-2.0-or-later AND LGPL-2.1-or-later"
 _gccrel=$pkgver-r$pkgrel
 depends="binutils-armv7 mpc1"
 makedepends_build="gcc g++ bison flex texinfo gawk zip gmp-dev mpfr-dev mpc1-dev zlib-dev"
+# XXX: build hack to upgrade live on builders
 makedepends_host="linux-headers gmp-dev mpfr-dev mpc1-dev isl-dev zlib-dev musl-dev-armv7 binutils-armv7"
 subpackages="g++-armv7:gpp libstdc++-dev-armv7:libcxx_dev"
 [ "$CHOST" = "$CTARGET" ] && subpackages="gcc-doc$_target"

cross/gcc-riscv64/APKBUILD

@@ -32,14 +32,15 @@ pkgver=${_pkgbase}_git$_pkgsnap
 [ "$CHOST" != "$CTARGET" ] && _target="-$CTARGET_ARCH" || _target=""
 
 pkgname=gcc-riscv64
-pkgrel=8
+pkgrel=10
 pkgdesc="Stage2 cross-compiler for riscv64"
 url="https://gcc.gnu.org"
 arch="x86_64"
-license="GPL-2.0-or-later LGPL-2.1-or-later"
+license="GPL-2.0-or-later AND LGPL-2.1-or-later"
 _gccrel=$pkgver-r$pkgrel
 depends="binutils-riscv64 mpc1"
 makedepends_build="gcc g++ bison flex texinfo gawk zip gmp-dev mpfr-dev mpc1-dev zlib-dev"
+# XXX: build hack to upgrade live on builders
 makedepends_host="linux-headers gmp-dev mpfr-dev mpc1-dev isl-dev zlib-dev musl-dev-riscv64 binutils-riscv64"
 subpackages="g++-riscv64:gpp libstdc++-dev-riscv64:libcxx_dev"
 [ "$CHOST" = "$CTARGET" ] && subpackages="gcc-doc$_target"

cross/grub-efi-x86/APKBUILD

@@ -3,7 +3,7 @@
 
 pkgname=grub-efi-x86
 pkgver=2.06
-pkgrel=7
+pkgrel=11
 
 _arch="x86"
 _mirror="http://dl-4.alpinelinux.org/alpine/"
@@ -22,5 +22,5 @@ package() {
 }
 
 sha512sums="
-f748735b1b15d7424640a22c00b2c0ea23f392521ae0839f6a582bb1a67410da46bf51274991eb88d7a36a5f7036b7ed89b965cccf0dab293a692dd0d73c467c  grub-efi-2.06-r7-x86-edge.apk
+7400eb18117b8b1c8229f3f2f3eb3bcff75022d8ca81fa66fd35022eab93d9832e602d2454e957c11b8583f6c6176d1ff7fa6aa94ff5fadf8c14a0d55e447762  grub-efi-2.06-r11-x86-edge.apk
 "

cross/musl-aarch64/APKBUILD

@@ -7,8 +7,8 @@ if [ -z "$(type -t arch_to_hostspec)" ]; then
 fi
 
 pkgname=musl-aarch64
-pkgver=1.2.3
-pkgrel=4
+pkgver=1.2.3_git20230411
+pkgrel=0
 arch="x86_64"
 subpackages="musl-dev-aarch64:package_dev"
 
@@ -57,6 +57,6 @@ package_dev() {
 }
 
 sha512sums="
-17ca2c88d44f1e08372cb7a117a8cf754d44804445f1f94631c6517169657104beda3d57ffa07159054024519cb568cb3a8f267fd660897c1d36d3b5dfd059e4  musl-1.2.3-r4-aarch64-edge.apk
-d77fc40eac95c7ad87f7286f77bc356373fbbda93a971e8fa8154b23a55ec04691ec7976d522b4d52f1efd57cf2ea05576dbed8f70b1168028fcd25321c303b3  musl-dev-1.2.3-r4-aarch64-edge.apk
+08fc24d6ab89fe424d7531cbdd313ed6fa5cf28e7cbb9d0ce15912dc22373fc9f21c301ed3adea47a460cacbb1220319a51f93f7c6a2ae1a93658c0703619c07  musl-1.2.3_git20230411-r0-aarch64-edge.apk
+7a9e555fd7e94d50c2e0664ff32ff610537249131fb9bc968db286204c959bd1b3b155c0eed15d685225a094f71b71877d571821ef13c6faf74c73024306d8ee  musl-dev-1.2.3_git20230411-r0-aarch64-edge.apk
 "

cross/musl-armhf/APKBUILD

@@ -7,8 +7,8 @@ if [ -z "$(type -t arch_to_hostspec)" ]; then
 fi
 
 pkgname=musl-armhf
-pkgver=1.2.3
-pkgrel=4
+pkgver=1.2.3_git20230411
+pkgrel=0
 arch="x86_64"
 subpackages="musl-dev-armhf:package_dev"
 
@@ -57,6 +57,6 @@ package_dev() {
 }
 
 sha512sums="
-95e4ddc58290acdc15ebcf15c77b75de40bd0eb5ce79f745ef7dcdfde7d786216f69ca632c6c7bc562ff8ca54c65842a63ea3f79582ea63a13f2b9b8e5b0aee2  musl-1.2.3-r4-armhf-edge.apk
-45577e4571692a84fd984f023591d935901591a6b877163f93d1b854ba3b3876f972d26f5897a9f8b43d4dbc81aa736af2cec9bf60a7ff47f55805cc90926b3d  musl-dev-1.2.3-r4-armhf-edge.apk
+fa19f5b324ab7bf112e724670f8b7775d51a6209ef9c123c84a52859427021db07aa2cb329429d038ccfed010d0d21e20aef73447c2d2f0b0cd4dc7a8648dbf9  musl-1.2.3_git20230411-r0-armhf-edge.apk
+29da6801c91ccae218de9b6685af2380ee6e377719cfe7b37c6bf54d0fddbcd926e6be30ef4b38e833e19dd5b9f5e5093fea9bace17c408afe9bb570630595d3  musl-dev-1.2.3_git20230411-r0-armhf-edge.apk
 "

cross/musl-armv7/APKBUILD

@@ -7,8 +7,8 @@ if [ -z "$(type -t arch_to_hostspec)" ]; then
 fi
 
 pkgname=musl-armv7
-pkgver=1.2.3
-pkgrel=4
+pkgver=1.2.3_git20230411
+pkgrel=0
 arch="x86_64"
 subpackages="musl-dev-armv7:package_dev"
 
@@ -57,6 +57,6 @@ package_dev() {
 }
 
 sha512sums="
-0fb05cad178984393ac82ebcda74110ec77f13a9bb8fd5639cdec1e563ed724b80e0d2a2dea30ec98afab279bf9fc00d482b82be1c77611d0e8582853845a754  musl-1.2.3-r4-armv7-edge.apk
-f5cd6d747617fc8dc2ec021c75e8b66846c38773d02d106a549480a7a60d0f646fea0d2f941a62d269a021bb4f13e26447e75d10fed053352b9d0c5217a55896  musl-dev-1.2.3-r4-armv7-edge.apk
+b11903dab8d0f4e0a3eee7c78f74cb495519c6c08c250d6823342340c464d5d75acd1ba89bd90aaaea27505fcebb38cbfd10278a572e95a3bcdea1f5dd43c1e8  musl-1.2.3_git20230411-r0-armv7-edge.apk
+94aca2637425a6bd7f7641e2eb3be8cbea414c568c295d70b592550510f0a5c775a8e4f89aacff13caf6fd30fdc34c2f0f62ee9c93d185bed989f611e28ed0bf  musl-dev-1.2.3_git20230411-r0-armv7-edge.apk
 "

cross/musl-riscv64/APKBUILD

@@ -7,8 +7,8 @@ if [ -z "$(type -t arch_to_hostspec)" ]; then
 fi
 
 pkgname=musl-riscv64
-pkgver=1.2.3
-pkgrel=4
+pkgver=1.2.3_git20230411
+pkgrel=0
 arch="x86_64"
 subpackages="musl-dev-riscv64:package_dev"
 
@@ -57,6 +57,6 @@ package_dev() {
 }
 
 sha512sums="
-2f8046831c410d91dac08443091ac218e0b49f75b3d8b9b41735d4567c425e9aaae2704bfd537af97ed79910e5aa8dc6e1ba70ca7b2017349cebbf4406457aa9  musl-1.2.3-r4-riscv64-edge.apk
-7971285250946e45a78eb8a8414911b09c5f54bc99cdd0f9258f4f9f026001690935eb084c54115ce0c0d3c5ca7ffe2cbf903bb90da46f45c6ca71a361c54c89  musl-dev-1.2.3-r4-riscv64-edge.apk
+c9ed4d52c43a3810463bdee5aab83eaf0c23b5b5d6376245ad4f3c93acb533a7f458b6410ef31c044a699436a42eaf92530d884155eabf952878e85c79ac1c70  musl-1.2.3_git20230411-r0-riscv64-edge.apk
+29f59d4bbd1297efb032899b09ad63b64664a4c3cb46bf88dbdc9abbbb3f4729bf445dccf13ed5b56794fc1b703bb11c65a220c0a2de69ce497f83c64c2aced7  musl-dev-1.2.3_git20230411-r0-riscv64-edge.apk
 "

device/.shared-patches/linux/fix-read-only-segment-has-dynamic-relocations-error.patch

@@ -0,0 +1,17 @@
+Fixes "ld: read-only segment has dynamic relocations" error caused by "main/binutils: add -z text by default":
+https://gitlab.alpinelinux.org/alpine/aports/-/commit/a737d101cad8c0acf782d9a0ec38cf8d3432b6ff
+https://gitlab.alpinelinux.org/alpine/aports/-/commit/098309ba27bbb71f3723aa2e6e180776e0396b86
+
+diff --git a/Makefile b/Makefile
+index 4ee2a6394ec3..3fbced2573d1 100644
+--- a/Makefile
++++ b/Makefile
+@@ -969,6 +969,8 @@ ifeq ($(CONFIG_STRIP_ASM_SYMS),y)
+ LDFLAGS_vmlinux	+= $(call ld-option, -X,)
+ endif
+ 
++LDFLAGS_vmlinux += -z notext
++
+ ifneq ($(SEC_BUILD_CONF_USE_FINGERPRINT_TZ), false)
+   ifeq ($(CONFIG_SENSORS_FINGERPRINT), y)
+     ifneq ($(CONFIG_SEC_FACTORY), y)

device/.shared-patches/u-boot/gcc-12-u-boot-2020-fix-read-only-segment-has-dynamic-relocations-error.patch

@@ -0,0 +1,11 @@
+--- a/Makefile
++++ b/Makefile
+@@ -970,6 +970,8 @@
+ # Avoid 'Not enough room for program headers' error on binutils 2.28 onwards.
+ LDFLAGS_u-boot += $(call ld-option, --no-dynamic-linker)
+ 
++LDFLAGS_u-boot += -z notext $(call ld-option, --apply-dynamic-relocs)
++
+ ifeq ($(CONFIG_ARC)$(CONFIG_NIOS2)$(CONFIG_X86)$(CONFIG_XTENSA),)
+ LDFLAGS_u-boot += -Ttext $(CONFIG_SYS_TEXT_BASE)
+ endif

device/community/device-fairphone-fp4/APKBUILD

@@ -2,7 +2,7 @@
 # Maintainer: Luca Weiss <luca@z3ntu.xyz>
 pkgname=device-fairphone-fp4
 pkgdesc="Fairphone 4"
-pkgver=0.9
+pkgver=1.0
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -71,7 +71,7 @@ phosh() {
 
 sha512sums="
 2974ccc172bf1299daeb0bc746879b3a1db1fbc3a2b163a02a6554fed6ed9f733144bcf976cd2441c5664d496dcce3ae943f4314c653470dc07dda0de5ad632b  90-feedbackd-aw8695.rules
-584d14a61b9d3ee436725a5b4fd9e7e1fde8764bb7e1872e4a20115ad767e1d87ab2c2023d5f941217579ef915b6a6011f6ae61487102f690bd532368a090c8a  deviceinfo
+7a54c90ebe68b2fe1c59ef3b94bfdac0e0e7833eb881d8dcff86d61dc0d45a606d498aa10cefcc68a82bdbc4130091e036867fdb429ed314b9b46100c55a21d7  deviceinfo
 25a93dcbe6dbc6cff24f57cbf5539bc475c5fe0f6bf5e8374c7032b9c38a939bef0aa0cde1707afcc16b1ec2d0859c03c6ee92d80d8048d1c6adc6e25178b85f  gtk.css
 65f74d29ab318b23f7ac8923a3661f2c4130049273a8c6be234ed2c8e00810b6a1254b54cf0932e42850a6d48f821dcd038900fbb836feeddfab2759afffae38  phoc.ini
 "

device/community/device-fairphone-fp4/deviceinfo

@@ -24,7 +24,7 @@ deviceinfo_getty="ttyMSM0;115200"
 
 # Bootloader related
 deviceinfo_flash_method="fastboot"
-deviceinfo_kernel_cmdline="PMOS_NO_OUTPUT_REDIRECT sdhci.debug_quirks=0x40"
+deviceinfo_kernel_cmdline="PMOS_NO_OUTPUT_REDIRECT"
 deviceinfo_generate_bootimg="true"
 deviceinfo_bootimg_qcdt="false"
 deviceinfo_bootimg_mtk_mkimage="false"

device/community/device-motorola-harpia/APKBUILD

@@ -1,10 +1,9 @@
 # Reference: <https://postmarketos.org/devicepkg>
-# Maintainer: Ruby Iris Juric <ruby@srxl.me>
-# Co-Maintainer: Minecrell <minecrell@minecrell.net>
+# Maintainer: Minecrell <minecrell@minecrell.net>
 pkgname=device-motorola-harpia
 pkgdesc="Motorola Moto G4 Play"
-pkgver=7
-pkgrel=1
+pkgver=8
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -32,8 +31,12 @@ package() {
 
 nonfree_firmware() {
 	pkgdesc="GPU/WiFi/BT/Modem/Video firmware"
+	# harpia's WCNSS firmware has problems with WiFi channels on some device
+	# variants, using osprey's firmware seems to help as a workaround
+	# (see https://gitlab.com/postmarketOS/pmaports/-/issues/1085)
 	depends="firmware-qcom-adreno-a300 msm-firmware-loader
-		 firmware-motorola-harpia-wcnss-nv firmware-motorola-harpia-venus"
+		 firmware-motorola-harpia-wcnss-nv firmware-motorola-harpia-venus
+		 firmware-motorola-osprey-wcnss"
 	mkdir "$subpkgdir"
 }
 

device/community/device-nokia-n900/APKBUILD

@@ -2,13 +2,13 @@
 # Maintainer: Sicelo <absicsz@gmail.com>
 # Co-Maintainer: Danct12 <danct12@disroot.org>
 pkgname=device-nokia-n900
-pkgver=8.4
+pkgver=9.0
 pkgrel=0
 pkgdesc="Nokia N900"
 url="https://postmarketos.org"
 arch="armv7"
 license="MIT"
-depends="postmarketos-base linux-nokia-n900 u-boot-tools kbd kbd-bkeymaps ofono alsa-utils"
+depends="postmarketos-base linux-postmarketos-omap u-boot-tools kbd kbd-bkeymaps ofono alsa-utils"
 makedepends="devicepkg-dev u-boot-tools kbd kbd-bkeymaps"
 install="$pkgname.pre-upgrade $pkgname.post-install"
 subpackages="
@@ -75,7 +75,7 @@ package() {
 	install -D -m644 "$srcdir"/boot.scr \
 		"$pkgdir"/boot/boot.scr
 	install -D -m644 "$srcdir"/backlight-enable.sh \
-		"$pkgdir"/etc/postmarketos-mkinitfs/hooks/00-$pkgname-backlight.sh
+		"$pkgdir"/usr/share/mkinitfs/hooks/00-$pkgname-backlight.sh
 	install -D -m644 "$srcdir"/pointercal \
 		"$pkgdir"/etc/pointercal
 	install -D -m644 "$srcdir"/asound.state.speakers \
@@ -83,9 +83,9 @@ package() {
 	install -D -m644 "$srcdir"/asound.state.headset \
 		"$pkgdir"/var/lib/alsa/asound.state.headset
 	install -Dm644 "$srcdir"/10-initfs-keymap.files \
-		"$pkgdir"/etc/postmarketos-mkinitfs/files/10-initfs-keymap.files
+		"$pkgdir"/usr/share/mkinitfs/files/10-initfs-keymap.files
 	install -Dm644 "$srcdir"/10-initfs-keymap.sh \
-		"$pkgdir"/etc/postmarketos-mkinitfs/hooks/10-initfs-keymap.sh
+		"$pkgdir"/usr/share/mkinitfs/hooks/10-initfs-keymap.sh
 	install -Dm755 "$srcdir"/$pkgname.start \
 		"$pkgdir"/etc/local.d/$pkgname.start
 

device/community/device-oneplus-enchilada/APKBUILD

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

device/community/device-oneplus-enchilada/deviceinfo

@@ -18,7 +18,7 @@ deviceinfo_screen_height="2280"
 
 # Bootloader related
 deviceinfo_flash_method="fastboot"
-deviceinfo_kernel_cmdline="PMOS_NO_OUTPUT_REDIRECT console=ttyMSM0,115200"
+deviceinfo_kernel_cmdline="quiet loglevel=2 console=null"
 deviceinfo_generate_bootimg="true"
 deviceinfo_bootimg_qcdt="false"
 deviceinfo_bootimg_dtb_second="false"

device/community/device-oneplus-fajita/APKBUILD

@@ -3,7 +3,7 @@
 
 pkgname=device-oneplus-fajita
 pkgdesc="OnePlus 6T"
-pkgver=8
+pkgver=9
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -49,7 +49,7 @@ phosh() {
 }
 
 sha512sums="
-8561a33c0e7d5085186258a71d2fc44daa01b24d05781d53be87222b462059fee26baa2e004e799404606429629e56baad3778d74d1f725cec389f572c92155e  deviceinfo
+c3fe684bcd731c43837a6c1d53d8cb171fbf8e90f6d9fb99bd50c60bc18fbfae46b4e0623e4e841b9c7b0988e16282b9abf5927b09c54e85c8b632d858de68e4  deviceinfo
 65f74d29ab318b23f7ac8923a3661f2c4130049273a8c6be234ed2c8e00810b6a1254b54cf0932e42850a6d48f821dcd038900fbb836feeddfab2759afffae38  phoc.ini
 fe9871c325a38c0cadc9631870801ec15ab9f5b786ee854325b93eb3d23e7d8b1ac4f1075572ffcd225d8ec514dec09b986972ddff12a89260c0218af6de7887  q6voiced.conf
 "

device/community/device-oneplus-fajita/deviceinfo

@@ -18,7 +18,7 @@ deviceinfo_screen_height="2340"
 
 # Bootloader related
 deviceinfo_flash_method="fastboot"
-deviceinfo_kernel_cmdline="PMOS_NO_OUTPUT_REDIRECT console=ttyMSM0,115200"
+deviceinfo_kernel_cmdline="quiet loglevel=2 console=null"
 deviceinfo_generate_bootimg="true"
 deviceinfo_bootimg_qcdt="false"
 deviceinfo_bootimg_dtb_second="false"

device/community/device-pine64-pinebookpro/APKBUILD

@@ -3,7 +3,7 @@
 pkgname=device-pine64-pinebookpro
 pkgdesc="PINE64 Pinebook Pro"
 pkgver=11
-pkgrel=0
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -12,7 +12,7 @@ depends="
 	alsa-ucm-conf>=1.2.7
 	linux-postmarketos-rockchip>=5.14
 	nvme-cli
-	postmarketos-base
+	postmarketos-base>=25-r1
 	u-boot-pinebookpro
 	iw
 	"

device/community/device-pine64-pinephonepro/APKBUILD

@@ -2,7 +2,7 @@
 # Maintainer: Martijn Braam <martijn@brixit.nl>
 pkgname=device-pine64-pinephonepro
 pkgdesc="PINE64 PinePhone Pro"
-pkgver=3.6
+pkgver=3.7
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -13,7 +13,7 @@ depends="
 	alsa-ucm-conf>=1.2.6.2
 	eg25-manager>=0.4.2
 	linux-pine64-pinephonepro
-	postmarketos-base
+	postmarketos-base>=25-r1
 	fwupd>=1.8.6
 	"
 makedepends="
@@ -121,7 +121,7 @@ gnome() {
 sha512sums="
 2d68ffe143f633a86670f30e45dbad1cc313f219f22b7cd3319ab44bb7209c20cb29f2ff2c60c92390154af9c9a6815c4186be555364cf31552005eba024c0e7  51_keyboard.gschema.override
 98e9dcfb36dd5843ff441b148e3bffb70757c59601c5f01f55a584e8f017c7ca73f2275c1bff46e4236dd8174df36a43d10abf9b8dadee988b962036846dc6ed  90-modem-eg25.rules
-969e0b786e1697f1071e443e1bc5c08253b78c0ecdb410cfc70eeb4216ac464c18d02f543bd5d707fc8bb4ecbff52a6b4be18a94c26e6522b12ec0a38cb0eaaf  deviceinfo
+a2fec232778b5ba493c7a8b85b2121cdd19778cce0dac25f51ac3d2f1b48fb55b602ae62ae7d6a1a39af9310e4c05f04faf82c2b3f24698a0bee8cf303a115bb  deviceinfo
 c5006c38828eb519917d57756f7831c4552feffef2d4922a384073f6a551535f615ad397d784e313818e0b943e1f6212bcca0aff9ce37da60b29547b1631f24b  modemmanager.conf
 43f67e94491791685cdbb4874bb3034b1d297bdf3d23e7405c45ba8c58de72b4fb6a9943b79f46ef7b8f4dbc4d9db254ebec8eb3453d720a5a8fad277c6a9d88  ppkb.sh
 420ee1d7522d4d56c2909580fd6ba7580483ca5455b13eb6d22e700063ce0c1a5c6d2f5b161dfce0d777636fe9a712aa82f38a0585f2feabea3785b02bae7515  setup-modem.sh

device/community/device-pine64-pinephonepro/deviceinfo

@@ -20,7 +20,7 @@ deviceinfo_screen_height="1440"
 deviceinfo_getty="ttyS2;115200"
 
 # Installer related
-deviceinfo_dev_internal_storage="/dev/mmcblk0"
+deviceinfo_dev_internal_storage="/dev/mmcblk2"
 deviceinfo_dev_internal_storage_repartition="true"
 
 # Bootloader related

device/community/device-pine64-rockpro64/APKBUILD

@@ -1,20 +1,17 @@
 # Reference: <https://postmarketos.org/devicepkg>
-# Maintainer: Jean Lucas <jean@4ray.co>
-# Co-Maintainer: Bart Ribbers <bribbers@disroot.org>
+# Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=device-pine64-rockpro64
-pkgver=2
+pkgver=3
 pkgrel=2
 pkgdesc="PINE64 ROCKPro64"
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
 options="!check !archcheck"
-depends="postmarketos-base linux-postmarketos-rockchip u-boot-rockpro64"
+depends="postmarketos-base>=25-r1 linux-postmarketos-rockchip u-boot-rockchip"
 makedepends="devicepkg-dev"
 subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
-source="deviceinfo
-	extlinux.conf
-	"
+source="deviceinfo"
 
 build() {
 	devicepkg_build $startdir $pkgname
@@ -22,8 +19,6 @@ build() {
 
 package() {
 	devicepkg_package $startdir $pkgname
-	install -D -m644 "$srcdir"/extlinux.conf \
-		"$pkgdir"/boot/extlinux/extlinux.conf
 }
 
 nonfree_firmware() {
@@ -33,6 +28,5 @@ nonfree_firmware() {
 }
 
 sha512sums="
-7457107f8fcf27962474d2625c582eb9e7889d0306e3bee79b98037a0ac81a9a72b61acbfeb865eec4cd8f927c30597234889bd1eac1781b4be9766ed5cb124b  deviceinfo
-ad3a7a7d62af0d1be8a9e3fa93d155b96002a666f475be568902311f76ad2ef306570e49fc2734ef24bd9fc0be849747aa3824917405fa1ab8d22c2ff869d3e3  extlinux.conf
+eda78fea2ccd53b2edb3895919ecaa6831c815509d2324bca8e23a6c901100215f4df5b63aa1a8e0a47a879af258c86cd84f661042088b67b5de566a49afc4a8  deviceinfo
 "

device/community/device-pine64-rockpro64/deviceinfo

@@ -6,6 +6,7 @@ deviceinfo_name="PINE64 RockPro64"
 deviceinfo_manufacturer="PINE64"
 deviceinfo_codename="pine64-rockpro64"
 deviceinfo_year="2017"
+deviceinfo_dtb="rockchip/rk3399-rockpro64"
 deviceinfo_arch="aarch64"
 
 # Device related
@@ -18,5 +19,7 @@ deviceinfo_screen_height="1080"
 
 # Bootloader related
 deviceinfo_flash_method="none"
-deviceinfo_sd_embed_firmware="u-boot/pine64-rockpro64/u-boot-rockchip.bin:32"
+deviceinfo_sd_embed_firmware="u-boot/rockpro64-rk3399/idbloader.img:32,u-boot/rockpro64-rk3399/u-boot.itb:8192"
 deviceinfo_boot_part_start="32768"
+deviceinfo_kernel_cmdline="console=tty0 console=ttyS2,1500000n8 panic=10 coherent_pool=1M video=HDMI-A-1:1920x1080@60 video=eDP-1:1920x1080@60 loglevel=5 PMOS_NO_OUTPUT_REDIRECT"
+deviceinfo_generate_extlinux_config="true"

device/community/device-pine64-rockpro64/extlinux.conf

@@ -1,9 +0,0 @@
-timeout 10
-default POSTMARKETOS
-menu title boot prev kernel
-
-label POSTMARKETOS
-  kernel /vmlinuz
-  fdt /dtbs-postmarketos-rockchip/rockchip/rk3399-rockpro64.dtb
-  initrd /initramfs
-  append console=tty0 console=ttyS2,1500000n8 panic=10 coherent_pool=1M video=HDMI-A-1:1920x1080@60 video=eDP-1:1920x1080@60 loglevel=5 PMOS_NO_OUTPUT_REDIRECT

device/community/device-samsung-m0/APKBUILD

@@ -2,8 +2,8 @@
 # Maintainer: Newbyte <newbyte@disroot.org>
 pkgname=device-samsung-m0
 pkgdesc="Samsung Galaxy S III"
-pkgver=6.2
-pkgrel=1
+pkgver=6.3
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
@@ -52,7 +52,7 @@ nonfree_firmware() {
 }
 
 sha512sums="
-042a7d64ea9dd6d9f31e3754fc873e98ab403f8bfa2a7ec13c849db5282a1a23745936d7e2fc64c09a2cdb140acd903948298f39c5cb8c03130411ac94e9d34d  deviceinfo
+d745aabeda081c66056a35605cb352994050a1f53ba4570f16690a1670d20c2a39da5abbdc115acb925a933c8c16118b8ed7757da48cfe87779261d8d06b1d24  deviceinfo
 caa81e8ab6753c0ca24c22fb6742288765dfbf2469b8b8c35c5789edfcee546ef1c3b14ad6e540c417f434258399300f17d312b58157635eafab134587ef94cc  Midas.conf
 21f64c9104ec5780fffde8ba7ce57583592469694d07dd5e2de4173d7c9f99ba57fb28bb5bcfbbce921be9c4ead9d31980e948533162fe12424c2037145debb1  HiFi.conf
 56a2bdffc273cb0a581192e65378ff50e71c7bc8a696af7d5e7c165a53c005aae104c4514c68afb668454c5a94ce78bd509f8a40e3401d67e16636b1ed81d051  modules-load.conf

device/community/device-samsung-m0/deviceinfo

@@ -8,6 +8,7 @@ deviceinfo_codename="samsung-m0"
 deviceinfo_year="2012"
 deviceinfo_append_dtb="true"
 deviceinfo_dtb="exynos4412-i9300"
+deviceinfo_getty="ttySAC2;115200"
 deviceinfo_arch="armv7"
 deviceinfo_flash_kernel_on_update="true"
 

device/community/device-shift-axolotl/APKBUILD

@@ -4,7 +4,7 @@
 
 pkgname=device-shift-axolotl
 pkgdesc="SHIFT6mq"
-pkgver=7
+pkgver=8
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -55,7 +55,7 @@ phosh() {
 }
 
 sha512sums="
-6a075c5ea73bc2700cc5cb0325599e19b1380358f95938367150082253ab909140e2a02a496343a94b0b98b9e21a862953a0db4a023f5ceda9b7cef98250210f  deviceinfo
+a3e9ae292631233480b0fa60d90a7c0940162ea3876ae4bb8f2ad09ca4da94e9bcd6a0c690e8957ba4cd5d11ac50d3b32e7c89df5c44fd523aef6ea5e9c05c3d  deviceinfo
 65f74d29ab318b23f7ac8923a3661f2c4130049273a8c6be234ed2c8e00810b6a1254b54cf0932e42850a6d48f821dcd038900fbb836feeddfab2759afffae38  phoc.ini
 2a3cbdad5aa91181d24a4e56e63986af6accf887c64fa4d1b6ddad1926e29050243c4b1e2fd892d38ca7c16e24dff8545a16552e5749ae31b6d01bf428468e51  q6voiced.conf
 "

device/community/device-shift-axolotl/deviceinfo

@@ -20,7 +20,7 @@ deviceinfo_screen_height="2160"
 
 # Bootloader related
 deviceinfo_flash_method="fastboot"
-deviceinfo_kernel_cmdline="PMOS_NO_OUTPUT_REDIRECT console=ttyMSM0,115200n8"
+deviceinfo_kernel_cmdline="quiet loglevel=2 console=null"
 deviceinfo_generate_bootimg="true"
 deviceinfo_bootimg_qcdt="false"
 deviceinfo_bootimg_dtb_second="false"

device/community/device-tablet-x64uefi/APKBUILD

@@ -1,4 +1,5 @@
 # Reference: <https://postmarketos.org/devicepkg>
+# Maintainer: Clayton Craft <clayton@craftyguy.net>
 pkgname=device-tablet-x64uefi
 pkgdesc="Various tablets with atom CPU"
 pkgver=0.4

device/community/device-tablet-x86uefi/APKBUILD

@@ -1,8 +1,9 @@
 # Reference: <https://postmarketos.org/devicepkg>
+# Maintainer: Clayton Craft <clayton@craftyguy.net>
 pkgname=device-tablet-x86uefi
 pkgdesc="Various tablets with atom CPU"
-pkgver=3
-pkgrel=3
+pkgver=4
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="x86_64"
@@ -10,7 +11,7 @@ options="!check !archcheck"
 depends="postmarketos-base linux-lts libva-intel-driver grub-x86 alsa-ucm-conf"
 makedepends="devicepkg-dev"
 source="deviceinfo grub.cfg phoc.ini"
-subpackages="$pkgname-phosh $pkgname-x11"
+subpackages="$pkgname-phosh"
 
 build() {
 	devicepkg_build $startdir $pkgname
@@ -29,12 +30,6 @@ phosh() {
 		"$subpkgdir"/etc/phosh/phoc.ini
 }
 
-x11() {
-	install_if="$pkgname=$pkgver-r$pkgrel xorg-server"
-	depends="xf86-video-modesetting"
-	mkdir "$subpkgdir"
-}
-
 sha512sums="
 c9c81c6b57211c260a7a834c880068e5dec2a70a4502d0b4df7962c45d2f6019e7082bccbcc1eb7cee23adb7f05bc38f638010802e41279107cc7740d80e3fbe  deviceinfo
 2d951d71102181db85a2468fd770ee3a7958c06b14e27e52e0d4ff0e9b88f3ab3c5c9b15c8a938d1cd2ae0c94ad2aad7001f1b6fe943f96a38602085f481a4cf  grub.cfg

device/community/device-xiaomi-scorpio/30-gpu-firmware.files

@@ -1,4 +1,4 @@
-./lib/firmware/qcom/a530_pfp.fw
-./lib/firmware/qcom/a530_pm4.fw
-./lib/firmware/qcom/a530v3_gpmu.fw2
-./lib/firmware/qcom/msm8996/scorpio/a530_zap.mbn
+/lib/firmware/qcom/a530_pfp.fw
+/lib/firmware/qcom/a530_pm4.fw
+/lib/firmware/qcom/a530v3_gpmu.fw2
+/lib/firmware/qcom/msm8996/scorpio/a530_zap.mbn

device/community/device-xiaomi-scorpio/APKBUILD

@@ -4,7 +4,7 @@
 pkgname=device-xiaomi-scorpio
 pkgdesc="Xiaomi Mi Note 2"
 pkgver=3
-pkgrel=4
+pkgrel=7
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -19,7 +19,11 @@ depends="
 	soc-qcom-msm8996-ucm
 	"
 makedepends="devicepkg-dev"
-subpackages="$pkgname-nonfree-firmware:nonfree_firmware $pkgname-phosh"
+subpackages="
+	$pkgname-camera
+	$pkgname-phosh
+	$pkgname-nonfree-firmware:nonfree_firmware
+	"
 
 source="
 	30-gpu-firmware.files
@@ -55,7 +59,7 @@ nonfree_firmware() {
 	mkdir "$subpkgdir"
 
 	install -Dm644 "$srcdir/30-gpu-firmware.files" -t \
-		"$subpkgdir/etc/postmarketos-mkinitfs/files"
+		"$subpkgdir/usr/share/mkinitfs/files"
 }
 
 phosh() {
@@ -64,9 +68,14 @@ phosh() {
 		"$subpkgdir"/etc/phosh/phoc.ini
 }
 
+camera() {
+	install_if="$pkgname=$pkgver-r$pkgrel postmarketos-default-camera"
+	depends="megapixels"
+	mkdir -p "$subpkgdir"
+}
 
 sha512sums="
-a1ca623314e80045ea8d64be06d12ffc091a5585ca40f9713039883e20889ba47f4a3f9c3bd92bd3b616bb6bb621e87409b6b6fa43bfe566a2a46468609c16f4  30-gpu-firmware.files
+b033e7357c4ef91ba84f6f715e96e67637c2631d4746402f8a92333ba8974bbee7736a7bc081b0f84a84dc5b555a7db4dbb4f14f628bbfc42cbfa501c4f0ed36  30-gpu-firmware.files
 52ba13a75f14c8d75a719f463a870df34eb59765bd43f29a49fb0dff201410fa388a04f73ec8e6e86d634547bf6ef0164466333b24da36d882b0d7254bfbe213  deviceinfo
 ecd40b8f9bc17f383c52aa96ad23ceec41be75a4500d5e7a67f2f59875bf9f72eb35686a0b6e4949b45fd589c5da409d1212c52172fef94de2d1655b28c339b4  gpu-nobin.sh
 e9ee9c1404b41ba15eafff3f728ff6e0e78dc17e9a88483fca92db1aa3efe0e4d5bf26142e533c4ff12b1bf8ce04ccabb7ca0f93aaea586d5b30910282aad237  pointercal

device/community/firmware-fairphone-fp4/APKBUILD

@@ -1,6 +1,6 @@
 pkgname=firmware-fairphone-fp4
-pkgver=20211213
-pkgrel=1
+pkgver=20230215
+pkgrel=0
 pkgdesc="Firmware for Fairphone 4"
 subpackages="
 	$pkgname-adreno
@@ -15,7 +15,7 @@ url="https://github.com/FairBlobs/FP4-firmware"
 arch="aarch64"
 license="proprietary"
 options="!check !strip !archcheck !tracedeps pmb:cross-native"
-_commit="8e8b9b90d16022ef7bcb8b1eb7d762f729b5237e"
+_commit="7b95dc9cabee71fd2444cf1c99216bbc0421c111"
 source="https://github.com/FairBlobs/FP4-firmware/archive/$_commit/FP4-firmware-$_commit.tar.gz"
 builddir="$srcdir/FP4-firmware-$_commit"
 
@@ -81,5 +81,5 @@ wlan() {
 }
 
 sha512sums="
-4de6ccb9c1607366b64e3118e9c58d98b7d3e7a1b7dacd406bcf3097690997e01971b5eafc62dad97e6a1979cb5328615e8c52b87fd1b6e7b169107d69b9e493  FP4-firmware-8e8b9b90d16022ef7bcb8b1eb7d762f729b5237e.tar.gz
+5e64b2146250227ab70d605c586c516c2337d5a1f23db539603ac6709be6683cb09677caf7ee4880e9cc5ec9f3b5f6cc0b2e88184b1ebe859d0166353a3d1ae3  FP4-firmware-7b95dc9cabee71fd2444cf1c99216bbc0421c111.tar.gz
 "

device/community/firmware-motorola-harpia/APKBUILD

@@ -1,7 +1,6 @@
-# Maintainer: Ruby Iris Juric <ruby@srxl.me>
 pkgname=firmware-motorola-harpia
 pkgver=3
-pkgrel=0
+pkgrel=1
 pkgdesc="Firmware for Motorola Moto G4 Play"
 url="https://github.com/Sorixelle/vendor_motorola_harpia"
 subpackages="$pkgname-wcnss-nv:wcnss_nv $pkgname-venus"

device/community/firmware-oneplus-sdm845/APKBUILD

@@ -2,7 +2,7 @@
 
 pkgname=firmware-oneplus-sdm845
 pkgver=7
-pkgrel=0
+pkgrel=1
 pkgdesc="Firmware for OnePlus 6 / 6T"
 url="https://gitlab.com/sdm845-mainline/firmware-oneplus-sdm845"
 arch="aarch64"
@@ -32,7 +32,7 @@ firmware_initramfs() {
 	mkdir "$subpkgdir"
 
 	install -Dm644 "$srcdir/30-gpu-firmware.files" \
-		"$subpkgdir/etc/postmarketos-mkinitfs/files/30-gpu-firmware.files"
+		"$subpkgdir/usr/share/mkinitfs/files/30-gpu-firmware.files"
 }
 
 sha512sums="

device/community/firmware-pine64-rockpro64/APKBUILD

@@ -1,7 +1,7 @@
-# Maintainer: Jean Lucas <jean@4ray.co>
+# Maintainer: @exkc <exkc@exkc.moe>
 pkgname=firmware-pine64-rockpro64
 pkgver=1
-pkgrel=0
+pkgrel=1
 _commit="4b370cd415a2dd7b0ecdbe8bbf1d86fb35ce6985"
 pkgdesc="Firmware for the RockPro64 (pine64-rockpro64)"
 url="https://github.com/LibreELEC/brcmfmac_sdio-firmware"

device/community/firmware-shift-sdm845/APKBUILD

@@ -2,7 +2,7 @@
 
 pkgname=firmware-shift-sdm845
 pkgver=0.3
-pkgrel=0
+pkgrel=1
 pkgdesc="Firmware for SHIFT sdm845 devices"
 url="https://gitlab.com/sdm845-mainline/firmware-shift-sdm845"
 arch="aarch64"
@@ -37,7 +37,7 @@ firmware_initramfs() {
 	mkdir "$subpkgdir"
 
 	install -Dm644 "$srcdir/30-gpu-firmware.files" \
-		"$subpkgdir/etc/postmarketos-mkinitfs/files/30-gpu-firmware.files"
+		"$subpkgdir/usr/share/mkinitfs/files/30-gpu-firmware.files"
 }
 
 sha512sums="

device/community/linux-nokia-n900/0001-ARM-dts-n900-increase-charge-current-limit-to-950mA.patch

@@ -1,23 +0,0 @@
-From fbc4ce7a84e59215914a8981afe918002b191493 Mon Sep 17 00:00:00 2001
-From: Arthur Demchenkov <spinal.by@gmail.com>
-Date: Fri, 21 Dec 2018 09:23:57 +0300
-Subject: [PATCH] ARM: dts: n900: increase charge current limit to 950mA
-
-That was default in Maemo Fremantle
----
- arch/arm/boot/dts/omap3-n900.dts | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/arch/arm/boot/dts/omap3-n900.dts b/arch/arm/boot/dts/omap3-n900.dts
-index de7a31ae72207..7028a7cb2849e 100644
---- a/arch/arm/boot/dts/omap3-n900.dts
-+++ b/arch/arm/boot/dts/omap3-n900.dts
-@@ -700,7 +700,7 @@
- 		ti,current-limit = <100>;
- 		ti,weak-battery-voltage = <3400>;
- 		ti,battery-regulation-voltage = <4200>;
--		ti,charge-current = <650>;
-+		ti,charge-current = <950>;
- 		ti,termination-current = <100>;
- 		ti,resistor-sense = <68>;
- 

device/community/linux-nokia-n900/0002-power-supply-bq27xxx-expose-battery-data-when-CI.patch

@@ -1,115 +0,0 @@
-commit 68fdbe090c362e8be23890a7333d156e18c27781
-Author: Sicelo A. Mhlongo <absicsz@gmail.com>
-Date:   Wed Apr 20 14:30:59 2022 +0200
-
-    power: supply: bq27xxx: expose battery data when CI=1
-    
-    When the Capacity Inaccurate flag is set, the chip still provides data
-    about the battery, albeit inaccurate. Instead of discarding capacity
-    values for CI=1, expose the stale data and use the
-    POWER_SUPPLY_HEALTH_CALIBRATION_REQUIRED property to indicate that the
-    values should be used with care.
-    
-    Reviewed-by: Pali Rohár <pali@kernel.org>
-    Signed-off-by: Sicelo A. Mhlongo <absicsz@gmail.com>
-    Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
-
-diff --git a/drivers/power/supply/bq27xxx_battery.c b/drivers/power/supply/bq27xxx_battery.c
-index 72e727cd31e8..35e6a394c0df 100644
---- a/drivers/power/supply/bq27xxx_battery.c
-+++ b/drivers/power/supply/bq27xxx_battery.c
-@@ -1572,14 +1572,6 @@ static int bq27xxx_battery_read_charge(struct bq27xxx_device_info *di, u8 reg)
-  */
- static inline int bq27xxx_battery_read_nac(struct bq27xxx_device_info *di)
- {
--	int flags;
--
--	if (di->opts & BQ27XXX_O_ZERO) {
--		flags = bq27xxx_read(di, BQ27XXX_REG_FLAGS, true);
--		if (flags >= 0 && (flags & BQ27000_FLAG_CI))
--			return -ENODATA;
--	}
--
- 	return bq27xxx_battery_read_charge(di, BQ27XXX_REG_NAC);
- }
- 
-@@ -1742,6 +1734,18 @@ static bool bq27xxx_battery_dead(struct bq27xxx_device_info *di, u16 flags)
- 		return flags & (BQ27XXX_FLAG_SOC1 | BQ27XXX_FLAG_SOCF);
- }
- 
-+/*
-+ * Returns true if reported battery capacity is inaccurate
-+ */
-+static bool bq27xxx_battery_capacity_inaccurate(struct bq27xxx_device_info *di,
-+						 u16 flags)
-+{
-+	if (di->opts & BQ27XXX_O_HAS_CI)
-+		return (flags & BQ27000_FLAG_CI);
-+	else
-+		return false;
-+}
-+
- static int bq27xxx_battery_read_health(struct bq27xxx_device_info *di)
- {
- 	/* Unlikely but important to return first */
-@@ -1751,6 +1755,8 @@ static int bq27xxx_battery_read_health(struct bq27xxx_device_info *di)
- 		return POWER_SUPPLY_HEALTH_COLD;
- 	if (unlikely(bq27xxx_battery_dead(di, di->cache.flags)))
- 		return POWER_SUPPLY_HEALTH_DEAD;
-+	if (unlikely(bq27xxx_battery_capacity_inaccurate(di, di->cache.flags)))
-+		return POWER_SUPPLY_HEALTH_CALIBRATION_REQUIRED;
- 
- 	return POWER_SUPPLY_HEALTH_GOOD;
- }
-@@ -1758,7 +1764,6 @@ static int bq27xxx_battery_read_health(struct bq27xxx_device_info *di)
- void bq27xxx_battery_update(struct bq27xxx_device_info *di)
- {
- 	struct bq27xxx_reg_cache cache = {0, };
--	bool has_ci_flag = di->opts & BQ27XXX_O_HAS_CI;
- 	bool has_singe_flag = di->opts & BQ27XXX_O_ZERO;
- 
- 	cache.flags = bq27xxx_read(di, BQ27XXX_REG_FLAGS, has_singe_flag);
-@@ -1766,30 +1771,19 @@ void bq27xxx_battery_update(struct bq27xxx_device_info *di)
- 		cache.flags = -1; /* read error */
- 	if (cache.flags >= 0) {
- 		cache.temperature = bq27xxx_battery_read_temperature(di);
--		if (has_ci_flag && (cache.flags & BQ27000_FLAG_CI)) {
--			dev_info_once(di->dev, "battery is not calibrated! ignoring capacity values\n");
--			cache.capacity = -ENODATA;
--			cache.energy = -ENODATA;
--			cache.time_to_empty = -ENODATA;
--			cache.time_to_empty_avg = -ENODATA;
--			cache.time_to_full = -ENODATA;
--			cache.charge_full = -ENODATA;
--			cache.health = -ENODATA;
--		} else {
--			if (di->regs[BQ27XXX_REG_TTE] != INVALID_REG_ADDR)
--				cache.time_to_empty = bq27xxx_battery_read_time(di, BQ27XXX_REG_TTE);
--			if (di->regs[BQ27XXX_REG_TTECP] != INVALID_REG_ADDR)
--				cache.time_to_empty_avg = bq27xxx_battery_read_time(di, BQ27XXX_REG_TTECP);
--			if (di->regs[BQ27XXX_REG_TTF] != INVALID_REG_ADDR)
--				cache.time_to_full = bq27xxx_battery_read_time(di, BQ27XXX_REG_TTF);
--
--			cache.charge_full = bq27xxx_battery_read_fcc(di);
--			cache.capacity = bq27xxx_battery_read_soc(di);
--			if (di->regs[BQ27XXX_REG_AE] != INVALID_REG_ADDR)
--				cache.energy = bq27xxx_battery_read_energy(di);
--			di->cache.flags = cache.flags;
--			cache.health = bq27xxx_battery_read_health(di);
--		}
-+		if (di->regs[BQ27XXX_REG_TTE] != INVALID_REG_ADDR)
-+			cache.time_to_empty = bq27xxx_battery_read_time(di, BQ27XXX_REG_TTE);
-+		if (di->regs[BQ27XXX_REG_TTECP] != INVALID_REG_ADDR)
-+			cache.time_to_empty_avg = bq27xxx_battery_read_time(di, BQ27XXX_REG_TTECP);
-+		if (di->regs[BQ27XXX_REG_TTF] != INVALID_REG_ADDR)
-+			cache.time_to_full = bq27xxx_battery_read_time(di, BQ27XXX_REG_TTF);
-+
-+		cache.charge_full = bq27xxx_battery_read_fcc(di);
-+		cache.capacity = bq27xxx_battery_read_soc(di);
-+		if (di->regs[BQ27XXX_REG_AE] != INVALID_REG_ADDR)
-+			cache.energy = bq27xxx_battery_read_energy(di);
-+		di->cache.flags = cache.flags;
-+		cache.health = bq27xxx_battery_read_health(di);
- 		if (di->regs[BQ27XXX_REG_CYCT] != INVALID_REG_ADDR)
- 			cache.cycle_count = bq27xxx_battery_read_cyct(di);
- 

device/community/linux-nokia-n900/0003-wip-Revert-dma-direct-Fix-potential-NULL-pointer-der.patch

@@ -1,49 +0,0 @@
-diff --git a/include/linux/dma-direct.h b/include/linux/dma-direct.h
-index 18aade195884..6eb8f8ae76da 100644
---- a/include/linux/dma-direct.h
-+++ b/include/linux/dma-direct.h
-@@ -103,6 +103,10 @@ static inline bool dma_capable(struct device *dev, dma_addr_t addr, size_t size,
- 
- 	if (addr == DMA_MAPPING_ERROR)
- 		return false;
-+
-+	if (!dev->dma_mask)
-+		return false;
-+
- 	if (is_ram && !IS_ENABLED(CONFIG_ARCH_DMA_ADDR_T_64BIT) &&
- 	    min(addr, end) < phys_to_dma(dev, PFN_PHYS(min_low_pfn)))
- 		return false;
-diff --git a/kernel/dma/mapping.c b/kernel/dma/mapping.c
-index 559461a826ba..389fc0faaa47 100644
---- a/kernel/dma/mapping.c
-+++ b/kernel/dma/mapping.c
-@@ -148,9 +148,6 @@ dma_addr_t dma_map_page_attrs(struct device *dev, struct page *page,
- 
- 	BUG_ON(!valid_dma_direction(dir));
- 
--	if (WARN_ON_ONCE(!dev->dma_mask))
--		return DMA_MAPPING_ERROR;
--
- 	if (dma_map_direct(dev, ops) ||
- 	    arch_dma_map_page_direct(dev, page_to_phys(page) + offset + size))
- 		addr = dma_direct_map_page(dev, page, offset, size, dir, attrs);
-@@ -185,9 +182,6 @@ static int __dma_map_sg_attrs(struct device *dev, struct scatterlist *sg,
- 
- 	BUG_ON(!valid_dma_direction(dir));
- 
--	if (WARN_ON_ONCE(!dev->dma_mask))
--		return 0;
--
- 	if (dma_map_direct(dev, ops) ||
- 	    arch_dma_map_sg_direct(dev, sg, nents))
- 		ents = dma_direct_map_sg(dev, sg, nents, dir, attrs);
-@@ -293,9 +287,6 @@ dma_addr_t dma_map_resource(struct device *dev, phys_addr_t phys_addr,
- 
- 	BUG_ON(!valid_dma_direction(dir));
- 
--	if (WARN_ON_ONCE(!dev->dma_mask))
--		return DMA_MAPPING_ERROR;
--
- 	if (dma_map_direct(dev, ops))
- 		addr = dma_direct_map_resource(dev, phys_addr, size, dir, attrs);
- 	else if (ops->map_resource)

device/community/linux-nokia-n900/0004-ARM-dts-omap3_n900-disable-thermal-for-now.patch

@@ -1,38 +0,0 @@
-From 5f13cdce615165f5a623faa4a642ecc723202b0f Mon Sep 17 00:00:00 2001
-From: Merlijn Wajer <merlijn@wizzup.org>
-Date: Mon, 20 Dec 2021 22:27:03 +0100
-Subject: [PATCH] ARM: dts: omap3-n900: disable thermal for now
-
-See "Oops while booting 5.15.2 on Nokia N900" on linux-omap mailing list
----
- arch/arm/boot/dts/omap3-n900.dts | 17 +++++++++++++++++
- 1 file changed, 17 insertions(+)
-
-diff --git a/arch/arm/boot/dts/omap3-n900.dts b/arch/arm/boot/dts/omap3-n900.dts
-index 1746a44e96bc..fe7c884da27c 100644
---- a/arch/arm/boot/dts/omap3-n900.dts
-+++ b/arch/arm/boot/dts/omap3-n900.dts
-@@ -28,6 +28,23 @@
- 	status = "disabled";
- };
- 
-+/* Disable cpu_thermal and bandgap, they causes oopses on mmc access in OFF
-+   mode at the moment. Let's just disable thermal_zones as well, although the
-+   system works without it...
-+*/
-+&cpu_thermal {
-+	status = "disabled";
-+};
-+
-+&bandgap {
-+	status = "disabled";
-+};
-+
-+&thermal_zones {
-+	status = "disabled";
-+};
-+
-+
- / {
- 	model = "Nokia N900";
- 	compatible = "nokia,omap3-n900", "ti,omap3430", "ti,omap3";

device/community/linux-nokia-n900/0005-iio-accel-st-accel-add-lis302dl.patch

@@ -1,39 +0,0 @@
-diff --git a/drivers/iio/accel/st_accel.h b/drivers/iio/accel/st_accel.h
-index 8750dea56fcb..586146ac6884 100644
---- a/drivers/iio/accel/st_accel.h
-+++ b/drivers/iio/accel/st_accel.h
-@@ -61,6 +61,7 @@ enum st_accel_type {
- #define LIS3DE_ACCEL_DEV_NAME		"lis3de"
- #define LIS2DE12_ACCEL_DEV_NAME		"lis2de12"
- #define LIS2HH12_ACCEL_DEV_NAME		"lis2hh12"
-+#define LIS302DL_ACCEL_DEV_NAME		"lis302dl"
- 
- #ifdef CONFIG_IIO_BUFFER
- int st_accel_allocate_ring(struct iio_dev *indio_dev);
-diff --git a/drivers/iio/accel/st_accel_core.c b/drivers/iio/accel/st_accel_core.c
-index f1e6ec380667..2adf8cf7307b 100644
---- a/drivers/iio/accel/st_accel_core.c
-+++ b/drivers/iio/accel/st_accel_core.c
-@@ -444,6 +444,7 @@ static const struct st_sensor_settings st_accel_sensors_settings[] = {
- 		.wai_addr = ST_SENSORS_DEFAULT_WAI_ADDRESS,
- 		.sensors_supported = {
- 			[0] = LIS331DL_ACCEL_DEV_NAME,
-+			[1] = LIS302DL_ACCEL_DEV_NAME,
- 		},
- 		.ch = (struct iio_chan_spec *)st_accel_8bit_channels,
- 		.odr = {
-diff --git a/drivers/iio/accel/st_accel_i2c.c b/drivers/iio/accel/st_accel_i2c.c
-index cba57459e90a..466443101e8a 100644
---- a/drivers/iio/accel/st_accel_i2c.c
-+++ b/drivers/iio/accel/st_accel_i2c.c
-@@ -107,6 +107,10 @@ static const struct of_device_id st_accel_of_match[] = {
- 		.compatible = "st,lis2hh12",
- 		.data = LIS2HH12_ACCEL_DEV_NAME,
- 	},
-+	{
-+		.compatible = "st,lis302dl",
-+		.data = LIS302DL_ACCEL_DEV_NAME,
-+	},
- 	{},
- };
- MODULE_DEVICE_TABLE(of, st_accel_of_match);

device/community/linux-nokia-n900/0007-Revert-ARM-omap3-enable-off-mode-automatically.patch

@@ -1,117 +0,0 @@
-From d3b8625fd76fc839fc95e90b9117fafaf2d377bb Mon Sep 17 00:00:00 2001
-From: Merlijn Wajer <merlijn@wizzup.org>
-Date: Wed, 8 Dec 2021 15:28:59 +0100
-Subject: [PATCH] Revert "ARM: omap3: enable off mode automatically"
-
-This reverts commit fb2c599f056640d289b2147fbe6d9eaee689f1b2.
-
-This commit surfaces problems on the Nokia N900 when the system is
-actually in idle mode - causing oopses.
----
- arch/arm/mach-omap2/pm-debug.c |  2 ++
- arch/arm/mach-omap2/pm.c       |  2 --
- arch/arm/mach-omap2/pm.h       |  4 ++++
- arch/arm/mach-omap2/pm34xx.c   | 27 ++-------------------------
- 4 files changed, 8 insertions(+), 27 deletions(-)
-
-diff --git a/arch/arm/mach-omap2/pm-debug.c b/arch/arm/mach-omap2/pm-debug.c
-index b3110399a3fb..104634a9b5b3 100644
---- a/arch/arm/mach-omap2/pm-debug.c
-+++ b/arch/arm/mach-omap2/pm-debug.c
-@@ -34,6 +34,8 @@
- #include "prm2xxx_3xxx.h"
- #include "pm.h"
- 
-+u32 enable_off_mode;
-+
- #ifdef CONFIG_DEBUG_FS
- #include <linux/debugfs.h>
- #include <linux/seq_file.h>
-diff --git a/arch/arm/mach-omap2/pm.c b/arch/arm/mach-omap2/pm.c
-index da829a90fe8c..01ec1ba4878b 100644
---- a/arch/arm/mach-omap2/pm.c
-+++ b/arch/arm/mach-omap2/pm.c
-@@ -28,8 +28,6 @@
- #include "clockdomain.h"
- #include "pm.h"
- 
--u32 enable_off_mode;
--
- #ifdef CONFIG_SUSPEND
- /*
-  * omap_pm_suspend: points to a function that does the SoC-specific
-diff --git a/arch/arm/mach-omap2/pm.h b/arch/arm/mach-omap2/pm.h
-index 80e84ae66aee..2a883a0c1fcd 100644
---- a/arch/arm/mach-omap2/pm.h
-+++ b/arch/arm/mach-omap2/pm.h
-@@ -49,7 +49,11 @@ static inline int omap4_opp_init(void)
- extern int omap3_pm_get_suspend_state(struct powerdomain *pwrdm);
- extern int omap3_pm_set_suspend_state(struct powerdomain *pwrdm, int state);
- 
-+#ifdef CONFIG_PM_DEBUG
- extern u32 enable_off_mode;
-+#else
-+#define enable_off_mode 0
-+#endif
- 
- #if defined(CONFIG_PM_DEBUG) && defined(CONFIG_DEBUG_FS)
- extern void pm_dbg_update_time(struct powerdomain *pwrdm, int prev);
-diff --git a/arch/arm/mach-omap2/pm34xx.c b/arch/arm/mach-omap2/pm34xx.c
-index d73c7b692116..d37fb3304a2e 100644
---- a/arch/arm/mach-omap2/pm34xx.c
-+++ b/arch/arm/mach-omap2/pm34xx.c
-@@ -25,7 +25,7 @@
- #include <linux/clk.h>
- #include <linux/delay.h>
- #include <linux/slab.h>
--#include <linux/of.h>
-+#include <linux/omap-gpmc.h>
- 
- #include <trace/events/power.h>
- 
-@@ -406,12 +406,7 @@ static int __init pwrdms_setup(struct powerdomain *pwrdm, void *unused)
- 	if (!pwrst)
- 		return -ENOMEM;
- 	pwrst->pwrdm = pwrdm;
--
--	if (enable_off_mode)
--		pwrst->next_state = PWRDM_POWER_OFF;
--	else
--		pwrst->next_state = PWRDM_POWER_RET;
--
-+	pwrst->next_state = PWRDM_POWER_RET;
- 	list_add(&pwrst->node, &pwrst_list);
- 
- 	if (pwrdm_has_hdwr_sar(pwrdm))
-@@ -445,22 +440,6 @@ static void __init pm_errata_configure(void)
- 	}
- }
- 
--static void __init omap3_pm_check_pmic(void)
--{
--	struct device_node *np;
--
--	np = of_find_compatible_node(NULL, NULL, "ti,twl4030-power-idle");
--	if (!np)
--		np = of_find_compatible_node(NULL, NULL, "ti,twl4030-power-idle-osc-off");
--
--	if (np) {
--		of_node_put(np);
--		enable_off_mode = 1;
--	} else {
--		enable_off_mode = 0;
--	}
--}
--
- int __init omap3_pm_init(void)
- {
- 	struct power_state *pwrst, *tmp;
-@@ -494,8 +473,6 @@ int __init omap3_pm_init(void)
- 		goto err2;
- 	}
- 
--	omap3_pm_check_pmic();
--
- 	ret = pwrdm_for_each(pwrdms_setup, NULL);
- 	if (ret) {
- 		pr_err("Failed to setup powerdomains\n");

device/community/linux-nokia-n900/0008-wl1251-specify-max.-IE-length.patch

@@ -1,41 +0,0 @@
-From 7538e4ec6211a0d0e3d4f3d3138e9c2a39a38b62 Mon Sep 17 00:00:00 2001
-From: Merlijn Wajer <merlijn@wizzup.org>
-Date: Sun, 12 Dec 2021 23:13:08 +0100
-Subject: [PATCH] wl1251: specify max. IE length
-
-This fix is similar to commit 77c91295ea53 ("wil6210: specify max. IE
-length").  Without the max IE length set, wpa_supplicant cannot operate
-using the nl80211 interface.
-
-This patch is a workaround - the number 512 is taken from the wlcore
-driver, but note that per Paul Fertser:
-
-    there's no correct number because the driver will ignore the data
-    passed in extra IEs.
-
-Suggested-by: Paul Fertser <fercerpav@gmail.com>
-Signed-off-by: Merlijn Wajer <merlijn@wizzup.org>
----
- drivers/net/wireless/ti/wl1251/main.c | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/drivers/net/wireless/ti/wl1251/main.c b/drivers/net/wireless/ti/wl1251/main.c
-index 136a0d3b23c9..a25a6143e65f 100644
---- a/drivers/net/wireless/ti/wl1251/main.c
-+++ b/drivers/net/wireless/ti/wl1251/main.c
-@@ -1520,6 +1520,12 @@ int wl1251_init_ieee80211(struct wl1251 *wl)
- 	wl->hw->wiphy->interface_modes = BIT(NL80211_IFTYPE_STATION) |
- 					 BIT(NL80211_IFTYPE_ADHOC);
- 	wl->hw->wiphy->max_scan_ssids = 1;
-+
-+	/* We set max_scan_ie_len to a random value to make wpa_supplicant scans not
-+	 * fail, as the driver will the ignore the extra passed IEs anyway
-+	 */
-+	wl->hw->wiphy->max_scan_ie_len = 512;
-+
- 	wl->hw->wiphy->bands[NL80211_BAND_2GHZ] = &wl1251_band_2ghz;
- 
- 	wl->hw->queues = 4;
--- 
-2.34.1
-

device/community/linux-nokia-n900/APKBUILD

@@ -1,78 +0,0 @@
-# Maintainer: Sicelo <absicsz@gmail.com>
-# Co-Maintainer: Danct12 <danct12@disroot.org>
-
-pkgname=linux-nokia-n900
-pkgver=5.15.81
-pkgrel=0
-pkgdesc="Mainline kernel fork for Nokia N900"
-arch="armv7"
-url="https://kernel.org/"
-license="GPL-2.0-only"
-options="!strip !check !tracedeps
-	pmb:cross-native
-	pmb:kconfigcheck-community
-	"
-makedepends="bison findutils flex openssl-dev perl gmp-dev mpc1-dev mpfr-dev postmarketos-installkernel"
-
-_carch="arm"
-_flavor=nokia-n900
-_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;;
-esac
-source="
-	https://cdn.kernel.org/pub/linux/kernel/v${pkgver%%.*}.x/linux-$_kernver.tar.xz
-	$_patch
-	$_config
-	0001-ARM-dts-n900-increase-charge-current-limit-to-950mA.patch
-	0002-power-supply-bq27xxx-expose-battery-data-when-CI.patch
-	0003-wip-Revert-dma-direct-Fix-potential-NULL-pointer-der.patch
-	0004-ARM-dts-omap3_n900-disable-thermal-for-now.patch
-	0005-iio-accel-st-accel-add-lis302dl.patch
-	0006-ARM-dts-N900-use-iio-driver-for-accelerometer.patch
-	0007-Revert-ARM-omap3-enable-off-mode-automatically.patch
-	0008-wl1251-specify-max.-IE-length.patch
-"
-builddir="$srcdir/linux-$_kernver"
-
-prepare() {
-	default_prepare
-	cp -v "$srcdir"/$_config .config
-}
-
-build() {
-	unset LDFLAGS
-	make ARCH="$_carch" CC="${CC:-gcc}" \
-		KBUILD_BUILD_VERSION="$((pkgrel + 1 ))-postmarketOS"
-}
-
-package() {
-	mkdir -p "$pkgdir"/boot
-	make zinstall modules_install dtbs_install \
-		ARCH="$_carch" \
-		INSTALL_MOD_STRIP=1 \
-		INSTALL_PATH="$pkgdir"/boot \
-		INSTALL_MOD_PATH="$pkgdir" \
-		INSTALL_DTBS_PATH="$pkgdir/boot/dtbs"
-
-	install -D "$builddir"/include/config/kernel.release \
-		"$pkgdir/usr/share/kernel/$_flavor/kernel.release"
-}
-
-sha512sums="
-d25ad40b5bcd6a4c6042fd0fd84e196e7a58024734c3e9a484fd0d5d54a0c1d87db8a3c784eff55e43b6f021709dc685eb0efa18d2aec327e4f88a79f405705a  linux-5.15.tar.xz
-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
-ea33adda06e1fb64b763c34f1f598bb00ccfdba5400d0996871138284b4cb8a51e021c7c0ace9d4bc16027530027fb2a443d5013c6f0b22ed3d64f36152c8854  0004-ARM-dts-omap3_n900-disable-thermal-for-now.patch
-eb23d77ef3b03d90af43a22f37556c040f8ba69f91564d443615c9554c6ea4d19578730e8087b88751b5f673143cc557ac50bb81598f7f50aba08953c7604df8  0005-iio-accel-st-accel-add-lis302dl.patch
-302aa8e6677e7ecfae473553806cdf5d47687c4f8e73322d0ace78486f9290ba503069ed6b41250fe38802b6c6091c7c4eac06ab387e011f1316b84ad5e2641d  0006-ARM-dts-N900-use-iio-driver-for-accelerometer.patch
-acf3beef5448da7f3be19b862ac2fef65379d9f1617246baaab296083901174d891526cd9bf781162d4406089969c311701dfded04219bafd3c5c7784bc4c2e6  0007-Revert-ARM-omap3-enable-off-mode-automatically.patch
-acaa153809c390957ee8d80caae440a41d84c78f045268ac226f05019dbdd69959b5cf56b6bac2e2c0300bcdb68649ffb847e7a0a333408bf5b4426fc969afe8  0008-wl1251-specify-max.-IE-length.patch
-"