From patchwork Mon Nov 8 16:08:40 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adrian Freihofer X-Patchwork-Id: 1552427 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=googlegroups.com header.i=@googlegroups.com header.a=rsa-sha256 header.s=20210112 header.b=PLoDTgyK; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=kai9Sg0S; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=googlegroups.com (client-ip=2a00:1450:4864:20::337; helo=mail-wm1-x337.google.com; envelope-from=swupdate+bncbcx6venntaprbfmxuwgamgqerjfoeai@googlegroups.com; receiver=) Received: from mail-wm1-x337.google.com (mail-wm1-x337.google.com [IPv6:2a00:1450:4864:20::337]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4Hnwyz54Q4z9s1l for ; Tue, 9 Nov 2021 03:08:58 +1100 (AEDT) Received: by mail-wm1-x337.google.com with SMTP id g81-20020a1c9d54000000b003330e488323sf53257wme.0 for ; Mon, 08 Nov 2021 08:08:58 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1636387733; cv=pass; d=google.com; s=arc-20160816; b=UakiQM4kVLoM6BsoLNh7sAjrZH+VC+q785zrb3R35KoI4PpdQt1XU4GW9a57YmGSpk /gM+zibq4I7yjUmHmS7hCCL77x976WaoNVWn87S74VU07pT29nK4zdoroFGzEvI485rE XhGq4/c4Sn0H+ir7E0xg62TAAcGcospkMZ/2vcWYIyabbUvYB0y3XkjqmfNLcGHZWEiw F7wHTSqG0a+BcBKtZQWL76q2I0uwrMP5TmZLAJPPgylvTC/9lLV/PorvkWNlulZ/HVGL lvacTMj0h2ephcEaUdYvtOaPDI7LeBMVCitzTdeMc6KlFI0lgV/vSS8PsZRqoCOorLM2 Hehg== 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:references:in-reply-to :message-id:date:subject:cc:to:from:sender:dkim-signature :dkim-signature; bh=q/Oounql8TopXVtstrqoXBmefw+WoM7J/jPNzmPWsmY=; b=OofdfRQj3ZPKSCAig+eQ8D5io9hqH5BVajoYK7m35Bm5LVkMgXOim8PUbDQH0lySRa QuRoXDrDicKnnl568WutFFUx8C/FQl+gYBCJnN0GSfcZF3qu4uwze9HjLbbpKu9vMw8Z za0BYd81vEmgN9FnLDbx+ZvLBf1+ojIAt/G3lOgPcjdy6WuAaPp2Qv7YJAq16ztbp9bF vHPz2QaYrQff8676S8c22OQBPdpMUK9Tr9pBWYr8IxM0pfY9UKbQ6OrdAG/a+4lmxCr2 Xc5UaBaLT4VVmdmLFSorCW7a4usHgMTX1tP/3X4dkCTkY6p0UeRHqnZ/BesPD7mSaQVB x2uw== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=Te2Ga3YW; spf=pass (google.com: domain of adrian.freihofer@gmail.com designates 2a00:1450:4864:20::52f as permitted sender) smtp.mailfrom=adrian.freihofer@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=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=q/Oounql8TopXVtstrqoXBmefw+WoM7J/jPNzmPWsmY=; b=PLoDTgyKsXDX9FL+/1DvHgcHhVNSOJz9HIW0aDx41E54Vx/yiwYMDY+i59Iuc3G4uK +utUzvPmUwF4HOSPQkQ4neMhlDP9w9La3UdSJEBfLK++MRXUDeZV/9Y13RJpprB4Mkc0 SIjzrxwPz0J8iVEn9RtWZGimCmyoRSTuCt5aTjUqTlMEEvNJviVCI2nsK3G9llQQLTdZ IplsT9vtPlWG7WUzP+9Ic+8qOyGWaeuC6JNZ3HgfO786LJxXGo038zregm1BFeR7bYwe tngbUpp/C0+vprcggGL5n+hJRVYioyVoMLp8APAF+qgNtd1m+QpaYWnLWCAlQHKUOKUZ u3hg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=q/Oounql8TopXVtstrqoXBmefw+WoM7J/jPNzmPWsmY=; b=kai9Sg0Ss5AjT9sxlWOiyVlV3agKBgBafTHT80l1JIPAysdImclom67iSViI0L82Jn dMm5/WftSS6gA1oL9w/I4zgNawD810BNvbPzTgTLB4lrTOX0h2otlWy6myPsNdxrBaaY pil1zczohYUJbjk+K1cR7AFACgCxuan4uboUvJ/KRjmBkg+q5ZOvHDZtDSK7TZzj36u4 yvp6mWKa0Aw1/Nkz7VfPTifq/4z+rF4wyNKrzxe8FwmDf6V+xI/B4BZAlMr1qfNC0OnA 7ZWAHDP7kZiyQYrtIE3eagIl+jYmLgJswaUnaLniAMqABlVfykyXd8zsEi0KCbXpHoWZ NTsA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=sender:x-gm-message-state:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-spam-checked-in-group:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=q/Oounql8TopXVtstrqoXBmefw+WoM7J/jPNzmPWsmY=; b=VjRxbudOfWDHMw7N9y5/n/utBMOTeRS7C2npklyW4Zd2z7z5SnxVDZ/F8yK8Ht3T3S ase9OLr60gD9HVaKK7xFuGQ995i3U1LKcLEW23UdGga6hcIwG36Y6ms6K5TTutF6ku92 ehnorCO4zMLXTT9Rea+KJq5uueOFqCc7sUGqSULKB/hVkvcQcnpQBGm4G0Xf7lwD1T4/ ybAb5qKYTWS4cuKNRI4QPdTqBqHc1DlDQfyJsH9799sN1UR/sO6YGibQMsrR2ezAs3YN qOsck832tFsQS4VSBEHxlopIqP3SW4Gt1IQMxwn6Z63ei7vB5J407L+JMFiMYSznui5H 7ifg== Sender: swupdate@googlegroups.com X-Gm-Message-State: AOAM530gvHw//aEPp4WDFUX0Pz4uqBBowYgD29epOMa09Tq6dT0nM7sT p+HgXAd9u2KGKGLPwt5NnuA= X-Google-Smtp-Source: ABdhPJzB5FLp7nH+ODs32v5bWBJs0+2HCzuGYZe9sv1SfFpq2BRw77L2El3uO0OJb8PMD2Js3USN+g== X-Received: by 2002:a5d:400e:: with SMTP id n14mr313500wrp.368.1636387733607; Mon, 08 Nov 2021 08:08:53 -0800 (PST) X-BeenThere: swupdate@googlegroups.com Received: by 2002:a1c:80c3:: with SMTP id b186ls3551636wmd.2.gmail; Mon, 08 Nov 2021 08:08:52 -0800 (PST) X-Received: by 2002:a1c:f219:: with SMTP id s25mr54472554wmc.31.1636387732732; Mon, 08 Nov 2021 08:08:52 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1636387732; cv=none; d=google.com; s=arc-20160816; b=peAfBTrhySTicL146Q767iPZ5WGlj2klIB0oDer6ffs2arljo4feL2GoiPdtd85UmH UuBHptT0mxibLWqv4pRORON1gs9PsL0VJZnsvlGReF/v8Ig8xbp0FjnFtZczhJyEYGmz XKcKGUyKl/F6/ATS94fnauWbxuWLT5pfCB+eRrOXpBOQgZMQKd3zMoG29t4NsceQ+Nat RGkmWFgYD4w0U8wsCrWhLTjT/C6GDNQxTMv+41KLKYHF4Xj1qQMxkwB5RUii73V5RXsI KHI9YKe+cfXHy2UgJTwODSBaHUy8w5/dnCy0XnXsLipKTHMrNb2qiQ6cg3HpkHVY3pWH TsbQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=l/myvU3JrQpTtrpWG59NyONCtaZsZm8rQienqY5by0Q=; b=m7o6CroY7NjXghvh2Ha8j9UUNjpj58DATQ3Qbw1lBE00/rx5AZUg2bIYvtrQk4Jbsb NEKO75Vwvh+7whB76fRRnDc9qRO5kgUyOnqiyw+VL0qKUDr20gNvh3OM1ALZFMNcRnI3 YU8FxHOhwcVwI0vj3dpZjrGzrchQXa7VZ2ShFJ/aiwIPrv69SSKl/y1QBLX91gjSlDeh l8MUgTavX3QxmymVkigToY5dOsWiBn/eNpclZ0vm+xIherOz1OV4/4MLgMdnjtoG/Ffr 5RKB4nXPMvelh1IIYbb+wTzyDY/432bVA0OGOyG1XG8ZM+9YMyAan67wkcFgLEArmZmn qd6g== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=Te2Ga3YW; spf=pass (google.com: domain of adrian.freihofer@gmail.com designates 2a00:1450:4864:20::52f as permitted sender) smtp.mailfrom=adrian.freihofer@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from mail-ed1-x52f.google.com (mail-ed1-x52f.google.com. [2a00:1450:4864:20::52f]) by gmr-mx.google.com with ESMTPS id z3si19129wmi.2.2021.11.08.08.08.52 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 08 Nov 2021 08:08:52 -0800 (PST) Received-SPF: pass (google.com: domain of adrian.freihofer@gmail.com designates 2a00:1450:4864:20::52f as permitted sender) client-ip=2a00:1450:4864:20::52f; Received: by mail-ed1-x52f.google.com with SMTP id x15so33347355edv.1 for ; Mon, 08 Nov 2021 08:08:52 -0800 (PST) X-Received: by 2002:a05:6402:2554:: with SMTP id l20mr296075edb.33.1636387732123; Mon, 08 Nov 2021 08:08:52 -0800 (PST) Received: from md2ramxc.ad001.siemens.net ([62.32.0.69]) by smtp.gmail.com with ESMTPSA id w7sm6458698edc.4.2021.11.08.08.08.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Nov 2021 08:08:51 -0800 (PST) From: Adrian Freihofer To: swupdate@googlegroups.com Cc: Adrian Freihofer Subject: [swupdate] [meta-swupdate][PATCH v2 2/2] swupdate-image: use image link name Date: Mon, 8 Nov 2021 17:08:40 +0100 Message-Id: <20211108160840.61647-3-adrian.freihofer@siemens.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20211108160840.61647-1-adrian.freihofer@siemens.com> References: <20211108160840.61647-1-adrian.freihofer@siemens.com> MIME-Version: 1.0 X-Original-Sender: adrian.freihofer@gmail.com X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=Te2Ga3YW; spf=pass (google.com: domain of adrian.freihofer@gmail.com designates 2a00:1450:4864:20::52f as permitted sender) smtp.mailfrom=adrian.freihofer@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: , Use IMAGE_LINK_NAME instead of IMAGE_BASENAME. IMAGE_BASENAME contains a timestamp which causes some sporadic build failures. The problem is that if the image files have been built by a previous bitbake call and bitbake skips the task to build them again swupdate fails with searching for images with the timestamp of the current build job in the file name. The link refers to the latest available build in any case. Setting S to WORKDIR should not be needed. It's the default from bitbake.conf. Signed-off-by: Adrian Freihofer --- classes/swupdate-image.bbclass | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/classes/swupdate-image.bbclass b/classes/swupdate-image.bbclass index d405fe1..de9ee1f 100644 --- a/classes/swupdate-image.bbclass +++ b/classes/swupdate-image.bbclass @@ -10,17 +10,14 @@ inherit swupdate-common.bbclass -S = "${WORKDIR}/${PN}" - SRC_URI += "file://sw-description" -SWUPDATE_IMAGES += "${IMAGE_BASENAME}" +SWUPDATE_IMAGES += "${IMAGE_LINK_NAME}" python do_swupdate_copy_swdescription() { - import shutil workdir = d.getVar('S', True) - image = d.getVar('IMAGE_BASENAME', True) + image = d.getVar('IMAGE_LINK_NAME', True) filespath = d.getVar('FILESPATH') sw_desc_path = bb.utils.which(filespath, "sw-description") shutil.copyfile(sw_desc_path, os.path.join(workdir, "sw-description"))