From patchwork Thu Jun 17 15:43:46 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Haemmerle X-Patchwork-Id: 1493627 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org 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+bncbaabbvo3vwdamgqei4n65wa@googlegroups.com; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=googlegroups.com header.i=@googlegroups.com header.a=rsa-sha256 header.s=20161025 header.b=dL/ofHQ1; dkim-atps=neutral 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 ozlabs.org (Postfix) with ESMTPS id 4G5RF534c8z9sSn for ; Fri, 18 Jun 2021 01:44:25 +1000 (AEST) Received: by mail-wm1-x337.google.com with SMTP id w186-20020a1cdfc30000b02901ced88b501dsf2289486wmg.2 for ; Thu, 17 Jun 2021 08:44:25 -0700 (PDT) ARC-Seal: i=3; a=rsa-sha256; t=1623944662; cv=pass; d=google.com; s=arc-20160816; b=Hx5ZEtUYUYNlBSvfyMCTYiMsxu1PxKmsVLpP7wFJbwZNXcm/jO50prCHMGAUbcGzH1 sCKN75AYdn5pJGWqi8OvIQ4VCCyGUU3xHWOn/N3Dbbw+fBXHgJHExNrhk0j0yhv1G0y0 khXUnrk6hJ/+Bxmql/geEvrlzxv02eP9jwiUyNUGUq0GC2Dpqtx6jaexv8nNIuxczWxc B0nr0INO0WQzkWpjRWXutf65tw2FWppfsvln7CZhLVEO+k2DHvWAupylgZIWqbUOMDi4 skhvE9x0qQDdFrGFl+vhqLKYqqZJibrqtEyQVIVAGmwXQtPJOQle95txnY3nhiHxnIX8 ZB8w== 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:references :in-reply-to:message-id:date:subject:cc:to:from:dkim-signature; bh=uCXhxUWik9C6ELLbfniRYbt52PzAdpVDIF7JnccI4ic=; b=tbFRXow7IrBR7V+xevE7yNSsx65qXWMXIC6MDbVAp/x5zjNkUVkiwIeMlb7HwkoNYV CrdS3gb9Fz/2v1ZEYVdHjMF8v5jakullT7xehCampFMq8vPG968iz3zc1n46jZxepkDL 6jemh7GddsiLNdsezvdRByZF0pmkaK/1JLLbi0r9rEveddmJGXXZeuwm+5GvDyHktyVt /nC3iuFWH538S5Lsz42vZl1Lppv0P+hlPU9Zi4BD9cMM9+jNVBE6VR+/BiMwjKF8ghAh FY+dAXZMFebUX9Y7hL00DeYAwrddTT007lhKAxaBeikwhIDAAZ6QTl5BG/2BoGfnoiLQ yHcg== ARC-Authentication-Results: i=3; gmr-mx.google.com; dkim=pass header.i=@leica-geosystems.com header.s=selector1 header.b=eBaLuFfe; arc=pass (i=1 spf=pass spfdomain=leica-geosystems.com dmarc=pass fromdomain=leica-geosystems.com); spf=pass (google.com: domain of thomas.haemmerle@leica-geosystems.com designates 40.107.20.123 as permitted sender) smtp.mailfrom=thomas.haemmerle@leica-geosystems.com; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=leica-geosystems.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :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=uCXhxUWik9C6ELLbfniRYbt52PzAdpVDIF7JnccI4ic=; b=dL/ofHQ1dhwigoxEabGRsMw0aYyvvSH7CXvB3BxWz8d9hnwquizletg4LkIVQ5HGpP kS6PEQwoTwk4H1lDPLFxMdDZwTfUfPBx8NVUGuyHMnZgNoBLj5s8H8fjv1Bw02pm20ID uBAw6QMe3/795odgdM21J087MOMNuFtez28lVbo8RqCU/v+PDhtpoJI7Ws4cXWjRg+8W 0Oy4YZ9ftU2YSyfxQz8tYXWDbxt8tG0mxacvrjsA3vhuPwDX0vJ4mS64Rshs5vMO38Zx KY8qcevKq4JvMNbBD7MI0Gj7VnpdqskzGYjYoPH6k7j8ILlDw6Ts4nrHtHlOXnnSzCdB yTzA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references: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=uCXhxUWik9C6ELLbfniRYbt52PzAdpVDIF7JnccI4ic=; b=ku00MAP4L05QzvKXrnTcTnAxPqj/3pBIsl1VBk55YdU4gV0Qxxb3mLIU9H9ddK/CRH EgZ9YGwS1Ix5nrSqL75qJEYIfjxnHmwOfQgGPEErG+DDjeF8IBevH3XZOMqGXVUABUHe 0K2mHcfmsAjNLY2Csl6Qb2lUTqYFEvrBYJkPm0wz0OlJLtl0KhcqZd3XDJ8M2ahgzwEd 35S+e03/rGmz5izOqYXSrw6O4gpsiX3Xi+CRRI1kXwVpzSgr30BQxlp61O2UciTXnzDk 4zV9YKraJdvGe96TWPlcWplRos4AZoW7v5O1Im1excoQ9xQz7kPj9nOSDve2SW52RW77 XXgg== X-Gm-Message-State: AOAM5310ya6PM3XWRYprFruHfXGiw67tn9yNo54FZ4BbQIXfrG4ZRybU Fs8y3AT/y1tOPhcB8bFJeiE= X-Google-Smtp-Source: ABdhPJwPgAd7XB5osHQRfyHFBcX1wh+B6DLBPvna3u4eYSX1I7qKsI62TgSjPyGqz5i8p4JYn7mjvA== X-Received: by 2002:a5d:4d43:: with SMTP id a3mr6569223wru.312.1623944662043; Thu, 17 Jun 2021 08:44:22 -0700 (PDT) X-BeenThere: swupdate@googlegroups.com Received: by 2002:a5d:6945:: with SMTP id r5ls2272316wrw.2.gmail; Thu, 17 Jun 2021 08:44:21 -0700 (PDT) X-Received: by 2002:a5d:4dc4:: with SMTP id f4mr6541124wru.181.1623944661433; Thu, 17 Jun 2021 08:44:21 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1623944661; cv=pass; d=google.com; s=arc-20160816; b=lx9kY7N+/CN2w4smpb7YHhcdAsf28vfy2eBMfI1MITGE/rf4pACpLWHc7RhroV6aGE Lj+vMpyhqChVS2US1fbxW91riXjrH8LOxsDhlbK5RTG8DmU0tdHDU01c1Jhi262yn/3i gpw+KaR5di8gQ19Zqr+Y/6K3eR/sxg9mRtXxUJtnVEHkFlEVEyLJboo475PWbukJ61l4 PZ14s4DyOqN4libc1MlBhGo2KvFStWJu7t57zENf6wtJPgBYMNWR6SFwHnyv8pHu5of+ YndJZPhpr4Uo0KNztq4KXQpRDSJusF/14I9UPJloP6r8tQKKhhyUIisflzI5dGBF3C5N H/1A== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=ZdoCNw6UCAymdVXLe7iRHiutXDyVoJXzk52O4415zaw=; b=TMFvz8dYceZp87qp20iGID1pVwZbHxCYCORnTb3Nuhj715gtxxy6Yc5ljG/HW8ncg0 o/2LPLhCn+DPbiFh2QKH7sqE1TrDmUSC9Utfq6leE9aGbcc9/1U2GA9s2eb8S3YBjnFJ 5EWyK9AX7coQXOb2WoxtjTvSnSw1H9DH1oA2kGvKC4mb1M3Wn3beD5AAxBEkrGsM0CYw e5QFsFC6aIA1wmi1S/Db1i75C90/F5VSoGg2ucet3ruif9o3vqTmDqqa6JTFsQelg3cn /h22eTZQzW2LvfiRMKBP/bN3xaaQhf1xVea4jWwEluwCfCq/Bn1DASM6YJGi1frYvZ8S LdOQ== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@leica-geosystems.com header.s=selector1 header.b=eBaLuFfe; arc=pass (i=1 spf=pass spfdomain=leica-geosystems.com dmarc=pass fromdomain=leica-geosystems.com); spf=pass (google.com: domain of thomas.haemmerle@leica-geosystems.com designates 40.107.20.123 as permitted sender) smtp.mailfrom=thomas.haemmerle@leica-geosystems.com; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=leica-geosystems.com Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05on2123.outbound.protection.outlook.com. [40.107.20.123]) by gmr-mx.google.com with ESMTPS id t7si324813wrp.5.2021.06.17.08.44.21 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 17 Jun 2021 08:44:21 -0700 (PDT) Received-SPF: pass (google.com: domain of thomas.haemmerle@leica-geosystems.com designates 40.107.20.123 as permitted sender) client-ip=40.107.20.123; ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=VWJ1x2pCs+XbAnH+hZLyE5EgmvtiTHFIcwqlNlfywwxHCMAv0UETxh246BTrZ2z6PQL9qNlGcPVfr+jNXGsM2IPxs4RVs4yjWmivko3gPvJOjNBizQL0QeXINbSf5ohbEaO/l8WtbZt3JK4lbiE/Ps2awBHkcXZ0VPDJS+FKlFT+36PVOgoJKPxVXnBHPN3bo7xhpF5RATSCGzrA298Sk0aRnOpmnQ33C45LJKSdlJ+hpYKBh9Pp09e0pT/FVlshLTya9C1GErJRoVN3UZ72d4EMMzSJ+Omx+nLJOaOGkQiSXMhYVl/daPB7iAdHCQ+Mi61Vga5x/SlltrudyZZsCw== 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:X-MS-Exchange-SenderADCheck; bh=ZdoCNw6UCAymdVXLe7iRHiutXDyVoJXzk52O4415zaw=; b=E7eDi3lfsEnMtYdQ9j22G78CVvSxj1zz057f6qBc5ohTegkdJdBCVzGnEAxscTxe5XY3MQ35QGxsLsX+FfyzC6vxC6xG4KDHbSyCePQt+nmCgcxJJf0OBgz/2Dd9eRVq1HR1MPnMrfyxGzDljE/xfz1NSpjVeFA2QiFyzpuSiMkiUMjqulRLp/5Jdz7huVEjIOoB0PSHUIvSPHtYuhCTkmP0WfC/R4FUcJx6M/lq+nmIl1SHGYujupcqxtomJAXxM/FhEiQPFDMAyvb+GI3Avu2ZqhmuVEKtnQzNXDnIEB5KKk3iu6zMHUQzvFbpj5sGFa6tM0kRJnDfUg5qJBxOmw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 193.8.40.94) smtp.rcpttodomain=googlegroups.com smtp.mailfrom=leica-geosystems.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=leica-geosystems.com; dkim=none (message not signed); arc=none Received: from AM5PR1001CA0043.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:206:15::20) by DBAPR06MB6712.eurprd06.prod.outlook.com (2603:10a6:10:183::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4242.16; Thu, 17 Jun 2021 15:44:20 +0000 Received: from AM5EUR02FT035.eop-EUR02.prod.protection.outlook.com (2603:10a6:206:15:cafe::47) by AM5PR1001CA0043.outlook.office365.com (2603:10a6:206:15::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4242.15 via Frontend Transport; Thu, 17 Jun 2021 15:44:20 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 193.8.40.94) smtp.mailfrom=leica-geosystems.com; googlegroups.com; dkim=none (message not signed) header.d=none;googlegroups.com; dmarc=pass action=none header.from=leica-geosystems.com; Received-SPF: Pass (protection.outlook.com: domain of leica-geosystems.com designates 193.8.40.94 as permitted sender) receiver=protection.outlook.com; client-ip=193.8.40.94; helo=hexagon.com; Received: from hexagon.com (193.8.40.94) by AM5EUR02FT035.mail.protection.outlook.com (10.152.8.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4242.18 via Frontend Transport; Thu, 17 Jun 2021 15:44:19 +0000 Received: from aherlnxbspsrv01.lgs-net.com ([10.60.34.56]) by hexagon.com with Microsoft SMTPSVC(10.0.17763.1697); Thu, 17 Jun 2021 17:44:19 +0200 X-Patchwork-Original-From: "'Thomas Haemmerle' via swupdate" From: Thomas Haemmerle To: swupdate@googlegroups.com Cc: andrey.zhizhikin@leica-geosystems.com, Thomas Haemmerle Subject: [swupdate] [meta-swupdate][PATCH 2/2] Support optional argument for packagedata key in automatic versions Date: Thu, 17 Jun 2021 15:43:46 +0000 Message-Id: <20210617154346.23097-2-thomas.haemmerle@leica-geosystems.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210617154346.23097-1-thomas.haemmerle@leica-geosystems.com> References: <20210617154346.23097-1-thomas.haemmerle@leica-geosystems.com> X-OriginalArrivalTime: 17 Jun 2021 15:44:19.0028 (UTC) FILETIME=[A29B5140:01D7638F] X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: b09a1067-342e-4b65-afed-08d931a6c565 X-MS-TrafficTypeDiagnostic: DBAPR06MB6712: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:556; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 5zOjzqAH+OQVk8jnRWfZBIXgJHuPmbx7NCJ5becdNK6bKJxD8IFsPn26wmp9qAOAbPIlePefe5FyTozF7WnIqejRsLLlfn+oCXnKolo4s/k1mwBv66QZjPbam4qJATACbUp3l6KKzotc2u6QXhK/wy9UkwwguGpdsUFlg34uzZOTl7mPA7fhMviNo7luMF98BS1l0i3cwsHSDLtR95MPKwLLxOipKDQiwBdCKrrJCB9SSD395B5kEW/A5alM01wllBb0Vkh4NkPieQT8NnuWwYsbQCW36sXZuI+KqlCq77zIqTztFwdxCxzfsLnU4v6A+W96CB8j46Nq40Sov0p9TBeCel58Fk0eS8C64RPRptX2Ll4YaLRQLhW0KKnOgAnyeHoVBs2RO2//heGNDhjqCmOOOYOIegFXj5TGrIrU75Auf7kZBS4f7NDwuQL7xQSSbAkJWL8NtxQykKR5UmbIWYiGxq3uQTOZdN0RRkkxTS0e9UvvOrfmRn11RjPVWIcCA7IWc+2QZnILDEwftZrqI8gHVq1fWEeBg7z32afKh1rIZ7NVcHCGANLu5//xejjsg9YW0lUT2r0uDkcJkYez2N1fBs+tYNgBKScmHrSzMs5pNckmHGgruIQ18xMDqJpP+FdkeHsF2y2thQA+xBeEe6dUlcd52FYj15KkZrNVAJ/mQDsvXA9k8J+dB3RCQARi X-Forefront-Antispam-Report: CIP:193.8.40.94;CTRY:CH;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:hexagon.com;PTR:ahersrvdom50.leica-geosystems.com;CAT:NONE;SFS:(4636009)(346002)(39860400002)(396003)(376002)(136003)(36840700001)(46966006)(356005)(1076003)(70586007)(26005)(44832011)(2906002)(8936002)(2616005)(4326008)(478600001)(6916009)(186003)(83380400001)(8676002)(36860700001)(336012)(81166007)(82740400003)(316002)(107886003)(70206006)(34020700004)(6666004)(86362001)(82310400003)(5660300002)(36756003)(47076005);DIR:OUT;SFP:1102; X-OriginatorOrg: leica-geosystems.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Jun 2021 15:44:19.5403 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: b09a1067-342e-4b65-afed-08d931a6c565 X-MS-Exchange-CrossTenant-Id: 1b16ab3e-b8f6-4fe3-9f3e-2db7fe549f6a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=1b16ab3e-b8f6-4fe3-9f3e-2db7fe549f6a;Ip=[193.8.40.94];Helo=[hexagon.com] X-MS-Exchange-CrossTenant-AuthSource: AM5EUR02FT035.eop-EUR02.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBAPR06MB6712 X-Original-Sender: thomas.haemmerle@leica-geosystems.com X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@leica-geosystems.com header.s=selector1 header.b=eBaLuFfe; arc=pass (i=1 spf=pass spfdomain=leica-geosystems.com dmarc=pass fromdomain=leica-geosystems.com); spf=pass (google.com: domain of thomas.haemmerle@leica-geosystems.com designates 40.107.20.123 as permitted sender) smtp.mailfrom=thomas.haemmerle@leica-geosystems.com; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=leica-geosystems.com X-Original-From: Thomas Haemmerle Reply-To: Thomas Haemmerle 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: , Increase flexibility of automatic versions by adding support for definition of the packagedata key in version tag. Signed-off-by: Thomas Haemmerle --- README | 6 ++++++ classes/swupdate-common.bbclass | 18 ++++++++++++++---- 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/README b/README index 2fbb0fe..a785b72 100644 --- a/README +++ b/README @@ -37,6 +37,12 @@ the file is a container for the real package) you can append the correct package name to the tag: `@SWU_AUTO_VERSION:` +To insert the value of a variable from BitBake's package-data-file different to +`PV` (e.g. `PKGV`) you can append the variable name to the tag: +`@SWU_AUTO_VERSION@` +or +`@SWU_AUTO_VERSION:@` + SWU image signing ------------ diff --git a/classes/swupdate-common.bbclass b/classes/swupdate-common.bbclass index eb3ebd6..8cfd11b 100644 --- a/classes/swupdate-common.bbclass +++ b/classes/swupdate-common.bbclass @@ -100,7 +100,7 @@ def swupdate_expand_auto_versions(d, s, list_for_cpio): def get_package_name(group, file_list): package = None - m = re.search(r"%s:(?P.+?(?=\"))" % (AUTOVERSION_REGEXP), group) + m = re.search(r"%s:(?P.+?(?=[\"@]))" % (AUTOVERSION_REGEXP), group) if m: package = m.group('package') return (package, True) @@ -114,6 +114,12 @@ def swupdate_expand_auto_versions(d, s, list_for_cpio): 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) @@ -127,15 +133,19 @@ def swupdate_expand_auto_versions(d, s, list_for_cpio): pkg_info = os.path.join(d.getVar('PKGDATA_DIR'), 'runtime-reverse', package) pkgdata = oe.packagedata.read_pkgdatafile(pkg_info) - if not "PV" in pkgdata.keys(): - bb.warn("\"PV\" not set for package %s - using \"1.0\"" % (package)) + (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['PV'].split('+')[0] + 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():]