summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Runge2022-09-06 14:17:16 +0200
committerDavid Runge2022-09-06 14:17:16 +0200
commit05938c1efea823b5daf18724c57ffe8f2e102034 (patch)
tree0016ea30f4109e7ac4eed0c31a76ecdc6b8e882b
parent136589322cf3b96615f8dc21f0a04a938d41af45 (diff)
downloadaur-05938c1efea823b5daf18724c57ffe8f2e102034.tar.gz
Upgrade to 5.15.65.49.realtime1
PKGBUILD: Upgrade to 5.15.65.49.realtime1 and consolidate with core/linux-lts. config: Consolidate config with kernel 5.15.65.
-rw-r--r--.SRCINFO11
-rw-r--r--PKGBUILD17
-rw-r--r--config27
3 files changed, 30 insertions, 25 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 1793573ec281..97593a716401 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
pkgbase = linux-rt-lts
pkgdesc = Linux RT LTS
- pkgver = 5.15.55.48.realtime1
+ pkgver = 5.15.65.49.realtime1
pkgrel = 1
- url = https://gitlab.archlinux.org/dvzrv/linux-rt-lts/-/commits/v5.15.55.48.realtime1
+ url = https://gitlab.archlinux.org/dvzrv/linux-rt-lts/-/commits/v5.15.65.49.realtime1
arch = x86_64
license = GPL2
makedepends = bc
@@ -17,16 +17,16 @@ pkgbase = linux-rt-lts
makedepends = texlive-latexextra
makedepends = xmlto
options = !strip
- source = git+https://gitlab.archlinux.org/dvzrv/linux-rt-lts.git/#tag=v5.15.55.48.realtime1?signed
+ source = git+https://gitlab.archlinux.org/dvzrv/linux-rt-lts.git/#tag=v5.15.65.49.realtime1?signed
source = config
validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E
validpgpkeys = 5ED9A48FC54C0A22D1D0804CEBC26CDB5A56DE73
validpgpkeys = C7E7849466FE2358343588377258734B41C31549
validpgpkeys = 991F6E3F0765CF6295888586139B09DA5BF0D338
sha512sums = SKIP
- sha512sums = d8e8a9df3ce628c4aad3a388693175896581b59c4af16d885ef11f2e556b49fde3d40ebc7502793226e40af31cd5fb788d11b2521014a052671c3304d3ad83c7
+ sha512sums = 0a1f653efd3307ed9989f21913f403c98308e7b4bb59ac27ff555f50163cd73829ba3b4cf9121f88a914636a65780903ea482516c2f34eccdda09897edca3a8b
b2sums = SKIP
- b2sums = 1048525ac8a9ba90cf31b46309c131b1c18ddac852b6b0150e4d1e497bb2ebe85625019de4fda02d403e6ccfdf541829b11cb54148305eddc8f9097ca0082dd8
+ b2sums = 55a368265cfa28c5df3b8e4e2f1ccf9e489cca57d55dda80d885fc64f45e368f53cc3bdd62e305866ea275883cd94d2f60ebc82f525d95a780d70bb6ec555fa6
pkgname = linux-rt-lts
pkgdesc = The Linux RT LTS kernel and modules
@@ -37,6 +37,7 @@ pkgname = linux-rt-lts
optdepends = linux-firmware: firmware images needed for some devices
provides = VIRTUALBOX-GUEST-MODULES
provides = WIREGUARD-MODULE
+ provides = KSMBD-MODULE
pkgname = linux-rt-lts-headers
pkgdesc = Headers and scripts for building modules for the Linux RT LTS kernel
diff --git a/PKGBUILD b/PKGBUILD
index 9ea1ca16eed2..6654f53e491d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
# Contributor: Joakim Hernberg <jbh@alchemy.lu>
pkgbase=linux-rt-lts
-pkgver=5.15.55.48.realtime1
+pkgver=5.15.65.49.realtime1
pkgrel=1
pkgdesc='Linux RT LTS'
arch=(x86_64)
@@ -16,9 +16,9 @@ source=(
config
)
sha512sums=('SKIP'
- 'd8e8a9df3ce628c4aad3a388693175896581b59c4af16d885ef11f2e556b49fde3d40ebc7502793226e40af31cd5fb788d11b2521014a052671c3304d3ad83c7')
+ '0a1f653efd3307ed9989f21913f403c98308e7b4bb59ac27ff555f50163cd73829ba3b4cf9121f88a914636a65780903ea482516c2f34eccdda09897edca3a8b')
b2sums=('SKIP'
- '1048525ac8a9ba90cf31b46309c131b1c18ddac852b6b0150e4d1e497bb2ebe85625019de4fda02d403e6ccfdf541829b11cb54148305eddc8f9097ca0082dd8')
+ '55a368265cfa28c5df3b8e4e2f1ccf9e489cca57d55dda80d885fc64f45e368f53cc3bdd62e305866ea275883cd94d2f60ebc82f525d95a780d70bb6ec555fa6')
validpgpkeys=(
'647F28654894E3BD457199BE38DBBDC86092693E' # Greg Kroah-Hartman <gregkh@linuxfoundation.org>
'5ED9A48FC54C0A22D1D0804CEBC26CDB5A56DE73' # Steven Rostedt (Der Hacker) <rostedt@goodmis.org>
@@ -60,8 +60,7 @@ prepare() {
build() {
cd $pkgbase
- make all
- make htmldocs
+ make htmldocs all
}
_package() {
@@ -69,7 +68,7 @@ _package() {
depends=(coreutils initramfs kmod)
optdepends=('wireless-regdb: to set the correct wireless channels of your country'
'linux-firmware: firmware images needed for some devices')
- provides=(VIRTUALBOX-GUEST-MODULES WIREGUARD-MODULE)
+ provides=(VIRTUALBOX-GUEST-MODULES WIREGUARD-MODULE KSMBD-MODULE)
cd $pkgbase
local kernver="$(<version)"
@@ -105,11 +104,11 @@ _package-headers() {
install -Dt "$builddir/arch/x86" -m644 arch/x86/Makefile
cp -t "$builddir" -a scripts
- # add objtool for external module building and enabled VALIDATION_STACK option
+ # required when STACK_VALIDATION is enabled
install -Dt "$builddir/tools/objtool" tools/objtool/objtool
- # add xfs and shmem for aufs building
- mkdir -p "$builddir"/{fs/xfs,mm}
+ # required when DEBUG_INFO_BTF_MODULES is enabled
+ install -Dt "$builddir/tools/bpf/resolve_btfids" tools/bpf/resolve_btfids/resolve_btfids
echo "Installing headers..."
cp -t "$builddir" -a include
diff --git a/config b/config
index 76457f5c1bef..500983c05c07 100644
--- a/config
+++ b/config
@@ -1,10 +1,10 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.15.55 Kernel Configuration
+# Linux/x86 5.15.65 Kernel Configuration
#
-CONFIG_CC_VERSION_TEXT="gcc (GCC) 12.1.1 20220730"
+CONFIG_CC_VERSION_TEXT="gcc (GCC) 12.2.0"
CONFIG_CC_IS_GCC=y
-CONFIG_GCC_VERSION=120101
+CONFIG_GCC_VERSION=120200
CONFIG_CLANG_VERSION=0
CONFIG_AS_IS_GNU=y
CONFIG_AS_VERSION=23900
@@ -117,7 +117,7 @@ CONFIG_BPF_SYSCALL=y
CONFIG_BPF_JIT=y
CONFIG_BPF_JIT_ALWAYS_ON=y
CONFIG_BPF_JIT_DEFAULT_ON=y
-# CONFIG_BPF_UNPRIV_DEFAULT_OFF is not set
+CONFIG_BPF_UNPRIV_DEFAULT_OFF=y
CONFIG_USERMODE_DRIVER=y
CONFIG_BPF_PRELOAD=y
CONFIG_BPF_PRELOAD_UMD=m
@@ -349,9 +349,6 @@ CONFIG_X86_FEATURE_NAMES=y
CONFIG_X86_X2APIC=y
CONFIG_X86_MPPARSE=y
# CONFIG_GOLDFISH is not set
-CONFIG_RETPOLINE=y
-CONFIG_CC_HAS_SLS=y
-# CONFIG_SLS is not set
CONFIG_X86_CPU_RESCTRL=y
# CONFIG_X86_EXTENDED_PLATFORM is not set
CONFIG_X86_INTEL_LPSS=y
@@ -518,6 +515,16 @@ CONFIG_HAVE_LIVEPATCH=y
# CONFIG_LIVEPATCH is not set
# end of Processor type and features
+CONFIG_CC_HAS_SLS=y
+CONFIG_CC_HAS_RETURN_THUNK=y
+CONFIG_SPECULATION_MITIGATIONS=y
+CONFIG_PAGE_TABLE_ISOLATION=y
+CONFIG_RETPOLINE=y
+CONFIG_RETHUNK=y
+CONFIG_CPU_UNRET_ENTRY=y
+CONFIG_CPU_IBPB_ENTRY=y
+CONFIG_CPU_IBRS_ENTRY=y
+# CONFIG_SLS is not set
CONFIG_ARCH_HAS_ADD_PAGES=y
CONFIG_ARCH_MHP_MEMMAP_ON_MEMORY_ENABLE=y
CONFIG_USE_PERCPU_NUMA_NODE_ID=y
@@ -752,6 +759,7 @@ CONFIG_HAVE_KPROBES_ON_FTRACE=y
CONFIG_HAVE_FUNCTION_ERROR_INJECTION=y
CONFIG_HAVE_NMI=y
CONFIG_TRACE_IRQFLAGS_SUPPORT=y
+CONFIG_TRACE_IRQFLAGS_NMI_SUPPORT=y
CONFIG_HAVE_ARCH_TRACEHOOK=y
CONFIG_HAVE_DMA_CONTIGUOUS=y
CONFIG_GENERIC_SMP_IDLE_THREAD=y
@@ -9979,7 +9987,6 @@ CONFIG_SECURITY_DMESG_RESTRICT=y
CONFIG_SECURITY=y
CONFIG_SECURITYFS=y
CONFIG_SECURITY_NETWORK=y
-CONFIG_PAGE_TABLE_ISOLATION=y
CONFIG_SECURITY_INFINIBAND=y
CONFIG_SECURITY_NETWORK_XFRM=y
CONFIG_SECURITY_PATH=y
@@ -10160,8 +10167,7 @@ CONFIG_CRYPTO_CRC32=m
CONFIG_CRYPTO_CRC32_PCLMUL=m
CONFIG_CRYPTO_XXHASH=m
CONFIG_CRYPTO_BLAKE2B=m
-CONFIG_CRYPTO_BLAKE2S=m
-CONFIG_CRYPTO_BLAKE2S_X86=m
+CONFIG_CRYPTO_BLAKE2S_X86=y
CONFIG_CRYPTO_CRCT10DIF=y
CONFIG_CRYPTO_CRCT10DIF_PCLMUL=m
CONFIG_CRYPTO_GHASH=m
@@ -10751,7 +10757,6 @@ CONFIG_IO_STRICT_DEVMEM=y
#
# x86 Debugging
#
-CONFIG_TRACE_IRQFLAGS_NMI_SUPPORT=y
CONFIG_EARLY_PRINTK_USB=y
# CONFIG_X86_VERBOSE_BOOTUP is not set
CONFIG_EARLY_PRINTK=y