Skip to content

Commit

Permalink
feat: update Linux to 5.10.27, enable 32-bit time syscalls
Browse files Browse the repository at this point in the history
This adds compat for really ancient 32-bit time kernel syscalls (as both
32 and 64-bit architectures moved to 64-bit time to avoid Y2038
problem).

Signed-off-by: Andrey Smirnov <smirnov.andrey@gmail.com>
  • Loading branch information
smira authored and talos-bot committed Apr 1, 2021
1 parent fdf4866 commit 60ce626
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 8 deletions.
6 changes: 3 additions & 3 deletions kernel/kernel-prepare/pkg.yaml
Expand Up @@ -5,10 +5,10 @@ dependencies:
- image: '{{ .TOOLS_IMAGE }}'
steps:
- sources:
- url: https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.23.tar.xz
- url: https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.27.tar.xz
destination: linux.tar.xz
sha256: f6e21c03ec6ff85b26d77c59fdab81e64707792a57593643307df192749edb6a
sha512: c5d51d9fedec04b0aac396cf3b22d133b305c1fb2a189aa512d0c42d4abf10feecdab4b8ddccc4c3b3a65a84f168d04f37fcc9bb65d7c794d20978e2ebb4faed
sha256: d99dc9662951299c53a0a8d8c8d0a72a16ff861d20e927c0f9b14f63282d69d9
sha512: 96175a9a08cfa1cdcc4ac510d29420b8b6551f2c9b2afd9b41356d31c287caf43f9ca7197c6f5ede69851fcda63606c7b6ea698e5b098a108671d7c9b2c73e30
env:
ARCH: {{ if eq .ARCH "aarch64"}}arm64{{ else if eq .ARCH "x86_64" }}x86_64{{ else }}unsupported{{ end }}
prepare:
Expand Down
5 changes: 2 additions & 3 deletions kernel/kernel/config-amd64
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
# Linux/x86 5.10.23 Kernel Configuration
# Linux/x86 5.10.27 Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.0"
CONFIG_CC_IS_GCC=y
Expand Down Expand Up @@ -759,7 +759,7 @@ CONFIG_HAVE_STACK_VALIDATION=y
CONFIG_HAVE_RELIABLE_STACKTRACE=y
CONFIG_OLD_SIGSUSPEND3=y
CONFIG_COMPAT_OLD_SIGACTION=y
# CONFIG_COMPAT_32BIT_TIME is not set
CONFIG_COMPAT_32BIT_TIME=y
CONFIG_HAVE_ARCH_VMAP_STACK=y
CONFIG_VMAP_STACK=y
CONFIG_ARCH_HAS_STRICT_KERNEL_RWX=y
Expand Down Expand Up @@ -1723,7 +1723,6 @@ CONFIG_PCIEASPM_DEFAULT=y
CONFIG_PCIE_PME=y
# CONFIG_PCIE_DPC is not set
# CONFIG_PCIE_PTM is not set
# CONFIG_PCIE_BW is not set
CONFIG_PCI_MSI=y
CONFIG_PCI_MSI_IRQ_DOMAIN=y
CONFIG_PCI_QUIRKS=y
Expand Down
3 changes: 1 addition & 2 deletions kernel/kernel/config-arm64
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
# Linux/arm64 5.10.23 Kernel Configuration
# Linux/arm64 5.10.27 Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.0"
CONFIG_CC_IS_GCC=y
Expand Down Expand Up @@ -1811,7 +1811,6 @@ CONFIG_PCIEASPM_DEFAULT=y
CONFIG_PCIE_PME=y
# CONFIG_PCIE_DPC is not set
# CONFIG_PCIE_PTM is not set
# CONFIG_PCIE_BW is not set
CONFIG_PCI_MSI=y
CONFIG_PCI_MSI_IRQ_DOMAIN=y
CONFIG_PCI_MSI_ARCH_FALLBACKS=y
Expand Down

0 comments on commit 60ce626

Please sign in to comment.