From 1af0d4cb288b36548895967f0cf553d6f393d495 Mon Sep 17 00:00:00 2001 From: Reza Arbab Date: Mon, 9 Oct 2023 10:17:25 -0500 Subject: [PATCH] package/petitboot: prefer kexec-lite on powerpc This is a better choice on platforms where it is available, so default to it. Still select kexec for platforms where kexec-lite is not available. While we're at it, make use of the new BR2_PACKAGE_KEXEC_LITE_ARCH_SUPPORTS symbol instead of relying of the kexec-lite arch depends being a subject of kexec. While we're at it, sort all run-time dependencies alphabetically and don't repeat the comment. Signed-off-by: Reza Arbab [Arnout: - use BR2_PACKAGE_KEXEC_LITE_ARCH_SUPPORTS; - still allow full kexec by turning around the dependency; - extend commit message. ] Signed-off-by: Arnout Vandecappelle --- package/petitboot/Config.in | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/package/petitboot/Config.in b/package/petitboot/Config.in index bd50ff65a0..b81ab6310d 100644 --- a/package/petitboot/Config.in +++ b/package/petitboot/Config.in @@ -1,7 +1,6 @@ config BR2_PACKAGE_PETITBOOT bool "petitboot" - # kexec-lite arch depends is a subset of kexec arch depends - depends on BR2_PACKAGE_KEXEC_ARCH_SUPPORTS + depends on BR2_PACKAGE_KEXEC_ARCH_SUPPORTS || BR2_PACKAGE_KEXEC_LITE_ARCH_SUPPORTS depends on BR2_USE_MMU # lvm2 depends on BR2_USE_WCHAR # elfutils depends on !BR2_STATIC_LIBS # elfutils, lvm2 @@ -10,12 +9,11 @@ config BR2_PACKAGE_PETITBOOT select BR2_PACKAGE_ELFUTILS select BR2_PACKAGE_LVM2 # devmapper select BR2_PACKAGE_NCURSES - # run-time dependency only - select BR2_PACKAGE_KEXEC if !BR2_PACKAGE_KEXEC_LITE - # run-time dependency only - select BR2_PACKAGE_POWERPC_UTILS if ( BR2_powerpc || BR2_powerpc64 || BR2_powerpc64le ) - # run-time dependency only + # run-time dependencies + select BR2_PACKAGE_KEXEC if !BR2_PACKAGE_KEXEC_LITE_ARCH_SUPPORTS + select BR2_PACKAGE_KEXEC_LITE if BR2_PACKAGE_KEXEC_LITE_ARCH_SUPPORTS && !BR2_PACKAGE_KEXEC select BR2_PACKAGE_NVME if ( BR2_powerpc || BR2_powerpc64 || BR2_powerpc64le ) + select BR2_PACKAGE_POWERPC_UTILS if ( BR2_powerpc || BR2_powerpc64 || BR2_powerpc64le ) help Petitboot is a small kexec-based bootloader