From 571d0cc767b136ac4460d418ebbeefde8c2a547a Mon Sep 17 00:00:00 2001 From: Zheng Zengkai Date: Fri, 3 Feb 2023 18:50:16 +0800 Subject: [PATCH] Release 6.1.8-2.0.0.6 config: disable CONFIG_EFI_ZBOOT by default Signed-off-by: Zheng Zengkai --- ...-disable-CONFIG_EFI_ZBOOT-by-default.patch | 53 +++++++++++++++++++ kernel.spec | 10 +++- 2 files changed, 61 insertions(+), 2 deletions(-) create mode 100644 0004-config-disable-CONFIG_EFI_ZBOOT-by-default.patch diff --git a/0004-config-disable-CONFIG_EFI_ZBOOT-by-default.patch b/0004-config-disable-CONFIG_EFI_ZBOOT-by-default.patch new file mode 100644 index 0000000..cdf54eb --- /dev/null +++ b/0004-config-disable-CONFIG_EFI_ZBOOT-by-default.patch @@ -0,0 +1,53 @@ +From 6fbc58368796705497c61fd8093cfadb0c35abcd Mon Sep 17 00:00:00 2001 +From: Xie XiuQi +Date: Wed, 1 Feb 2023 17:52:52 +0800 +Subject: [PATCH] config: disable CONFIG_EFI_ZBOOT by default + +CONFIG_EFI_ZBOOT is introduced to openEuler 22.03 LTS SP1 by this +commit for loongarch and enabled by default: + e46780727555("efi/libstub: implement generic EFI zboot"). + +However, if is enabled, the compiled version cannot be booted on +openEuler 22.03 LTS. So, disable it on this version. + +Signed-off-by: Xie XiuQi +Signed-off-by: Zheng Zengkai +--- + arch/arm64/configs/openeuler_defconfig | 14 +------------- + 1 file changed, 1 insertion(+), 13 deletions(-) + +diff --git a/arch/arm64/configs/openeuler_defconfig b/arch/arm64/configs/openeuler_defconfig +index fbb71f7520a8..63f2adbbc778 100644 +--- a/arch/arm64/configs/openeuler_defconfig ++++ b/arch/arm64/configs/openeuler_defconfig +@@ -15,18 +15,6 @@ CONFIG_INIT_ENV_ARG_LIMIT=32 + CONFIG_LOCALVERSION="" + # CONFIG_LOCALVERSION_AUTO is not set + CONFIG_BUILD_SALT="" +-CONFIG_HAVE_KERNEL_GZIP=y +-CONFIG_HAVE_KERNEL_LZMA=y +-CONFIG_HAVE_KERNEL_XZ=y +-CONFIG_HAVE_KERNEL_LZO=y +-CONFIG_HAVE_KERNEL_LZ4=y +-CONFIG_HAVE_KERNEL_ZSTD=y +-CONFIG_KERNEL_GZIP=y +-# CONFIG_KERNEL_LZMA is not set +-# CONFIG_KERNEL_XZ is not set +-# CONFIG_KERNEL_LZO is not set +-# CONFIG_KERNEL_LZ4 is not set +-# CONFIG_KERNEL_ZSTD is not set + CONFIG_DEFAULT_INIT="" + CONFIG_DEFAULT_HOSTNAME="(none)" + CONFIG_SYSVIPC=y +@@ -2008,7 +1996,7 @@ CONFIG_EFI_SOFT_RESERVE=y + CONFIG_EFI_PARAMS_FROM_FDT=y + CONFIG_EFI_RUNTIME_WRAPPERS=y + CONFIG_EFI_GENERIC_STUB=y +-CONFIG_EFI_ZBOOT=y ++# CONFIG_EFI_ZBOOT is not set + CONFIG_EFI_ARMSTUB_DTB_LOADER=y + CONFIG_EFI_GENERIC_STUB_INITRD_CMDLINE_LOADER=y + # CONFIG_EFI_BOOTLOADER_CONTROL is not set +-- +2.25.1 + diff --git a/kernel.spec b/kernel.spec index fd600e6..833f728 100644 --- a/kernel.spec +++ b/kernel.spec @@ -10,9 +10,9 @@ %global upstream_version 6.1 %global upstream_sublevel 8 -%global devel_release 1 +%global devel_release 2 %global maintenance_release .0.0 -%global pkg_release .5 +%global pkg_release .6 %define with_debuginfo 0 # Do not recompute the build-id of vmlinux in find-debuginfo.sh @@ -73,6 +73,7 @@ Source9998: patches.tar.bz2 Patch0001: 0001-kconfig-Add-script-to-update-openeuler_defconfig.patch Patch0002: 0002-config-add-initial-openeuler_defconfig-for-arm64.patch Patch0003: 0003-config-add-initial-openeuler_defconfig-for-x86_64.patch +Patch0004: 0004-config-disable-CONFIG_EFI_ZBOOT-by-default.patch #BuildRequires: BuildRequires: module-init-tools, patch >= 2.5.4, bash >= 2.03, tar @@ -300,6 +301,7 @@ Applypatches series.conf %{_builddir}/kernel-%{version}/linux-%{KernelVer} %patch0001 -p1 %patch0002 -p1 %patch0003 -p1 +%patch0004 -p1 touch .scmversion find . \( -name "*.orig" -o -name "*~" \) -exec rm -f {} \; >/dev/null @@ -882,6 +884,10 @@ fi %endif %changelog +* Fri Feb 3 2023 Zheng Zengkai - 6.1.8-2.0.0.6 +- update to v6.1.8-2.0.0.6 +- config: disable CONFIG_EFI_ZBOOT by default + * Fri Jan 29 2023 Xie XiuQi - 6.1.8-1.0.0.5 - update to v6.1.8