From a499619c0f0fdd7ab3769ada154eba82cd87765c Mon Sep 17 00:00:00 2001 From: Hakusai Zhang Date: Sat, 11 Jan 2025 18:41:28 +0800 Subject: [PATCH 1/2] bundle: add linux_kernel_version feature. Currently master switched to linux-6.6 but it can't successful build for many devices. Add ability to change linux_kernel_verison on vendor's device config.json. demo config.json: ``` { ... subsystems: { ... { "subsystem": "kernel", "components":[ { "component": "linux", "features": [ "linux_kernel_version=linux-5.10" ] } ] } ... } ... } ``` Signed-off-by: Hakusai Zhang Change-Id: Ide39146fce6042ae6dd23ce248c486d99fe7effd --- bundle.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/bundle.json b/bundle.json index 29623a9..24f5ea6 100644 --- a/bundle.json +++ b/bundle.json @@ -16,7 +16,9 @@ "subsystem": "kernel", "syscap": [ ], - "features": [], + "features": [ + "linux_kernel_version" + ], "adapted_system_type": [ "standard" ], -- Gitee From 321368ecc19547ae03d1e9974ce41007d61105ff Mon Sep 17 00:00:00 2001 From: Hakusai Zhang Date: Sat, 11 Jan 2025 18:44:54 +0800 Subject: [PATCH 2/2] kernel: fix build for x86 When build kernel for x86_64 machine, build script passed ARCH=x86_64 to kernel make commands. But ARCH variable for x86_64 is also x86, just fix that. Signed-off-by: Hakusai Zhang Change-Id: Id7f0bd22ee17614472352e066eefd8bc39026b4d --- kernel.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/kernel.mk b/kernel.mk index 34d4740..98ad915 100644 --- a/kernel.mk +++ b/kernel.mk @@ -49,6 +49,7 @@ else ifeq ($(KERNEL_ARCH), riscv64) else ifeq ($(KERNEL_ARCH), x86_64) KERNEL_TARGET_TOOLCHAIN := gcc KERNEL_TARGET_TOOLCHAIN_PREFIX := + KERNEL_ARCH := x86 else ifeq ($(KERNEL_ARCH), loongarch64) KERNEL_TARGET_TOOLCHAIN := $(PREBUILTS_GCC_DIR)/linux-x86/loongarch64/gcc-loongarch64-linux-gnu/bin KERNEL_TARGET_TOOLCHAIN_PREFIX := $(KERNEL_TARGET_TOOLCHAIN)/loongarch64-unknown-linux-gnu- -- Gitee