main/wcnss-wlan: move install= to global scope

Part-of: https://gitlab.postmarketos.org/postmarketOS/pmaports/-/merge_requests/7696
main/ttyescape: move install= to global scope
2026-01-13 22:29:56 -08:00 · 2026-01-13 22:29:56 -08:00 · 2026-01-13 22:29:56 -08:00 · 2026-01-13 22:29:55 -08:00 · 2026-01-13 22:29:55 -08:00 · 2026-01-13 22:29:55 -08:00
1101 changed files with 41997 additions and 13720 deletions
@@ -1,4 +1,4 @@
-image: alpine:latest
+image: registry.alpinelinux.org/img/alpine:latest
 stages:
  - build
  - hardware tests
@@ -129,8 +129,9 @@ prepare-{{ device.name }}:
  needs:
    - job: 'prepare-{{ device.name }}'
      artifacts: false
-      # NOTE: We can't wait for a particular job in the matrix until GitLab implements support for it:
-      # https://gitlab.com/gitlab-org/gitlab/-/issues/423553
+      parallel:
+        matrix:
+          - KERNEL_VARIANT: $[[ matrix.KERNEL_VARIANT ]]
  variables:
    CI_TRON__PMB_BUILD_JOB: "prepare-{{ device.name }}{% if device.has_kernel_variants %}: [$KERNEL_VARIANT]{% endif %}"
    CI_TRON_KERNEL_CMDLINE__DEVICEINFO: '{{ device.deviceinfo.kernel_cmdline }}'
@@ -0,0 +1 @@
+lib/build_changed_aports.sh
@@ -2,9 +2,6 @@
 # Copyright 2024 Oliver Smith
 # SPDX-License-Identifier: GPL-3.0-or-later

-import glob
-import tempfile
-import sys
 import subprocess

 # Same dir
@@ -7,18 +7,12 @@
 import configparser
 import os
 import subprocess
+from functools import cache


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


 def run_git(parameters, check=True, stderr=None):
@@ -51,6 +45,7 @@ def run_pmbootstrap(parameters):
    subprocess.run(cmd, universal_newlines=True, check=True)


+@cache
 def get_upstream_branch():
    """ Use pmaports.cfg from current branch (e.g. "v20.05_fix-ci") and
        channels.cfg from master to retrieve the upstream branch.
@@ -61,10 +56,6 @@ def get_upstream_branch():
    if target_branch := os.environ.get("CI_MERGE_REQUEST_TARGET_BRANCH_NAME"):
        return target_branch

-    global cache
-    if "upstream_branch" in cache:
-        return cache["upstream_branch"]
-
    # Get channel (e.g. "stable") from pmaports.cfg
    # https://postmarketos.org/pmaports.cfg
    pmaports_dir = get_pmaports_dir()
@@ -82,11 +73,10 @@ def get_upstream_branch():
        " This appears to be an old branch, consider recreating your change" \
        " on top of master."

-    ret = channels_cfg[channel]["branch_pmaports"]
-    cache["upstream_branch"] = ret
-    return ret
+    return channels_cfg[channel]["branch_pmaports"]


+@cache
 def get_base_commit() -> str:
    """Get the base commit that can be compared with HEAD to get all commits in the
    given branch/merge request."""
@@ -142,21 +142,12 @@ class Device:


 class ArchTagSet(set):
-    supported_arches = [
-        Arch.x86_64,
-        Arch.x86,
-        Arch.aarch64,
-        Arch.armv7,
-        Arch.armhf,
-        Arch.riscv64,
-        Arch.ppc64le,
-    ]
-
    def update(self, iterable):
+        supported_arches = Arch.supported_binary()
        # This ignores things like !armv7, that could be a follow-up optimization
        if 'noarch' in iterable or 'all' in iterable:
-            iterable = [arch for arch in self.supported_arches]
-        super().update([Arch(arch) for arch in iterable if Arch(arch) in self.supported_arches])
+            iterable = [arch for arch in supported_arches]
+        super().update([Arch(arch) for arch in iterable if Arch(arch) in supported_arches])


 if __name__ == "__main__":
@@ -233,6 +224,7 @@ if __name__ == "__main__":
                Arch.armhf: "qemu",
                Arch.riscv64: "qemu",
                Arch.ppc64le: "ppc64le",
+                Arch.loongarch64: "loongarch64",
            },
        )
        with open(child_pipeline, "w") as fw:
@@ -16,12 +16,12 @@ fi
 sh_files="
 	./main/mdss-fb-init-hack/mdss-fb-init-hack.sh
 	./main/postmarketos-base-ui/rootfs-usr-lib-NetworkManager-dispatcher.d-50-dns-filter.sh
-	./main/postmarketos-base-ui/rootfs-usr-lib-NetworkManager-dispatcher.d-50-tethering.sh
 	./main/postmarketos-installkernel/installkernel-pmos
 	./main/postmarketos-initramfs/init.sh
 	./main/postmarketos-initramfs/init_functions.sh
 	./main/postmarketos-mkinitfs-hook-netboot/netboot.sh
 	./main/postmarketos-ui-os-installer/rootfs-usr-bin-pmos_setup.sh
+	./main/postmarketos-usb-moded/rootfs-usr-lib-systemd-system-generators-umtprd-config-generator
 	./main/ttyescape/*.post-install
 	./main/unl0kr/unlock.sh
 	./device/community/soc-qcom/call_audio_idle_suspend_workaround.sh
@@ -27,6 +27,7 @@ def args(request):
    args.offline = False
    args.action = "init"
    args.cross = False
+    args.ccache = False
    args.log = None

    init_args(args)
@@ -14,7 +14,7 @@ def test_aports_ui():
    """
    pmaports_cfg = pmb.config.pmaports.read_config()
    for arch in pmaports_cfg["supported_arches"].split(","):
-        for path in common.get_changed_files():
+        for path in common.get_changed_files(removed=False):
            path = Path(path)

            if path.name != "APKBUILD":
@@ -5,10 +5,6 @@
 #
 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'
@@ -95,20 +91,6 @@ check_local_sources() {
 	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
-}
-
 cleanup() {
  [ -f "$_staged" ] && rm "$_staged"
 }
@@ -122,8 +104,4 @@ for apkbuild in $(changed_files '**/APKBUILD'); do
 	cleanup
 done

-for path in $(changed_files); do
-	check_file_size "$path"
-done
-
 trap - EXIT
@@ -27,7 +27,8 @@
 	Replace space inside `[ ]` with `x` to fill the checkbox
 -->
 * [ ] edge (`master` branch)
-* [ ] `v25.06`
+* [ ] `v25.12`
+* [ ] `v25.06` (supported until 2026-01-23)

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

@@ -1,3 +1,5 @@
 Casey Connolly <casey.connolly@linaro.org> <caleb.connolly@linaro.org>
 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>
@@ -9,13 +9,13 @@ branch_aports=master
 mirrordir_alpine=edge

 [v25.12]
-description=Upcoming stable release (DO NOT USE)
+description=Latest release / Recommended for best stability
 branch_pmaports=v25.12
-branch_aports=master
+branch_aports=3.23-stable
 mirrordir_alpine=v3.23

 [v25.06]
-description=Latest release / Recommended for best stability
+description=Old release (supported until 2026-01-23)
 branch_pmaports=v25.06
 branch_aports=3.22-stable
 mirrordir_alpine=v3.22
@@ -1,4 +1,3 @@
-# Maintainer: Oliver Smith <ollieparanoid@postmarketos.org>
 # https://docs.postmarketos.org/pmbootstrap/cross_compiling.html
 #
 # Wrapper for the "crossdirect" compilation method.
@@ -19,6 +18,7 @@
 # fakeroot, rpath). The rust version and redirect for archivers are implemented
 # as simple shell wrappers.

+maintainer="Oliver Smith <ollieparanoid@postmarketos.org>"
 pkgname=crossdirect
 pkgver=5.3.1
 pkgrel=1
