Re: [isar-cip-core][PATCH] swupdate.inc: Remove unnecessary defaults from getVar


Jan Kiszka
 

On 12.11.21 12:07, Q. Gylstorff wrote:
From: Quirin Gylstorff <quirin.gylstorff@...>

Also 'TRUE' is not a valid value.

Signed-off-by: Quirin Gylstorff <quirin.gylstorff@...>
---
recipes-core/swupdate/swupdate.inc | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/recipes-core/swupdate/swupdate.inc b/recipes-core/swupdate/swupdate.inc
index 191aa2b..7812ae7 100644
--- a/recipes-core/swupdate/swupdate.inc
+++ b/recipes-core/swupdate/swupdate.inc
@@ -26,12 +26,12 @@ def get_bootloader_build_profile(d):
SWUPDATE_BUILD_PROFILES += "${@get_bootloader_build_profile(d)}"

def get_bootloader_dependencies(d):
- bootloader = d.getVar("SWUPDATE_BOOTLOADER", True) or ""
+ bootloader = d.getVar("SWUPDATE_BOOTLOADER") or ""
if bootloader == "efibootguard":
return "efibootguard-dev"
if bootloader == "u-boot":
- if d.getVar("U_BOOT_CONFIG_PACKAGE", True) == "1":
- return "libubootenv u-boot-{}-config".format(d.getVar("MACHINE", TRUE))
+ if d.getVar("U_BOOT_CONFIG_PACKAGE") == "1":
+ return "libubootenv u-boot-{}-config".format(d.getVar("MACHINE"))
else:
return "libubootenv"
return ""
@@ -48,7 +48,7 @@ dpkg_runbuild_prepend() {
}

python do_check_bootloader () {
- bootloader = d.getVar("SWUPDATE_BOOTLOADER", True) or "None"
+ bootloader = d.getVar("SWUPDATE_BOOTLOADER") or "None"
if not bootloader in ["efibootguard", "u-boot"]:
bb.warn("swupdate: SWUPDATE_BOOTLOADER set to incompatible value: " + bootloader)
}
Thanks, applied.

Jan

--
Siemens AG, T RDA IOT
Corporate Competence Center Embedded Linux

Join cip-dev@lists.cip-project.org to automatically receive all group messages.