From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Tue, 07 Jun 2022 11:04:38 +0200 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1nyV8g-006CPH-MN for lore@lore.pengutronix.de; Tue, 07 Jun 2022 11:04:38 +0200 Received: from localhost ([127.0.0.1] helo=metis.ext.pengutronix.de) by metis.ext.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1nyV8f-00034h-Gd; Tue, 07 Jun 2022 11:04:37 +0200 Received: from mail-eopbgr80043.outbound.protection.outlook.com ([40.107.8.43] helo=EUR04-VI1-obe.outbound.protection.outlook.com) by metis.ext.pengutronix.de with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1nyV8C-00034Q-2d for ptxdist@pengutronix.de; Tue, 07 Jun 2022 11:04:08 +0200 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Dt3siWQXHc1hTxuj0YN9OvlArYEYv3WpWMV/UNris2sBOZPjcDh9Cheg+2AdlnztGHhUSDiygg0uMm1E/cBbvGb2tYSmcpR6/FzWCOkM4z5+yBPhYTlYWZVJPWHw/7ZfR+8W7osLIce+iAjGeK2tUE3GZDAI1Uq0K9LRDWFEkjRFy9UWMG+aPWeePbA07WusyJZPG9LC8L4Duzwsu1FGhuij7b60sFHVGb8t/c2YBWvpOOGXL1/2XAAdbbxP+dmq7d/qEuv+NFRQOnpMS4PUbJgLf5SmbqAYR/zswACjqJEaFSvc32BpXWADwa9h+Gwc/0PGTF04ZnC4qxinBxR/hQ== 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=xdn7cSHh3wzITLe00X6Wdcu3vma/HP6yrY5CXn5oQB8=; b=RSxRUoVo7DP1LwisH/A/fVgpJmdpYeVnAzAkuvjLMXqEiQgKUNHbdIZQESh65XnUmGA3EXhEuKmRZU7HYYdBOSePPuQQcCMrC34pKI6oQKvcUh5kkb1e18I5qQb1tYQAoQefbmuF8bRjsOpXOuatVcW5w5ROFqWvR7E8YXMWNTxdXKk5iyVINBavKyjgY10WmSEA20QjAu8iEXmDolLUC1zceshlZMxC581wsZ5AAra5vbQ092dZIA9UXQxmLQ8BMHubOMQg/DovGzmsP5Et9v+GgtS6HAPfpn4tYZG1TcHp1O34Ybp+An4nHjhs/+BPtdXpKNQgpjQ+nfamsgLE1g== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=t2data.com; dmarc=pass action=none header.from=t2data.com; dkim=pass header.d=t2data.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=t2datacom.onmicrosoft.com; s=selector1-t2datacom-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=xdn7cSHh3wzITLe00X6Wdcu3vma/HP6yrY5CXn5oQB8=; b=h1BYGRLlZ0Fk77voPx4EXzDNZZ4VqK4ZRNBgHYAxAaZjLf/EcZWzwJ9XeFpjbxAglSbh/dFWy9I3Rs6eVpv2ADm9/i/YwepVRZuuHZsJ7+S1e/ZZknIVDe0BevpcEDIm+GWamnlEdJqOOrQGoRrvVkfYOwwQA4Qs27r5K/te2fI= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=t2data.com; Received: from DB9P251MB0618.EURP251.PROD.OUTLOOK.COM (2603:10a6:10:334::22) by GV2P251MB0971.EURP251.PROD.OUTLOOK.COM (2603:10a6:150:7e::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5314.19; Tue, 7 Jun 2022 09:04:05 +0000 Received: from DB9P251MB0618.EURP251.PROD.OUTLOOK.COM ([fe80::1d7f:19a9:18f9:57af]) by DB9P251MB0618.EURP251.PROD.OUTLOOK.COM ([fe80::1d7f:19a9:18f9:57af%9]) with mapi id 15.20.5314.019; Tue, 7 Jun 2022 09:04:05 +0000 From: Christian Melki To: ptxdist@pengutronix.de Date: Tue, 7 Jun 2022 11:03:49 +0200 Message-Id: <20220607090350.346676-1-christian.melki@t2data.com> X-Mailer: git-send-email 2.34.1 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-ClientProxiedBy: GV3P280CA0020.SWEP280.PROD.OUTLOOK.COM (2603:10a6:150:b::32) To DB9P251MB0618.EURP251.PROD.OUTLOOK.COM (2603:10a6:10:334::22) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 9514ba8c-a289-42a0-740a-08da4864ac49 X-MS-TrafficTypeDiagnostic: GV2P251MB0971:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: sYzG1GRcPxVVL0R186JMw06XFCTjXh+j3S2XAsiQxAs5oA+X2DKaKA1XFi1POQfeUs1eLbp9O2F7NCyNJx8nh56OGSCMwucVq4qGF05xtxnA7xFQt4jGyvt4v6TCQQVjk/sHnSCFsr5+GLSZQfZdsdarFRs7Is8ngMe1oPEoci4oiMZQTQzjGyqiABkKDp2jGvqQ7f/Z2ACKtwRvMGB7Tid404rB3Atpm6N83y17TPHOfAgEdmwgG9JH3VspFWZ+E1l1Ow9tmsj8YwvdvRO+++O3BJDGtK1Ur+zjgOo6pEVuGjmpJGuwsOd5FShNKP3QggYOaTANkSnJ5mk7823kQrdPMSqDca4F2qR41f/C+/G8loL7MGgBBOgj10RHozJ2YYRlRH2nuDXx6zVT0QFYtaVvU4SIc/iJYcN51VYvaTtDsgloVJ7h/kN/QbTJ9qjAOsqPrE69D1glM8pL9RLEBeXtah16r9bcH4x9reBZVnZWsHoBQVMSA5Z2AnzQcvLqtWK0dsb0b50aBo+Pw7vLPCkF1yMBZ2m72SVDG4DmkBBGwDNlmnIdIfC9S35x3RRe/1CoYuSqkuP8RsqVSurGhG0I5eC+q7qn3bngguHtr/rYEpTorRjwBCwcZ6z0RJw1WMDXkNXagX5hEzgtRlfWGc7bcxHLhIbx6ogKaldEEGk7stbop5smsSwe8o87z1LNcOEMvA4zu23AwR6Uy0MGgg== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DB9P251MB0618.EURP251.PROD.OUTLOOK.COM; PTR:; CAT:NONE; SFS:(13230001)(366004)(39830400003)(396003)(136003)(346002)(2906002)(83380400001)(66946007)(66556008)(8936002)(6666004)(2616005)(6512007)(26005)(1076003)(316002)(6916009)(6506007)(52116002)(186003)(66476007)(508600001)(38350700002)(5660300002)(38100700002)(8676002)(41300700001)(36756003)(44832011)(6486002)(86362001); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?lKpEL5+0rCYikE8pHtKxMD8a/G2fbf4sXI0XysRS3GXSsFBopuILgw3LEK00?= =?us-ascii?Q?aey1VBzCgnJsICxkNggNuTqaiA8nr2VVAOEog9kH9JJYdchqDBuCtTHLSh0f?= =?us-ascii?Q?mjJjsbCPGlxaEjCUeDCaErpiQ4fXFqSc5UgjesLztTgg1zrazcHyEcQGUOfr?= =?us-ascii?Q?i/JYyO6nCgow8PKUcpYvA/SY/3YcodQ05i0NuUApN3AAOUPO0n89E51Ltbtb?= =?us-ascii?Q?3aidzFXVex5Mpf1RQdGBiQMVzRGeWiqadMZ+TDIXAzR/zqB3+qGnWvF8YE3a?= =?us-ascii?Q?TGS3BaQJS+zgoLk+VLOn1wt07tP5J53E7ZiFYuLLVcTOvm11g9RU8OUR2xOI?= =?us-ascii?Q?mtOWP4nNffqA4v2TrFo3cE9pek2U7KIXlXY3zDvC3Xz4x0OitsGFMPDR7Prs?= =?us-ascii?Q?4YdITozJxKH/5onYoxiQLVGkT1dWOyzjgyVep9ZlardYEtWPI2soA62tPLXj?= =?us-ascii?Q?TGAE6T+NPzQpOITkOwY7KaZi2ChKGeS1sL4LasOh0cBTe6iotQe7QgdF1cPW?= =?us-ascii?Q?xBYtyXevdAIggWnx/QKuCCRM2+3zO0Qqxp28KqzK45dpn3ejcGG6sKbp1COc?= =?us-ascii?Q?SpMU4S5z1AmBjEY9FJXpIwwI3hE9Q60C9PsYjoO79l8redpJxxo0dMmJzdlO?= =?us-ascii?Q?xLW7y3aQYj39NQLVnT9gc9GuezQiz/mM/P1umQW8PUwOHj3Lfr4bCYbd0lSd?= =?us-ascii?Q?Cm3XldGOOXmEMZpLJeryFAEqE11B7mEBodvjv4kFqEACSdXvPFBzxwtYdfaJ?= =?us-ascii?Q?eK6/qHKlyw678YoLtd7IdRe3tNde02JEaSM3TIHh6WZQ36+FKNZCoL2npROu?= =?us-ascii?Q?F1qBbdjsn97hmQ8gbgvuzFLEfdooplDJKvMO6YUpAZBgWNLe6+OvdioMEPvD?= =?us-ascii?Q?ds+Jby4iPHplqoaWrZdFqV/WrmJfIxiMSLDOHJ052YEpPsQ6i4iY2moBxH7G?= =?us-ascii?Q?1dXPDtoGyP/K52GF+xACI8kV7mpoI7jKmMD+k5tEJrz1nhQDk9kvn2MbWA5i?= =?us-ascii?Q?jj920OMJwfO+8uPT4eEh6H5glNF7z9ufE+iIYEofy5fwI9/ixtONT3msVgrr?= =?us-ascii?Q?0VutNBqjIBZSvwTmmQQovN/fQvKJZeafAimqLRraL7UXpjYXdXMBlX70uL96?= =?us-ascii?Q?sBp8upkO/qcFoP1RCEETqOEv/PgJTjkS3Sg1xEB12M258DHmjFOzI0FmCPSe?= =?us-ascii?Q?hMuDmyW4TZyugpIpn/TX8ds+wUJ0/+/Al0vjpCARrhTPt7jcIfBX+ubvXYBB?= =?us-ascii?Q?Rz7bsr3oMOE7GLP38/35QNzaGOmOuZaBSiK1yjrV+aeEaSALAB9zfxNLkdM5?= =?us-ascii?Q?Yvn2lYfZ+CGF82Ly2x1wPUgyzQNRJqIRWMQkxgGrTOAVv9ITwAvpVymCac7w?= =?us-ascii?Q?q84FT1MzXCKJoEbfiT9Iy4fOogyjUo5evGmq8eon7qslUrqflwH57i9XRryf?= =?us-ascii?Q?aIf8ReZs6CHooCd5z0yagu+5Y4dGmJVFIZzg/T6AhnNI/SEuJpJaN1x1TZLa?= =?us-ascii?Q?AoZSsaCWZ9na7U4Gf/3eD0/uql/P5xxhsWBG9kzk8wj/sMMqtmzGFg4KEw9O?= =?us-ascii?Q?NPIxvK43at8m/2M/SeYlN5wm5aU50rngHThr4P4teK5KoU3vN9p1/qrKP1sP?= =?us-ascii?Q?EL5F1/8MNtg32uSp8vlTEv66wN3e3COHgdNOCTvkjBwvOwvSneadpWuBLqpv?= =?us-ascii?Q?0N2VfUB4IODba+ODeSRBOhvw9a6KUjn++Oq5PmKB0BeMrenxSQh7lxmijz9P?= =?us-ascii?Q?0DF1JZwWB7JYRAO9BR54CBsV79oETes=3D?= X-OriginatorOrg: t2data.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9514ba8c-a289-42a0-740a-08da4864ac49 X-MS-Exchange-CrossTenant-AuthSource: DB9P251MB0618.EURP251.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Jun 2022 09:04:05.1865 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 27928da5-aacd-4ba1-9566-c748a6863e6c X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: SbEv3nwqEyzQhhaS4BL38lbtt4WJJc3J/DPz7HdCCyb7r8K2JKkcCCj8liw4mr0HwgLArn3Jb3pIwqty6zw/dVDtIr4Jlv8rTfN1Cw46DK0= X-MS-Exchange-Transport-CrossTenantHeadersStamped: GV2P251MB0971 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on metis.ext.pengutronix.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=4.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.2 Subject: [ptxdist] [PATCH 1/2] barebox: Simplify/cleanup barebox image installations. X-BeenThere: ptxdist@pengutronix.de X-Mailman-Version: 2.1.29 Precedence: list List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Sender: "ptxdist" X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: ptxdist-bounces@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false Barebox has been carrying a descriptive barebox-flash-images file for a while now. This file contains the generated image files. So instead of searching for images, let barebox tell us. Also remove some legacy image and environment handling. This means that only Barebox >= 2015.12 is supported. Signed-off-by: Christian Melki --- rules/barebox.make | 35 ++++++++++------------------------- 1 file changed, 10 insertions(+), 25 deletions(-) diff --git a/rules/barebox.make b/rules/barebox.make index 753a47b59..581fd1ff9 100644 --- a/rules/barebox.make +++ b/rules/barebox.make @@ -179,31 +179,16 @@ ifneq ($(strip $(BAREBOX_PROGS_TARGET_y)),) endif @$(call world/image-clean, BAREBOX) - @if [ -d $(BAREBOX_BUILD_DIR)/images ]; then \ - find $(BAREBOX_BUILD_DIR)/images/ -name "barebox-*.img" | sort | while read image; do \ - $(call ptx/image-install, BAREBOX, $$image); \ - if [ ! -e $(IMAGEDIR)/barebox-image ]; then \ - $(call ptx/image-install-link, BAREBOX, `basename $$image`, barebox-image); \ - fi; \ - done; \ - fi - @if [ -e $(IMAGEDIR)/barebox-image ]; then \ - :; \ - elif [ -e $(BAREBOX_BUILD_DIR)/barebox-flash-image ]; then \ - $(call ptx/image-install, BAREBOX, $(BAREBOX_BUILD_DIR)/barebox-flash-image, barebox-image); \ - else \ - $(call ptx/image-install, BAREBOX, $(BAREBOX_BUILD_DIR)/barebox.bin, barebox-image); \ - fi - @if [ -e $(BAREBOX_BUILD_DIR)/defaultenv/barebox_zero_env ]; then \ - $(call ptx/image-install, BAREBOX, $(BAREBOX_BUILD_DIR)/defaultenv/barebox_zero_env, \ - barebox-default-environment); \ - elif [ -e $(BAREBOX_BUILD_DIR)/common/barebox_default_env ]; then \ - $(call ptx/image-install, BAREBOX, $(BAREBOX_BUILD_DIR)/common/barebox_default_env, \ - barebox-default-environment); \ - elif [ -e $(BAREBOX_BUILD_DIR)/barebox_default_env ]; then \ - $(call ptx/image-install, BAREBOX, $(BAREBOX_BUILD_DIR)/barebox_default_env, \ - barebox-default-environment); \ - fi + + @$(foreach image, $(shell cat $(BAREBOX_BUILD_DIR)/barebox-flash-images), \ + $(call ptx/image-install, BAREBOX, $(BAREBOX_BUILD_DIR)/$(image)); \ + if [ ! -e $(IMAGEDIR)/barebox-image ]; then \ + $(call ptx/image-install-link, BAREBOX, $(notdir $(image)), barebox-image); \ + fi; ) + + $(call ptx/image-install, BAREBOX, $(BAREBOX_BUILD_DIR)/defaultenv/barebox_zero_env, \ + barebox-default-environment); \ + @$(call touch) # ---------------------------------------------------------------------------- -- 2.34.1