From patchwork Wed Sep 22 18:00:24 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "McAllister, Colin" X-Patchwork-Id: 1531367 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=googlegroups.com header.i=@googlegroups.com header.a=rsa-sha256 header.s=20210112 header.b=a3nKugoS; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=googlegroups.com (client-ip=2607:f8b0:4864:20::23e; helo=mail-oi1-x23e.google.com; envelope-from=swupdate+bncbdhnphwu6ijrbsw6vwfamgqedqb6phi@googlegroups.com; receiver=) Received: from mail-oi1-x23e.google.com (mail-oi1-x23e.google.com [IPv6:2607:f8b0: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 ozlabs.org (Postfix) with ESMTPS id 4HF5gg1PStz9sVq for ; Thu, 23 Sep 2021 04:00:45 +1000 (AEST) Received: by mail-oi1-x23e.google.com with SMTP id m84-20020acabc57000000b00275c1cf95d4sf1293671oif.2 for ; Wed, 22 Sep 2021 11:00:45 -0700 (PDT) ARC-Seal: i=3; a=rsa-sha256; t=1632333642; cv=pass; d=google.com; s=arc-20160816; b=HF+WHpvG6O7lbZBuNdmr288pK6QIGuRu9wWHkX18wQXUUNkkQigYIosyfUUqIgoJBN Zsm1QIXgiFw/r6D7P47MNQuee7Vu/Dfz3WH00LNgqZIJ94WildEkyBYi1B2RZ7kHb0c6 7r3LGHWZQlE3g6HKBfCC5eh7wyFmllYbPghWa5q+V6MsHlnnApy3BHJrPLtWXSuWlx3e m0Yg/lWtIs0HdW7U5NHRTxXKgQve/tlTkMV0B/m6qbG9lMzSB6iWVsQrTn5NybatAvjy MvVN4Ve+wBCNtLmdRlkXI7xJKgtVVWW2xNPLPCvLSSC79WcXFx43qogqdKULRnuv68fb mg7g== ARC-Message-Signature: i=3; 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:reply-to:mime-version:message-id :date:subject:cc:to:from:dkim-signature; bh=TICg9VPBADniAXI7q6cyQldPw9QzjXMu+fkszZV0rZQ=; b=obyBnxkaJ+9k0VjctjF9kYrTmKSLWtj8xioMhGyOd+8x5ht2wfqcyLQkBEIcCDfCyh WF10pxufmI4E3N/KTyLH8sSTEdB3ZDgVE0k8TiZM2CWoIJI+Mc5xnWnvmRhWXo6RmA6i krPEgTtWfqIUhxD7WP6SRqazpq9yUuvWeY3xv46TE3xjUK0rvKFE+a9HukCUC2TO/CHz WGKfV1ODCC4AAXtg3Wd9eJIKjEOlIY3JuVmSHjRrCk38VkAF72Kxaunr43arwFKsEFvl QGOcXD4ZUi/W5h/QJUL2zy1i7ywqkdjsvwJX1YQTNUVtc14Vl+GrJfr6ULyFqAJpKroV tCRg== ARC-Authentication-Results: i=3; gmr-mx.google.com; dkim=pass header.i=@garmin.com header.s=pps1 header.b=dZh6w4Ag; dkim=pass header.i=@garmin.onmicrosoft.com header.s=selector1-garmin-onmicrosoft-com header.b=p97mTEro; arc=pass (i=1 spf=pass spfdomain=garmin.com dmarc=pass fromdomain=garmin.com); spf=pass (google.com: domain of colin.mcallister@garmin.com designates 205.220.177.212 as permitted sender) smtp.mailfrom=Colin.McAllister@garmin.com; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=garmin.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20210112; h=from:to:cc:subject:date:message-id:mime-version:x-original-sender :x-original-authentication-results:reply-to:precedence:mailing-list :list-id:list-post:list-help:list-archive:list-subscribe :list-unsubscribe; bh=TICg9VPBADniAXI7q6cyQldPw9QzjXMu+fkszZV0rZQ=; b=a3nKugoSltGU8xOdasdkkHRvVxDWLJwJhRQ4+GSyXFGYy/EHP2sR0r/c6JAvzi/9mU vgjiPdknhua7V+Aqpm4eB1J9gG0PCpxC7eW52ha2IwpK2XzPoEkcO1Fglh2g5gls7A2H q5RqTeNrrnRxHrnJOJK57tWY+fn8J4yTxZZ7+NR0aRpmdIkGL5FVzR6n4bS1TmwNr5Uq jJKmaxfu0DZd6fog28eNKf46lf1OCRjcxWcb0gDQ/Kv+YLGXLVkWGyzlW+60zz5hPuRz /OhPpB+q6E4Ver/E0GEqXJFcM5imCtP42sbGBGP76AF/DRdERAm3/uLz84gbG96NNWgU 7uzw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :x-original-sender:x-original-authentication-results:reply-to :precedence:mailing-list:list-id:x-spam-checked-in-group:list-post :list-help:list-archive:list-subscribe:list-unsubscribe; bh=TICg9VPBADniAXI7q6cyQldPw9QzjXMu+fkszZV0rZQ=; b=xbFAelAuwFUZsEmDo9dHOfYsHhZJtfM6r3u9BSJMvX9fIL7uulG24RVa+ve2+CKk4I sCkw31G+fu/VWDIpSbhO+zaAd+d5zKJXXt8vrlmRrj4DRHVUdFFFh9nYvNsMB1SzU+lA K8N59LANU3QJPFo1XxW4CEsmyNVcH9ib1O4EHQVocHhPwaIhKxi9JNynSEk+f8arkGO+ 3mCkBSOWbVor4eQN/7Y1IvSflrFiyLXyUqHabR3PwrvgjwHZe4iHbBxujzIgFtUdDzzZ miRX/HdnVC3el02InbFxYMXuZ5QJFP88xVYDTFzIgLJN/c4oQjVPTQ26NdJLM3CON2g6 Sc1Q== X-Gm-Message-State: AOAM532M7lAVz1qA2twALhiZH46PuABF+YzwXaxeASHQOlL+Ez98DGCM 2u8pm3HBx/3EyRG8tNxYHnk= X-Google-Smtp-Source: ABdhPJyBpibh6JBH9QU9CuXTIy+8ljGC/iLkl7mES7T4kglt9ZpcMBItNyfG2YM5IGh4HpkyCACKqA== X-Received: by 2002:a54:4f8a:: with SMTP id g10mr368850oiy.81.1632333642471; Wed, 22 Sep 2021 11:00:42 -0700 (PDT) X-BeenThere: swupdate@googlegroups.com Received: by 2002:a05:6808:f0f:: with SMTP id m15ls892027oiw.11.gmail; Wed, 22 Sep 2021 11:00:42 -0700 (PDT) X-Received: by 2002:a05:6808:1906:: with SMTP id bf6mr9263908oib.130.1632333642078; Wed, 22 Sep 2021 11:00:42 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1632333642; cv=pass; d=google.com; s=arc-20160816; b=ejTB+VYJvN7XsViTz5HEQmbW0UYTfWiTosphVElHpS1ouiNwB4H7YbEd6C6nxxZp2n VJo+DYlIvsivNIrnMWQXCO10CKIW+4+x9BCqK+uztkjrrdBzK7xKJ6CA12TUpT4y9f3B 7N6SshNmHQMy/2L/ahjwInGM8pl77Yh7JLQNy7HFQZi0LCCRt1XrlqnKqig1bFOSn0uA duw33W88GmVPqvW8Hoa+MWx0cqgk+uHr1M0A6YacBNWvtHfLbR+zKqSjpfArRGinGLco cuLy1hYMioS/CkOz7YM0zyLD5iMaAAsY9QujA5gAlOCHh22ERrU8+vmaG/v5TA7vsl0J xFTQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:dkim-signature:dkim-signature; bh=FfYbOxU4lPQ9OU0m6XdM2sqb2GVA4io2ePql+D5pkUQ=; b=iJW4ZiurtHaVj38qqBy2EEkFmuPoSrg8IIMymQrIfxeiZ+iVGN7TRSyKmJrCVtm6qg GAWQCiRoXzaPbPOqbYDnwqSgaD3zkfTaXnlIGZImKokbBUZzGcgiCKb7kpeC9iD+3JFk 3xnXePa4Z5hhMQcLS0eat5bwE1HuVpeKfuOEAd9wNnET+qA8CzPvQGcW+TmGZGU1CSTH MwZPqtondNeBfc8FxWKXZsFkkBB/JjjixV/LJySyQqDpXbWUqF1FbVyw40B0hza8HJYE 8dHpVcOez6yb3SNADcAD0rM5m9Vo3fXVJUoAhhqqR4G0M4NjpRtrIvXYsfvI4v3JTZWz aPPw== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@garmin.com header.s=pps1 header.b=dZh6w4Ag; dkim=pass header.i=@garmin.onmicrosoft.com header.s=selector1-garmin-onmicrosoft-com header.b=p97mTEro; arc=pass (i=1 spf=pass spfdomain=garmin.com dmarc=pass fromdomain=garmin.com); spf=pass (google.com: domain of colin.mcallister@garmin.com designates 205.220.177.212 as permitted sender) smtp.mailfrom=Colin.McAllister@garmin.com; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=garmin.com Received: from mx0b-000eb902.pphosted.com (mx0b-000eb902.pphosted.com. [205.220.177.212]) by gmr-mx.google.com with ESMTPS id bf14si261325oib.0.2021.09.22.11.00.41 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 22 Sep 2021 11:00:42 -0700 (PDT) Received-SPF: pass (google.com: domain of colin.mcallister@garmin.com designates 205.220.177.212 as permitted sender) client-ip=205.220.177.212; Received: from pps.filterd (m0220298.ppops.net [127.0.0.1]) by mx0a-000eb902.pphosted.com (8.16.1.2/8.16.1.2) with SMTP id 18M5MdTC024108 for ; Wed, 22 Sep 2021 13:00:40 -0500 Received: from nam02-sn1-obe.outbound.protection.outlook.com (mail-sn1anam02lp2048.outbound.protection.outlook.com [104.47.57.48]) by mx0a-000eb902.pphosted.com with ESMTP id 3b7q3y22y2-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Wed, 22 Sep 2021 13:00:39 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=W7PJQdNBfILi8WXbUS3IQ4pFhzyJThhdNQElYd1H4FguU3eLKDcWGybjRI49Ya7pCgAS+irSJJ8cRJvaFgre2FMjjbLQcmODV4tsvw2a0j5o5/jdkttWY4J9TqULdep3+B25bTWZSi+GcCQZJ0t3tIl7vGx/GuE9oxRhi5j5XEbc6cPLqNnf+gPOJpR9UWtQxteCnB54IIVqs3GGwf7AOX3w3uvnaKx6E6/0ZrFq3f0npJkDfadf09UyE7x1Utsjk6DzqyDPOsu1AcLYeNEDFZXGIEnbZKAW4QFow/jojSinjNDhVM3XukdHksyGE19+jLxnf198Kt0e82KHiESTwA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=FfYbOxU4lPQ9OU0m6XdM2sqb2GVA4io2ePql+D5pkUQ=; b=T8keDMmwKcZDe7MF2atJHJCPrc5oX+DMkPaseFuBzQqvTs059OMuAqdSodtKQeXvcPexGIdSV6wsbUhvUQ6z9NSDVRh1FkWn+oAN8E/RGsQVaiVn2KH6OMF2qZZPQqb0bl/tDObXEUUCeVwhIv1yt5enNsiZHS8WT0Fn+7K4GRegCEmn7AixU56l8Z+T3/LTnJCJhaH+iH6G7+eN/i+sK9iZMjvVr9y3i6V971NgipufQgtpy5/YtgRln0bEpKYdUaBvd8L5cXZ/BMSMZmBNbcjtLek8HquurOL9e4zNrRdB2fu9Lcmc7aVULr1dotPMPzF+Zz1xSrlKKFDY3loAgw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 204.77.163.244) smtp.rcpttodomain=googlegroups.com smtp.mailfrom=garmin.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=garmin.com; dkim=none (message not signed); arc=none Received: from MW4PR04CA0061.namprd04.prod.outlook.com (2603:10b6:303:6b::6) by CY4PR04MB0425.namprd04.prod.outlook.com (2603:10b6:903:b4::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4523.17; Wed, 22 Sep 2021 18:00:37 +0000 Received: from MW2NAM10FT064.eop-nam10.prod.protection.outlook.com (2603:10b6:303:6b:cafe::8d) by MW4PR04CA0061.outlook.office365.com (2603:10b6:303:6b::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4544.13 via Frontend Transport; Wed, 22 Sep 2021 18:00:36 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 204.77.163.244) smtp.mailfrom=garmin.com; googlegroups.com; dkim=none (message not signed) header.d=none;googlegroups.com; dmarc=pass action=none header.from=garmin.com; Received-SPF: Pass (protection.outlook.com: domain of garmin.com designates 204.77.163.244 as permitted sender) receiver=protection.outlook.com; client-ip=204.77.163.244; helo=olawpa-edge4.garmin.com; Received: from olawpa-edge4.garmin.com (204.77.163.244) by MW2NAM10FT064.mail.protection.outlook.com (10.13.154.101) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4544.13 via Frontend Transport; Wed, 22 Sep 2021 18:00:36 +0000 Received: from OLAWPA-EXMB9.ad.garmin.com (10.5.144.19) by olawpa-edge4.garmin.com (10.60.4.228) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2106.2; Wed, 22 Sep 2021 13:00:29 -0500 Received: from OLAWPA-EXMB3.ad.garmin.com (10.5.144.15) by OLAWPA-EXMB9.ad.garmin.com (10.5.144.19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256) id 15.1.2308.14; Wed, 22 Sep 2021 13:00:33 -0500 Received: from localhost.localdomain (10.5.209.17) by smtp.garmin.com (10.5.144.15) with Microsoft SMTP Server id 15.1.2308.14 via Frontend Transport; Wed, 22 Sep 2021 13:00:32 -0500 X-Patchwork-Original-From: "colin.mcallister via swupdate" From: "McAllister, Colin" To: CC: Colin McAllister Subject: [swupdate] [meta-swupdate][PATCH] swupdate-common: Modify sha256 placeholder regex Date: Wed, 22 Sep 2021 13:00:24 -0500 Message-ID: <20210922180023.15911-1-colin.mcallister@garmin.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 663e87fc-4eb9-4972-f7e3-08d97df2e14a X-MS-TrafficTypeDiagnostic: CY4PR04MB0425: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:2803; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: mUGmY9xmSjvgRR0jCbhjCEuwQuBLIPibeEt5RjYe6wVGfGmOlQWSPDeKVBeIwZRp/KshSOfbSS7WsXCHnP2j30RIX7xyyCauRa0Cxp3mCA6sbtsD3b/jicuGrvhxsS4tkZPGBkXKGO26OWsGiC7odIoyidEqagtfGbiE/XgMvt/cVmkIEMFd3Lb77CQ0hftEdTI4VVsEKnsLXFC1a3ihSDt+IkOspaXQ+dFBFmZeKkcJzr8SwVxEjypkfDmeI9Ex39pZlr4DYN9LCKkzhXczbPtdwidKDWS5H1+v2oZwOCHT0f05IzVdxiOLlMaeGBoJnM5FrpJievLcEzhZ8dbPFcWcxNPu34bX4i0cegrHM+2PbLrEzBfEEEaeUl62fpvyHZ1thkSkbqUVjtAlPAymwqmx/KsCB0L9bWX0ZO5AxVB4KXDvNnz3rkC2VrT0fo7LBQaMkXTI5d4+R68IGiMntTwVV9jnkQBKM+oy3phJBRkLy1laidDqyKuUDMgkP0VPDL1Ai/DPX1CegMOC+be9cpmT0Kucq4yazjyajrCyTyf4QhBLgguB+qPuB5MmNt0ACxuwWJXpD0xavd5W1kQ6D7VpAJbpIH5Vq4pXJMFhD89BuSueu2ytZVRoNLsA/Fo2cpntv2LJbEwLbRdi8yibwEocxODT+zfmk1mgPDfgJt92VFzyD8qicu2MkNhiUwSFqMF1GTvbSMzzoJAtCmicRQ== X-Forefront-Antispam-Report: CIP:204.77.163.244;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:olawpa-edge4.garmin.com;PTR:extedge.garmin.com;CAT:NONE;SFS:(46966006)(36840700001)(6916009)(8936002)(7636003)(2876002)(107886003)(36756003)(8676002)(2616005)(86362001)(1076003)(5660300002)(6666004)(47076005)(70586007)(36860700001)(336012)(2906002)(82310400003)(186003)(70206006)(83380400001)(26005)(316002)(4326008)(508600001)(426003)(356005);DIR:OUT;SFP:1102; X-OriginatorOrg: garmin.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Sep 2021 18:00:36.3580 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 663e87fc-4eb9-4972-f7e3-08d97df2e14a X-MS-Exchange-CrossTenant-Id: 38d0d425-ba52-4c0a-a03e-2a65c8e82e2d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=38d0d425-ba52-4c0a-a03e-2a65c8e82e2d;Ip=[204.77.163.244];Helo=[olawpa-edge4.garmin.com] X-MS-Exchange-CrossTenant-AuthSource: MW2NAM10FT064.eop-nam10.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR04MB0425 X-Proofpoint-ORIG-GUID: wRf-h6hAQJivUIPjgcXTVlbveRiA3ZXb X-Proofpoint-GUID: wRf-h6hAQJivUIPjgcXTVlbveRiA3ZXb X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.182.1,Aquarius:18.0.790,Hydra:6.0.391,FMLib:17.0.607.475 definitions=2021-09-22_07,2021-09-22_01,2020-04-07_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1015 malwarescore=0 bulkscore=0 phishscore=0 mlxlogscore=551 impostorscore=0 spamscore=0 suspectscore=0 mlxscore=0 priorityscore=1501 lowpriorityscore=0 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2109200000 definitions=main-2109220118 X-Original-Sender: colin.mcallister@garmin.com X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@garmin.com header.s=pps1 header.b=dZh6w4Ag; dkim=pass header.i=@garmin.onmicrosoft.com header.s=selector1-garmin-onmicrosoft-com header.b=p97mTEro; arc=pass (i=1 spf=pass spfdomain=garmin.com dmarc=pass fromdomain=garmin.com); spf=pass (google.com: domain of colin.mcallister@garmin.com designates 205.220.177.212 as permitted sender) smtp.mailfrom=Colin.McAllister@garmin.com; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=garmin.com X-Original-From: Reply-To: 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: , From: Colin McAllister For images that do not have a version, but could use the install-if-different flag, the sha256 sum could be used instead. A previous regex would allow this because the '@filname' was replaced with the sha256, no matter what key the value was associated with. The current regex is updated to support using the placeholder for both the sha256 and version keys. Signed-off-by: Colin McAllister --- 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 a4dcf84..f483398 100644 --- a/classes/swupdate-common.bbclass +++ b/classes/swupdate-common.bbclass @@ -80,7 +80,7 @@ def swupdate_write_sha256(s): for line in f: shastr = r"sha256.+=.+@(.+\")" #m = re.match(r"^(?P.+)sha256.+=.+(?P\w+)", line) - m = re.match(r"^(?P.+)sha256.+[=:].*(?P[\'\"])@(?P.*)(?P=quote)", line) + m = re.match(r"^(?P.+)[sha256|version].+[=:].*(?P[\'\"])@(?P.*)(?P=quote)", line) if m: filename = m.group('filename') hash = swupdate_get_sha256(s, filename)