mirror of
https://github.com/flatcar/scripts.git
synced 2026-05-04 19:56:32 +02:00
kernel: upgrade from 6.6 to 6.12.20
This commit is contained in:
Adrian Vladu
parent
3d9ec51471
commit
1a87217709
@ -1,2 +1,2 @@
|
||||
DIST linux-6.6.tar.xz 140064536 BLAKE2B 5f02fd8696d42f7ec8c5fbadec8e7270bdcfcb1f9844a6c4db3e1fd461c93ce1ccda650ca72dceb4890ebcbbf768ba8fba0bce91efc49fbd2c307b04e95665f2 SHA512 458b2c34d46206f9b4ccbac54cc57aeca1eaecaf831bc441e59701bac6eadffc17f6ce24af6eadd0454964e843186539ac0d63295ad2cc32d112b60360c39a35
|
||||
DIST patch-6.6.83.xz 4030820 BLAKE2B 6be60eda7d6d383f3aee8028e7a90f68fce40ea1253d64ae898ae43a2409e59b0e7871f73e67e28059504a4fa5ee2d1b62b4d79385dec8440588c9c58976068b SHA512 84a3b6dac6cad984044fa9d87153a6a7b4fc16ffb526658d918fa56ccffafbe973aa8347af4574a44733861076067db90e6f84d3eb375aa5cde6e4db255c0940
|
||||
DIST linux-6.12.tar.xz 147906904 BLAKE2B b2ec2fc69218cacabbbe49f78384a5d259ca581b717617c12b000b16f4a4c59ee348ea886b37147f5f70fb9a7a01c1e2c8f19021078f6b23f5bc62d1c48d5e5e SHA512 a37b1823df7b4f72542f689b65882634740ba0401a42fdcf6601d9efd2e132e5a7650e70450ba76f6cd1f13ca31180f2ccee9d54fe4df89bc0000ade4380a548
|
||||
DIST patch-6.12.20.xz 1432116 BLAKE2B cc42fce6584baa82dcf513e62433a61b8d90562648f64d7795e58ec3de0c5449b3685e05a0cb0f9c46b08faa7edf6d6b7edd3520fbc1fabbbb5b8fba2d528299 SHA512 a1568d4233d900f95fa4394147acdc37498582b050fd6a111506f680636b50b6725bf99d76f4f3613d5af5e50d3e46929d718dae3a59f2174ff53477bef83825
|
||||
|
||||
@ -0,0 +1,41 @@
|
||||
# Copyright 2014 CoreOS, Inc.
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
ETYPE="sources"
|
||||
|
||||
# -rc releases should be versioned L.M_rcN
|
||||
# Final releases should be versioned L.M.N, even for N == 0
|
||||
|
||||
# Only needed for RCs
|
||||
K_BASE_VER="5.15"
|
||||
|
||||
inherit kernel-2
|
||||
EXTRAVERSION="-flatcar"
|
||||
detect_version
|
||||
|
||||
DESCRIPTION="Full sources for the CoreOS Linux kernel"
|
||||
HOMEPAGE="http://www.kernel.org"
|
||||
if [[ "${PV%%_rc*}" != "${PV}" ]]; then
|
||||
SRC_URI="https://git.kernel.org/torvalds/p/v${KV%-coreos}/v${OKV} -> patch-${KV%-coreos}.patch ${KERNEL_BASE_URI}/linux-${OKV}.tar.xz"
|
||||
PATCH_DIR="${FILESDIR}/${KV_MAJOR}.${KV_PATCH}"
|
||||
else
|
||||
SRC_URI="${KERNEL_URI}"
|
||||
PATCH_DIR="${FILESDIR}/${KV_MAJOR}.${KV_MINOR}"
|
||||
fi
|
||||
|
||||
# make modules_prepare depends on pahole
|
||||
RDEPEND="dev-util/pahole"
|
||||
|
||||
KEYWORDS="amd64 arm64"
|
||||
IUSE=""
|
||||
|
||||
# XXX: Note we must prefix the patch filenames with "z" to ensure they are
|
||||
# applied _after_ a potential patch-${KV}.patch file, present when building a
|
||||
# patchlevel revision. We mustn't apply our patches first, it fails when the
|
||||
# local patches overlap with the upstream patch.
|
||||
UNIPATCH_LIST="
|
||||
${PATCH_DIR}/z0001-kbuild-derive-relative-path-for-srctree-from-CURDIR.patch \
|
||||
${PATCH_DIR}/z0002-revert-pahole-flags.patch \
|
||||
${PATCH_DIR}/z0003-Revert-x86-boot-Remove-the-bugger-off-message.patch \
|
||||
"
|
||||
@ -0,0 +1,71 @@
|
||||
From e7593854f521ec21786fc7bfe5777b35dc627b9d Mon Sep 17 00:00:00 2001
|
||||
From: Adrian Vladu <avladu@cloudbasesolutions.com>
|
||||
Date: Wed, 11 Sep 2024 11:14:26 +0000
|
||||
Subject: [PATCH] pahole: remove parallel -j flag
|
||||
|
||||
When pahole is executed with -j (parallel) then btf metadata order is
|
||||
non-deterministic and the built kernel and modules don't match.
|
||||
---
|
||||
init/Kconfig | 2 +-
|
||||
lib/Kconfig.debug | 9 ---------
|
||||
scripts/Makefile.btf | 4 +---
|
||||
3 files changed, 2 insertions(+), 13 deletions(-)
|
||||
|
||||
diff --git a/init/Kconfig b/init/Kconfig
|
||||
index 9684e5d2b81c..c8544aa6856a 100644
|
||||
--- a/init/Kconfig
|
||||
+++ b/init/Kconfig
|
||||
@@ -1889,7 +1889,7 @@ config RUST
|
||||
depends on !GCC_PLUGINS
|
||||
depends on !RANDSTRUCT
|
||||
depends on !SHADOW_CALL_STACK
|
||||
- depends on !DEBUG_INFO_BTF || PAHOLE_HAS_LANG_EXCLUDE
|
||||
+ depends on !DEBUG_INFO_BTF
|
||||
help
|
||||
Enables Rust support in the kernel.
|
||||
|
||||
diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
|
||||
index 59b6765d86b8..611dfcce9335 100644
|
||||
--- a/lib/Kconfig.debug
|
||||
+++ b/lib/Kconfig.debug
|
||||
@@ -398,15 +398,6 @@ config PAHOLE_HAS_BTF_TAG
|
||||
btf_decl_tag) or not. Currently only clang compiler implements
|
||||
these attributes, so make the config depend on CC_IS_CLANG.
|
||||
|
||||
-config PAHOLE_HAS_LANG_EXCLUDE
|
||||
- def_bool PAHOLE_VERSION >= 124
|
||||
- help
|
||||
- Support for the --lang_exclude flag which makes pahole exclude
|
||||
- compilation units from the supplied language. Used in Kbuild to
|
||||
- omit Rust CUs which are not supported in version 1.24 of pahole,
|
||||
- otherwise it would emit malformed kernel and module binaries when
|
||||
- using DEBUG_INFO_BTF_MODULES.
|
||||
-
|
||||
config DEBUG_INFO_BTF_MODULES
|
||||
bool "Generate BTF type information for kernel modules"
|
||||
default y
|
||||
diff --git a/scripts/Makefile.btf b/scripts/Makefile.btf
|
||||
index 2d6e5ed9081e..291bfdab7a9b 100644
|
||||
--- a/scripts/Makefile.btf
|
||||
+++ b/scripts/Makefile.btf
|
||||
@@ -12,8 +12,6 @@ endif
|
||||
|
||||
pahole-flags-$(call test-ge, $(pahole-ver), 121) += --btf_gen_floats
|
||||
|
||||
-pahole-flags-$(call test-ge, $(pahole-ver), 122) += -j
|
||||
-
|
||||
ifeq ($(pahole-ver), 125)
|
||||
pahole-flags-y += --skip_encoding_btf_inconsistent_proto --btf_gen_optimized
|
||||
endif
|
||||
@@ -21,7 +19,7 @@ endif
|
||||
else
|
||||
|
||||
# Switch to using --btf_features for v1.26 and later.
|
||||
-pahole-flags-$(call test-ge, $(pahole-ver), 126) = -j --btf_features=encode_force,var,float,enum64,decl_tag,type_tag,optimized_func,consistent_func
|
||||
+pahole-flags-$(call test-ge, $(pahole-ver), 126) = --btf_features=encode_force,var,float,enum64,decl_tag,type_tag,optimized_func,consistent_func
|
||||
|
||||
endif
|
||||
|
||||
--
|
||||
2.34.1
|
||||
|
||||
@ -0,0 +1,26 @@
|
||||
From 9faff3734e6456e7927c0914829a4764ec9f1b44 Mon Sep 17 00:00:00 2001
|
||||
From: Adrian Vladu <avladu@cloudbasesolutions.com>
|
||||
Date: Tue, 17 Sep 2024 13:44:14 +0000
|
||||
Subject: [PATCH] pahole: support reproducible builds
|
||||
|
||||
---
|
||||
scripts/Makefile.btf | 3 +++
|
||||
1 file changed, 3 insertions(+)
|
||||
|
||||
diff --git a/scripts/Makefile.btf b/scripts/Makefile.btf
|
||||
index 2d6e5ed9081e..b2f88b0fcf37 100644
|
||||
--- a/scripts/Makefile.btf
|
||||
+++ b/scripts/Makefile.btf
|
||||
@@ -23,6 +23,9 @@ else
|
||||
# Switch to using --btf_features for v1.26 and later.
|
||||
pahole-flags-$(call test-ge, $(pahole-ver), 126) = -j --btf_features=encode_force,var,float,enum64,decl_tag,type_tag,optimized_func,consistent_func
|
||||
|
||||
+# Support reproducible builds.
|
||||
+pahole-flags-$(call test-ge, $(pahole-ver), 127) = -j --btf_features=encode_force,var,float,enum64,decl_tag,type_tag,optimized_func,consistent_func,reproducible_build
|
||||
+
|
||||
endif
|
||||
|
||||
pahole-flags-$(CONFIG_PAHOLE_HAS_LANG_EXCLUDE) += --lang_exclude=rust
|
||||
--
|
||||
2.34.1
|
||||
|
||||
@ -0,0 +1,35 @@
|
||||
From 0890eb69da82aec12518a5c2998afea467a0e9d7 Mon Sep 17 00:00:00 2001
|
||||
From: Adrian Vladu <avladu@cloudbasesolutions.com>
|
||||
Date: Thu, 19 Sep 2024 07:59:59 +0000
|
||||
Subject: [PATCH] tools: hv: fix cross-compilation for ARM64
|
||||
|
||||
---
|
||||
tools/hv/Makefile | 4 +++-
|
||||
1 file changed, 3 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/tools/hv/Makefile b/tools/hv/Makefile
|
||||
index 2e60e2c212cd..d72554cedbf6 100644
|
||||
--- a/tools/hv/Makefile
|
||||
+++ b/tools/hv/Makefile
|
||||
@@ -2,7 +2,9 @@
|
||||
# Makefile for Hyper-V tools
|
||||
include ../scripts/Makefile.include
|
||||
|
||||
+ifeq ($(ARCH),)
|
||||
ARCH := $(shell uname -m 2>/dev/null)
|
||||
+endif
|
||||
sbindir ?= /usr/sbin
|
||||
libexecdir ?= /usr/libexec
|
||||
sharedstatedir ?= /var/lib
|
||||
@@ -20,7 +22,7 @@ override CFLAGS += -O2 -Wall -g -D_GNU_SOURCE -I$(OUTPUT)include
|
||||
override CFLAGS += -Wno-address-of-packed-member
|
||||
|
||||
ALL_TARGETS := hv_kvp_daemon hv_vss_daemon
|
||||
-ifneq ($(ARCH), aarch64)
|
||||
+ifeq ($(filter $(ARCH),aarch64 arm64),)
|
||||
ALL_TARGETS += hv_fcopy_uio_daemon
|
||||
endif
|
||||
ALL_PROGRAMS := $(patsubst %,$(OUTPUT)%,$(ALL_TARGETS))
|
||||
--
|
||||
2.34.1
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user