From patchwork Wed Apr 6 08:18:26 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefano Babic X-Patchwork-Id: 1613835 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=J7peNPHJ; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=googlegroups.com (client-ip=2a00:1450:4864:20::23f; helo=mail-lj1-x23f.google.com; envelope-from=swupdate+bncbcxploxj6ikrbzmzwwjamgqex66vo7q@googlegroups.com; receiver=) Received: from mail-lj1-x23f.google.com (mail-lj1-x23f.google.com [IPv6:2a00:1450:4864:20::23f]) (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 4KYHTm1Lr6z9sFv for ; Wed, 6 Apr 2022 18:18:50 +1000 (AEST) Received: by mail-lj1-x23f.google.com with SMTP id n9-20020a2e82c9000000b002435af2e8b9sf539334ljh.20 for ; Wed, 06 Apr 2022 01:18:50 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1649233125; cv=pass; d=google.com; s=arc-20160816; b=ZUCSNaSRMVogSAg0suyCYOhA+bzGcVlPTCY224ftzPawYhVloyEQ0zoigMP4Bar7i5 nXSr+GtcxOyCgTei+FI+CjtF51pTT7Spq/IyHxDAxA/2Y7jjjRavK0j3ZtVEqHuKSgGG 5ZbvTtCuCBWb4SUApwdqZ/cYIStoj0xFE/zfRe/wwNFEMQxBY/5Y60ugcK+6M/t90pzQ RNHNX0M40GheiLurOD44GT7PrnlhzPJxxNuvtaBx7CJJ1qtWd7LDDNucaRysqxJSdkn7 xXvc3hiiJdpXVamOFh6N7fX18G51r+WqtBpfLBCfzplTSajaZz4VNZJcl6xSWjls8SJY HWiQ== 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; bh=Ob7Veysge12HgxPSU0K92uA7IETLafKGX7p2pYapG74=; b=xUul/QAq6hVX3wh+6QMtx2CRBgUvEgsWjuCJRIZJJixJqLZ3cDxJ98My30s5jk3UCY Z3Nw4bPH+VJ3QvNAqpuqEZjkfc405ATdCbK0TYQcX4L+Bt/lxGHmjJdD/0vxZvm9Hcat nmad5CLvchoA99VRKXI2Fmsq9EGK2Jc0i6BiW61RD08NBMiPnrmGHMVGqsJwyUBZZNHA F9x52QKdAB4wdrfo+8OYhsb7iK0d/P40WuoYIZb1/cfqAXPLbFYzkYKm5KQHQxk8XAua B+/of9NnKwQPXTTrfonAeCM3iiEOso6GMLzr5OmuaNJz7mKeCc7KXsuX0km2SB2oDm0q YP/g== 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: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=Ob7Veysge12HgxPSU0K92uA7IETLafKGX7p2pYapG74=; b=J7peNPHJyP5Nl6zaUPkJM6OhWz9bQ8gkf7hW1K5DkWTuWQ98ZKNSt+fdlmwsFMS8xW 0EVdjEmv45FTQqgZUZJS73rawE4pCIRb3NGZbdxh9kUSoSS+Qbwl3vWMOTHigr3SuKwK CuP5/2Lfem2GZFFVBqvqUg1z6HIDKWCUa0Dqc8PY5PaJQXmv2RSRuchIk8kP5XVEOfDZ qrpGRr4nbyI3dqIu7hVkjzhfCJ9Z3jpsEMhEEendH8cXxtI47W/PZHQFwBsHOdkwX/b4 RQ2Q9QKEggx6Nh6GkowjQ/4uomdfRwWHY1qTom26zHu4M1URGQL3PEgLt/3jD2NDrMBl FsFw== 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=Ob7Veysge12HgxPSU0K92uA7IETLafKGX7p2pYapG74=; b=AY+d84qlzNoLbmQARWEOLo6VsNI4StuakvMhhD7A2UExitJEongRMkpjcN1TsNf6fI /ZLGHp88FCRiq5vans2NFgzWHuru1/QBqo3jxWD34BoeupYUF6jp08gMZ15cuK62iZkF Q0sGVrg8RVIQ20WwXJZsTPsW7TyoYTYQZAImMSCWYKAVXNA3vNvc4REtIK9/Kz+iFnkL Dy/k29xhozjU9pAOxN7HZicDnlp4bwHeh91xM5sQrMZPMnElhT9DIvCbPu2WAoFY6qLE LVeFy3HN8LVqM2RygyMPdF/jvObYzoAV6kv8kGC/GtDxBGLcuppnD6c6V9z0PUQz5Uyt BdBw== Sender: swupdate@googlegroups.com X-Gm-Message-State: AOAM532AFpnK4Ld0QSyGcJR3Bx+6AgW3R7inlVYBdSPpwUmGWIPKiFwk fiDSlN+dEY1UExB8v3PpEMo= X-Google-Smtp-Source: ABdhPJyks//Ihh0Q3qMrybz2ux4CGpqVwt9DREHSLfp8k5klkFQCTJIg1nbFOg4x1nlp4ZqhqXlGYg== X-Received: by 2002:a05:6512:3994:b0:44a:2b5d:2881 with SMTP id j20-20020a056512399400b0044a2b5d2881mr5233886lfu.415.1649233125425; Wed, 06 Apr 2022 01:18:45 -0700 (PDT) X-BeenThere: swupdate@googlegroups.com Received: by 2002:a05:651c:211c:b0:24b:4b3:cb8f with SMTP id a28-20020a05651c211c00b0024b04b3cb8fls1828673ljq.6.gmail; Wed, 06 Apr 2022 01:18:44 -0700 (PDT) X-Received: by 2002:a2e:7205:0:b0:24a:fb45:dbc3 with SMTP id n5-20020a2e7205000000b0024afb45dbc3mr4778403ljc.96.1649233124317; Wed, 06 Apr 2022 01:18:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1649233124; cv=none; d=google.com; s=arc-20160816; b=YFbc+MZfdt91RBs8qQB4FH7IFKW0YIVK/lJm5UKAQH0qCuv8a9vutQS5DqnDhIPR25 n4YkwdRQql6l8w31gT7zSVjL9NjPiyM9nRIR2mExLUWwMB6qSBQxQuscjmKxp/I9bCk+ BLoKZ1E0TmwZffRL7YKZFJfQA+tix1MGCmAzLdkVfiG8zBkr8ZjR92owVaJ+YrNx2h5a ePM4P3gmA/Z8BDsL81otb+ofDzI+o6W5AJXcFxSy0IugFT+hho4EgMZLE4AXcZY7xjkY yhzwA/iUGfG56EPGUT7rgicvU4xXWUfX5yPRCnCcI1X6BuSGVHnuhJaDBxvymq7CyDv1 gO0Q== 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; bh=M3tAtMzQL762eG2szQWh8n/rwWzEaZrd3y/PrrzvDbE=; b=fS96MabnOnxpMFbYicZHm0bE9ThvSDhJIHXepln2sxWqzlEOVPOlOzPzeHSfXLfBsB 5Hg3OTgqJLAb5tzpJPnzIMOK7FE5SwJIn0kT6GRJLUjUUj0nHpIjdGzLSy07hHw1lR5u vRjwZC4ljqCp/Km/kPYZ3nXXoWFNxPxXvme0eb+AalbRi7EU9BjHCC67OCC3fT7nR1++ NByzfPiJ9G26Wv3F9EnGcxAjqeqjNVqwCKnEpSXMjfaj6byNT+3Dk59lVegQVPDq/JyE l/cNdkyb2+oRrbWFvvYC56CoMxGvM+PUaadhGP/Pcu8fkzHbEUso7DuwK+qpau5YVG2t 4cCA== 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 f43-20020a0565123b2b00b0044ada59207esi627929lfv.12.2022.04.06.01.18.44 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 06 Apr 2022 01:18:44 -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 4KYHTb68zTz1r1fm; Wed, 6 Apr 2022 10:18:43 +0200 (CEST) Received: from localhost (dynscan1.mnet-online.de [192.168.6.70]) by mail.m-online.net (Postfix) with ESMTP id 4KYHTb609Xz1qqkB; Wed, 6 Apr 2022 10:18:43 +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 kEu4NyODBAuH; Wed, 6 Apr 2022 10:18:43 +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; Wed, 6 Apr 2022 10:18:43 +0200 (CEST) Received: from localhost (mail.babic.homelinux.org [127.0.0.1]) by babic.homelinux.org (Postfix) with ESMTP id D4E8045400DB; Wed, 6 Apr 2022 10:18:42 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at babic.homelinux.org Received: from babic.homelinux.org ([127.0.0.1]) by localhost (mail.babic.homelinux.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id evcdrmU8kfAg; Wed, 6 Apr 2022 10:18:39 +0200 (CEST) Received: from paperino.fritz.box (paperino.fritz.box [192.168.178.48]) by babic.homelinux.org (Postfix) with ESMTP id 764984540E68; Wed, 6 Apr 2022 10:18:39 +0200 (CEST) From: Stefano Babic To: swupdate@googlegroups.com Cc: Stefano Babic Subject: [swupdate] [meta swupdate] [V2 01/12] Evaluate functions inside sw-description Date: Wed, 6 Apr 2022 10:18:26 +0200 Message-Id: <20220406081837.2222008-2-sbabic@denx.de> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220406081837.2222008-1-sbabic@denx.de> References: <20220406081837.2222008-1-sbabic@denx.de> 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: , Instead to add new rules to parse sw-description to generate data, create a generic method to let the class to call a function. It is then enough to create a list / libraries of these function instead to find new ways to extend sw-description's syntax. Signed-off-by: Stefano Babic --- classes/swupdate-common.bbclass | 34 +++++++++++++++++++++++++++++++-- 1 file changed, 32 insertions(+), 2 deletions(-) diff --git a/classes/swupdate-common.bbclass b/classes/swupdate-common.bbclass index 53aa48e..556ab8d 100644 --- a/classes/swupdate-common.bbclass +++ b/classes/swupdate-common.bbclass @@ -38,7 +38,7 @@ def swupdate_getdepends(d): return depstr -def swupdate_get_sha256(s, filename): +def swupdate_get_sha256(d, s, filename): import hashlib m = hashlib.sha256() @@ -84,7 +84,7 @@ def swupdate_write_sha256(s): m = re.match(r"^(?P.+)(sha256|version).+[=:].*(?P[\'\"])@(?P.*)(?P=quote)", line) if m: filename = m.group('filename') - hash = swupdate_get_sha256(s, filename) + hash = swupdate_get_sha256(None, s, filename) write_lines.append(line.replace("@%s" % (filename), hash)) else: write_lines.append(line) @@ -93,6 +93,34 @@ def swupdate_write_sha256(s): for line in write_lines: f.write(line) +def swupdate_create_func_line(s, function, parms): + parmlist = parms.split(',') + cmd = "'" + s + "'" + for parm in parmlist: + if len(cmd): + cmd = cmd + ',' + cmd = cmd + "'" + parm + "'" + cmd = function + '(' + cmd + ')' + return cmd + +def swupdate_exec_functions(d, s, write_lines): + import re + for index, line in enumerate(write_lines): + m = re.match(r"^(?P.+)\$(?P\w+)\((?P.+)\)(?P.+)$", line) + if m: + bb.warn("Found function") + fun = m.group('bitbake_function_name') + "(d, \"" + s + "\", \"" + m.group('parms') + "\")" + ret = eval(fun) + bb.warn("Fun : %s" % fun) + bb.warn ("%s return %s " % (m.group('bitbake_function_name'), ret)) + cmd = swupdate_create_func_line(s, m.group('bitbake_function_name'), m.group('parms') ) + bb.warn ("Returned command %s" % cmd) + line = m.group('before_placeholder') + ret + m.group('after_placeholder') + "\n" + #ret = eval(cmd) + bb.warn ("==> Returned command %s : %s" % (cmd, ret)) + write_lines[index] = line + + def swupdate_expand_bitbake_variables(d, s): write_lines = [] @@ -125,6 +153,8 @@ def swupdate_expand_bitbake_variables(d, s): write_lines.append(line) + swupdate_exec_functions(d, s, write_lines) + with open(os.path.join(s, "sw-description"), 'w+') as f: for line in write_lines: f.write(line) From patchwork Wed Apr 6 08:18:27 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefano Babic X-Patchwork-Id: 1613834 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=IAv4PPSo; 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+bncbcxploxj6ikrbzuzwwjamgqelkdbmfy@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 4KYHTm1DcHz9sFs for ; Wed, 6 Apr 2022 18:18:50 +1000 (AEST) Received: by mail-wm1-x337.google.com with SMTP id f19-20020a7bcd13000000b0038c01defd5asf969144wmj.7 for ; Wed, 06 Apr 2022 01:18:50 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1649233127; cv=pass; d=google.com; s=arc-20160816; b=EO/uKieUo1762Kbjrcwa+QAYs9O5PiAAg+PdMDxpHJzeU6Rpms8rn8mEOJMKM4x6FV IEfPeqcNFOWZg+ZuRQIFx4RFe+HXXA+m1Wd0fnR5Va/smTi86xIAFlyMoO80CNfxefud roOdAtEk493Sa4k6STSgIOViyhhrShmRxS9Tyv5U0NTg2y0NJp+LT9qGaKwHzlHFcX4t ZwpaZl7/xO++KRmIecC5ww7MIXyVXkjsXMC0g6ONd/HBmgMmT2XRVnJyXkdojSd6SIU3 hedvIg9BREvk7RMZnl/+0u78CxqXU8xIOcA76/XKJ/vdJgZHe9by4oPODRKRgio1/gtA PXXg== 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; bh=VhB8WV79Dw2rOYAEyAbvHqb97aD3NAd07SAjtnEUxQc=; b=lB7lWVQpai18Olkt8RXTP4bqnG6z7cZKjyWFdJyeIzWGADMUGetldW//1M/t2RsgGk g2v4k1HE47k+7TcyxAkSh5LpUyg0mITYGch/6rvBuq5W1oOSJPWnzFW8WcinnyuP/PB8 WMbTkhc2Z3us4WPEH9oMHwpssTFvq/2gWxF990MoNILjZ3HkKUUEzaMgbLRO07707ToS rsYAoPEqUy9sVCARQc0oZxYJPARPdf5gD+jduJJ2kbJIKGBxXOqnIOmVQXpPmQXbORe0 N3purCIZYuJk13rEST+e4zMHERdHHzb09BrlE7teT2jskS81/e2UkmU80OJpwNPnrRpc ZJow== ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=neutral (google.com: 2001:a60:0:28:0:1:25:1 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: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=VhB8WV79Dw2rOYAEyAbvHqb97aD3NAd07SAjtnEUxQc=; b=IAv4PPSotdskjLwqjuTZKr4aN2GvIAlZIz1KcHTxQgovERlfrbgs87froVcz7xUgq7 SEStGorYopbWDkcngTgn0+d/ieCLm35/FwHjP2305ve0kCP8DiI3t4G5IpoWapDr9lUE BqjCtp+qV1J3qjMHFlTe9ydPLSleq1oa5etg+i20yMWOhzy0mW0Yv37V13pPVwDFG3cf KNH5U9MHtxqBOzNfQY19ytBnWVJTvxDkmign0frQ8mEfv9pcB1AROpO8WuQvxrMqg7+a Kic4r5fVzSsPQIFqcVzeGSjolwLAHoaw6V5B/w/ZAPIopzm4nst33Vn+BGnyWHOuTiOE PQEw== 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=VhB8WV79Dw2rOYAEyAbvHqb97aD3NAd07SAjtnEUxQc=; b=NU2NoLQgTKg9fhx6yxrkhLpEUelA4zMzL46UoeJU8mOdjOsAvylIiaP+MB49cb1nbK Q/PsNibZI8lPLaB7sTwxkEoiMw+2iPGuOcYDGqsYVJUie+rYR9rQHtd8CA/3ZnHlCKKW a7HWgQjezP4/iz+m7lHAiZo9ZY0FixASs6uldaHa3zqLJ0chsCQcb6qNnk6puERYIvxZ s8Vt8HYp8WkfwrJoL3xdGqilH6yQLmp6SBTL9egQnh032S8E7LcN07ygRGTFxDvXvdVo G5pAjLGntzeXJJQlA8K+IpRZrZ18o5vCLpMd2ds8TVErvcipCkzhyyrfnzb/VVP5lXDF UhAg== Sender: swupdate@googlegroups.com X-Gm-Message-State: AOAM532yQAoXPzvxNPSQ0Mq/jhEPiDUI4Iba+oPqhpqUWDeMl4pP+C2V mkqGQyKAbZdabAK0EaUwzJw= X-Google-Smtp-Source: ABdhPJzZGDUYcMfEoy/x/o73rMhx2h8qBUnELdW4JeKHMF5DTbmPPryn64g3sBwFGuN1VjQcrIuCfQ== X-Received: by 2002:adf:d222:0:b0:206:17ba:5f76 with SMTP id k2-20020adfd222000000b0020617ba5f76mr5546316wrh.484.1649233126816; Wed, 06 Apr 2022 01:18:46 -0700 (PDT) X-BeenThere: swupdate@googlegroups.com Received: by 2002:a05:600c:5119:b0:38e:4822:3f49 with SMTP id o25-20020a05600c511900b0038e48223f49ls2482227wms.3.canary-gmail; Wed, 06 Apr 2022 01:18:45 -0700 (PDT) X-Received: by 2002:a05:600c:4e8b:b0:38c:90cf:1158 with SMTP id f11-20020a05600c4e8b00b0038c90cf1158mr6536530wmq.107.1649233125859; Wed, 06 Apr 2022 01:18:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1649233125; cv=none; d=google.com; s=arc-20160816; b=fKaERY5uvkhepXWW3Ovn+R27TiRDxIylNZsG2BL5A73G/n5UVfYYWGePtRx21SDIR3 iThXVPH4TO9PMOjLfPv0ZblVseA05uXSVaJgbMlJ0MsGnv8svmGPYdHhvSEJUHEMUy2D aqGT1ExmVKpUMg5yDGNzQKeioQ14UFY5eJIwlinGvyzJJr3R/WAm0w+3h4cIieDegyEP bil+H6G/jfsUkkPowkonNrJuICPYse6bg9+0704+8FJnygxk8/B2PTu5nlCDXZqQEUju ZTbsIWOydQAawK3TGqOMQ04KBVcB0Aa5+jhv2B5fcjIv0j/gVEQE4KXGwd/+TBCP6vds uXjQ== 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; bh=+z2BQND6fStvh/gupkEw0B1rgxTUUrR9Zymf1rIXSYM=; b=hVRSp9GaqB9epU/R2LgdUGls8F3nP7/r1O3dHLIM5AMRNU/slRzd/a+L3m3KXfOVej l18LxHtisoSE3dLH2pXqgpNv/1wG98euyDSGD9lwqzTYxMoFOnuvq2rbhz2bPm9KuBGc JJ++tltGri83axpC1URJ6wWnlAJ0/yG8eh3gOSgEYeQwXKIyuM34PraJPBD3QlN4PrVr r48S6OvVoGinsgcHkISK8w7VRdRByJHP6UlYDEBFxLWLLK0Ht7FJEURJ1LA+ihOIFb4b 3+07RroAFJ12aZZUTgsvyZipTtEzdESNcXAmZrAtTX/8TMPrxPLfwzILvYxknlnlLAq9 en6g== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=neutral (google.com: 2001:a60:0:28:0:1:25:1 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. [2001:a60:0:28:0:1:25:1]) by gmr-mx.google.com with ESMTPS id az31-20020a05600c601f00b00389f5a1b55asi260261wmb.0.2022.04.06.01.18.45 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 06 Apr 2022 01:18:45 -0700 (PDT) Received-SPF: neutral (google.com: 2001:a60:0:28:0:1:25:1 is neither permitted nor denied by domain of sbabic@denx.de) client-ip=2001:a60:0:28:0:1:25:1; Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 4KYHTd4H9wz1s7tQ; Wed, 6 Apr 2022 10:18:45 +0200 (CEST) Received: from localhost (dynscan1.mnet-online.de [192.168.6.70]) by mail.m-online.net (Postfix) with ESMTP id 4KYHTd3XJDz1qqkK; Wed, 6 Apr 2022 10:18:45 +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 px20F6OstQvt; Wed, 6 Apr 2022 10:18:44 +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; Wed, 6 Apr 2022 10:18:44 +0200 (CEST) Received: from localhost (mail.babic.homelinux.org [127.0.0.1]) by babic.homelinux.org (Postfix) with ESMTP id 3AEB845400DB; Wed, 6 Apr 2022 10:18:44 +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 wfHnVT9aRr5s; Wed, 6 Apr 2022 10:18:41 +0200 (CEST) Received: from paperino.fritz.box (paperino.fritz.box [192.168.178.48]) by babic.homelinux.org (Postfix) with ESMTP id 8E6644541450; Wed, 6 Apr 2022 10:18:39 +0200 (CEST) From: Stefano Babic To: swupdate@googlegroups.com Cc: Stefano Babic Subject: [swupdate] [meta swupdate] [V2 02/12] swupdate-common: factorize function get_pwd_file_args Date: Wed, 6 Apr 2022 10:18:27 +0200 Message-Id: <20220406081837.2222008-3-sbabic@denx.de> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220406081837.2222008-1-sbabic@denx.de> References: <20220406081837.2222008-1-sbabic@denx.de> MIME-Version: 1.0 X-Original-Sender: sbabic@denx.de X-Original-Authentication-Results: gmr-mx.google.com; spf=neutral (google.com: 2001:a60:0:28:0:1:25:1 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: , Signed-off-by: Stefano Babic --- classes/swupdate-common.bbclass | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/classes/swupdate-common.bbclass b/classes/swupdate-common.bbclass index 556ab8d..ff21cf1 100644 --- a/classes/swupdate-common.bbclass +++ b/classes/swupdate-common.bbclass @@ -21,6 +21,13 @@ python () { d.delVarFlag('do_unpack', 'noexec') } +def get_pwd_file_args(d, passfile): + pwd_args = [] + pwd_file = d.getVar(passfile, True) + if pwd_file: + pwd_args = ["-passin", "file:%s" % pwd_file] + return pwd_args + def swupdate_getdepends(d): def adddep(depstr, deps): for i in (depstr or "").split(): @@ -279,12 +286,6 @@ def prepare_sw_description(d): 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" if signing: - def get_pwd_file_args(): - pwd_args = [] - pwd_file = d.getVar('SWUPDATE_PASSWORD_FILE', True) - if pwd_file: - pwd_args = ["-passin", "file:%s" % pwd_file] - return pwd_args sw_desc_sig = os.path.join(s, 'sw-description.sig') sw_desc = os.path.join(s, 'sw-description.plain' if encrypt else 'sw-description') @@ -303,7 +304,7 @@ def prepare_sw_description(d): 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() + ["-out", sw_desc_sig, sw_desc] + 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) if not cms_cert: @@ -315,7 +316,8 @@ def prepare_sw_description(d): bb.fatal("SWUPDATE_CMS_KEY isn't set") if not os.path.exists(cms_key): bb.fatal("SWUPDATE_CMS_KEY %s doesn't exist" % (cms_key)) - signcmd = ["openssl", "cms", "-sign", "-in", sw_desc, "-out", sw_desc_sig, "-signer", cms_cert, "-inkey", cms_key] + get_pwd_file_args() + ["-outform", "DER", "-nosmimecap", "-binary"] + signcmd = ["openssl", "cms", "-sign", "-in", sw_desc, "-out", sw_desc_sig, "-signer", cms_cert, "-inkey", cms_key] + \ + get_pwd_file_args(d, 'SWUPDATE_PASSWORD_FILE') + ["-outform", "DER", "-nosmimecap", "-binary"] else: bb.fatal("Unrecognized SWUPDATE_SIGNING mechanism.") subprocess.run(' '.join(signcmd), shell=True, check=True) From patchwork Wed Apr 6 08:18:28 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefano Babic X-Patchwork-Id: 1613833 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=oT07PF3g; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=googlegroups.com (client-ip=2a00:1450:4864:20::43a; helo=mail-wr1-x43a.google.com; envelope-from=swupdate+bncbcxploxj6ikrbz4zwwjamgqeluwbufq@googlegroups.com; receiver=) Received: from mail-wr1-x43a.google.com (mail-wr1-x43a.google.com [IPv6:2a00:1450:4864:20::43a]) (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 4KYHTm1gfrz9sFx for ; Wed, 6 Apr 2022 18:18:50 +1000 (AEST) Received: by mail-wr1-x43a.google.com with SMTP id p18-20020adfba92000000b001e8f7697cc7sf232438wrg.20 for ; Wed, 06 Apr 2022 01:18:50 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1649233127; cv=pass; d=google.com; s=arc-20160816; b=hg48TxP29KNxYeJ3VPCvocqPzdSYbsATT2npw5dMM9DJ4mSjtTF2ZCn/aoLWY9kK9F f/D0pRFpuTtOpnLXQ1s6YWqjK3uB7JLpw6r1aoV9EpXsGi9Itt5N/E9L4Qbq67iPp8Fz Q//PltIm45h6AX3w3xnXr95fiV7zl/Q3nNPWWiVXAAukCkcLufXlsxlAE8lyhWmHCLGZ O9gC8imFDWp2oZD0h+5PnFFVdGCK+T4agE2PC/gFX92FIe6EUM9LNva/iwsH+5PRQyDt 71RgC9HzqN6JvH79Iipfcvfwrds+GfnCUDhb1DgDu205WGnW9TfBETu2kCwWGR6Nfwo9 wPsw== 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; bh=nnNtAo49yDBKUox+LlznmzqXN17sh5zI1D+4hJbPcUk=; b=NjC/esUG4sDBhye91kFpK+7X4MHqKvQcpGzNCkoq7DyfzepfW9CQVk18eNoaXOoZo4 rSLI203iPLjHO6Vn2ofSUVvpu0piuH3OPBb4G1RP5E3jFsdBtmoj3eoxEYhWysAmyZpt 40n/kHXgv00uuWa6G5Mpmhea1upGEi4OaeF7PsWPyBTBjpf1YTjCu9hISbCfv0CCgXFn PY6dVNxeK4tBNasXK/hxPdCkWQ0WfrpcpLIyZT9xDVDslqX+OGhIH6O1fVeUWhPW6dww Cd4oHYS4cHRNZiOWSRkEQjOdEN/GtMcz8v3cl6953QV8gRLVkCCidh1X6j8f3Bt/eysP 0CiA== ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=neutral (google.com: 2001:a60:0:28:0:1:25:1 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: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=nnNtAo49yDBKUox+LlznmzqXN17sh5zI1D+4hJbPcUk=; b=oT07PF3gll7XxwCVGDSGUZ9FCvB+VpyRqCzQ4FjPpd9rCNlArvcIwa/0w1YjVM5Pe2 vnyye+yExK4c+3NY9XTTrMGErlKIS/eYA6hhLggLad+aYVXNXn8C+lOi/s9a1FNSoBJl e3MDbrFYYJFFaKrJ3gKmKeZvVoOAR4AtiZRekurD8ln9FMoX6zCDe4VOFWkIwKVgzfXY gpGymvoWYb1HBOcoH5cC52V35XTa1mrzr0NwzL/Fwj0FqgX1BXJb8K6XMTVHvapd7Yg1 kkRn5tRfXmbxgZoNHlYUJiCt4IbIdQnw2fPWOs7ySkPyAbYTkwxAQlSVmhIZb7ONY+JC yfZg== 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=nnNtAo49yDBKUox+LlznmzqXN17sh5zI1D+4hJbPcUk=; b=yt6yydP7zIb8F4bsV+ldIxURMvf5NfTQSto5RBFW5LsypKvh83HILNybpqmbcUHFwM ar6jfT8of67mX73CREL1YxliufryQNHa9vxn7UitfmNY0xpAo1ZKCvMXltgbQs8RkzZ8 xfvXYbY/sn+773mPCRLh1rS3FYJEl+JCMwTQbg/Rpe8BvruhgzBv5aDF9tcWDdGMkxlw fWi6VAaqhuv1AgUlxeAtjqs9VDviUVe0DcFEy3fct9suXwUlaTDcO3NtQv7w9qlHL3hY 6gb3PkNiNDBOWqp0ajygA+5RDSs72RooiVrgZVQwdEBXb6fDc6Rbz3rE90oiWaUlA+of SLWA== Sender: swupdate@googlegroups.com X-Gm-Message-State: AOAM53085NzxksAjJw81GckKl9aImQKtEMXBNwY3mozh989+cieF2D6a Bc+DpqH/tERWjYz7BGeRMGM= X-Google-Smtp-Source: ABdhPJyY+vr+vizUybLqE38DwX9ZFtpPZTcLm8T0t2RnEnOSY4p+2Os6sIvPPko16lagormaslOajw== X-Received: by 2002:a5d:6cab:0:b0:206:b84:9428 with SMTP id a11-20020a5d6cab000000b002060b849428mr5696705wra.358.1649233127518; Wed, 06 Apr 2022 01:18:47 -0700 (PDT) X-BeenThere: swupdate@googlegroups.com Received: by 2002:a05:600c:5119:b0:38e:4822:3f49 with SMTP id o25-20020a05600c511900b0038e48223f49ls2482250wms.3.canary-gmail; Wed, 06 Apr 2022 01:18:46 -0700 (PDT) X-Received: by 2002:a05:600c:1c20:b0:38c:ae37:c1ae with SMTP id j32-20020a05600c1c2000b0038cae37c1aemr6328137wms.203.1649233126732; Wed, 06 Apr 2022 01:18:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1649233126; cv=none; d=google.com; s=arc-20160816; b=KGiVQE7DQ5+qTOYo5I7cJhlUB62YP2/xOzuwbfeCdYIeGyx5KvQdzrZrCBSHxiqaYM pXyn5MrQaf3UvXvza4nJhGxiPHaTdnV6aFZ0eTsgetSgXqAy6NoVEOH5/h3kNNUKzNp7 jKouVWGkB8mgLyPP21frluqCu3x9fe5Y1MSLIe4I6HhB/HaAQx5BtzG3jObB0tb2XuFs YSVXPGq29v2451oZzbqRI3NdZgIwZEDsoxbHA+lI5F4V3pWc9czVndtCC6HmXFz3cwqk gfCBh+ZtlvWL0DYezejuSvvarCRPQ+0RSuPUxGTuffdOW7qWuueapIB4Lm9csIgRAaVn jZ2g== 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; bh=Qpm4z4W72uF6WO7WId4anpHyFByjACu5+gx7YG/0syg=; b=k0/j5jQyxgo49gI/GRJfN5sU9Rnngw6xUNOqJ+h3yGzvfC8IbNdsiNhkgHvCTrb5Gy uwceiJ14ZRIx87tF3b2fW1/3pE36qhsSMD9/LoOktMNOPPZd2o9nkEkXIagoRImcZ0NM xsFJl5JnXd3FY7hMO9E2tvjo8a0rBN3WAoSvOwrDkUhQ5fTHg+upg7UrxAe0G62xljhY MFsgVlps3/JUuFqJ+gZBl3wKbmrrGz9SNmuxPuR4EqHuCFRIF2GNrzkvFCDXDIxtyFn3 jc1Ds7EYoXQkclAhnrt3EiWoywj/ZLfS0KUc00RpdBIlj+38QrKlbHq7R+1d/3/tfduf rqJw== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=neutral (google.com: 2001:a60:0:28:0:1:25:1 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. [2001:a60:0:28:0:1:25:1]) by gmr-mx.google.com with ESMTPS id e15-20020a056000178f00b0020619efb241si412223wrg.4.2022.04.06.01.18.46 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 06 Apr 2022 01:18:46 -0700 (PDT) Received-SPF: neutral (google.com: 2001:a60:0:28:0:1:25:1 is neither permitted nor denied by domain of sbabic@denx.de) client-ip=2001:a60:0:28:0:1:25:1; Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 4KYHTf3PT2z1s7tQ; Wed, 6 Apr 2022 10:18:46 +0200 (CEST) Received: from localhost (dynscan1.mnet-online.de [192.168.6.70]) by mail.m-online.net (Postfix) with ESMTP id 4KYHTf3CRsz1qqkJ; Wed, 6 Apr 2022 10:18:46 +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 fG4ZweH0VxTd; Wed, 6 Apr 2022 10:18:45 +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; Wed, 6 Apr 2022 10:18:45 +0200 (CEST) Received: from localhost (mail.babic.homelinux.org [127.0.0.1]) by babic.homelinux.org (Postfix) with ESMTP id 5CE914540E68; Wed, 6 Apr 2022 10:18:45 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at babic.homelinux.org Received: from babic.homelinux.org ([127.0.0.1]) by localhost (mail.babic.homelinux.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id eH2O5hjQNZLA; Wed, 6 Apr 2022 10:18:42 +0200 (CEST) Received: from paperino.fritz.box (paperino.fritz.box [192.168.178.48]) by babic.homelinux.org (Postfix) with ESMTP id A5FDD4541B74; Wed, 6 Apr 2022 10:18:39 +0200 (CEST) From: Stefano Babic To: swupdate@googlegroups.com Cc: Stefano Babic Subject: [swupdate] [meta swupdate] [V2 03/12] class: add a library file for generic function Date: Wed, 6 Apr 2022 10:18:28 +0200 Message-Id: <20220406081837.2222008-4-sbabic@denx.de> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220406081837.2222008-1-sbabic@denx.de> References: <20220406081837.2222008-1-sbabic@denx.de> MIME-Version: 1.0 X-Original-Sender: sbabic@denx.de X-Original-Authentication-Results: gmr-mx.google.com; spf=neutral (google.com: 2001:a60:0:28:0:1:25:1 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: , sw-description can be generated using ad-hoc and user function. Create a file that will be used as library, with functions that are called when sw-description is parset for variable substitution. Signed-off-by: Stefano Babic --- classes/swupdate-common.bbclass | 18 +----------------- classes/swupdate-lib.bbclass | 0 2 files changed, 1 insertion(+), 17 deletions(-) create mode 100644 classes/swupdate-lib.bbclass diff --git a/classes/swupdate-common.bbclass b/classes/swupdate-common.bbclass index ff21cf1..926f17a 100644 --- a/classes/swupdate-common.bbclass +++ b/classes/swupdate-common.bbclass @@ -100,31 +100,15 @@ def swupdate_write_sha256(s): for line in write_lines: f.write(line) -def swupdate_create_func_line(s, function, parms): - parmlist = parms.split(',') - cmd = "'" + s + "'" - for parm in parmlist: - if len(cmd): - cmd = cmd + ',' - cmd = cmd + "'" + parm + "'" - cmd = function + '(' + cmd + ')' - return cmd - def swupdate_exec_functions(d, s, write_lines): import re for index, line in enumerate(write_lines): m = re.match(r"^(?P.+)\$(?P\w+)\((?P.+)\)(?P.+)$", line) if m: - bb.warn("Found function") fun = m.group('bitbake_function_name') + "(d, \"" + s + "\", \"" + m.group('parms') + "\")" ret = eval(fun) - bb.warn("Fun : %s" % fun) - bb.warn ("%s return %s " % (m.group('bitbake_function_name'), ret)) - cmd = swupdate_create_func_line(s, m.group('bitbake_function_name'), m.group('parms') ) - bb.warn ("Returned command %s" % cmd) + bb.debug (2, "%s return %s " % (m.group('bitbake_function_name'), ret)) line = m.group('before_placeholder') + ret + m.group('after_placeholder') + "\n" - #ret = eval(cmd) - bb.warn ("==> Returned command %s : %s" % (cmd, ret)) write_lines[index] = line diff --git a/classes/swupdate-lib.bbclass b/classes/swupdate-lib.bbclass new file mode 100644 index 0000000..e69de29 From patchwork Wed Apr 6 08:18:30 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefano Babic X-Patchwork-Id: 1613836 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=LeuRYl5D; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=googlegroups.com (client-ip=2a00:1450:4864:20::33a; helo=mail-wm1-x33a.google.com; envelope-from=swupdate+bncbcxploxj6ikrb2mzwwjamgqememomea@googlegroups.com; receiver=) Received: from mail-wm1-x33a.google.com (mail-wm1-x33a.google.com [IPv6:2a00:1450:4864:20::33a]) (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 4KYHTn2x6Sz9sG6 for ; Wed, 6 Apr 2022 18:18:53 +1000 (AEST) Received: by mail-wm1-x33a.google.com with SMTP id x8-20020a7bc768000000b0038e73173886sf972082wmk.6 for ; Wed, 06 Apr 2022 01:18:52 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1649233130; cv=pass; d=google.com; s=arc-20160816; b=n+2H+1ODQmG9Ee3WbUTib9f2jOVhGh4bugrZifYsUuz42Ky5YONfCqjnv599dwkr20 VpGvP2z8rJ+oB8X6pit19IDLuBe6P73k94v0NGG1PQytE1tzJE+QAJQsZu85GE58zdiT SWdnXOJSl+zd33kAEHBs2Fq7G3OeC6CBHHBEm6dIWhpoaSGAs16hyjVaJOcjMQvpj1K/ lqgTSe7K5Y57+MxoFIKIDmipfsZYq65+q07nsr4uSO1wT7T6KtksjTK8BzwrTElW1oUB sIVCW3wUg22LFe9g8kJqjUrCCnZQxAbDd6qYHTAhX8bwwV/CB3aVN91FtLuHz3MY9ROb 8gOw== 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; bh=u0BFJ/0B5KK3dyVUhKgRPWk7uQSerA9hcm+UQHEd2AA=; b=D2QWjk3rGDHQCxhoOemwAiZNbWS+R3jr+q/bK6xneVKVdWFEEqxjV0uJbDTqyBUu2r YUaJ80vb38Irsxk6rEht1dDRM08qxEpHyU9NxFNtHakgztcU7zYc3F0cJZLwhvOz4IUx klSdj3T9Bl5xbLuguLlJ309a9vy6/p5duCbgl/JZVxjG0A1Akv4lcShLN8/Z/OfP3QYV 6vyiLwaG5r8UzGEcP2su0x3ndKCzDWa1Ek3jBJ0cBJyAxhmY0mQ3QUA5g7sOlO8nutif jE0mNHQeuSo5dOniEzhVA1OblrlfoF7C2kfTxk7r3yJN8XhGWO8Nv1JOZecJYfwL7a/z D7Qw== ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=neutral (google.com: 212.18.0.10 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: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=u0BFJ/0B5KK3dyVUhKgRPWk7uQSerA9hcm+UQHEd2AA=; b=LeuRYl5DFUquRT94QYJO1/lNdX4WOda3aYNzCvuTTuORF9V4MrbNCHL5CsMH5OOWwZ 4SIdxB+OdLJyrYK1ZMaXYTcDjsoGVr0R5+X/L2oC0FLPIgYDtxXKJkK7EpYRytIZQ08B qdZLI2+q2nP4Eva+jjpCLW3M/b2ekGOUH1us3f/k7TqAtU5oklwFR2nuO3AjHg3gWVWX ooi/mXd5jHo1lSPjUcOv2KzNnzoW0hF2TvkTIsWZKPJrBUk02eCEafKQa4hh1ckdZuDh s743/h5jKOBM5wsi21OpjtdOs5y4fzoy2ds70SaglAP4Mdyl9BPDBD0br+ff+mdK2wne DIiw== 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=u0BFJ/0B5KK3dyVUhKgRPWk7uQSerA9hcm+UQHEd2AA=; b=mRAF8ieVKwR5ucsKjK2PKsnFdyPnmCZQs5QKTlN3XhZ6fPINN45Dfw9AicQVTkjwK0 fVh7A9+Rm6SniLaDHFmxrRQi63QqyEQz3qHsaCRBnEW798fP1906qstlTdqLMQ5MoPfn LpQXP7eexbNuOtSijTLRE39VGDc1tEYtaO2XSOz/jDkXMzERVd+N9Ud9d5MxLNSDL3VA CiK/9xBaOl6oMZ9/UVn3531u+6Dk1NBqx5UFATjcdoA6xH9ZQZ15tirxH5we/CyQTY/H B07dV//dB5gmu9WpgFQcBXJ6jkmf9bM5qPSwbTZHs4keiHrrKu9HbbGmmpc1x1sTec21 S4vg== Sender: swupdate@googlegroups.com X-Gm-Message-State: AOAM530EfwfaVrY9iyPj30dx4Ogvvr++vSREeo2L3SBOQSZqA73iPtQY +LMtqzWs1VhQYtIXg4XdUmM= X-Google-Smtp-Source: ABdhPJxfrDamj5TcDRABHwEQSY5D8SogKKCBxE+MWAotWR+DGJ0m2cVVy7Ra0AJIGWixb1AJm4N5Pg== X-Received: by 2002:a5d:64eb:0:b0:205:d418:4798 with SMTP id g11-20020a5d64eb000000b00205d4184798mr5725269wri.11.1649233130017; Wed, 06 Apr 2022 01:18:50 -0700 (PDT) X-BeenThere: swupdate@googlegroups.com Received: by 2002:a05:600c:4e01:b0:38c:9f99:b05 with SMTP id b1-20020a05600c4e0100b0038c9f990b05ls2483609wmq.1.canary-gmail; Wed, 06 Apr 2022 01:18:49 -0700 (PDT) X-Received: by 2002:a05:600c:1d8a:b0:38e:6bc4:e2ac with SMTP id p10-20020a05600c1d8a00b0038e6bc4e2acmr6318246wms.118.1649233129150; Wed, 06 Apr 2022 01:18:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1649233129; cv=none; d=google.com; s=arc-20160816; b=JSVNQQsFuHEt5H3M62cHhIpX+lwX4OVa8oKJ8/Sc8PY8vS+ZmYXgEjZ5oZxbE1QdpL dbSCIszOecipsYFAr7VH0aM0oB81OSGaJMATOYifKqGbSr3nwhl1W79DtuP2MWTPPvmM VqiqLLZC0l9pvpfUD5QJTB1XgeqqDYWxXQ5+4y/WM5DiitpLWbH0gauJ407V9ytqWfv7 NzCL4F29S7jBsT1/r6b+s7Z6vpUG4W0BVcLwnLXix9JWp7OQmSCJwFWJFV6xTpoXa4qC zizu1IvZu3dRxTCKM0AWprQZOJ0aPba2+/sWyDJCmourfDEpwxdizJH4FAR4lBa+gc0R acSQ== 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; bh=EkKdZW3GxZZoUInE/Pphs1RgOvbu1CCFy4Lh+P4FCHI=; b=pp8xPCSPZ2PpdcfQY5SwGSsfomEq6ZiGsx8ngKE4NYOWEVsdXoHagYXlA8BAJ92WQ1 ldD/bUkxIXZc+Ee0hD5nv/8goDu92gkNi6+rRUlfoaBFNLwvgnlq8mu/hSPkJZVkSDWX 2Wwbeg7p1BGjqCnwbzFdI9z/JAy+/cnZNMTYRNYp86Yg6PuKrV4dZHJXiwDFmd99fd9Q C+N39bFgLmI9v7B7/QhrwqIcfqeCnArxVnzw7oRLuy3lHE6uuDearB6iqpzJtuE5hi0h lxExICOCXyQl9WJ+G5widcJskb70jBFcABACjmM80CLKfKxS53zZzkrMFnLx7k/rYzCD kTzA== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=neutral (google.com: 212.18.0.10 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.10]) by gmr-mx.google.com with ESMTPS id b22-20020a05600c4e1600b0038c73e87e1asi372907wmq.0.2022.04.06.01.18.49 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 06 Apr 2022 01:18:49 -0700 (PDT) Received-SPF: neutral (google.com: 212.18.0.10 is neither permitted nor denied by domain of sbabic@denx.de) client-ip=212.18.0.10; Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 4KYHTh6Ttbz1s7t5; Wed, 6 Apr 2022 10:18:48 +0200 (CEST) Received: from localhost (dynscan1.mnet-online.de [192.168.6.70]) by mail.m-online.net (Postfix) with ESMTP id 4KYHTh6HbHz1qqkB; Wed, 6 Apr 2022 10:18:48 +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 G3LXeCceSmkN; Wed, 6 Apr 2022 10:18:48 +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; Wed, 6 Apr 2022 10:18:48 +0200 (CEST) Received: from localhost (mail.babic.homelinux.org [127.0.0.1]) by babic.homelinux.org (Postfix) with ESMTP id B261C45400DB; Wed, 6 Apr 2022 10:18:47 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at babic.homelinux.org Received: from babic.homelinux.org ([127.0.0.1]) by localhost (mail.babic.homelinux.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 7jTLgOP2mR3y; Wed, 6 Apr 2022 10:18:45 +0200 (CEST) Received: from paperino.fritz.box (paperino.fritz.box [192.168.178.48]) by babic.homelinux.org (Postfix) with ESMTP id D5D844542B58; Wed, 6 Apr 2022 10:18:39 +0200 (CEST) From: Stefano Babic To: swupdate@googlegroups.com Cc: Stefano Babic Subject: [swupdate] [meta swupdate] [V2 05/12] class: add function that signs and returns hash of artifact Date: Wed, 6 Apr 2022 10:18:30 +0200 Message-Id: <20220406081837.2222008-6-sbabic@denx.de> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220406081837.2222008-1-sbabic@denx.de> References: <20220406081837.2222008-1-sbabic@denx.de> 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.10 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: , This adds swupdate_sign_ec521_sha512 - it can be used to report and store the hash after signing an artifact. Used to verify the integrity of a component by the device during boot. This function signs a file with secp521r1. There are a lot of ways to sign, and they can be easily added later. The rule is to add a function with the name swupdate_sign_, and if the function needs OE variables, they should be created with the name rule SWUPDATE__. Signed-off-by: Stefano Babic --- classes/swupdate-lib.bbclass | 73 ++++++++++++++++++++++++++++++++++++ 1 file changed, 73 insertions(+) diff --git a/classes/swupdate-lib.bbclass b/classes/swupdate-lib.bbclass index e69de29..4347b83 100644 --- a/classes/swupdate-lib.bbclass +++ b/classes/swupdate-lib.bbclass @@ -0,0 +1,73 @@ +DEPENDS += "python3-magic-native zstd-native" + +def swupdate_encrypt_file(f, out, key, ivt): + import subprocess + encargs = ["openssl", "enc", "-aes-256-cbc", "-in", f, "-out", out] + encargs += ["-K", key, "-iv", ivt, "-nosalt"] + subprocess.run(encargs, check=True) + +def swupdate_extract_keys(keyfile_path): + try: + with open(keyfile_path, 'r') as f: + lines = f.readlines() + except IOError: + bb.fatal("Failed to open file with keys %s" % (keyfile)) + + data = {} + for _ in lines: + k,v = _.split('=',maxsplit=1) + data[k.rstrip()] = v + + key = data['key'].rstrip('\n') + iv = data['iv'].rstrip('\n') + + return key,iv + +def swupdate_get_sha256(d, s, filename): + import hashlib + + m = hashlib.sha256() + + with open(os.path.join(s, filename), 'rb') as f: + while True: + data = f.read(1024) + if not data: + break + m.update(data) + return m.hexdigest() + +def swupdate_sign_file(d, s, filename): + import subprocess + import magic + import base64 + + fname = os.path.join(s, filename) + mime = magic.Magic(mime=True) + ftype = mime.from_file(fname) + + if ftype == 'application/zstd': + zcmd = 'zstdcat' + elif ftype == 'application/gzip': + zcmd = 'zcat' + else: + zcmd = 'cat' + + privkey = d.getVar('SWUPDATE_SIGN_PRIVATE_KEY') + + dump = subprocess.run([ zcmd, fname ], check=True, capture_output=True) + + signature = subprocess.run([ "openssl", "dgst", "-keyform", "PEM", "-sha256", "-sign", privkey ] + \ + get_pwd_file_args(d, 'SWUPDATE_SIGN_PASSWORD_FILE'), check=True, capture_output=True, input=dump.stdout) + + hash = base64.b64encode(signature.stdout).decode() + + # SWUpdate accepts attribute with a maximum size of 255. If the hash + # exceeds this value, returns sha256 of the generated hash + # + if len(hash) > 255: + m = hashlib.sha256() + m.update(hash) + hash = m.hexdigest() + + return hash + From patchwork Wed Apr 6 08:18:31 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefano Babic X-Patchwork-Id: 1613837 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=lVvmgs/5; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=googlegroups.com (client-ip=2a00:1450:4864:20::33a; helo=mail-wm1-x33a.google.com; envelope-from=swupdate+bncbcxploxj6ikrb2uzwwjamgqetjyuzoq@googlegroups.com; receiver=) Received: from mail-wm1-x33a.google.com (mail-wm1-x33a.google.com [IPv6:2a00:1450:4864:20::33a]) (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 4KYHTp18nCz9sFq for ; Wed, 6 Apr 2022 18:18:53 +1000 (AEST) Received: by mail-wm1-x33a.google.com with SMTP id l7-20020a05600c1d0700b0038c9c48f1e7sf2615603wms.2 for ; Wed, 06 Apr 2022 01:18:53 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1649233131; cv=pass; d=google.com; s=arc-20160816; b=PgRnI7sE6fTFfHJ7m3UHvqT/lOB/OqHWwr7on371IQLDprUHaDPU44Vp8npL5t3sPV f7waGJDP1bg6sKXCNB5DPqTYE+kX1a7gY1RgtpYORKX+aD01srREUE5jYBepboxmFb7L c0FI9lK+TGSAZvTMCndYptjEv50Cteq4sRSXU+qZOth5C6jBGE4scr7ObaH4vNxaE0OY uad1iw5nE6BRjm3r0/gJmW+Ko5seCU9oB3vlFLgM0mM6yLcKAGCRR3Qu0jfpUytnS/Hx IgMi9nLQgT8RR0yU0AmEUWRfXmC1+hkBe7RJLj6CQf2zipli2pOdp9PzafhpsJoJxvXJ VJCQ== 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; bh=GTFkURqFS6NRVqRUQ02ghNmylTUeB1AhAnzaUkdYo08=; b=Psnd8+oKdsbXpi+GPToZWJCmIjwLB0PLfj7udwnbftbbIW39o8R1/pwRA3oB9bY9BG JIS02a5lg1X2+ok9GPgGE+9f+32mWkoETP51ujAoPw0yIA1+FrdYaUc9RUEAyhaqwOCE FY8wsqJnXH2CkJA6jMDi+BuDmAVQvI59iHwDhqGrpjuZ8g+i1SeoW+rkTTiSiCmcZxCO GR3nqgyWZhG1dOxGgmuNrpGLPN808EmOZgIWkkK0NvOEcx+KPte/nRlj9t07GeUL0eJV 2Qrk1pSdY0EWKn1KkqaoIdHZ0ubUe+xkGQbFC48dUCt6Y+5t+rLGYR+abBH24GQwIUcX TKuA== ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=neutral (google.com: 212.18.0.10 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: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=GTFkURqFS6NRVqRUQ02ghNmylTUeB1AhAnzaUkdYo08=; b=lVvmgs/5VvXRY881FvoQctD5Y9zKMauXY9lvL2j7RTrUFwLJBI5tLdlovjrLrNLDpQ Lf7QpSK5vtcWfO/9gOmk9cSTHQEXUNPm7JPseXiHBldwjNE1qGSfRl3qqlwCG9EdRJMZ zNZ4qF0OmY3yJeeqzPMfTNm36zuM47Iwouz6BJ+LAolCcznrOjCOVIB0DJfpgeEROFpX oNbNGxOQX8TX1m/H5cp2E31eQKSuvoz4ue3Ix2tWLMyvfnaTx7QLGY7LMpYEXYmvvegd B0IpYW7NXfJvFq3dZUFD2HmbiaXzTYZegdsq5FOtorV49v/R/aXcATbB71n5AEonrdly dchA== 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=GTFkURqFS6NRVqRUQ02ghNmylTUeB1AhAnzaUkdYo08=; b=EMDgUBL1CwkSE4aTJzZVtqoN6ATIbJEXk01lO9UObClLJ49WJLA5lY+5GLTNrQ71GT m9TaErOzlP98aL8k/SZIb48xFbGt/Ms1EfJpcWo8lOYTFR+UhZqDce5GFR68HY7RpX6B yFw36h9QtkUgtDITufzqykRiLLsc/LExtkm7nWq4P7DoQtWcWY1mvAWyjpHIEZg4TriT HP3ZbudV2HO78uaJHzrbpXqK4+P1Vqo2uN6jUZNU1XaDidhU1HZwAFzWCmbkmLPizzZO ib0Xchd8jSa7ETqzO7xiftSjKaoCsIM9zB/yNIUp1cimVCn2J4IuRDwdW30q03S3D72z G9tQ== Sender: swupdate@googlegroups.com X-Gm-Message-State: AOAM5300vPASFw2+lJ58QCE/OFCSEHpqVa2HMAERGCOcXDym8YOBiw/u WvO1/r4umlXKH0VZQRhYMeI= X-Google-Smtp-Source: ABdhPJxHGW74wUMmdcaXVSuUd6DD5kRQiSNscwoAw+rPdeXW1HkF5AXPZCUITpVV/2cs0UUBOEXaAA== X-Received: by 2002:a1c:f005:0:b0:38c:b6d5:5c2a with SMTP id a5-20020a1cf005000000b0038cb6d55c2amr6464789wmb.89.1649233131143; Wed, 06 Apr 2022 01:18:51 -0700 (PDT) X-BeenThere: swupdate@googlegroups.com Received: by 2002:adf:f950:0:b0:205:dbf5:72d8 with SMTP id q16-20020adff950000000b00205dbf572d8ls1058647wrr.0.gmail; Wed, 06 Apr 2022 01:18:50 -0700 (PDT) X-Received: by 2002:adf:fd08:0:b0:206:164c:4ac1 with SMTP id e8-20020adffd08000000b00206164c4ac1mr5570644wrr.680.1649233130237; Wed, 06 Apr 2022 01:18:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1649233130; cv=none; d=google.com; s=arc-20160816; b=0Uqk0YMH1sjjWWFrlyjevTn8AveZKUK7lVKlF4dfhU4Y17+yl662jh09DJ2ekdgV5K O+ODUeyp110kS4VSDDYVHl1EjlL//+9FrVZNNF7ahrlInxBIzJT/8hUrWeKPMrXfX1DT EzpMyxsrav47PmXRNCuwWVyzCp9NXOlvyRM7s3hH84HqVieemwVPPDStPVKt04sUGfhf irPa2w8ZdKQi8Uq39I+VRnGed1/SvhnPXbvATVkpP8/qHzQLibpXPXcblFPiOckeEIdM cHKxTemxfhfVeZdCa+RcmPSapXsU9Edc4Mb6gxSNJ3gWiPW2aPnxce+HKdSKnNFyuU4m Y6MA== 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; bh=aCJiFIad9wrPZ1LSrPJdWVA6K/ImzzW6ZwvK2Bpd6UY=; b=jQGW9AomRd/pYeHaMaLy4uWxVOnV7iND7MEfcQUYMiDqJyMdeRpc10puCd2WEgK1qX RjN3iETitLTEjx6va1Z81tmdqviKoP3MdUHZ3WYwgKJsAM1KRVyZ8tFznsoCMW1fmOCr plJURxTKODSiSu+G/k4MB/Tcm883A8jcR1EgXJT79lucU3BRURX0ejE6Le3EntQp0Tkr Nisck4092XeC65J6EsrPeVuCV/EE2ZjWT9FMUNc/lfN8sOlIQFwas3nsBg+tv4e7CnDb TDy4WxCa0K3HJ1xq/QqPFNpCXqGDe8OO+XJUwILXJAsLcYDcDTeczjzJeKk7J4qfIBis nxmg== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=neutral (google.com: 212.18.0.10 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.10]) by gmr-mx.google.com with ESMTPS id 11-20020a5d47ab000000b00205f806f142si791126wrb.8.2022.04.06.01.18.50 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 06 Apr 2022 01:18:50 -0700 (PDT) Received-SPF: neutral (google.com: 212.18.0.10 is neither permitted nor denied by domain of sbabic@denx.de) client-ip=212.18.0.10; Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 4KYHTj6mK7z1s7tQ; Wed, 6 Apr 2022 10:18:49 +0200 (CEST) Received: from localhost (dynscan1.mnet-online.de [192.168.6.70]) by mail.m-online.net (Postfix) with ESMTP id 4KYHTj6ZnJz1qqkB; Wed, 6 Apr 2022 10:18:49 +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 hQOLOFlcb8TG; Wed, 6 Apr 2022 10:18:49 +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; Wed, 6 Apr 2022 10:18:49 +0200 (CEST) Received: from localhost (mail.babic.homelinux.org [127.0.0.1]) by babic.homelinux.org (Postfix) with ESMTP id D810C4540E68; Wed, 6 Apr 2022 10:18:48 +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 Dsup69O0eUb4; Wed, 6 Apr 2022 10:18:46 +0200 (CEST) Received: from paperino.fritz.box (paperino.fritz.box [192.168.178.48]) by babic.homelinux.org (Postfix) with ESMTP id E12F94542B62; Wed, 6 Apr 2022 10:18:39 +0200 (CEST) From: Stefano Babic To: swupdate@googlegroups.com Cc: Stefano Babic Subject: [swupdate] [meta swupdate] [V2 06/12] Add SPDX identifier to classes file Date: Wed, 6 Apr 2022 10:18:31 +0200 Message-Id: <20220406081837.2222008-7-sbabic@denx.de> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220406081837.2222008-1-sbabic@denx.de> References: <20220406081837.2222008-1-sbabic@denx.de> 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.10 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: , Signed-off-by: Stefano Babic --- classes/swupdate-common.bbclass | 4 ++++ classes/swupdate-image.bbclass | 2 ++ classes/swupdate-lib.bbclass | 4 ++++ classes/swupdate.bbclass | 2 ++ 4 files changed, 12 insertions(+) diff --git a/classes/swupdate-common.bbclass b/classes/swupdate-common.bbclass index f221f94..e7564c4 100644 --- a/classes/swupdate-common.bbclass +++ b/classes/swupdate-common.bbclass @@ -1,3 +1,7 @@ +# Copyright (C) 2015-2022 Stefano Babic +# +# SPDX-License-Identifier: GPLv3 + inherit swupdate-lib DEPENDS += "\ diff --git a/classes/swupdate-image.bbclass b/classes/swupdate-image.bbclass index 512c0a6..b964b76 100644 --- a/classes/swupdate-image.bbclass +++ b/classes/swupdate-image.bbclass @@ -1,5 +1,7 @@ # Copyright (C) 2015-2021 Stefano Babic # +# SPDX-License-Identifier: GPLv3 +# # This class is thought to be used in an image recipe. # It generates a SWU file from the image itself # User *must* add a sw-descitpion file diff --git a/classes/swupdate-lib.bbclass b/classes/swupdate-lib.bbclass index 4347b83..233eca1 100644 --- a/classes/swupdate-lib.bbclass +++ b/classes/swupdate-lib.bbclass @@ -1,3 +1,7 @@ +# Copyright (C) 2015-2022 Stefano Babic +# +# SPDX-License-Identifier: GPLv3 + DEPENDS += "python3-magic-native zstd-native" def swupdate_encrypt_file(f, out, key, ivt): diff --git a/classes/swupdate.bbclass b/classes/swupdate.bbclass index 153626d..d13710f 100644 --- a/classes/swupdate.bbclass +++ b/classes/swupdate.bbclass @@ -1,5 +1,7 @@ # Copyright (C) 2015-2021 Stefano Babic # +# SPDX-License-Identifier: GPLv3 +# # Some parts from the patch class # # swupdate allows to generate a compound image for the From patchwork Wed Apr 6 08:18:32 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefano Babic X-Patchwork-Id: 1613838 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=OHpRgU6f; 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+bncbcxploxj6ikrb24zwwjamgqenfyxapa@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 4KYHTp3f4Wz9sFs for ; Wed, 6 Apr 2022 18:18:54 +1000 (AEST) Received: by mail-wm1-x337.google.com with SMTP id 189-20020a1c02c6000000b0038e6c4c6472sf2618108wmc.1 for ; Wed, 06 Apr 2022 01:18:54 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1649233132; cv=pass; d=google.com; s=arc-20160816; b=LFez9xWcwQe2WvzBLDZ1rOP3eIZhmE8rnO/JZXxLz3al3SqP0TDfrRM5/xNADHY1pg Qq+vkXcm8a2RRJBOCn+d7QatRZeN89VFs3JfJrCkI6WDIHAW+yK+eMT/pMSoI/T34O/p NdBi1rW/DTIFXucyFk9QSfGYdhPdMKpRYtyQXpGvWJBK+JqFh0AkR9DvjdJbVuJEfNz/ 8UpTTIZAP/g01I5r397lkHzmr8NmxGOb56cai95lXpb4zgXSrx9SG2mYh5xKhUIddDMk /yOXXQFJM0wuy5X/Ix7Gzv1xJ8+9lbZcR1F3Zc7pGhkcSSRdUrHPQBLWWO92P1mv1uTu Sgbw== 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; bh=zepn35flemBBIz7iaE0QbKGycHNNK4Wth9BT5j8qeeY=; b=QoBabLRKbNaFxrPeAS8uyhdCotopNkMrF1OUxEQ1/wXSuji8UinuPtxfDX4uo6kyvk qVgA4TK9+9HMp8tPoian/Fc5j9rfKE9GNbfrbY98v5AblOGj3E9PlZVDtSL2tKQ4TX/o 6+hQLXUcWkTCpbpYJbay1m3+Eb7rSiSAio4aaoLCK0O9o7uUnx1ljdQ9a+jpKlb/5JTw bCfaHiZMS87ahjKgFjfRYivJCBTAbU6M9Y6LoXI/sQCwWaXEDb3Tuys78Jn3lExEkneK 6XZaGjz2LM3Qbf98Ap32roJf3HoTB0vdQ+S6pN/T/F2wQo6At4xcKVUWQdeoNDHh999U OcQg== ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=neutral (google.com: 212.18.0.10 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: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=zepn35flemBBIz7iaE0QbKGycHNNK4Wth9BT5j8qeeY=; b=OHpRgU6fP7mNiL+Puy+kh8ExUGKE6X+WLCveMnSiVN5pd56q3NOdSS9JlJncKHocgy Npt+3WVvsYrdaMxhMPcFyqCzbAvO6VuoS0Ho8EnRJSe2La1fVCRI9oX+u1RP3pJLwSFM l7shEG4c4jZIsEgzM1asEh1JE28DsMO+RY4yoazCwdBXys98InSKhklXLNW37HD4ANdR CQjE7aLfXV5NwPmtPsAHSxyrYq3dMyAx1RHqbpA91aH5wZ37RljPrbr8vQYaVxuwJ50a Gbu3smgK54NwZoRwcELRoOeK/RgdbPArR0DiSFUgkyOfS+l79IZjSQE6nXb50VT2CDbA fwpA== 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=zepn35flemBBIz7iaE0QbKGycHNNK4Wth9BT5j8qeeY=; b=XUUetoMzSAY4GJRrlemR8sgx9sCph86uU7ZuOBHu7PGFwJYPKoNhnKT9fH0FVzYrOb jo9oermSnAw3tZeseD5RTvA602AsgRB7SJaw6za0yIEUEu5hQfqsU0sKhVp7B1Qnflgx kiMIEm41IcQBqTm55XgaQU4mEaax7RnFjZHYY9vHHPBVL4zbERzlvQgpEQGLW70etXCO wdV3Zx4MZlxezkCYisGl5JYHQifKWWVuHXKbl5It8MU1fJX72Pw5WkJ/3P/Sw12KlQYQ m/LGiEdO2FfbIo5e5fOskiqhk2rHLi81gBrzX2KhMXyES5SikE7/Oqh//qPls2Kmjaf4 hgkA== Sender: swupdate@googlegroups.com X-Gm-Message-State: AOAM530EMkk9GkCZdTavI/6Z19Tqz61A3HgyM6FpHjulrL1N3ULRizZV wYvLdLXYYOioX/Eqt/a55dQ= X-Google-Smtp-Source: ABdhPJxGaiUnFlsyaiV6yHbD23LeRnKMS/r5ZNv/9gEyL8g5/zIcTCqKl7LwDeFN5siBkizkxnvhyw== X-Received: by 2002:a05:6000:1202:b0:206:1868:721f with SMTP id e2-20020a056000120200b002061868721fmr5776660wrx.292.1649233131971; Wed, 06 Apr 2022 01:18:51 -0700 (PDT) X-BeenThere: swupdate@googlegroups.com Received: by 2002:a5d:5306:0:b0:206:e61:ce02 with SMTP id e6-20020a5d5306000000b002060e61ce02ls1060992wrv.2.gmail; Wed, 06 Apr 2022 01:18:51 -0700 (PDT) X-Received: by 2002:a05:6000:1c08:b0:205:fd17:2f7e with SMTP id ba8-20020a0560001c0800b00205fd172f7emr5700286wrb.203.1649233131094; Wed, 06 Apr 2022 01:18:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1649233131; cv=none; d=google.com; s=arc-20160816; b=jjCsSUXV9b0CkukUk3p33Orn9EpEGpK1b48tUySvPcsCuoNAA9O0kswj4gUYl1F2Xs 8DT2JikRQS90EHe+qVp/5JoGFDDSiXWMUKKtcwvkLzJEBQbcaGI3lK03ew+c49WW9QuX R3tsw6emMEprXM/f3HQ18mBwS7pkLQ15D2Kc62BkEb/KSOx34jRtlON8C1RX/jzOvloC WT53HiqAcPFlj9WIoisHkQY+X8BTT148ZbUn665gVwhsNMBHkUCFWozmVVBDBAm7RDtf NxaPkhntJv3v4EN1Oeau6uiwK25V93llzM1Fe5Tp85tLWkyoCa8UmNyOLsu3SaK5qjwm whNQ== 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; bh=PxmBuv9XNLjiLgu2bp4ZqCxcF8BiZTpGDW72G8p2uSM=; b=TtCDvgT5p7y59cXQrTok3RzYkIL6KGTiUHKLYQMpvKWA4c0ArvB8T5m/H3a8gxxc6k hilRqAIkaIHIgwdDzY0Krup3qGGeTw7f+lvZ3Cj2AK+bDSOotVMuk2lK187Y/mamvq+b 1Ej70+ezQrBqmqVNYiPKth5mdfWY4NM0AXgu8Q9MlGlwmdEIf/mPiIWOMhwdFAg57rJW Z/zrJYAjGUuJst+WyX+bNi3jC1mH3FjB/1AbHuc+T07GIj7ioJAn43TSiDCFgmKjTnFY 5cmGz0MaMsNJVFLJ1IPmZ+4cvxQbU4XYAktjlN0eItUYcxL2vsaCdIrI0i7FPaY35R7K oBRQ== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=neutral (google.com: 212.18.0.10 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.10]) by gmr-mx.google.com with ESMTPS id p187-20020a1c29c4000000b00389cb60cc3esi260770wmp.0.2022.04.06.01.18.51 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 06 Apr 2022 01:18:51 -0700 (PDT) Received-SPF: neutral (google.com: 212.18.0.10 is neither permitted nor denied by domain of sbabic@denx.de) client-ip=212.18.0.10; Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 4KYHTk6G1Zz1s7tQ; Wed, 6 Apr 2022 10:18:50 +0200 (CEST) Received: from localhost (dynscan1.mnet-online.de [192.168.6.70]) by mail.m-online.net (Postfix) with ESMTP id 4KYHTk6494z1qqkJ; Wed, 6 Apr 2022 10:18:50 +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 O6VQoUBDT6bS; Wed, 6 Apr 2022 10:18:50 +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; Wed, 6 Apr 2022 10:18:50 +0200 (CEST) Received: from localhost (mail.babic.homelinux.org [127.0.0.1]) by babic.homelinux.org (Postfix) with ESMTP id 030D645400DB; Wed, 6 Apr 2022 10:18:50 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at babic.homelinux.org Received: from babic.homelinux.org ([127.0.0.1]) by localhost (mail.babic.homelinux.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 3V6T6WnZePLg; Wed, 6 Apr 2022 10:18:47 +0200 (CEST) Received: from paperino.fritz.box (paperino.fritz.box [192.168.178.48]) by babic.homelinux.org (Postfix) with ESMTP id ED03E4542C8C; Wed, 6 Apr 2022 10:18:39 +0200 (CEST) From: Stefano Babic To: swupdate@googlegroups.com Cc: Stefano Babic Subject: [swupdate] [meta swupdate] [V2 07/12] class: move swupdate_get_sha256 to library Date: Wed, 6 Apr 2022 10:18:32 +0200 Message-Id: <20220406081837.2222008-8-sbabic@denx.de> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220406081837.2222008-1-sbabic@denx.de> References: <20220406081837.2222008-1-sbabic@denx.de> 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.10 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: , Signed-off-by: Stefano Babic --- classes/swupdate-common.bbclass | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/classes/swupdate-common.bbclass b/classes/swupdate-common.bbclass index e7564c4..e96e927 100644 --- a/classes/swupdate-common.bbclass +++ b/classes/swupdate-common.bbclass @@ -51,19 +51,6 @@ def swupdate_getdepends(d): return depstr -def swupdate_get_sha256(d, s, filename): - import hashlib - - m = hashlib.sha256() - - with open(os.path.join(s, filename), 'rb') as f: - while True: - data = f.read(1024) - if not data: - break - m.update(data) - return m.hexdigest() - def swupdate_extract_keys(keyfile_path): try: with open(keyfile_path, 'r') as f: From patchwork Wed Apr 6 08:18:33 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefano Babic X-Patchwork-Id: 1613839 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=rz6SihKH; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=googlegroups.com (client-ip=2a00:1450:4864:20::338; helo=mail-wm1-x338.google.com; envelope-from=swupdate+bncbcxploxj6ikrb3ezwwjamgqel7362ay@googlegroups.com; receiver=) Received: from mail-wm1-x338.google.com (mail-wm1-x338.google.com [IPv6:2a00:1450:4864:20::338]) (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 4KYHTr1Kk6z9sFq for ; Wed, 6 Apr 2022 18:18:56 +1000 (AEST) Received: by mail-wm1-x338.google.com with SMTP id f19-20020a7bcd13000000b0038c01defd5asf969270wmj.7 for ; Wed, 06 Apr 2022 01:18:55 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1649233133; cv=pass; d=google.com; s=arc-20160816; b=m0WhH3bBW1E/oNrgreGZSXYJIeqL7TLykkapksWktuLkBM7SC0R5NDN6QSSsldnquE VeFwUPPIFS745KaK+AHWkuZoAbJX6d98nFPhjzRweT2Coh8Wh6W92a6ufUnhpuC5dkJD sgJLwcCQdz0k0+1NACpFhLuI7Km+N9J2/L0wxdE5tJBUdEMpClcCCqPOmP7v5L9Roq2L ds+YZv0KbznA6Mo0AJ8pCxs00v3YLw0t7IY6fBk0kjtC5iyF28P41a8FzuzHjbHFfK7y P6SRzXXBcwxsNtGrbFY9MxeNNbF0gUmJf5LtrjiKNkIdTFg+3y9P6hb3N06xVzQKjkJP G2zA== 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; bh=A14splTaKjdgPEbELGvsqVzGuNHYE6KiKg+5WEB8wHU=; b=cCN9ia/OZz0Hp40iDS/qzflmBqb93QYwPcxMxxGchHrDgYKPol4hjaqpeW4FjGnE+e e3LNaG+tUZ2TGfW7HTOs9a8T+NANzCIn0hj+0DaXxrGEK9pQllGK3FTNWc+Ccnlyhu0Z ul3HRpGtF3iq+DWfKxcy8IkNFbW8gqiXHDswFNisamKeM0tGA9Ryco5xJTgPRdzvZJsW dRJhGZIWUhw3J4nSP5nFTLg0otq3+ZlQMfXMQROb8312mlxpDJF0uvMz3abFmx7bcbDq VfMqPomtkwN1lnM67gz82PilWdWbO/IAEmTJrB9lL4gL4On6vJL6ODFKvpX923Ubk3gq s1Wg== 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: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=A14splTaKjdgPEbELGvsqVzGuNHYE6KiKg+5WEB8wHU=; b=rz6SihKHwErAPS4eXOlYgxl5/O+SshYTbE1Wl2PMTPi1wVnWfGBeZuAF+ByXIl9pmu 6Y81HIJOhLn9QcAQafuqelJsvd0inZK1MHd/BXsWtimk5Anx89ZqQjp6tnW+M7On9Kjp TCq+mAAgN+yzJNbWUb2zVGNWDwFApR+cfbnYhktovsEf07go+r7JsOAxrWwSzb8wTvQV gydx44zFfX+Yy71bXIXUk1PbWirpWNJaYQfY3sn1zsQxYbdz3NlZq1qxsE5J3Xm4WhIJ LKeQMX4oSETKwLzehmyh0QtYhXZg690f5H2dkGXQ/EX+n/9hYfYU42i5PL8++XUJnZOu GewA== 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=A14splTaKjdgPEbELGvsqVzGuNHYE6KiKg+5WEB8wHU=; b=2FyI9Pc1gW6TUaJMtNUCb8lmmTQ9e+/VoSLQyqLSsQg68wLuhnFgozo7TYSc1PF9kv lyNxn3YMebmGRWjb+qcdfJuBYgnFZLTyOr2h79r7+tQVI9ELsTsme7DIG2igyZMQBAoO SjrRyXcHD5BFG+v7ORxf0llPuZlvirZlbT2P0+tNYhixUgMbyOba+g39MnK6KK0O2wMd EBQqmT1NyOhXPocOUxBDkHDx8e0m0xcMKGWRds0zhu5Vcx4uKOh9b1wx4AC2wpXTKklm UhL1khXwhAEDxddezqAR5GFbG4i6rizTnwbq8PPyWCHScUZ0wG7GeG2inlA38CUlWfH3 cBEQ== Sender: swupdate@googlegroups.com X-Gm-Message-State: AOAM532gNZuqOztm6CAuxforS4e1NTPTF8hVsIAVC0ZXUNCsGWgZMEtl BKdWwabq6kY5LAW0s2iXWuU= X-Google-Smtp-Source: ABdhPJxs8auzkckZR0gM4+VkH6BJMq+RkZ6ES7GLaMxCIgFZE+LgDVLy2pdkVkXqHZO2CGye/fEA9Q== X-Received: by 2002:a05:6000:186f:b0:205:857d:dee8 with SMTP id d15-20020a056000186f00b00205857ddee8mr5692755wri.532.1649233133210; Wed, 06 Apr 2022 01:18:53 -0700 (PDT) X-BeenThere: swupdate@googlegroups.com Received: by 2002:a5d:5306:0:b0:206:e61:ce02 with SMTP id e6-20020a5d5306000000b002060e61ce02ls1061126wrv.2.gmail; Wed, 06 Apr 2022 01:18:52 -0700 (PDT) X-Received: by 2002:adf:a3da:0:b0:206:1479:8b79 with SMTP id m26-20020adfa3da000000b0020614798b79mr5696766wrb.147.1649233132473; Wed, 06 Apr 2022 01:18:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1649233132; cv=none; d=google.com; s=arc-20160816; b=WUFY7qNTn8KT2tkFXSvMCE+pOxrTOKIJ1Cl/fRolu7BZ95ib9rvwRfwKUNH682hkbS tIWOvF2SbYgkKzie+PF3d7V1HpOySBCHVMg1F5Cq2+ZkFR4ZoS6QPM88z+p2qgXeSgaD 55ymWrRCStes9GNsMIhXV0RQL76ml1M26dF+9OOSWqFUkT3Kc8CoAtN9+3n60YaS/vVY oRyv6ySPjgnN8QssBUI0yDJfx58eqBY8a4j8XnffYaqNA7/ACqZCD5fxLUfAL1CvZAof W3V5ZpVSWfACL1g0NA0l8ZlxrGV3fWqtFN0arVvArfeRgy0a+GhO+tMkwsC3xgHsjXwU dOyg== 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; bh=olMuhStWEjIP74FKkFwV0TPPASm7sx1h63L7YJmkP+0=; b=HBjdNsbGqdRMruFWqlVvQ3lqTSVNobtgCkdunMxDxqgm36kYvn6/vU5JDRDlcsQ+nB e1emARV5Qq2TWDjN63Lunv3CJMhdMDGRk45v3ya8F4cMgYnjNKw9Mv/b+Qeiak5OExvO ovkF/yFjoLgpH2gx+NBnZVu+hIRZICpxnHw9xy3EkFKduEfKVwn3ryVLP26iEuTlX1RE e5uNUzM/3+2x3IO/ZAwn8KaXLhDRq7eZGv/ixnuZK5YIwdWiDp7Wl6nZ0SsvaIerjIWW CMeWpJWJoDN6HGIuko4OOpAuNQycKoTZXoOVxRTv5U5MHDyvXkid+8VJdEHuT6XoNg0z psbQ== 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 c2-20020a05600c0a4200b0038cac42709csi306970wmq.1.2022.04.06.01.18.52 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 06 Apr 2022 01:18:52 -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 4KYHTm1r0Sz1r1ff; Wed, 6 Apr 2022 10:18:52 +0200 (CEST) Received: from localhost (dynscan1.mnet-online.de [192.168.6.70]) by mail.m-online.net (Postfix) with ESMTP id 4KYHTm1h50z1qqkB; Wed, 6 Apr 2022 10:18:52 +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 W8CI9YB42csn; Wed, 6 Apr 2022 10:18:51 +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; Wed, 6 Apr 2022 10:18:51 +0200 (CEST) Received: from localhost (mail.babic.homelinux.org [127.0.0.1]) by babic.homelinux.org (Postfix) with ESMTP id 6E4F945400DB; Wed, 6 Apr 2022 10:18:51 +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 qZEowbD2PYTr; Wed, 6 Apr 2022 10:18:49 +0200 (CEST) Received: from paperino.fritz.box (paperino.fritz.box [192.168.178.48]) by babic.homelinux.org (Postfix) with ESMTP id 135C54542C9B; Wed, 6 Apr 2022 10:18:40 +0200 (CEST) From: Stefano Babic To: swupdate@googlegroups.com Cc: Stefano Babic Subject: [swupdate] [meta swupdate] [V2 08/12] class: move swupdate_encrypt_file to lib Date: Wed, 6 Apr 2022 10:18:33 +0200 Message-Id: <20220406081837.2222008-9-sbabic@denx.de> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220406081837.2222008-1-sbabic@denx.de> References: <20220406081837.2222008-1-sbabic@denx.de> 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: , Signed-off-by: Stefano Babic --- classes/swupdate-common.bbclass | 6 ------ 1 file changed, 6 deletions(-) diff --git a/classes/swupdate-common.bbclass b/classes/swupdate-common.bbclass index e96e927..7d60a6f 100644 --- a/classes/swupdate-common.bbclass +++ b/classes/swupdate-common.bbclass @@ -68,12 +68,6 @@ def swupdate_extract_keys(keyfile_path): return key,iv -def swupdate_encrypt_file(f, out, key, ivt): - import subprocess - encargs = ["openssl", "enc", "-aes-256-cbc", "-in", f, "-out", out] - encargs += ["-K", key, "-iv", ivt, "-nosalt"] - subprocess.run(encargs, check=True) - def swupdate_write_sha256(s): import re write_lines = [] From patchwork Wed Apr 6 08:18:34 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefano Babic X-Patchwork-Id: 1613840 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=fyMb5PBC; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=googlegroups.com (client-ip=2a00:1450:4864:20::638; helo=mail-ej1-x638.google.com; envelope-from=swupdate+bncbcxploxj6ikrb3uzwwjamgqejckdsfq@googlegroups.com; receiver=) Received: from mail-ej1-x638.google.com (mail-ej1-x638.google.com [IPv6:2a00:1450:4864:20::638]) (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 4KYHTs0jrFz9sFq for ; Wed, 6 Apr 2022 18:18:57 +1000 (AEST) Received: by mail-ej1-x638.google.com with SMTP id qw30-20020a1709066a1e00b006e7f3de1be3sf788539ejc.11 for ; Wed, 06 Apr 2022 01:18:56 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1649233134; cv=pass; d=google.com; s=arc-20160816; b=dj9/n8dVv1SehiBFkaeUBgB7KIhbSLoXtxW5P/qUzuNGsIY/0ExBuNsqjb8YhAEvS7 IBfeYni4cT/LQIlEyYrvuVQiLtKGYHqa/t17yev15uBi54q35z1fyKBcGy6vfanjd2Nu B2IdieALYma0Mfgbgqqo7zhfrlgn/CRIU/UNfmHIQZKL4TtQfIjvImpBh4YoDvGRFIZJ JmIFGkgSK1+9PV7xu1idY8tIrnVdOv1c15AFxD0L7gkAV9Q4tv6Q1yVRNH5KvamdQUVX KG+H66R840enIhqoNwNhnFOxF62RTDPDHh/sIAgiDZx2YnpjQIdFOikpD5ihimHs7oiN VEBw== 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; bh=/WPDP5k4GPgHHizexlC8dl2yZSOhPYWWke0gxXLrl5c=; b=nPBYOBtVgBGiBZqi/x4/BQ1J1URJtC+S2sWYJwqOyjuR7rcZRqckswHuvlaCjLNcMF yygfQw3rcnB2TsKUk1kFuVrupN+FXnHZiwd3/MrSH0oDc+5K96f9MokdwAHlV9tWhtPa chUDzrb+95WiMenK9iuhONtJPTiZkkYA/uAp3sfq+oqaxgPyb/OXaYcjVeXX0l9gyOpj aA8r/oGUK4ROYodNJiqrG7Tvo9GpwW8wtRn6x+bqh2Qud4e2HhstrO0bcitmxEKqOIr4 Tl7vTqFEUbFoa00iJBFtVJqsLK4kGSIYkMDWnmVyUnQuD1vMriGC0i1BRWsC9j8+w4HO ckNw== ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=neutral (google.com: 212.18.0.10 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: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=/WPDP5k4GPgHHizexlC8dl2yZSOhPYWWke0gxXLrl5c=; b=fyMb5PBCW/S1ZmUzlPweC9srpo94FRmGQcBYvA1XpJOtP7ElHYT1NRB9SXSWMrNzyW 2ei5Re2Gv02SkOfQVpNJv9FSnqbRsTITjOibP0/VZd6sJdrAWL0hBc1hPcsiPcvYiUu+ KRyYdvSRZDpbyi37lIM2a5uOq+XgKqc84OVJ9CnkSYWmvohR8LSYvYwe1cRfXJvH7ryk 2zAghqYE7yJ6WZrchVh0ixWGoyNP8JEy8NkdKvfv15n3OiS/3jLJM3sbwBj+ZSoexXAb nwYlcRBXaDvFdXxUERbxHKr7Th+gjYvl4A9AlfK8CQY32nGNhoJ1d9zKX58FHpy0X+8P ssoA== 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=/WPDP5k4GPgHHizexlC8dl2yZSOhPYWWke0gxXLrl5c=; b=TWD2dDa5eTPiivK8i5yCGuvbB2iGSy4j66L/SiXsQC5fjbHLAeOmiUw+phjI/JViF5 d7YOZo9yPeKVVB8/a22OTEnM+M//2lRngebdRVd+E1AZRp9NUD7zS1d4AXODMjxGKzxV e9BZzu51DByMlwRiCR0z3M0QBjwpyimY6kfeGI7LXESGDj1vZvK3UcJPdA5fpYXa03gb YMydfJGhDigFogUod/w8yjlvrdX5Wt/Mvp0UfAMhfEZJ6kDXVAXS/mrCoLjDytIDwERc Ezh2u/svWERe6I9kGVUQuUOWk8iD419Cm0MkTMK3GfscSKzI2UgviQlV/j2CRPf7zYaC TMhw== Sender: swupdate@googlegroups.com X-Gm-Message-State: AOAM5301wR3EB+P7yznmpu3YS/STWqEbUb2aacZlXfgA6PiVMb9DwIA8 zenXia3jLmZMekIdLYI+vjo= X-Google-Smtp-Source: ABdhPJzYV84KfwMLQYk/wneeCmVDCVH0B0kYedywVkIrUpmd3/pciiEEPRXahUp3dfPv8hpcDoR00g== X-Received: by 2002:a17:907:6da1:b0:6e7:efbe:d217 with SMTP id sb33-20020a1709076da100b006e7efbed217mr7324405ejc.119.1649233134280; Wed, 06 Apr 2022 01:18:54 -0700 (PDT) X-BeenThere: swupdate@googlegroups.com Received: by 2002:aa7:d1cf:0:b0:403:768d:84b2 with SMTP id g15-20020aa7d1cf000000b00403768d84b2ls778980edp.1.gmail; Wed, 06 Apr 2022 01:18:53 -0700 (PDT) X-Received: by 2002:a05:6402:c1c:b0:41c:d04f:31b2 with SMTP id co28-20020a0564020c1c00b0041cd04f31b2mr7437519edb.89.1649233133346; Wed, 06 Apr 2022 01:18:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1649233133; cv=none; d=google.com; s=arc-20160816; b=DbzrejqPk5x07dDUUqjBBcCqIgk5Dvwhkfx9cIsz8FLABfHJr3BZFZroPSZbxMRFtZ sh38c1DOwdJawwYUq6DKb7XZjdK1CRBGrWznO8qSXv+BEzjZTj50W53CwoAdORgRsDms M/FOKJ7c1cml1jEywx30DIdrKnn5ZINKnqm/tZK4Lu62BRgUo2T0uRrMSmzOpxISbUhW +P5uxGj3lULanAtuLUnEnFKEE3rnBLgCsl7i9Qk1ZEwoZT5Fj2/7CeaGjEbcmPSTh8XZ 67di0JMI9Ru4GDGMEWZy61pX8FmulHbTpNfXNO5c3mPCOqNVV8lYnSD1a7hLtZCiaB4E yZ+w== 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; bh=Zqj5JJKC0O+8H9b1jEpaPt3TJmIv3GGfuYqORVLesFY=; b=GG8alKKTuXej/jHXEjCx6m5yumZbRuoQgVWK5Nv7rWHmNOrCfCGOgEFWZhFEi2VpkB uGOhTo5BVANVWrluk9E0EQ3wsnTGRczX10MRUeKGG/8JKp4XPZ75izRTLpKNi89TC9hC cRteheIpxQEWPNbkMrHln2EykxVTPXiEMXipV8jKllYDmk28TUiM3PAF1iipiRFP5V4k yRo7v0vE9bqezhZlAqkiN4GOvq7DLy+a4Ci72To1NLDfqe8y2tyn73tLE82KgCyJk+Cu 7wrEfoq5raF5lLP3cxLfxByea2ELhLXfWPDbuiaX2zWxYTYrOhECEon/7rOXGPkaBHOK mVug== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=neutral (google.com: 212.18.0.10 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.10]) by gmr-mx.google.com with ESMTPS id d8-20020a50e408000000b00418f6042d64si984492edm.1.2022.04.06.01.18.53 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 06 Apr 2022 01:18:53 -0700 (PDT) Received-SPF: neutral (google.com: 212.18.0.10 is neither permitted nor denied by domain of sbabic@denx.de) client-ip=212.18.0.10; Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 4KYHTn1NrYz1s7tQ; Wed, 6 Apr 2022 10:18:53 +0200 (CEST) Received: from localhost (dynscan1.mnet-online.de [192.168.6.70]) by mail.m-online.net (Postfix) with ESMTP id 4KYHTn18TQz1qqkB; Wed, 6 Apr 2022 10:18:53 +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 nERr7PS0R5ii; Wed, 6 Apr 2022 10:18:52 +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; Wed, 6 Apr 2022 10:18:52 +0200 (CEST) Received: from localhost (mail.babic.homelinux.org [127.0.0.1]) by babic.homelinux.org (Postfix) with ESMTP id 6135445400DB; Wed, 6 Apr 2022 10:18:52 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at babic.homelinux.org Received: from babic.homelinux.org ([127.0.0.1]) by localhost (mail.babic.homelinux.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id CsPqxl-AEigj; Wed, 6 Apr 2022 10:18:50 +0200 (CEST) Received: from paperino.fritz.box (paperino.fritz.box [192.168.178.48]) by babic.homelinux.org (Postfix) with ESMTP id 1F3CB4542CF7; Wed, 6 Apr 2022 10:18:40 +0200 (CEST) From: Stefano Babic To: swupdate@googlegroups.com Cc: Stefano Babic Subject: [swupdate] [meta swupdate] [V2 09/12] class: move swupdate_extract_keys to lib Date: Wed, 6 Apr 2022 10:18:34 +0200 Message-Id: <20220406081837.2222008-10-sbabic@denx.de> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220406081837.2222008-1-sbabic@denx.de> References: <20220406081837.2222008-1-sbabic@denx.de> 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.10 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: , Signed-off-by: Stefano Babic --- classes/swupdate-common.bbclass | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/classes/swupdate-common.bbclass b/classes/swupdate-common.bbclass index 7d60a6f..79b2246 100644 --- a/classes/swupdate-common.bbclass +++ b/classes/swupdate-common.bbclass @@ -51,23 +51,6 @@ def swupdate_getdepends(d): return depstr -def swupdate_extract_keys(keyfile_path): - try: - with open(keyfile_path, 'r') as f: - lines = f.readlines() - except IOError: - bb.fatal("Failed to open file with keys %s" % (keyfile)) - - data = {} - for _ in lines: - k,v = _.split('=',maxsplit=1) - data[k.rstrip()] = v - - key = data['key'].rstrip('\n') - iv = data['iv'].rstrip('\n') - - return key,iv - def swupdate_write_sha256(s): import re write_lines = [] From patchwork Wed Apr 6 08:18:35 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefano Babic X-Patchwork-Id: 1613841 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=dsb9un17; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=googlegroups.com (client-ip=2a00:1450:4864:20::63d; helo=mail-ej1-x63d.google.com; envelope-from=swupdate+bncbcxploxj6ikrb4ezwwjamgqe7z7prpq@googlegroups.com; receiver=) Received: from mail-ej1-x63d.google.com (mail-ej1-x63d.google.com [IPv6:2a00:1450:4864:20::63d]) (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 4KYHTw1f1vz9sFq for ; Wed, 6 Apr 2022 18:19:00 +1000 (AEST) Received: by mail-ej1-x63d.google.com with SMTP id jx2-20020a170907760200b006dfc374c502sf796387ejc.7 for ; Wed, 06 Apr 2022 01:18:59 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1649233137; cv=pass; d=google.com; s=arc-20160816; b=wyTQ5V2GxhS1SVWBpNI4n3XNXohg3R99ACYqCiGeYCiBjEPzqtt1bb/ffG/dNyyb/q no4Uh5lIWwdBFTUKHWrOcynXoRZmPfhk1JcgP+alCcnle8bFjoHsNm5zRgjMc583ll/4 Ex686hLZ4Jr9MqAOrYiT6J7EgEu8wfNJvzcx1pqFidnDARpp5jKF1ePYGyuzeWW/bhw8 pqOIzP8wJlEgWU6eO2vffvyz/YdRwxP5+GdcHc21UGeaKPzuVcT8zkqUJpJ7G16Nyvnw kofVFVZml/jdV5T3p6sW/TiiujeBCnOmJ+r8Gu26FVkevu5shQQzEjLWvGKaWpKQMt+L na9A== 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; bh=s4xlcJ79xPzqNtxRi9b7ZtmGNlCMVmDipCa+ui6Qnnk=; b=VU5J36R/mxR58tS3vDsRMwI6RlZ6U9nDcsCS0lvnokG1PDyV5u27QoSLem5DFFyPdz JUe22XTb88HzUi8aYUyzBaZh6sf6uM76DLmMo9xS1zCkGEX1Yi89M1iKGaElUoi+z2Te Ic3Hc+Rve7lCnSLndTZeBs07tBt0oEH6ZtwB0QQr4Gxe7BazPC45bSscnWahDFyPOcf1 XSYBFmNfeHfsV42Ekt7kqzl73nzcFOxiHP7kBj0kuPtTcjx5srrnBP4Ai94jz42v9qxu NpVJMtPc7mFXvsZRHahPwEPtgrsF17TvN0aLgl85sF+8qdKM3QfYY2YAAgbS14vxp+sS moMg== 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: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=s4xlcJ79xPzqNtxRi9b7ZtmGNlCMVmDipCa+ui6Qnnk=; b=dsb9un17jUqh6E74sQZU2VxELKVyJcMYDXXJVEUZ2xM6n+kjEqY28ddlYIy9i3DrH0 dOjE9n874a+SC4uosZukLjwsP9JzWq176PhprwphjFZ2ofXMh7A+F0J6Idt/kKimpOl9 yo0dWOwfn1CZzviB55oauMCrytAd5H5g1zxOIzsqvMv6CEMpnH2HMbljqfxJIGv42qTu 98JotYrHIYAmNHQbD1dHck7juokAM/eAA08Yl2HP5+i49o7qca2yBluYUNVtWPW0S4S2 OzXsUMnX/8ZbRAzP07CjFqfpE4f/hHvO+OogBVkaie1nhOBDpjJ/93znD+BIckMYxFcf iWxg== 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=s4xlcJ79xPzqNtxRi9b7ZtmGNlCMVmDipCa+ui6Qnnk=; b=YWT/hHt236m0ZHbolqtzqjyAmty63pDRcwRjWsbYDbUhQsOiuHvZTMx1trs2hjetFo mCqUjMkftiDNR64f7RJd6qbMKLUwZUAOmDf9KjJ11qLmguvkaUyBvuDkFNHPYnr7KDWD r+UD9iIWqmwwybZNg9aXiK2EbaIJ3l3rL0DWTKqMZMv3ina0M5jLWuNi12QETomyC82v 5BqDN/qmXYWL0YAcQdzd1rhf7h7iEotq02b04iGtLDBY3gvKTRfVnWSqw/Djmt/xq+vq mEN0NMp3eHfcVQGN0eg9ly8L2l0yTeJRAhlWW4xWo/s+khuDizTqgAsYmevDz3kgC9Hk /5uQ== Sender: swupdate@googlegroups.com X-Gm-Message-State: AOAM532I9xIJHlebIaA9fbB2BK1oIHNwqEcRD+BGeBzX5mIibn6E/tRT 8lUTv5r2nEhqgg1Ln/3rDLw= X-Google-Smtp-Source: ABdhPJwCZM/HfxuelShqn2Oo8H4Gs9Yn8ZWG7OqC60FhHZXT2hUrJd/EIpv8EgEq/rcnuF/jEANetw== X-Received: by 2002:a17:907:1606:b0:6df:f528:4033 with SMTP id hb6-20020a170907160600b006dff5284033mr7070310ejc.433.1649233137044; Wed, 06 Apr 2022 01:18:57 -0700 (PDT) X-BeenThere: swupdate@googlegroups.com Received: by 2002:a17:907:629d:b0:6b2:5d23:3c7a with SMTP id nd29-20020a170907629d00b006b25d233c7als2345021ejc.4.gmail; Wed, 06 Apr 2022 01:18:56 -0700 (PDT) X-Received: by 2002:a17:907:7245:b0:6e4:b142:f736 with SMTP id ds5-20020a170907724500b006e4b142f736mr7352311ejc.58.1649233136047; Wed, 06 Apr 2022 01:18:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1649233136; cv=none; d=google.com; s=arc-20160816; b=yOn/+cT8+g/FjEWXsiMq3Fn7nCZUtVeejHBhInJ0c77t7c3lPcNUWY8ZwpbqIh5i/C KJLiAg9ld1pFA7vWc6f0f8S7kssGfOdMwVaW9xpElt8MzF9OoTZlkckBVVAzrKQ2yPsV zxoFQfU1uJkuPAqd9IpvHln1EazRbut7C19xgEreqF5XWR36/s8k0TTlMc7Nmxu8X1VK t4+khSjrRgvJR0+hZ75BOkD4c1U26xEMyA2r6wCRXnU1vw251KVMhO2YuM0RFPI2hrLi 6fiAUHLUY/nOkZ+ygXh/dM0jdQOJKt+8s1ahD30OJmoLS8GU6CGtudALmNQdrHq4kyhp KuaQ== 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; bh=MH5PnZlSIsOs8qLKtzaZUnamVUZQRVniRJ9Im+oonhc=; b=XytZuM043t0cWAY3Qq+BsorTkAKgzRIdltMQ8MQWcBHWOv0M/YrVD+r5VLd1cz5DKC jwDIPZQKMUETT+U+jkpqQgnM1Kj3219Xn0UNa/pYWWCX9zENabYa3DMOT6Llghk5KWV1 BVxPqgDJ7ZQQLORCFoB0LKid8Gwnk7NbyS1oHyYwm9VIvINw9TVNCYqs0kSZYXoDS5XK miSNcM9RzcrAmP18If5ptEMCyqB/73hHkDKZ793IQDULezoMbWo9fUl4tFn+RHh1VN1a BzY8cGufB4ocD97/MQvdDOVdGhy9K5sQXkTbzC5AF1ckFecZ3VKQ7bn8wRXBS7BhHoIJ ar2w== 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 d8-20020a50e408000000b00418f6042d64si984502edm.1.2022.04.06.01.18.56 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 06 Apr 2022 01:18:56 -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 4KYHTq5gM2z1r1ff; Wed, 6 Apr 2022 10:18:55 +0200 (CEST) Received: from localhost (dynscan1.mnet-online.de [192.168.6.70]) by mail.m-online.net (Postfix) with ESMTP id 4KYHTq5Tqcz1qqkJ; Wed, 6 Apr 2022 10:18:55 +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 djRqW649krZI; Wed, 6 Apr 2022 10:18:54 +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; Wed, 6 Apr 2022 10:18:54 +0200 (CEST) Received: from localhost (mail.babic.homelinux.org [127.0.0.1]) by babic.homelinux.org (Postfix) with ESMTP id 35C9745400DB; Wed, 6 Apr 2022 10:18:54 +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 OeRwbufQ7Sdr; Wed, 6 Apr 2022 10:18:51 +0200 (CEST) Received: from paperino.fritz.box (paperino.fritz.box [192.168.178.48]) by babic.homelinux.org (Postfix) with ESMTP id 2BBF44542CF8; Wed, 6 Apr 2022 10:18:40 +0200 (CEST) From: Stefano Babic To: swupdate@googlegroups.com Cc: Stefano Babic , Thomas Haemmerle Subject: [swupdate] [meta swupdate] [V2 10/12] class: rework autoversion to be more generic Date: Wed, 6 Apr 2022 10:18:35 +0200 Message-Id: <20220406081837.2222008-11-sbabic@denx.de> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220406081837.2222008-1-sbabic@denx.de> References: <20220406081837.2222008-1-sbabic@denx.de> 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: , Drop special parsing with @SWU_VERSION, not required anymore, because it is possible to call a function by setting the name inside sw-description. Simplify the workflow and the search pattern. Drop limitation that a package should be part of SWU, and look up for any variable belonging to any package. Drop the association between filename and package name, because it is in most cases wrong and it is replaced by the explicit name of the package in sw-description. Old syntax: version = "@SWU_AUTO_VERSION"; // package name = filename or version = "@SWU_AUTO_VERSION:" or version = "@SWU_AUTO_VERSION:@" New syntax: = "$swupdate_auto_versions()"; or = "$swupdate_auto_versions(@)"; Signed-off-by: Stefano Babic CC: Thomas Haemmerle --- classes/swupdate-common.bbclass | 66 --------------------------------- classes/swupdate-lib.bbclass | 35 +++++++++++++++++ 2 files changed, 35 insertions(+), 66 deletions(-) diff --git a/classes/swupdate-common.bbclass b/classes/swupdate-common.bbclass index 79b2246..1ee241d 100644 --- a/classes/swupdate-common.bbclass +++ b/classes/swupdate-common.bbclass @@ -153,78 +153,12 @@ def swupdate_find_bitbake_variables(d): pass return ' '.join(set(vardeps)) -def swupdate_expand_auto_versions(d, s): - import re - import oe.packagedata - AUTO_VERSION_TAG = "@SWU_AUTO_VERSION" - AUTOVERSION_REGEXP = "version\s*=\s*\"%s" % AUTO_VERSION_TAG - - with open(os.path.join(s, "sw-description"), 'r') as f: - data = f.read() - - def get_package_name(group, file_list): - package = None - - m = re.search(r"%s:(?P.+?(?=[\"@]))" % (AUTOVERSION_REGEXP), group) - if m: - package = m.group('package') - return (package, True) - - for filename in file_list: - if filename in group: - package = filename - - if not package: - bb.fatal("Failed to find file in group %s" % (group)) - - return (package, False) - - def get_packagedata_key(group): - m = re.search(r"%s.+?(?<=@)(?P.+?(?=\"))" % (AUTOVERSION_REGEXP), group) - if m: - return (m.group('key'), True) - return ("PV", False) - - regexp = re.compile(r"\{[^\{]*%s.[^\}]*\}" % (AUTOVERSION_REGEXP)) - while True: - m = regexp.search(data) - if not m: - break - - group = data[m.start():m.end()] - - (package, pkg_name_defined) = get_package_name(group, (d.getVar('SWUPDATE_IMAGES', True) or "").split()) - - pkg_info = os.path.join(d.getVar('PKGDATA_DIR'), 'runtime-reverse', package) - pkgdata = oe.packagedata.read_pkgdatafile(pkg_info) - - (key, key_defined) = get_packagedata_key(group) - - if not key in pkgdata.keys(): - bb.warn("\"%s\" not set for package %s - using \"1.0\"" % (key, package)) - version = "1.0" - else: - version = pkgdata[key].split('+')[0] - - replace_str = AUTO_VERSION_TAG - if pkg_name_defined: - replace_str = replace_str + ":" + package - if key_defined: - replace_str = replace_str + "@" + key - - group = group.replace(replace_str, version) - data = data[:m.start()] + group + data[m.end():] - - with open(os.path.join(s, "sw-description"), 'w+') as f: - f.write(data) - def prepare_sw_description(d): import shutil import subprocess s = d.getVar('S', True) swupdate_expand_bitbake_variables(d, s) - swupdate_expand_auto_versions(d, s) swupdate_write_sha256(s) diff --git a/classes/swupdate-lib.bbclass b/classes/swupdate-lib.bbclass index 233eca1..203de3f 100644 --- a/classes/swupdate-lib.bbclass +++ b/classes/swupdate-lib.bbclass @@ -75,3 +75,38 @@ def swupdate_sign_file(d, s, filename): return hash +def swupdate_auto_versions(d, s, parms): + import re + import oe.packagedata + + def get_package_name(group): + package = None + + pkgvar = group.split('@') + package = pkgvar[0] + if len(pkgvar) > 1: + varname = pkgvar[1] + else: + varname = 'PV' + + return (package, varname) + + if parms is None: + return "undefined" + + group = parms + + (package, key) = get_package_name(group) + + bb.debug(2, "Package %s defined %s" %(package, key)) + + pkg_info = os.path.join(d.getVar('PKGDATA_DIR'), 'runtime-reverse', package) + pkgdata = oe.packagedata.read_pkgdatafile(pkg_info) + + if not key in pkgdata.keys(): + bb.warn("\"%s\" not set for package %s - using \"1.0\"" % (key, package)) + version = "1.0" + else: + version = pkgdata[key].split('+')[0] + + return version From patchwork Wed Apr 6 08:18:36 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefano Babic X-Patchwork-Id: 1613842 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=V76PWttn; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=googlegroups.com (client-ip=2a00:1450:4864:20::23e; helo=mail-lj1-x23e.google.com; envelope-from=swupdate+bncbcxploxj6ikrb4mzwwjamgqe4s23vma@googlegroups.com; receiver=) Received: from mail-lj1-x23e.google.com (mail-lj1-x23e.google.com [IPv6:2a00:1450:4864:20::23e]) (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 4KYHTx0ZKnz9sFs for ; Wed, 6 Apr 2022 18:19:00 +1000 (AEST) Received: by mail-lj1-x23e.google.com with SMTP id w17-20020a05651c103100b0024986ae896fsf560498ljm.10 for ; Wed, 06 Apr 2022 01:19:00 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1649233138; cv=pass; d=google.com; s=arc-20160816; b=uIj0Q+K4LOnOEz6uLtmz1fZkmFfYETnQ8Hr6dLkhV7nMk6hjsE+FrfPu8zBuuhj0j4 R1Mj2d5nxvd+28bwd42Gca5Ia+WES8tfwjhky6DKy9IkWCmZ+V2k9fliRDfigosH757d KlDpEV5fuO9G7L1leOUww6FqprnFhLz8Lp4bjHustn0wMehGUtz1fokx7Mre7b4tCeHf lYxBuIE6BoMmyw+ouUpmHi+mxdIlTlb5zeA0Xd0yWhHjPMqaKhE2OdtBwuWmTZpZzXUw AzjQ42u5UwfwUJmMYmPG/6B2PTjgZocwEiPCeyNBS+DtOGBtk1BWUQ4BGFpIB4J9HNdy v9Dg== 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; bh=ZuFC4rAqwgybqJj4RN5kJBv5tL/84VwZIi0rOpMP4XY=; b=OSCoK2WKMAm2xCY+B4VLL/RcysbmeyHLYw9/AY+mDac5yAfdQNNmT2DnFHtZGEI8mm v534BnQd5hAyLr1lrJZa9qZ58FiC4Hvd6uaCVqbwq1na80b23QbjJuGToe7y9Pd8tVQE 5tafBKzNGtLFZPecyxwFJzLEqn5yNyjStihd/0VDdJfctno1kf8m/fuYfl5ng6C9ANks Z/KnCFkCU4sqLi0c5wyrpYFaZozh9PNoCt26H3oNh1l9wlb7AKV3A3mQOviLbidl4o4f OFXwqbsJCCP1UzZNjGLhNQVCt55BkbIyXMUUgRYlkQR3UuqyWEpI8/E/e+ixHbEhydbT 0tmQ== ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=neutral (google.com: 212.18.0.10 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: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=ZuFC4rAqwgybqJj4RN5kJBv5tL/84VwZIi0rOpMP4XY=; b=V76PWttnxbFDf3nbuCcwMPZs/E8dDt9rmAS1BI2BArH/ReMKT80gvVRhR2NFUYDCr/ AnAJiCl6QjPaKsIZwwFVVLNo7EQoNZX9Py/4yEMnSeaWkZyXiy/S0vr36ungUds0agIT zQRwQYj+KUFM6q/7j913W+vuCa28WDtFWiC1ud+hl9ydhlf6044aT5e77enjsI4+k8d2 XL8b6VSD88yl3vIzAo0MvvBUzNIGVQwQrpzj1qGGW/0u1z6sqX2ais68mIuIKqF52EIp 6uNBBLnPCECrcEejzV0N28/dd+maK/XfhHZ0PmrVw0Lvq30n+R9DWzXAw7WWaAkxX44a hC/w== 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=ZuFC4rAqwgybqJj4RN5kJBv5tL/84VwZIi0rOpMP4XY=; b=lpt6kYx8AXmi/wEfWkxPwRtxo2C57hNjVHLz8+DM+TdQfVyG/hY6YV6ar4DRSpgXkh /LxBV57NLIpkdedeuuABaS49URts76AiFDv17n9pha1J+m5vub7+vQq/pthhadrQrBu4 MemMGI6gG7Crf4VgnVkM3ZXXtdjHbvhMOohROTTHf/eHp46Z3fjfjZSDUaZH7Rx4lBcE wSMVu4q8zk1mW6a+WBlEWDk0K4VixyR4ZOn9koK1aiPAE0FzVlBWlOWAR+ZaDRgGnx7x Kx2V/dY0GBc3oR+X3/rEo91jS+McisiQKzGsbhD8M4hqxxHPiXls+S/nM+XNIemA4Qno gycQ== Sender: swupdate@googlegroups.com X-Gm-Message-State: AOAM531XG6Pb8BQtEEsKTx75DrS8Hfd/kx2fED7KLZUsKDpzsbN3L+3L PaR3g6WRTqCfneUl+pyd4oI= X-Google-Smtp-Source: ABdhPJyaxICB0BADjzoDYuJ0z4lK04tOeEYfkKlNCfLnOM6D51FX/rQQXzSuxAwcxyjoPJu5J2E9TQ== X-Received: by 2002:a05:6512:3087:b0:44a:3cc8:757d with SMTP id z7-20020a056512308700b0044a3cc8757dmr5337906lfd.178.1649233137661; Wed, 06 Apr 2022 01:18:57 -0700 (PDT) X-BeenThere: swupdate@googlegroups.com Received: by 2002:a05:651c:1241:b0:248:b17:7fcf with SMTP id h1-20020a05651c124100b002480b177fcfls2012669ljh.8.gmail; Wed, 06 Apr 2022 01:18:56 -0700 (PDT) X-Received: by 2002:a2e:9d88:0:b0:247:fd40:a321 with SMTP id c8-20020a2e9d88000000b00247fd40a321mr4399312ljj.62.1649233136639; Wed, 06 Apr 2022 01:18:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1649233136; cv=none; d=google.com; s=arc-20160816; b=RgRx2E0VGf94Ydu5Ogp8IFX+Gff2trXv3LrL/nKlhOV3e+SYDrpi3B1WKSeXq9P6hz EFFQV8p8XI9mCJYQp2ZLebEOxgYI1wbm9nOOzap6UngmoX2KB2ZXWVnRrty8WmkoQYQg d00uethlAZlSadU1SLo5QC3iEVyJbmIBaBpSrOjlzzUewOer5xJPrbWd+LPB7lTBSd7A mePXQ91wyUF0UsqBQuDknVgr4RFRU86aDObpDl5k6Ev+bUDiZ5a587LL3FHKJK9RwLIl FhJactakZYqPxKp7HbNl33agY97+RBWRjBtr2PDU0iFgY3IiyLSCKlu/ti9ErPLBubj/ 5Mtg== 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; bh=kB0tbyFqn0M7ZZQvHP7y82nRqYKj7RCo6M+MmUskFCU=; b=gKSdof3WPDvHRlS/FQvX8tkytLRTTcuiVgfvdL85iBH7KK2E9uYNTwQWrz90pDwcBL /KKjHxMLmnISulLahw9cOiMIcbDzRwCVt4gNOD3diZa8VXTdXOvpPzpkTDb6ico0q3AX TNZGLI7scCFo/Ap9cusWoha3WELq4B3Mf8h2gBIIluYa2R3KtIWPUX8BRsBO+//iRCHx UKkwaGT5ADa+lbA3CygcvBMkDdt2LkJYbXzDzS7lflhVKSBbjTV1sbEXxzcG/Qc7JbSr oP4xNxkCYBTVY4zppgbZeNduhfEAvzhIAZek7mF0ANTMDHfpxevHvoIpmJChQCJL3Nng SgVw== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=neutral (google.com: 212.18.0.10 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.10]) by gmr-mx.google.com with ESMTPS id d2-20020a0565123d0200b0044af4a5b540si575303lfv.7.2022.04.06.01.18.56 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 06 Apr 2022 01:18:56 -0700 (PDT) Received-SPF: neutral (google.com: 212.18.0.10 is neither permitted nor denied by domain of sbabic@denx.de) client-ip=212.18.0.10; Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 4KYHTr0k36z1s7tX; Wed, 6 Apr 2022 10:18:56 +0200 (CEST) Received: from localhost (dynscan1.mnet-online.de [192.168.6.70]) by mail.m-online.net (Postfix) with ESMTP id 4KYHTr04b6z1qqkJ; Wed, 6 Apr 2022 10:18:56 +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 dOec43X3oTE1; Wed, 6 Apr 2022 10:18:55 +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; Wed, 6 Apr 2022 10:18:55 +0200 (CEST) Received: from localhost (mail.babic.homelinux.org [127.0.0.1]) by babic.homelinux.org (Postfix) with ESMTP id DF4024540E68; Wed, 6 Apr 2022 10:18:54 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at babic.homelinux.org Received: from babic.homelinux.org ([127.0.0.1]) by localhost (mail.babic.homelinux.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id tp4rJpGoOQWZ; Wed, 6 Apr 2022 10:18:52 +0200 (CEST) Received: from paperino.fritz.box (paperino.fritz.box [192.168.178.48]) by babic.homelinux.org (Postfix) with ESMTP id 42BC14542CFF; Wed, 6 Apr 2022 10:18:40 +0200 (CEST) From: Stefano Babic To: swupdate@googlegroups.com Cc: Stefano Babic , Thomas Haemmerle Subject: [swupdate] [meta swupdate] [V2 11/12] rename swupdate_auto_versions to swupdate_get_pkgvar Date: Wed, 6 Apr 2022 10:18:36 +0200 Message-Id: <20220406081837.2222008-12-sbabic@denx.de> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220406081837.2222008-1-sbabic@denx.de> References: <20220406081837.2222008-1-sbabic@denx.de> 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.10 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: , It is now possible to get any variable of any package by calling the function, so give it a more appropriate name. Signed-off-by: Stefano Babic CC: Thomas Haemmerle --- classes/swupdate-lib.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/classes/swupdate-lib.bbclass b/classes/swupdate-lib.bbclass index 203de3f..6d93e67 100644 --- a/classes/swupdate-lib.bbclass +++ b/classes/swupdate-lib.bbclass @@ -75,7 +75,7 @@ def swupdate_sign_file(d, s, filename): return hash -def swupdate_auto_versions(d, s, parms): +def swupdate_get_pkgvar(d, s, parms): import re import oe.packagedata From patchwork Wed Apr 6 08:18:37 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefano Babic X-Patchwork-Id: 1613843 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=YqhNrreg; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=googlegroups.com (client-ip=2a00:1450:4864:20::33a; helo=mail-wm1-x33a.google.com; envelope-from=swupdate+bncbcxploxj6ikrb4uzwwjamgqerjdicei@googlegroups.com; receiver=) Received: from mail-wm1-x33a.google.com (mail-wm1-x33a.google.com [IPv6:2a00:1450:4864:20::33a]) (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 4KYHTx2zbvz9sFq for ; Wed, 6 Apr 2022 18:19:01 +1000 (AEST) Received: by mail-wm1-x33a.google.com with SMTP id t2-20020a7bc3c2000000b003528fe59cb9sf972973wmj.5 for ; Wed, 06 Apr 2022 01:19:01 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1649233139; cv=pass; d=google.com; s=arc-20160816; b=vslk/iUEfUHoJTJDLfWQklA3muYddiwZ5gQrnopiwYMwvwAVA4vnDuCU3ntt52U4+A vRgcW1BhzY1QpfjX98YDJMIn0sjPJxmtaUc6yCXQs23baTiEQAwrsk5xtudGjsPqIoKD yEiLnt8rJh+1QbTGTqfZPat12FONZT5W6E876o/j5YlSFwkxQwb/h6G6nb7h17mKXgyX uqMhFp96BBn3rUh1Vc6v6ruEoFWpli8HbpCrOKzJE8bzZZ0QsLG0PV4gQiFOYY/SlEsM 2AybZwpVm2kf/iIeqN7eRv53r7eIuvUf7Rul4ZK9u53WVHYFgyeZq/e4LlmLUmkDbau6 OAEw== 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; bh=xiNdKDeaoN1shUgRZ5v9tdrtfTY5IDqQrOFf6BkFZC4=; b=LconSy/XMD6UJSo5gTf1PLLSz9cVPPdg4mZe2paL1SR3xkJYMPs3n3ctRG2//vEodT OUay+Moxp/Wbs/fwZ6T7cLsPLMzSZ/jyTvPfMJLWHdYEtAd7TfW34u2XRTtLCWvs31cy 0iut8TM7KyAG2SCAP61ouaNQ8MxZs618TuYE5i3sweoEMtDXQx1yGmWqLJuRQbSvs13H OPbUaOHUqavmB2DTgU2Aui9G3MDFoC6pFKkz8U8k294ZqQAMyHGJeGo2j5lYRIvlkbJ3 mYsee5IvQTEuUx5KRIUeefo++UIa2am2bjOL+7HZhf6/a7udSwuN0hj0Vy5/kE5S2RMn 9mdw== 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: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=xiNdKDeaoN1shUgRZ5v9tdrtfTY5IDqQrOFf6BkFZC4=; b=YqhNrreg0mTH+SBdBf7v9Ecejo45umEaI9b1epd9LAao+H1LLb3kJtRghoXAYuxKyO yGoEDKt9U/L07w16HoAgpoiDwpZvxSf3YG68M7T9dpxeiLmqm4e5W/JB/3qzH7tYbvXC mt1PXmv9gjVBcGr5f+Ozrmz5tkHp5EeLxm/iANFJz8xfDiPzNSbg0L2UvfMtAN58HIgo fDeuRNgZ6L7E1yg86bOFVWy1DRLcqHGj99HqyiCe41mJlLxzXjVP9oBCHUHMuHpzMz9H 3xQdfeC/ke5141NyNZEfkjP5hqbETb1wMvyd3Kkz4t0LHHhDBeXWpVhqbW2+RK8fedWx gn6Q== 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=xiNdKDeaoN1shUgRZ5v9tdrtfTY5IDqQrOFf6BkFZC4=; b=bs/DT146pSpcuK4bGIuoHpe0cE5vv3Sd5DDCYhkHgqisnvk9+CjoObjenJiDu88ga3 b98mL7bWm5IKuhnmypytaIZEvcsC9MmHlY1pbN/UYEv0KI04+gmPgcb8/bWg2e8QlBaR PZaW9G49JqL0FKLDI1g8OeUnFlahZsbfWEgiSKZebN+3ivx8cEOAwVmqB9i3stM8LfkR I5XVNOOFz4XY0mAMFPkMx9V5vDsfab+HdiOiZNz/qehkDnASTHfauA2yCyHprOtiLyhO CYv9IzfbwIx6yatTvpZFtKTk09v5xNG3M5znYMleJtBmxd3nTPPTlTtLn64YK6KRLIh8 MNjA== Sender: swupdate@googlegroups.com X-Gm-Message-State: AOAM530OuMVnzQJjaqHOzDSOJmI3ZSz/rROtVrjv+aBzQTvQrj0seWvp oI3WBtYCGTJmmZZBXOy693A= X-Google-Smtp-Source: ABdhPJzJ19hl2TMOXhSUfFIlg2OZlPEhziwj1+qK/uYgNinGDBl4Ddfb70sab5vuypGUY4+ZUBTlAA== X-Received: by 2002:a05:6000:11ce:b0:206:100d:ba01 with SMTP id i14-20020a05600011ce00b00206100dba01mr5718130wrx.558.1649233138740; Wed, 06 Apr 2022 01:18:58 -0700 (PDT) X-BeenThere: swupdate@googlegroups.com Received: by 2002:a5d:5306:0:b0:206:e61:ce02 with SMTP id e6-20020a5d5306000000b002060e61ce02ls1061455wrv.2.gmail; Wed, 06 Apr 2022 01:18:58 -0700 (PDT) X-Received: by 2002:adf:efcb:0:b0:206:1b0a:5270 with SMTP id i11-20020adfefcb000000b002061b0a5270mr5654794wrp.322.1649233137975; Wed, 06 Apr 2022 01:18:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1649233137; cv=none; d=google.com; s=arc-20160816; b=S5A4/+fMN3XZDRtGew5UtyT7hFw+W5bYm5i9PQQcQ8KkWu2kYtL6iBagHRsvsLCNP0 Ifa3AkYhVEnTfIH72bkicuaitevBttRafhzIBGXZAT6uSjWBFuIc8TY3Ky436b9HzfwE y8MjygBSmjDUjsqXJZlanNweDgsfPxwYGB+TR3m8UwMgK5XRl214SmwhyD9BSPS0FsvF BGhSb1EbdhQLtltEFh+dffxnkrM0hp4nZYmqP4NE77ep5KpOfmSs943BO9ric7XcL7tZ wJfYYBSadaKboKCYLfSPhIYrWcHHSGUSo3blXl3BpWbA/aQbjot1IfDPAjskYQZFbrXR xzxg== 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; bh=ADnVgWfWlyZrEtBvsgF3wUZLK9MQtzatCfBJ3dq10CM=; b=vd0wbZLJ3koFQqh7pJkY6HrPBKGzNL/H83aYJTUw5kgi3boj68SVyPtu7RZ+GWDuJp Rs+K2LNX3mNvGnDUJaZSibzV5jyLbkZ9kgVxfIo94jrvejs1xQIVyH8VUSnlH+65e9lN 6VqYFBNg26dFN1BZoiIeBgSWkk3PXAnq8Sqe1BuZHNRjxdqryOEwwtXJmLKRNWjRuoHo 8c5c9w6dXCru0r5pqvkrgn+Z8IUJbRhX/XBtSN3TTZvpr6+cgtKORYESTcPRGc9W2Yxp MpZOH+OaQjIfupM2cpqnD5xxOKn2g1uAm57ujTh+vdYvvGFJwroLo8KsjTQ0oMOSt67e /9KA== 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 y11-20020a05600015cb00b00205db67de65si788161wry.2.2022.04.06.01.18.57 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 06 Apr 2022 01:18:57 -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 4KYHTs5vNlz1r1ff; Wed, 6 Apr 2022 10:18:57 +0200 (CEST) Received: from localhost (dynscan1.mnet-online.de [192.168.6.70]) by mail.m-online.net (Postfix) with ESMTP id 4KYHTs5hsQz1qqkB; Wed, 6 Apr 2022 10:18:57 +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 2kKG6C6d2AJ6; Wed, 6 Apr 2022 10:18:57 +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; Wed, 6 Apr 2022 10:18:57 +0200 (CEST) Received: from localhost (mail.babic.homelinux.org [127.0.0.1]) by babic.homelinux.org (Postfix) with ESMTP id B71C345400DB; Wed, 6 Apr 2022 10:18:56 +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 EccIZwnRl_xI; Wed, 6 Apr 2022 10:18:54 +0200 (CEST) Received: from paperino.fritz.box (paperino.fritz.box [192.168.178.48]) by babic.homelinux.org (Postfix) with ESMTP id 4EEEA4542D00; Wed, 6 Apr 2022 10:18:40 +0200 (CEST) From: Stefano Babic To: swupdate@googlegroups.com Cc: Stefano Babic Subject: [swupdate] [meta swupdate] [V2 12/12] Raise a warning if old syntax for sha256 is used Date: Wed, 6 Apr 2022 10:18:37 +0200 Message-Id: <20220406081837.2222008-13-sbabic@denx.de> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220406081837.2222008-1-sbabic@denx.de> References: <20220406081837.2222008-1-sbabic@denx.de> 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: , Generation of attributes in sw-description should be done by separate function. The old syntax with '@' is still allowed for compatibility reason, but it will be removed in future. Signed-off-by: Stefano Babic --- classes/swupdate-common.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/classes/swupdate-common.bbclass b/classes/swupdate-common.bbclass index 1ee241d..37403c0 100644 --- a/classes/swupdate-common.bbclass +++ b/classes/swupdate-common.bbclass @@ -57,10 +57,10 @@ def swupdate_write_sha256(s): with open(os.path.join(s, "sw-description"), 'r') as f: for line in f: shastr = r"sha256.+=.+@(.+\")" - #m = re.match(r"^(?P.+)sha256.+=.+(?P\w+)", line) m = re.match(r"^(?P.+)(sha256|version).+[=:].*(?P[\'\"])@(?P.*)(?P=quote)", line) if m: filename = m.group('filename') + bb.warn("Syntax for sha256 changed, please use $swupdate_get_sha256(%s)" % filename) hash = swupdate_get_sha256(None, s, filename) write_lines.append(line.replace("@%s" % (filename), hash)) else: