From 63cd5bebb91fc46e1bf4d3b9fa6457cd66483e11 Mon Sep 17 00:00:00 2001 From: Arnav Singh Date: Sun, 26 Oct 2025 19:11:31 -0700 Subject: [PATCH] linux-postmarketos-allwinner: upgrade to 6.17.5_git20251026 Also switch to building with LLVM, per https://gitlab.postmarketos.org/postmarketOS/postmarketos/-/issues/123 Part-of: --- .../linux-postmarketos-allwinner/APKBUILD | 15 +++--- .../config-postmarketos-allwinner.aarch64 | 47 +++++++++++-------- .../config-postmarketos-allwinner.armv7 | 47 ++++++++----------- 3 files changed, 56 insertions(+), 53 deletions(-) diff --git a/device/community/linux-postmarketos-allwinner/APKBUILD b/device/community/linux-postmarketos-allwinner/APKBUILD index 54dd493fc..17fdcd17e 100644 --- a/device/community/linux-postmarketos-allwinner/APKBUILD +++ b/device/community/linux-postmarketos-allwinner/APKBUILD @@ -3,20 +3,23 @@ _flavor=postmarketos-allwinner _config="config-$_flavor.$CARCH" pkgname=linux-$_flavor -pkgver=6.17.0_git20250929 +pkgver=6.17.5_git20251026 pkgrel=0 -_tag="orange-pi-6.17-20250929-0124" +_tag="orange-pi-6.17-20251026-1441" pkgdesc="Kernel fork with Pine64 patches (megi's tree, slightly patched)" arch="aarch64 armv7" url="https://megous.com/git/linux/" license="GPL-2.0-only" makedepends=" bison + clang devicepkg-dev findutils flex gmp-dev installkernel + lld + llvm mpc1-dev mpfr-dev openssl-dev @@ -63,7 +66,7 @@ prepare() { build() { unset LDFLAGS # V=1: workaround for pma#1990 - make ARCH="$_carch" CC="${CC:-gcc}" \ + make ARCH="$_carch" LLVM=1 \ KBUILD_BUILD_VERSION="$((pkgrel + 1 ))-$_flavor" \ CFLAGS_MODULE=-fno-pic \ DTC_FLAGS="-@" \ @@ -80,9 +83,9 @@ package() { INSTALL_DTBS_PATH="$pkgdir/boot/dtbs" } sha512sums=" -c8f301d67aba17d48e0117b580ba0ce09a6b450f0db3e1134cb58fe4a5d010dafa1c8d2b42fe95de024ecadb8d0861d6c664de8355e806fced01bb8fe8e4b347 linux-postmarketos-allwinner-orange-pi-6.17-20250929-0124.tar.gz -07711920494103697139df76b1f04e14ccec7bd1757ae0a7d6f18b674875cbd8a95189338dd618d1d76454c2e626a2e04402988aa4b01ecad17a5990af407a5f config-postmarketos-allwinner.aarch64 -1246a8bdfa2785171923961eaf28452e2894fca9bb0da0035e630a86417a78a7ddf058c94dcd6e911cdf8101ce19a7b211ebc5bd6b9f50167819723e8b3a9abe config-postmarketos-allwinner.armv7 +6d8f14b11b0d50bc7e6354716a91600531a2e9385035bd277d1f241aa7515137340acd9d17e161c3d3f4b7d846f4513b80a5e93fc74bf1ee1275424e11afa8e9 linux-postmarketos-allwinner-orange-pi-6.17-20251026-1441.tar.gz +02134d0bb81019a5fdfb1d2c14b167185f174bb2d49695cc4bab944ed3363e2058a39a6d4d0c55f3baa4aac8c0df95150185f96278d9a2ec3b08f383b66d0ef1 config-postmarketos-allwinner.aarch64 +928dfc0545ebe2e2ff6e86407d74f7158968a770e088dc804b99985fc5c0dab56970c4f64b845f560090456f02431a41b1d6c2f61f0862675306fb15ed9e46c9 config-postmarketos-allwinner.armv7 22d8630900ddd644e5351aecddf430782f27a83a89369f6e7e222682c909b1d0a37f6ddba2fd560a4c9306aaa285f117f3047c54435efe146c1fd06cf6c69281 0001-dts-add-dontbeevil-pinephone-devkit.patch a342cfefa540a090f10f1c2d16e27f14db8da1c46867ea0a5c60f6cd9ead7443a9994af1e0a45e94878f7bb37c8e36cae5ce086c6afae5007d71f613190ec861 0002-dts-add-pinetab-dev-old-display-panel.patch cb321cc103295e4091754a867e1cbf40fa918483d557d81d7e9fe2df594fd078ae6025f72c1339a93cf342e762fa82121d0225cd8c09e89234962eca1c69c129 0003-dts-pinetab-add-missing-ohci1.patch diff --git a/device/community/linux-postmarketos-allwinner/config-postmarketos-allwinner.aarch64 b/device/community/linux-postmarketos-allwinner/config-postmarketos-allwinner.aarch64 index 6f454a80a..20d4c5626 100644 --- a/device/community/linux-postmarketos-allwinner/config-postmarketos-allwinner.aarch64 +++ b/device/community/linux-postmarketos-allwinner/config-postmarketos-allwinner.aarch64 @@ -1,18 +1,20 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 6.17.0 Kernel Configuration +# Linux/arm64 6.17.5 Kernel Configuration # -CONFIG_CC_VERSION_TEXT="aarch64-alpine-linux-musl-gcc (Alpine 15.2.0) 15.2.0" -CONFIG_CC_IS_GCC=y -CONFIG_GCC_VERSION=150200 -CONFIG_CLANG_VERSION=0 -CONFIG_AS_IS_GNU=y -CONFIG_AS_VERSION=24500 -CONFIG_LD_IS_BFD=y -CONFIG_LD_VERSION=24500 -CONFIG_LLD_VERSION=0 +CONFIG_CC_VERSION_TEXT="Alpine clang version 21.1.2" +CONFIG_GCC_VERSION=0 +CONFIG_CC_IS_CLANG=y +CONFIG_CLANG_VERSION=210102 +CONFIG_AS_IS_LLVM=y +CONFIG_AS_VERSION=210102 +CONFIG_LD_VERSION=0 +CONFIG_LD_IS_LLD=y +CONFIG_LLD_VERSION=210102 CONFIG_RUSTC_VERSION=109000 -CONFIG_RUSTC_LLVM_VERSION=200108 +CONFIG_RUSTC_LLVM_VERSION=210102 +CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y +CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=y CONFIG_TOOLS_SUPPORT_RELR=y CONFIG_CC_HAS_ASM_INLINE=y CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y @@ -186,11 +188,9 @@ CONFIG_UCLAMP_BUCKETS_COUNT=5 CONFIG_ARCH_SUPPORTS_NUMA_BALANCING=y CONFIG_ARCH_WANT_BATCHED_UNMAP_TLB_FLUSH=y CONFIG_CC_HAS_INT128=y -CONFIG_CC_IMPLICIT_FALLTHROUGH="-Wimplicit-fallthrough=5" +CONFIG_CC_IMPLICIT_FALLTHROUGH="-Wimplicit-fallthrough" CONFIG_GCC10_NO_ARRAY_BOUNDS=y -CONFIG_CC_NO_ARRAY_BOUNDS=y CONFIG_GCC_NO_STRINGOP_OVERFLOW=y -CONFIG_CC_NO_STRINGOP_OVERFLOW=y CONFIG_ARCH_SUPPORTS_INT128=y CONFIG_SLAB_OBJ_EXT=y CONFIG_CGROUPS=y @@ -300,7 +300,7 @@ CONFIG_TRACEPOINTS=y CONFIG_ARM64=y CONFIG_RUSTC_SUPPORTS_ARM64=y -CONFIG_GCC_SUPPORTS_DYNAMIC_FTRACE_WITH_ARGS=y +CONFIG_CLANG_SUPPORTS_DYNAMIC_FTRACE_WITH_ARGS=y CONFIG_64BIT=y CONFIG_MMU=y CONFIG_ARM64_CONT_PTE_SHIFT=4 @@ -481,6 +481,8 @@ CONFIG_RODATA_FULL_DEFAULT_ENABLED=y CONFIG_ARM64_TAGGED_ADDR_ABI=y CONFIG_COMPAT=y CONFIG_KUSER_HELPERS=y +CONFIG_COMPAT_VDSO=y +CONFIG_THUMB2_COMPAT_VDSO=y # CONFIG_COMPAT_ALIGNMENT_FIXUPS is not set # CONFIG_ARMV8_DEPRECATED is not set @@ -522,6 +524,7 @@ CONFIG_ARM64_TLB_RANGE=y # CONFIG_AS_HAS_ARMV8_5=y CONFIG_ARM64_BTI=y +CONFIG_ARM64_BTI_KERNEL=y CONFIG_CC_HAS_BRANCH_PROT_PAC_RET_BTI=y CONFIG_ARM64_E0PD=y CONFIG_ARM64_AS_HAS_MTE=y @@ -721,8 +724,14 @@ CONFIG_ARCH_SUPPORTS_SHADOW_CALL_STACK=y # CONFIG_SHADOW_CALL_STACK is not set CONFIG_ARCH_SUPPORTS_LTO_CLANG=y CONFIG_ARCH_SUPPORTS_LTO_CLANG_THIN=y +CONFIG_HAS_LTO_CLANG=y CONFIG_LTO_NONE=y +# CONFIG_LTO_CLANG_FULL is not set +# CONFIG_LTO_CLANG_THIN is not set CONFIG_ARCH_SUPPORTS_CFI_CLANG=y +# CONFIG_CFI_CLANG is not set +CONFIG_HAVE_CFI_ICALL_NORMALIZE_INTEGERS_CLANG=y +CONFIG_HAVE_CFI_ICALL_NORMALIZE_INTEGERS_RUSTC=y CONFIG_HAVE_CONTEXT_TRACKING_USER=y CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y @@ -789,12 +798,9 @@ CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y # end of GCOV-based kernel profiling CONFIG_HAVE_GCC_PLUGINS=y -CONFIG_GCC_PLUGINS=y -# CONFIG_GCC_PLUGIN_LATENT_ENTROPY is not set CONFIG_FUNCTION_ALIGNMENT_4B=y CONFIG_FUNCTION_ALIGNMENT_8B=y CONFIG_FUNCTION_ALIGNMENT=8 -CONFIG_CC_HAS_MIN_FUNCTION_ALIGNMENT=y CONFIG_CC_HAS_SANE_FUNCTION_ALIGNMENT=y # end of General architecture-dependent options @@ -6959,6 +6965,7 @@ CONFIG_CC_HAS_AUTO_VAR_INIT_ZERO=y CONFIG_INIT_STACK_NONE=y # CONFIG_INIT_STACK_ALL_PATTERN is not set # CONFIG_INIT_STACK_ALL_ZERO is not set +CONFIG_CC_HAS_SANCOV_STACK_DEPTH_CALLBACK=y # CONFIG_KSTACK_ERASE is not set # CONFIG_INIT_ON_ALLOC_DEFAULT_ON is not set # CONFIG_INIT_ON_FREE_DEFAULT_ON is not set @@ -6980,9 +6987,9 @@ CONFIG_CC_HAS_ZERO_CALL_USED_REGS=y # CONFIG_BUG_ON_DATA_CORRUPTION is not set # end of Hardening of kernel data structures +CONFIG_CC_HAS_RANDSTRUCT=y CONFIG_RANDSTRUCT_NONE=y # CONFIG_RANDSTRUCT_FULL is not set -# CONFIG_RANDSTRUCT_PERFORMANCE is not set # end of Kernel hardening options # end of Security options @@ -7356,6 +7363,7 @@ CONFIG_LIBFDT=y CONFIG_OID_REGISTRY=y CONFIG_HAVE_GENERIC_VDSO=y CONFIG_GENERIC_GETTIMEOFDAY=y +CONFIG_GENERIC_COMPAT_VDSO=y CONFIG_GENERIC_VDSO_TIME_NS=y CONFIG_VDSO_GETRANDOM=y CONFIG_GENERIC_VDSO_DATA_STORE=y @@ -7403,7 +7411,6 @@ CONFIG_AS_HAS_NON_CONST_ULEB128=y CONFIG_FRAME_WARN=2048 # CONFIG_STRIP_ASM_SYMS is not set # CONFIG_HEADERS_INSTALL is not set -# CONFIG_DEBUG_SECTION_MISMATCH is not set CONFIG_SECTION_MISMATCH_WARN_ONLY=y CONFIG_ARCH_WANT_FRAME_POINTERS=y CONFIG_FRAME_POINTER=y diff --git a/device/community/linux-postmarketos-allwinner/config-postmarketos-allwinner.armv7 b/device/community/linux-postmarketos-allwinner/config-postmarketos-allwinner.armv7 index 33914b8de..2677955c7 100644 --- a/device/community/linux-postmarketos-allwinner/config-postmarketos-allwinner.armv7 +++ b/device/community/linux-postmarketos-allwinner/config-postmarketos-allwinner.armv7 @@ -1,18 +1,21 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 6.17.0 Kernel Configuration +# Linux/arm 6.17.5 Kernel Configuration # -CONFIG_CC_VERSION_TEXT="armv7-alpine-linux-musleabihf-gcc (Alpine 15.2.0) 15.2.0" -CONFIG_CC_IS_GCC=y -CONFIG_GCC_VERSION=150200 -CONFIG_CLANG_VERSION=0 -CONFIG_AS_IS_GNU=y -CONFIG_AS_VERSION=24500 -CONFIG_LD_IS_BFD=y -CONFIG_LD_VERSION=24500 -CONFIG_LLD_VERSION=0 +CONFIG_CC_VERSION_TEXT="Alpine clang version 21.1.2" +CONFIG_GCC_VERSION=0 +CONFIG_CC_IS_CLANG=y +CONFIG_CLANG_VERSION=210102 +CONFIG_AS_IS_LLVM=y +CONFIG_AS_VERSION=210102 +CONFIG_LD_VERSION=0 +CONFIG_LD_IS_LLD=y +CONFIG_LLD_VERSION=210102 CONFIG_RUSTC_VERSION=109000 -CONFIG_RUSTC_LLVM_VERSION=200108 +CONFIG_RUSTC_LLVM_VERSION=210102 +CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y +CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=y +CONFIG_TOOLS_SUPPORT_RELR=y CONFIG_CC_HAS_ASM_INLINE=y CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y CONFIG_CC_HAS_COUNTED_BY=y @@ -176,11 +179,9 @@ CONFIG_UCLAMP_TASK=y CONFIG_UCLAMP_BUCKETS_COUNT=5 # end of Scheduler features -CONFIG_CC_IMPLICIT_FALLTHROUGH="-Wimplicit-fallthrough=5" +CONFIG_CC_IMPLICIT_FALLTHROUGH="-Wimplicit-fallthrough" CONFIG_GCC10_NO_ARRAY_BOUNDS=y -CONFIG_CC_NO_ARRAY_BOUNDS=y CONFIG_GCC_NO_STRINGOP_OVERFLOW=y -CONFIG_CC_NO_STRINGOP_OVERFLOW=y CONFIG_SLAB_OBJ_EXT=y CONFIG_CGROUPS=y CONFIG_PAGE_COUNTER=y @@ -407,7 +408,6 @@ CONFIG_ARM_THUMB=y CONFIG_ARM_VIRT_EXT=y CONFIG_SWP_EMULATE=y CONFIG_CPU_LITTLE_ENDIAN=y -# CONFIG_CPU_BIG_ENDIAN is not set # CONFIG_CPU_ICACHE_DISABLE is not set # CONFIG_CPU_ICACHE_MISMATCH_WORKAROUND is not set # CONFIG_CPU_BPREDICT_DISABLE is not set @@ -505,8 +505,6 @@ CONFIG_ALIGNMENT_TRAP=y # CONFIG_PARAVIRT is not set # CONFIG_PARAVIRT_TIME_ACCOUNTING is not set # CONFIG_XEN is not set -CONFIG_CC_HAVE_STACKPROTECTOR_TLS=y -CONFIG_STACKPROTECTOR_PER_TASK=y # end of Kernel Features # @@ -660,6 +658,8 @@ CONFIG_STACKPROTECTOR=y CONFIG_STACKPROTECTOR_STRONG=y CONFIG_LTO_NONE=y CONFIG_ARCH_SUPPORTS_CFI_CLANG=y +# CONFIG_CFI_CLANG is not set +CONFIG_HAVE_CFI_ICALL_NORMALIZE_INTEGERS_CLANG=y CONFIG_HAVE_CONTEXT_TRACKING_USER=y CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y @@ -702,10 +702,7 @@ CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y # end of GCOV-based kernel profiling CONFIG_HAVE_GCC_PLUGINS=y -CONFIG_GCC_PLUGINS=y -# CONFIG_GCC_PLUGIN_LATENT_ENTROPY is not set CONFIG_FUNCTION_ALIGNMENT=0 -CONFIG_CC_HAS_MIN_FUNCTION_ALIGNMENT=y CONFIG_CC_HAS_SANE_FUNCTION_ALIGNMENT=y # end of General architecture-dependent options @@ -6168,7 +6165,7 @@ CONFIG_XFS_SUPPORT_ASCII_CI=y # CONFIG_GFS2_FS is not set # CONFIG_OCFS2_FS is not set CONFIG_BTRFS_FS=m -# CONFIG_BTRFS_FS_POSIX_ACL is not set +CONFIG_BTRFS_FS_POSIX_ACL=y # CONFIG_BTRFS_FS_RUN_SANITY_TESTS is not set # CONFIG_BTRFS_DEBUG is not set # CONFIG_BTRFS_ASSERT is not set @@ -6418,7 +6415,6 @@ CONFIG_PROC_MEM_ALWAYS_FORCE=y # CONFIG_SECURITYFS is not set # CONFIG_STATIC_USERMODEHELPER is not set CONFIG_DEFAULT_SECURITY_DAC=y -CONFIG_LSM="lockdown,yama,loadpin,safesetid,integrity,bpf" # # Kernel hardening options @@ -6433,11 +6429,10 @@ CONFIG_CC_HAS_AUTO_VAR_INIT_ZERO=y CONFIG_INIT_STACK_NONE=y # CONFIG_INIT_STACK_ALL_PATTERN is not set # CONFIG_INIT_STACK_ALL_ZERO is not set +CONFIG_CC_HAS_SANCOV_STACK_DEPTH_CALLBACK=y # CONFIG_KSTACK_ERASE is not set # CONFIG_INIT_ON_ALLOC_DEFAULT_ON is not set # CONFIG_INIT_ON_FREE_DEFAULT_ON is not set -CONFIG_CC_HAS_ZERO_CALL_USED_REGS=y -# CONFIG_ZERO_CALL_USED_REGS is not set # end of Memory initialization # @@ -6454,9 +6449,9 @@ CONFIG_CC_HAS_ZERO_CALL_USED_REGS=y # CONFIG_BUG_ON_DATA_CORRUPTION is not set # end of Hardening of kernel data structures +CONFIG_CC_HAS_RANDSTRUCT=y CONFIG_RANDSTRUCT_NONE=y # CONFIG_RANDSTRUCT_FULL is not set -# CONFIG_RANDSTRUCT_PERFORMANCE is not set # end of Kernel hardening options # end of Security options @@ -6853,7 +6848,6 @@ CONFIG_AS_HAS_NON_CONST_ULEB128=y CONFIG_FRAME_WARN=1024 # CONFIG_STRIP_ASM_SYMS is not set # CONFIG_HEADERS_INSTALL is not set -# CONFIG_DEBUG_SECTION_MISMATCH is not set CONFIG_SECTION_MISMATCH_WARN_ONLY=y # end of Compile-time checks and compiler options @@ -6868,7 +6862,6 @@ CONFIG_DEBUG_FS_ALLOW_ALL=y CONFIG_HAVE_ARCH_KGDB=y CONFIG_ARCH_HAS_UBSAN=y # CONFIG_UBSAN is not set -CONFIG_HAVE_KCSAN_COMPILER=y # end of Generic Kernel Debugging Instruments #