443773aaa9
This commit upgrades the Linux kernel to 6.12.18 from 6.6.x, which comes
from the linux-yocto upstream.
The following changes we made to support the kernel upgrade.
For linux debian package deb_patches folder.
We adapt the kernel related patch for 6.12.18, and cherry pick the
following 8 commits to support to build the kernel 6.12.x.
1) commit f77deecbb5d4 "d/rules.real: Unset KBUILD_HOSTCFLAGS etc.
instead of overriding to be empty"
https://salsa.debian.org/kernel-team/linux/-/commit/f77deecbb5d4
2) commit 0d0d62b7d1cc "d/rules.d/Makefile.inc: Add scripts/include to
header include path"
https://salsa.debian.org/kernel-team/linux/-/commit/0d0d62b7d1cc
3) commit 4ad01663251d "[x86] linux-cpupower: Update turbostat Makefile
to define BUILD_BUG_HEADER"
https://salsa.debian.org/kernel-team/linux/-/commit/4ad01663251d
4) commit fced95b415be "hyperv-daemons: Update for upstream removal of
hv_fcopy_daemon"
https://salsa.debian.org/kernel-team/linux/-/commit/fced95b415be
5) commit 3a17dcbfe0be "d/rules.d/certs: Add newly required include
directory to CPPFLAGS"
https://salsa.debian.org/kernel-team/linux/-/commit/3a17dcbfe0be
6) commit 15b6859742d4 "Disable building rtla, since bullseye's
libtraceevent and libtracefs are too old"
https://salsa.debian.org/kernel-team/linux/-/commit/15b6859742d4
7) commit b4b93560d441 "[ia64] Drop all ia64 configs due to upstream
dropping IA64 arch"
https://salsa.debian.org/kernel-team/linux/-/commit/b4b93560d441
8) commit b93faa99519d "linux-kbuild: Add scripts/module-common.c
(Closes: #1087495)"
https://salsa.debian.org/kernel-team/linux/-/commit/b93faa99519d
For the Linux source code patches folder.
1) We adapt the patch 0001, 0003, 0005, 0006, 0010, 0014 and 0017 based
on kernel-6.12.18.
2) Remove all the ice port back patches because that has been included
in our source code.
For the kernel config.
We enable CONFIG_CPUSETS_V1 and CONFIG_MEMCG_V1 to fix install issue.
Verification:
- Build kernel and out of tree modules success for rt and std.
- Build iso success for rt and std.
- Install success onto a All-in-One lab with rt kernel, and can
switch to std kernel.
- Boot up successfully in the lab.
- The sanity testing was run and the test results PASS.
- The cyclictest benchmark was also run on the starlingx lab, the result
is "samples: 43199996 avg: 1656.295 std_dev: 67.617 max: 8827
99.9999th percentile: 8652“，It is worse than linux-6.6.x.
- The network performance test had been done. For TCP, better than
kernel-6.6.x, for UDP, a little worse than kernel-6.6.x, for STCP,
can not do the test that is same with kernel-6.6.x.
Story: 2011384
Task: 51856
Change-Id: I06ff2f3ab3620fe887f1e5e72ea9022a0cea6102
Signed-off-by: Jiping Ma <jiping.ma2@windriver.com>
45 lines
2.0 KiB
Diff
45 lines
2.0 KiB
Diff
From 7002ca5a870f7deb4e40fda2d2f8834b2af16176 Mon Sep 17 00:00:00 2001
|
|
From: Ben Hutchings <benh@debian.org>
|
|
Date: Mon, 5 Aug 2024 04:30:36 +0200
|
|
Subject: [PATCH 14/20] d/rules.real: Unset KBUILD_HOSTCFLAGS etc. instead of
|
|
overriding to be empty
|
|
|
|
The upstream Makefile tries to add some flags to KBUILD_HOSTCFLAGS,
|
|
and now fails to build anything if we override it to be empty:
|
|
|
|
.../scripts/kconfig/util.c:11:10: fatal error: hashtable.h: No such file or directory
|
|
11 | #include <hashtable.h>
|
|
| ^~~~~~~~~~~~~
|
|
compilation terminated.
|
|
|
|
Instead of overriding these flags variables to be empty, unset them in
|
|
the environment.
|
|
|
|
(cherry picked from commit f77deecbb5d46f1f5034f348952152b0c2d584f7)
|
|
Signed-off-by: Jiping Ma <jiping.ma2@windriver.com>
|
|
---
|
|
debian/rules.real | 4 +++-
|
|
1 file changed, 3 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/debian/rules.real b/debian/rules.real
|
|
index 19b3d7d..00f2a33 100644
|
|
--- a/debian/rules.real
|
|
+++ b/debian/rules.real
|
|
@@ -42,10 +42,12 @@ undefine LANGUAGE
|
|
stamp = [ -d $(dir $@) ] || mkdir $(dir $@); touch $@
|
|
|
|
setup_env := env -u ABINAME -u ARCH -u FEATURESET -u FLAVOUR -u VERSION -u LOCALVERSION
|
|
+# XXX: All the tools leak flags between host and build all the time, just don't care. See #1050991.
|
|
+setup_env += -u KBUILD_HOSTCFLAGS -u HOSTCFLAGS -u KBUILD_HOSTLDFLAGS
|
|
setup_env += DISTRIBUTION_OFFICIAL_BUILD=1 DISTRIBUTOR="$(DISTRIBUTOR)" DISTRIBUTION_VERSION="$(SOURCEVERSION)" KBUILD_BUILD_TIMESTAMP="$(SOURCE_DATE)" KBUILD_BUILD_VERSION_TIMESTAMP="StarlingX $(DISTRIBUTOR) $(SOURCEVERSION) ($(SOURCE_DATE_UTC_ISO))"
|
|
setup_env += KBUILD_VERBOSE=$(if $(filter terse,$(DEB_BUILD_OPTIONS)),0,1)
|
|
|
|
-MAKE_CLEAN = $(setup_env) $(MAKE) KCFLAGS=-fdebug-prefix-map=$(CURDIR)/= KBUILD_HOSTCFLAGS='$(CFLAGS) $(CPPFLAGS)' HOSTCFLAGS='$(CFLAGS) $(CPPFLAGS)' KBUILD_HOSTLDFLAGS='$(LDFLAGS)'
|
|
+MAKE_CLEAN = $(setup_env) $(MAKE) KCFLAGS=-fdebug-prefix-map=$(CURDIR)/=
|
|
MAKE_SELF := $(MAKE) -f debian/rules.real $(MAKEOVERRIDES)
|
|
MAKEOVERRIDES =
|
|
|
|
--
|
|
2.47.1
|
|
|