From patchwork Mon Sep 6 09:21:50 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefano Babic X-Patchwork-Id: 1524865 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: 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=rMgrQ0gl; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=googlegroups.com (client-ip=2a00:1450:4864:20::440; helo=mail-wr1-x440.google.com; envelope-from=swupdate+bncbcxploxj6ikrbof326eqmgqetrrfgaa@googlegroups.com; receiver=) Received: from mail-wr1-x440.google.com (mail-wr1-x440.google.com [IPv6:2a00:1450:4864:20::440]) (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 ozlabs.org (Postfix) with ESMTPS id 4H32wb0Jztz9sCD for ; Mon, 6 Sep 2021 19:22:05 +1000 (AEST) Received: by mail-wr1-x440.google.com with SMTP id y13-20020adfe6cd000000b00159694c711dsf1020803wrm.17 for ; Mon, 06 Sep 2021 02:22:05 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1630920121; cv=pass; d=google.com; s=arc-20160816; b=GhjZ5kuw82/PgX/lchi6u58144ZKeH26OBZ59oAHY89XDqGkpdXZ9X5J4ODYjmyzA4 Rp8hXm9kMitqy6K6uw+fndivnysG6pqBTMbyVLWLBfAg9fNGyljnrYi6oZCA91C9j+TW J8f4H6wrxYEUUx83b+gvu0wfbdLnwtNIam81ii71Ew4AxZi0+OZNmynYJEyxKeZakyxe K8cCN58xURx16J7K6Chki57NouMDKzN1Sxs7YDLNhp9tFgEqkuIy9LFFG4FnCM4wgMbl ZpJAeDJInJ4PnEOe5byOGsLHB96M3JO/pwQzSRrLIiqf6Oj08YabWqfg8SuMMAgj/BUm oISQ== 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; bh=HZjpup5LP9Rt2H2LSNBz+DWbCj7HdlfQPf+rPZDsGoA=; b=UFRkBoFtMXolGhpECn6KvkGeJKFAq3vG+sm2HXq+2fta3C9G7CEMCJaUJyyuY9E0xN vJKODYmHgax8epOTaBmuVbh5W7v6uYIUxkScscWEqEjyzBA8gIOx4XZPAVKWTw6TAks0 thEeDWEzfzS2vhJdU1E9gI/OqWNbqc0cspbdTa4tolq24C5diKwQDVgXVszMAvNPz8nv PB0etvww+/PNls7gzajI6Dg9KVQr9OutIhDeNl6XxAkp5Q/hbNhuqhRrV4Sm79mm3GMt IcAMpf4iaT1OiaMMed0lFrsrIlduimCDBCt6IEWPtajUZhKI4Z/r9VXIBrVr6h5eHTE7 kXOg== ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=neutral (google.com: 212.18.0.9 is neither permitted nor denied by domain of sbabic@denx.de) smtp.mailfrom=sbabic@denx.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20210112; h=sender:from:to:cc:subject:date:message-id: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=HZjpup5LP9Rt2H2LSNBz+DWbCj7HdlfQPf+rPZDsGoA=; b=rMgrQ0gltRMbwKwZyQdPVUyKs/WEDgtvp9gOdCyvJIs8Keq9TtsoHGBV+Fy3vAWfd9 DT+Gx4Rt9/eodJrzP4ya6BPpDCtWJu66ZRrdeXirx8WlrlVMhcKjSam180OluUtt/Cy+ SgKSKH9NMU8og5UzYQIU6grzzDv0CzYNMG4yi3/NM4IZLhGQPy7mTub2Q2W5LG/ScFRY CIn52q46g95h9BroZP0aGfB84ttHLFBQ9+MyZgA9iT9LlWES7f8d7K09lWb5X0M0ETfz PVZbC8NwotKznHp6ORR++g8BoYvJrV2HaS/J2kMYQgBGhBzpCmBfonhyWV1TipuqtJ01 tS+g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=sender:x-gm-message-state:from:to:cc:subject:date:message-id :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=HZjpup5LP9Rt2H2LSNBz+DWbCj7HdlfQPf+rPZDsGoA=; b=akCoIX6bz/f14dOnte0khgA9neZoJaQPIbAITKYoy7vfejxjIwLRfMf3YJZMJuc5zQ kcp9qRw27WZCX+156Moak8/SZeZc2uFxJ01ei7sbZThM3q50Gev22uVzSdQzeq94gfb5 uLl1zxohJjsXCM+/ehvJ6Mw13FA6X0ah+896PSg2u2uSEBXBNqVWOh6X5/YdDJFwKiKh Y2l3vd2n+j0IVscM18T8Z/AZ2A11sPQap3Gea5r/BDlpxNqhQV8OPPiVoy1wZUWGY5UI 8XsmJaqAAUgwBKn/NbpoM0LC+ZaKBOyULQPnR5j5SQ+GxiYiJyhoTQbmIUjGIuvpn9kM 7wow== Sender: swupdate@googlegroups.com X-Gm-Message-State: AOAM532UN9iKQk46IscLzjtb9iyzkTpCc1jvYb4YLsJnCGx4d6xVpkvV Ii82iLfTBm7nGeknuFE6wMI= X-Google-Smtp-Source: ABdhPJyKqnmnDDNfhYqOtr36CeQuwx1Jb6H6VNXdWy7QWVnbtYdvBpnEr0hRzbSKIbBQmmd6CVU0ug== X-Received: by 2002:a5d:55cd:: with SMTP id i13mr12641260wrw.366.1630920121060; Mon, 06 Sep 2021 02:22:01 -0700 (PDT) X-BeenThere: swupdate@googlegroups.com Received: by 2002:adf:c789:: with SMTP id l9ls752307wrg.1.gmail; Mon, 06 Sep 2021 02:22:00 -0700 (PDT) X-Received: by 2002:adf:804a:: with SMTP id 68mr12469136wrk.236.1630920120246; Mon, 06 Sep 2021 02:22:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1630920120; cv=none; d=google.com; s=arc-20160816; b=ehvjz9IpBy/a7GfzHEGelWouI0DdWDVDl45VXNPcKv44PDlH4pe7a/YiGGnc4fg1cs EsLJjW6e7PvuU+BKx9w5eqRj4JGq7ki+tgLtZ62laTmqSDRBoxBB8j93puVHN5AKYXRc yfGUCkTlY2MYh3wI0QDvC10UMhwGzKa43A9zEUNxm9BnoiCAAJbL88PD2GEW3Ot3ZEka qfZMnowe3Ay/rRYKSwbgwRmtlYcuXqy9GOIi3WKPwQEN2KPHmd4l5UWulPahOM3CJl10 ly5q26d/xKurpZ9vnYj3IKizDpmBbYKHVim2pGRlWjMC3JcRqOSHhP2lY6QX8BPL92yB vu5Q== 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; bh=YF1A2WnWw8OoOVeFz3ok+8kMatzPzV3W7LPXfSP4fsw=; b=GB4d4rfezIpcN+kUCInuoq5NC+/DvvGSCX6X3Pal6z/4S4k4bdHh4JadiE74pFtcFD j99TDC9sngyUCd8NMnrwBs+eBzZvmUU7X/+ksS+DeUVbIzHBG0mQwVDQCkSzNvN8a2ch de+q+QGgxWA9GAJBm5e2+nK8rbCvGcK2qP8AuZavvWI71q1B++JSgtZNUcrHVDUJ4REC ioSGRmvcJF9TmBmTCr6tFXaoPf0ezFAEtpOBrrm4M3vRxIbGKZJl1xM4Li8CFzj4Tseb lXVw31m+rdQLs5oNXe7s5HquK3q4mm3WUzmNpGVps3fZuNhT9DC4sFxl2ZW1iV4mQvcF molQ== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=neutral (google.com: 212.18.0.9 is neither permitted nor denied by domain of sbabic@denx.de) smtp.mailfrom=sbabic@denx.de Received: from mail-out.m-online.net (mail-out.m-online.net. [212.18.0.9]) by gmr-mx.google.com with ESMTPS id i7si52051wrn.2.2021.09.06.02.22.00 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 06 Sep 2021 02:22:00 -0700 (PDT) Received-SPF: neutral (google.com: 212.18.0.9 is neither permitted nor denied by domain of sbabic@denx.de) client-ip=212.18.0.9; Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 4H32wR73JQz1qwxh; Mon, 6 Sep 2021 11:21:59 +0200 (CEST) Received: from localhost (dynscan1.mnet-online.de [192.168.6.70]) by mail.m-online.net (Postfix) with ESMTP id 4H32wR6shFz1qqkK; Mon, 6 Sep 2021 11:21:59 +0200 (CEST) X-Virus-Scanned: amavisd-new at mnet-online.de Received: from mail.mnet-online.de ([192.168.8.182]) by localhost (dynscan1.mail.m-online.net [192.168.6.70]) (amavisd-new, port 10024) with ESMTP id JPSywPBxNMHn; Mon, 6 Sep 2021 11:21:58 +0200 (CEST) Received: from babic.homelinux.org (host-88-217-136-221.customer.m-online.net [88.217.136.221]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.mnet-online.de (Postfix) with ESMTPS; Mon, 6 Sep 2021 11:21:58 +0200 (CEST) Received: from localhost (mail.babic.homelinux.org [127.0.0.1]) by babic.homelinux.org (Postfix) with ESMTP id 32AF44540C3E; Mon, 6 Sep 2021 11:21:58 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at babic.homelinux.org Received: from babic.homelinux.org ([IPv6:::1]) by localhost (mail.babic.homelinux.org [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id 743_bgCIqyNX; Mon, 6 Sep 2021 11:21:55 +0200 (CEST) Received: from paperino.fritz.box (paperino.fritz.box [192.168.178.48]) by babic.homelinux.org (Postfix) with ESMTP id A93F6454022F; Mon, 6 Sep 2021 11:21:55 +0200 (CEST) From: Stefano Babic To: swupdate@googlegroups.com Cc: Stefano Babic Subject: [swupdate] [[meta-swupdate] PATCH ] BUG: fix regression introduced by 534cf5d5968e713 Date: Mon, 6 Sep 2021 11:21:50 +0200 Message-Id: <20210906092150.26606-1-sbabic@denx.de> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-Original-Sender: sbabic@denx.de X-Original-Authentication-Results: gmr-mx.google.com; spf=neutral (google.com: 212.18.0.9 is neither permitted nor denied by domain of sbabic@denx.de) smtp.mailfrom=sbabic@denx.de 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: , The encryption part in the commion class does not work anymore due to the missing access to variables' database. Signed-off-by: Stefano Babic --- classes/swupdate-common.bbclass | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/classes/swupdate-common.bbclass b/classes/swupdate-common.bbclass index cbd86ca..dabd466 100644 --- a/classes/swupdate-common.bbclass +++ b/classes/swupdate-common.bbclass @@ -296,7 +296,7 @@ def swupdate_add_src_uri(d, list_for_cpio): shutil.copyfile(local, dst) list_for_cpio.append(filename) -def add_image_to_swu(deploydir, imagename, s, encrypt, list_for_cpio): +def add_image_to_swu(d, deploydir, imagename, s, encrypt, list_for_cpio): import shutil src = os.path.join(deploydir, imagename) @@ -334,13 +334,13 @@ def swupdate_add_artifacts(d, list_for_cpio): for fstype in fstypes: image_found = False for imagebase in imagebases: - image_found = add_image_to_swu(deploydir, imagebase + fstype, s, encrypted, list_for_cpio) + image_found = add_image_to_swu(d, deploydir, imagebase + fstype, s, encrypted, list_for_cpio) if image_found: break if not image_found: bb.fatal("swupdate cannot find image file: %s" % os.path.join(deploydir, imagebase + fstype)) else: # Allow also complete entries like "image.ext4.gz" in SWUPDATE_IMAGES - if not add_image_to_swu(deploydir, image, s, encrypted, list_for_cpio): + if not add_image_to_swu(d, deploydir, image, s, encrypted, list_for_cpio): bb.fatal("swupdate cannot find %s image file" % image)