Digi
/
meta-digi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

meta-digi: Remove True option to getVar calls 

getVar() defaults to expanding by default.

See poky's commit: 2631c375b8a025ee2e4329f6d93900bb7b5dadf7

Signed-off-by: Javier Viguera <javier.viguera@digi.com>
This commit is contained in:
Javier Viguera 2025-01-30 11:09:28 +01:00
parent e64002650d
commit 5209d57dc3
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
meta-digi-dey/recipes-connectivity/networkmanager/networkmanager_%.bbappend
View File

@ -30,8 +30,8 @@ PACKAGECONFIG:append = " gnutls modemmanager ppp concheck"
# NetworkManager only accepts IP addresses in CIDR format # NetworkManager only accepts IP addresses in CIDR format
# #
def ipaddr_to_cidr(iface, d): def ipaddr_to_cidr(iface, d):
ipaddr = d.getVar('%s_STATIC_IP' % iface.upper(), True) ipaddr = d.getVar('%s_STATIC_IP' % iface.upper())
netmask = d.getVar('%s_STATIC_NETMASK' % iface.upper(), True) netmask = d.getVar('%s_STATIC_NETMASK' % iface.upper())
binary_str = '' binary_str = ''
for byte in netmask.split('.'): for byte in netmask.split('.'):
binary_str += bin(int(byte))[2:].zfill(8) binary_str += bin(int(byte))[2:].zfill(8)

10
meta-digi-dey/recipes-digi/swu-images/swu.inc
View File

@ -61,19 +61,19 @@ python do_swuimage:prepend() {
d.setVar('SWUPDATE_PRIVATE_KEY', glob.glob(d.getVar('SWUPDATE_PRIVATE_KEY_TEMPLATE'))[0]) d.setVar('SWUPDATE_PRIVATE_KEY', glob.glob(d.getVar('SWUPDATE_PRIVATE_KEY_TEMPLATE'))[0])
# Copy script file. # Copy script file.
updatescript = d.getVar('SWUPDATE_SCRIPT', True) updatescript = d.getVar('SWUPDATE_SCRIPT')
imgdeploydir = d.getVar('DEPLOY_DIR_IMAGE', True) imgdeploydir = d.getVar('DEPLOY_DIR_IMAGE')
if "/" not in updatescript: if "/" not in updatescript:
workdir = d.getVar('WORKDIR', True) workdir = d.getVar('WORKDIR')
updatescript = os.path.join(workdir, updatescript) updatescript = os.path.join(workdir, updatescript)
if os.path.isfile(updatescript): if os.path.isfile(updatescript):
shutil.copyfile(updatescript, os.path.join(imgdeploydir, os.path.basename(updatescript))) shutil.copyfile(updatescript, os.path.join(imgdeploydir, os.path.basename(updatescript)))
# Copy U-Boot script file. # Copy U-Boot script file.
if d.getVar('SWUPDATE_UBOOTIMG') == "true": 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: if "/" not in uboot_updatescript:
workdir = d.getVar('WORKDIR', True) workdir = d.getVar('WORKDIR')
uboot_updatescript = os.path.join(workdir, uboot_updatescript) uboot_updatescript = os.path.join(workdir, uboot_updatescript)
if os.path.isfile(uboot_updatescript): if os.path.isfile(uboot_updatescript):
shutil.copyfile(uboot_updatescript, os.path.join(imgdeploydir, os.path.basename(uboot_updatescript))) shutil.copyfile(uboot_updatescript, os.path.join(imgdeploydir, os.path.basename(uboot_updatescript)))