From 5209d57dc35f5c01069ab983e4bf8c33b14f3db1 Mon Sep 17 00:00:00 2001 From: Javier Viguera Date: Thu, 30 Jan 2025 11:09:28 +0100 Subject: [PATCH] meta-digi: Remove True option to getVar calls getVar() defaults to expanding by default. See poky's commit: 2631c375b8a025ee2e4329f6d93900bb7b5dadf7 Signed-off-by: Javier Viguera --- .../networkmanager/networkmanager_%.bbappend | 4 ++-- meta-digi-dey/recipes-digi/swu-images/swu.inc | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/meta-digi-dey/recipes-connectivity/networkmanager/networkmanager_%.bbappend b/meta-digi-dey/recipes-connectivity/networkmanager/networkmanager_%.bbappend index 0669aa8ad..4a4aeb376 100644 --- a/meta-digi-dey/recipes-connectivity/networkmanager/networkmanager_%.bbappend +++ b/meta-digi-dey/recipes-connectivity/networkmanager/networkmanager_%.bbappend @@ -30,8 +30,8 @@ PACKAGECONFIG:append = " gnutls modemmanager ppp concheck" # NetworkManager only accepts IP addresses in CIDR format # def ipaddr_to_cidr(iface, d): - ipaddr = d.getVar('%s_STATIC_IP' % iface.upper(), True) - netmask = d.getVar('%s_STATIC_NETMASK' % iface.upper(), True) + ipaddr = d.getVar('%s_STATIC_IP' % iface.upper()) + netmask = d.getVar('%s_STATIC_NETMASK' % iface.upper()) binary_str = '' for byte in netmask.split('.'): binary_str += bin(int(byte))[2:].zfill(8) diff --git a/meta-digi-dey/recipes-digi/swu-images/swu.inc b/meta-digi-dey/recipes-digi/swu-images/swu.inc index 5fea641f9..cae74612b 100644 --- a/meta-digi-dey/recipes-digi/swu-images/swu.inc +++ b/meta-digi-dey/recipes-digi/swu-images/swu.inc @@ -61,19 +61,19 @@ python do_swuimage:prepend() { d.setVar('SWUPDATE_PRIVATE_KEY', glob.glob(d.getVar('SWUPDATE_PRIVATE_KEY_TEMPLATE'))[0]) # Copy script file. - updatescript = d.getVar('SWUPDATE_SCRIPT', True) - imgdeploydir = d.getVar('DEPLOY_DIR_IMAGE', True) + updatescript = d.getVar('SWUPDATE_SCRIPT') + imgdeploydir = d.getVar('DEPLOY_DIR_IMAGE') if "/" not in updatescript: - workdir = d.getVar('WORKDIR', True) + workdir = d.getVar('WORKDIR') updatescript = os.path.join(workdir, updatescript) if os.path.isfile(updatescript): shutil.copyfile(updatescript, os.path.join(imgdeploydir, os.path.basename(updatescript))) # Copy U-Boot script file. if d.getVar('SWUPDATE_UBOOTIMG') == "true": - uboot_updatescript = d.getVar('SWUPDATE_UBOOT_SCRIPT_NAME', True) + uboot_updatescript = d.getVar('SWUPDATE_UBOOT_SCRIPT_NAME') if "/" not in uboot_updatescript: - workdir = d.getVar('WORKDIR', True) + workdir = d.getVar('WORKDIR') uboot_updatescript = os.path.join(workdir, uboot_updatescript) if os.path.isfile(uboot_updatescript): shutil.copyfile(uboot_updatescript, os.path.join(imgdeploydir, os.path.basename(uboot_updatescript)))