From 62f19c3e030c3d22948141b4ca1ad7cf3fab6064 Mon Sep 17 00:00:00 2001 From: Jan Jasper de Kroon Date: Sun, 6 Nov 2022 17:44:42 +0100 Subject: [PATCH] device/main/linux-postmarketos-allwinner: upgrade to 6.0.7 (MR 3624) [ci:skip-build]: Already built successfully in CI --- device/main/linux-postmarketos-allwinner/APKBUILD | 13 +++++++------ .../config-postmarketos-allwinner.aarch64 | 15 ++++----------- .../config-postmarketos-allwinner.armv7 | 13 +++++-------- 3 files changed, 16 insertions(+), 25 deletions(-) diff --git a/device/main/linux-postmarketos-allwinner/APKBUILD b/device/main/linux-postmarketos-allwinner/APKBUILD index 3c5a557d4..7af741b1c 100644 --- a/device/main/linux-postmarketos-allwinner/APKBUILD +++ b/device/main/linux-postmarketos-allwinner/APKBUILD @@ -3,12 +3,13 @@ # Co-Maintainer: Bart Ribbers # Co-Maintainer: Oliver Smith # Co-Maintainer: Clayton Craft +# Co-Maintainer: Jan Jasper de Kroon _flavor=postmarketos-allwinner _config="config-$_flavor.$CARCH" pkgname=linux-$_flavor -pkgver=6.0.3_git20221022 -pkgrel=2 -_tag="orange-pi-6.0-20221022-2043" +pkgver=6.0.7_git20221105 +pkgrel=0 +_tag="orange-pi-6.0-20221105-1830" pkgdesc="Kernel fork with Pine64 patches (megi's tree, slightly patched)" arch="aarch64 armv7" url="https://megous.com/git/linux/" @@ -82,9 +83,9 @@ package() { } sha512sums=" -476009ec3d0114d486a1c61fdfd6fb2fbaa9d8f9bce384b4f8732f088444d5f044b67dc2270c303c70aaf099cad9fb273671f1d7c81d000eb36a085a688be800 linux-postmarketos-allwinner-orange-pi-6.0-20221022-2043.tar.gz -eb9cbef2d40eb9d47e94cf85a50df42e02c29a359638443f72c89cdfe25b395058be8139c4437be56bf5e30fdcc32a4dacba55e2fab64e7590af8b9eff5e4bb8 config-postmarketos-allwinner.aarch64 -de68f7bdae39f983598f640022ce693c9e70e42bfa5d20b5a18587c871a32305a821d93f681c08e347765949a7a80b2af9e28f15e614ebdecb7898e4b5ad2a16 config-postmarketos-allwinner.armv7 +c36aec0f3e807d9631811b0f77fed75e961e9617a8d3f5e4ae21e87d39c64623dc201626d49a3f292298369ee18d99de66577adcf9347af192a651a3cc2545b3 linux-postmarketos-allwinner-orange-pi-6.0-20221105-1830.tar.gz +89995eec95ed38a7f61c08e62af0cfb38bbf0030721bff8ab4944e054f6292b1a6af8871bcacfe01d14acb30d0fd08deac20f2d954cd8e6e946fd0a4db01524e config-postmarketos-allwinner.aarch64 +04364e9b741e06efdf171e73bf7733ffb920f369a9e0748b5df2737eb86f7b7c4cfbac6fc72484505379b808e5896beee81599f850c0804fbb0ffecf09ca2a5b config-postmarketos-allwinner.armv7 126e0a65e04f22f14eac1281a69000d9d5b107ed8fd1b52f37e812751f55e6c45b0240ceac61c9d95ae7f0543aaf9d96b85a8532baf59283c077b9945e615367 0001-dts-add-dontbeevil-pinephone-devkit.patch 1dc710f5abacdd5698169d5e985efeca8114986c774c3d65e89812d08ceb3db5ebdc6dd64dd76a262c761f3bfc3ffb6bc237fd5236bd1f89c5975d12e42eda04 0002-dts-add-pinetab-dev-old-display-panel.patch 96849f40f6defc4ad7646256814bea5ac353c4e0479fd069365ff27456d63da801541ec616f6db736d60f3134384321a9eeb5bfbd555363bf1259c8de63d17fa 0003-dts-pinetab-add-missing-bma223-ohci1.patch diff --git a/device/main/linux-postmarketos-allwinner/config-postmarketos-allwinner.aarch64 b/device/main/linux-postmarketos-allwinner/config-postmarketos-allwinner.aarch64 index b8d48c399..7b3483e81 100644 --- a/device/main/linux-postmarketos-allwinner/config-postmarketos-allwinner.aarch64 +++ b/device/main/linux-postmarketos-allwinner/config-postmarketos-allwinner.aarch64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 6.0.3 Kernel Configuration +# Linux/arm64 6.0.7 Kernel Configuration # CONFIG_CC_VERSION_TEXT="aarch64-alpine-linux-musl-gcc (Alpine 12.2.1_git20220924-r3) 12.2.1 20220924" CONFIG_CC_IS_GCC=y @@ -156,7 +156,6 @@ CONFIG_ARCH_SUPPORTS_NUMA_BALANCING=y CONFIG_CC_HAS_INT128=y CONFIG_CC_IMPLICIT_FALLTHROUGH="-Wimplicit-fallthrough=5" CONFIG_GCC12_NO_ARRAY_BOUNDS=y -CONFIG_CC_NO_ARRAY_BOUNDS=y CONFIG_ARCH_SUPPORTS_INT128=y CONFIG_CGROUPS=y CONFIG_PAGE_COUNTER=y @@ -396,7 +395,6 @@ CONFIG_HZ=250 CONFIG_SCHED_HRTICK=y CONFIG_ARCH_SPARSEMEM_ENABLE=y CONFIG_HW_PERF_EVENTS=y -CONFIG_CC_HAVE_SHADOW_CALL_STACK=y # CONFIG_PARAVIRT is not set # CONFIG_PARAVIRT_TIME_ACCOUNTING is not set CONFIG_KEXEC=y @@ -653,8 +651,6 @@ CONFIG_HAVE_ARCH_STACKLEAK=y CONFIG_HAVE_STACKPROTECTOR=y CONFIG_STACKPROTECTOR=y CONFIG_STACKPROTECTOR_STRONG=y -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_LTO_NONE=y @@ -5845,12 +5841,10 @@ CONFIG_LSM="yama,loadpin,integrity,selinux,smack,tomoyo,apparmor" # # Memory initialization # -CONFIG_CC_HAS_AUTO_VAR_INIT_PATTERN=y -CONFIG_CC_HAS_AUTO_VAR_INIT_ZERO_BARE=y -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_GCC_PLUGIN_STRUCTLEAK_USER is not set +# CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF is not set +# CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF_ALL is not set # CONFIG_GCC_PLUGIN_STACKLEAK is not set # CONFIG_INIT_ON_ALLOC_DEFAULT_ON is not set # CONFIG_INIT_ON_FREE_DEFAULT_ON is not set @@ -6350,7 +6344,6 @@ CONFIG_STRICT_DEVMEM=y # CONFIG_KUNIT is not set CONFIG_ARCH_HAS_KCOV=y CONFIG_CC_HAS_SANCOV_TRACE_PC=y -# CONFIG_KCOV is not set # CONFIG_RUNTIME_TESTING_MENU is not set CONFIG_ARCH_USE_MEMTEST=y # CONFIG_MEMTEST is not set diff --git a/device/main/linux-postmarketos-allwinner/config-postmarketos-allwinner.armv7 b/device/main/linux-postmarketos-allwinner/config-postmarketos-allwinner.armv7 index a78e179f0..0d845a275 100644 --- a/device/main/linux-postmarketos-allwinner/config-postmarketos-allwinner.armv7 +++ b/device/main/linux-postmarketos-allwinner/config-postmarketos-allwinner.armv7 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 6.0.3 Kernel Configuration +# Linux/arm 6.0.7 Kernel Configuration # CONFIG_CC_VERSION_TEXT="armv7-alpine-linux-musleabihf-gcc (Alpine 12.2.1_git20220924-r3) 12.2.1 20220924" CONFIG_CC_IS_GCC=y @@ -151,7 +151,6 @@ CONFIG_GENERIC_SCHED_CLOCK=y CONFIG_CC_IMPLICIT_FALLTHROUGH="-Wimplicit-fallthrough=5" CONFIG_GCC12_NO_ARRAY_BOUNDS=y -CONFIG_CC_NO_ARRAY_BOUNDS=y CONFIG_CGROUPS=y CONFIG_PAGE_COUNTER=y # CONFIG_CGROUP_FAVOR_DYNMODS is not set @@ -464,7 +463,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 @@ -662,6 +660,7 @@ CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y CONFIG_HAVE_GCC_PLUGINS=y CONFIG_GCC_PLUGINS=y # CONFIG_GCC_PLUGIN_LATENT_ENTROPY is not set +CONFIG_GCC_PLUGIN_ARM_SSP_PER_TASK=y # end of General architecture-dependent options CONFIG_RT_MUTEXES=y @@ -5657,12 +5656,10 @@ CONFIG_LSM="lockdown,yama,loadpin,safesetid,integrity,bpf" # # Memory initialization # -CONFIG_CC_HAS_AUTO_VAR_INIT_PATTERN=y -CONFIG_CC_HAS_AUTO_VAR_INIT_ZERO_BARE=y -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_GCC_PLUGIN_STRUCTLEAK_USER is not set +# CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF is not set +# CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF_ALL 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