From patchwork Sun May 16 14:19:49 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mircea GLIGA X-Patchwork-Id: 1479077 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=2605:bc80:3010::138; helo=smtp1.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=bitdefender.onmicrosoft.com header.i=@bitdefender.onmicrosoft.com header.a=rsa-sha256 header.s=selector2-bitdefender-onmicrosoft-com header.b=r3ADEXUd; dkim-atps=neutral Received: from smtp1.osuosl.org (smtp1.osuosl.org [IPv6:2605:bc80:3010::138]) (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 4Fjkth0ppSz9sW1 for ; Mon, 17 May 2021 00:20:12 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 11101838F2; Sun, 16 May 2021 14:20:10 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id AkB0FMGLh6PD; Sun, 16 May 2021 14:20:09 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp1.osuosl.org (Postfix) with ESMTP id 5E8D3838E0; Sun, 16 May 2021 14:20:08 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id ED3981BF3C2 for ; Sun, 16 May 2021 14:20:06 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id E5A704032D for ; Sun, 16 May 2021 14:20:05 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Authentication-Results: smtp4.osuosl.org (amavisd-new); dkim=pass (1024-bit key) header.d=bitdefender.onmicrosoft.com Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id kznJeL3KUQhZ for ; Sun, 16 May 2021 14:20:04 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05on20703.outbound.protection.outlook.com [IPv6:2a01:111:f400:7e1a::703]) by smtp4.osuosl.org (Postfix) with ESMTPS id 721FD40413 for ; Sun, 16 May 2021 14:20:04 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=f2mRP00nu7CH/IIDs0l2Ur7P4428VJ/oyb+w5sWZoRQSjw8Bl3PdBxD5tBmeg0QoI1nVvZFlQQAkFyskC8ixSO4C4b4H92d6u/wi9NMUiemYCQ0ktSqRkJoIrpvQcanOy929qxivYbD9f2LgVVYtgfeWZq6iahMDL9qHIFhNdPHZ4jo7u5TJ6klMRJjzn+RmAky9/wreSgGvj4MVxHh7QYTVb/qH5Ab/HmAhMmwmFZsbMETttQr1vHkszNQnNngr1a0+VSj4p8faWVIRhEIWY0aMegYJPEVQhEMbUM4JwAbbSwXTbH+AzZL26siqhZViMlJ23F0Nq6U/oWI+CyArag== 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=rBvgHkYGBqeGzcD6RM1WWrxYnnF2JqfFJeUibm1/bTo=; b=gnGplospxho90+M27rNk9oL4JVIKe5aD/JCVQfrZxhRy4bROtMOD0O5MgrPK/8Nnla95BfcGS12oFaOB9liRyIIwWxXDPZyvXpXV6eRTFAre69Inwglo8Bs8lgbOysFej7IYdTKlTWQZbZpfrPWLDpKTB9b/DVQP6EgeQQYteebbsesns0QQgcTBaW6VLiimjP4ma/m94Gbdy5g7I6v0Rprn1w1eNOqmL5kRoxYWH+KMmMKmCyLfVip/MDzQwQeSLGT6TMtF/gTGzMEty2KjhmXdyPle8RhwwZ8ncL6nOkoEvwiv7xy7NEg6eKuESHaKYXA/vP0RHIxA61jQXpvK6A== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=bitdefender.com; dmarc=pass action=none header.from=bitdefender.com; dkim=pass header.d=bitdefender.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bitdefender.onmicrosoft.com; s=selector2-bitdefender-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=rBvgHkYGBqeGzcD6RM1WWrxYnnF2JqfFJeUibm1/bTo=; b=r3ADEXUdY1PsdpeCmiaKzU8BDPNgg9H7arWZuOPprR1qRsfNCc6DYz/h4AGbM9J9N7UMLxMcFvYUT4XtpSs82sO9sK4kwtAZy7pc8QzMLN+s/fVYbkzu3RB1z9z7W0lqxjZujF98u1j6hIZ9eZMLnAbnhUm77v37y6juZpHTBsQ= Authentication-Results: buildroot.org; dkim=none (message not signed) header.d=none;buildroot.org; dmarc=none action=none header.from=bitdefender.com; Received: from AM0PR02MB5283.eurprd02.prod.outlook.com (2603:10a6:208:109::23) by AM9PR02MB7249.eurprd02.prod.outlook.com (2603:10a6:20b:3eb::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4129.25; Sun, 16 May 2021 14:20:01 +0000 Received: from AM0PR02MB5283.eurprd02.prod.outlook.com ([fe80::187e:eecd:313b:6c1c]) by AM0PR02MB5283.eurprd02.prod.outlook.com ([fe80::187e:eecd:313b:6c1c%7]) with mapi id 15.20.4129.031; Sun, 16 May 2021 14:20:01 +0000 From: Mircea GLIGA To: buildroot@buildroot.org Date: Sun, 16 May 2021 17:19:49 +0300 Message-Id: <20210516141949.1271867-1-mgliga@bitdefender.com> X-Mailer: git-send-email 2.31.1 X-Originating-IP: [5.15.191.170] X-ClientProxiedBy: VI1PR0701CA0029.eurprd07.prod.outlook.com (2603:10a6:800:90::15) To AM0PR02MB5283.eurprd02.prod.outlook.com (2603:10a6:208:109::23) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from mgliga-l.bitdefender.biz (5.15.191.170) by VI1PR0701CA0029.eurprd07.prod.outlook.com (2603:10a6:800:90::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4150.11 via Frontend Transport; Sun, 16 May 2021 14:20:00 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 622a1e62-9660-4a0a-82a9-08d91875b123 X-MS-TrafficTypeDiagnostic: AM9PR02MB7249: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:3826; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: IIhG1Ajw2xZ08eCVudXaEEZQj9JAx1tFV3fuJtUJ5lL85YOT718WpMKa7AdUaopXhTyaJQC2zTx8DL3AUK62s98/jxFlW0JvHS/mI8B+VTg9LUYtIMESA/SRBMX3Mv9LYCBti3BwZrGGovQwYqjiqqVGxQB3Mwub68cJ6IOiQnAMaBN6tUYiB7p9nDNt9yHC6hizFggnpg/BlurKIYWtaRS0WlVsffuDvoZt6hz9rgDimiHc9BX68N06BaDT52IQ/4y9AVtG8GRhZVxtnCvRax6w3lgBpbr2weI/mwZXjC4PIuMwwX/Ytypi3S1dgwXO47F8MoFv6qEY+CgL7L7w8Fc8rn/g0p7zkDQ75PDmA6BaelMVxCkiPkrpZRrEyg0WKrF35f0V42l0UfaOGBAvv13FjkA5HmGqGYh+ehPEEEmWxd7AnCY+7uDnb4Rwf5NQisE5ccSoWdRcQ2gO5dcbfneVmD6NfOdHdjlL1kyOhWYgN4OQFg016wBeIAl7eKYdLZW0g4mlWisDSNQTjQhOI5+uGHgpYsmMbJGyGx4cNltAOJbtldPkhneXuCVA/HKJzAFqiSrZBVpQwqbyoL+uPKckApRq3467XVFmYBDFm3dopXJfDM83v8x8QmrfogQrtNq8zWMGV5s4KgDgnrYgJJzHGWaLfrnQrPZ/ZymtTbhzp9VpoGJndEyVY5f7Ul4bUVsiAeESumYmjUkR82K37HYGeAwXV3BYpiTSaVih24fA8jnShTEEBYnagHg35+x6 X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM0PR02MB5283.eurprd02.prod.outlook.com; PTR:; CAT:NONE; SFS:(39840400004)(136003)(366004)(376002)(396003)(346002)(4326008)(6666004)(107886003)(86362001)(6512007)(6506007)(2906002)(956004)(2616005)(6916009)(66946007)(66476007)(478600001)(26005)(5660300002)(8676002)(966005)(66556008)(8936002)(316002)(36756003)(186003)(16526019)(6486002)(38100700002)(38350700002)(1076003)(52116002)(83380400001)(81973001); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: JVOb9x2BmDyky0LIdd5bTlhxI2PQxa9plw8EJOJao2teNe8t4kjkrZY89E3PdB78smkqHoFN+WUxqWr4/eC8WLP2hoV4UPHV8nlNzUvgMXXYEyrjKmdLAgXhi52DCJWhdTbWlkEVvr1mYNJC6cY0s5OgamMYdyZToCAOfK4zbDQoXcMp1spqhmGGkSAdWJdrhvDN98FyS0X3UTBGNzbKylqFp4sSNsHDYPBkbmZXpOijm3u3hTGDYPBlpprd4LPKzB6k87O8t7lbQaWNp+Auw7OEiTFyn92JjEVdVAVbYhdq4SMU6h24XbAsFvxZlX24CL6V9lr0AT/EdKkk2zAELQYjYrhR4v+6b9CfmMz3Ql7Jm6WhI4EG2GBMBRJyf/A3NHnRXCrhb8IAPcvNxXk2OksvmqqaDANU447LtsSJPXgBvTbejWZlrU9OZai4j0Nb4X7XYzA9Q+WBd1FN0ke4L2v6IzHmKUYJ/kCKGWintebxIFlc0gFpsKEadAdQAM9yqL2DRE8m2t/XjFotAvP37dSnrCpDkVahRiicqupRlbofZStISmzlGI090LHA+cVNKhG8ES2h/sAwWhOsIrdiJE+Rl/0UfmuVxANVX5C0xK58w7gOpsdQEzT6hZsQfIJCKwneQL/KhyZFJl1501Qn7J6MyiLrBmClb5N3U+FZHW45ELD4Fsg+fHIZsVQvRUmADgR8B0GGBojWuwrWiAsldClGPwJu0Tu9reoEeXZKof1KFMOya/tFTSMHggnWLIU6EFPwlbAEpEOA3Gymk0A9TV0LLEzw5HlJBQLu5N62WqQbsuyiNf+te9xJm7xjHUy4ovjLAK6/lwcrLNVDZ149T1Btbmgs/cTOpQBrrt36+hWCVQj4PVG/kj3WKDLaa9BgEKmKGz4rA3ymRwhJ287r2U8xDlP0NzEj8bxMWyAr7gff+OtXa8fypX5Zj2nYNABCeLPU97VOKV1BypGGUoorreuvAoLWWewxumgxFIAaKRq1UjjgL46Boe577OuPNv7TRxE1YOrbDqXKd7j4nHdhVkJBHu9rccbA/0aKhquhWSEshAGwqGwcpVXcrBkNxvVFtIEdT9VqmeCjanOcEtkgSgZB+4QEb1isAe+ouCXF6NQ1OI0BtQcAjjATsapLrnetWsG0p9CbiS/kPqWgwt7IygU8U75Zkp5+q1yAeI0yDxhnLeNOCCJcbyaPUUja705rSvrOXCvLBLDdN61BGnNk3B5D/Hf9oTwcijHR+ULpuCU50LG51scyTYHAdoKOELetR2rQyvhJTq14ECiB2lNe6JE/jL/FbzNvmDBjfTYQA/GTo4HVRYUwKac2sRdNF9pq X-OriginatorOrg: bitdefender.com X-MS-Exchange-CrossTenant-Network-Message-Id: 622a1e62-9660-4a0a-82a9-08d91875b123 X-MS-Exchange-CrossTenant-AuthSource: AM0PR02MB5283.eurprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 May 2021 14:20:01.3029 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 487baf29-f1da-469a-9221-243f830c36f3 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: nPYc3Klzy2MYdw6Bsk8wKsGhuPttXPDdT2WNEcsGfyEnWvf43w38YYvX55t8Wr6cWL3V1rmaSRyL98PU/c4xLSuKLPIMx81ShJk4XavUNoo= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM9PR02MB7249 Subject: [Buildroot] [PATCH 1/1] package/environment-setup: Fix incorrect order of the `sed` expressions X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mircea GLIGA Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Order of the `sed` expressions is important; when this was commited to master, the order of the expressions from the original patch [1] was changed, rendering the second expression to noop. This made all the environment variables from the script to contain absolute paths: long absolute paths makes verbose builds difficult to read/follow. We can take advantage of the fact that the PATH is updated and we don't have to use absolute paths. Fixed by reordering the `sed` expresions: * first update the path of the binaries: e.g. 's%$(HOST_DIR)/bin/%%g' * only then update remaining paths: e.g. 's%$(HOST_DIR)%\$$SDK_PATH%g' [1] https://patchwork.ozlabs.org/project/buildroot/patch/20201027140140.47982-1-matthew.weber@rockwellcollins.com/ Signed-off-by: Mircea GLIGA --- package/environment-setup/environment-setup.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/environment-setup/environment-setup.mk b/package/environment-setup/environment-setup.mk index fcad013f0d..f4c52921f7 100644 --- a/package/environment-setup/environment-setup.mk +++ b/package/environment-setup/environment-setup.mk @@ -26,8 +26,8 @@ define HOST_ENVIRONMENT_SETUP_INSTALL_CMDS printf "alias cmake=\"cmake \ -DCMAKE_TOOLCHAIN_FILE=$(HOST_DIR)/share/buildroot/toolchainfile.cmake \ -DCMAKE_INSTALL_PREFIX=/usr\"\n" >> $(ENVIRONMENT_SETUP_FILE) - $(SED) 's%$(HOST_DIR)%\$$SDK_PATH%g' \ - -e 's%$(HOST_DIR)/bin/%%g' \ + $(SED) 's%$(HOST_DIR)/bin/%%g' \ + -e 's%$(HOST_DIR)%\$$SDK_PATH%g' \ -e '/^export "PATH=/c\' \ $(ENVIRONMENT_SETUP_FILE) printf "export \"PATH=\$$SDK_PATH/bin:\$$SDK_PATH/sbin:\$$PATH\"\n" \