| Message ID | 20220403140603.26029-1-andrey.zhizhikin@leica-geosystems.com |
|---|---|
| State | Accepted |
| Delegated to: | Tom Rini |
| Headers | show
Return-Path: <u-boot-bounces@lists.denx.de> X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=leica-geosystems.com header.i=@leica-geosystems.com header.a=rsa-sha256 header.s=selector1 header.b=SBb+fUUP; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=<UNKNOWN>) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (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 bilbo.ozlabs.org (Postfix) with ESMTPS id 4KWbLf4qFQz9sCD for <incoming@patchwork.ozlabs.org>; Mon, 4 Apr 2022 00:06:48 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 548BF83AFF; Sun, 3 Apr 2022 16:06:39 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=quarantine dis=none) header.from=leica-geosystems.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=leica-geosystems.com header.i=@leica-geosystems.com header.b="SBb+fUUP"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 5835783B03; Sun, 3 Apr 2022 16:06:37 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_PASS,SPF_PASS, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.2 Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-vi1eur04on0719.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe0e::719]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 5006F83AF9 for <u-boot@lists.denx.de>; Sun, 3 Apr 2022 16:06:29 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=quarantine dis=none) header.from=leica-geosystems.com Authentication-Results: phobos.denx.de; spf=fail smtp.mailfrom=andrey.zhizhikin@leica-geosystems.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=P4is3+hCkTwR0GyAAdxzqeC9qkq/pl9QDcceekIDyu6bIdVlRjzvCi9hsQYDIbcGREpgfnNt2s3+l9qMnVGZ8GGymIKeh9KulM7aO3DklFVvTT/9jcXkCSPb0RWboz0xm6qZgXUC7Z4muNYfyhjf1Vd/CjQSHPAVXQ1c+F/m/oIa6lmAg/3aMcyNqoXqC6T8avpk1cDhXX9AAMYIyOIwCuF1HLFBhEN4T+NG1lTP4LMPidmS1FJfwU2h2cH83vS6za2EZPfmAqoIw01k4embdurZMhh74URTXC4/ofjkW0Y5rSblKmGhVyjlMYWC72AAtWu+fWDAf0oZVEM+YMZaDQ== 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=fZayPFEfXQgC/3ezrOMf/xyBfzXoErnTpReuVNKE6is=; b=Q9zyeUvW3/Gcb/Lqx5L5VEohvU+RFIGHuvBPoM4D9JdN6FdaKS7OvC/vGjZ6Ts049r7lzZeMrvPlSnDxTa+pIakZVunheS0trbBMtpX72RIL3MxVfQG/6h0iguPExRDshHkyUHp0nSugbypk2iDy2Fp2onaKOclI83G6cgzHTFoVeCoHyLMsV7IP2SvRPQYfhxriy3GIbc+TS4wzvBO1HcNEKyFjRU6bBjnyP3i4P9b5XNztNzYg3shlSeqLb/nGLbJzsWUUCf06HPODRmjxVt/HDGPdU5WCkp/Zico2t09+1LtFICHLfOkkmqFmM9EixMS4pogW/G7nd26aveXpMA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=leica-geosystems.com; dmarc=pass action=none header.from=leica-geosystems.com; dkim=pass header.d=leica-geosystems.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=leica-geosystems.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=fZayPFEfXQgC/3ezrOMf/xyBfzXoErnTpReuVNKE6is=; b=SBb+fUUPhNnEIYNrdYR4lr2xTenBi58VF6Ga6d8nbLplFC6LaZnUMe4d7BtmF29kt/6DA+rm64x3AFj7gDBCilLwOxX26YQ2pvG/RLKV7HrP1u7JFQ+VRqc+UVP/Jb4tUj3GSYgDIkhvAzF+KzQwfDx574XxamYWZzJtzvPLgzk= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=leica-geosystems.com; Received: from DB6PR06MB3016.eurprd06.prod.outlook.com (2603:10a6:6:6::10) by DB6PR0601MB2197.eurprd06.prod.outlook.com (2603:10a6:4:4e::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5123.31; Sun, 3 Apr 2022 14:06:27 +0000 Received: from DB6PR06MB3016.eurprd06.prod.outlook.com ([fe80::75a3:bc8f:8735:369c]) by DB6PR06MB3016.eurprd06.prod.outlook.com ([fe80::75a3:bc8f:8735:369c%5]) with mapi id 15.20.5123.030; Sun, 3 Apr 2022 14:06:27 +0000 From: Andrey Zhizhikin <andrey.zhizhikin@leica-geosystems.com> To: u-boot@lists.denx.de Cc: sjg@chromium.org, marek.behun@nic.cz, xypron.glpk@gmx.de, Andrey Zhizhikin <andrey.zhizhikin@leica-geosystems.com> Subject: [PATCH] env: do not fail on non-existing env.in file Date: Sun, 3 Apr 2022 16:06:03 +0200 Message-Id: <20220403140603.26029-1-andrey.zhizhikin@leica-geosystems.com> X-Mailer: git-send-email 2.25.1 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-ClientProxiedBy: ZRAP278CA0003.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:10::13) To DB6PR06MB3016.eurprd06.prod.outlook.com (2603:10a6:6:6::10) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: b64f709b-4653-41f0-1bc8-08da157b24b0 X-MS-TrafficTypeDiagnostic: DB6PR0601MB2197:EE_ X-Microsoft-Antispam-PRVS: <DB6PR0601MB2197F925A07DD1C59783DD70A6E29@DB6PR0601MB2197.eurprd06.prod.outlook.com> X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: bAuACOovcnesebKAwVa7o3mmr+MDWT9PH5dyBKF5inF8zJxvQV8LbKg7etTuvTDkp8eLfkAL9tqskeeSy1dgYsMUZaGpfO6O05D3s/KTc3GlHdSvv65surPA5QmK2i59Vr/cfJ+PczyxzKgHR/F3ROTydsCRodoFHEKGIE1b9fv1WCiZ2GUjdr1h6QlsU12CD9wmBOWFWPRR4daTXZgwC3dYDeH3Kjo7Z75Vb5ixNkTNmLm9g/q+ZtcK+yXm5N4fvLTz7vaOD999YrmrdFb8JO4XVCku0CiVaPO1+clp98tu+HC3VC7eP0gpsNExNPEysBrDjv1R1c20y6YB57Fc5JZwIki8vvm30BZndK08oYs647FtCgeh2Zb6wjUNF1KdesfRGR0m01x/wEvw5IUNZGz0gK8Uz+cgoocf/cp33eks5Bxt9BUUFYuNPWgC4PoUDCE20IAT65FKCU8K9r2t4c1AcOJeEkiAqHoHycWDZRqCmCznw2ojxwmYUs9cCN2vJy6ggLkCQSioHEqtSHKjBbl9HYBWgvgklt7muDmgIA6TAyhZTHSsF2pOwVIr6erFpXnem/BFXF2hFG2+lHrO3nN+LbYTA/3FU/1O1RTZzef37ktUHD7OJPAcKVaV2odkpLKEbOIfUnFIXXOYk2NAvMgsRFIONhE4e4jUSEIATzzWryn5qEd5TBevsVsnuCzi X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DB6PR06MB3016.eurprd06.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230001)(4636009)(366004)(86362001)(6506007)(52116002)(83380400001)(186003)(26005)(2616005)(1076003)(107886003)(6512007)(2906002)(36756003)(8936002)(6666004)(5660300002)(44832011)(38100700002)(38350700002)(4744005)(316002)(6916009)(508600001)(6486002)(4326008)(8676002)(66946007)(66476007)(66556008); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: ZceEV4FajxFSSr/iVAaU2xkDhHkdyYW8AUidQ/fDLe3TmGpuKmrkzaJbkUyQawfknZibOOKWBROZm+zcjNlSmzCSGQaV8Q961lBBklQQqmlRUIGM6HXCgqDm2mMwJBRUHIjCfeko/JHTtAFH4xmjnHHYIqus4TV8N52ECTcJnW2eD2Mqqi7HmxrZHEn+1nJq3i7TNyFKyIHkBGbCax3F9a4daJaLhbXaL8ArcEeBAUqRHqx+LyGmvKFelvrHz/aXRUPgfKcSRT5s9AeNVcJ27NQx6KCLCF886rCVk6flvUq+o2MTE33pbRdf4TLJ7mUQWnQcG0E2vG7nqAsK+npL/qMAP+ubP5ynkTQbmVF34ylpW2sDyC5nrQQ0pi7LyX6kifwgLjzRGnEhsOum3yJ7t8zZMImoDCgwPegBeMeIOESpXBb135LNkr0w58TfObE4cpgP93UwyGafGzXpPPLlSuu1YrxPGKbKzSlw4xAKkLpLKkrxEyVLxu5n+D0dpGSZggbifk9S7hTMLE9b6q50BjbOknjZqvTjzIEB6SZETS3HZhUv1TudI1GxrSG5lB8i7mTUjRo+2az6mTEDUbT2/y1u8S2bO/6n/Dn9u9vw+OmA+maBoeoy9j15MRvCFuCV1cYPMDnokyGbxubkUnn+rW/JN9Sy2BDM2uLl2EmnjoJhjzERlUQFqCMkFfyR2Bz3jEEf3DByUoEuZGXwfhfQH7AXNpPryBQO2h//BBmrzPDeYbvKbYaBq27jK4JBkMVjf3L9w+QHveK5uoVWj1l2TQDSP03yz2zOxz124QtI8osGpukPKXfpi7zwASwLtegLOY/vWtfcgQcmZGoV6gbQBLKv4r/REDegvlK+p4GULZ63v5RcHA6Ed/rPQdOShz+fubhqxFz8nTkL5LIjdOmFxOmZKYLOicQ9J1Hmsr3MrmVqNmseBPbEbOIiKblUcQTQqHGqcOJBs9cWikvuiuz+tbl/4EOAUYzTW6Djf5Y2Td7HEbkY8O9fyzF/0/ugIqgPaYoq8r7zn5KhPzbXawBCYNoxw2M+37yudY7sxI1cn67VseQqwSF7ezTCXe/zj1VoYISqzfNFDpNlaERlt8hRwFTAbCa0BPCfgLBJXIEk++BispEJM5/kwIXVxYrfFefk7UdrE54wObmH5Oetp33AlQDNsDrQ5yFIDUDJCsIMKzQcyHwZaw27ep9iGW2HbuQd0oSkvINRzqL/R0dmI5TSWTCH24pAFNHVKj/LTKNFyoyrMIVD1P5AdGAQwjUr57CjvG5ndJPUN9t1G3RmKFMyOv5YulhqnRjJ36tiPhazR/g34HI6+bY7dW3fJbmU+hZOV5TjHpQLZbziMUKPXzHVGJedXF0St4ADxzXwLXTXKe+m/+/6nR4EOnE4VZnP5RYgB+BJDBFtsAhO6ufH/rXjx2tLBb3OAKYOEKF6PCTimoGUr2XBwkKX4BoNp2tlXPqVF6r32HSjTwNepi446fwAahuExoTB0t5ILeL9BJycR//sDN7xh8n+bvuzhuZtWW9IWY1Z1UAgHSh7jpF68AC4K7YM2m5aA+KBs7sdqsytOTykh69EgmBpKvRrfa0jDD4DLqPo1qPhJqH7VDR2sw8YqdorsSb/7OxU1OWW/0GEqAEA119r6mEiUqJL5OtbM+4EIwQJiuR9e4p1qiQpnjMm3A6U8aqnyBV7PMPfy2vFxpCJfJ3jJiKc0iDn1wdhy2jwQFVBHC9LD6DtraJblhjALnoy251MXtH+0Rmo0JMSSMM= X-OriginatorOrg: leica-geosystems.com X-MS-Exchange-CrossTenant-Network-Message-Id: b64f709b-4653-41f0-1bc8-08da157b24b0 X-MS-Exchange-CrossTenant-AuthSource: DB6PR06MB3016.eurprd06.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Apr 2022 14:06:27.3434 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 1b16ab3e-b8f6-4fe3-9f3e-2db7fe549f6a X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: Pld3+Dk4S70HvWdgcRZc/QUy+b4zacIfxKjMONt4uwNCKZLZPCY+QGbb8LiVDJNX8l6yKsfRlaOIgd+su9SLh2G/US1NSnqTdAWLlQ+s+cQ= X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB6PR0601MB2197 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion <u-boot.lists.denx.de> List-Unsubscribe: <https://lists.denx.de/options/u-boot>, <mailto:u-boot-request@lists.denx.de?subject=unsubscribe> List-Archive: <https://lists.denx.de/pipermail/u-boot/> List-Post: <mailto:u-boot@lists.denx.de> List-Help: <mailto:u-boot-request@lists.denx.de?subject=help> List-Subscribe: <https://lists.denx.de/listinfo/u-boot>, <mailto:u-boot-request@lists.denx.de?subject=subscribe> Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" <u-boot-bounces@lists.denx.de> X-Virus-Scanned: clamav-milter 0.103.5 at phobos.denx.de X-Virus-Status: Clean |
| Series |
env: do not fail on non-existing env.in file
|
expand
|
On Sun, Apr 03, 2022 at 04:06:03PM +0200, Andrey Zhizhikin wrote: > If include/generated/env.in does not exist, which is a typical case for > clean build, quiet_cmd_gen_envp command tries to delete this file > unconditionally. > > This produces following warning during the build: > ENVP include/generated/env.in > rm: cannot remove 'include/generated/env.in': No such file or directory > > Add '-f' option to the `rm` command to not complain if file does not > exist. > > Fixes: f432eb6d8a9d ("env: Avoid using a leftover text-environment file") > Signed-off-by: Andrey Zhizhikin <andrey.zhizhikin@leica-geosystems.com> > Reviewed-by: Sean Anderson <seanga2@gmail.com> Applied to u-boot/master, thanks!
diff --git a/Makefile b/Makefile index 4672147318..868445bf33 100644 --- a/Makefile +++ b/Makefile @@ -1846,7 +1846,7 @@ quiet_cmd_gen_envp = ENVP $@ -I$(srctree)/arch/$(ARCH)/include \ $< -o $@; \ else \ - rm $@; \ + rm -f $@; \ touch $@ ; \ fi include/generated/env.in: include/generated/env.txt FORCE
If include/generated/env.in does not exist, which is a typical case for clean build, quiet_cmd_gen_envp command tries to delete this file unconditionally. This produces following warning during the build: ENVP include/generated/env.in rm: cannot remove 'include/generated/env.in': No such file or directory Add '-f' option to the `rm` command to not complain if file does not exist. Fixes: f432eb6d8a9d ("env: Avoid using a leftover text-environment file") Signed-off-by: Andrey Zhizhikin <andrey.zhizhikin@leica-geosystems.com> --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)