From patchwork Wed Jul 3 13:36:02 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabio Estevam X-Patchwork-Id: 1956246 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=googlegroups.com header.i=@googlegroups.com header.a=rsa-sha256 header.s=20230601 header.b=AKUZ79Tf; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20230601 header.b=QOk43xBy; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=googlegroups.com (client-ip=2607:f8b0:4864:20::d3d; helo=mail-io1-xd3d.google.com; envelope-from=swupdate+bncbdulzynr2qmrbs5hsw2amgqev4iesua@googlegroups.com; receiver=patchwork.ozlabs.org) Received: from mail-io1-xd3d.google.com (mail-io1-xd3d.google.com [IPv6:2607:f8b0:4864:20::d3d]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4WDgm234Yjz1xqh for ; Wed, 3 Jul 2024 23:36:16 +1000 (AEST) Received: by mail-io1-xd3d.google.com with SMTP id ca18e2360f4ac-7f61da2de1esf568555639f.1 for ; Wed, 03 Jul 2024 06:36:16 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1720013772; cv=pass; d=google.com; s=arc-20160816; b=t0ewrVNTNYnqnuhHDLArnpMigGYgFwPdPgXzkpe1VGrS0KHpmOWM7N8MxLkoklh0pb qKw8HchIvSGFKDTB94wPyTyQIriaJVqJvscQvQUC9N76CyOS80d1UKSxVKvBbpZAlbmo 6lRBNBMQIpPvlWLD2M9jCy4/LnfSHv0hLEJg8eeGVfxArFh/mw06cfg/FQZerZfVBeR0 9xkc6x16HG1//XbIL8fYcYvJE35SUbc54gvVcgZpOznjnigc/yImcaIi4tKck0tUgIBQ rSvE6dWHxfopA8Znjmtl6TjY6Bf2AFT9U81g4YQWaUtkReXAuxxRcuOfB0yfp93f12bH 57hg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:mime-version:message-id:date :subject:cc:to:from:sender:dkim-signature:dkim-signature; bh=c5cu96vEXT8BP5NSAzJigt1TRSFoz3M569YsVdjPOIE=; fh=pDvj68k8UoH7qVySn+fY1a1sIivypeVLhu/JIe0R08c=; b=yE/5yFwBAFc6J+gOszqpFYxOxKyGgWGtjyBdB/JjXU8cfpfZj9rx8vn3v0p1//oLCZ VDf/jeMRnB4Mfm5hG8dKzCqnF25A+8AYtdxV/etgyTrwZlWSR+R28MrCoGsilR14tVUA 1f9cjA+c9YA4Wr0JKGKK8nuEdF9lZFkQGfgMcavqtrdktqQBYQTM7JzIRPph0AsWdxBQ L86bxqG10IJffxxl3xpkbPrQ86x0a1al2uiyNexzyv3uumfGOeDA4DxW12FxrrqCJjHS nFOgKzgW66K52ZGXbVZpA5qvngfmkY5ZRzTbehF7lge1kWLrAsoJjcs97zVGzxC2qYNC ewzA==; darn=patchwork.ozlabs.org ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=HGJGmux8; spf=pass (google.com: domain of festevam@gmail.com designates 2001:4860:4864:20::2c as permitted sender) smtp.mailfrom=festevam@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20230601; t=1720013772; x=1720618572; darn=patchwork.ozlabs.org; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:x-original-authentication-results :x-original-sender:mime-version:message-id:date:subject:cc:to:from :sender:from:to:cc:subject:date:message-id:reply-to; bh=c5cu96vEXT8BP5NSAzJigt1TRSFoz3M569YsVdjPOIE=; b=AKUZ79TfO52VNewEgSHt098NpzRMtBN0VdPx00pQZwLVN0lCM42vqaeFXHUlSoNie5 yCcyn8xUUnE6Y229QnIgVpijg3nxTVMhbA6vIe2RyhLyDHr6y8uORYTg81ttUryEaGks r9eOgx4NwhSXxGG3JQ7LasbjqQhTY7OYb+HVwMfekNTJQ7pS142ErUmx7sjhSQ62y4Cf oXj2CMTl980cwpo6Vmq0LKxYW2pf/qL6/qHqaMLAUjglGykHTIIPQc1alQncWqsb8aF7 k1AqgTQLF9rGVlOGQVgiv4usxI7yJupc9jUln1HcqM50Bd24xBr5PTw/eS1yu0RczoKf zkEA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1720013772; x=1720618572; darn=patchwork.ozlabs.org; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:x-original-authentication-results :x-original-sender:mime-version:message-id:date:subject:cc:to:from :from:to:cc:subject:date:message-id:reply-to; bh=c5cu96vEXT8BP5NSAzJigt1TRSFoz3M569YsVdjPOIE=; b=QOk43xByNNhlx4oL/LqfMzOpQVaCqDW0fNiKH+eWhhqA/Pqm8JVjwyZ9nvYVGeYaUF VDbLgdW82ivXKwKXBUqzkGBt4MF9LvjSpznn2BewWBTFOt8vSHkMmH8jrs5tO9Eayc/q aqi72Z/nMomnX0rEKrJXy99+Xuq+hPGwjwN3O7q5watCBIsNnYxyYgwfxGll4AUTCDg6 bMoBDUaIndbVKcShKF/Dkp2o0JwBCgedCMz0mOn2jfoKbDDNRSgck0xY3UrS7MLRkdYT 41WCt/Kej0ZMErAp/E+rLnT8u840598VRHn5QnoHHsSC+BQShmWyeUwy0S4h/HYgSA7M Kt0Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720013772; x=1720618572; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence :x-original-authentication-results:x-original-sender:mime-version :message-id:date:subject:cc:to:from:x-beenthere:x-gm-message-state :sender:from:to:cc:subject:date:message-id:reply-to; bh=c5cu96vEXT8BP5NSAzJigt1TRSFoz3M569YsVdjPOIE=; b=X9sY/vAuCGcDCnsG2ZIj1MC1BWdC1n63jljG7OjlZEhQxzwsqc9PXyuPaSk71g1TTH RnRH4Ltil14a9/QNWsnvadaHxfm49dE3P9MqFNFFY7DwbfCUaV2WeefcP1VubL0Kum5h 3napHhwygpINm0ZnNTKt/fc9ZAjXh0kwuyQLjcdXJ/y1xjXGofqrbo5FZBGy5U8/5jPA D1grg94xTro/q6idzgv0LfdUM4dMtFUhT0I7C27XO/3CmPHlr7sUGWFLuVHIWM82jqh5 XGeHl3SmX5PfICXUmkLMFkAYtxMYJjE1wgJTxiidRFgT53dDgQuqZrxb69hJto7qi0jx 7X9Q== Sender: swupdate@googlegroups.com X-Forwarded-Encrypted: i=2; AJvYcCWIr66nhPXPFdccW6YQ3UEH5VbEzr1F4sT2zjsEZX7YdnyNHUqCi8CoscIxDluKjrSi41Ovj+MIA9XFv1RWXQyLZK/spDNY0tiIMiXffw== X-Gm-Message-State: AOJu0Yw2FB+pqX0IUMp6cIdVlYx/ABgWlXRmzy/Rm9uXDqKTBgKPKusD hy3lrSAlDbSkny90Lr8dk3VwsOwJeahEIDLpTTp/Dj6HagFelvml X-Google-Smtp-Source: AGHT+IH9ysU6bYu9AfhYWQrM2bHVnryYDaKcAdoNQq++yZNJWBo222sgqX/UQ1d9vLfcg8S4OAXU1g== X-Received: by 2002:a92:c248:0:b0:382:aa49:e828 with SMTP id e9e14a558f8ab-382aa49e9ddmr9092865ab.26.1720013772431; Wed, 03 Jul 2024 06:36:12 -0700 (PDT) X-BeenThere: swupdate@googlegroups.com Received: by 2002:a05:6e02:1c25:b0:374:a461:6a03 with SMTP id e9e14a558f8ab-37b0eb36848ls43413775ab.0.-pod-prod-07-us; Wed, 03 Jul 2024 06:36:11 -0700 (PDT) X-Received: by 2002:a05:6602:1d15:b0:7f6:5c30:3717 with SMTP id ca18e2360f4ac-7f65c303a28mr327637939f.5.1720013771344; Wed, 03 Jul 2024 06:36:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1720013771; cv=none; d=google.com; s=arc-20160816; b=l7uY3NpHwlG49GcHVJEViM5ZCr3OnGiGA+PXRDH5yKT7SDiqmQres3QDFVjtsq5p0u yP3V7A1fZQ/PvBWxjidb7CypZdKp8faxgylt3tBVoXWj1z9srXMGftm3WujKDhnkIuf1 AwUfi29i3S2gH/A1ybRUxFTMkw5WcVNnRjbTzZ3RQ3xT5Qt2w9NZclIsIPlLfexe/3nt SLSXpPgShpA2WS31jUop5gz9Bka/fKnouTazKoqVv4TRPdZwcpaBkCblnPB8NL1WDMyt pJiTGJpUrHvXZm95nhDo2qKPBI5p20K8MggTpL9kIS5blPDrsbeDUfGYxaLyzaydc+aD vM4g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:dkim-signature; bh=U+n2oq3d71tlAiC1+XggPSTILsOWJOGotsjYnT8XLSA=; fh=hMbMKVKWJQ3EK4eWE/6Z0F060FPS2PBVhYc17BWty/I=; b=iU2bxF32zu/S4e4QNdrb0ipSoKQ0AeKQi/Bt6VyCJI9QovIsloeZa6Myv0PWBPfS5r DB4UODZO550hbw0CKHilRdRfPUpPEJ6VVMS169DBQ/ctXHSIS8+VyGS3AMWbFU2Qpr6o zI4SB7NCAxw91K+6veH3njx6AR0Gm0VEAP1stStrG5h523oVTmIinEHMS4RcW5J80W7Q /KNazVRKpsXtTAm5ZkbceBF1jg4JsftV6riDSJ1i+GWu3JIDtO6QtcOrenAMH3xWidHC Yr2NpeX+6+1W5N+4oN7wU3EnvBTl3VQ3PF7Yr7zezB5U9rLRhfjhv764Uz9Lj7RYiFNs qQbQ==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=HGJGmux8; spf=pass (google.com: domain of festevam@gmail.com designates 2001:4860:4864:20::2c as permitted sender) smtp.mailfrom=festevam@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from mail-oa1-x2c.google.com (mail-oa1-x2c.google.com. [2001:4860:4864:20::2c]) by gmr-mx.google.com with ESMTPS id ca18e2360f4ac-7f61ce768aasi45735139f.1.2024.07.03.06.36.11 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 03 Jul 2024 06:36:11 -0700 (PDT) Received-SPF: pass (google.com: domain of festevam@gmail.com designates 2001:4860:4864:20::2c as permitted sender) client-ip=2001:4860:4864:20::2c; Received: by mail-oa1-x2c.google.com with SMTP id 586e51a60fabf-25cd2b51fd3so714254fac.3 for ; Wed, 03 Jul 2024 06:36:11 -0700 (PDT) X-Received: by 2002:a05:6358:7f0d:b0:1a4:6af9:2324 with SMTP id e5c5f4694b2df-1a6acf43924mr1323760555d.2.1720013770199; Wed, 03 Jul 2024 06:36:10 -0700 (PDT) Received: from fabio-Precision-3551.. ([2804:14c:485:4b61:6d86:b0cf:cd04:a49f]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-72c6d50a942sm8059860a12.93.2024.07.03.06.36.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Jul 2024 06:36:09 -0700 (PDT) From: Fabio Estevam To: swupdate@googlegroups.com Cc: Fabio Estevam Subject: [swupdate] [PATCH] swupdate: Remove True parameter from getVar() and getVarFlag() Date: Wed, 3 Jul 2024 10:36:02 -0300 Message-Id: <20240703133602.412984-1-festevam@gmail.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Original-Sender: festevam@gmail.com X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=HGJGmux8; spf=pass (google.com: domain of festevam@gmail.com designates 2001:4860:4864:20::2c as permitted sender) smtp.mailfrom=festevam@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Precedence: list Mailing-list: list swupdate@googlegroups.com; contact swupdate+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: swupdate@googlegroups.com X-Google-Group-Id: 605343134186 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , True is default since 2016 and most layers were already updated not to pass this parameter where not necessary, e.g. oe-core was updated couple times, first in: https://git.openembedded.org/openembedded-core/commit/?id=7c552996597faaee2fbee185b250c0ee30ea3b5f and later in: https://git.openembedded.org/openembedded-core/commit/?id=26c74fd10614582e177437608908eb43688ab510 Do the same in the swupdate layer. Signed-off-by: Fabio Estevam Acked-by: Stefano Babic --- classes-recipe/swupdate-common.bbclass | 66 +++++++++++++------------- classes-recipe/swupdate-image.bbclass | 6 +-- 2 files changed, 36 insertions(+), 36 deletions(-) diff --git a/classes-recipe/swupdate-common.bbclass b/classes-recipe/swupdate-common.bbclass index ad3c0a023936..0367f812e28f 100644 --- a/classes-recipe/swupdate-common.bbclass +++ b/classes-recipe/swupdate-common.bbclass @@ -29,13 +29,13 @@ python () { def get_pwd_file_args(d, passfile): pwd_args = [] - pwd_file = d.getVar(passfile, True) + pwd_file = d.getVar(passfile) if pwd_file: pwd_args = ["-passin", "file:%s" % pwd_file] return pwd_args def get_certfile_args(d): - extra_certs = d.getVar('SWUPDATE_CMS_EXTRA_CERTS', True) + extra_certs = d.getVar('SWUPDATE_CMS_EXTRA_CERTS') if not extra_certs: return [] certfile_args = [] @@ -53,7 +53,7 @@ def swupdate_getdepends(d): deps.append(i) deps = [] - images = (d.getVar('IMAGE_DEPENDS', True) or "").split() + images = (d.getVar('IMAGE_DEPENDS') or "").split() for image in images: adddep(image , deps) @@ -169,19 +169,19 @@ def prepare_sw_description(d): import shutil import subprocess - s = d.getVar('S', True) + s = d.getVar('S') swupdate_expand_bitbake_variables(d, s) swupdate_write_sha256(s) - encrypt = d.getVar('SWUPDATE_ENCRYPT_SWDESC', True) + encrypt = d.getVar('SWUPDATE_ENCRYPT_SWDESC') if encrypt: bb.note("Encryption of sw-description") shutil.copyfile(os.path.join(s, 'sw-description'), os.path.join(s, 'sw-description.plain')) - key,iv = swupdate_extract_keys(d.getVar('SWUPDATE_AES_FILE', True)) + key,iv = swupdate_extract_keys(d.getVar('SWUPDATE_AES_FILE')) swupdate_encrypt_file(os.path.join(s, 'sw-description.plain'), os.path.join(s, 'sw-description'), key, iv) - signing = d.getVar('SWUPDATE_SIGNING', True) + signing = d.getVar('SWUPDATE_SIGNING') if signing == "1": bb.warn('SWUPDATE_SIGNING = "1" is deprecated, falling back to "RSA". It is advised to set it to "RSA" if using RSA signing.') signing = "RSA" @@ -192,26 +192,26 @@ def prepare_sw_description(d): if signing == "CUSTOM": signcmd = [] - sign_tool = d.getVar('SWUPDATE_SIGN_TOOL', True) + sign_tool = d.getVar('SWUPDATE_SIGN_TOOL') signtool = sign_tool.split() for i in range(len(signtool)): signcmd.append(signtool[i]) if not signcmd: bb.fatal("Custom SWUPDATE_SIGN_TOOL is not given") elif signing == "RSA": - privkey = d.getVar('SWUPDATE_PRIVATE_KEY', True) + privkey = d.getVar('SWUPDATE_PRIVATE_KEY') if not privkey: bb.fatal("SWUPDATE_PRIVATE_KEY isn't set") if not os.path.exists(privkey): bb.fatal("SWUPDATE_PRIVATE_KEY %s doesn't exist" % (privkey)) signcmd = ["openssl", "dgst", "-sha256", "-sign", privkey] + get_pwd_file_args(d, 'SWUPDATE_PASSWORD_FILE') + ["-out", sw_desc_sig, sw_desc] elif signing == "CMS": - cms_cert = d.getVar('SWUPDATE_CMS_CERT', True) + cms_cert = d.getVar('SWUPDATE_CMS_CERT') if not cms_cert: bb.fatal("SWUPDATE_CMS_CERT is not set") if not os.path.exists(cms_cert): bb.fatal("SWUPDATE_CMS_CERT %s doesn't exist" % (cms_cert)) - cms_key = d.getVar('SWUPDATE_CMS_KEY', True) + cms_key = d.getVar('SWUPDATE_CMS_KEY') if not cms_key: bb.fatal("SWUPDATE_CMS_KEY isn't set") if not os.path.exists(cms_key): @@ -228,7 +228,7 @@ def prepare_sw_description(d): def swupdate_add_src_uri(d, list_for_cpio): import shutil - s = d.getVar('S', True) + s = d.getVar('S') exclude = (d.getVar("SWUPDATE_SRC_URI_EXCLUDE") or "").split() fetch = bb.fetch2.Fetch([], d) @@ -239,11 +239,11 @@ def swupdate_add_src_uri(d, list_for_cpio): filename = os.path.basename(local) if filename in exclude: continue - aes_file = d.getVar('SWUPDATE_AES_FILE', True) + aes_file = d.getVar('SWUPDATE_AES_FILE') if aes_file: - key,iv = swupdate_extract_keys(d.getVar('SWUPDATE_AES_FILE', True)) + key,iv = swupdate_extract_keys(d.getVar('SWUPDATE_AES_FILE')) if (filename != 'sw-description') and (os.path.isfile(local)): - encrypted = (d.getVarFlag("SWUPDATE_IMAGES_ENCRYPTED", filename, True) or "") + encrypted = (d.getVarFlag("SWUPDATE_IMAGES_ENCRYPTED", filename) or "") dst = os.path.join(s, "%s" % filename ) if encrypted == '1': bb.note("Encryption requested for %s" %(filename)) @@ -263,7 +263,7 @@ def add_image_to_swu(d, deploydir, imagename, s, encrypt, list_for_cpio): target_imagename = os.path.basename(imagename) # allow images in subfolders of DEPLOY_DIR_IMAGE dst = os.path.join(s, target_imagename) if encrypt == '1': - key,iv = swupdate_extract_keys(d.getVar('SWUPDATE_AES_FILE', True)) + key,iv = swupdate_extract_keys(d.getVar('SWUPDATE_AES_FILE')) bb.note("Encryption requested for %s" %(imagename)) swupdate_encrypt_file(src, dst, key, iv) else: @@ -274,21 +274,21 @@ def add_image_to_swu(d, deploydir, imagename, s, encrypt, list_for_cpio): def swupdate_add_artifacts(d, list_for_cpio): import shutil # Search for images listed in SWUPDATE_IMAGES in the DEPLOY directory. - images = (d.getVar('SWUPDATE_IMAGES', True) or "").split() - deploydir = d.getVar('DEPLOY_DIR_IMAGE', True) - imgdeploydir = d.getVar('SWUDEPLOYDIR', True) - s = d.getVar('S', True) + images = (d.getVar('SWUPDATE_IMAGES') or "").split() + deploydir = d.getVar('DEPLOY_DIR_IMAGE') + imgdeploydir = d.getVar('SWUDEPLOYDIR') + s = d.getVar('S') for image in images: - fstypes = (d.getVarFlag("SWUPDATE_IMAGES_FSTYPES", image, True) or "").split() - encrypted = (d.getVarFlag("SWUPDATE_IMAGES_ENCRYPTED", image, True) or "") + fstypes = (d.getVarFlag("SWUPDATE_IMAGES_FSTYPES", image) or "").split() + encrypted = (d.getVarFlag("SWUPDATE_IMAGES_ENCRYPTED", image) or "") if fstypes: - noappend_machine = d.getVarFlag("SWUPDATE_IMAGES_NOAPPEND_MACHINE", image, True) + noappend_machine = d.getVarFlag("SWUPDATE_IMAGES_NOAPPEND_MACHINE", image) if noappend_machine == "0": # Search for a file explicitly with MACHINE - imagebases = [ image + '-' + d.getVar('MACHINE', True) ] + imagebases = [ image + '-' + d.getVar('MACHINE') ] elif noappend_machine == "1": # Search for a file explicitly without MACHINE imagebases = [ image ] else: # None, means auto mode. Just try to find an image file with MACHINE or without MACHINE - imagebases = [ image + '-' + d.getVar('MACHINE', True), image ] + imagebases = [ image + '-' + d.getVar('MACHINE'), image ] for fstype in fstypes: image_found = False for imagebase in imagebases: @@ -303,13 +303,13 @@ def swupdate_add_artifacts(d, list_for_cpio): def swupdate_create_cpio(d, swudeploydir, list_for_cpio): - s = d.getVar('S', True) + s = d.getVar('S') os.chdir(s) - updateimage = d.getVar('IMAGE_NAME', True) + '.swu' + updateimage = d.getVar('IMAGE_NAME') + '.swu' line = 'for i in ' + ' '.join(list_for_cpio) + '; do echo $i;done | cpio -ov -H crc --reproducible > ' + os.path.join(swudeploydir, updateimage) os.system(line) os.chdir(swudeploydir) - updateimage_link = d.getVar('IMAGE_LINK_NAME', True) + updateimage_link = d.getVar('IMAGE_LINK_NAME') if updateimage_link: updateimage_link += '.swu' if updateimage_link != updateimage: @@ -319,16 +319,16 @@ python do_swuimage () { import shutil list_for_cpio = ["sw-description"] - workdir = d.getVar('WORKDIR', True) - s = d.getVar('S', True) - imgdeploydir = d.getVar('SWUDEPLOYDIR', True) + workdir = d.getVar('WORKDIR') + s = d.getVar('S') + imgdeploydir = d.getVar('SWUDEPLOYDIR') shutil.copyfile(os.path.join(workdir, "sw-description"), os.path.join(s, "sw-description")) - if d.getVar('SWUPDATE_SIGNING', True): + if d.getVar('SWUPDATE_SIGNING'): list_for_cpio.append('sw-description.sig') # Add artifacts added via SRC_URI - if not d.getVar('INHIBIT_SWUPDATE_ADD_SRC_URI', True): + if not d.getVar('INHIBIT_SWUPDATE_ADD_SRC_URI'): swupdate_add_src_uri(d, list_for_cpio) # Add artifacts set via SWUPDATE_IMAGES diff --git a/classes-recipe/swupdate-image.bbclass b/classes-recipe/swupdate-image.bbclass index e9c67a6ff1a5..175fc4ea61e4 100644 --- a/classes-recipe/swupdate-image.bbclass +++ b/classes-recipe/swupdate-image.bbclass @@ -19,7 +19,7 @@ SRC_URI += "file://sw-description" SWUPDATE_IMAGES += "${IMAGE_LINK_NAME}" python () { - image = d.getVar('IMAGE_LINK_NAME', True) + image = d.getVar('IMAGE_LINK_NAME') if d.getVarFlag("SWUPDATE_IMAGES_FSTYPES", image) is None: flag = d.getVarFlag("SWUPDATE_IMAGES_FSTYPES", d.getVar('IMAGE_BASENAME')) if flag: @@ -38,8 +38,8 @@ python do_swupdate_copy_swdescription() { import shutil - workdir = d.getVar('S', True) - image = d.getVar('IMAGE_LINK_NAME', True) + workdir = d.getVar('S') + image = d.getVar('IMAGE_LINK_NAME') filespath = d.getVar('FILESPATH') sw_desc_path = bb.utils.which(filespath, "sw-description") shutil.copyfile(sw_desc_path, os.path.join(workdir, "sw-description"))