linux-postmarketos-qcom-msm8226: update to latest kconfig

Manual kconfig changes: * CACHEFILES=m (category:netmount) * CRYPTO_CAMELLIA=m (category:netmount) * CRYPTO_CTS=y (category:netmount) * FSCACHE=y (category:netmount) * NFS_FSCACHE=y (category:netmount) * NFS_V4_2=y (category:netmount) * NFSD=m (category:netmount) * NFSD_V3_ACL=y (category:netmount) * NFSD_V4=y (category:netmount) * NFSD_PNFS=y (category:netmount) * NFSD_BLOCKLAYOUT=y (category:netmount) * NFSD_SCSILAYOUT=y (category:netmount) * NFSD_V4_2_INTER_SSC=y (category:netmount) * RPCSEC_GSS_KRB5_ENCTYPES_AES_SHA1=y (category:netmount) * RPCSEC_GSS_KRB5_ENCTYPES_AES_SHA2=y (category:netmount) * RPCSEC_GSS_KRB5_ENCTYPES_CAMELLIA=y (category:netmount) * CRYPTO_AES_TI=m (category:netmount) * NFS_V4_1=y (category:netmount) * ACCESSIBILITY=y (category:accessibility) * A11Y_BRAILLE_CONSOLE=y (category:accessibility) * SPEAKUP=m (category:accessibility) * SPEAKUP_SYNTH_ACNTSA=m (category:accessibility) * SPEAKUP_SYNTH_APOLLO=m (category:accessibility) * SPEAKUP_SYNTH_AUDPTR=m (category:accessibility) * SPEAKUP_SYNTH_BNS=m (category:accessibility) * SPEAKUP_SYNTH_DECTLK=m (category:accessibility) * SPEAKUP_SYNTH_DECEXT=m (category:accessibility) * SPEAKUP_SYNTH_LTLK=m (category:accessibility) * SPEAKUP_SYNTH_SOFT=m (category:accessibility) * SPEAKUP_SYNTH_SPKOUT=m (category:accessibility) * SPEAKUP_SYNTH_TXPRT=m (category:accessibility) * SECURITY_DMESG_RESTRICT=y (category:hardening)
2026-05-12 12:00:17 +02:00
1311 changed files with 26252 additions and 27196 deletions
@@ -1,4 +1,4 @@
-image: registry.alpinelinux.org/img/alpine:3.24
+image: registry.alpinelinux.org/img/alpine:3.23
 stages:
  - build
  - hardware tests
@@ -1,29 +0,0 @@
-#!/bin/sh -e
-# Description: Ensure that we're not depending on a too new pmbootstrap version.
-# https://postmarketos.org/pmb-ci
-
-if [ "$(id -u)" = 0 ]; then
-	set -x
-	apk -q add coreutils curl jq
-	exec su "${TESTUSER:-build}" -c "sh -e $0"
-fi
-
-pmbootstrap_min_age_days="30"
-pmbootstrap_min_version_field="$(grep pmbootstrap_min_version= pmaports.cfg)"
-pmbootstrap_min_version="${pmbootstrap_min_version_field#*=}"
-
-tag_date=$(curl -s "https://gitlab.postmarketos.org/api/v4/projects/postmarketOS%2Fpmbootstrap/repository/tags/$pmbootstrap_min_version" \
-	| jq -r ".created_at")
-
-tag_age_timestamp=$(date -d "$tag_date" +"%s")
-acceptable_age_timestamp=$(date -d "$pmbootstrap_min_age_days days ago" +"%s")
-
-echo "NOTE: pmbootstrap versions must be at least $pmbootstrap_min_age_days days old to be the minimum required version"
-
-if [ "$tag_age_timestamp" -ge "$acceptable_age_timestamp" ]; then
-	echo "ERROR: pmbootstrap version '$pmbootstrap_min_version' is too new!"
-	exit 1
-else
-	echo "PASS: pmbootstrap version '$pmbootstrap_min_version' is acceptable"
-	exit 0
-fi
@@ -1,7 +1,4 @@
 #!/bin/sh -e
-
-# shellcheck shell=busybox
-
 # Description: check various bad patterns with grep
 # https://postmarketos.org/pmb-ci

@@ -171,15 +168,6 @@ if [ -n "$CI_MERGE_REQUEST_DIFF_BASE_SHA" ]; then
 			exit_code=1
 		fi
 	fi
-
-	# Get latest commit message in MR
-	case "$CI_COMMIT_DESCRIPTION" in
-		*"[ci:skip-grep]"*)
-			echo "WARNING: not checking packages with grep"
-			echo " ([ci:skip-grep])!"
-			exit_code=0
-			;;
-	esac
 fi

 exit "$exit_code"
@@ -38,10 +38,6 @@ def get_kconfigcheck_categories() -> list [str]:


 if __name__ == "__main__":
-    if common.commit_message_has_string("[ci:skip-apkbuild-lint]"):
-        print("WARNING: not linting deviceinfo files ([ci:skip-apkbuild-lint])")
-        exit(0)
-
    kconfigcheck_categories = get_kconfigcheck_categories()
    custom_valid_options += kconfigcheck_categories
    os.environ["CUSTOM_VALID_OPTIONS"] = " ".join(custom_valid_options)
@@ -61,20 +57,7 @@ if __name__ == "__main__":
    if len(apkbuilds_filtered) < 1:
        print("No APKBUILDs to lint")
        sys.exit(0)
-
-    print("Running apkbuild-lint...")
-    print("")
-
-    ret = 0
-    for apkbuild in apkbuilds_filtered:
-        try:
-            cmd = ["apkbuild-lint", apkbuild]
-            subprocess.run(cmd, text=True, check=True)
-        except subprocess.CalledProcessError as exception:
-            ret = exception.returncode
-
-    print("")
-    if ret == 0:
-        print("Success")
-
-    sys.exit(ret)
+    try:
+        subprocess.run(["apkbuild-lint", *apkbuilds_filtered], text=True, check=True)
+    except subprocess.CalledProcessError as exception:
+        sys.exit(exception.returncode)
@@ -211,9 +211,9 @@ if __name__ == "__main__":
            archtag={
                Arch.x86_64: "shared",
                Arch.x86: "shared",
-                Arch.aarch64: "aarch64",
-                Arch.armv7: "armv7",
-                Arch.armhf: "armhf",
+                Arch.aarch64: "arm64",
+                Arch.armv7: "qemu",
+                Arch.armhf: "qemu",
                Arch.riscv64: "qemu",
                Arch.ppc64le: "ppc64le",
                Arch.loongarch64: "loongarch64",
@@ -36,28 +36,17 @@ if __name__ == "__main__":
    # aports later. We might be given a changed aport from e.g. extra-repos/systemd when
    # that repo is not enabled
    buildable_pkgs = set()
-    archived = set()
    for path in pmb.core.pkgrepo.pkgrepo_iter_package_dirs():
-        # Store archived packages for matching later
-        if os.path.split(os.path.split(path)[0])[1] == 'archived':
-            archived.add(os.path.basename(path))
-            continue
        buildable_pkgs.add(os.path.basename(path))

    # To store a list of packages from extra-repos/systemd for special handling
    #  later:
    systemd_pkgs = list()

-    # Filter out packages are not found in enabled repos or are in archived
+    # Filter out packages are not found in enabled repos
    # (Iterate over copy of packages, because we modify it in this loop)
    for package in packages.copy():
        if package not in buildable_pkgs:
-            # Specifically handle archived since it could include packages
-            # who's sources are dead
-            if package in archived:
-                print(f"{package}: archived, skipping")
-                packages.remove(package)
-                continue
            print(f"{package}: not in current repo, skipping")
            packages.remove(package)
            # FIXME: this should probably be more generic, if other repos are added
@@ -18,6 +18,7 @@ sh_files="
 	./main/postmarketos-base-ui/rootfs-usr-lib-NetworkManager-dispatcher.d-50-dns-filter.sh
 	./main/postmarketos-duranium/rootfs-usr-bin-duranium-set-channel
 	./main/postmarketos-duranium/rootfs-usr-libexec-duranium-first-boot
+	./main/postmarketos-duranium/rootfs-usr-libexec-duranium-mount-subpartitions
 	./main/postmarketos-duranium/rootfs-usr-libexec-duranium-usb-gadget-setup
 	./main/postmarketos-installkernel/installkernel-pmos
 	./main/postmarketos-initramfs/init.sh
@@ -67,7 +67,7 @@ instance/

 # Documentation
 public
-docs/packaging/device-packages/deviceinfo-reference.md
+docs/deviceinfo-reference.md

 # PyBuilder
 target/
@@ -111,9 +111,6 @@ pytest-commits:

 # APKBUILD linting
 aport-lint:
-  # alpine:latest doesn't have the most recent atools-go, which means we would
-  # miss some linting rules that were added upstream. Use alpine:edge instead.
-  image: alpine:edge
  stage: lint
  rules:
    - if: *mr_rule
@@ -175,18 +172,6 @@ mr-settings:
    - wget -q "https://gitlab.postmarketos.org/postmarketOS/ci-common/-/raw/main/check_mr_settings.py"
    - python3 ./check_mr_settings.py

-pmbootstrap minimum version:
-  stage: lint
-  rules:
-    - if: *mr_rule
-      changes:
-        - .ci/check-pmbootstrap-min-version.sh
-        - .gitlab-ci.yml
-        - pmaports.cfg
-  script:
-    - .ci/lib/gitlab_prepare_ci.sh
-    - .ci/check-pmbootstrap-min-version.sh
-
 # Calculate build of changed aports using a dynamic downstream pipelines:
 # https://docs.gitlab.com/ci/pipelines/downstream_pipelines/#dynamic-child-pipelines
 # For those to work, we need two jobs:
@@ -28,7 +28,6 @@
 -->
 * [ ] edge (`main` branch)
 * [ ] `v25.12`
-* [ ] `v26.06`

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

@@ -8,8 +8,4 @@
 * Maintainers of the package:
 * MR that had no maintainer response, if applicable:

-If the maintainers don't reply within two weeks of opening this issue, the
-package is considered orphaned and, in the case of device packages, the devices
-will be moved to the archived category.
-
 /label ~maintainership-status
@@ -1,25 +0,0 @@
-<!-- Use this template to notify community kernel maintainers that their
-     kernels are out-of-date and start the timer for moving them to testing.
-
-     Please title the issue:
-     Current community kernels not meeting version requirement (yyyy-mm-dd)
-->
-
-Hi, as per our
-[device categorization requirements for the community category](https://docs.postmarketos.org/pmaports/main/device-categorization.html#community),
-devices in the community category may not use a kernel version older than 6
-months.
-
-As of today (yyyy-mm-dd), the following kernels do not meet this requirement:
-
-* kernel-pkgname: kernel-pkgver, version-release-date (maintainers: @ ...)
-
-This issue is an attempt to notify you (the maintainers) of the situation so
-that you can update the packages. As per the rules, you have two weeks to
-update the packages or reply with a request for more time, up to one month
-of time from the moment this issue is opened. If that time passes and the
-devices still no longer meet the requirements, they will be moved to testing.
-
-/label ~"device-category::community"
-/label ~kernel
-/label ~"type::policy"
@@ -8,14 +8,14 @@ Person in charge of the release (doesn't have to do all the work, but has to
 push it forward):
 <!-- Put your usename here and assign yourself to this issue -->

-### 0. Preparation
+### Preparation
 - [ ] Create the gitlab milestone for the release
 - [ ] Add this infrastructure issue to the milestone
 - [ ] Update the
      [timeline](https://docs.postmarketos.org/policies-and-processes/development/releases/current-timeline.html)
      for the next release

-### 1. Pre-Build phase
+### Pre-Build phase

 This phase is to get some extra time for building packages. The branch will be rebased once in the branch phase.

@@ -23,8 +23,6 @@ This phase is to get some extra time for building packages. The branch will be r

 - [ ] Alpine's main repository must be built and published
 - [ ] Alpine's community repository must be built and published
-      <small>Without this, bpo won't be able to build packages but steps before
-      that can be done already.</small>

 #### pmbootstrap: adjust config
 - [ ] Update `pmb/config/__init__.py:apk_tools_min_version`. This should be a
@@ -38,21 +36,18 @@ This phase is to get some extra time for building packages. The branch will be r
 - [ ] `git checkout -b vYY.MM main`
 - [ ] Create a `=== Branch vYY.MM from main ===` commit
  - Remove channels.cfg (should only be in main)
-  - Adjust `pmaports.cfg`: Change `channel=edge` to `channel=vYY.MM`
-  - Adjust `pmaports.cfg`: Change `supported_arches` to `x86_64,aarch64,armv7`
-  - Delete `.ci/build-*` scripts for other arches
-    <small>`pmbootstrap ci` reads these</small>
+  - Change `channel=edge` to `channel=vYY.MM` in pmaports.cfg
+  - Change `supported_arches` to `x86_64,aarch64,armv7` in pmaports.cfg
+  - Disable x86, armhf, riscv64 in .ci/build-jobs.yaml.j2 on the release branch
+    and delete `.ci/build-*` scripts for these arches
 - [ ] `git push`
- [ ] Ensure the branch is protected in the
-      [repository settings](https://gitlab.postmarketos.org/postmarketOS/pmaports/-/settings/repository)
+- [ ] '''protect the new release branch in gitlab''', so nobody can force-push to it

 #### pmaports: update main branch
 - [ ] `git checkout main`
 - [ ] Add the new branch to
-  [channels.cfg](https://wiki.postmarketos.org/wiki/Channels.cfg_reference):
-  - [Example](https://gitlab.postmarketos.org/postmarketOS/pmaports/-/commit/c43571ceaf9b8155519bc9fb760bdeccd96e7e9c)
-  - Check if you need to set `branch_aports=master` initially if the stable
-    branch does not exist yet.
+  [channels.cfg](https://wiki.postmarketos.org/wiki/Channels.cfg_reference),
+  [like this](https://gitlab.postmarketos.org/postmarketOS/pmaports/-/commit/c43571ceaf9b8155519bc9fb760bdeccd96e7e9c)
 - [ ] `git push`

 #### pmaports: update os-release / remove packages / aportgen
@@ -66,15 +61,13 @@ This phase is to get some extra time for building packages. The branch will be r
  - `pmbootstrap config mirrors.pmaports none`
  - `pmbootstrap config mirrors.systemd none`
  - `pmbootstrap checksum postmarketos-base`
-  - `git commit -s` (`Remove packages that we don't have in stable`)
+  - `git commit`
 - [ ] Remove packages:
  - `cross/*-armhf` and other unsupported arches in cross dir (keep `gcc-x86` and `musl-dev-x86`, `systemd-boot-x86`)
+  - `main/postmarketos-ui-asteroid` (no smartwatches are useful on stable branches at the moment)
  - `gcc4*` and `gcc6*` from main and cross dirs
  - `device/downstream`, `device/archived`
-  - `extra-repos/systemd/postmarketos-repo-nightly`
- [ ] Run `pmbootstrap aportgen` for packages in cross:
-  - `cd cross; PMB_APK_FORCE_MISSING_REPOSITORIES=1 pmbootstrap aportgen musl-* grub-efi-x86`
-  - `git commit -s` (`cross: regenerate for vYY.MM`)
+- [ ] Run `pmbootstrap aportgen` for packages in cross
 - [ ] `git push`

 #### bpo: adjust config
@@ -86,19 +79,17 @@ This phase is to get some extra time for building packages. The branch will be r
 - [ ] Roll it out/ask somebody who can do that
 - [ ] Restart bpo, it will start building `x86_64` packages

-#### Bootstrap of binary packages
- [ ] Fix all failing `x86_64` packages (Remember: patches need to go through
-      edge first, then get backported to the stable branch!)
+#### bootstrap of binary packages
+- [ ] Fix failing `x86_64` packages (Remember: patches need to go through edge
+  first, then get backported to the stable branch!)
  - Try to get build fixes merged to edge quickly, ask for reviews in
    #postmarketos-devel, and consider merging trivial fixes right after they
    pass CI.
  - Devices in testing and archived categories that don't build: consider
    trying to fix them, or just delete them from the branch
- [ ] Wait until all packages for `x86_64` (main repository, we don't need to
-      wait for the systemd repository before continuing) are built and
-      published
- [ ] Enable arm repositories in the BPO config
- [ ] Get all packages to build without errors
+- [ ] Wait until all packages for `x86_64` are built and published
+- [ ] Fix up ARM packages too
+- [ ] Wait until all packages for ARM are built and published

 #### Wallpaper poll
 - [ ] Team meeting: make a short list of 4 wallpapers from [the
@@ -134,11 +125,11 @@ This phase is to get some extra time for building packages. The branch will be r
 - [ ] Adjust CI of postmarketos-release-upgrade to test the new release too
  (`git grep` for the previous release to see what needs to be adjusted)

-#### Update the wallpaper
+### Update the wallpaper
 - [ ] Set the wallpaper that won in the poll in edge, backport this change to
  the stable release branch

-### 2. Branch phase
+### Branch phase

 #### Rebase on main
 - [ ] `git checkout vYY.MM`
@@ -149,7 +140,8 @@ This phase is to get some extra time for building packages. The branch will be r

 #### Update BPO config
 - [ ] Update bpo's images config to build images for the new branch for all
-  devices in community and main
+  devices in community and main, except for:
+  - qemu-*
 - [ ] bpo: configure the new branch to be not WIP anymore
 - [ ] Roll-out bpo changes

@@ -157,12 +149,7 @@ This phase is to get some extra time for building packages. The branch will be r
 - [ ] Ensure that a pmbootstrap release been made with the apk-tools min
  version change

-#### aports stable branch set?
-* [ ] Check if a stable branch exists in `aports` for the new release, and that
-      it is being used in `channels.cfg` (might still be set to `master` if it
-      did not exist during the Pre-Branch phase).
-
-### 3. Test phase
+### Test phase
 - [ ] Create an issue in pmaports with a checklist of devices and UIs in main
  and community (see previous issue for reference)
  - Tag the testers of each device and UI
@@ -177,7 +164,7 @@ This phase is to get some extra time for building packages. The branch will be r
  intended for the upcoming release
 - [ ] Add new version to the pmaports gitlab issue template (.gitlab dir)

-### 4. Release phase
+### Release phase
 - [ ] Did a reasonable amount of devices get tested? (we may consider dropping
  devices that were not tested)
 - [ ] Make sure all fixes are in
@@ -3,5 +3,3 @@ Casey Connolly <kcxt@postmarketos.org> <caleb@postmarketos.org>
 Achill Gilgenast <achill@achill.org> <fossdd@pwned.life>
 Aelin <aelin@postmarketos.org> <adrian@postmarketos.org>
 Aelin <aelin@postmarketos.org> <adrian@travitia.xyz>
-Stefan Hansson <newbyte@postmarketos.org> <newbie13xd@gmail.com>
-Stefan Hansson <newbyte@postmarketos.org> <newbyte@postmarketos.org>
@@ -1,4 +1,4 @@
-# Commit Style
+# Policy for commits in pmaports

 This document defines policy for organising and titling commits for
 inclusion in pmaports.
@@ -16,9 +16,9 @@ target device.

 ## General policy

-We follow
-[Alpine's aports commit style](https://gitlab.alpinelinux.org/alpine/aports/-/blob/master/COMMITSTYLE.md)
-with some minor exceptions and additions.
+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

@@ -10,7 +10,7 @@ Helpful resources:
 * [How to create a package](https://wiki.postmarketos.org/wiki/Create_a_package)
 * [APKBUILD reference](https://wiki.alpinelinux.org/wiki/APKBUILD_Reference)
 * [pmaports commit style](./COMMITSTYLE.md)
-* [Approval rules](docs/merge-requests/approval-rules.md)
+* [Approval rules](docs/approval-rules.md)
 * [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)
@@ -8,12 +8,6 @@ branch_pmaports=main
 branch_aports=master
 mirrordir_alpine=edge

-[v26.06]
-description=Upcoming stable release (DO NOT USE)
-branch_pmaports=v26.06
-branch_aports=3.24-stable
-mirrordir_alpine=v3.24
-
 [v25.12]
 description=Latest release / Recommended for best stability
 branch_pmaports=v25.12
@@ -0,0 +1,43 @@
+# This package gets installed in the native and foreign arch chroots.
+# It creates files like /usr/lib/arch-bin-masquerade/armhf/gcc, which
+# point in the native chroot to the armhf-cross-compiler, and in the
+# armhf chroot to /usr/bin/gcc. That way compilation works fine, even
+# when distcc gets the absolute path to the compiler passed (ccache does
+# that).
+maintainer=""
+pkgname=arch-bin-masquerade
+pkgver=2
+pkgrel=0
+pkgdesc="Wrappers for ccache + distcc (native and foreign chroots)"
+url="https://postmarketOS.org"
+arch="all"
+license="MIT"
+options="!check !tracedeps pmb:cross-native"
+
+package() {
+	# Architectures and binaries
+	_archs="x86_64 armhf armv7 aarch64"
+	_bins="c++ cc cpp g++ gcc"
+
+	# Iterate over architectures
+	for _arch in $_archs; do
+		# Create the arch-specific bin folder
+		_hostspec="$(arch_to_hostspec $_arch)"
+		_bindir="$pkgdir/usr/lib/arch-bin-masquerade/$_arch"
+		mkdir -p "$_bindir"
+		cd "$_bindir"
+
+		# Iterate over binaries and create wrappers
+		for _bin in $_bins; do
+			{
+				echo "#!/bin/sh"
+				if [ "$_arch" == "$CARCH" ]; then
+					echo "exec /usr/bin/${_bin} \"\$@\""
+				else
+					echo "exec /usr/bin/${_hostspec}-${_bin} \"\$@\""
+				fi
+			} > "$_bin"
+			chmod +x "$_bin"
+		done
+	done
+}
@@ -34,7 +34,7 @@ _pkgsnap="${pkgver##*_git}"
 [ "$CHOST" != "$CTARGET" ] && _target="-$CTARGET_ARCH" || _target=""

 pkgname=gcc-aarch64
-pkgrel=6
+pkgrel=3
 pkgdesc="Stage2 cross-compiler for aarch64"
 url="https://gcc.gnu.org"
 arch="x86_64"
@@ -179,10 +179,7 @@ esac

 # libatomic is a dependency for openvswitch
 $_libatomic && subpackages="$subpackages libatomic::$CTARGET_ARCH"
-if $_libgcc; then
-	depends="$depends libgcc-static$_target"
-	subpackages="$subpackages libgcc::$CTARGET_ARCH libgcc-static$_target:libgccstatic:$CTARGET_ARCH"
-fi
+$_libgcc && subpackages="$subpackages libgcc::$CTARGET_ARCH"
 $_libquadmath && subpackages="$subpackages libquadmath::$CTARGET_ARCH"
 if $_libgomp; then
 	depends="$depends libgomp=$_gccrel"
@@ -634,20 +631,6 @@ libgcc() {
 	depends=

 	amove usr/lib/libgcc_s.so.*
-	# Symlink for Clang to find the library. Gets overwritten by the real
-	# library if gcc is installed.
-	ln -s /usr/lib/libgcc_s.so.1 \
-		"$subpkgdir"/usr/lib/libgcc_s.so
-}
-
-libgccstatic() {
-	pkgdesc="GNU C compiler runtime libraries"
-	depends=
-
-	amove usr/lib/gcc/"$CTARGET"/"$pkgver"/crtbegin.o
-	amove usr/lib/gcc/"$CTARGET"/"$pkgver"/crtbeginS.o
-	amove usr/lib/gcc/"$CTARGET"/"$pkgver"/crtendS.o
-	amove usr/lib/gcc/"$CTARGET"/"$pkgver"/libgcc.a
 }

 libgomp() {
@@ -34,7 +34,7 @@ _pkgsnap="${pkgver##*_git}"
 [ "$CHOST" != "$CTARGET" ] && _target="-$CTARGET_ARCH" || _target=""

 pkgname=gcc-armhf
-pkgrel=6
+pkgrel=3
 pkgdesc="Stage2 cross-compiler for armhf"
 url="https://gcc.gnu.org"
 arch="aarch64 x86_64"
@@ -180,10 +180,7 @@ esac

 # libatomic is a dependency for openvswitch
 $_libatomic && subpackages="$subpackages libatomic::$CTARGET_ARCH"
-if $_libgcc; then
-	depends="$depends libgcc-static$_target"
-	subpackages="$subpackages libgcc::$CTARGET_ARCH libgcc-static$_target:libgccstatic:$CTARGET_ARCH"
-fi
+$_libgcc && subpackages="$subpackages libgcc::$CTARGET_ARCH"
 $_libquadmath && subpackages="$subpackages libquadmath::$CTARGET_ARCH"
 if $_libgomp; then
 	depends="$depends libgomp=$_gccrel"
@@ -636,20 +633,6 @@ libgcc() {
 	depends=

 	amove usr/lib/libgcc_s.so.*
-	# Symlink for Clang to find the library. Gets overwritten by the real
-	# library if gcc is installed.
-	ln -s /usr/lib/libgcc_s.so.1 \
-		"$subpkgdir"/usr/lib/libgcc_s.so
-}
-
-libgccstatic() {
-	pkgdesc="GNU C compiler runtime libraries"
-	depends=
-
-	amove usr/lib/gcc/"$CTARGET"/"$pkgver"/crtbegin.o
-	amove usr/lib/gcc/"$CTARGET"/"$pkgver"/crtbeginS.o
-	amove usr/lib/gcc/"$CTARGET"/"$pkgver"/crtendS.o
-	amove usr/lib/gcc/"$CTARGET"/"$pkgver"/libgcc.a
 }

 libgomp() {
@@ -34,7 +34,7 @@ _pkgsnap="${pkgver##*_git}"
 [ "$CHOST" != "$CTARGET" ] && _target="-$CTARGET_ARCH" || _target=""

 pkgname=gcc-armv7
-pkgrel=6
+pkgrel=3
 pkgdesc="Stage2 cross-compiler for armv7"
 url="https://gcc.gnu.org"
 arch="aarch64 x86_64"
@@ -180,10 +180,7 @@ esac

 # libatomic is a dependency for openvswitch
 $_libatomic && subpackages="$subpackages libatomic::$CTARGET_ARCH"
-if $_libgcc; then
-	depends="$depends libgcc-static$_target"
-	subpackages="$subpackages libgcc::$CTARGET_ARCH libgcc-static$_target:libgccstatic:$CTARGET_ARCH"
-fi
+$_libgcc && subpackages="$subpackages libgcc::$CTARGET_ARCH"
 $_libquadmath && subpackages="$subpackages libquadmath::$CTARGET_ARCH"
 if $_libgomp; then
 	depends="$depends libgomp=$_gccrel"
@@ -636,20 +633,6 @@ libgcc() {
 	depends=

 	amove usr/lib/libgcc_s.so.*
-	# Symlink for Clang to find the library. Gets overwritten by the real
-	# library if gcc is installed.
-	ln -s /usr/lib/libgcc_s.so.1 \
-		"$subpkgdir"/usr/lib/libgcc_s.so
-}
-
-libgccstatic() {
-	pkgdesc="GNU C compiler runtime libraries"
-	depends=
-
-	amove usr/lib/gcc/"$CTARGET"/"$pkgver"/crtbegin.o
-	amove usr/lib/gcc/"$CTARGET"/"$pkgver"/crtbeginS.o
-	amove usr/lib/gcc/"$CTARGET"/"$pkgver"/crtendS.o
-	amove usr/lib/gcc/"$CTARGET"/"$pkgver"/libgcc.a
 }

 libgomp() {
@@ -34,7 +34,7 @@ _pkgsnap="${pkgver##*_git}"
 [ "$CHOST" != "$CTARGET" ] && _target="-$CTARGET_ARCH" || _target=""

 pkgname=gcc-loongarch64
-pkgrel=6
+pkgrel=3
 pkgdesc="Stage2 cross-compiler for loongarch64"
 url="https://gcc.gnu.org"
 arch="aarch64 x86_64"
@@ -180,10 +180,7 @@ esac

 # libatomic is a dependency for openvswitch
 $_libatomic && subpackages="$subpackages libatomic::$CTARGET_ARCH"
-if $_libgcc; then
-	depends="$depends libgcc-static$_target"
-	subpackages="$subpackages libgcc::$CTARGET_ARCH libgcc-static$_target:libgccstatic:$CTARGET_ARCH"
-fi
+$_libgcc && subpackages="$subpackages libgcc::$CTARGET_ARCH"
 $_libquadmath && subpackages="$subpackages libquadmath::$CTARGET_ARCH"
 if $_libgomp; then
 	depends="$depends libgomp=$_gccrel"
@@ -636,20 +633,6 @@ libgcc() {
 	depends=

 	amove usr/lib/libgcc_s.so.*
-	# Symlink for Clang to find the library. Gets overwritten by the real
-	# library if gcc is installed.
-	ln -s /usr/lib/libgcc_s.so.1 \
-		"$subpkgdir"/usr/lib/libgcc_s.so
-}
-
-libgccstatic() {
-	pkgdesc="GNU C compiler runtime libraries"
-	depends=
-
-	amove usr/lib/gcc/"$CTARGET"/"$pkgver"/crtbegin.o
-	amove usr/lib/gcc/"$CTARGET"/"$pkgver"/crtbeginS.o
-	amove usr/lib/gcc/"$CTARGET"/"$pkgver"/crtendS.o
-	amove usr/lib/gcc/"$CTARGET"/"$pkgver"/libgcc.a
 }

 libgomp() {
@@ -34,7 +34,7 @@ _pkgsnap="${pkgver##*_git}"
 [ "$CHOST" != "$CTARGET" ] && _target="-$CTARGET_ARCH" || _target=""

 pkgname=gcc-ppc64le
-pkgrel=6
+pkgrel=3
 pkgdesc="Stage2 cross-compiler for ppc64le"
 url="https://gcc.gnu.org"
 arch="aarch64 x86_64"
@@ -180,10 +180,7 @@ esac

 # libatomic is a dependency for openvswitch
 $_libatomic && subpackages="$subpackages libatomic::$CTARGET_ARCH"
-if $_libgcc; then
-	depends="$depends libgcc-static$_target"
-	subpackages="$subpackages libgcc::$CTARGET_ARCH libgcc-static$_target:libgccstatic:$CTARGET_ARCH"
-fi
+$_libgcc && subpackages="$subpackages libgcc::$CTARGET_ARCH"
 $_libquadmath && subpackages="$subpackages libquadmath::$CTARGET_ARCH"
 if $_libgomp; then
 	depends="$depends libgomp=$_gccrel"
@@ -636,20 +633,6 @@ libgcc() {
 	depends=

 	amove usr/lib/libgcc_s.so.*
-	# Symlink for Clang to find the library. Gets overwritten by the real
-	# library if gcc is installed.
-	ln -s /usr/lib/libgcc_s.so.1 \
-		"$subpkgdir"/usr/lib/libgcc_s.so
-}
-
-libgccstatic() {
-	pkgdesc="GNU C compiler runtime libraries"
-	depends=
-
-	amove usr/lib/gcc/"$CTARGET"/"$pkgver"/crtbegin.o
-	amove usr/lib/gcc/"$CTARGET"/"$pkgver"/crtbeginS.o
-	amove usr/lib/gcc/"$CTARGET"/"$pkgver"/crtendS.o
-	amove usr/lib/gcc/"$CTARGET"/"$pkgver"/libgcc.a
 }

 libgomp() {
@@ -34,7 +34,7 @@ _pkgsnap="${pkgver##*_git}"
 [ "$CHOST" != "$CTARGET" ] && _target="-$CTARGET_ARCH" || _target=""

 pkgname=gcc-riscv64
-pkgrel=6
+pkgrel=3
 pkgdesc="Stage2 cross-compiler for riscv64"
 url="https://gcc.gnu.org"
 arch="aarch64 x86_64"
@@ -180,10 +180,7 @@ esac

 # libatomic is a dependency for openvswitch
 $_libatomic && subpackages="$subpackages libatomic::$CTARGET_ARCH"
-if $_libgcc; then
-	depends="$depends libgcc-static$_target"
-	subpackages="$subpackages libgcc::$CTARGET_ARCH libgcc-static$_target:libgccstatic:$CTARGET_ARCH"
-fi
+$_libgcc && subpackages="$subpackages libgcc::$CTARGET_ARCH"
 $_libquadmath && subpackages="$subpackages libquadmath::$CTARGET_ARCH"
 if $_libgomp; then
 	depends="$depends libgomp=$_gccrel"
@@ -636,20 +633,6 @@ libgcc() {
 	depends=

 	amove usr/lib/libgcc_s.so.*
-	# Symlink for Clang to find the library. Gets overwritten by the real
-	# library if gcc is installed.
-	ln -s /usr/lib/libgcc_s.so.1 \
-		"$subpkgdir"/usr/lib/libgcc_s.so
-}
-
-libgccstatic() {
-	pkgdesc="GNU C compiler runtime libraries"
-	depends=
-
-	amove usr/lib/gcc/"$CTARGET"/"$pkgver"/crtbegin.o
-	amove usr/lib/gcc/"$CTARGET"/"$pkgver"/crtbeginS.o
-	amove usr/lib/gcc/"$CTARGET"/"$pkgver"/crtendS.o
-	amove usr/lib/gcc/"$CTARGET"/"$pkgver"/libgcc.a
 }

 libgomp() {
@@ -34,7 +34,7 @@ _pkgsnap="${pkgver##*_git}"
 [ "$CHOST" != "$CTARGET" ] && _target="-$CTARGET_ARCH" || _target=""

 pkgname=gcc-x86
-pkgrel=6
+pkgrel=3
 pkgdesc="Stage2 cross-compiler for x86"
 url="https://gcc.gnu.org"
 arch="aarch64 x86_64"
@@ -180,10 +180,7 @@ esac

 # libatomic is a dependency for openvswitch
 $_libatomic && subpackages="$subpackages libatomic::$CTARGET_ARCH"
-if $_libgcc; then
-	depends="$depends libgcc-static$_target"
-	subpackages="$subpackages libgcc::$CTARGET_ARCH libgcc-static$_target:libgccstatic:$CTARGET_ARCH"
-fi
+$_libgcc && subpackages="$subpackages libgcc::$CTARGET_ARCH"
 $_libquadmath && subpackages="$subpackages libquadmath::$CTARGET_ARCH"
 if $_libgomp; then
 	depends="$depends libgomp=$_gccrel"
@@ -636,20 +633,6 @@ libgcc() {
 	depends=

 	amove usr/lib/libgcc_s.so.*
-	# Symlink for Clang to find the library. Gets overwritten by the real
-	# library if gcc is installed.
-	ln -s /usr/lib/libgcc_s.so.1 \
-		"$subpkgdir"/usr/lib/libgcc_s.so
-}
-
-libgccstatic() {
-	pkgdesc="GNU C compiler runtime libraries"
-	depends=
-
-	amove usr/lib/gcc/"$CTARGET"/"$pkgver"/crtbegin.o
-	amove usr/lib/gcc/"$CTARGET"/"$pkgver"/crtbeginS.o
-	amove usr/lib/gcc/"$CTARGET"/"$pkgver"/crtendS.o
-	amove usr/lib/gcc/"$CTARGET"/"$pkgver"/libgcc.a
 }

 libgomp() {
@@ -34,7 +34,7 @@ _pkgsnap="${pkgver##*_git}"
 [ "$CHOST" != "$CTARGET" ] && _target="-$CTARGET_ARCH" || _target=""

 pkgname=gcc-x86_64
-pkgrel=6
+pkgrel=3
 pkgdesc="Stage2 cross-compiler for x86_64"
 url="https://gcc.gnu.org"
 arch="aarch64"
@@ -179,10 +179,7 @@ esac

 # libatomic is a dependency for openvswitch
 $_libatomic && subpackages="$subpackages libatomic::$CTARGET_ARCH"
-if $_libgcc; then
-	depends="$depends libgcc-static$_target"
-	subpackages="$subpackages libgcc::$CTARGET_ARCH libgcc-static$_target:libgccstatic:$CTARGET_ARCH"
-fi
+$_libgcc && subpackages="$subpackages libgcc::$CTARGET_ARCH"
 $_libquadmath && subpackages="$subpackages libquadmath::$CTARGET_ARCH"
 if $_libgomp; then
 	depends="$depends libgomp=$_gccrel"
@@ -634,20 +631,6 @@ libgcc() {
 	depends=

 	amove usr/lib/libgcc_s.so.*
-	# Symlink for Clang to find the library. Gets overwritten by the real
-	# library if gcc is installed.
-	ln -s /usr/lib/libgcc_s.so.1 \
-		"$subpkgdir"/usr/lib/libgcc_s.so
-}
-
-libgccstatic() {
-	pkgdesc="GNU C compiler runtime libraries"
-	depends=
-
-	amove usr/lib/gcc/"$CTARGET"/"$pkgver"/crtbegin.o
-	amove usr/lib/gcc/"$CTARGET"/"$pkgver"/crtbeginS.o
-	amove usr/lib/gcc/"$CTARGET"/"$pkgver"/crtendS.o
-	amove usr/lib/gcc/"$CTARGET"/"$pkgver"/libgcc.a
 }

 libgomp() {
@@ -3,8 +3,8 @@

 maintainer=""
 pkgname=grub-efi-x86
-pkgver=2.14
-pkgrel=0
+pkgver=2.12
+pkgrel=9

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

 sha512sums="
-a092d829a6726702f7c21047c2b3bc27b5ef50ab928f60831a4107659a0ea0d670cc81e0d5b7ed047e06f990bffa9c032633b4f0b15a6920c9fcff37cd39e465  grub-efi-2.14-r0-x86-edge.apk
+ef8dd1fde9db54c71dd5024be62d09bf4f19dbdd2faf9772780373816050f23c594c6eefdc367f5b8cd93e97ae2f10dbd73cf7979377b72deb77acf8a3e37f71  grub-efi-2.12-r9-x86-edge.apk
 "
@@ -2,7 +2,7 @@
 maintainer=""
 pkgname=systemd-boot-x86
 _pkgname=systemd-boot  # for monitoring
-pkgver=260.2
+pkgver=260.1
 pkgrel=0
 pkgdesc="systemd's EFI boot manager for x86 EFI on x86_64."
 url="https://systemd.io/"
@@ -118,7 +118,7 @@ efistub() {
 }

 sha512sums="
-63d15da49e7580952a48a0b50df20c1b398e4b77edf259510b0cdb9022e919387baadf2190194a50f1f582b83e0768c13997a4189cf0fb6a61b65015496d9c80  systemd-260.2.tar.gz
+9f975dce6861853a817a7ceab18a24449a85d1bda6939b3a5173430c02a4d8a9a2b34ebb8cce1c51db9b0ff9078fcc65da7b0f44e3bdcbbe013b9e04bb6f0ff9  systemd-260.1.tar.gz
 8ecb5e25c0d8b01c406fa3084b0910d517cabbf12894958b4d3d77462cb0924f0a52fe2bf1aa39af29b16fd78fe080a6a99daa18015c6059fb2e52c971d83ba9  0001-meson-disable-libintl-check-if-pam-is-disabled.patch
 ad54e2c7e7a21bfa9b5f9e8db1b6af6a6d78a3e5dfe2dafcec77488f6224865ab4d4c8a8c8ee1c54c99d1741361e9fb3a51e5d36bcbc7a1c3fdcc4d0c1672132  cross-x86.meson
 "
@@ -1,34 +0,0 @@
-From c977b184350479b8c43a0e002eaf2b13b510ba4f Mon Sep 17 00:00:00 2001
-From: Michal Suchanek <msuchanek@suse.de>
-Date: Thu, 13 Oct 2022 22:39:51 +0200
-Subject: [PATCH] libfdt: Fix invalid version warning
-
-python does not like the u-boot- prefix in the version, drop it.
-
-/usr/lib/python3.10/site-packages/setuptools/dist.py:544: UserWarning:
-The version specified ('u-boot-2022.10') is an invalid version, this may
-not work as expected with newer versions of setuptools, pip, and PyPI.
-Please see PEP 440 for more details.
-
-Signed-off-by: Michal Suchanek <msuchanek@suse.de>
-Reviewed-by: Simon Glass <sjg@chromium.org>
-Link: https://github.com/u-boot/u-boot/commit/c977b184350479b8c43a0e002eaf2b13b510ba4f
-Note by ollieparanoid: this isn't just a warning anymore, but causes
-builds to fail with more recent python tooling.
---
- scripts/dtc/pylibfdt/Makefile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/scripts/dtc/pylibfdt/Makefile b/scripts/dtc/pylibfdt/Makefile
-index 493995e30384..a7579f0c5f67 100644
--- a/scripts/dtc/pylibfdt/Makefile
-+++ b/scripts/dtc/pylibfdt/Makefile
-@@ -17,7 +17,7 @@ quiet_cmd_pymod = PYMOD   $@
-       cmd_pymod = unset CROSS_COMPILE; unset CFLAGS; \
- 		CC="$(HOSTCC)" LDSHARED="$(HOSTCC) -shared " \
- 		LDFLAGS="$(HOSTLDFLAGS)" \
-		VERSION="u-boot-$(UBOOTVERSION)" \
-+		VERSION="$(UBOOTVERSION)" \
- 		CPPFLAGS="$(HOSTCFLAGS) -I$(LIBFDT_srcdir)" OBJDIR=$(obj) \
- 		SOURCES="$(PYLIBFDT_srcs)" \
- 		SWIG_OPTS="-I$(LIBFDT_srcdir) -I$(LIBFDT_srcdir)/.." \
@@ -1,55 +0,0 @@
-From 78a3943b752afa9321bd4d87626cf44b5fdeeb63 Mon Sep 17 00:00:00 2001
-From: Oliver Smith <ollieparanoid@postmarketos.org>
-Date: Sun, 31 May 2026 10:51:08 +0200
-Subject: [PATCH] python 3.13: binman: migrate from pkg_resources to importlib
-
-Fix for:
-    File "/home/pmos/build/src/uboot-imx-c4960dade272da9d6a7f53f6956d4d6747d573e9/tools/binman/control.py", line 11, in <module>
-      import pkg_resources
-  ModuleNotFoundError: No module named 'pkg_resources'
-
-Patch based on:
-https://github.com/u-boot/u-boot/commit/538719cb6a77934d069e0e64f264457a59a9ebfc
-
-Signed-off-by: Oliver Smith <ollieparanoid@postmarketos.org>
---
- tools/binman/control.py | 9 +++++----
- 1 file changed, 5 insertions(+), 4 deletions(-)
-
-diff --git a/tools/binman/control.py b/tools/binman/control.py
-index bfe63a1520..e77e433ae4 100644
--- a/tools/binman/control.py
-+++ b/tools/binman/control.py
-@@ -8,7 +8,7 @@
- from collections import OrderedDict
- import glob
- import os
-import pkg_resources
-+import importlib.resources as importlib_resources
- import re
- 
- import sys
-@@ -89,7 +89,7 @@ def _ReadMissingBlobHelp():
-             msg = ''
-         return tag, msg
- 
-    my_data = pkg_resources.resource_string(__name__, 'missing-blob-help')
-+    my_data = importlib_resources.files(__package__).joinpath('missing-blob-help').read_bytes()
-     re_tag = re.compile('^([-a-z0-9]+):$')
-     result = {}
-     tag = None
-@@ -136,8 +136,9 @@ def GetEntryModules(include_testing=True):
-     Returns:
-         Set of paths to entry class filenames
-     """
-    glob_list = pkg_resources.resource_listdir(__name__, 'etype')
-    glob_list = [fname for fname in glob_list if fname.endswith('.py')]
-+    entries = importlib_resources.files(__package__).joinpath('etype')
-+    glob_list = [entry.name for entry in entries.iterdir()
-+                 if entry.name.endswith('.py') and entry.is_file()]
-     return set([os.path.splitext(os.path.basename(item))[0]
-                 for item in glob_list
-                 if include_testing or '_testing' not in item])
-- 
-2.54.0
-
@@ -1,6 +1,5 @@
 # Archived: Downstream port, only for testing. Use mainline port (alcatel-idol347)!
 # Reference: <https://postmarketos.org/devicepkg>
-maintainer=""
 pkgname=device-alcatel-idol347-downstream
 pkgdesc="Alcatel OneTouch Idol 3 (4.7) (Downstream)"
 pkgver=5
@@ -1,6 +1,5 @@
 # Archived: Kernel does not build anymore
 # Reference: <https://postmarketos.org/devicepkg>
-maintainer=""
 pkgname=device-amazon-mantis
 pkgdesc="Amazon Fire TV Stick 4K"
 pkgver=4
@@ -1,7 +1,6 @@
 # Archived: Replaced by apple-idevice

 # Reference: <https://postmarketos.org/devicepkg>
-maintainer=""
 pkgname=device-apple-d22
 pkgdesc="Apple iPhone X (Global)"
 pkgver=3
@@ -1,7 +1,6 @@
 # Archived: Downstream port, only for testing. Use mainline port (asus-x00td)!
 # This kernel is mostly used for bringing up new features on mainline, thus unmaintained
 # Reference: <https://postmarketos.org/devicepkg>
-maintainer=""
 pkgname=device-asus-x00td-downstream
 pkgdesc="Asus Zenfone Max Pro M1 downstream"
 pkgver=4
@@ -1,6 +1,5 @@
 # Archived: Downstream port, only for testing. Use mainline port (bq-paella)!
 # Reference: <https://postmarketos.org/devicepkg>
-maintainer=""
 pkgname=device-bq-paella-downstream
 pkgdesc="BQ Aquaris X5 (Downstream)"
 pkgver=4
@@ -1,6 +1,5 @@
 # Archived: unmaintained port, only for testing. Use generic/mainline port (qcom-msm8916)
 # Reference: <https://postmarketos.org/devicepkg>
-maintainer=""
 pkgname=device-bq-piccolo
 pkgdesc="BQ Aquaris M5"
 pkgver=10
@@ -1,6 +1,5 @@
 # Archived: Kernel does not build anymore
 # Reference: <https://postmarketos.org/devicepkg>
-maintainer=""
 pkgname=device-bq-vegetahd
 pkgdesc="BQ Aquaris E5 HD"
 pkgver=4
@@ -1,6 +1,5 @@
 # Archived: Downstream port, only for testing. Use mainline port!
 # Reference: <https://postmarketos.org/devicepkg>
-maintainer=""
 pkgname=device-google-crosshatch-downstream
 pkgdesc="Google Pixel 3 XL (Downstream)"
 pkgver=4
@@ -1,6 +1,5 @@
 # Archived: Kernel does not build anymore
 # Reference: <https://postmarketos.org/devicepkg>
-maintainer=""
 pkgname=device-hisense-m470bsa
 pkgdesc="Hisense Sero 7 Pro"
 pkgver=4
@@ -1,6 +1,5 @@
 # Archived: Kernel does not build anymore
 # Reference: <https://postmarketos.org/devicepkg>
-maintainer=""
 pkgname=device-htc-a5ul
 pkgdesc="HTC Desire 816"
 pkgver=2
@@ -1,6 +1,5 @@
 # Archived: Kernel does not build anymore
 # Reference: <https://postmarketos.org/devicepkg>
-maintainer=""
 pkgname=device-htc-bravo
 pkgver=2
 pkgrel=0
@@ -1,6 +1,5 @@
 # Archived: Downstream port, only for testing. Use mainline port (htc-flounder)!
 # Reference: <https://postmarketos.org/devicepkg>
-maintainer=""
 pkgname=device-htc-flounder-downstream
 pkgdesc="Google Nexus 9"
 pkgver=4
@@ -1,6 +1,5 @@
 # Archived: Downstream port, only for testing. Use mainline port!
 # Reference: <https://postmarketos.org/devicepkg>
-maintainer=""
 pkgname=device-htc-m8-downstream
 pkgdesc="HTC One M8 (Downstream)"
 pkgver=3
@@ -1,6 +1,5 @@
 # Archived: Kernel does not build anymore
 # Reference: <https://postmarketos.org/devicepkg>
-maintainer=""
 pkgname=device-huawei-alice
 pkgdesc="Huawei P8 Lite"
 pkgver=5
@@ -1,6 +1,5 @@
 # Archived: Downstream port, only for testing. Use mainline port!
 # Reference: <https://postmarketos.org/devicepkg>
-maintainer=""
 pkgname=device-huawei-angler-downstream
 pkgver=4
 pkgrel=0
@@ -1,6 +1,5 @@
 # Archived: Downstream port, only for testing. Use mainline port (huawei-kiwi)!
 # Reference: <https://postmarketos.org/devicepkg>
-maintainer=""
 pkgname=device-huawei-kiwi-downstream
 pkgdesc="Huawei Honor 5X (Downstream)"
 pkgver=3
@@ -1,6 +1,5 @@
 # Archived: Kernel does not build anymore
 # Reference: <https://postmarketos.org/devicepkg>
-maintainer=""
 pkgname=device-klipad-rel
 pkgdesc="KLIPAD Klipad Tablet"
 pkgver=5
@@ -1,7 +1,6 @@
 # Archived: Downstream port, maybe useful for EPDC performance improvement
 # needs special userspace to show up anything
 # Reference: <https://postmarketos.org/devicepkg>
-maintainer=""
 pkgname=device-kobo-clara-downstream
 pkgdesc="Kobo Clara HD downstream"
 pkgver=2
@@ -1,6 +1,5 @@
 # Archived: unmaintained port, only for testing. Use generic/mainline port (qcom-msm8953)
 # Reference: <https://postmarketos.org/devicepkg>
-maintainer=""
 pkgname=device-lenovo-kuntao
 pkgdesc="Lenovo P2"
 pkgver=7
@@ -1,6 +1,5 @@
 # Archived: Downstream port, only for testing. Use mainline port!
 # Reference: <https://postmarketos.org/devicepkg>
-maintainer=""
 pkgname=device-lg-bullhead-downstream
 pkgdesc="Google Nexus 5X"
 pkgver=4
@@ -1,6 +1,5 @@
 # Archived: Kernel does not build anymore
 # Reference: <https://postmarketos.org/devicepkg>
-maintainer=""
 pkgname=device-lg-d802
 pkgdesc="LG G2"
 pkgver=5
@@ -1,6 +1,5 @@
 # Archived: Downstream port, only for testing. Use mainline port!
 # Reference: <https://postmarketos.org/devicepkg>
-maintainer=""
 pkgname=device-lg-h815-downstream
 pkgdesc="LG G4 (h815) (Downstream)"
 pkgver=3
@@ -1,6 +1,5 @@
 # Archived: Downstream port, only for testing. Use mainline port!
 # Reference: <https://postmarketos.org/devicepkg>
-maintainer=""
 pkgname=device-lg-mako-downstream
 pkgver=5
 pkgrel=0
@@ -1,6 +1,5 @@
 # Archived: Kernel does not build anymore
 # Reference: <https://postmarketos.org/devicepkg>
-maintainer=""
 pkgname=device-lg-mmh4x
 pkgdesc="LG K40 (AT&T)"
 pkgver=5
@@ -1,6 +1,5 @@
 # Archived: Kernel sources have disappeared, does not build anymore
 # Reference: <https://postmarketos.org/devicepkg>
-maintainer=""
 pkgname=device-meizu-mblu2
 pkgdesc="Meizu M2"
 pkgver=5
@@ -1,6 +1,5 @@
 # Archived: Kernel does not build anymore
 # Reference: <https://postmarketos.org/devicepkg>
-maintainer=""
 pkgname=device-mobvoi-skipjack
 pkgdesc="Mobvoi Ticwatch C2"
 pkgver=6
@@ -1,6 +1,5 @@
 # Archived: Downstream port, only for testing. Use mainline port!
 # Reference: <https://postmarketos.org/devicepkg>
-maintainer=""
 pkgname=device-motorola-falcon-downstream
 pkgdesc="Moto G (2013) (Downstream)"
 pkgver=4
@@ -1,6 +1,5 @@
 # Archived: Kernel does not build anymore
 # Reference: <https://postmarketos.org/devicepkg>
-maintainer=""
 pkgname=device-motorola-maserati
 pkgdesc="Motorola Motorola Droid 4"
 pkgver=3
@@ -1,6 +1,5 @@
 # Archived: Downstream port, only for testing. Use mainline port (motorola-ocean)!
 # Reference: <https://postmarketos.org/devicepkg>
-maintainer=""
 pkgname=device-motorola-ocean-downstream
 pkgdesc="Motorola Moto G7 Power"
 pkgver=4
@@ -1,6 +1,5 @@
 # Archived: Kernel does not build anymore
 # Reference: <https://postmarketos.org/devicepkg>
-maintainer=""
 pkgname=device-motorola-odessa
 pkgdesc="Motorola Moto G9 Plus"
 pkgver=5
@@ -1,6 +1,5 @@
 # Archived: Downstream port, only for testing. Use mainline port!
 # Reference: <https://postmarketos.org/devicepkg>
-maintainer=""
 pkgname=device-motorola-peregrine-downstream
 pkgdesc="Moto G 4G (2013) (Downstream)"
 pkgver=5
@@ -1,7 +1,6 @@
 # Archived: depends on petitboot-motorola-smi

 # Reference: <https://postmarketos.org/devicepkg>
-maintainer=""
 pkgname=device-motorola-smi
 pkgdesc="Motorola RAZR i"
 pkgver=4
@@ -1,6 +1,5 @@
 # Archived: Downstream port, only for testing. Use mainline port (qcom-msm89x7)!
 # Reference: <https://postmarketos.org/devicepkg>
-maintainer=""
 pkgname=device-nokia-panther-downstream
 pkgdesc="Nokia 4.2 (Downstream)"
 pkgver=5
@@ -1,6 +1,5 @@
 # Archived: Downstream port, only for testing. Use mainline port (oneplus-billie2)!
 # Reference: <https://postmarketos.org/devicepkg>
-maintainer=""
 pkgname=device-oneplus-billie2-downstream
 pkgdesc="OnePlus Nord N100 (Downstream)"
 pkgver=4
@@ -1,6 +1,5 @@
 # Archived: Downstream port, only for reference. Use mainline port (oneplus-cheeseburger)!
 # Reference: <https://postmarketos.org/devicepkg>
-maintainer=""
 pkgname=device-oneplus-cheeseburger-downstream
 pkgdesc="OnePlus 5 (Downstream)"
 pkgver=6
@@ -1,6 +1,5 @@
 # Archived: Downstream port, only for reference. Use mainline port (oneplus-dumpling)!
 # Reference: <https://postmarketos.org/devicepkg>
-maintainer=""
 pkgname=device-oneplus-dumpling-downstream
 pkgdesc="OnePlus 5T (Downstream)"
 pkgver=6
@@ -1,6 +1,5 @@
 # Archived: Downstream port, only for testing. Use mainline port!
 # Reference: <https://postmarketos.org/devicepkg>
-maintainer=""
 pkgname=device-oneplus-instantnoodlep-downstream
 pkgdesc="OnePlus 8 Pro (Downstream)"
 pkgver=4
@@ -1,6 +1,5 @@
 # Archived: Downstream port, only for testing. Use mainline port!
 # Reference: <https://postmarketos.org/devicepkg>
-maintainer=""
 pkgname=device-oneplus-kebab-downstream
 pkgdesc="OnePlus 8T (Downstream)"
 pkgver=4
@@ -1,6 +1,5 @@
 # Archived: Downstream port, only for testing. Use mainline port!
 # Reference: <https://postmarketos.org/devicepkg>
-maintainer=""
 pkgname=device-ouya-ouya-downstream
 pkgver=4
 pkgrel=0
@@ -1,6 +1,5 @@
 # Reference: <https://postmarketos.org/devicepkg>
 # Archived: Not actively maintained, hw is very rare/unlikely to be used by anyone, and port is outdated/broken
-maintainer=""
 pkgname=device-purism-librem5dev
 pkgdesc="Purism Librem 5 Devkit"
 pkgver=4
@@ -1,6 +1,5 @@
 # Archived: Kernel does not build anymore
 # Reference: <https://postmarketos.org/devicepkg>
-maintainer=""
 pkgname=device-samsung-a3y17lte
 pkgdesc="Samsung Galaxy A3 (2017)"
 pkgver=4
@@ -1,6 +1,5 @@
 # Archived: Downstream port, only for testing. Use mainline port (samsung-a5lte)!
 # Reference: <https://postmarketos.org/devicepkg>
-maintainer=""
 pkgname=device-samsung-a5lte-downstream
 pkgdesc="Samsung Galaxy A5 (SM-A500F)"
 pkgver=4
@@ -1,6 +1,5 @@
 # Archived: Downstream port, only for testing. Use mainline port (samsung-a5ulte)!
 # Reference: <https://postmarketos.org/devicepkg>
-maintainer=""
 pkgname=device-samsung-a5ulte-downstream
 pkgdesc="Samsung Galaxy A5 (SM-A500FU)"
 pkgver=4
@@ -1,6 +1,5 @@
 # Archived: Downstream port, only for testing. Use mainline port!
 # Reference: <https://postmarketos.org/devicepkg>
-maintainer=""
 pkgname=device-samsung-a6lte-downstream
 pkgdesc="Samsung Galaxy A6 2018 (Downstream)"
 pkgver=4
@@ -1,6 +1,5 @@
 # Archived: Kernel does not build anymore
 # Reference: <https://postmarketos.org/devicepkg>
-maintainer=""
 pkgname=device-samsung-arubaslim
 pkgdesc="Samsung Galaxy Core"
 pkgver=5
@@ -1,7 +1,6 @@
 # Archived: Downstream port, only for testing. Use mainline port (samsung-coreprimevelte)!
 # This kernel is used only for bringing up new features, thus archived
 # Reference: <https://postmarketos.org/devicepkg>
-maintainer=""
 pkgname=device-samsung-coreprimevelte-downstream
 pkgdesc="Samsung Galaxy Core Prime VE LTE downstream"
 pkgver=4
@@ -1,6 +1,5 @@
 # Archived: Kernel does not build anymore
 # Reference: <https://postmarketos.org/devicepkg>
-maintainer=""
 pkgname=device-samsung-crespo
 pkgdesc="Samsung Nexus S"
 pkgver=4
@@ -1,6 +1,5 @@
 # Archived: Downstream port, only for testing. Use mainline port (samsung-espresso10/samsung-espresso7)!
 # Reference: <https://postmarketos.org/devicepkg>
-maintainer=""
 pkgname=device-samsung-espresso10-downstream
 pkgdesc="Samsung Galaxy Tab 2 (10.1 inch)"
 pkgver=4
@@ -1,6 +1,5 @@
 # Archived: Downstream port
 # Reference: <https://postmarketos.org/devicepkg>
-maintainer=""
 pkgname=device-samsung-expressatt-downstream
 pkgdesc="Samsung Galaxy Express SGH-I437"
 pkgver=4
@@ -1,6 +1,5 @@
 # Archived: Downstream port, only for testing. Use mainline port!
 # Reference: <https://postmarketos.org/devicepkg>
-maintainer=""
 pkgname=device-samsung-golden-downstream
 pkgdesc="Samsung Galaxy S III mini (Downstream)"
 pkgver=2
@@ -1,6 +1,5 @@
 # Archived: Kernel does not build anymore
 # Reference: <https://postmarketos.org/devicepkg>
-maintainer=""
 pkgname=device-samsung-gtel3g
 pkgdesc="Samsung Galaxy Tab E 9.6"
 pkgver=3
@@ -1,6 +1,5 @@
 # Archived: Kernel does not build anymore
 # Reference: <https://postmarketos.org/devicepkg>
-maintainer=""
 pkgname=device-samsung-hero2lte
 pkgdesc="Samsung Galaxy S7 edge"
 pkgver=4
@@ -1,6 +1,5 @@
 # Archived: Downstream port, only for testing. Use mainline port!
 # Reference: <https://postmarketos.org/devicepkg>
-maintainer=""
 pkgname=device-samsung-i9100-downstream
 pkgver=2
 pkgrel=0
@@ -1,6 +1,5 @@
 # Archived: Kernel does not build anymore
 # Reference: <https://postmarketos.org/devicepkg>
-maintainer=""
 pkgname=device-samsung-i9100g
 pkgdesc="Samsung Galaxy SII (GT-I9100G)"
 pkgver=2
@@ -1,6 +1,5 @@
 # Reference: <https://postmarketos.org/devicepkg>
 # Archived: Downstream port, only for testing. Use mainline port (samsung-j6lte)!
-maintainer=""
 pkgname=device-samsung-j6lte-downstream
 pkgdesc="Samsung Galaxy J6 (2018)"
 pkgver=3
@@ -1,6 +1,5 @@
 # Archived: Downstream port, only for testing. Use mainline port (samsung-j7xelte)!
 # Reference: <https://postmarketos.org/devicepkg>
-maintainer=""
 pkgname=device-samsung-j7xelte-downstream
 pkgdesc="Samsung Galaxy J7 (2016)"
 pkgver=3
@@ -1,7 +1,6 @@
 # Archived: Downstream port, only for reference. Use mainline port (samsung-janice)!
 # Reference: <https://postmarketos.org/devicepkg>

-maintainer=""
 pkgname=device-samsung-janice-downstream
 pkgver=2
 pkgrel=0
@@ -1,6 +1,5 @@
 # Archived: Kernel does not build anymore
 # Reference: <https://postmarketos.org/devicepkg>
-maintainer=""
 pkgname=device-samsung-k3gxx
 pkgdesc="Samsung Galaxy S5 (International 3G)"
 pkgver=4
@@ -1,6 +1,5 @@
 # Archived: Kernel does not build anymore
 # Reference: <https://postmarketos.org/devicepkg>
-maintainer=""
 pkgname=device-samsung-kiran
 pkgdesc="Samsung Z1"
 pkgver=2
@@ -1,6 +1,5 @@
 # Archived: Downstream port, only for testing. Use mainline port (samsung-klte)!
 # Reference: <https://postmarketos.org/devicepkg>
-maintainer=""
 pkgname=device-samsung-klte-downstream
 pkgdesc="Samsung Galaxy S5 (SM-G900F)"
 pkgver=3
@@ -1,6 +1,5 @@
 # Archived: Kernel does not build anymore
 # Reference: <https://postmarketos.org/devicepkg>
-maintainer=""
 pkgname=device-samsung-kylessopen
 pkgdesc="Galaxy Trend"
 pkgver=4
@@ -1,6 +1,5 @@
 # Archived: Downstream port, only for testing. Use mainline port (samsung-lt01)!
 # Reference: <https://postmarketos.org/devicepkg>
-maintainer=""
 pkgname=device-samsung-lt01wifi-downstream
 pkgdesc="Samsung Galaxy Tab 3 8.0"
 pkgver=5
@@ -1,6 +1,5 @@
 # Archived: Downstream port, only for testing. Use mainline port (samsung-m0/samsung-m3)!
 # Reference: <https://postmarketos.org/devicepkg>
-maintainer=""
 pkgname=device-samsung-m0-downstream
 pkgdesc="Samsung Galaxy S III"
 pkgver=8
@@ -1,6 +1,5 @@
 # Archived: Downstream port, only for testing. Use mainline port!
 # Reference: <https://postmarketos.org/devicepkg>
-maintainer=""
 pkgname=device-samsung-matissewifi-downstream
 pkgdesc="Samsung Galaxy Tab 4 10.1 (Downstream)"
 pkgver=3
@@ -1,5 +1,4 @@
 # Archived: Downstream port, only for testing. Use mainline port!
-maintainer=""
 pkgname=device-samsung-ms013g-downstream
 pkgdesc="Samsung Galaxy Grand 2 (Downstream)"
 pkgver=4
@@ -1,6 +1,5 @@
 # Archived: Downstream port, replaced by mainline port.
 # Reference: <https://postmarketos.org/devicepkg>
-maintainer=""
 pkgname=device-samsung-n1awifi-downstream
 pkgdesc="Samsung Galaxy Note 10.1 (2014 edition)"
 pkgver=5
@@ -1,6 +1,5 @@
 # Archived: Downstream port, only for testing. Use mainline port (samsung-on7xelte)!
 # Reference: <https://postmarketos.org/devicepkg>
-maintainer=""
 pkgname=device-samsung-on7xelte-downstream
 pkgdesc="Samsung Galaxy J7 Prime"
 pkgver=4
@@ -1,6 +1,5 @@
 # Archived: Kernel does not build anymore
 # Reference: <https://postmarketos.org/devicepkg>
-maintainer=""
 pkgname=device-samsung-royss
 pkgdesc="Samsung Galaxy Young"
 pkgver=4
@@ -1,6 +1,5 @@
 # Archived: Kernel does not build anymore
 # Reference: <https://postmarketos.org/devicepkg>
-maintainer=""
 pkgname=device-samsung-s6500d
 pkgdesc="Samsung Galaxy Mini 2"
 pkgver=3
@@ -1,6 +1,5 @@
 # Archived: Kernel does not build anymore
 # Reference: <https://postmarketos.org/devicepkg>
-maintainer=""
 pkgname=device-samsung-superior
 pkgdesc="Samsung Galaxy Premier"
 pkgver=5