From patchwork Fri Jun 2 13:20:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Storm, Christian" X-Patchwork-Id: 1789624 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=googlegroups.com (client-ip=2a00:1450:4864:20::13f; helo=mail-lf1-x13f.google.com; envelope-from=swupdate+bncbdd6bwv65qpbbdgz46rqmgqewf5uaiy@googlegroups.com; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=googlegroups.com header.i=@googlegroups.com header.a=rsa-sha256 header.s=20221208 header.b=KcvbEkmL; dkim-atps=neutral Received: from mail-lf1-x13f.google.com (mail-lf1-x13f.google.com [IPv6:2a00:1450:4864:20::13f]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4QXkBm454Bz20Py for ; Fri, 2 Jun 2023 23:20:16 +1000 (AEST) Received: by mail-lf1-x13f.google.com with SMTP id 2adb3069b0e04-4f256ddef3asf1715658e87.2 for ; Fri, 02 Jun 2023 06:20:16 -0700 (PDT) ARC-Seal: i=3; a=rsa-sha256; t=1685712013; cv=pass; d=google.com; s=arc-20160816; b=f8O0pgqH6OPabBeJizGRjlAFKxj5vC9qlzuIBCY3ql3w4TH+87RTQQjvmWR3pQMuGZ Hnr2r+MbcNz093yYxCG4o7wAwgVxtrVrWrdMAdZoSUmFLABBgch5vLBrSh5Qti3W3hLd inRVT/CEQLuNce9/LFAQUSi4qtTycCfPHFL4ivDGcESPRYUonnXhnv5cZrta04bJ5gPX n/ZapkCb16lJcbYgX2uDvmINQjOC9AAKX3rjB5CtFHh5OTNA0wbPX/YmsUhBWtXNn90k /Ik8Gik7tqyVtT4AvroiqrajuwdxjsZIBHDL/M03XNDshD72xYqr+NaJaDnHRWpf/c7P BBLw== 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=pWQmjcLh0gDGidiJ2GWyzICyEuGnwJm6SP9OxcVHCQ4=; b=r+9rnPg0e7vE3QWetVUpvxeLqGrJBAkpTjLA/ODngc1AKNEYuC6rA6JgY6TkPyBVem oEaYfSCG7L28kwwKb7/vqqOP4uzSFJ//JM89lwg7ufuIQWEbHAI0iee21kwkEugLNhXZ Js/4Qda5r8aS4gFQYufse5uha6EevpyKRGO6A1fCdSPMKofcia0AgOxZPPHLCPWWFab/ A3rmco5juF6Q4dnQoeEjmX3NC81KfW5/dRDLa6CHhnUjdOh+2r4Np4vFSzm8A+xYWSWC F2wAsHnfrJu02VDlaNRSYGQt9U3NytvyaYEJXpKElrSL+eUZCFiA2+NJw2xnzAFSgmj7 75yw== ARC-Authentication-Results: i=3; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=SYuDjkSH; 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 christian.storm@siemens.com designates 2a01:111:f400:fe1a::626 as permitted sender) smtp.mailfrom=christian.storm@siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20221208; t=1685712013; x=1688304013; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:reply-to :x-original-authentication-results:x-original-sender:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from:from:to :cc:subject:date:message-id:reply-to; bh=pWQmjcLh0gDGidiJ2GWyzICyEuGnwJm6SP9OxcVHCQ4=; b=KcvbEkmLSA2tEqJszSuYfDOHBjebWp63/7DdZgj3i6M4QdthcciINaqLhqh9dHhy2O OQ/PWfKFN7raMephkUK2KV1Dxu3kx/0osfAIj0YauCq1w6Rlfi9jIfyjLaqHPXGBiI68 Q7ax2RXpdqnTtckl2W6mCFbWK4G4fBtww8Dh42ba82xScUlWWw/fgD0xFqI+FlIwmaUT QK5vgl/RqzkgrweSOcayv2HL7k5YcM7nsvDi8WTMkgWBWt6ydj7nW5T8jiTRSx0F8Fp7 D8qBVmH6OvAPrm6fSPc5wbvcpHjAK0y3fhzW5JjRwbub4cHP1NK/np3ey0tWMaOByLdc kJ6g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685712013; x=1688304013; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence:reply-to :x-original-authentication-results:x-original-sender:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :x-beenthere:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=pWQmjcLh0gDGidiJ2GWyzICyEuGnwJm6SP9OxcVHCQ4=; b=COro5esHk9j6buH2/aJIrWM1FWNNVueBOEgO+8bcMA95QTP08E5euyBxaf8ayfzxT2 YWqXOuxPtD6O43NJGJXBR4zanIIe1XRcgKyIeirvVuSSvUuh9gxHh2jnxcQ/JD2e8zbi JXQOgsrGdlE8oUB6sVXLwsh7fY7C9C9Wh4DhZ3xBMakkmjyVdehvMat20x7luZ/BNi6V zOFU9i5KKqG3BkyXuI+ALFInNb6GNOEyT/n5yuxm/MG/vGciWCJtto7BqO3u1uq5aB51 cDxsiIrZ79fsEbsd4DzAIRPLQGD3izGroerQUSqKmK8rLWeY+BjVNkPXENvDOFtbetZ9 ActA== X-Gm-Message-State: AC+VfDz4YgbVCicyLMFuyfVZVW/9lXJxIR8I4YbEYreMj+y5RaZ5NmBu KDGTGI2G4E4C6EfacfIMbM0= X-Google-Smtp-Source: ACHHUZ6NEIrruy6GziyCfc+uhI08QLw0omPrIKW/s3MQCBB/yKdnhQp7vIF9GZMU5iV8wmo+NfbJyQ== X-Received: by 2002:ac2:485b:0:b0:4f2:7cb1:65fc with SMTP id 27-20020ac2485b000000b004f27cb165fcmr1931090lfy.64.1685712013258; Fri, 02 Jun 2023 06:20:13 -0700 (PDT) X-BeenThere: swupdate@googlegroups.com Received: by 2002:a19:8c11:0:b0:4f1:4c37:e1cc with SMTP id o17-20020a198c11000000b004f14c37e1ccls323681lfd.0.-pod-prod-07-eu; Fri, 02 Jun 2023 06:20:11 -0700 (PDT) X-Received: by 2002:ac2:447b:0:b0:4f0:124:b56b with SMTP id y27-20020ac2447b000000b004f00124b56bmr1863432lfl.7.1685712011603; Fri, 02 Jun 2023 06:20:11 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1685712011; cv=pass; d=google.com; s=arc-20160816; b=xH6Lcm8VQmBADvvl59/PTtDpDW6xdUn7tS5dMsjsoCPFMorkdJWRpob9Dp7+udGgq3 P+sIRnih+cnI114EbtFjsolusCIFlbqlzN1PnAMduaLSV8PVMrJjNoNmWAU/Yp5e48/x E7dxhENMgecsUkUqqPsErWkvH8oiGCpxFEE9imxlCeAGzOpVFWuKAqanyT0gUxfR3Yhv xT/uZgwaJjjGhHmb32UcOvb+e17DsrghbcsmAuovZGrdu2kaGJwu3lSBr0zCAIobI/wT 7g+6MCRy3dere/He/6X0D+zzGl0RNATANXL8JSH8XAZw7nonAR98XyYDF8MoSLjZBauB hV0Q== 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=i88hEps+cUEIxsCvHXjohbKNbr9k7e/6C7DWQaXhzuY=; b=vjInjGtpKW437BBneYNCHXm/BbVbhR9HHjjgiPu9ybbc0X7kaMC22Lg6BjocsF9rGe ValnG1DEIgyiSMOa5AXnO4mTPDBbULKH60NSIolFaglLN//g9UAoAnmifq5vAUE8XrkL EBV+nlZeho9rU0n1EPWGoLZrzNAHGOYCtj6Hc1LnQt2B4PRdEo5VoKTj+3u/VEl1moSg PqdrKo6j+uBvY0dxeiQGpX/96gWZHkl/7fGoiCwijSuDGTGeWuQjt/jHSR/bytRoGFIV x4tRTAQqCtqPP5+t9dDv/AiYQn7eTHSc1XGcXSvG24/WhyG1uBifo+RG2dBP3WU6x3WI Dixg== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=SYuDjkSH; 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 christian.storm@siemens.com designates 2a01:111:f400:fe1a::626 as permitted sender) smtp.mailfrom=christian.storm@siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Received: from EUR03-DBA-obe.outbound.protection.outlook.com (mail-dbaeur03on20626.outbound.protection.outlook.com. [2a01:111:f400:fe1a::626]) by gmr-mx.google.com with ESMTPS id e1-20020a195001000000b004f3a8f89761si160890lfb.11.2023.06.02.06.20.11 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 02 Jun 2023 06:20:11 -0700 (PDT) Received-SPF: pass (google.com: domain of christian.storm@siemens.com designates 2a01:111:f400:fe1a::626 as permitted sender) client-ip=2a01:111:f400:fe1a::626; ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=krA+AoXkFC5pOnjcnmqVkeCIX2ezcAbYvQefOP1RwmLPvSOdkhfW0DRgqadgAwTHWzcfZ2ePNBOS6p/qTl5WUBMBdSXfPCMIfKTyXk+qj3UB4UIJMD9Ee/f0opVC6mhyyzU4Vu38SwJ0jCd2Um2c5N9hjHCF4dsAZ5XNm2KFWxF6/XKl717KFC0XDU4D+/2iiQgSHcmZ+IXOLEtSWqvHOo52IY59LPozdybrKonPXIWaKbTl7qqtYPV5EbREVam7xT9ULA5PMDvA3Q3HUQHS0Iy1YqMKo6UNVlbxGrn5emUz0uKYZ7HVxKC8tNnO/Bl5yRX+QTexRqsIRQ2pR4ndzA== 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-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=i88hEps+cUEIxsCvHXjohbKNbr9k7e/6C7DWQaXhzuY=; b=gADhUa1bbzDHjNt/+GJgCjtW/E3PFdENNOMEMyiOrSyCW5wPJu0u6tv36zHK1vHdRPlJoFES5HewCBV+bcwTdyaKKtcmz0gtMvHHtW2pffavTU4bSGIUK5Dfj78XMiDnvO0YxnyDkRok6qCYIft60tAcBsY1PWzTk2TqMKfG7MOI1KNIrVoMr3Wz9LtPv4qg1lUIc1jSw1lo5CwsZwwaqevL9Dsvvvmq2v1ToB2stM1Dp6qdunGsu+ZT/ShGo4koKIVBfMbEtpbyq9bM7BWw0sHeB8+5PO0qNGLVH9WfvG7YgEGSfRr7CpFpswyCnsj9GFPJGGyzJeB/KtJTgUhvFQ== 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 DB9PR10MB5404.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:10:333::17) by GVXPR10MB5887.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:150:6::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6455.23; Fri, 2 Jun 2023 13:20:09 +0000 Received: from DB9PR10MB5404.EURPRD10.PROD.OUTLOOK.COM ([fe80::6bed:3b93:4756:c9f3]) by DB9PR10MB5404.EURPRD10.PROD.OUTLOOK.COM ([fe80::6bed:3b93:4756:c9f3%6]) with mapi id 15.20.6433.025; Fri, 2 Jun 2023 13:20:09 +0000 X-Patchwork-Original-From: "'Christian Storm' via swupdate" From: "Storm, Christian" To: swupdate@googlegroups.com Cc: Christian Storm Subject: [swupdate] [PATCH 5/5] tools/swupdate-progress: Adapt for wfx Date: Fri, 2 Jun 2023 15:20:22 +0200 Message-Id: <20230602132022.70931-5-christian.storm@siemens.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230602132022.70931-1-christian.storm@siemens.com> References: <20230602132022.70931-1-christian.storm@siemens.com> X-ClientProxiedBy: FR3P281CA0145.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:95::8) To DB9PR10MB5404.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:10:333::17) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DB9PR10MB5404:EE_|GVXPR10MB5887:EE_ X-MS-Office365-Filtering-Correlation-Id: e68050c0-5346-46f1-ef8b-08db636c16f0 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: OhMzN8zTx+fwEeK70ucsO060qeZgxewM0ot7+S+meV/dxGWSCDCIiWerdxBjdr6uip0IAAnjxtFEgz+y9o0wCVWw7OARzfRwmctK+yETcZpFZgE44MekhXkzAzhVWm1AfJXKk94XekO8WjeiHXaFMMpGUdX1U9B5eEz8kme0zrs3jriMZcJXnXlQ2Actes/yk54P6Q+zdDybf7x9Gtvg4eGvICnV9m2feOsrBP4PKIksj5OG8t8NgTCAkGLv64XNeBbU5gDdI+9S8Zc6PYwCRkEGwRZ1ThYkVHDgIan5ZS5H1vy0cJprLgfbNuLgCxEggPfLkRc1Q1yhuufUNjMyAChy2IR+n/TbIEJ8HN0WA383iYRLEp8xv/De8rURlvt/KuchnOGbQ9B64WYWN34QpyLmgCbK8l9EspGxN80uAwKicngmeRWVrEoW3GhoX9HOaLjIBU+xmoQSbuBjvIWuGna1F8G9l8WwbgC2WBYuZyrEtF/AXUJtxugk6bfjNoB9lLZG97z50RBlhCFHGB19yYqOL0JXMVykGMg6HfaSNwTR/LeimkeSW1n+9W/KTJ4h X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DB9PR10MB5404.EURPRD10.PROD.OUTLOOK.COM;PTR:;CAT:NONE;SFS:(13230028)(4636009)(39860400002)(376002)(136003)(346002)(366004)(396003)(451199021)(6486002)(478600001)(6666004)(83380400001)(186003)(36756003)(6512007)(2616005)(38100700002)(6506007)(86362001)(82960400001)(107886003)(1076003)(316002)(4326008)(41300700001)(66476007)(6916009)(66556008)(66946007)(44832011)(5660300002)(8676002)(8936002)(2906002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 7zvR63Uf9VwsUKivge7dScDFspq16NKveSbNiYigk4laT3CD3SJ1Hv2U6XFcX19Iz55Si9CGyNwBJie3H72MktXTuXYD4BwkA1cr16Ktr5zTTi+b0ce1nZc+SyJWD6DouqbrTpaWJB5B8VU3c/hhNNJAZG4/PbCf9XNU3BLjpCheRGgLFZN7MHHHlpTlhL1go/WQhOS/CDIvhfLJCb/7tBAfv7oN2RvYt/ihpOMh6Z1w+IDrVuDFXlQzkF5dKCVApJ9frmPT7ALOoH3jxRFnJ0WLStyZyeOv3VKqWuUBJ/7dqGF1Y+YnAuA+XLWZEB5IMooJCU6hnhJCheARt6BfXW5HRbCLCBA5208zyl/I9CuPVfOfc7jbGmt9Ylh4nRpG7Wbs2MoNRgou3AULyVWpGrI/FBZ+IFqJFgsg82iP50GzKKmFfbsE7YbItKgfZfymmHOcFyBHwP2JSHnm5wiVgUCuZgjv4q0RcrXDuPJwCNhLKaqR3b7fObNNFDFXB24odf0uSFUY+55X8+FcbKcXJEIZ/qXCfPzVIxPUTbl3klzg42BctYCvczIYPxh9pzzBggk3YfbRCQhLvwHNyLoLhXbiGApyBxHxptdnqj3x9R6Rv8TBNnP26z1bmEqhrEx+uTWdZumCpbuksIY78cSjTc7bdBpJdNJoW6k9dXXyODyh8c0Crnfz5OstaNktGMMWc5UumkfmamRLSKsy16+eVW4HFsoRFj3KtIBzDXRRi3VNCkosDFAczTsUx+bJYDmV2FzU21oMCUFDjfOEQcgI22WYwfsw5m05jlEqpnJkgf7CU7Eox347N0SYCpWbe+qcgvNqj/kVhh9A4T4XQRk6xU9Rlex0cnO0W7Ji6zQM/csoRxj4OCLFITZnUpfgIIxkn9uOTQL9rSVfiB5vQdi6+kdp1UmEMKSAPxFHDSjhc2lM9aOHONdhVYWRvOU59a3AiPeE6r6pl3IAiUd+L98IrjnnSlaZDnUGlTFNrryctPLpEncxHDIoC6dyMH0iabW3UNKXn1nRmji/nJLrk7/emR36HBVThZPuPTlFp9hHLHMT9AdF5q14vQ/Ue20kgUEbXae5gTiE9b70Qr4CYdSaUyuYmxtLMvmS+4BmNx8uHuC/4XyRiDIVClH3jm889o37JhE9ZPF++8DTAaMg0ouqW1uKrTLb58mSdee9nz/n0GvxOHgJoGQ2EChFm1mKyE57cUohauDoxY8sZ127EXcad2N5o1GXYqW3zikgiTYlieo+qWqlpvpDByNDAW8jxxobP96nDcIVNt7gH+HpNU+/JgTDyl4UbklJp5w1FtcL7GzNxN38De1BEJ+4MTYImfURlfGvC2Vq5OgXs2ZZ/TQtjOZVERjAhsJo+dNjROY60dlaTFX0vaQKpDsp4lSs1Smst8Qn4z/GDT+auXkTE26Gh/tQfAB4JuLLeIeeP+1R/ufsx2o25gNm7a69qQfbtdfubATf5jImIr3ghs8hseWgVUzvGAGql2OZYTplwfdJdTmrahmw25c9qNzBy4vis0zCF369ovqp18wNumTTuz9QT3qS8Jq+6Y8cOC3kKh75ZClATdQVQLeyTULYlxj+lsCwa+BeWReJ7DXN2QTB72GtICQsMA/T/+YjAHKrqtDczB9xHsLgUtUVlHI9W26BMzz+KKnom/igDLh8svTRJWH/Xw== X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-Network-Message-Id: e68050c0-5346-46f1-ef8b-08db636c16f0 X-MS-Exchange-CrossTenant-AuthSource: DB9PR10MB5404.EURPRD10.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Jun 2023 13:20:09.7011 (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: GndcKoeY/MrxAcnhCfmUoJUuy5pMFjPWQ8HO+GPSEoZ+VYDPqDVctcmpGviTAgig+LOW3XyRe2SKffUxKcueBb3ae4MUGl3P6X9GfFGiMes= X-MS-Exchange-Transport-CrossTenantHeadersStamped: GVXPR10MB5887 X-Original-Sender: christian.storm@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=SYuDjkSH; 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 christian.storm@siemens.com designates 2a01:111:f400:fe1a::626 as permitted sender) smtp.mailfrom=christian.storm@siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com X-Original-From: Christian Storm Reply-To: Christian Storm 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: , wfx workflows do have an activation step after SWUpdate has installed the update, hence defer actions until activation is ordered by wfx. Signed-off-by: Christian Storm --- tools/swupdate-progress.c | 75 +++++++++++++++++++++++++++++---------- 1 file changed, 57 insertions(+), 18 deletions(-) diff --git a/tools/swupdate-progress.c b/tools/swupdate-progress.c index 72da5044..cba497a7 100644 --- a/tools/swupdate-progress.c +++ b/tools/swupdate-progress.c @@ -190,6 +190,31 @@ static void fill_progress_bar(char *bar, size_t size, unsigned int percent) memset(&bar[filled_len], '-', remain); } +static void reboot_device(void) +{ + sleep(5); + sync(); + if (reboot(LINUX_REBOOT_CMD_RESTART) < 0) { /* Should never happen. */ + fprintf(stdout, "Please reset the board.\n"); + } +} + +static void run_post_script(char *script, struct progress_msg *msg) +{ + char *cmd; + if (asprintf(&cmd, "%s %s", script, + msg->status == SUCCESS ? + "SUCCESS" : "FAILURE") == -1) { + fprintf(stderr, "OOM calling post-exec script\n"); + return; + } + int ret = system(cmd); + if (ret) { + fprintf(stdout, "Executed %s with error : %d\n", cmd, ret); + } + free(cmd); +} + int main(int argc, char **argv) { int connfd; @@ -206,7 +231,6 @@ int main(int argc, char **argv) int opt_r = 0; int opt_p = 0; int c; - int ret; char *script = NULL; bool wait_update = true; @@ -360,35 +384,50 @@ int main(int argc, char **argv) ? "SUCCESS" : "FAILURE"); if (script) { - char *cmd; - if (asprintf(&cmd, "%s %s", script, - msg.status == SUCCESS ? - "SUCCESS" : "FAILURE") == -1) { - fprintf(stderr, "OOM calling post-exec script\n"); - } else { - ret = system(cmd); - if (ret) { - fprintf(stdout, "Executed %s with error : %d\n", cmd, ret); - } - free(cmd); - } + run_post_script(script, &msg); } resetterm(); + #if !defined(CONFIG_SURICATTA_WFX) if (psplash_ok) psplash_progress(psplash_pipe_path, &msg); psplash_ok = 0; if ((msg.status == SUCCESS) && (msg.cur_step > 0) && opt_r) { - sleep(5); - sync(); - if (reboot(LINUX_REBOOT_CMD_RESTART) < 0) { /* It should never happen */ - fprintf(stdout, "Please reset the board.\n"); - } + reboot_device(); + } + #else + if (msg.status == SUCCESS) { + fprintf(stdout, "\nWaiting for activation.\n"); + char *buf = alloca(PSPLASH_MSG_SIZE); + snprintf(buf, PSPLASH_MSG_SIZE - 1, "MSG Waiting for activation."); + psplash_write_fifo(psplash_pipe_path, buf); + } + if (msg.status == FAILURE) { + if (psplash_ok) + psplash_progress(psplash_pipe_path, &msg); + psplash_ok = 0; } + #endif wait_update = true; break; case DONE: fprintf(stdout, "\nDONE.\n\n"); break; + case PROGRESS: + #if defined(CONFIG_SURICATTA_WFX) + if (strcasestr(msg.info, "\"state\": \"ACTIVATING\"") && + strcasestr(msg.info, "\"progress\": 100")) { + msg.status = SUCCESS; + if (psplash_ok) + psplash_progress(psplash_pipe_path, &msg); + psplash_ok = 0; + if (opt_r && strcasestr(msg.info, "firmware")) { + reboot_device(); + break; + } + fprintf(stdout, "Don't know how to activate this update, doing nothing.\n"); + } + #endif + break; default: break; }