From patchwork Tue May 16 16:07:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Arno Baumfalk X-Patchwork-Id: 24007 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8CBC5C77B7A for ; Tue, 16 May 2023 16:07:23 +0000 (UTC) Received: from EUR01-VE1-obe.outbound.protection.outlook.com (EUR01-VE1-obe.outbound.protection.outlook.com [40.107.14.101]) by mx.groups.io with SMTP id smtpd.web10.26076.1684253238247554291 for ; Tue, 16 May 2023 09:07:20 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@astro-kom.de header.s=selector2 header.b=WRtn0Ic+; spf=pass (domain: astro-kom.de, ip: 40.107.14.101, mailfrom: a.baumfalk@astro-kom.de) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=c+UFuDKLEknyxvb6a+peg7JoFMmDD49u9URGoSRZtLHPk7/gxehWqROyzCxdrPaf9spEmjZjvQSaTlddyaHNj+WvlqCaDyRwWlnhfFy6YFd6lFsqC5xkde80jjwgiTYUVRZTcIoQhOM0RbHNQh/7Ozb1FHyAw+0AA5lteujmDBnX0HAMckenzs2o3sx8UJ1RhxIgRvIcsu7N2HQ32XE0DQMYhpg6nFHE108lBX4LTUHiwTJObWAO26N5pvNJIQpO4ieEqu+rqJ7yIcCw2VqV7ueBMVx+K4V/XKjBV+NPbRW9bG4PSEFa3wO9zM4hgU7xc4/mxKc5zNlcwtaLJB4GNw== 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=YVCCAv1Rt4OmFTTiLeggU3Ox37ckkuuhliEc7wfg+vk=; b=Xwup60rsPqlvjM8qE0SeeL7fYj+XIYz35uC+t6eFZLA0BOTJiHELIut4fadmUaYQGAHBGx/nrBprLiXQpZQCgq4ruhEHi5xV6FtdLPZRIiO2xa5ayR7JJsKCNSWY7pDXdR2rBNoQB6b2OdcMZ9QkEm5zBRQNbneBT6GhXpFzRSlgAmTcKgTNXtlkVrNGLqvneVQRyrsX+jrZEyzdnJxsXGbBbotnZ5LpBfmBFCW4uIvBi5LMWYrPTQ+AvWUD1fCItlMe4Pf5fodnTq5I6LoU9XWJEYUhL0DsvkATNQOCm8trl0qUJk1H/CuYL5HOJttkoCVthksmq0Dt87QZa6kDrQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=astro-kom.de; dmarc=pass action=none header.from=astro-kom.de; dkim=pass header.d=astro-kom.de; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=astro-kom.de; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=YVCCAv1Rt4OmFTTiLeggU3Ox37ckkuuhliEc7wfg+vk=; b=WRtn0Ic+zcGV/9huNpNdZW0769EldzDMI8Nw55wZEQRnTptCUGF6NlpKpZYhTdxcjqqQSaOLzLyneLaLf2ZKSXnqopC+sBInPdF9KC6JMMJF60w3/sn//Im/7Y5u+KijkXj+J1e4Adf1JJiwJqcZELfRavamTe1eq8V1lh5tB7NsP4PC5eSOD5o/BGfSP8fbxw41pSmgAWPzdg/s54IcTZ1pCZ2Jo5vpEt2erIDyGrIfol34v7ElDv8jSPVLNX/f8A35BSAYEL/RNjOfcuvvpv0CiIyjibrgK1740IQt9af/YLolSzS6FGWURAJSw6fMoyTbHFdPXTe9EnSbu+gLpg== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=astro-kom.de; Received: from AM0PR02MB4226.eurprd02.prod.outlook.com (2603:10a6:208:dd::31) by AS4PR02MB8183.eurprd02.prod.outlook.com (2603:10a6:20b:4ce::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6387.33; Tue, 16 May 2023 16:07:11 +0000 Received: from AM0PR02MB4226.eurprd02.prod.outlook.com ([fe80::7cf8:3151:61c2:e660]) by AM0PR02MB4226.eurprd02.prod.outlook.com ([fe80::7cf8:3151:61c2:e660%6]) with mapi id 15.20.6387.032; Tue, 16 May 2023 16:07:10 +0000 Message-ID: <94c18370-5149-8d5a-32ad-8c72a76e38e0@astro-kom.de> Date: Tue, 16 May 2023 18:07:08 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.9.0 Content-Language: de-DE To: bitbake-devel@lists.openembedded.org From: "Dr. Arno Baumfalk" Subject: [PATCH] fetch2/npm: evaluate PATH before patching HOME X-ClientProxiedBy: FR0P281CA0167.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:b4::13) To AM0PR02MB4226.eurprd02.prod.outlook.com (2603:10a6:208:dd::31) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AM0PR02MB4226:EE_|AS4PR02MB8183:EE_ X-MS-Office365-Filtering-Correlation-Id: dc418cf9-153c-402c-f8f5-08db56279ad2 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: XvDAxmv4b965P4TKvJj82TesU3TJ4ssyOTRojTEvOC/DMSdVI1ylGGl7+82JVT0ePmYalCzeyUafwH9GFJHGTR8I99wvsKoo7v3UVhhN/dkOmk/4/vWPOGLNcSfTxQB+YKKhhAqFxrtZljEv5RZ/n+99cgy30s0rT1LjP1gYr36e5wvvHj5rT/ohwMBDdELshZtmUVAw/ZiTTBIz1jQqNvvcibHl0GC1hdxTJHrOHRUYPD1tuwnhvWBMRxMsahbnGnzDAEgHY75Vf83a8TYzx67mqtmhVBPjY9LBrcex3ZKhr5p+v0BCuqE9+v/mb6WtkMefv5YAudtXnMlnSHi5gYEveZgkqTmk1vuGxrEklsCykZ/G3YomTNXDEGPS0FHj4D1dgc/hEGYULXM8t9PSsHMGzcci7Mg970u2gOuWtmnE3A5jmfrrt93dvP4TK7CxhTrbdnyoTrfRK3AM7PdC4VSIGQM9l61YcOF69jZPkwIGROHGJ+d7gVzsD/2gPO/iRXQdcHrLDwHaESuE3+iVK1m3cZdzMpPkNrUnCvAxY5UbIQo6CSMAByDbBGBCIDRzZU7nhXmYEZx0zP+hLUDJ/Y2N7OgmGG8/cnzUcQbKt2GJnaARo56In4qIJB1Iuy9BeViPyeEZ7WzyQQSWfxCvrY3Ft6hagIV2U1r3+fhOuAyu3XIWYw7UyS8hy7yXGhuJ X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AM0PR02MB4226.eurprd02.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230028)(396003)(376002)(136003)(346002)(39840400004)(366004)(451199021)(2906002)(41300700001)(15974865002)(86362001)(31696002)(186003)(478600001)(6916009)(66556008)(66946007)(66476007)(31686004)(5660300002)(8676002)(316002)(8936002)(52116002)(166002)(6486002)(38100700002)(53546011)(6506007)(6512007)(83380400001)(33964004)(66574015)(2616005)(36756003)(73022008)(41612003)(43740500002)(45980500001)(579004)(559001);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?4xXhuTBX3NDJe73as/Wv46oiX9ZY?= =?utf-8?q?d7uYGWmtGX/hlKZA6VZ4RAUQGaCaHNi1cYn7/bQFXFKJndFAT3vN7AKod2T3werN+?= =?utf-8?q?GVbQIO+jmuqRRHQ8Id1uARZv7OxuboHxWTsMYaAjAfU6Lh+I2CxA++SvEZ3dsT2KC?= =?utf-8?q?3bKjl2F+6bQWZfoxMJ4VUxj3y1SzOlNqEeIW4VwHNhZlqnjn4pqbHN2Z6ftnGOBsO?= =?utf-8?q?/M2nN3lOIIk/ecr4aw/WFCAb/l2/IzgBrEcwgup64RAmQhQHoxftf2/EWcEnS3xCO?= =?utf-8?q?0SpXx4UVIqhwYmVNdX7ryZkT20TvNlASr8wCNgG0MB7H1Q8girruqN0OgZrnM2cG7?= =?utf-8?q?dUa8TxbsImZ25cceBCe+tJKpOMYsiIfdvrIHA8cmovOkJSPJ6Z4Y4rfeaLHPkogde?= =?utf-8?q?2hVk7acV2KYFj5fCYmPUiQA7oqpndk6blJGw3fE50woy8gH+zOl9Ekz/Fd7n04i8W?= =?utf-8?q?gB4G77o6pzuDhyJfv4d0vjoMgxlAz8Vbi7s6VvWT5Mmq4v1K3HKSipNBXXaurTkB+?= =?utf-8?q?rj3rJgxjacI1lmU2RIpDWWpDj0PVsB+NortxQEAttD7kgw3Z/zVwDivBN71fq/GLt?= =?utf-8?q?+SpHEsc78kuNDgylmXBCm6xAzCJQN3+YNcTtPZG9YE1rOHyaEG4oDdQKgRKX3tcYB?= =?utf-8?q?RGSfQ3iVrSrDK3Y7RjsPwaU4XT+3cFUkIImus11oJnkVLl1DzMpZ6V4EVMfI8ZuTe?= =?utf-8?q?m5+Tc3TUEEu+16Dbqjtfb1Es7paBVSKNcUUHqPzZZb03u7S311QwXgXjlNHbPCWVA?= =?utf-8?q?AfwEmqpNNniFs+AgEi/p+JvZKAikAGm0+d/eyGA+i2nRk8hl4WZfFT4veMznNKG9i?= =?utf-8?q?U9FvEguH8Tm4GxFRNqaIDQXoRnudeD5BQm56mJCDWt0Y/cbIpZxcDXlnwG73xXkHY?= =?utf-8?q?9iDgTizJ+sTzuJyMwusrwXookjAodWsVGcfNMElKHWGolKnEoZfuP0FQqo7QHOkjG?= =?utf-8?q?DEqnv4X9+vg7bRBM0IFqy7irqyBNtccA30l0YADzLbIOQJ5amxhb3c5DX4UylYqZq?= =?utf-8?q?C+xtzq9MbVaSbMBIuy6KDkDpZOGWkXyG8FeVRxr3NbUsXFaondAqA2Y5MpyMB9P7z?= =?utf-8?q?OUxalyyy7b+e/i1rTgfXOAmsSpM40e4l1e3VCz3LWGdN22yUSfqnINfBqWcVn+zoO?= =?utf-8?q?dDL27ZwobnaDVQpccB0paoC4/M8PwcIzqbRBYCG2vAYvwOM0VZUUn4Pf4jPF6HDIr?= =?utf-8?q?HjM2w7L0MjWmXEH2JvqB12HeSpFVRjeKhx6Y4BCXcX5LkVcxF0yfjsIVeY1g0t2G/?= =?utf-8?q?4mFsSwAglWAb0ojHODk5Maic8anVxdMpVEZtRLprfP1d/rPWtuKLWMjdeb1xol65w?= =?utf-8?q?643CRVi3dZLtAVW5XR2zaxG5RYKT19MAOKiXBnqD2bBcElrPRllJPEm3MQE82Qxcm?= =?utf-8?q?11TibI6iPc+nM2jPgYCP4p9oILPcMS25cT1Mc9FB3QZBkkQ+gg19DfHXkqzwr4zpU?= =?utf-8?q?tRfnO6o88eAVmCjMkDnSUQ8XwDMqZ9srDLsxQUSs9NhZOyYHiuFMCFyLjAAa4GMKs?= =?utf-8?q?LYEOQhQNJGOgb5dx12NYiOYI2kAW5TMuN85GeAjMn+Ib7aKVkOd2Xv/BnCSqd1wMn?= =?utf-8?q?HttCG5uJTcf?= X-OriginatorOrg: astro-kom.de X-MS-Exchange-CrossTenant-Network-Message-Id: dc418cf9-153c-402c-f8f5-08db56279ad2 X-MS-Exchange-CrossTenant-AuthSource: AM0PR02MB4226.eurprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 May 2023 16:07:10.7736 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 3b05cd54-01bf-41a6-8a3a-9c3c3ffacd90 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: QM5rJkg78le99FB+xEGIMUJEYtvb0Duef0/85WW18SI5iBUk1lzruE4xac5XGboDoMMXk6LCg00sqGIAiSkxtA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS4PR02MB8183 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 16 May 2023 16:07:23 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/bitbake-devel/message/14790 From acafbccb32510bca036894287afbe83765bc2d30 Mon Sep 17 00:00:00 2001 From: Arno Baumfalk Date: Tue, 16 May 2023 17:18:26 +0200 Subject: [PATCH] fetch2/npm: evaluate PATH before patching HOME When the user configures the TMPDIR variable in a way that it contains $HOME (in local.conf), the DataSmart (d) object's PATH variable will also contain $HOME. As the NpmEnvironment patches HOME with a temporary directory, further evaluation of PATH will become invalid an the build breaks with an error (npm not found). As countermeasure PATH is evaluated *before* patching HOME. Signed-off-by: Arno Baumfalk ---  bitbake/lib/bb/fetch2/npm.py | 1 +  1 file changed, 1 insertion(+)              if not workdir: diff --git a/bitbake/lib/bb/fetch2/npm.py b/bitbake/lib/bb/fetch2/npm.py index 8a179a339a..e6d0598f5d 100644 --- a/bitbake/lib/bb/fetch2/npm.py +++ b/bitbake/lib/bb/fetch2/npm.py @@ -103,6 +103,7 @@ class NpmEnvironment(object):          """Run npm command in a controlled environment"""          with tempfile.TemporaryDirectory() as tmpdir:              d = bb.data.createCopy(self.d) +            d.setVar("PATH", d.getVar("PATH"))  # PATH might contain $HOME - evaluate it before patching              d.setVar("HOME", tmpdir)