From patchwork Tue Jan 26 13:14:06 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Adler X-Patchwork-Id: 1431672 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::13a; helo=mail-lf1-x13a.google.com; envelope-from=swupdate+bncbclp7i7wwmhrbs5mycaamgqeg4jv5wy@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=NdAsNjX2; dkim-atps=neutral Received: from mail-lf1-x13a.google.com (mail-lf1-x13a.google.com [IPv6:2a00:1450:4864:20::13a]) (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 4DQ6hf6RN8z9sRR for ; Wed, 27 Jan 2021 00:17:04 +1100 (AEDT) Received: by mail-lf1-x13a.google.com with SMTP id v25sf1312615lfp.18 for ; Tue, 26 Jan 2021 05:17:04 -0800 (PST) ARC-Seal: i=3; a=rsa-sha256; t=1611667019; cv=pass; d=google.com; s=arc-20160816; b=aMPRopp2F0ghbKvJ6Oosgnvyzc1z0P8CXD5UwMIRltKHwLGQxQmDExGMh76hbA2MKE 80z7hnoMQZG9kpcUi592LbE2gk85MLqa+MNwJVbOKblpulpQOVvxq04Ty2Gwnwtetd8C 9Oki2FlP3qwWULFEvUt1nv5tteDLQL3L49a7l0n0FQkZU9gdLAwMgql65FiUYFryFFGr 0CeL74hqoxwbchgTHECfOL4rcgNyHvGVrEYqpT4wYrU8u7Mv64B+ugMM6CqbZohnYBnc y4tklitfvm5kcAIiFsmhYKMC5O/eOjFPeqTNlVEIl4iJw/elXNT7gKZv/F7m0lbFuxhM icfA== 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:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:dkim-signature; bh=sxvgdnC4ze4vpsTBdVBrY5mFWKNBcxtc8+uKdLFvm0g=; b=HdrSfg05gpj7YOwsSBSe29cNTuilfH5T5srN01NWYVBSYTLwD1qhiPZn9TeUEQN2Wh 5joJLqLdrgDqYsWiP8oLtxqjUnnXjFm5W9dlBfvZ+VxRW15wOqrEySPZnAoPGaHGscji IepPpzAXEVv3LRqZFvhnoPwfIP0viR+jAQGGvkK7S37K96InUPKD72tPk7Qwl12xQNCQ Kbnqyin4N1Ebwcrv3PzYKvuGVt+6tJILD3QysbAqd651zCY+CqTGHsp6KVvkZ98ib4US z7fj7+anWWe7X9U7kCme1O8W2ZtVRFoRYaNapfuc+nBVQZMd052MTFlqHzkZwWAz/z6h gYqw== ARC-Authentication-Results: i=3; gmr-mx.google.com; dkim=pass header.i=@siemens.onmicrosoft.com header.s=selector1-siemens-onmicrosoft-com header.b=lo8uAIsE; arc=pass (i=1 spf=pass spfdomain=siemens.com dkim=pass dkdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=neutral (google.com: 2a01:111:f400:fe0e::61e is neither permitted nor denied by best guess record for domain of michael.adler@siemens.com) smtp.mailfrom=michael.adler@siemens.com; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=siemens.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20161025; 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=sxvgdnC4ze4vpsTBdVBrY5mFWKNBcxtc8+uKdLFvm0g=; b=NdAsNjX22EquWXCLNvA72dVLTHJBrn4ZMVFzpiJmXzmDVkNMUjYZK5Mvp6T3iY4jKi Uby/XYrV9K0jFS0Tei2xhMRmDEYV1V0FlZMS00S3rsjfbK/CKITeq6z3qxLtF3vULmd9 /c9Wcqdmx94n/dqgvRrUKxB0usikqEFgmXbrn6m285oR7BWP3DVO7bKboPVGbYx/kAP0 bwsKs5ONbjL8W/OmT+qf2oNsvvL4EvoAl55x6Q63NZl6gDqY7tthHUC50TUBi/JxMJnu dFQIn9e8r4Kh3qZhdi2BJ7MfSloSWhfmv4tOor6NW4ItUFd8L3oMsPWgHxmkQ7qZ4DZ0 fvZA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=sender:x-gm-message-state:from:to:cc:subject:date:message-id :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=sxvgdnC4ze4vpsTBdVBrY5mFWKNBcxtc8+uKdLFvm0g=; b=ZwNMhW/qs7AMNAb1diuvw6ojJN3IlCraRGibqLfc3mGMVj20pQ5sdL6yzvimPtpNx4 kEYgHXw5KNV7W8Go0Muz0DpKpUuvGBEgn9Hyksyk40NORRHJj382RvgZcP70F+k3VfJg XTLIph9qGWCTJft+JfFl2QAdsTHA1JEYh4vrUtsOVzCFr5IKUmZ+PEmZ7W9s2xRNpCBV s8Ff5ia80aF6bUE+Lm5EN2/temrvAloKP6AHCe9gQ//pLmJnBtD3kuhTxnKtxvaE5kTN q+ww8u5puqKL/oA/LzMaCHR8TxwMIyHTAbacs6UmALUMQhJR8QCtoppRTXUuQBaykC0w 9GnA== Sender: swupdate@googlegroups.com X-Gm-Message-State: AOAM533pDIZSfnIWG+SRrBpPmGdIPtRrPA4PqpfB9hJp40TQ+XeN7PMT jFfJRnl2VwCIj+bwg9J3DqY= X-Google-Smtp-Source: ABdhPJy0y3gmP00qlSpaTa9f5FJ+6onsT/aDuQBDPbav4ke4agPRA+HkG6F3ORmBXkp0DXNncCEI6w== X-Received: by 2002:a05:6512:3253:: with SMTP id c19mr2560487lfr.245.1611667019718; Tue, 26 Jan 2021 05:16:59 -0800 (PST) X-BeenThere: swupdate@googlegroups.com Received: by 2002:a2e:974c:: with SMTP id f12ls658834ljj.8.gmail; Tue, 26 Jan 2021 05:16:58 -0800 (PST) X-Received: by 2002:a2e:a58f:: with SMTP id m15mr2926382ljp.214.1611667018701; Tue, 26 Jan 2021 05:16:58 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1611667018; cv=pass; d=google.com; s=arc-20160816; b=N2n3iUY4QCwHrkFDDFSwfsGWn16/Y79bzNTj5Yo1Q475fQX/J/Uf+PjF4llZeG86LF 5H4Lq4P9AxdTsq+VM7gGIu/0fwqzC1HvD+42ffZmi3J680RR4qjjJ4EDFWmE+Zi+pEox axpCxZSL2g4HR04RO/1vcDu55EMSNRiqnQbXxhQmSNwownfs3W5ZoIfTcOFeAgWRCy0r tSblHjjf4IR17b3Dab5cEZ7aoob4f2n//Scs+UJLVaWs1EJo4UJUScvVRU91oPY174Fi KPvIPHYjirGR1VcdIdbUO/gn8zRwOrE/FGMvEr02ZiMs9JmbbRNHZOrvrtZ9GmISnkWt rRHw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:content-transfer-encoding:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=bLaLACg+i1XgSfzHx7gP8auap5712nymgSxiGp81oVw=; b=OCqpTcCkAxYKueOoCkWwZ0Fh65qaH5Q+YV8suaMVhPTB57OCj67WJQWkfrvnfeOUf7 a33s6xBJsPgnnM19SYjFMJ3L9ujWpnfZIbaAunaVRqSj7yvewwdm/fk5zB1RNBFM/88g GNy9FnTqFjHUqAkgNkaWDNFAVzcc08XtwBjl0vFQMmA1uPVX4QqgD4lm6QmgHWoJAPX7 NF7o1MzbhcWztgq/RBd7ozs+ejH8fdSq2cnHSCk4ghZG2DMJ12DCyfr2r9dM38PmbjaX BFzMATfXnTAnvBq6kyVsrGNQfjX8613tiiwjIZbByUsWRFbgkSM3TWPITT8tFTQ05K/H rUzQ== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.onmicrosoft.com header.s=selector1-siemens-onmicrosoft-com header.b=lo8uAIsE; arc=pass (i=1 spf=pass spfdomain=siemens.com dkim=pass dkdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=neutral (google.com: 2a01:111:f400:fe0e::61e is neither permitted nor denied by best guess record for domain of michael.adler@siemens.com) smtp.mailfrom=michael.adler@siemens.com; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-vi1eur04on061e.outbound.protection.outlook.com. [2a01:111:f400:fe0e::61e]) by gmr-mx.google.com with ESMTPS id l22si501289ljh.4.2021.01.26.05.16.58 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 26 Jan 2021 05:16:58 -0800 (PST) Received-SPF: neutral (google.com: 2a01:111:f400:fe0e::61e is neither permitted nor denied by best guess record for domain of michael.adler@siemens.com) client-ip=2a01:111:f400:fe0e::61e; ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=GySYswYhqLyD7bzr2UdZVx/i6KmT5QYRa2B+vl+gbsyyaiz5eJyHyePHmfgscIj8PkvWyPAgVvhtdPX70dRIglo/kgy08KdenRvvach4WOkSRK9NJdBWawafo16kO8d9GLZK/1+xwRXSe6ITJFHyrC0V89nFEr/pZC1FzNtFQyxWakvTw0nUvqwnwVAw5FPtS0OjBmfV0fbSdtEKptp1dfk31ta6wlR64Hlz0lAtIgxHFXPkEA2eYwoVCpl1qgpfh/ATRLFA00UvH9GNWWs2t31rEp7gzCmG9dIXiErBO5LwQwvIUg13d1WtFeZHbU2IuEszevs7gBIBAdciJtdTcQ== 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=bLaLACg+i1XgSfzHx7gP8auap5712nymgSxiGp81oVw=; b=h2gvJkcLJ4e57Rj4gNOq5lUlnqc6q70/UXi3aYaYGB4kC49X+huVD0efkp7GXB1XL/p8SP2JWNbpC3lGaAPr4FbEY8PlAAcHQgKnq4+ZAaasQ03eV8qSvtDjz5V4PLOXklyTr8V7vYEkfD10kYp/ZBturRIGfizwdopCfKCdCoowR9dyHPRhmkObKbKl0246spOIdKMZfXyVS/JQQ4WonyGodvsIvscjkMdv1ataKMdqiOCpJWQM5cjQDPtIISGPJSUyRbIlOYxD7/3G3yB7zvpVmli/x0NMX9JXxaQCens8KFKxvORMwBcPCiVri8BAlAcKR/IqVon8PxiIw+rJsg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=siemens.com; dmarc=pass action=none header.from=siemens.com; dkim=pass header.d=siemens.com; arc=none Received: from AM0PR10MB2322.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:208:d7::22) by AM0PR10MB3603.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:156::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3784.17; Tue, 26 Jan 2021 13:16:57 +0000 Received: from AM0PR10MB2322.EURPRD10.PROD.OUTLOOK.COM ([fe80::2838:c46a:e3fe:2c7a]) by AM0PR10MB2322.EURPRD10.PROD.OUTLOOK.COM ([fe80::2838:c46a:e3fe:2c7a%4]) with mapi id 15.20.3784.019; Tue, 26 Jan 2021 13:16:57 +0000 From: Michael Adler To: swupdate@googlegroups.com Cc: Michael Adler , Christian Storm Subject: [swupdate] [PATCH 3/9] Added software select to swupdate.cfg globals Date: Tue, 26 Jan 2021 14:14:06 +0100 Message-Id: <20210126131412.3567-4-michael.adler@siemens.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20210126131412.3567-1-michael.adler@siemens.com> References: <20210126131412.3567-1-michael.adler@siemens.com> X-Originating-IP: [93.104.69.78] X-ClientProxiedBy: AM0P190CA0020.EURP190.PROD.OUTLOOK.COM (2603:10a6:208:190::30) To AM0PR10MB2322.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:208:d7::22) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost (93.104.69.78) by AM0P190CA0020.EURP190.PROD.OUTLOOK.COM (2603:10a6:208:190::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3784.12 via Frontend Transport; Tue, 26 Jan 2021 13:16:56 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: aeec0e60-0b40-498d-ed3f-08d8c1fca812 X-MS-TrafficTypeDiagnostic: AM0PR10MB3603: X-LD-Processed: 38ae3bcd-9579-4fd4-adda-b42e1495d55a,ExtAddr X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:326; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: QB8TS11PLtOkqdXN91u4MlgyBCxRGZMct7fILBAYi3JfLcVFEIGdtGSRmu8j8vhW6OTx2fC8sLzoiaZua5SPeZ5lkpPkmDRWB+z2SRC0e40Spw1BBDf6U7D+STTzomuZGN/V9sP5xc/CDxef4UDtymCDzSzKbAGwzIrWPeoPmG0rVRlCFnOCbOCUD/jbnDOvmkcE7FOph/PEHfI1aGbSJtOGeDUQ1X4+dXiWD6TsH1DQmlI21d1z7QmB3KbgE5tK7PFJ1g2rQuDRj0Wk4JJtzZ3/xd/sxo6SUfXCD5n+WS4pBH1oWr4D51zwV8OR8q65brMni4SeE5GJdcI8KeUQ++AGEWUMfQqltNbzfogmTOmp8vXSjgPD2mo2jdeANO/ZbqkvWJ1ijZ5Rq7LazwwBRA== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AM0PR10MB2322.EURPRD10.PROD.OUTLOOK.COM;PTR:;CAT:NONE;SFS:(4636009)(39860400002)(136003)(376002)(396003)(346002)(366004)(54906003)(8676002)(66476007)(316002)(6486002)(6916009)(36756003)(6666004)(8936002)(83380400001)(66946007)(478600001)(86362001)(6496006)(44832011)(186003)(4326008)(956004)(2616005)(2906002)(107886003)(1076003)(16526019)(26005)(66556008)(5660300002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData: Vf4G9cg8yB5lWodpmuNmNHLtdP0VPBtmILykXouKZyGaFkAZ0n4G2CLUCGsIXCEpYk5S4BuAaxL9AFe5OH9WN72EYuwfcNJ/HGbXIOBGZAhlPYpaDpKkA3nqOaAax6lzjtGrkuDe3zZO6TLQY65JBijji7sIxR0Bgns/t8BqRCVpjCqgPJyH8zZxI2aJ7R10w1sxYCYGGElNbZoLKt8Kgz9aBH2+Dyok9G7xCr+fMPyG6NYYTg+HL3GkEQw1Oo7LogS190+mNUK0U1e/nTCZJa9j5vuo5gwSDamkohbiV3YOXLbmn+qw9fVsE7zkL+pfGk1xtLHCK+FOCJZ2UwWxa9B7zp/3uqZFfPlmg7hlyNGb1f0w9bfctoDw6DBLKz7X5aFjC19vd5/7XCgz9K7eCN/ptUKbJYsl5SjZRiHVvo71NCz4Fa1K/IarCkpWed9HXWICwfs4u+lZpbo3JxYsr+KCmnWLpPTD4MM8Nx7Q9O5B5tnuG/n/dcnOyzrrrg9St+oVEkEtEVkxj0zQhnfhKglEHSk8x/RvuRlbsdM2cIBY5KveUfCL9fUN6bw6kraOcRc+LvlrobGBteGhO3trlUFNB7+C6XHPv4NlITYSoy1JU0OafRCubHlW7554UYTI5Ctdtlt5bHTkXmiHMNjVxytDE8SogM+0350R51S/Q4XVnW5N5H/xnQqiwXGrmXagiTC0Mgu/7SOwY0ncarTgo1IwcuW+rFS+5+0DcerbhkwNf5/I12TWYtJFsVthpHdUAfuvBQuek1FSUcuTZj6A3UpxaOyLlLPU+2InnQeaZ+cIKZftQpAhT1KB2NSJdPOWaJdih8kH+dnBK1pY4M0uDVbItkHtRJomDppGmzKcyy2MVJN4HqIOZSS246gZxX2tfa8blBVBwYnL9x43lWjbguhFEp1wwlGQo31iQfNqe3Z9MWulOZ8WjFJKNKo1LEBZ9hZGPq7suC+7xWC3xX0TnfmKZMyZWWnoEzbn0iwAwO5jgCjapXUZzcVcn/f/QdbLpF/jH/cWmHxhMbk3AhPt7oFvF+4Y3tGHn7bUzeyOUsStBlKfdczUa8+1xk1uBlKm X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-Network-Message-Id: aeec0e60-0b40-498d-ed3f-08d8c1fca812 X-MS-Exchange-CrossTenant-AuthSource: AM0PR10MB2322.EURPRD10.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Jan 2021 13:16:57.0686 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 38ae3bcd-9579-4fd4-adda-b42e1495d55a X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: okym14ZMmt1uuISVmxFwo6dcRTaueaM/oapEVVn4Uinc5JxpwCl8foUTOiyxCVyJrh7iowVIVdfW7sf2NpGwAqzrh+rdChIeyLvuhBa//Oo= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR10MB3603 X-Original-Sender: Michael.Adler@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.onmicrosoft.com header.s=selector1-siemens-onmicrosoft-com header.b=lo8uAIsE; arc=pass (i=1 spf=pass spfdomain=siemens.com dkim=pass dkdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=neutral (google.com: 2a01:111:f400:fe0e::61e is neither permitted nor denied by best guess record for domain of michael.adler@siemens.com) smtp.mailfrom=michael.adler@siemens.com; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=siemens.com Precedence: list Mailing-list: list swupdate@googlegroups.com; contact swupdate+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: swupdate@googlegroups.com X-Google-Group-Id: 605343134186 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , Previously, this option could only be specified using command-line arguments or via the IPC interface. Signed-off-by: Michael Adler Signed-off-by: Christian Storm --- core/swupdate.c | 12 +++++++++++- examples/configuration/swupdate.cfg | 2 ++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/core/swupdate.c b/core/swupdate.c index 788981e..ff3cd16 100644 --- a/core/swupdate.c +++ b/core/swupdate.c @@ -363,6 +363,12 @@ static int read_globals_settings(void *elem, void *data) GET_FIELD_STRING(LIBCFG_PARSER, elem, "forced-signer-name", sw->globals.forced_signer_name); + char software_select[SWUPDATE_GENERAL_STRING_SIZE] = ""; + GET_FIELD_STRING(LIBCFG_PARSER, elem, "select", software_select); + if (parse_image_selector(software_select, sw)) { + return 1; + } + return 0; } @@ -809,8 +815,12 @@ int main(int argc, char **argv) fprintf(stderr, "Error: Incorrect select option format.\n"); exit(EXIT_FAILURE); } + } + + + if (strlen(swcfg.globals.default_software_set) > 0 && strlen(swcfg.globals.default_running_mode) > 0) { INFO("software set: %s mode: %s", swcfg.globals.default_software_set, - swcfg.globals.default_running_mode); + swcfg.globals.default_running_mode); } /* Read sw-versions */ diff --git a/examples/configuration/swupdate.cfg b/examples/configuration/swupdate.cfg index 6fad156..a97f982 100644 --- a/examples/configuration/swupdate.cfg +++ b/examples/configuration/swupdate.cfg @@ -38,6 +38,8 @@ # [emailProtection|codeSigning] (default: emailProtection) # forced-signer-name : string # set expected common name of signer certificate +# select: : string +# select software images set and source (,) globals : {