Skip to contentSkip to conversation

zephyr-kernel: drop support for 4.2.0

PATCH New [email protected] 1 participant 2 messages Apr 24

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 zephyr-kernel: drop support for 4.2.0

From: Lee Chee Yang <[email protected]>

drop EOL v4.2.0
https://docs.zephyrproject.org/latest/releases/index.html

---
 ...ry-generation-issue-in-cross-compila.patch | 106 -------
 .../zephyr-kernel/zephyr-kernel-src-4.2.0.inc | 298 ------------------
 2 files changed, 404 deletions(-)
 delete mode 100644 meta-zephyr-core/recipes-kernel/zephyr-kernel/files/0001-v4.2.0-x86-fix-efi-binary-generation-issue-in-cross-compila.patch
 delete mode 100644 meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-kernel-src-4.2.0.inc
meta-zephyr-core/recipes-kernel/zephyr-kernel/files/0001-v4.2.0-x86-fix-efi-binary-generation-issue-in-cross-compila.patch deleted +0 -106
deleted file mode 100644
index b0d0de8..0000000
@@ -1,106 +0,0 @@
-From e5886aa207e5d4f26fdbeefe7c6eae12ae0a276c Mon Sep 17 00:00:00 2001
-From: Naveen Saini <[email protected]>
-Date: Wed, 16 Apr 2025 14:51:49 +0800
-Subject: [PATCH] x86: fix efi binary generation issue in cross compilation env
-
-Set root directory for headers.
-
-Upstream-Status: Inappropriate [Cross-compilation specific]
-
-Signed-off-by: Naveen Saini <[email protected]>
----
- arch/x86/zefi/zefi.py                                       | 5 ++++-
- boards/intel/adl/CMakeLists.txt                             | 1 +
- boards/intel/ehl/CMakeLists.txt                             | 1 +
- boards/intel/rpl/CMakeLists.txt                             | 1 +
- boards/up-bridge-the-gap/up_squared/CMakeLists.txt          | 1 +
- boards/up-bridge-the-gap/up_squared_pro_7000/CMakeLists.txt | 1 +
- 6 files changed, 9 insertions(+), 1 deletion(-)
-
-diff --git a/arch/x86/zefi/zefi.py b/arch/x86/zefi/zefi.py
-index 2f9c3482bb4..a13728206f3 100755
---- a/arch/x86/zefi/zefi.py
-+++ b/arch/x86/zefi/zefi.py
-@@ -115,8 +115,10 @@ def build_elf(elf_file, include_dirs):
-     includes = []
-     for include_dir in include_dirs:
-         includes.extend(["-I", include_dir])
-+    #  Pass --sysroot path for cross compilation
-+    sysrootarg = "--sysroot=" + args.sysroot
-     cmd = ([args.compiler, "-shared", "-Wall", "-Werror", "-I."] + includes +
--           ["-fno-stack-protector", "-fpic", "-mno-red-zone", "-fshort-wchar",
-+           ["-fno-stack-protector", "-fpic", "-mno-red-zone", "-fshort-wchar", sysrootarg,
-             "-Wl,-nostdlib", "-T", ldscript, "-o", "zefi.elf", cfile])
-     verbose(" ".join(cmd))
-     subprocess.run(cmd, check = True)
-@@ -156,6 +158,7 @@ def parse_args():
-     parser.add_argument("-v", "--verbose", action="store_true", help="Verbose output")
-     parser.add_argument("-i", "--includes", required=True, nargs="+",
-                         help="Zephyr base include directories")
-+    parser.add_argument("-s", "--sysroot", required=True, help="Cross compilation --sysroot=path")
- 
-     return parser.parse_args()
- 
-diff --git a/boards/intel/adl/CMakeLists.txt b/boards/intel/adl/CMakeLists.txt
-index 6a250ca315c..867393baac6 100644
---- a/boards/intel/adl/CMakeLists.txt
-+++ b/boards/intel/adl/CMakeLists.txt
-@@ -8,6 +8,7 @@ set_property(GLOBAL APPEND PROPERTY extra_post_build_commands
-   -o ${CMAKE_OBJCOPY}
-   -i ${ZEPHYR_BASE}/include ${PROJECT_BINARY_DIR}/include/generated
-   -f ${PROJECT_BINARY_DIR}/${CONFIG_KERNEL_BIN_NAME}.elf
-+  -s ${SYSROOT_DIR}
-   $<$<BOOL:${CMAKE_VERBOSE_MAKEFILE}>:--verbose>
-   WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
- )
-diff --git a/boards/intel/ehl/CMakeLists.txt b/boards/intel/ehl/CMakeLists.txt
-index 6a250ca315c..867393baac6 100644
---- a/boards/intel/ehl/CMakeLists.txt
-+++ b/boards/intel/ehl/CMakeLists.txt
-@@ -8,6 +8,7 @@ set_property(GLOBAL APPEND PROPERTY extra_post_build_commands
-   -o ${CMAKE_OBJCOPY}
-   -i ${ZEPHYR_BASE}/include ${PROJECT_BINARY_DIR}/include/generated
-   -f ${PROJECT_BINARY_DIR}/${CONFIG_KERNEL_BIN_NAME}.elf
-+  -s ${SYSROOT_DIR}
-   $<$<BOOL:${CMAKE_VERBOSE_MAKEFILE}>:--verbose>
-   WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
- )
-diff --git a/boards/intel/rpl/CMakeLists.txt b/boards/intel/rpl/CMakeLists.txt
-index 6a250ca315c..867393baac6 100644
---- a/boards/intel/rpl/CMakeLists.txt
-+++ b/boards/intel/rpl/CMakeLists.txt
-@@ -8,6 +8,7 @@ set_property(GLOBAL APPEND PROPERTY extra_post_build_commands
-   -o ${CMAKE_OBJCOPY}
-   -i ${ZEPHYR_BASE}/include ${PROJECT_BINARY_DIR}/include/generated
-   -f ${PROJECT_BINARY_DIR}/${CONFIG_KERNEL_BIN_NAME}.elf
-+  -s ${SYSROOT_DIR}
-   $<$<BOOL:${CMAKE_VERBOSE_MAKEFILE}>:--verbose>
-   WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
- )
-diff --git a/boards/up-bridge-the-gap/up_squared/CMakeLists.txt b/boards/up-bridge-the-gap/up_squared/CMakeLists.txt
-index 98e4e9b2a82..69d5b97e116 100644
---- a/boards/up-bridge-the-gap/up_squared/CMakeLists.txt
-+++ b/boards/up-bridge-the-gap/up_squared/CMakeLists.txt
-@@ -11,6 +11,7 @@ set_property(GLOBAL APPEND PROPERTY extra_post_build_commands
-   -o ${CMAKE_OBJCOPY}
-   -i ${ZEPHYR_BASE}/include ${PROJECT_BINARY_DIR}/include/generated
-   -f ${PROJECT_BINARY_DIR}/${CONFIG_KERNEL_BIN_NAME}.elf
-+  -s ${SYSROOT_DIR}
-   $<$<BOOL:${CMAKE_VERBOSE_MAKEFILE}>:--verbose>
-   WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
- )
-diff --git a/boards/up-bridge-the-gap/up_squared_pro_7000/CMakeLists.txt b/boards/up-bridge-the-gap/up_squared_pro_7000/CMakeLists.txt
-index 6a250ca315c..867393baac6 100644
---- a/boards/up-bridge-the-gap/up_squared_pro_7000/CMakeLists.txt
-+++ b/boards/up-bridge-the-gap/up_squared_pro_7000/CMakeLists.txt
-@@ -8,6 +8,7 @@ set_property(GLOBAL APPEND PROPERTY extra_post_build_commands
-   -o ${CMAKE_OBJCOPY}
-   -i ${ZEPHYR_BASE}/include ${PROJECT_BINARY_DIR}/include/generated
-   -f ${PROJECT_BINARY_DIR}/${CONFIG_KERNEL_BIN_NAME}.elf
-+  -s ${SYSROOT_DIR}
-   $<$<BOOL:${CMAKE_VERBOSE_MAKEFILE}>:--verbose>
-   WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
- )
--- 
-2.37.3
-
meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-kernel-src-4.2.0.inc deleted +0 -298

298 lines not on this page · raw message

Signature · 1 line
2.37.3
#1 lore raw

PATCH 2/2 zephyr-kernel-test: split ZEPHYRTESTS by version

From: Lee Chee Yang <[email protected]>

---
 ...-test.inc => zephyr-kernel-test-3.7.0.inc} |  0
 .../zephyr-kernel-test-4.3.0.inc              | 66 +++++++++++++++++++
 .../zephyr-kernel/zephyr-kernel-test-all.bb   |  2 +-
 .../zephyr-kernel/zephyr-kernel-test.bb       |  2 +-
 4 files changed, 68 insertions(+), 2 deletions(-)
 rename meta-zephyr-core/recipes-kernel/zephyr-kernel/{zephyr-kernel-test.inc => zephyr-kernel-test-3.7.0.inc} (100%)
 create mode 100644 meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-kernel-test-4.3.0.inc
meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-kernel-test-3.7.0.inc renamed from meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-kernel-test.inc +0 -0
similarity index 100%
rename from meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-kernel-test.inc
rename to meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-kernel-test-3.7.0.inc
meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-kernel-test-4.3.0.inc new file +66 -0

66 lines not on this page · raw message

meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-kernel-test-all.bb +1 -1
index d9dbb40..faaf403 100644
@@ -1,7 +1,7 @@
 LICENSE = "Apache-2.0"
 INHIBIT_DEFAULT_DEPS = "1"
 
-require recipes-kernel/zephyr-kernel/zephyr-kernel-test.inc
+require recipes-kernel/zephyr-kernel/zephyr-kernel-test-${PREFERRED_VERSION_zephyr-kernel}.inc
 
 addtask testimage
 deltask compile
meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-kernel-test.bb +1 -1
index 75b1757..13532b6 100644
@@ -1,4 +1,4 @@
 require recipes-kernel/zephyr-kernel/zephyr-image.inc
-require recipes-kernel/zephyr-kernel/zephyr-kernel-test.inc
+require recipes-kernel/zephyr-kernel/zephyr-kernel-test-${PREFERRED_VERSION_zephyr-kernel}.inc
 
 BBCLASSEXTEND = '${@" ".join(["zephyrtest:" + x for x in d.getVar("ZEPHYRTESTS", True).split()])}'
Signature · 1 line
2.37.3