@@ -0,0 +1,33 @@
+From abcc28985f5ab3b50c3ed85abee5e7f8bbd0889e Mon Sep 17 00:00:00 2001
+From: Oliver Smith <ollieparanoid@postmarketos.org>
+Date: Sun, 21 Dec 2025 17:04:26 +0100
+Subject: [PATCH] meson: disable libintl check if pam is disabled
+
+Disable the libintl check when building without the pam feature, so e.g.
+systemd-boot can be (cross) compiled without having the foreign arch
+libintl installed on a musl platform.
+---
+ meson.build | 5 ++---
+ 1 file changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index bcf1ff2df5..c7088f3d9c 100644
+--- a/meson.build
+++ b/meson.build
+@@ -1021,11 +1021,10 @@ libdl = cc.find_library('dl')
+ 
+ # On some distributions that use musl (e.g. Alpine), libintl.h may be provided by gettext rather than musl.
+ # In that case, we need to explicitly link with libintl.so.
+-if cc.has_function('dgettext',
+libintl = []
+if get_option('pam').enabled() and not cc.has_function('dgettext',
+                    prefix : '''#include <libintl.h>''',
+                    args : '-D_GNU_SOURCE')
+-        libintl = []
+-else
+         libintl = cc.find_library('intl')
+         if not cc.has_function('dgettext',
+                                prefix : '''#include <libintl.h>''',
+-- 
+2.52.0
+
@@ -1,149 +0,0 @@
-From 01ce16f1299237946cf07f54952b72e533e5c59b Mon Sep 17 00:00:00 2001
-From: Struan Robertson <contact@struan.tech>
-Date: Thu, 18 Sep 2025 15:32:35 +0100
-Subject: [PATCH] patch wchar_t for musl
-
---
- src/basic/stdio-util.h      |  2 +-
- src/boot/efi-string.c       | 10 +++++-----
- src/boot/efi.h              |  6 +++---
- src/boot/fuzz-efi-printf.c  |  2 +-
- src/boot/test-efi-string.c  |  2 +-
- src/test/test-format-util.c |  4 ++--
- 6 files changed, 13 insertions(+), 13 deletions(-)
-
-diff --git a/src/basic/stdio-util.h b/src/basic/stdio-util.h
-index 052087ce15..f9412e8be2 100644
--- a/src/basic/stdio-util.h
-+++ b/src/basic/stdio-util.h
-@@ -49,7 +49,7 @@ do {                                                                    \
-                         (void) va_arg(ap, long long int);               \
-                         break;                                          \
-                 case PA_WCHAR:                                          \
-                        (void) va_arg(ap, wchar_t);                     \
-+                        (void) va_arg(ap, uint16_t);                     \
-                         break;                                          \
-                 case PA_WSTRING:                                        \
-                 case PA_STRING:                                         \
-diff --git a/src/boot/efi-string.c b/src/boot/efi-string.c
-index 8e2c73d84d..08003fac5a 100644
--- a/src/boot/efi-string.c
-+++ b/src/boot/efi-string.c
-@@ -597,7 +597,7 @@ typedef struct {
-         bool have_field_width;
- 
-         const char *str;
-        const wchar_t *wstr;
-+        const uint16_t *wstr;
- 
-         /* For numbers. */
-         bool is_signed;
-@@ -658,7 +658,7 @@ static bool push_str(FormatContext *ctx, SpecifierContext *sp) {
-                 push_padding(ctx, ' ', sp->padded_len);
- 
-         /* In userspace unit tests we cannot just memcpy() the wide string. */
-        if (sp->wstr && sizeof(wchar_t) == sizeof(char16_t)) {
-+        if (sp->wstr && sizeof(uint16_t) == sizeof(char16_t)) {
-                 memcpy(ctx->buf + ctx->n, sp->wstr, sp->len * sizeof(*sp->wstr));
-                 ctx->n += sp->len;
-         } else {
-@@ -752,7 +752,7 @@ static bool handle_format_specifier(FormatContext *ctx, SpecifierContext *sp) {
-          * int in vararg functions, which is why we fetch only ints for any such types. The compiler would
-          * otherwise warn about fetching smaller types. */
-         assert_cc(sizeof(int) == 4);
-        assert_cc(sizeof(wchar_t) <= sizeof(int));
-+        assert_cc(sizeof(uint16_t) <= sizeof(int));
-         assert_cc(sizeof(long long) == sizeof(intmax_t));
- 
-         assert(ctx);
-@@ -847,13 +847,13 @@ static bool handle_format_specifier(FormatContext *ctx, SpecifierContext *sp) {
-                 return push_str(ctx, sp);
- 
-         case 'c':
-                sp->wstr = &(wchar_t){ va_arg(ctx->ap, int) };
-+                sp->wstr = &(uint16_t){ va_arg(ctx->ap, int) };
-                 sp->len = 1;
-                 return push_str(ctx, sp);
- 
-         case 's':
-                 if (sp->long_arg) {
-                        sp->wstr = va_arg(ctx->ap, const wchar_t *) ?: L"(null)";
-+                        sp->wstr = va_arg(ctx->ap, const uint16_t *) ?: L"(null)";
-                         sp->len = wcsnlen(sp->wstr, sp->len);
-                 } else {
-                         sp->str = va_arg(ctx->ap, const char *) ?: "(null)";
-diff --git a/src/boot/efi.h b/src/boot/efi.h
-index 1832df980c..4e6a2f7288 100644
--- a/src/boot/efi.h
-+++ b/src/boot/efi.h
-@@ -16,7 +16,7 @@
- 
- #if SD_BOOT
- /* uchar.h/wchar.h are not suitable for freestanding environments. */
-typedef __WCHAR_TYPE__ wchar_t;
-+typedef __WCHAR_TYPE__ uint16_t;
- typedef __CHAR16_TYPE__ char16_t;
- typedef __CHAR32_TYPE__ char32_t;
- 
-@@ -28,7 +28,7 @@ assert_cc(sizeof(uint8_t) == 1);
- assert_cc(sizeof(uint16_t) == 2);
- assert_cc(sizeof(uint32_t) == 4);
- assert_cc(sizeof(uint64_t) == 8);
-assert_cc(sizeof(wchar_t) == 2);
-+assert_cc(sizeof(uint16_t) == 2);
- assert_cc(sizeof(char16_t) == 2);
- assert_cc(sizeof(char32_t) == 4);
- assert_cc(sizeof(size_t) == sizeof(void *));
-@@ -38,7 +38,7 @@ assert_cc(alignof(uint8_t) == 1);
- assert_cc(alignof(uint16_t) == 2);
- assert_cc(alignof(uint32_t) == 4);
- assert_cc(alignof(uint64_t) == 8);
-assert_cc(alignof(wchar_t) == 2);
-+assert_cc(alignof(uint16_t) == 2);
- assert_cc(alignof(char16_t) == 2);
- assert_cc(alignof(char32_t) == 4);
- 
-diff --git a/src/boot/fuzz-efi-printf.c b/src/boot/fuzz-efi-printf.c
-index 2857b389a2..ec2a45568f 100644
--- a/src/boot/fuzz-efi-printf.c
-+++ b/src/boot/fuzz-efi-printf.c
-@@ -44,7 +44,7 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
-         fuzz_setup_logging();
- 
-         PRINTF_ONE(i->status, "%*.*s", i->field_width, (int) len, i->str);
-        PRINTF_ONE(i->status, "%*.*ls", i->field_width, (int) (len / sizeof(wchar_t)), (const wchar_t *) i->str);
-+        PRINTF_ONE(i->status, "%*.*ls", i->field_width, (int) (len / sizeof(uint16_t)), (const uint16_t *) i->str);
- 
-         PRINTF_ONE(i->status, "%% %*.*m", i->field_width, i->precision);
-         PRINTF_ONE(i->status, "%*p", i->field_width, i->ptr);
-diff --git a/src/boot/test-efi-string.c b/src/boot/test-efi-string.c
-index e0d3bd9b71..52c65d753d 100644
--- a/src/boot/test-efi-string.c
-+++ b/src/boot/test-efi-string.c
-@@ -705,7 +705,7 @@ TEST(xvasprintf_status) {
-         test_printf_one("%-14ls %-10.0ls %-10.3ls", L"left", L"", L"chopped");
- 
-         test_printf_one("%.6s", (char[]){ 'n', 'o', ' ', 'n', 'u', 'l' });
-        test_printf_one("%.6ls", (wchar_t[]){ 'n', 'o', ' ', 'n', 'u', 'l' });
-+        test_printf_one("%.6ls", (uint16_t[]){ 'n', 'o', ' ', 'n', 'u', 'l' });
- 
-         test_printf_one("%u %u %u", 0U, 42U, 1234567890U);
-         test_printf_one("%i %i %i", 0, -42, -1234567890);
-diff --git a/src/test/test-format-util.c b/src/test/test-format-util.c
-index 0a95837dbe..d07333a5d1 100644
--- a/src/test/test-format-util.c
-+++ b/src/test/test-format-util.c
-@@ -18,8 +18,8 @@ assert_cc(STRLEN(U"") == 0);
- assert_cc(STRLEN(U"a") == sizeof(char32_t));
- assert_cc(STRLEN(U"123") == 3 * sizeof(char32_t));
- assert_cc(STRLEN(L"") == 0);
-assert_cc(STRLEN(L"a") == sizeof(wchar_t));
-assert_cc(STRLEN(L"123") == 3 * sizeof(wchar_t));
-+assert_cc(STRLEN(L"a") == sizeof(uint16_t));
-+assert_cc(STRLEN(L"123") == 3 * sizeof(uint16_t));
- assert_cc(DECIMAL_STR_MAX(uint8_t) == STRLEN("255")+1);
- assert_cc(DECIMAL_STR_MAX(int8_t) == STRLEN("-127")+1);
- assert_cc(DECIMAL_STR_MAX(uint64_t) == STRLEN("18446744073709551615")+1);
-- 
-2.51.0
-
@@ -1,61 +0,0 @@
-From 9047f8b2a7374d95e8261f15941d07b6e4def3fe Mon Sep 17 00:00:00 2001
-From: Clayton Craft <clayton@craftyguy.net>
-Date: Tue, 7 Jan 2025 20:19:51 -0800
-Subject: [PATCH] (pmOS cross/systemd-boot-x86 specific): meson: minimal
- configure for building systemd-boot
-
-Notes:
-    - toggling all ENABLED_* things off saves a ton of configure
-      time
-    - Removing capability.h, so that cross compiling doesn't fail
-      because that header isn't installed
-    - Set libcap to required=false, they aren't needed for building the
-      bootloader, and they complicate cross compilation
-
-IMPORTANT: some of these dependencies don't exist for the target arch
-(x86) and since they aren't actually required by sd-boot it's easier
-to just disable/remove them from meson.build!!!
---
- meson.build | 12 ++++++++++--
- 1 file changed, 10 insertions(+), 2 deletions(-)
-
-diff --git a/meson.build b/meson.build
-index 238b935372..8449eb8ecd 100644
--- a/meson.build
-+++ b/meson.build
-@@ -688,7 +688,6 @@ conf.set('GPERF_LEN_TYPE', gperf_len_type,
- 
- foreach header : [
-         'crypt.h',
-        'sys/capability.h',
- ]
- 
-         if not cc.has_header(header)
-@@ -997,7 +996,7 @@ threads = dependency('threads')
- librt = cc.find_library('rt')
- libm = cc.find_library('m')
- libdl = cc.find_library('dl')
-libcap = dependency('libcap')
-+libcap = dependency('libcap', required : false)
- 
- # On some architectures, libatomic is required. But on some installations,
- # it is found, but actual linking fails. So let's try to use it opportunistically.
-@@ -1886,6 +1885,15 @@ pefile = pymod.find_installation('python3', required: false, modules : ['pefile'
- want_ukify = get_option('ukify').require(python_39 and (want_tests != 'true' or pefile.found()), error_message : 'Python >= 3.9 and pefile required').allowed()
- conf.set10('ENABLE_UKIFY', want_ukify)
- 
-+foreach key : conf.keys()
-+        if key.startswith('ENABLE_')
-+                conf.set10(key, false)
-+        endif
-+endforeach
-+
-+conf.set10('ENABLE_EFI', true)
-+conf.set10('ENABLE_BOOTLOADER', true)
-+
- #####################################################################
- 
- check_efi_alignment_py = files('tools/check-efi-alignment.py')
-- 
-2.51.0
-
@@ -2,12 +2,11 @@

 pkgname=systemd-boot-x86
 _pkgname=systemd-boot  # for monitoring
-pkgver=258.2
+pkgver=259
 pkgrel=0
 pkgdesc="systemd's EFI boot manager for x86 EFI on x86_64."
 url="https://systemd.io/"
-# riscv64: I have no way to test this currently
-arch="x86_64"
+arch="x86_64" # x86 32-bit only makes sense on x86 64-bit
 license="LGPL-2.1-or-later"
 makedepends="
 	bash
@@ -23,8 +22,7 @@ makedepends="
 "
 source="
 	systemd-$pkgver.tar.gz::https://github.com/systemd/systemd/archive/refs/tags/v$pkgver.tar.gz
-	0001-patch-wchar_t-for-musl.patch
-	0002-meson-minimal-configure-for-building-systemd-boot.patch
+	0001-meson-disable-libintl-check-if-pam-is-disabled.patch
 	cross-x86.meson
 	"
 # check: no tests
@@ -37,6 +35,7 @@ builddir="$srcdir/systemd-$pkgver"

 build() {
 	abuild-meson  \
+		-Dlibc="musl" \
 		-Dsbat-distro="alpine" \
 		-Dsbat-distro-summary="Alpine Linux" \
 		-Dsbat-distro-pkgname="$pkgname" \
@@ -119,8 +118,7 @@ efistub() {
 }

 sha512sums="
-1dc016a5a037aec2682e08d2add0dcf8d03db15b45ce8c6b677898f734aefd4694ce18e588d579e42514071fc4c167b2bf53808478b2bd3856b257c9fbcde45d  systemd-258.2.tar.gz
-9ff8da74fa51b0ededaf6cf7b80b03f433c8617db39eb5cde01477031fa00724b8b7bdf68c945c277510f81e7fbbf3b2732f2c781b0f6ce67569b2737581595b  0001-patch-wchar_t-for-musl.patch
-5cffc18f3eaaab1b6cc8f7191afed628036b9e794ca7f9fe0a7eb4653862f8cd2b43f18483916b52cdca4ddb17b8baae5baa212aa152b1ae8f2b31d57d6e1f45  0002-meson-minimal-configure-for-building-systemd-boot.patch
+ef46b13661df43e3cfbeee1bc22f0b1eb902e8ebe39c19868c465efd08b35a199c2a2cd9d8021a6bc4d692fa0c6e0eab3f13eecd6ce24dde81d3945464a25b50  systemd-259.tar.gz
+8ecb5e25c0d8b01c406fa3084b0910d517cabbf12894958b4d3d77462cb0924f0a52fe2bf1aa39af29b16fd78fe080a6a99daa18015c6059fb2e52c971d83ba9  0001-meson-disable-libintl-check-if-pam-is-disabled.patch
 ad54e2c7e7a21bfa9b5f9e8db1b6af6a6d78a3e5dfe2dafcec77488f6224865ab4d4c8a8c8ee1c54c99d1741361e9fb3a51e5d36bcbc7a1c3fdcc4d0c1672132  cross-x86.meson
 "
@@ -1,6 +1,6 @@
 # Archived: Kernel sources have disappeared, does not build anymore
-# Maintainer: Hadi Charara <hadicharara@ymail.com>
 # Reference: <https://postmarketos.org/devicepkg>
+maintainer="Hadi Charara <hadicharara@ymail.com>"
 pkgname=device-amazon-suez
 pkgdesc="Amazon Fire HD 10"
 pkgver=2
@@ -1,7 +1,7 @@
 # Archived: Replaced by apple-idevice

-# Maintainer: Jonas Heinrich <onny@project-insanity.org>
 # Reference: <https://postmarketos.org/devicepkg>
+maintainer="Jonas Heinrich <onny@project-insanity.org>"
 pkgname=device-apple-iphone7
 pkgdesc="Apple iPhone 7"
 pkgver=2
@@ -1,7 +1,7 @@
 # Archived: Replaced by apple-idevice

 # Reference: <https://postmarketos.org/devicepkg>
-# Maintainer: Aster Boese <asterboese@mailbox.org>
+maintainer="Aster Boese <asterboese@mailbox.org>"
 pkgname=device-apple-n61
 pkgdesc="Apple iPhone 6"
 pkgver=3
@@ -1,6 +1,6 @@
 # Archived: Downstream port, only for testing. Use mainline port!
 # Reference: <https://postmarketos.org/devicepkg>
-# Maintainer: Luca Weiss <luca@lucaweiss.eu>
+maintainer="Luca Weiss <luca@lucaweiss.eu>"
 pkgname=device-asus-sparrow-downstream
 pkgdesc="ASUS ZenWatch 2 (Downstream)"
 pkgver=2
@@ -1,7 +1,7 @@
 # Archived: Kernel doesn't build anymore
 #
-# Maintainer: Achill Gilgenast <achill@achill.org>
 # Reference: <https://postmarketos.org/devicepkg>
+maintainer="Achill Gilgenast <achill@achill.org>"
 pkgname=device-bq-tenshi
 pkgdesc="BQ Aquaris U Plus"
 pkgver=2
@@ -1,6 +1,6 @@
 # Archived: linux-radxa-dev packages x86_64 binaries in aarch64 package which makes akms part of this device fail when built on aarch64
 # Reference: <https://postmarketos.org/devicepkg>
-# Maintainer: Antoine Martin (ayakael) <dev@ayakael.net>
+maintainer="Antoine Martin (ayakael) <dev@ayakael.net>"
 pkgname=device-clockworkpi-uconsole-radxa-cm5
 pkgdesc="Clockwork Tech ClockworkPi uConsole Radxa CM5"
 pkgver=5
@@ -1,6 +1,6 @@
 # Archived: Downstream port, only for testing. Use mainline port!
 # Reference: <https://postmarketos.org/devicepkg>
-# Maintainer: Luca Weiss <luca@lucaweiss.eu>
+maintainer="Luca Weiss <luca@lucaweiss.eu>"
 pkgname=device-fairphone-fp2-downstream
 pkgdesc="Fairphone 2 (Downstream)"
 pkgver=2
@@ -1,6 +1,6 @@
 # Archived: Kernel does not build anymore
-# Maintainer: Max Buchholz <2maxax2@gmx.de>
 # Reference: <https://postmarketos.org/devicepkg>
+maintainer="Max Buchholz <2maxax2@gmx.de>"
 pkgname=device-htc-enrc2b
 pkgdesc="HTC One X+"
 pkgver=2
@@ -1,6 +1,6 @@
 # Archived: Downstream port, only for testing. Use mainline port!
 # Reference: <https://postmarketos.org/devicepkg>
-# Maintainer: Luca Weiss <luca@lucaweiss.eu>
+maintainer="Luca Weiss <luca@lucaweiss.eu>"
 pkgname=device-htc-memul-downstream
 pkgdesc="HTC One Mini 2 (Downstream)"
 pkgver=2
@@ -1,6 +1,6 @@
 # Archived: Kernel does not build anymore
 # Reference: <https://postmarketos.org/devicepkg>
-# Maintainer: gtrxAC <gtrxac2@gmail.com>
+maintainer="gtrxAC <gtrxac2@gmail.com>"
 pkgname=device-huawei-plank
 pkgdesc="Huawei Honor 7"
 pkgver=3
@@ -1,6 +1,6 @@
 # Archived: Downstream port, only for testing. Use mainline port!
 # Reference: <https://postmarketos.org/devicepkg>
-# Maintainer: Luca Weiss <luca@lucaweiss.eu>
+maintainer="Luca Weiss <luca@lucaweiss.eu>"
 pkgname=device-huawei-sturgeon-downstream
 pkgdesc="Huawei Watch"
 pkgver=2
@@ -1,6 +1,6 @@
 # Archived: Downstream port, only for testing. Use mainline port!
 # Reference: <https://postmarketos.org/devicepkg>
-# Maintainer: Luca Weiss <luca@lucaweiss.eu>
+maintainer="Luca Weiss <luca@lucaweiss.eu>"
 pkgname=device-lg-lenok-downstream
 pkgdesc="LG G Watch R (Downstream)"
 pkgver=2
@@ -1,7 +1,6 @@
 # Archived: Kernel does not build anymore
 # Reference: <https://postmarketos.org/devicepkg>
-# Maintainer: Uclydde <julianbraha@gmail.com>
-
+maintainer="Uclydde <julianbraha@gmail.com>"
 pkgname=device-lg-us996
 pkgdesc="LG V20"
 pkgver=3
@@ -1,6 +1,6 @@
 # Archived: Kernel does not build anymore
-# Maintainer: ky0ko <ky0ko@disroot.org>
 # Reference: <https://postmarketos.org/devicepkg>
+maintainer="ky0ko <ky0ko@disroot.org>"
 pkgname=device-motorola-def
 pkgdesc="Motorola Moto One Hyper"
 pkgver=2
@@ -1,3 +1,5 @@
+# Archived: depends on petitboot-motorola-smi
+
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-motorola-smi
 pkgdesc="Motorola RAZR i"
@@ -1,6 +1,6 @@
 # Archived: Kernel does not build anymore
 # Reference: <https://postmarketos.org/devicepkg>
-# Maintainer: Piotr Halama <skrzynka@halamix2.pl>
+maintainer="Piotr Halama <skrzynka@halamix2.pl>"
 pkgname=device-nokia-frt
 pkgdesc="Nokia 1"
 pkgver=2
@@ -1,6 +1,6 @@
 # Archived: Downstream port, only for testing. Use mainline port!
 # Reference: <https://postmarketos.org/devicepkg>
-# Maintainer: Luca Weiss <luca@lucaweiss.eu>
+maintainer="Luca Weiss <luca@lucaweiss.eu>"
 pkgname=device-oneplus-bacon-downstream
 pkgver=2
 pkgrel=0
@@ -1,6 +1,6 @@
 # Archived: Downstream port, only for testing. Use mainline port!
-# Maintainer: Henrik Grimler <henrik@grimler.se>
 # Reference: <https://postmarketos.org/devicepkg>
+maintainer="Henrik Grimler <henrik@grimler.se>"
 pkgname=device-samsung-chagallwifi-downstream
 pkgdesc="Samsung Galaxy Tab S 10.5 (Downstream)"
 pkgver=2
@@ -1,6 +1,6 @@
 # Archived: Kernel does not build anymore
 # Reference: <https://postmarketos.org/devicepkg>
-# Maintainer: omame <me@omame.xyz>
+maintainer="omame <me@omame.xyz>"
 pkgname=device-samsung-j6primelte
 pkgdesc="Samsung Galaxy J6+"
 pkgver=4
@@ -1,13 +1,14 @@
+# Archived: Downstream port, only for testing. Use mainline port (samsung-j7xelte)!
 # Reference: <https://postmarketos.org/devicepkg>
-pkgname=device-samsung-jxelte
-pkgdesc="Samsung Galaxy J7(2016)"
+pkgname=device-samsung-j7xelte-downstream
+pkgdesc="Samsung Galaxy J7 (2016)"
 pkgver=3
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
 options="!check !archcheck"
-depends="postmarketos-base postmarketos-base-downstream linux-samsung-jxelte mkbootimg msm-fb-refresher"
+depends="postmarketos-base postmarketos-base-downstream linux-samsung-j7xelte mkbootimg msm-fb-refresher"
 makedepends="devicepkg-dev"
 source="deviceinfo"
 subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
@@ -22,10 +23,10 @@ package() {

 nonfree_firmware() {
 	pkgdesc="Wifi firmware"
-	depends="firmware-samsung-jxelte"
+	depends="firmware-samsung-j7xelte"
 	mkdir "$subpkgdir"
 }

 sha512sums="
-f74d1d2ea51a0fc3778548700f401132b3351d1437ca48cefcc766bbfa77d619f86dd91b9859bc2600d4b6932aeb9185d916c1398b890d88b66175d7c4d05871  deviceinfo
+89a963f139b027affcbb39424be3c205ce352fa1242c34c07de185ff96591b3a2922bfdf57f9bdf4128eb4e08100c2e5dfc9cb86caebe726ad5b727a2bfe5dd1  deviceinfo
 "
@@ -3,9 +3,9 @@
 # scripts.

 deviceinfo_format_version="0"
-deviceinfo_name="Samsung Galaxy J7(2016)"
+deviceinfo_name="Samsung Galaxy J7 (2016)"
 deviceinfo_manufacturer="Samsung"
-deviceinfo_codename="samsung-jxelte"
+deviceinfo_codename="samsung-j7xelte-downstream"
 deviceinfo_year="2016"
 deviceinfo_arch="aarch64"

@@ -17,7 +17,6 @@ deviceinfo_screen_height="1280"

 # Bootloader related
 deviceinfo_flash_method="heimdall-bootimg"
-deviceinfo_kernel_cmdline="androidboot.selinux=permissive androidboot.selinux=permissive"
 deviceinfo_generate_bootimg="true"
 deviceinfo_bootimg_qcdt="true"
 deviceinfo_flash_offset_kernel="0x00008000"
@@ -26,4 +25,6 @@ deviceinfo_flash_offset_second="0x00f00000"
 deviceinfo_flash_offset_tags="0x00000100"
 deviceinfo_flash_pagesize="2048"
 deviceinfo_flash_heimdall_partition_kernel="BOOT"
+deviceinfo_flash_heimdall_partition_rootfs="USERDATA"
 deviceinfo_flash_sparse="true"
+deviceinfo_flash_sparse_samsung_format="1"
@@ -1,6 +1,6 @@
 # Archived: Kernel does not build anymore
 # Reference: <https://postmarketos.org/devicepkg>
-# Maintainer: Eray Tutmaz <tarkanttmz261@gmail.com>
+maintainer="Eray Tutmaz <tarkanttmz261@gmail.com>"
 pkgname=device-samsung-j7y17lte
 pkgdesc="Samsung Galaxy J7 2017"
 pkgver=4
@@ -1,6 +1,6 @@
 # Archived: Downstream port, only for testing. Use mainline port!
-# Maintainer: Henrik Grimler <henrik@grimler.se>
 # Reference: <https://postmarketos.org/devicepkg>
+maintainer="Henrik Grimler <henrik@grimler.se>"
 pkgname=device-samsung-klimtlte-downstream
 pkgdesc="Samsung Galaxy Tab S 8.4 LTE (Downstream)"
 pkgver=6
@@ -1,6 +1,6 @@
 # Archived: Downstream port, only for testing. Use mainline port!
-# Maintainer: Hendrik Noack <hendrik.noack@protonmail.com>
 # Reference: <https://postmarketos.org/devicepkg>
+maintainer="Hendrik Noack <hendrik.noack@protonmail.com>"
 pkgname=device-samsung-n2awifi-downstream
 pkgdesc="Samsung Galaxy Tab Pro 10.1 WiFi"
 pkgver=2
@@ -1,6 +1,6 @@
 # Archived: Kernel does not build anymore
-# Maintainer: Théo Friberg <fsmnarmosta@posteo.net>
 # Reference: <https://postmarketos.org/devicepkg>
+maintainer="Théo Friberg <fsmnarmosta@posteo.net>"
 pkgname=device-samsung-nevisp
 pkgdesc="Samsung Galaxy Fame GT-S6810P"
 pkgver=4
@@ -1,6 +1,6 @@
 # Archived: Downstream port, only for testing. Use mainline port!
-# Maintainer: Hendrik Noack <hendrik.noack@protonmail.com>
 # Reference: <https://postmarketos.org/devicepkg>
+maintainer="Hendrik Noack <hendrik.noack@protonmail.com>"
 pkgname=device-samsung-v1awifi-downstream
 pkgdesc="Samsung Galaxy Note Pro 12.2 WiFi (Downstream)"
 pkgver=2
@@ -1,6 +1,6 @@
 # Archived: Downstream port, only for testing. Use mainline port!
 # Reference: <https://postmarketos.org/devicepkg>
-# Maintainer: Luca Weiss <luca@lucaweiss.eu>
+maintainer="Luca Weiss <luca@lucaweiss.eu>"
 pkgname=device-sony-leo-downstream
 pkgdesc="Sony Xperia Z3 (Downstream)"
 pkgver=2
@@ -1,6 +1,6 @@
 # Archived: Downstream port, only for testing. Use mainline port!
 # Reference: <https://postmarketos.org/devicepkg>
-# Maintainer:
+maintainer=""
 pkgname=device-volla-mimameid-downstream
 pkgdesc="Volla Phone 22 (Downstream)"
 pkgver=2
@@ -1,6 +1,6 @@
 # Archived: Kernel does not build anymore
-# Maintainer: Fedorov Bohdan <misterjdr@yandex.ru>
 # Reference: <https://postmarketos.org/devicepkg>
+maintainer="Fedorov Bohdan <misterjdr@yandex.ru>"
 pkgname=device-xiaomi-cactus
 pkgdesc="Xiaomi Redmi 6A"
 pkgver=2
@@ -1,6 +1,6 @@
 # Archived: Kernel does not build anymore
-# Maintainer: Eli Riggs <eli@rje.li>
 # Reference: <https://postmarketos.org/devicepkg>
+maintainer="Eli Riggs <eli@rje.li>"
 pkgname=device-xiaomi-willow
 pkgdesc="Xiaomi Redmi Note 8T"
 pkgver=2
@@ -1,5 +1,5 @@
 # Archived: Kernel does not build anymore
-# Maintainer: ky0ko <ky0ko@disroot.org>
+maintainer="ky0ko <ky0ko@disroot.org>"
 pkgname=firmware-motorola-def
 pkgver=1
 pkgrel=1
@@ -1,5 +1,5 @@
 # Archived: Kernel does not build anymore
-# Maintainer: omame <me@omame.xyz>
+maintainer="omame <me@omame.xyz>"
 pkgname=firmware-samsung-j6primelte
 pkgver=0.1
 pkgrel=1
@@ -1,7 +1,8 @@
-pkgname=firmware-samsung-jxelte
+# Archived: Downstream port, only for testing. Use mainline port (samsung-j7xelte)!
+pkgname=firmware-samsung-j7xelte-downstream
 pkgver=1
-pkgrel=1
-pkgdesc="Samsung Galaxy J7 2016 Firmware"
+pkgrel=0
+pkgdesc="Samsung Galaxy J7 (2016) Firmware"
 url="https://gitlab.com/android_samsung_universal7870"
 arch="aarch64"
 license="proprietary"
@@ -33,7 +34,7 @@ package() {

 }
 sha512sums="
-3a70de63fc0a842306fc05f66f75ac2fcf7b7726b1a195cf6746c49bb0b563e994c46f6f02c4ad3e3a14819cbc5d5ba930ef0ab720aa1cd2a4839a1d04bf0096  firmware-samsung-jxelte-9cf17bec93940d68755158e69b9b3abdf3b4ece1-bcmdhd_sta.bin
-c34bb422662fcfb604ff0942a294d3b8ec360e07ca5b4a586472d42ec37ba60776e010f99f56ce511c5a1779c438605ec7a0fd965dece9b3b70b9e093d7913e3  firmware-samsung-jxelte-9cf17bec93940d68755158e69b9b3abdf3b4ece1-nvram.txt
-1aef3df174f07204e59d099242cb2d0ad63d957583723bd9423be5d316c2aa426e9136bfedde8d3b3080b99fb608e6ffce9ca4f419080b79f9bf00732ec99d57  firmware-samsung-jxelte-9cf17bec93940d68755158e69b9b3abdf3b4ece1-mfc_fw.bin
+3a70de63fc0a842306fc05f66f75ac2fcf7b7726b1a195cf6746c49bb0b563e994c46f6f02c4ad3e3a14819cbc5d5ba930ef0ab720aa1cd2a4839a1d04bf0096  firmware-samsung-j7xelte-9cf17bec93940d68755158e69b9b3abdf3b4ece1-bcmdhd_sta.bin
+c34bb422662fcfb604ff0942a294d3b8ec360e07ca5b4a586472d42ec37ba60776e010f99f56ce511c5a1779c438605ec7a0fd965dece9b3b70b9e093d7913e3  firmware-samsung-j7xelte-9cf17bec93940d68755158e69b9b3abdf3b4ece1-nvram.txt
+1aef3df174f07204e59d099242cb2d0ad63d957583723bd9423be5d316c2aa426e9136bfedde8d3b3080b99fb608e6ffce9ca4f419080b79f9bf00732ec99d57  firmware-samsung-j7xelte-9cf17bec93940d68755158e69b9b3abdf3b4ece1-mfc_fw.bin
 "
@@ -1,5 +1,5 @@
 # Archived: Only used by archived downstream kernel
-# Maintainer: knuxify <knuxify@gmail.com>
+maintainer="knuxify <knuxify@gmail.com>"
 pkgname=firmware-samsung-lt01wifi-downstream
 pkgver=0.1
 pkgrel=0
@@ -1,5 +1,5 @@
 # Archived: Kernel does not build anymore
-# Maintainer: Théo Friberg <fsmnarmosta@posteo.net>
+maintainer="Théo Friberg <fsmnarmosta@posteo.net>"
 pkgname=firmware-samsung-nevisp
 pkgver=1
 pkgrel=0
@@ -1,5 +1,5 @@
 # Archived: Kernel does not build anymore
-# Maintainer: Eli Riggs <eli@rje.li>
+maintainer="Eli Riggs <eli@rje.li>"
 pkgname=firmware-xiaomi-willow
 pkgver=1
 pkgrel=0
@@ -1,8 +1,7 @@
 # Archived: Kernel sources have disappeared, does not build anymore
-# Maintainer: Hadi Charara <hadicharara@ymail.com>
 # Reference: <https://postmarketos.org/vendorkernel>
 # Kernel config based on: arch/arm64/configs/suez_defconfig
-
+maintainer="Hadi Charara <hadicharara@ymail.com>"
 pkgname=linux-amazon-suez
 pkgver=3.18.19
 pkgrel=3
@@ -1,9 +1,7 @@
 # Archived: Replaced by linux-postmarketos-apple-16k
-
-# Maintainer: Jonas Heinrich <onny@project-insanity.org>
 # Reference: <https://postmarketos.org/vendorkernel>
 # Kernel config based on: arch/arm64/configs/hx_h9p_defconfig
-
+maintainer="Jonas Heinrich <onny@project-insanity.org>"
 pkgname=linux-apple-iphone7
 pkgver=5.4.14
 pkgrel=2
@@ -1,8 +1,8 @@
 # Archived: Kernel doesn't build anymore
 #
-# Maintainer: Achill Gilgenast <achill@achill.org>
 # Reference: <https://postmarketos.org/vendorkernel>
 # Kernel config based on: arch/arm/configs/lineage_tenshi_defconfig
+maintainer="Achill Gilgenast <achill@achill.org>"
 pkgname=linux-bq-tenshi
 pkgver=3.18.31
 pkgrel=0
@@ -1,8 +1,7 @@
 # Archived: Downstream port, only for testing. Use mainline port!
 # Reference: <https://postmarketos.org/vendorkernel>
-# Maintainer: Luca Weiss <luca@lucaweiss.eu>
 # Kernel config based on: arch/arm/configs/lineageos_FP2_defconfig
-
+maintainer="Luca Weiss <luca@lucaweiss.eu>"
 pkgname=linux-fairphone-fp2-downstream
 pkgver=3.4.0
 pkgrel=0
@@ -1,8 +1,7 @@
 # Archived: Kernel does not build anymore
-# Maintainer: Max Buchholz <2maxax2@gmx.de>
 # Reference: <https://postmarketos.org/vendorkernel>
 # Kernel config based on: arch/arm/configs/enrc2b_defconfig
-
+maintainer="Max Buchholz <2maxax2@gmx.de>"
 pkgname=linux-htc-enrc2b
 pkgver=3.1.10
 pkgrel=4
@@ -1,7 +1,6 @@
 # Archived: Kernel does not build anymore
-# Maintainer: ky0ko <ky0ko@disroot.org>
 # Reference: <https://postmarketos.org/vendorkernel>
-
+maintainer="ky0ko <ky0ko@disroot.org>"
 pkgname=linux-motorola-def
 pkgver=4.14.117
 pkgrel=2
@@ -1,7 +1,7 @@
 # Archived: Kernel does not build anymore
 # Reference: <https://postmarketos.org/vendorkernel>
 # Kernel config based on: arch/arm/configs/FRT_defconfig
-# Maintainer: Piotr Halama <skrzynka@halamix2.pl>
+maintainer="Piotr Halama <skrzynka@halamix2.pl>"
 pkgname=linux-nokia-frt
 pkgver=3.18.79
 pkgrel=6
@@ -1,3 +1,4 @@
+# Archived: depended on by only device-motorola-smi
 _flavor="postmarketos-intel-medfield"
 pkgname=linux-$_flavor
 pkgver=6.2.7
@@ -1,7 +1,7 @@
 # Archived: -dev packages x86_64 binaries in aarch64 package which makes akms part of device-clockworkpi-uconsole-radxa-cm5 fail when built on aarch64
 # Reference: <https://postmarketos.org/vendorkernel>
 # Kernel config based on: arch/arm64/configs/rockchip_linux_defconfig
-# Maintainer: Antoine Martin (ayakael) <dev@ayakael.net>
+maintainer="Antoine Martin (ayakael) <dev@ayakael.net>"
 pkgname=linux-radxa
 pkgver=6.1.115
 pkgrel=1
@@ -4,7 +4,7 @@

 pkgname=linux-samsung-a3y17lte
 pkgver=3.18.14
-pkgrel=2
+pkgrel=3
 pkgdesc="Samsung Galaxy A3 (2017) kernel fork"
 arch="aarch64"
 _carch="arm64"
@@ -38,14 +38,24 @@ _outdir="out"
 prepare() {
 	default_prepare
 	. downstreamkernel_prepare
+
+	# Fix for proc.S build error
+	sed -i '189s/#.*//' arch/arm64/mm/proc.S
+
+	# Neutralizing FIPS integrity checks, just returning 0
+	echo "int main() { return 0; }" > scripts/fips_crypto_utils.c
+
+	# Silence FIPS hmac script
+	echo "exit 0" > scripts/fips_crypto_hmac.sh
 }

 build() {
 	unset LDFLAGS
 	make O="$_outdir" ARCH="$_carch" CC="${CC:-gcc}" \
-		KBUILD_BUILD_VERSION="$((pkgrel + 1 ))-postmarketOS"
+		KBUILD_BUILD_VERSION="$((pkgrel + 1 ))-postmarketOS" \
+		KCFLAGS="-Wno-error -w -fno-pie -fno-stack-protector -std=gnu89 -fcommon" \
+		CONFIG_FIPS=n

-	# Master DTB (deviceinfo_bootimg_qcdt)
 	dtbTool-exynos -o "$_outdir/arch/$_carch/boot"/dt.img \
 		$(find "$_outdir/arch/$_carch/boot/dts/" -name *a3y17lte*.dtb)
 }
@@ -56,7 +66,8 @@ package() {
 		"$pkgdir"/boot/dt.img
 }

-sha512sums="71cb4a24bc1aaeaeafd5e00159e560f487eb851a099f652fcb2e9709e6aea4f2e1b95830be13c865c2fab1fad54c9ba209d72068806cef64713e1e12e3d9fb70  linux-samsung-a3y17lte-5414dbfa9f5e114366ff0cc2ffeb9725f3c6b8c3.tar.gz
+sha512sums="
+71cb4a24bc1aaeaeafd5e00159e560f487eb851a099f652fcb2e9709e6aea4f2e1b95830be13c865c2fab1fad54c9ba209d72068806cef64713e1e12e3d9fb70  linux-samsung-a3y17lte-5414dbfa9f5e114366ff0cc2ffeb9725f3c6b8c3.tar.gz
 773cfc48bac93381f1b7fa5e191cead49fc0fad923022b2e28532f4b43ac67ef6a6760613c3693226ed9ab67146f30cf3e0e578e0657c901c9af48f75de6881c  config-samsung-a3y17lte.aarch64
 77eba606a71eafb36c32e9c5fe5e77f5e4746caac292440d9fb720763d766074a964db1c12bc76fe583c5d1a5c864219c59941f5e53adad182dbc70bf2bc14a7  gcc7-give-up-on-ilog2-const-optimizations.patch
 197d40a214ada87fcb2dfc0ae4911704b9a93354b75179cd6b4aadbb627a37ec262cf516921c84a8b1806809b70a7b440cdc8310a4a55fca5d2c0baa988e3967  gcc8-fix-put-user.patch
@@ -67,4 +78,5 @@ sha512sums="71cb4a24bc1aaeaeafd5e00159e560f487eb851a099f652fcb2e9709e6aea4f2e1b9
 66af05562023bebc8334db8236655960e306aa4e2ce216129a077a762bcf951b8c2c286e1c3f45c6478296769e3b6a70f88256e909a9c48f2539bfc056ecf312  04-fix-firmware-make.patch
 436f028e28760c2c93c63333ecd78d4d03291264cb2e108f66d75d5f2e44df9b0cba90ecfd762df3aab7ff131eddc13ba033332a6384680bff85424cfe95c4c2  05-add-dts-make.patch
 9e532d0051756831e12948a5584f331528be58bcddbfab1e1df0217760d035f81b1ac7361b8e81190d4901761572680965b4dd8ef30492c5f94fc330089ce0b3  06-fix-video-argb-setting.patch
-0d56ba508408dc31961ad688f7fd960b0008851fd5729088658095417781b99962740e0c64d162a26f8389e4b4dc88e291252e7935e896fc70bf73c23150caea  07-fix-usb-gadget-random-mac.patch"
+0d56ba508408dc31961ad688f7fd960b0008851fd5729088658095417781b99962740e0c64d162a26f8389e4b4dc88e291252e7935e896fc70bf73c23150caea  07-fix-usb-gadget-random-mac.patch
+"
@@ -1,9 +1,8 @@
 # Archived: Downstream port, only for testing. Use mainline port!
-# Maintainer: David Davies-Jones <david@exultantmonkey.co.uk>
-# Co-Maintainer: Henrik Grimler <henrik@grimler.se>
 # Reference: <https://postmarketos.org/vendorkernel>
 # Kernel config based on: arch/arm/configs/lineageos_chagallwifi_defconfig
-
+# Co-Maintainer: Henrik Grimler <henrik@grimler.se>
+maintainer="David Davies-Jones <david@exultantmonkey.co.uk>"
 pkgname=linux-samsung-chagallwifi-downstream
 pkgver=3.4.113
 pkgrel=0
@@ -1,6 +1,6 @@
 # Archived: Kernel does not build anymore
 # Reference: <https://postmarketos.org/vendorkernel>
-# Maintainer: omame <me@omame.xyz>
+maintainer="omame <me@omame.xyz>"
 pkgname=linux-samsung-j6primelte
 pkgver=3.18.124
 pkgrel=4
@@ -0,0 +1,20 @@
+From aedfcba925841807c0d401eb55ffbdd9d57ef16b Mon Sep 17 00:00:00 2001
+From: Henrik Grimler <henrik@grimler.se>
+Date: Fri, 27 Jun 2025 11:17:12 +0200
+Subject: [PATCH] Makefile: ignore bundled toolchain
+
+Use the gcc from the system instead.
+---
+diff --git a/Makefile b/Makefile
+index dc4c2fa6..4710528d 100644
+--- a/Makefile
+++ b/Makefile
+@@ -249,7 +249,7 @@ SUBARCH := $(shell uname -m | sed -e s/i.86/x86/ -e s/x86_64/x86/ \
+ # Default value for CROSS_COMPILE is not to prefix executables
+ # Note: Some architectures assign CROSS_COMPILE in their arch/*/Makefile
+ ARCH            ?= arm64
+-CROSS_COMPILE   ?= ../PLATFORM/prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.9/bin/aarch64-linux-android-
+# CROSS_COMPILE   ?= ../PLATFORM/prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.9/bin/aarch64-linux-android-
+ 
+ # Architecture as present in compile.h
+ UTS_MACHINE 	:= $(ARCH)
@@ -1,13 +1,12 @@
+# Archived: Downstream port, only for testing. Use mainline port (samsung-j7xelte)!
 # Reference: <https://postmarketos.org/vendorkernel>
-# Kernel config based on: arch/arm64/configs/device_j7xelte_xx
-
-pkgname=linux-samsung-jxelte
+pkgname=linux-samsung-j7xelte-downstream
 pkgver=3.18.14
-pkgrel=7
-pkgdesc="Samsung Galaxy J7(2016) kernel fork"
+pkgrel=0
+pkgdesc="Samsung Galaxy J7 (2016) kernel fork"
 arch="aarch64"
 _carch="arm64"
-_flavor="samsung-jxelte"
+_flavor="samsung-j7xelte"
 url="https://kernel.org"
 license="GPL-2.0-only"
 options="!strip !check !tracedeps pmb:cross-native"
@@ -25,6 +24,7 @@ source="
 	gcc8-fix-put-user.patch
 	01-fix-dtb.patch
 	02-fix-video-argb-setting.patch
+	03-Makefile-ignore-bundled-toolchain.patch
 	linux3.7to4.5-ARM64-remove-Sun-Solaris-style-flag-on-section.patch
 	0002-fix-usb-gadget-random-mac.patch
 	disable-charging-bootmode.patch
@@ -67,13 +67,14 @@ package() {
 }

 sha512sums="
-e6602a988b66a632114b431743a170fca15f069f3eb5f743d2859bf9d0de020faaeabbf3a9b574a2f3b1167efb04a42c7d818ecff2e730d268d24966e73b16c4  linux-samsung-jxelte-6a08243a47caf497bf07d34baacbf7e822344b24.tar.gz
-bb4602115d838abf7b1c2f442e33eb76569e30e1dcf9031a054cd56c599460029ccec8d6406ac01175cacde8f89a1ca1f601864ea7c09f151151b9058530e3d9  config-samsung-jxelte.aarch64
+e6602a988b66a632114b431743a170fca15f069f3eb5f743d2859bf9d0de020faaeabbf3a9b574a2f3b1167efb04a42c7d818ecff2e730d268d24966e73b16c4  linux-samsung-j7xelte-6a08243a47caf497bf07d34baacbf7e822344b24.tar.gz
+48c3c78a9ce6e03f2a4c739607897c82235e2a96bbd17d336ceed437b8140d9c88461163739dc42b3f6a7226e18788d7c7b57b6064d04737163ab93f198b235a  config-samsung-j7xelte.aarch64
 2b48f1bf0e3f70703d2cdafc47d5e615cc7c56c70bec56b2e3297d3fa4a7a1321d649a8679614553dde8fe52ff1051dae38d5990e3744c9ca986d92187dcdbeb  gcc10-extern_YYLOC_global_declaration.patch
 77eba606a71eafb36c32e9c5fe5e77f5e4746caac292440d9fb720763d766074a964db1c12bc76fe583c5d1a5c864219c59941f5e53adad182dbc70bf2bc14a7  gcc7-give-up-on-ilog2-const-optimizations.patch
 197d40a214ada87fcb2dfc0ae4911704b9a93354b75179cd6b4aadbb627a37ec262cf516921c84a8b1806809b70a7b440cdc8310a4a55fca5d2c0baa988e3967  gcc8-fix-put-user.patch
 1ea1501b7b7f1ab3ef4c54a74c01183c96b0403b0a57e3f7c37f299c5c338b86ef5e281a7273b97e87dae5a8d49ffa8a7a3e55d433e34fb53d97fbffdc631d55  01-fix-dtb.patch
 3156b7badd136700ba6332a6d20844ed00452d0a89eda81c32a7d008f61bec1a694d6afbddc35e1f5ffbd400d1119e176361b7e9647ea7edd4310f2cf4ba5caa  02-fix-video-argb-setting.patch
+3cb0cf7888eeb9ac8e17f11cb8db6343e2e16185010f263b2c5cb335cbc87d001b1fd2c4aa2f81b65fd1093f24000c8a1b8e856e362c2b574cad0b5afcfed8aa  03-Makefile-ignore-bundled-toolchain.patch
 75545ccd0082a119b9ad95fcef3523c939a5c946f8f3a5c3dde15cee1502f6c1011050a0ad5359426f018bb7ceea1c97a28c7665941bc89f365c8d11065ce0f6  linux3.7to4.5-ARM64-remove-Sun-Solaris-style-flag-on-section.patch
 0b1836f86020e9e7701f0cf0819149a8f079b69eab87ef301ded7753cda77207a6fff00103dbd5c2a5f60493b46d060ead5967ea800e55ae29fc651b49aab41a  0002-fix-usb-gadget-random-mac.patch
 32e51c6171bcb72b15f5f11a9c9b3279e03e630f2ea6d14b66fbfdd8a8c1587bdb7e88698197e9a81e05c47dba08d13c1ff4a5e4692d14b042f07dd2006c1cc0  disable-charging-bootmode.patch
@@ -517,7 +517,7 @@ CONFIG_IP_PNP_RARP=y
 # CONFIG_NET_IPGRE_DEMUX is not set
 CONFIG_NET_IP_TUNNEL=y
 # CONFIG_IP_MROUTE is not set
-# CONFIG_SYN_COOKIES is not set
+CONFIG_SYN_COOKIES=y
 # CONFIG_NET_IPVTI is not set
 # CONFIG_NET_UDP_TUNNEL is not set
 # CONFIG_NET_FOU is not set
@@ -1,8 +1,7 @@
 # Archived: Downstream port, only for testing. Use mainline port!
-# Maintainer: Henrik Grimler <henrik@grimler.se>
 # Reference: <https://postmarketos.org/vendorkernel>
 # Kernel config based on: arch/arm/configs/lineageos_klimtlte_defconfig
-
+maintainer="Henrik Grimler <henrik@grimler.se>"
 pkgname=linux-samsung-klimtlte-downstream
 pkgver=3.4.113
 pkgrel=0
@@ -1,8 +1,7 @@
 # Archived: Kernel does not build anymore
-# Maintainer: Théo Friberg <fsmnarmosta@posteo.net>
 # Reference: <https://postmarketos.org/vendorkernel>
 # Kernel config based on: arch/arm/configs/cyanogenmod_nevisp_defconfig
-
+maintainer="Théo Friberg <fsmnarmosta@posteo.net>"
 pkgname=linux-samsung-nevisp
 pkgver=3.0.101
 pkgrel=6
@@ -1,7 +1,7 @@
 # Archived: Downstream port, only for testing. Use mainline port!
-# Maintainer: Audun MG <audun@gangsto.org>
 # Reference: <https://postmarketos.org/vendorkernel>
 # Kernel config based on: arch/arm/configs/lineageos_shinano_leo_defconfig
+maintainer="Audun MG <audun@gangsto.org>"
 pkgname=linux-sony-leo-downstream
 pkgver=3.4.113
 pkgrel=0
@@ -1,8 +1,7 @@
 # Archived: Downstream port, only for testing. Use mainline port!
 # Reference: <https://postmarketos.org/vendorkernel>
 # Kernel config based on: arch/arm64/configs/gs5_defconfig
-# Maintainer:
-
+maintainer=""
 pkgname=linux-volla-mimameid-downstream
 pkgver=4.14.186
 pkgrel=0
@@ -1,8 +1,7 @@
 # Archived: Kernel does not build anymore
-# Maintainer: Fedorov Bohdan <misterjdr@yandex.ru>
 # Reference: <https://postmarketos.org/vendorkernel>
 # Kernel config based on: arch/arm/configs/cactus_defconfig
-
+maintainer="Fedorov Bohdan <misterjdr@yandex.ru>"
 pkgname=linux-xiaomi-cactus
 pkgver=4.9.117
 pkgrel=3
@@ -1,8 +1,7 @@
 # Archived: Downstream port, only for testing. Use mainline port!
 # Reference: <https://postmarketos.org/vendorkernel>
 # Kernel config based on: arch/arm64/configs/platina_defconfig
-# Maintainer: Molly Sophia <mollysophia379@gmail.com>
-
+maintainer="Molly Sophia <mollysophia379@gmail.com>"
 pkgname=linux-xiaomi-platina-downstream
 pkgver=4.4.296
 pkgrel=0
@@ -1,8 +1,7 @@
 # Archived: Kernel does not build anymore
-# Maintainer: Eli Riggs <eli@rje.li>
 # Reference: <https://postmarketos.org/vendorkernel>
 # Kernel config based on: arch/arm64/configs/vendor/willow-perf_defconfig
-
+maintainer="Eli Riggs <eli@rje.li>"
 pkgname=linux-xiaomi-willow
 pkgver=4.14.117
 pkgrel=3
@@ -1,3 +1,5 @@
+# Archived: does not build and should not handle building a bootimg in packaging
+
 pkgname=petitboot-motorola-smi
 pkgver=1.13
 pkgrel=1
@@ -1,4 +1,4 @@
-# Maintainer: WeirdTreeThing <bradyn127@protonmail.com>
+maintainer="WeirdTreeThing <bradyn127@protonmail.com>"
 pkgname=alsa-ucm-conf-cros
 pkgver=0.8
 pkgrel=0
@@ -1,4 +1,4 @@
-# Maintainer: Richard Acayan <mailingradian@gmail.com>
+maintainer="Richard Acayan <mailingradian@gmail.com>"
 pkgname=alsa-ucm-conf-qcom-sdm670
 pkgver=1.2.9_git20250707
 pkgrel=0
@@ -1,9 +1,9 @@
-# Maintainer: Danila Tikhonov <danila@jiaxyga.com>
-# Co-Maintainer: Jens Reidel <adrian@travitia.xyz>
+# Co-Maintainer: Aelin <aelin@postmarketos.org>
 # Co-Maintainer: David Wronek <david@mainlining.org>
+maintainer="Danila Tikhonov <danila@jiaxyga.com>"
 pkgname=alsa-ucm-conf-qcom-sm7150
 pkgver=1.2.14_git20251026
-pkgrel=0
+pkgrel=1
 pkgdesc="ALSA UCM configuration for SM7150 devices"
 url="https://github.com/sm7150-mainline/alsa-ucm-conf"
 arch="aarch64"
@@ -1,5 +1,5 @@
-# Maintainer: Casey Connolly <kcxt@postmarketos.org>
-# Co-Maintainer: Joel Selvaraj <joelselvaraj.oss@gmail.com>
+# Co-Maintainer: Joel Selvaraj <foss@joelselvaraj.com>
+maintainer="Casey Connolly <kcxt@postmarketos.org>"
 pkgname=alsa-ucm-conf-sdm845
 pkgver=1
 pkgrel=1
@@ -1,5 +1,5 @@
 # Reference: <https://postmarketos.org/devicepkg>
-# Maintainer: Minecrell <minecrell@minecrell.net>
+maintainer="Minecrell <minecrell@minecrell.net>"
 pkgname=device-asus-me176c
 pkgdesc="ASUS MeMO Pad 7 (ME176C(X))"
 pkgver=8
@@ -1,8 +1,8 @@
 # Reference: <https://postmarketos.org/devicepkg>
-# Maintainer: Luca Weiss <luca@lucaweiss.eu>
+maintainer="Luca Weiss <luca@lucaweiss.eu>"
 pkgname=device-fairphone-fp4
 pkgdesc="Fairphone 4"
-pkgver=6
+pkgver=7
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -39,7 +39,6 @@ subpackages="$pkgname-openrc"
 source="
 	81-libssc-fairphone-fp4.rules
 	deviceinfo
-	hexagonrpcd.confd
 	modules-initfs
 	"

@@ -52,8 +51,6 @@ package() {

 	install -Dm644 "$srcdir"/81-libssc-fairphone-fp4.rules \
 		"$pkgdir"/usr/lib/udev/rules.d/81-libssc-fairphone-fp4.rules
-	install -Dm644 "$srcdir"/hexagonrpcd.confd \
-		"$pkgdir"/usr/share/hexagonrpcd/hexagonrpcd-adsp-sensorspd.conf
 }

 openrc() {
@@ -72,6 +69,5 @@ openrc() {
 sha512sums="
 2c16ba75e0077b2b1eaefa4c73b287475505a1aeb291ec29316d41cc094277320f9d2aaabfd91eb1dc0f488ab2d61a94faef16e7afe0f1e226779113761b9a37  81-libssc-fairphone-fp4.rules
 06cdf6ba36f29553484dcde46431500550608dfb757836c180886e3dbc2a1ce5e90927690c63aea468e90ce0b1371d15efe62912eb43749c0e0bee27ce5215b3  deviceinfo
-6a3d620f2cc60308a62ff651ffb00a5ee1f092131cca9d33b6afd61c8a372a3fd7d46540162213593107e0943b33f3f0119d003d43dcd06dbde757390a6c1729  hexagonrpcd.confd
 52bb7ed829caa4dcff9728bd6e3cdf118b3c7ee7dfe90df0d4e6422dd67bf3258ae2a4d2dc7599da4182fbd8eb47a0e1d20c58198dc17f2bf178b8f01a8887f7  modules-initfs
 "
@@ -1,2 +0,0 @@
-# Fairphone 4 specific hexagonrpcd firmware directory
-hexagonrpcd_fw_dir="/usr/share/qcom/sm7225/Fairphone/fairphone4"