diff options
author | Milan P. Stanić <mps@arvanta.net> | 2020-07-31 20:55:24 +0000 |
---|---|---|
committer | Milan P. Stanić <mps@arvanta.net> | 2020-07-31 21:01:00 +0000 |
commit | 206ffc48c552bed0567b8a6d40930a283ca9a3d8 (patch) | |
tree | f9eae5722c7d69f5e62a708d16234728601f3c81 | |
parent | fb8825a7277080cffed5d7312aa62324c6848dac (diff) |
testing/linux-edge: upgrade to 5.7.12
revert CONFIG_CC_HAVE_STACKPROTECTOR_SYSREG and
CONFIG_STACKPROTECTOR_PER_TASK which are disabled in previous commit by
mistake on aarch64
enable CONFIG_ARM64_LSE_ATOMICS on aarch64
remove CONFIG_BROKEN_GAS_INST=y on aarch64, not needed
next are default on aarch64 with this kernel version
CONFIG_CC_HAS_BRANCH_PROT_PAC_RET=y
CONFIG_CC_HAS_SIGN_RETURN_ADDRESS=y
CONFIG_AS_HAS_PAC=y
-rw-r--r-- | testing/linux-edge/APKBUILD | 10 | ||||
-rw-r--r-- | testing/linux-edge/config-edge.aarch64 | 10 | ||||
-rw-r--r-- | testing/linux-edge/config-edge.armv7 | 2 | ||||
-rw-r--r-- | testing/linux-edge/config-edge.x86_64 | 2 |
4 files changed, 15 insertions, 9 deletions
diff --git a/testing/linux-edge/APKBUILD b/testing/linux-edge/APKBUILD index 05aebf1fa52..09b5e499829 100644 --- a/testing/linux-edge/APKBUILD +++ b/testing/linux-edge/APKBUILD @@ -4,7 +4,7 @@ _flavor=edge pkgname=linux-${_flavor} # NOTE: this kernel is intended for testing # please resist urge to upgrade it blindly -pkgver=5.7.11 +pkgver=5.7.12 case $pkgver in *.*.*) _kernver=${pkgver%.*};; *.*) _kernver=$pkgver;; @@ -216,7 +216,7 @@ _dev() { } sha512sums="45bde01593f6147c8c169b9e46b4b56eee998142552ae0ff82f1dd21b1fd54f3b32f6283f6bd77ea717d374672167849e468c157f235d2f12f7d7816e4623bf6 linux-5.7.tar.xz -1200b91a83d43fab4e5b1a6a9f412a6f5bc4facf11a797c4bd98aafca82bd8be8045ee4af4ca4aff0921288c30256a452045b82c07bc55dcf67d6d5a25948bf4 patch-5.7.11.xz -6fdad7e1912c9085ed49fb0f6a7c37870e61fa7823bcdf7a44ba5f74d51b80ca42350137c91ebbe3c25ddb48d930ce1146aaf9ab4deb126bd5946ba05b4f5820 config-edge.aarch64 -8311a2b71d68a8941b8dd04581db898568ba6d58d67dcd884c78a93c5f46eea95ef161d501aa75a2d1fa159f083b1652b3b37097978bf54c6c891bb1d9dce36d config-edge.armv7 -b04aed25dc6100ad8d03af746cae5baa8688c8716032decae0d6e530ceda5ce3d046879f874ea48aa5c90a25f4beeccf10d776a68d328af235d25cb01abbee0c config-edge.x86_64" +86bbdd23e0ace2273ca03868a3414f943c9e7759945ee2c6c7171acb286e25366137ba4d9a65c89c3dcca12b03e1c32c6e9fdcbd5f6a85a4025ef00ae65a1c28 patch-5.7.12.xz +e963fc9076410029a48c825e02ee4729ef2c1bbce169912d9a730e2daa219c95974849c020e8c1e145ac4f4a14cfc3ddbd5c8ff395cef5694d930924087dc67b config-edge.aarch64 +492d53569148c8b1ba76f4356f72052adf71720dedb38a8ed3019ba0c0e7de736f4fe99a7e243e536c3329ce7a20e851a5f68d5060e4b629a469a84cffe8e540 config-edge.armv7 +60d44b867bf5a6acb53dd2eb2aabafc87a217f1fe247f2705060a7cb112c10f3a886d0018c4b390a24b0aea3713ef3a1f6fddf0c4697fa2833d4f7e2f676c4eb config-edge.x86_64" diff --git a/testing/linux-edge/config-edge.aarch64 b/testing/linux-edge/config-edge.aarch64 index 429f390c586..651778e0226 100644 --- a/testing/linux-edge/config-edge.aarch64 +++ b/testing/linux-edge/config-edge.aarch64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 5.7.11 Kernel Configuration +# Linux/arm64 5.7.12 Kernel Configuration # # @@ -256,7 +256,6 @@ CONFIG_FIX_EARLYCON_MEM=y CONFIG_PGTABLE_LEVELS=4 CONFIG_ARCH_SUPPORTS_UPROBES=y CONFIG_ARCH_PROC_KCORE_TEXT=y -CONFIG_BROKEN_GAS_INST=y # # Platform selection @@ -403,6 +402,7 @@ CONFIG_SETEND_EMULATION=y # CONFIG_ARM64_HW_AFDBM=y CONFIG_ARM64_PAN=y +CONFIG_ARM64_LSE_ATOMICS=y CONFIG_ARM64_USE_LSE_ATOMICS=y CONFIG_ARM64_VHE=y # end of ARMv8.1 architectural features @@ -419,6 +419,10 @@ CONFIG_ARM64_CNP=y # # ARMv8.3 architectural features # +# CONFIG_ARM64_PTR_AUTH is not set +CONFIG_CC_HAS_BRANCH_PROT_PAC_RET=y +CONFIG_CC_HAS_SIGN_RETURN_ADDRESS=y +CONFIG_AS_HAS_PAC=y CONFIG_AS_HAS_CFI_NEGATE_RA_STATE=y # end of ARMv8.3 architectural features @@ -439,6 +443,8 @@ CONFIG_ARM64_SVE=y CONFIG_ARM64_MODULE_PLTS=y # CONFIG_ARM64_PSEUDO_NMI is not set # CONFIG_RANDOMIZE_BASE is not set +CONFIG_CC_HAVE_STACKPROTECTOR_SYSREG=y +CONFIG_STACKPROTECTOR_PER_TASK=y # end of Kernel Features # diff --git a/testing/linux-edge/config-edge.armv7 b/testing/linux-edge/config-edge.armv7 index 8f143756505..32ad9b7f147 100644 --- a/testing/linux-edge/config-edge.armv7 +++ b/testing/linux-edge/config-edge.armv7 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 5.7.11 Kernel Configuration +# Linux/arm 5.7.12 Kernel Configuration # # diff --git a/testing/linux-edge/config-edge.x86_64 b/testing/linux-edge/config-edge.x86_64 index 119e04e2d64..79516cd94bd 100644 --- a/testing/linux-edge/config-edge.x86_64 +++ b/testing/linux-edge/config-edge.x86_64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86_64 5.7.11 Kernel Configuration +# Linux/x86_64 5.7.12 Kernel Configuration # # |