From patchwork Fri Jan 29 11:51:50 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Adler X-Patchwork-Id: 1433269 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::33d; helo=mail-wm1-x33d.google.com; envelope-from=swupdate+bncbclp7i7wwmhrbvpoz6aamgqedtvifqy@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=isTexm/S; dkim-atps=neutral Received: from mail-wm1-x33d.google.com (mail-wm1-x33d.google.com [IPv6:2a00:1450:4864:20::33d]) (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 4DRwjR2VKgz9sWP for ; Fri, 29 Jan 2021 22:54:01 +1100 (AEDT) Received: by mail-wm1-x33d.google.com with SMTP id y9sf3100593wmi.8 for ; Fri, 29 Jan 2021 03:54:01 -0800 (PST) ARC-Seal: i=3; a=rsa-sha256; t=1611921237; cv=pass; d=google.com; s=arc-20160816; b=OvFN+aKlFvLHZ9gKaAa+kSzzkOVCL0/kO00DmDNxWmCfmg3Jf7pNFeXONM3Pi2GkkC rxlQU7XaUd6yEyvmB/6kuPik337zEk3FxKxM9SRLblJhqegxsrogmgUkj3yDYWQ0vWuW GUyiadflgt1W+8TLXgHh8W2oaGzDJ/sfJlCrYddH9yyuoynYu1iOPaKxqzBiS1LLoDVS 0852pcMirUY4aB4oq2MXGA4VKCX66r0uR4Vqk3UK/DcCv+32OGixlquD0cyaggwyD/px 9Co6VFPvBTbR97mpvymCz4c6kedI+C5+P5wfUIuL/P3D3qdLXoLdrN1eFc/zXUw/KppT HHBw== 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:message-id:date :subject:cc:to:from:sender:dkim-signature; bh=dlk4P2rvVdx5+SLAlW8zZpUxJvzB69RKv5zNs3r5jzM=; b=JiOE35UeO7h1zUWU6OmzrVAGYCXL4g0VSAk3hrP001WUW19Aak/YN19FCCDwAyQ8FI Zdivs4F++k73S+QxQStBfMQOtqIMP9xZqXXSX0DTRNaGhGjakfydMqN2Wojx/6gNgtg3 C+Vm0hSlZrN7YmiI5i+FVHuKXZJpnWMkosA0AdNlOBcCWQHOFa/f52S4chQNRz0fYQti 1snw6k95zzkLrCIK+rB4dTLJCJk7810iED/5NSqTGXsgFYVkpxyJt7OgcfQqEU1tjd0i xCV9zKFofXor1gzh83z6TiRt+oY34FVk8LcUBxQV+5VO/xoYLWwCs8CNGShTeMiXjDq4 i5Sg== ARC-Authentication-Results: i=3; gmr-mx.google.com; dkim=pass header.i=@siemens.onmicrosoft.com header.s=selector1-siemens-onmicrosoft-com header.b=NFHp3ZQT; arc=pass (i=1 spf=pass spfdomain=siemens.com dkim=pass dkdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of michael.adler@siemens.com designates 40.107.14.78 as permitted sender) smtp.mailfrom=michael.adler@siemens.com; dmarc=pass (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: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=dlk4P2rvVdx5+SLAlW8zZpUxJvzB69RKv5zNs3r5jzM=; b=isTexm/Sj9dvt3P3cdFQXlRYxmtGpAZO/kD02j28/HV/cV6KzzKjOeQbL87czt2ZyN CGDfhcQNZScy19qAC9f6GxQMY9tUn3+16cvCjTUvOd+77dl6OOaNiCXfFb97Uw3XX+qN z4QZVDdsQNaGGT/0RhHWWwEtwL/0cOgm1fFo6hylIIakjk91lbQP0m2RgSFqYuvUJOkC DeqlYQVhsLRJ5WJjVnJfZZaFy0wgeEGPlfASYY2miWfIzRNpJj8A36o/FVUrxwB7iYoi GaJX9PkvX7/02s2gqf8xefbBM3Pjmxgz1sD0W9V9T/M7jUUXjDU2/IOoKC/Z1Z9OU0fM m0sA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=sender:x-gm-message-state:from:to:cc:subject:date:message-id :mime-version:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:x-spam-checked-in-group:list-post :list-help:list-archive:list-subscribe:list-unsubscribe; bh=dlk4P2rvVdx5+SLAlW8zZpUxJvzB69RKv5zNs3r5jzM=; b=Nz1iPyfoLfTOpJj5p8Lvb75VYnwsOWi3BtZPjxRkIhf0iHVezY/cvDMLbrsPldfs7U gwhjx1SP1QukiH+LrcNpn836KTtdV1IyrYh5y7ozbZiec8RsiivDx/To6MDCgeGgAg4U 0K5MZCypsZGtj6f6umDp8j/Hy1XMzUBUCNeSlCtMGa4c4aUwyZl6lXNwnaQoihkp+g7E KIK6H6vqponbl7kJgyAfvUy2XE6sDfNoT8ChIi/WH2RAT73GbuklcGU9c3okpNRRNcAu gwuXeq4fHNNMTu1rEjgtHDt/2jAqlpmQ7D8dVJdoelOcWWiPm1FbR2+DEar6cKyYacrr BwFA== Sender: swupdate@googlegroups.com X-Gm-Message-State: AOAM533m/vM05EyDTAkDHWNhweTRm42lnpTAuLCgOeT7BJZJ68xG62I4 drbjNN+Cc2+iR2mH4wTY5Rg= X-Google-Smtp-Source: ABdhPJxOuEJ3kfERa3Ds9R9iS74ap/UTLI/bSl3nVPPg3ezP4m5HSb6etrxkHb1PlqJpHBdATlzZfQ== X-Received: by 2002:a7b:c188:: with SMTP id y8mr3291809wmi.173.1611921237232; Fri, 29 Jan 2021 03:53:57 -0800 (PST) X-BeenThere: swupdate@googlegroups.com Received: by 2002:adf:dd41:: with SMTP id u1ls1257215wrm.3.gmail; Fri, 29 Jan 2021 03:53:56 -0800 (PST) X-Received: by 2002:a05:6000:192:: with SMTP id p18mr4076857wrx.69.1611921236415; Fri, 29 Jan 2021 03:53:56 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1611921236; cv=pass; d=google.com; s=arc-20160816; b=dGGkmMCS0XShsLFQiQTpfrsIY1pecjQkZNyyRpJRhTRYQ3ercx0gBhBKm6uXDxrEb5 JReREScNJWij2Mpuan3Ro/HfsrERu1HU2ezBYQhaTvDkqopIQiMGnZkeI/RASzKHDw5j WV7UwjwFX8SjmJ8QplFQXkPkVmSsniyrl+j/VJID1OZoz/v1FuqT2A8Fm/PHHFNVQrpS 1vV4aRQlcyvcZyPtY92oriP1tm+DLj/R+ddz98E5nQiN3UVFHpp6a4puta6jb0MujHof Ec1BAnrOS/vvaUkrCudYszMZHNQksT8y3sA0Bav3bvp2kR5ZHWS1vAp48UQCib0w3WPL SIkQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:content-transfer-encoding:message-id:date:subject:cc :to:from:dkim-signature; bh=C0WrjUOE9xqOCkEu41HZSjk4CtlaR7CcoagmtKl6si0=; b=AKDxb8VRpdNn/ubeIyTc075cI2fuTK48WdYRfB7RNMGCeaQ4Dt9dUcNdSW+h1VinZi HnJO8p3gAOgVLp2bFbJYfC1dnce6VDLwJ1V17nc4VySBOrAKoD4J3Xo7gJ0NNokb1uuE SZZUTK1fY7XMxoXxuIr/T/mfpD8cEdxBloOgQj1WzrIiimcQURG7vUYRlBgQaXkJDg1j iubNRZAZltl2I0c0tn2pmwzN+NP1nzoWo4RkXW/gnqbEiCTZrEbw1Kp/fM5O7i+H9q8y aUYbS3xBN89vETphPSRvQTw2h7o/x+QUuZ671ALGx69M2mFGveLpkLBJANWjHUHvWHda RcBw== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.onmicrosoft.com header.s=selector1-siemens-onmicrosoft-com header.b=NFHp3ZQT; arc=pass (i=1 spf=pass spfdomain=siemens.com dkim=pass dkdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of michael.adler@siemens.com designates 40.107.14.78 as permitted sender) smtp.mailfrom=michael.adler@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-eopbgr140078.outbound.protection.outlook.com. [40.107.14.78]) by gmr-mx.google.com with ESMTPS id z188si621165wmc.1.2021.01.29.03.53.56 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 29 Jan 2021 03:53:56 -0800 (PST) Received-SPF: pass (google.com: domain of michael.adler@siemens.com designates 40.107.14.78 as permitted sender) client-ip=40.107.14.78; ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=oghS+zr0skWBvHXyM708TT4wyN1S+b0/MFiOodMU0I1UlgYHEQeMCyZH/d5xFrByyjmnJI/t/btm51YdqbB7MEqOU6RURFxe2gaUCjqTETaGadGG0luVDixrMacRWKvgmwPFB/3hwfK5dlF0DEKa8ptdGJInUlBDlXUKmjsKlE9OxNcaaM9kBmnCBwaCXgIt3P3vIhQx1tXj0DjCOG1DtbVPgwrph7TtylxB3v10VkiiA130KweNb+OPCs9+nVarWrSwFzI0z5jjaj5zQGM9JHDMuQpaKeUlunAs1oMUm5EtUu6pC2uKRS+wfWyRb1EOknEGuaRl4GKflVec1jK2gw== 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=C0WrjUOE9xqOCkEu41HZSjk4CtlaR7CcoagmtKl6si0=; b=htEckuVfVH31yefNqsQoQEQQLJ+u40t82SKk6JIRFJ6KZpUJqVrxjbqYH0ce/IVx6SSmzV5Isq4IcqMoXe8lgDIzYT/QqaTqd6zrZIe03X94TMEMeSf3rVrIZz4LlREyfX2dQzIEvnkZtlKt+2iNhGE00dB099H1FY/yw91hY62Zf2pXU7p2/FbX2H3wdgJxOr5mf3mrsRvSoSkDrAdHy+sJNgTAoe5IvW7BBAcfzSptgN26ec5QslBC2t2ZA/ro+nnuraAn5cEv5CHT6fSuRfnj21/3o5yCUIeBldm31TJIlj2XCtE3SUrq7Qwns7EnKWqhz0Q1IKyIfK3vuBo4Jg== 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 AM4PR1001MB1348.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:200:91::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3805.19; Fri, 29 Jan 2021 11:53:55 +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; Fri, 29 Jan 2021 11:53:55 +0000 From: Michael Adler To: swupdate@googlegroups.com Cc: Michael Adler Subject: [swupdate] [PATCH v2 0/5] Overhaul swupdate.cfg handling Date: Fri, 29 Jan 2021 12:51:50 +0100 Message-Id: <20210129115155.13116-1-michael.adler@siemens.com> X-Mailer: git-send-email 2.30.0 X-Originating-IP: [93.104.94.155] X-ClientProxiedBy: AM4PR0101CA0069.eurprd01.prod.exchangelabs.com (2603:10a6:200:41::37) 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.94.155) by AM4PR0101CA0069.eurprd01.prod.exchangelabs.com (2603:10a6:200:41::37) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3805.17 via Frontend Transport; Fri, 29 Jan 2021 11:53:55 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: f0195823-190b-4318-b6a6-08d8c44c8dfe X-MS-TrafficTypeDiagnostic: AM4PR1001MB1348: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:7691; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: g5y85cBMpCNOmxFpzIE0aUetlySprR+LXANUh0g0/R/yI5QEf0YTkywO3Hg5MEmPb5s7XxKbQYqTcvPOEgTCKo8TA8xVoh7U3AM0efa5LEAqrairKLikkcoDeP74nJC4IyLnJGjkRdrBjvw0HPt4rz83BBDYydcx9tot/sDkXQq+3VtpPS+r8J9kmZfyWCUAO9pExtfci6l+UsHDwWLaLViFrOIk13qDBYUV6GZni9mi3V10liZUol1Q0S+YBirZeAjxQg0UKk+qwPS48eZHoPxWeKUFN8BjHUglBHuuTdxC9bZ5VYKhOvM3frq4wi0zt0SEUDDB6Wm2KfQmJXjXhiGeXXv+iP6iYprC60e544fS32WiWjZCD6pLjRR8H7q7pdxtGikawuWWsYcD8zcuAMzgsPvPiVxetPHwX/xsg3eU3ws407u6G/KOtdYz3Mo+//+6fFBs6T9QhEiMvjU3Nfaf4sOJSOqEVfFrg3BGp+KEK0LaZGU+lwWat7UJ1TfJQbQoTMk0o1zwb9Ik1Y2QPg== 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)(346002)(376002)(396003)(366004)(136003)(39860400002)(44832011)(8936002)(107886003)(6486002)(2906002)(956004)(6666004)(26005)(1076003)(2616005)(16526019)(186003)(316002)(6916009)(4326008)(478600001)(6496006)(8676002)(66476007)(66946007)(5660300002)(83380400001)(86362001)(36756003)(66556008);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData: LdxYFYpk3jgIRs5kX+Eza5UErXGufRGRAJxRoBJXn+BhzY0AfdrULLja/1PjKVYAmSm9Lps+rQJiiA7lppAW6xS/Ru+fYQ0DDs6Qef309oDSLBHoVaci+otYC6CulECrgvNs35IQQUH/yuZiRIHKBqOj6J6XuyUPQjijv9SqW4RuFG4KYlXTEleeAvOzjHAKjukiViafhwGO80znsue+V/btifiyH6dSekHLsIb6Um8LDDvTAHbPdNgdJYW6td9DRpXAdH3/FGArchK4ykBjAdS0Jf6S5V1Eu6A3pFKQa8DyMx6bBYba6J9GgPDrgmkaYTCA/kzoOo47+0YpmCASyGadxQSJXoDMNifwjzdA0c5l0lXSG+OV01qYcgRdo7S3IhGvJmUWIsx2rCb6sqSqn31oHiVXNZoz8sbAjB2kDJgsD/JDqVWCR44hdMNwkrRb+BAEGeurDwsvk2Eh939JLlmu0UFUuU7F504rG7QzlLLYQcUPgASziY5OWZx241kb+bN/JoUCcQnmt4w2f6JwRrHUU1eD7ELuFDreYor6IbBBeVC1M7Fm1/6gZ3DWFR64q4LWMzcsO1Cg5i/Sk2pG5BW5p05+qoDWNqwOFa5LWE1zl7tLGD7eaOkncc0DdRu/SwcgKydbTi5hu667ij7Oj3CpUCwsWAgYDi948d4xns1sq6VD+M2t9zfbtZTDNuL9ouPkI/Z+bOZIoSqO5ajwTbWuqfMr33PxI/obWwlWyh307b2SZSPE9vUMWm0JqeuId4I784fqP9iAO2C8HZsGRrdJ/94l8v38/kkUkzUZlvZkZ+g4WYXHtLt4Tf1SL9Ma6Jo7oZhBzXaFKZMMVfmFsdAWdrdtz1/8mP8EN8NU+GqCykEi5XjBZgrQdJTJQW+pYmnEFwWiy2Dpigpa5xiw9paYWQZoeiv1OFnO8/6jghdemv9iNHsfF3Nkhjcpiwjw+v3Wb3G/o4NfolQcPCaNC25/COHfYSp2C0zQLYobP+EcJT022ZYhFmSF1c5pPiRSl37tRpGzNdKuSERJlttntLNleWZwEdVm+9RN2q80KOwIka0mu5YVaOWBMVkRkzQ2 X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-Network-Message-Id: f0195823-190b-4318-b6a6-08d8c44c8dfe X-MS-Exchange-CrossTenant-AuthSource: AM0PR10MB2322.EURPRD10.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Jan 2021 11:53:55.3782 (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: GnBqszbMlrsiKCUtZHBQbC4qCff21wAJ5XKl9gZ1hyTBdLiI+6tip73+Ov4EdD23bC7kWmft+kcrTMMMyF/a871YP+kAO0Y9m8NmxRcuMwQ= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM4PR1001MB1348 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=NFHp3ZQT; arc=pass (i=1 spf=pass spfdomain=siemens.com dkim=pass dkdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of michael.adler@siemens.com designates 40.107.14.78 as permitted sender) smtp.mailfrom=michael.adler@siemens.com; dmarc=pass (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: , Hi, this is v2 of my patch series regarding swupdate.cfg. Changes between v1 and v2 based on Stefano's review comments (thanks!): * Changed comments style (replaced // with /* */) * Changed log levels from TRACE to DEBUG * Only parse image selector if it is present in the configuration file * Merged functions swupdate_cfg_read_module_settings and read_module_settings * Squashed commits regarding new config API * Added some additional documentation for new config API * Re-ordered commits so that previously ACKed patches may be applied already Michael Adler (5): Simplify get_sw_versions Enable tracing for early start up code Added software select to swupdate.cfg globals Config parser: Additional logging Avoid re-opening and reading configuration file core/artifacts_versions.c | 25 ++++------- core/pctl.c | 20 ++++----- core/swupdate.c | 68 +++++++++++++++++++++++------ corelib/downloader.c | 7 ++- corelib/swupdate_settings.c | 52 ++++++++++++++-------- examples/configuration/swupdate.cfg | 2 + include/parselib.h | 2 - include/pctl.h | 9 +++- include/swupdate_settings.h | 40 +++++++++++++---- include/util.h | 3 +- mongoose/mongoose_interface.c | 7 ++- parser/parser.c | 2 + suricatta/server_general.c | 10 ++--- suricatta/server_hawkbit.c | 14 +++--- suricatta/suricatta.c | 11 +++-- 15 files changed, 185 insertions(+), 87 deletions(-)