From patchwork Wed Nov 24 14:47:25 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Herbrechtsmeier X-Patchwork-Id: 366 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 04458C433EF for ; Wed, 24 Nov 2021 14:48:11 +0000 (UTC) Received: from EUR04-HE1-obe.outbound.protection.outlook.com (EUR04-HE1-obe.outbound.protection.outlook.com [40.107.7.88]) by mx.groups.io with SMTP id smtpd.web08.6874.1637765286114657847 for ; Wed, 24 Nov 2021 06:48:10 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="body hash did not verify" header.i=@weidmueller.onmicrosoft.com header.s=selector1-weidmueller-onmicrosoft-com header.b=0td54vJP; spf=pass (domain: weidmueller.com, ip: 40.107.7.88, mailfrom: stefan.herbrechtsmeier-oss@weidmueller.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Yjc/o7cjJepGLmy6Q2nb8t6rL9Jbcwu0VuqHNebGMD2fjbg2pztpPmepurkdRiKOuTxokoofSBP6rExQ1jIMBTnRRyCvo5N9Rvm5xUq0u4E3lOHxYBHNs336xVj0S9T0hrWrVwlsmDBvJp7wowcMWK37vNbjZbSiWHRarEDIP7GMOdv53prW9qJw0HseRafPtiL8mqJ0lRRVF2Lh5Sl4KcM9fZ7laB0RmvdYGsxMEsfDqKPXM/b6/ikKkEyfbf8cwKw/1hSmbd+DynN7VEN032hjIrOiRa+vP/8CoVe8neR0ALDU6g+0DhQ/992rm3xCZbS0W+WJ/1UxjUx1ZA/q3w== 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=sz88teO6NvIEmO99g6r5SLtVTOZgC/G5K308B4U3k4c=; b=jPJt30suhEttWz9uJEQNrlZ/gR0ZlJL/mkaY8vVspIpM+UZhkB2pNdnWyLxf5fpGpC3fLeDHZSGshSCGFUCyU3qLJ+KmYg6QWXOJjGQ2frMLewaLUqq4ee/Tu3O4GLO+qDYnyO4EOc0IJGR7YCqWz6N1/d0V1IXHomZ9N0h4+8K5hNY1Ztjl5fP9c4EXM+JdQw9/NtT7eMeOccqG9Mz2crvLi5HW6Qs1qBMfzv1ntcEiypL3W2glWNu1EdOhsZIjGNXNtexAncSHrm9NQ9AWrpdlxXQcMpigcMmnko6bVe/5zvYj6dqK0ntJwgRpQP+38rhDVObL8FiHY2Zldoy81w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=weidmueller.com; dmarc=pass action=none header.from=weidmueller.com; dkim=pass header.d=weidmueller.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=weidmueller.onmicrosoft.com; s=selector1-weidmueller-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=sz88teO6NvIEmO99g6r5SLtVTOZgC/G5K308B4U3k4c=; b=0td54vJPcBJIg6UWzLxvycTwJtZCTp2jIWCgtRD9pWVXrjosNQIxSPYLDXqB8zioLl2a0dliRBmHrQSf+bWTrZa6QL638dpCBiiuFvLYdPppr0Auh4UnYD2OGiSL2iccgND+0HmiySSo50rpf4aNIxS7H9ehJgL7UsL++2OoEPg= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=weidmueller.com; Received: from PAXPR08MB6969.eurprd08.prod.outlook.com (2603:10a6:102:1d8::23) by PAXPR08MB6447.eurprd08.prod.outlook.com (2603:10a6:102:de::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4713.24; Wed, 24 Nov 2021 14:48:03 +0000 Received: from PAXPR08MB6969.eurprd08.prod.outlook.com ([fe80::f:41c4:eb10:5010]) by PAXPR08MB6969.eurprd08.prod.outlook.com ([fe80::f:41c4:eb10:5010%7]) with mapi id 15.20.4713.026; Wed, 24 Nov 2021 14:48:03 +0000 From: Stefan Herbrechtsmeier To: openembedded-core@lists.openembedded.org, Alexander Kanavin , Jasper Orschulko , Konrad Weihmann , Martin Koppehel , Richard Purdie CC: Stefan Herbrechtsmeier Subject: [RFC PATCH 01/15] openssh: Extend to provide native recipe Date: Wed, 24 Nov 2021 15:47:25 +0100 Message-ID: <20211124144739.2250-2-stefan.herbrechtsmeier-oss@weidmueller.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20211124144739.2250-1-stefan.herbrechtsmeier-oss@weidmueller.com> References: <20211124144739.2250-1-stefan.herbrechtsmeier-oss@weidmueller.com> X-ClientProxiedBy: AM5PR0701CA0015.eurprd07.prod.outlook.com (2603:10a6:203:51::25) To PAXPR08MB6969.eurprd08.prod.outlook.com (2603:10a6:102:1d8::23) MIME-Version: 1.0 Received: from DE10512.weidmueller.com (94.134.181.208) by AM5PR0701CA0015.eurprd07.prod.outlook.com (2603:10a6:203:51::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4734.21 via Frontend Transport; Wed, 24 Nov 2021 14:48:03 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 905d6126-64d6-4556-02bd-08d9af596b1d X-MS-TrafficTypeDiagnostic: PAXPR08MB6447: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:296; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: VFnzFgj1WN7TrEMFnCrGR47cr/OyZMatIC96gpcZrVDGGhq+uecgtc0fd3Tn8pqUefPxIMR2V96rF2fFLeqSNie6eMGd0rAnn7M0CID+vPPw1ChSwzjJoon45IK9qpkPO79lwMWn+Y8pge86LLfkM+zNtM4JwXJBrnl0/YwxTO9Zg6YKlOggPI3ibEH+onPp0rccNCfPT/Gu64ofyCRFXvTkbTCi0KpCUK+06bR9CQUBx0uQtP6axcn3834WdAhO92sJWJ0VdzGjy6uVnaPFjW1pX0oq6xrc1MGg+h7V9RHKHH2DJqTZnH7qbmG7O10DjQWuv7XEF4p0uqm3xxsNiu3Cz3teQJGTxrgNajXtqsrnWT5A3cUDVUBiKXjVxhV3EcXTPrcfZuXkDVqB4hTc4nDC3ly33ImAmcxGp8MJXGFuhQ7Rs/BlxgjQczaD6z/3QZOCU0CGObXtEjDoaaMA2wrQV2GIMAaNyAbXEiRupP6dsSyprJMvMpvkssMjUO4EouJ5rWyWIUQkRVEXrAAf0Xo1/pJGA+lgK124+7XnJYEW1wQVdI1P7Y+2NM8vw9UdDpy3dp2nPmzRM/4H5duLyaMpH8lmgSN/1kWczVd80MneQixOzBdTs/Cz/EILu55G1tVZR3pUNBLxPZLEh3sb9BDLMOsrdLLRy7PF5WYHdPNF0C2EChMcCth+cFua9vELagMFDPjbAyvy8EF5l+gqKQ== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:PAXPR08MB6969.eurprd08.prod.outlook.com;PTR:;CAT:NONE;SFS:(4636009)(366004)(508600001)(7696005)(38100700002)(38350700002)(52116002)(110136005)(2616005)(956004)(66476007)(66556008)(4326008)(66946007)(36756003)(83380400001)(186003)(4744005)(26005)(316002)(8676002)(8936002)(86362001)(5660300002)(107886003)(2906002)(6486002)(1076003)(6666004);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: FwiXycD9vn/BZcsRi5xoGunaeiOyYoYRJgkbVhV2apSGuExAq1Esdkg/iJPsbcnLC3L+1U75ki7lEB07ZNsExI1sePOGMe9GZbjScyGvGBJZcOACmcetnW3f7JlhtbNnVo4EqDJ92R02J0PI049R2ioJ2xOqt/QvOGEtkLn/FJVrpRsfJvgTddJJHN88jJ6jaS0gbY4cBOmWPdiY4QMFOjkVwzi8YgMOldUnkbZyBw++HU/T93BAeNDAkwKd5GGnEYPoche5+3j4A6j2PurEeGF9EXF3ElfD1biB07KY2bVfWzgrweP87G8QqsXqlJMoPJrvHRDtWqncHrR3n+26WAtqyinihkBdZkDnLNSvUs9pyfaVrxhvyY2/4zORrhq6turffmk6Mlw6otEX4kJlpsfh4QBqY6BVo/c6N/mSd20+iaR44F/on5BDhVftIIx9TY04DcyHAiSwKT4h9ze5TZQsVxRf2/tqGnHJNtyRkP25x9n47jS8Lf5TkLPM+jpCq415RWeLmR01erX6glGIBZfKyaMbBVgxNoaLI/O6c7Trc51dezHQ1uNplV9CQCtez4MrvtRwLXFvZSXvPHN2XWLXLYKgcah0c3EkybtnCMjZOdXaxgbRNznavJbwQ1ZKanNyrUOB6ihlzLWuLBnoL0A+pl+DWCINnVfhxviUSpQVjHCC7vu25tzJ8OPNLELj+30Lx8KRBHwTA3Gu+G6M00E9NV2Q4FysEQkoKDgR6wmJEgb/xVGwe5wDb0+W8UFPD3O0+DUIgYlKpyOEzuH+1pUoRw8302/RG51YN9dSu3/OyIF485yOdq8Gs5zyKLZh1PTomXZbiFRT0Ew2/Sd1CYPOCpvj8sdoOK/23ovuY35q/RWEddje/tyhWvj/+I47g1R0ba/ammu1a+lL+iCLapvZwONL1XmLP+ZdB5ZED7zBX4YtC7mPZdYlOjFX/Zs9eQKht+sZzKE1bfOEZifCUn6NU+ZxRz/Jofk0wMdKkalP3nzplTJt4H0sPWzoIqrpHMx0d0N0S1wFxgzUvT33mAAipbr5L45GkifXq3FZgd5/zYla1adh/oRdxbIO88immLqozxJluFtCOrcfnTc4B9jn0RJ15lNHwc0al0bXh8/oythh9YVhXW7wLAnCC9D5DySsPmOSstvfrHSTOu8KgCumSAlyKFp74y9nWe5KQ0XdZJTM3FgGlGSX/qusnPqABg3Bi9hC426i/J4oXUyCAKh2H3TL1RYvFwYmuiXw2XNTM4yByDqF0ZsTjgTToAJDl/cerQKqJt2gdcYrgGBvd3sCu8McTn8tdh7kNKYHk198W/q+Alc9rK4Posf1G3OviLCfV/4fz6P8cm188IM7rQfe/J9dB34Fq1uc+R29t+eVmre2r9oyqz/8JyNErrMB/4A/UUBLTcrr106olrF+DLuaEq6e9hqmvtZc0DvX75QdKXCVhUPNdTtly77l5C5Wa8Ltx7QdNAy6WI/ltqAiaY6iE38AG64lLLFmJGvHNw/1eXIuD8TqDprvF8CXNxGM+1rX4MzS7WEvklU6CfR+UqdgooVNGLS6yZ+xZhSgG2t6S/5wD+exoyKkTs/aiNg1zVNdy1xpR8RJQ8rOtLH6zQiz9rHCysY/ylQ7zc13qn8= X-OriginatorOrg: weidmueller.com X-MS-Exchange-CrossTenant-Network-Message-Id: 905d6126-64d6-4556-02bd-08d9af596b1d X-MS-Exchange-CrossTenant-AuthSource: PAXPR08MB6969.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Nov 2021 14:48:03.4774 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: e4289438-1c5f-4c95-a51a-ee553b8b18ec X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: kp/Z74w3fBNq1RsLP36gabCs5JeDjGRvppnoHOcxLYvvaQ3pS1meg5H4V+O3OPQeo/P5pmPwRF2PM57KzQK7nQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXPR08MB6447 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 ; Wed, 24 Nov 2021 14:48:11 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/158696 From: Stefan Herbrechtsmeier Signed-off-by: Stefan Herbrechtsmeier --- meta/recipes-connectivity/openssh/openssh_8.8p1.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-connectivity/openssh/openssh_8.8p1.bb b/meta/recipes-connectivity/openssh/openssh_8.8p1.bb index ee86bb92ab..33fdf1e8ab 100644 --- a/meta/recipes-connectivity/openssh/openssh_8.8p1.bb +++ b/meta/recipes-connectivity/openssh/openssh_8.8p1.bb @@ -182,4 +182,4 @@ ALTERNATIVE_PRIORITY = "90" ALTERNATIVE:${PN}-scp = "scp" ALTERNATIVE:${PN}-ssh = "ssh" -BBCLASSEXTEND += "nativesdk" +BBCLASSEXTEND += "native nativesdk" From patchwork Wed Nov 24 14:47:26 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Herbrechtsmeier X-Patchwork-Id: 367 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 F4087C433F5 for ; Wed, 24 Nov 2021 14:48:11 +0000 (UTC) Received: from EUR04-HE1-obe.outbound.protection.outlook.com (EUR04-HE1-obe.outbound.protection.outlook.com [40.107.7.88]) by mx.groups.io with SMTP id smtpd.web08.6874.1637765286114657847 for ; Wed, 24 Nov 2021 06:48:11 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="body hash did not verify" header.i=@weidmueller.onmicrosoft.com header.s=selector1-weidmueller-onmicrosoft-com header.b=sRKm5ALc; spf=pass (domain: weidmueller.com, ip: 40.107.7.88, mailfrom: stefan.herbrechtsmeier-oss@weidmueller.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=a7OVYBdi5N5qO44RZApMTCywpLkQqI0lFBitkKNCPs2heztoZ3bjRDxcDlmc4d5djW9yhKEclIE/75q7Wl2HwAqCBSmItl9LkYZDaIVboV2XyOOSS9Nb5albLlCuNzWEggH5bpUc/BRkmbYVxppM+BBPu9uLnc7Prw7TYWTAhlvD5/R+s6c3VMgrALgaIX1+lakiA3RVuqDMuUvO0SE04eZNplHk4VpN/op6Sb64QLMGbuOhT6sqnL+dKQcaomN8nkkjJ5lk6vTzYZNL26DuMFiWRHNC/TB0F0hR6tooNxrMNPw1WWxpVcSwTRwbwF19tcGx7uor+jPTMlVcfonQ7A== 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=C4aK2zT3YUBaI8kpiQhpgiMzQisK+tjjQdnPM72PzNI=; b=E9oIsO3EV4xAf0MrMUZQE0cd+R3GuUgv9Gl7B/v/XbBkL20ybWsc4HCEYFP+iu5u95aBFXIb326bCcLyE46A04ej9KxK4a25K9EUlmb0vs+TTG87ZWSSJ7ypWpW3+GfB3D6kE3CYX7253Tx2/gr9+rT5yuwAyzuBboZBH5UFr+dFBU+F5hOATiJsxRZgjRqUk26IWx3SdUWqiIftdahlwLMGwae+cuaVc5LPjgWk4JcQAAN28004T/8od15Yi6Azj/pRqqiqfFi9T6hHaqJJOoh6mTiplgrfV/mp9OPHbXdpEVPAmDyu+UonZoPLHc92WBrFNDtBY3q2DG3lGgFuNQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=weidmueller.com; dmarc=pass action=none header.from=weidmueller.com; dkim=pass header.d=weidmueller.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=weidmueller.onmicrosoft.com; s=selector1-weidmueller-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=C4aK2zT3YUBaI8kpiQhpgiMzQisK+tjjQdnPM72PzNI=; b=sRKm5ALcGxBDoxVFTHxnVYnEzT+ZdcZP8dyrreaq3/qfRejVty71P6/wNGm3D8r9QgocA31aJ6kiKq3xy214abXaYAOdq4dfIrvNMLQ3xWWaX8AqU2Y+5Z4epwdMvu1tsw3z2BUUgcqAZRTiWvLZMa9BEeWjVcezGam+TIF+eKo= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=weidmueller.com; Received: from PAXPR08MB6969.eurprd08.prod.outlook.com (2603:10a6:102:1d8::23) by PAXPR08MB6447.eurprd08.prod.outlook.com (2603:10a6:102:de::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4713.24; Wed, 24 Nov 2021 14:48:04 +0000 Received: from PAXPR08MB6969.eurprd08.prod.outlook.com ([fe80::f:41c4:eb10:5010]) by PAXPR08MB6969.eurprd08.prod.outlook.com ([fe80::f:41c4:eb10:5010%7]) with mapi id 15.20.4713.026; Wed, 24 Nov 2021 14:48:04 +0000 From: Stefan Herbrechtsmeier To: openembedded-core@lists.openembedded.org, Alexander Kanavin , Jasper Orschulko , Konrad Weihmann , Martin Koppehel , Richard Purdie CC: Stefan Herbrechtsmeier Subject: [RFC PATCH 02/15] recipetool: Skip hbs extension in guess license Date: Wed, 24 Nov 2021 15:47:26 +0100 Message-ID: <20211124144739.2250-3-stefan.herbrechtsmeier-oss@weidmueller.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20211124144739.2250-1-stefan.herbrechtsmeier-oss@weidmueller.com> References: <20211124144739.2250-1-stefan.herbrechtsmeier-oss@weidmueller.com> X-ClientProxiedBy: AM5PR0701CA0015.eurprd07.prod.outlook.com (2603:10a6:203:51::25) To PAXPR08MB6969.eurprd08.prod.outlook.com (2603:10a6:102:1d8::23) MIME-Version: 1.0 Received: from DE10512.weidmueller.com (94.134.181.208) by AM5PR0701CA0015.eurprd07.prod.outlook.com (2603:10a6:203:51::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4734.21 via Frontend Transport; Wed, 24 Nov 2021 14:48:03 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: f8fb43a3-673a-40f9-028a-08d9af596b6c X-MS-TrafficTypeDiagnostic: PAXPR08MB6447: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:1284; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ueeYy+lsz3iapJiASCf5gn4zAQjSBuXIUMBMXDbHqttjRLxsy6TC2BzvE+eWoK/Tb3MzwtQzEPLZce7W4NYFHo+gv1K0Z6NFxTlwmwxVxClGjyZUgC3NyBmwGAPmFX2yTOdJdx6iA0upd/V7jrYNIrOQTOlahULmxhrlL8xaUtxeKaXjDoddq4scIU33+dWH4k2FHmlx6L22cK84EgaQMru1gMKcwjDqzn8yeI4oUOGYL5kUfCvOVS1oePt4fgDtel4bFpiPQr5hj2dEN2HpLmrFTozeOLYK/pAkSUzek9+pqBhXmkg3HnciFdhttvpXIFD9J5xOhJsGsvblwQzG8LfEogS2cYGjtk4yqWb+pnRvDBRxVQq7KGiVj5owJ2ApLRoonu4YBYx1qYPYKIjeAPE2I9putt8Ke3b+Rp9ovysc/PBcXM405BAfT/VSVDbp6sKeJrng+T4yhQa21IDBg0zlzclbjlqtrrKkG9GmtmCLzWo10YMHbYlsv2jlax4KbePVw2di678MfWlZBuKeWKM1tO30xeZVRRlS+BEHXHAMfHfSJaqS4hmNvZhSFK5yfmq5r21U/34O2C+Z4zfQNOHWCdOQE4vzflsqgz5GmvAonQ21KcTZl4KgqP1CUOlix0miyHHCHcf5pBHuf/vZM+6mrTUferVzNjvfI/yjcS+eJnjhtDJAq/6MDo7E0RsClkU4ef+osXZpjIhTCVrtRw== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:PAXPR08MB6969.eurprd08.prod.outlook.com;PTR:;CAT:NONE;SFS:(4636009)(366004)(508600001)(7696005)(38100700002)(38350700002)(52116002)(110136005)(2616005)(956004)(66476007)(66556008)(4326008)(66946007)(36756003)(83380400001)(186003)(4744005)(26005)(316002)(8676002)(8936002)(86362001)(5660300002)(107886003)(2906002)(6486002)(1076003)(6666004);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: wOfe7dh9+oXRDyhMvhnXug5q/iC3WqR3IXbgyrfjlHkB0GR7lB0zLRzwkWL25u+loyI6GW7V5TpU9S52+llS3+uTyunwHwrMFN6GxEy5ipRHD+lEnjS2r/iiEMMcLK/ttEUpPIypr7r/jXC0NSQ/DiUHauBqL68idnqdvUjgVHIKhegwtyHsUAajvLdWjGVA2F9TCCxBaCTcx2YGi4CZ3+omaSdrjBX1w/lWpqnAKT7YFQgcWluPa0DKGhmdFUkbi5LGk4UelY9eOqvMgNhjQKrRoYtM/RM7NC9ZpAbuofZRz7qglupRXpZV5A7Xscy+eiiotZeoUQqc3V9h5eqp7faaU/IL+KwqyYCRuedJFl86Oe/zMc4wqLsIaVYSexeRJI1OWKncnNeAr7z6bMeCjbfut4YtHusohvwyIprwEb/rVuXDkjUIW0TO84EN72OA4oaJoLVl3mhTqN7sEV2ii2/9JZNgqN3gKDK084SKeSQNCFRCYYnndkdDX+Q/2ggjxtwEDi6q0XKnnPbbwBNVmmPhKIIRC8M2ffkfgmvFhegnhHSORbce1osM9lxUV4QUsuLgRMZ3qmNK/ucQkw9Ce+XlOZBs/6dXCb/1jklce92UNOqhB/JJmsaPBwOKjQzs/DIOu7RGJcy8+cHkMVSv2vTBzjRZhIxD272fMtsqS6b/zjrfCGo2E1mUrxSTTWCA8xnMZJkCHNs1bcT4jeXeN+8+WiXwb0ydz1xHLlUGj8xJ9ziK3MF7MPfWll5WU9fXrGKn8xnGDRU5AcDpXtIw401TabzZV3RdSkvLYfIcL+mQdx4nKjJn87q7xXQ04Zfo0djNjvcWzPIF3EDVZgfJ6DYrd+Xs+2btWLvTGxZYYDlh45DrgZYrboXrIBITQA5SNCOAMYv9zWJAloxA280oZ/lILCT7b0RZUgM6ktN+VvLf97ERwo1v5+kbjU8CJBvG3tQCC3Zsv9bFsdqGMZpQeuk2Wca9TTHbBYsREsPaqwdUFBfAn2CeLcDU5eNCR+vNBSlKY4GCbka5w4lK33TMfK3h7rPbjbY4UqFnVxbIHWoZmEMFTy/P6YT7unPTnmbPB6BA3IXto8VZ4kUmnwX1T6DKwo9tH6Mcwi4PWmuHUnj9b1+aFtln8Wm1lwXFfC1ayjkNRilY07wYwlQgbJYdpoZTv8ja0J4QF7EN3rKHgn1sVHeMJ4k8ZiNyV64VYNaI/jO5a8mSoFzgGqGnM7V2dWK8bw6SYUjPg4Aso31LaFHAwUirDH2mxp6kg0ntBaiPQQiSpip75jD1LT5jUEP9CT94BUzqG5VA0fcJIQFiay26iSyZLqfeztAz7cwdiycXMxZBhxN628TnfU5tcBHfp62iD9NvS1mDNIqKk25UnO5waYlASyodEbtSngaUmeHPXaR2WBhAML9B6EVI9lDgr3BScA395HxFJYY0SGd6SBzTIgnQMd7CdUg4Brfz2Eey73kONWSnq+FpYdbpL8DAbYM7AVQIQcl27mhENPUDxocp5pE6Yq2HYD7Ar08e/NxLdiRecz1KzzbVfwjnsSTCAbtY44p+/qKzkoeL1QHYdWZ1KlN+qWgnWfc2LFafhExzS34j9bzBYug5u/VbLYSOA8q5u7B8AU3NMhalITUZOfw= X-OriginatorOrg: weidmueller.com X-MS-Exchange-CrossTenant-Network-Message-Id: f8fb43a3-673a-40f9-028a-08d9af596b6c X-MS-Exchange-CrossTenant-AuthSource: PAXPR08MB6969.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Nov 2021 14:48:04.2311 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: e4289438-1c5f-4c95-a51a-ee553b8b18ec X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 50Lo+r81GMzEYZaimIB5xnGdZ4lXdEbFpF1+tIbD0yaiVh6GuYpXMkC23yMUsI/y01bG/9nwgenbowvphyRJ0Q== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXPR08MB6447 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 ; Wed, 24 Nov 2021 14:48:11 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/158698 From: Stefan Herbrechtsmeier Signed-off-by: Stefan Herbrechtsmeier --- scripts/lib/recipetool/create.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/lib/recipetool/create.py b/scripts/lib/recipetool/create.py index b6c4564761..d41653e7ce 100644 --- a/scripts/lib/recipetool/create.py +++ b/scripts/lib/recipetool/create.py @@ -1191,7 +1191,7 @@ def guess_license(srctree, d): licenses = [] licspecs = ['*LICEN[CS]E*', 'COPYING*', '*[Ll]icense*', 'LEGAL*', '[Ll]egal*', '*GPL*', 'README.lic*', 'COPYRIGHT*', '[Cc]opyright*', 'e[dp]l-v10'] - skip_extensions = (".html", ".js", ".json", ".svg", ".ts") + skip_extensions = (".hbs", ".html", ".js", ".json", ".svg", ".ts") licfiles = [] for root, dirs, files in os.walk(srctree): for fn in files: From patchwork Wed Nov 24 14:47:27 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Herbrechtsmeier X-Patchwork-Id: 369 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 02054C433EF for ; Wed, 24 Nov 2021 14:48:14 +0000 (UTC) Received: from EUR04-HE1-obe.outbound.protection.outlook.com (EUR04-HE1-obe.outbound.protection.outlook.com [40.107.7.88]) by mx.groups.io with SMTP id smtpd.web08.6874.1637765286114657847 for ; Wed, 24 Nov 2021 06:48:13 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="body hash did not verify" header.i=@weidmueller.onmicrosoft.com header.s=selector1-weidmueller-onmicrosoft-com header.b=AlHPbJMZ; spf=pass (domain: weidmueller.com, ip: 40.107.7.88, mailfrom: stefan.herbrechtsmeier-oss@weidmueller.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Fq6O1lTHIBjkSyv/cmRk4FOne5K9BX0aOSb0n2TRS7u5O12TweVoHErSynwC8GDqqV6D1v8B+8jXKhBa27vY/XEBsBjJxAUahq71S3TtDDOUFqmVfv4PlLvHGPJbg92h5vCQE2Dx8+t4wsLeWWfRhOc97KamdpqVT2OpKs27QeUFjpyyWrOlqxISooZG3TeTqdxIoQh6FPqDFCyrtNFTjdvFkkecuO4bri6tp29aGnhbqkvFAam4+vQWMlPMVKgvYEeFveFj1HPM2sk/SMwRQrWnFiGoyWY5jSItIlb75DnlAvugIokiqMUJ1wjtB8ASGqXc6/OGrAvZHPkX8yM0Ng== 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=Jl8FGDsnZ5eFoZPDxQktpmK95u2QA25fQp3jylggMQQ=; b=gMoB8jhwE/Ro6T0qJex5iwI3LsXkzoaHtuhzqZt4vt8MLWcFaKcyi95YOX1NZ2TaR9Tv3eXuXSfb+z3d1DcUCCyT9x3OA5ZeHoXhX/SuR84cMt9iinxMyUJKfcZaxBm0wBj001vc/NrDUUwnJ0K6x80IAh1h0vfAhcCuMuwcTsT2ZjreABJrM62GAo1o/brT0AsA5c//EJvxotvPBn7l9oXXBTrMUUoRyVS7/IKeSuq7xCUvNsigm6Ldy8EDQWd6OB6kNnaW7CEa0OfLbnYrGYShlNv/Wh692Nbf1Bj6fx/ClEhQBWmCUCH4Werfn5MopDpqG36VnrUbSCW8vQz1IA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=weidmueller.com; dmarc=pass action=none header.from=weidmueller.com; dkim=pass header.d=weidmueller.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=weidmueller.onmicrosoft.com; s=selector1-weidmueller-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Jl8FGDsnZ5eFoZPDxQktpmK95u2QA25fQp3jylggMQQ=; b=AlHPbJMZ4P3IjjSx/kbggbqv4+eIXpRsaUirlPxZgT6C4nDkPypjgu1QDMvakRr0CWyvRX4FwWwDEjtcqXMx0LiUUJR+whKXL0bVIq1lCJ4T6ATxGaBZ3E5lD4ZZfY/JMcHb3NNn2udT92hSWcixlEIVpMOIr63X5rpMEwDLhXQ= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=weidmueller.com; Received: from PAXPR08MB6969.eurprd08.prod.outlook.com (2603:10a6:102:1d8::23) by PAXPR08MB6447.eurprd08.prod.outlook.com (2603:10a6:102:de::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4713.24; Wed, 24 Nov 2021 14:48:05 +0000 Received: from PAXPR08MB6969.eurprd08.prod.outlook.com ([fe80::f:41c4:eb10:5010]) by PAXPR08MB6969.eurprd08.prod.outlook.com ([fe80::f:41c4:eb10:5010%7]) with mapi id 15.20.4713.026; Wed, 24 Nov 2021 14:48:05 +0000 From: Stefan Herbrechtsmeier To: openembedded-core@lists.openembedded.org, Alexander Kanavin , Jasper Orschulko , Konrad Weihmann , Martin Koppehel , Richard Purdie CC: Stefan Herbrechtsmeier Subject: [RFC PATCH 03/15] externalsrc: Remove subsequent slash from B Date: Wed, 24 Nov 2021 15:47:27 +0100 Message-ID: <20211124144739.2250-4-stefan.herbrechtsmeier-oss@weidmueller.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20211124144739.2250-1-stefan.herbrechtsmeier-oss@weidmueller.com> References: <20211124144739.2250-1-stefan.herbrechtsmeier-oss@weidmueller.com> X-ClientProxiedBy: AM5PR0701CA0015.eurprd07.prod.outlook.com (2603:10a6:203:51::25) To PAXPR08MB6969.eurprd08.prod.outlook.com (2603:10a6:102:1d8::23) MIME-Version: 1.0 Received: from DE10512.weidmueller.com (94.134.181.208) by AM5PR0701CA0015.eurprd07.prod.outlook.com (2603:10a6:203:51::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4734.21 via Frontend Transport; Wed, 24 Nov 2021 14:48:04 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: b3c53cf5-b426-4941-7eca-08d9af596bdd X-MS-TrafficTypeDiagnostic: PAXPR08MB6447: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:346; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: PUncMgsd384lCJrPtbs85QO39u8eWtKcBylSWdme6OiUSiOzIcW+H9jGACSvw8Ypf5JbMHnGHJ4Umc/X8KgDk3zNYE1YdaQ0KE4apgMWu5TBjNn514yFT/2jvoWxITktWh8V+NlQSdMqWeppXe0fx3bJ7IUWcqax6g/De3NkmrQYW/NQoPrFZEo3juX37mvh+2IS9/r9uA6nvb08NODooatBuYoI/T4nqVhlpqXXbMLQL20gkenmHVnJGd3qoWCNvIOSXy6hDLBnS7XJv1xhwdCg8gtbvdRgbUTmFHdZ9PwXCMFNL5wVVfg/QcQQFm+bTB4ux9fLPoSQlKSwkGUnKXMYYCnQog6eMqdqwklCWmIUmLtJQHpD6HaRicGQHpb8aDbUbnjUbS5ox340H1TG5k3qGkLOlJIxAnSFUMSWz4KH3Wh70PVZ9a4hiMSuZMfHj/syjhs6ihxg0B6lXGU58u8jw2AYQhjKEic9QIQ/kzVSTfQ5HAr/1WJbJcHkMdORIo3NweQFgBcQHJPuMGm6PYD4LGwZ+iDPCfTrNaW70uzRYWCrwg+/1hpj5RpVbhcGEYEzaWcrjyZcALPC/FOjJ7MptzVIHW0kryqUaQ/CWD8Y6GHDTf2knM9SexL5G1hvrBBJ6qH/kpw6ANsEVJrm0qskZsz5x+QImUmmTAU9jmGAdAztrSpfOYXi0AMd3+dFaQ4t8XtA0f1LU7CGEt+U+w== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:PAXPR08MB6969.eurprd08.prod.outlook.com;PTR:;CAT:NONE;SFS:(4636009)(366004)(508600001)(7696005)(38100700002)(38350700002)(52116002)(110136005)(2616005)(956004)(66476007)(66556008)(4326008)(66946007)(36756003)(83380400001)(186003)(4744005)(26005)(316002)(8676002)(8936002)(86362001)(5660300002)(107886003)(2906002)(6486002)(1076003)(6666004);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Lp9lPpMiijSyUn2VBw+3diQtEMfgm7ID6X+MtmBdCuqL737ETE+uBIucHs8cbU/5YRsi3FRWiR5t6+QQ8M1lokdZEYzXbIvyiGccyl/D6MBYUuQ8nAjBtkGvshG/I8f44y5N/s86Wz6BY57FxmB/JBtPEdf/GwP0d+PWDUPb79HWGCd82wLLmwxPZQHFZHzDBuDQr0lwAP9BUT3xZp6yGtRY/Qj9T3CEuoc3BgRWoamBNiw/xT4FQn6jWZsxuQEPfV6RBk5nZgrgN7HIXHE25u03h6ss0f7fK5fbPf6QSj6Pt+Kvy8yE2ZxEmvN4vDveYoaKtQ6VLiJbc+X6BCHaxbE2zOfl0ROgVciQMVrmLxGfo5s9C9JRqhErbX5t8DJ7seYdKYY6dUxt7VjaHQehQYlZQs42LCqytf5+PDLOxQgv36Wo9OPzoKNUTmeBEuBVoEFxkVASLRu7/pJq4vt+4hiZ762ema3uC/vGdNYPzzuLmyElNSd3MQgpnfYDx5QgrM4AP+ZGPt4rYa/YKTVQkl5ENKWdW9iEpH7HiU8RZWLbz+0sbS6GHPVWo3XcFEZ9ckawk2lpGqYbm3BpSeKAAKKU/ixhkH3KpjQukfn/R+3gY/sc0NgSDIt0MuWtYzqTTu7Jg1xpKXKRfGT3UWEOnfm1dGNReenAmAb621qLvoyiGGHzljcK8inPZepvSv9UQ7QyRBrRkCCxGpODf0dedLr3TrA6/+gQ1THvJx2BbMK7PKH2PVypsVL8DDjkmd39DqP/k75tlJERb2idlam7KoqvXv7uiuH6l52tep7yaqKJxLtd8sj688fd9bQK0nRVep1Jl5GiW8tB+JafRcUISGSdt1AgudzX+wK1hKOwar3V94DtwFAbvDkGFKgM/QeFrG8jhqi0CdLWCsfZlcCHywsChexpl3dfwvV2n0y4eqKvK2FeJkIYwhYHgr5dIEn6pZxQZOtMWT8hEz0IgcL91dgnrK4J4vpOtZiCW/tBcPu/3mKwNmUu8qSwvRxckvOdEIKNL/8I1cGQFpbkcRzVYVxYR/GWhwZwJitGRRVilIoX2Lj9O5WAN+1Sqg1B7h6WHkbnPJBY+ATp2Vkm5xPiwXzYKyuPglI/iYlBTE0SsJK8RfNX6Bp+jP9iuklOuu89NFq/WolTNVZy+mb3f0VdPiuhQhg7ANueNTE/fnXveMqIOvqLQ4I/6K/7qPktzbH9H4XDrU22sDI3Vjv9QTDL00OnxfbCurp+hy16SngfIzqbhFVyxYFnb6dgRmibSSm60KlBOlppc/LWB03ZGEwmXWUpo0IjewIR0OatpP1QSL30hISGUgtYyBGIY3bBadCLrF4Xy/bx+6nUl7FBWETobDY0pV1pb55ZCfTcsRbsB2oZeaIfZpqq7FL6fsCuzYN0DnM4pdjjYtShEtdy7Po5Vb5aycP+/II/+ZJpp70deG5j0IChlwXs5/PiHIYXes1z5fe0R4e9uJACNIdA1FtwAMtFiW/A5EFVGkC5G2i1W9gyfMKG42+wMZqKXlEzUQwv0sfVdeh33e9mB6t8Mes4zpkxogYbVBvOPMfG/mxLMXc4hiF6LSwuArcU/+tgwC55PqIdB9RZVS4IIz8Df/ylFCv7L/WWk5Y/urMnRzS8Lbs= X-OriginatorOrg: weidmueller.com X-MS-Exchange-CrossTenant-Network-Message-Id: b3c53cf5-b426-4941-7eca-08d9af596bdd X-MS-Exchange-CrossTenant-AuthSource: PAXPR08MB6969.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Nov 2021 14:48:05.1152 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: e4289438-1c5f-4c95-a51a-ee553b8b18ec X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: Jv64QgbSXm86wEn8QvtNAhOTLoo4MUQf1MatTfjXKXXKRI5uuCGPAV2Qmil6M3beTqCMCxqwnY4LbuqeqT0imQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXPR08MB6447 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 ; Wed, 24 Nov 2021 14:48:13 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/158700 From: Stefan Herbrechtsmeier Signed-off-by: Stefan Herbrechtsmeier --- meta/classes/externalsrc.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes/externalsrc.bbclass b/meta/classes/externalsrc.bbclass index abfe24bace..959f2d7bc3 100644 --- a/meta/classes/externalsrc.bbclass +++ b/meta/classes/externalsrc.bbclass @@ -60,7 +60,7 @@ python () { if externalsrcbuild: d.setVar('B', externalsrcbuild) else: - d.setVar('B', '${WORKDIR}/${BPN}-${PV}/') + d.setVar('B', '${WORKDIR}/${BPN}-${PV}') local_srcuri = [] fetch = bb.fetch2.Fetch((d.getVar('SRC_URI') or '').split(), d) From patchwork Wed Nov 24 14:47:28 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Herbrechtsmeier X-Patchwork-Id: 373 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 01063C433F5 for ; Wed, 24 Nov 2021 14:48:15 +0000 (UTC) Received: from EUR04-HE1-obe.outbound.protection.outlook.com (EUR04-HE1-obe.outbound.protection.outlook.com [40.107.7.88]) by mx.groups.io with SMTP id smtpd.web08.6874.1637765286114657847 for ; Wed, 24 Nov 2021 06:48:14 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="body hash did not verify" header.i=@weidmueller.onmicrosoft.com header.s=selector1-weidmueller-onmicrosoft-com header.b=srkrzCjt; spf=pass (domain: weidmueller.com, ip: 40.107.7.88, mailfrom: stefan.herbrechtsmeier-oss@weidmueller.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=d0MLV8vTd12B0KfPRSIzI+rX7dNr0ONiZtuMUMWEz17B8jZhSV1WdzBUsouoXzDQ4wz6DYOEgOttCNnvyJZNG3whkD6Zcg8AMGMO7I1NBQLb6jzqb9joiwfinuMfj2qEkSCwaTWfPuzOwcZil+qKbtoRgMlGMgFDrg+8fwuCHSFX0UJOWLuKSHpip4yGS9dKM8WVlTCZsZIBJKcL2cCbfO1hdj26y0mVh+lY8sfJXWHTISfTVdfizQjCRXJy19Yq+9OCF6PkimDO46LfTZGqnQlbWxMQsv844p8lGTw3G0IlBBD1CUmaeTpHAMyE8w/eAYcvCzIB6yP+XgnLXqs60g== 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=oqt6BjPhtmSkcOMMoUlOmPnWwXi1L9ecKccpeqLq5jU=; b=ljnKQfW4trzbgxZQCmkOrVjpGOrShA/hJFIzBJP0twIL7aWqTcqKC8kMf5XRaAzxibK8ZXSkv3hX6MxnqoN3AMsfwLlLQskpaqP5AdzNCgFWDDFZMlmSln4HOMNds6qVfdwMtniaan3/7a+525Qdv6zTuLY9kU6fcPSamTcerMLFgscEPscVJVfTUvsO2y90fSV4uPbw7m24S7sXj1+I8ro8xV5Fl5ZplfmGsddj9a4zlo3HlShviLWEQBVERNgz9uJMzI3NUuxZJxqycdQaLpwjYWnG31mR8VelvMwQcRY11Jl+sBFFWWSJd3/KsvmT0nmmJdjSXsDLlvSx2E3EQg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=weidmueller.com; dmarc=pass action=none header.from=weidmueller.com; dkim=pass header.d=weidmueller.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=weidmueller.onmicrosoft.com; s=selector1-weidmueller-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=oqt6BjPhtmSkcOMMoUlOmPnWwXi1L9ecKccpeqLq5jU=; b=srkrzCjtFc7C0qr9aGoi9oxLZGz6tyhpRTTycVfKAhPXAqqiN0KiUjstfxsmX+iRqcyISnneq1WuUT4yCzsEWmKFiVaBxGxtD1d6xYQTbs1gnEozIHUuvRiceW9+eY+wtnq/cG9wx6aMKPzFCGK9r1v8fp7vVBWoQCY10QYtcQI= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=weidmueller.com; Received: from PAXPR08MB6969.eurprd08.prod.outlook.com (2603:10a6:102:1d8::23) by PAXPR08MB6447.eurprd08.prod.outlook.com (2603:10a6:102:de::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4713.24; Wed, 24 Nov 2021 14:48:05 +0000 Received: from PAXPR08MB6969.eurprd08.prod.outlook.com ([fe80::f:41c4:eb10:5010]) by PAXPR08MB6969.eurprd08.prod.outlook.com ([fe80::f:41c4:eb10:5010%7]) with mapi id 15.20.4713.026; Wed, 24 Nov 2021 14:48:05 +0000 From: Stefan Herbrechtsmeier To: openembedded-core@lists.openembedded.org, Alexander Kanavin , Jasper Orschulko , Konrad Weihmann , Martin Koppehel , Richard Purdie CC: Stefan Herbrechtsmeier Subject: [RFC PATCH 04/15] bitbake: fetch2: Add striplevel support to unpack Date: Wed, 24 Nov 2021 15:47:28 +0100 Message-ID: <20211124144739.2250-5-stefan.herbrechtsmeier-oss@weidmueller.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20211124144739.2250-1-stefan.herbrechtsmeier-oss@weidmueller.com> References: <20211124144739.2250-1-stefan.herbrechtsmeier-oss@weidmueller.com> X-ClientProxiedBy: AM5PR0701CA0015.eurprd07.prod.outlook.com (2603:10a6:203:51::25) To PAXPR08MB6969.eurprd08.prod.outlook.com (2603:10a6:102:1d8::23) MIME-Version: 1.0 Received: from DE10512.weidmueller.com (94.134.181.208) by AM5PR0701CA0015.eurprd07.prod.outlook.com (2603:10a6:203:51::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4734.21 via Frontend Transport; Wed, 24 Nov 2021 14:48:05 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: f28df9c7-fae8-490e-a7ce-08d9af596c68 X-MS-TrafficTypeDiagnostic: PAXPR08MB6447: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:127; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: BIYNw6mblLX/BItwNBKcEFCGvU2q0iOCdHti8IsWFYVtgVxGFrG3Oedc0K8Yab5MI4WIR+O22Q4fTahqmsKxOQUb+HmT2UmsGp7TPmHRrnOI368q1yI39pXQ3q0HLSUcUsSX47uaSytSwYlQ/mKPmIeSH/QgnImsfrsND5BclRFNdHRk5tg/rY8aJtueCfTk7z/Pi/WssJ4bFoY+GJ1lh2KxJXmFHachqCR2dEecYqtoRtCxEoLDuc8Yp+r800RYbhyPKFdJHJAjEUeGooB28bUlhBrtxQFa6M59oVIy6CDf1YeROrrTXpgn0I6W+ukoJ8VfKy17YC9ac3DEvTEC73gHeEU3FuuUnzNVNuhQ4AgufMt9lRCEENvxC5ZUuHjYqDn/JmjdASXdNRm09ggQ5IxILRTUsW223drj/obfHOQL2IvnCK/Ub7P0K/Df0ATTtA90fCMwxx7DhVB7EdvrCEnrzy+jK4k1ZUyijridqmp24ik6ryn5mGS+3H2wT6sOkNnhAw8YWqKiw2vaiFTgz1JrLhlYba0cdPTc/minDPXdvxoSvV2z7W9YvMpcWQIdLeDRoXBj2aC8T2Cvab/WPjEM1M9Y1ewRSpLTNTb2bC2LiBUfEF5UZZm7p+p/r/6bL0qHPM59XSWDqxqfMbBAjwtXeViqn2HYGhDKSj14aYlECLLy4efnUStJaf9jSigw X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:PAXPR08MB6969.eurprd08.prod.outlook.com;PTR:;CAT:NONE;SFS:(4636009)(366004)(508600001)(7696005)(38100700002)(38350700002)(52116002)(110136005)(2616005)(956004)(66476007)(66556008)(4326008)(66946007)(36756003)(186003)(26005)(316002)(8676002)(8936002)(86362001)(5660300002)(107886003)(2906002)(6486002)(1076003)(6666004);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 28lvw4V4Von5cSlPm8RWVm5s2eYJDePxa7RnBcmosXWA4qSPOffYzxU1uDWmdpay4ilKyJ0MWrDGlj8bwMrs6MmhlPcB2ie1WiexV0mUZvGszHABWIq+7HB+HJTU51Z/UIaab2Vp8DVDEP5Vh2ziOkSpQbPYtQo+BdGCBZNTFRfZSjEhvcvVx6vp+93XSRcNqLJK7RzRtTNk3vcr/xH2lJ2MNdMpwMZ4O6Db5hcYYD7cKBWzgG4ErptiO3mInZlBQPFrQpxhQRx5jOD5r8i26iWZw00w3bFrVlpolEUhY3qanWAy/k9mQawaS4xlF6sfj3L5Y5VRlIdlUncSsWQChFukk7CBgCmQd9AnYVsn7IEgzO/zdlwHDhmvW9vrp8Hhnr99C1MyMFyS6rM5mhu+t0Nh5tuDPM6sW+GeLa5Fxs4ftBS+48IkdmLA+MpgUVlvBrjIH8nMG95amwtByGtDWkfeVysdBWti5qllwOSZMG2+mMbXLyee5omB2kug549liNrv387DikuzbWxuPNF1X6UqgHhTww6Yi6eDG+8Tbn4w8sspkwCXmoZ920R+qjH55xN9fUT/o7dgPYjU8uKLUgMEpVS+rWx69sccWHTjW5OwC3tN+gh46gB4zeJtnKmqwUOgyHghE9NK6MhrgTSbmZ+7/fWO81cLpoCMmuHqtR/Tbil+O2NBJf/URPLMmaYwdlBXj8bzZ5hCXvCupWVFsKvzUixdhqrPW9SR5ie/QJzhDTwdK/sSShXq4awHncpj84KwANaRlMlTuxadoZefgG2WOVnoHbICEmN25AoVLKS1V3mBoDy6waHERXFvrxB90lEivVtCxS/eLxqWHbskYaR8EKFPpF05skApwudQY/XOeDSj/SjTtThRf1O0A0PFt8VWFX7ZF6c3Rh22NJrdyLLBWAEmP96/65RgIKpM9SvagOyQgun/p2mKL5zUAPSyn+JRmfu3nOisbA1lTp5rANNF6fCO2Kt2ogDPHUCrZnqhcPjuAD6oajTAlXQvZRbbOk0UPfnXrmVHEYqVjqE2H07ys6o4tJGlCw4qdktxMkNhLGNWjrycHUEQmIFjzEN1u+rISNLHby2w01CTopR1FSeuEWswhZ9KBobtCJ0nJqSuudJdVLHggSHYLukcIDQ4GgavG4bTl1o0BQ3hGCtAbX5jKHJOt5AxHDFtfKr1MxEZ/X1SHIQVi8RZnKElWcM+VQ00Vm2miHykXceRm1U9hAvwjzS4ikPGva97nRX7IBt2/oMmDbvKtyHz6e4pCND/woq3bS4GerQ2Y3wRD5U/BibPjNpVeNCCrfshhV7I75B9yjhq+U+XNQx6UI7Rgb7qnaTZbR3ONJMalG+1vpv/TVrA2TpuMFD5j7q3D1cZR5Q6204/bxmmiEiXkiqm+ljXIqRxT7ZYq6NEl62e0XQ3tPgDms8yiA9Yn3oWy87XWAASqsmty5U1c/Ihli4n/Kd48FWMcgmdtojE1Hzf6L9Nyd2cqufKDVo+X7FdqB8H8TqE3GAgsK6zMlKuPAvKX1KfcXMZCejmQM7+27uIQSGnFxClkQO0PdP54x7Ac+9XAdrrc458HhwUk9tkcWsIamcF90wHeUuG8BVmCjTYPI0+6mP8auayznefyCTGLJGU5Ig= X-OriginatorOrg: weidmueller.com X-MS-Exchange-CrossTenant-Network-Message-Id: f28df9c7-fae8-490e-a7ce-08d9af596c68 X-MS-Exchange-CrossTenant-AuthSource: PAXPR08MB6969.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Nov 2021 14:48:05.7176 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: e4289438-1c5f-4c95-a51a-ee553b8b18ec X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: cAb1qnE8DnbINWOhhuAKDL8Ec1mvl2TtZvPvaUDY+apU1OLxnar+Mf+45R5mEq0ojyOVWbxO/m9Sa7q+YV+HZw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXPR08MB6447 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 ; Wed, 24 Nov 2021 14:48:14 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/158703 From: Stefan Herbrechtsmeier Add striplevel support to unpack tar archives into specified sub directories. The node package manager (npm) need this feature to unpack packages into its node_modules directory. Signed-off-by: Stefan Herbrechtsmeier --- bitbake/lib/bb/fetch2/__init__.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/bitbake/lib/bb/fetch2/__init__.py b/bitbake/lib/bb/fetch2/__init__.py index ded3106173..05b2d2e924 100644 --- a/bitbake/lib/bb/fetch2/__init__.py +++ b/bitbake/lib/bb/fetch2/__init__.py @@ -1462,6 +1462,9 @@ class FetchMethod(object): cmd = 'tar x --no-same-owner -f %s' % file elif file.endswith('.tgz') or file.endswith('.tar.gz') or file.endswith('.tar.Z'): cmd = 'tar xz --no-same-owner -f %s' % file + striplevel = urldata.parm.get('striplevel') + if striplevel: + cmd += ' --strip-components=%s' % striplevel elif file.endswith('.tbz') or file.endswith('.tbz2') or file.endswith('.tar.bz2'): cmd = 'bzip2 -dc %s | tar x --no-same-owner -f -' % file elif file.endswith('.gz') or file.endswith('.Z') or file.endswith('.z'): From patchwork Wed Nov 24 14:47:29 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Herbrechtsmeier X-Patchwork-Id: 374 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 01CFBC4332F for ; Wed, 24 Nov 2021 14:48:16 +0000 (UTC) Received: from EUR04-HE1-obe.outbound.protection.outlook.com (EUR04-HE1-obe.outbound.protection.outlook.com [40.107.7.88]) by mx.groups.io with SMTP id smtpd.web08.6874.1637765286114657847 for ; Wed, 24 Nov 2021 06:48:15 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="body hash did not verify" header.i=@weidmueller.onmicrosoft.com header.s=selector1-weidmueller-onmicrosoft-com header.b=0HF+1dWG; spf=pass (domain: weidmueller.com, ip: 40.107.7.88, mailfrom: stefan.herbrechtsmeier-oss@weidmueller.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=A81xWGjhx7KULVBeJ9rtnMUfIL9XqUCBaAKpUYz2s0o9MyPWB0OSfhYZFh2pDpdaWQ5f8W0tXvzYN6NP+tlHy404Xn9vQ7asDwp3anCSifU9TNK9eeAGGmbBBqlbaiTuvvNlPohfYV3iUPtYeNAEt6vJtwUlsVKitPD0xIVUF7v1+I6dY5LOrGkTODhphcpcxghhf7YcdE9cKUbNq80hGTC4fsEFxwR5mOH5TZxR03LrTMYXEtDNpZt/RuUtARrKjD4b3FBSZns2QXCCjA0O/Ui9AnA7/XGXYzcuBzv0A+yqHefTivUxOyHJHeicjCfuLZCzNgprtSYBUEOpg+11IA== 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=bL8BFLDKHRJw9DqaBkSkYo2u18bBCQDuJhvjShoo4QQ=; b=f95EWKAxh9DrdoK9rbW86qLpJqxz2FVfL+vGDWxdLPw88RajSzt4elVCi3x1myHfoNkUrIwvii9X3eJ/EAVOMaOBalqjGhQWypbfkF8nqFB2TJnWlDm7U93ScuxudgmQP9LISdj50MC07WAoDTOhyxzI4ppDgs9w7N+gNWq4mHCEpT26l1wKa3F2Dr6mJqiCHfbTjTvYNs7CpV+6lgNZHraMcgjyOmwLrzrPCrYl5se5//iBB/RFRTIreYnUdHBVf593jWZ577KaoqodpTn2fvMmxUfjZdQ19+/nMAo7n69KAs/VaGPly1/RdpoqNGTXhOEKN+bkuWh7qd6pmqb9Pg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=weidmueller.com; dmarc=pass action=none header.from=weidmueller.com; dkim=pass header.d=weidmueller.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=weidmueller.onmicrosoft.com; s=selector1-weidmueller-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=bL8BFLDKHRJw9DqaBkSkYo2u18bBCQDuJhvjShoo4QQ=; b=0HF+1dWGyVsy4XY7PEIGJKI78fJPPA5/Kp1X5m8zR24UXRwgcKN0+dKH8QZyC1Swy0r2mPw8c3LIuSeiu+LH8eEf/doyM3/Kn6CyIrQo/x12lYdKcmMhfB0DZUsvkd+rJVKQTJllOGFkJGz4KxGFWFKCyYt6OqpPiZ4ZJVLUQeM= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=weidmueller.com; Received: from PAXPR08MB6969.eurprd08.prod.outlook.com (2603:10a6:102:1d8::23) by PAXPR08MB6447.eurprd08.prod.outlook.com (2603:10a6:102:de::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4713.24; Wed, 24 Nov 2021 14:48:06 +0000 Received: from PAXPR08MB6969.eurprd08.prod.outlook.com ([fe80::f:41c4:eb10:5010]) by PAXPR08MB6969.eurprd08.prod.outlook.com ([fe80::f:41c4:eb10:5010%7]) with mapi id 15.20.4713.026; Wed, 24 Nov 2021 14:48:06 +0000 From: Stefan Herbrechtsmeier To: openembedded-core@lists.openembedded.org, Alexander Kanavin , Jasper Orschulko , Konrad Weihmann , Martin Koppehel , Richard Purdie CC: Stefan Herbrechtsmeier Subject: [RFC PATCH 05/15] bitbake: fetch2: Support archives with missing search directory mode Date: Wed, 24 Nov 2021 15:47:29 +0100 Message-ID: <20211124144739.2250-6-stefan.herbrechtsmeier-oss@weidmueller.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20211124144739.2250-1-stefan.herbrechtsmeier-oss@weidmueller.com> References: <20211124144739.2250-1-stefan.herbrechtsmeier-oss@weidmueller.com> X-ClientProxiedBy: AM5PR0701CA0015.eurprd07.prod.outlook.com (2603:10a6:203:51::25) To PAXPR08MB6969.eurprd08.prod.outlook.com (2603:10a6:102:1d8::23) MIME-Version: 1.0 Received: from DE10512.weidmueller.com (94.134.181.208) by AM5PR0701CA0015.eurprd07.prod.outlook.com (2603:10a6:203:51::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4734.21 via Frontend Transport; Wed, 24 Nov 2021 14:48:05 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 4a7915a3-a673-4911-4a05-08d9af596cc2 X-MS-TrafficTypeDiagnostic: PAXPR08MB6447: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:65; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: fHeQOD3GVr9KpK8YEQxgHICsphHHDz+ZtrCeQZyN41kliYOyKtyZR1/H2z7ovGwda1Ecg+EU0UH1BaWzwQ+0aDKsiLZLumsk5bZcobTgcpNIlX9uF9ma3MpJ3TDhnXcHd3XDBGnA81sgeTwroCfzOr9ZzjojLYw5AN6bIh4mGbuz2VCy2b5v1VMUpPLDmel+N/tDYH7oXTOiLnJ8OXWR+T+olwJSMBq+NEoReFmT2cgJ8Gk36dDIiV1c2F6KVm8n18p3RbSwMLeXhFKXj136hDlJp+IdEbedXIOhNk1sZxNa444bgUlHiUd6FkDiLenUZVcUwKcrw0r6PYwWMQHwRaEhpugVvQN3kAHlE/HUeLtxK30QGbRckTb5mtww9aHIPeQgmGut3LtxxMAbfmCXUyLA2NRUxau9+aopok6ESXD4LyvxCz+P7zWTQZtmCqXys9/4tm8MtkUiUJRSqqWeacv4zcGnDE7UyoINaz1kKikC1ICbZMPSCGLD94JCmOVdMEvWDBAST0aR9PExwghUclrt4NbpacoqEYYU+fMbb44URoU+6PCd4j8lRe7TFWJJoprv81CVckAJqixQn2zjgSL5XwNAdyYBiTf9/CXal1qGKK4oK8a+Sw4EkUkbqmyPeX8f2Pat3awAa4JgtPkcsWuJVDLiMlPJhhoe20BeVHRWcq/qBcp6LoSjkqgkSx4X X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:PAXPR08MB6969.eurprd08.prod.outlook.com;PTR:;CAT:NONE;SFS:(4636009)(366004)(508600001)(7696005)(38100700002)(38350700002)(52116002)(110136005)(2616005)(956004)(66476007)(66556008)(4326008)(66946007)(36756003)(186003)(4744005)(26005)(316002)(8676002)(8936002)(86362001)(5660300002)(107886003)(2906002)(6486002)(1076003)(6666004);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: gqXqCEQGWaCHtTb7GicOrh2tno4/h40iFDRtOE521deq3cs+81Vwkk7mgholluNkndATxn4haS9R0IHsCRDxO2dQ6aQaqXpUuyHNCLEOO7hNV5VeztC5AlRdINo3gTTKWL74MlSCkxQcidZNDmeDGrcOG6JPbI9BIbN7JaZMgHYSu7FK7/5Lq6rbR3WdrNh9iI1Lxb41DfmHWwxpJIqLH1SKToFLfcE0PxMauUuTCUA1LQySPt5S863cWS7jB55mQYPZiv1TPc130KRwEPpd1vTp4JnMLg9yvMWyLUegC9/jBIoJEFw1KpxnsnIUQm0mEefhv15r8aReD70am2/AbevdS7I8C4+iEC2gyGG/mGgPJmQrlob3j4fbhQjSmhpdoGbwaQdAb9DOvw8fnikbjRzeLeOO7Oe1qIW4OoBLIABh2DsIBpDDVdMeYBZyz4PvRSifoGffDzpWp2dh4vvADje9cdjfdZl56Yuk4NVyZlHVuKyrUftBuoiM2/VYE7S23UXjjyVRcaeEz7wuZg4NZkhwis9OBSqckp1Rx4NiTB00EV/XuiE9MDSdYqZ0S5MFrnm0GBCyg3mO/BdbTBdtagaXQxOU24jd2E30XKujqzzZnQ8Nc+1M8Hr5h8T6jnNNIt+Vn88pt2auk1ll1q1iADS3D3Ra5ao1fmfVzfWSK286nrS4v9ZHtp97YOtLedTyWhs2fBvMWC1TvD81jur9u/RPRjq8Xxy9QgGKMmsnDMmXzAvIwyWta8dpHzYm+QwthBE+qhpR9XBg8pHGRfseiGgPhNi48Kjs+C6eKtEYIQIu9stbSiqFcaCZ4cfZ3bpdaF/DvSsH4FarEiSMypk/MiJLZxhaIyPrztKW87elua2Y9wqFcD8RpfPtYdutF88WGO9ysuEnyQmaBYAK1rgw3jWPsx6uCxGrD5q9VU6LLh+Osd7jlaiIVAF/ee+6r+z7M9RFoJZi/P3oD7Aw3OLWFHqynQNkjso/dwVkbQ1vyxJAFPxff8FRkhqa0TehTLB9v47BrQkxPdx2/Km4ovkmXvVGIJs/iLGylZBZtUAZ4T0+hLUJo/PXHawkrwzOkjKa2EOVlV3KGceXSR3SKC0vEYtXybxyBTTbz7SK/Ki/TrjURxeKgSaKgkA6WvUMSaUXWadB97xatIcu6BL96Qv5jg1z92/0FOL2pUYhBxhs9Ue8hJ7Vt0fIucA/JA0jc9tHU8DYse6T+00fKLd2uUTVBjJlx1ruE44LYAMzmGXoO6D8aQLMDrVo/dTVJw/0YUroo7ZnqLZ2HzmRwWqT48JDJNpm4LVd16+ogDzIFozt/k0aJEAZND7b7SEash9UIRH+yWxk69ArOr2BfLHxnxkk6rAFeGIP3yoYDbyNJFLH5jSmXK4grKTU9IGYSfI1DUoUcS43dyWuvE7ZePE9jCoD7hHSZYI2o3QC+KV7MyPKuEZwzIUOHdKZdzDcFiUxiWmZDf7N5TAzG7JxcWnNhsyewQKGz7k7CRMzCTjy5FSteN4+FY7yVp8si+E26kVZCAFRIsBj+n++7jfSQse0Uigysr/A5thzQbTtfx/r2U3xglSCIVu1YKC4/yZtO6+qomaWd5I+K5M3+JvsrAhpupdqonLDPRMp1k5f0zCrrg5+D/Q= X-OriginatorOrg: weidmueller.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4a7915a3-a673-4911-4a05-08d9af596cc2 X-MS-Exchange-CrossTenant-AuthSource: PAXPR08MB6969.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Nov 2021 14:48:06.4284 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: e4289438-1c5f-4c95-a51a-ee553b8b18ec X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: UvA+vgJKwHheoeVJc4E4qn7EpS3n9PpKQOdnZzn6qchcvCpq+6+ttYdId4ZV6U4TAOBsz7PF3DAwLoqrdbW2mw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXPR08MB6447 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 ; Wed, 24 Nov 2021 14:48:16 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/158706 From: Stefan Herbrechtsmeier Signed-off-by: Stefan Herbrechtsmeier --- bitbake/lib/bb/fetch2/__init__.py | 1 + 1 file changed, 1 insertion(+) diff --git a/bitbake/lib/bb/fetch2/__init__.py b/bitbake/lib/bb/fetch2/__init__.py index 05b2d2e924..8ad4e3a5ec 100644 --- a/bitbake/lib/bb/fetch2/__init__.py +++ b/bitbake/lib/bb/fetch2/__init__.py @@ -1554,6 +1554,7 @@ class FetchMethod(object): path = data.getVar('PATH') if path: cmd = "PATH=\"%s\" %s" % (path, cmd) + cmd += " && chmod -R +X %s" % (unpackdir) bb.note("Unpacking %s to %s/" % (file, unpackdir)) ret = subprocess.call(cmd, preexec_fn=subprocess_setup, shell=True, cwd=unpackdir) From patchwork Wed Nov 24 14:47:30 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Stefan Herbrechtsmeier X-Patchwork-Id: 368 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 06725C4332F for ; Wed, 24 Nov 2021 14:48:12 +0000 (UTC) Received: from EUR02-AM5-obe.outbound.protection.outlook.com (EUR02-AM5-obe.outbound.protection.outlook.com [40.107.0.72]) by mx.groups.io with SMTP id smtpd.web10.6992.1637765289962517376 for ; Wed, 24 Nov 2021 06:48:11 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="body hash did not verify" header.i=@weidmueller.onmicrosoft.com header.s=selector1-weidmueller-onmicrosoft-com header.b=XA/m53Q3; spf=pass (domain: weidmueller.com, ip: 40.107.0.72, mailfrom: stefan.herbrechtsmeier-oss@weidmueller.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=k4W27XH/+xd9wC3fZ6iNxGT9yirEnfIFlJ5W22NQVnYcvUNvNAsFdKYSgTTVE3bCuPFhYhp/1Ylky/foIJEGFrQZRYOIqSJFjM6UfQxYXGmdp6VrGOfT7YNFknmSJNqCd4ZHFiJTHhfaXNPb2T5rJrOidHEV3UnaBA7bFEXosIVmzHgpt8RFrOcsMjbVEI+EkCc9IDlx4XxrqRPsxpkO26SSDnFxjqQf+cHE4re7KeVh5X1Nq6qKLqKP5hANrK2gc5qq3XxjifZAmrYiHmJP/1EdVB8Uof5aOvOtWQHkX3w4+1Ou/AoguJ0WfJ1MVAHhZv4anBKf1hjMJG9vvkHIdg== 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=/LCE44N0I8WJD181VgUoNvZCAOF0SXOVpATfCxtuT0Y=; b=atQVNr/WdC1nQ3nrwi2bMtX1nJL4DIkrQt0ytVubw/25goJNPlm0PyHqBXDr28GpclksXsHgG2Z8f8Ayw7N/HCPnek6xKc4zDwjg3213Uk2sPizW6MBmiCVsf7FvXMWOhewA1lw0aNv21pQkXfDXcLi9TYvNJNtr0LQXVqGtNw55KX7xg4oQVkXxV1fe+4jpuvPqNX6WlL3nvenjseEyDUUAwAziari2e8+RmYJ2oGW96u1Mik01GMhNGQQM63zAZhA96UO6I+pY7LqQ4fQlKLXhYJmepCr2deUGAi8UWChJtZrv8ofxEXRDHkaykt3nyxFO2YecOqiYQ31KR1Uz8Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=weidmueller.com; dmarc=pass action=none header.from=weidmueller.com; dkim=pass header.d=weidmueller.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=weidmueller.onmicrosoft.com; s=selector1-weidmueller-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=/LCE44N0I8WJD181VgUoNvZCAOF0SXOVpATfCxtuT0Y=; b=XA/m53Q3dAmYgLzEQD1KVFIDlniP31BSmGj/zHgyc6ACJCc9lPpKIHZO9il3yaQJ14dbzGWLDnFs9tjZSeqpg2/bUtNqxjUj76HLP9tmL7qVVk1MLmJa/Ddh1Uz8XIaS4biON8lOhfBKTbGTfCaTbQn3LgF5qsrOyeTSQXhyn24= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=weidmueller.com; Received: from PAXPR08MB6969.eurprd08.prod.outlook.com (2603:10a6:102:1d8::23) by PR3PR08MB5801.eurprd08.prod.outlook.com (2603:10a6:102:81::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4713.22; Wed, 24 Nov 2021 14:48:07 +0000 Received: from PAXPR08MB6969.eurprd08.prod.outlook.com ([fe80::f:41c4:eb10:5010]) by PAXPR08MB6969.eurprd08.prod.outlook.com ([fe80::f:41c4:eb10:5010%7]) with mapi id 15.20.4713.026; Wed, 24 Nov 2021 14:48:07 +0000 From: Stefan Herbrechtsmeier To: openembedded-core@lists.openembedded.org, Alexander Kanavin , Jasper Orschulko , Konrad Weihmann , Martin Koppehel , Richard Purdie CC: Stefan Herbrechtsmeier Subject: [RFC PATCH 06/15] npm: Rework to use plain npm commands and avoid npm cache Date: Wed, 24 Nov 2021 15:47:30 +0100 Message-ID: <20211124144739.2250-7-stefan.herbrechtsmeier-oss@weidmueller.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20211124144739.2250-1-stefan.herbrechtsmeier-oss@weidmueller.com> References: <20211124144739.2250-1-stefan.herbrechtsmeier-oss@weidmueller.com> X-ClientProxiedBy: AM5PR0701CA0015.eurprd07.prod.outlook.com (2603:10a6:203:51::25) To PAXPR08MB6969.eurprd08.prod.outlook.com (2603:10a6:102:1d8::23) MIME-Version: 1.0 Received: from DE10512.weidmueller.com (94.134.181.208) by AM5PR0701CA0015.eurprd07.prod.outlook.com (2603:10a6:203:51::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4734.21 via Frontend Transport; Wed, 24 Nov 2021 14:48:06 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 56fc3e71-c086-438c-787c-08d9af596d33 X-MS-TrafficTypeDiagnostic: PR3PR08MB5801: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:207; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: WBaHi5DXN79SAJnFaptzm8H0h7vTi3U8KGow5FGmGew+LZh1QNBzAeKADHu4i/03Onkjb8gRGT7Ws7+6rrFk9Ter66Rm6JfxP9AagmoMx7lDC5Ia+1uZK2vYOQ9WpVTaiZupX8tNj14CVBa8fTy/PkTUQ2A4dfAtnO6WpzzgByq9ZYROprmFeqFrYVIhNad1SGtTYoQFr9973K7JrShpSWtykxitSyBHhyNDNpeNehxmX1hH7MMPelh0p2ompWMCcfOUDYx9ZVYm5PT8FZBnezzgPYzYNk7n5Vf1XnCVKDL4QO5q0e+1+I3c6dg58cksYdl0ALNAXtkvBfjABCnULjP6rOluzc5rcryInxqzXKMU/FrAVgUsGrQFDb9jrGxGFyaUBGTiLAxupSpCRJVBw+iZeKCeyRq2sleCLNbDqkgw60BHzX/oXSenIl2bByLIMZ/yi3YziyzzMTyYOUQpql7XK/VeebmunPLE1E1JGmJ9+eaUp95Tar2nqkVjR55rX3dffdsSKEu9tU8TqRutunxHftKIKYaGJnYXWVxtQ9v4zbSRZqTwzWMOGuszAUZiF4z3kBMMfyueqasUyXOod/mPbgiNjYw55ftj9K6xaqkc3nhRDR5TIW8on7sUv4k6HSrvL174ZaQTj28B2PNEpXKpVLvVL6n45U750BhB1QjN5DpgZdkxhr31BLMGpI4++bAmOi9J5NcKaWmvqMnsaA== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:PAXPR08MB6969.eurprd08.prod.outlook.com;PTR:;CAT:NONE;SFS:(4636009)(366004)(6486002)(66476007)(66946007)(52116002)(66556008)(6666004)(8936002)(107886003)(8676002)(7696005)(2616005)(83380400001)(186003)(26005)(1076003)(66574015)(38100700002)(5660300002)(38350700002)(2906002)(956004)(110136005)(316002)(508600001)(30864003)(4326008)(86362001)(36756003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: wESrEOVTOdauf+aHqn27CDTzf/o5U1UBAjInuTD9nj0hDXbmWBFJsB4XyhD3trFvk6OuBr9abf/qnzZClZqUVWAquL9fDbSTlOk6XdG4SY3+Akzi25Mw7kGJ+BWZ41Q+pfbzI7zIO2iPJS6upfIcjyvQAA9usR9ybgqPPmqcOsIyRaYPpcGLZZL4CMkrG2ivOJDgySFnGOFcKuHieIY4k8a3Awkd8SO+e8T6LKkLd2adf8PQFWE/KIEVOc77+6hjbSPWmHa95TZUl895UIZHAZcm2ZwHxghKm/XtWNnOA9yawPSBmDGpk9Z59z9rTvF5TFUjT88jgE/Bf5sFGpaEDTy8FM9xPUJidjcNa9NGAQh2u1C1piu2tUHawBqw8yh6KMDrmP5dlMqw+/OL9yTN02sD5sqhmGSlKyhCcKPc8WWZEGlLdXskeseqkiVHYQwgm9xsZASGg2oMahlU/QC+OkdxbBDcln3/8W9lWQ2x2tLKO0XL57lP1EhYQbTJIJLvwUFqaxu8SCh60oZYwBUB5nh2HJJTplm0Bn0Gax70lKT7JxrdnOc49t8KVjH/h5y7/6SLUea7QWQz0Cbj8cQDvAAcyxC8q4E+y4Da1HkyLHM2YpzUVVFkFYTthmAxrPzrC6VHJZJEE7gtgw/L27Fsm/nVwf/UoVIz/J1MZqpcNvnxcuOs6K10GqFkSLF293hnqmVRtyy3jLdVnBtzIlJ/ckR/kZFPA8lv5+R5gia7IqkIGtngyVFeiGsX/Zfez3RHjHJqSKjb5lXW4i3Uih73fWCQEjI5diLu0pbGoRn15iVuyyRcVODZHCT/2GQJr2QCbxkGMMh4LhP0QUas1tjBphx8PwakFKcd3jd4q9Y4qni895uNGPCbEHCiQ+IlmDoFTXbGT1okKkGI4YhFqnltiQMhn4yz8u20BBNQ+v/lkK94dx7rxUhEZNM5vkhCS/iN7iJ9LEbrU7oalR+jWGGiSgmhMM9irb++EFzMv9kIK4ebmya2V1FHHQjgC1yacvvWRbpGkpk63g0zIpc0mTpslFOR8DoIS8af5e8OSlliAjxNcgejE98tdzGZWCMSe5FWhpe1vra9aXbZDUPz4wYQxtT58FEob8iKvrNhLcw8cmnm1d2MmVRTIcnb+sMzjZEQCT6PAIZcYPs0z2SDTNXSK74PSJfIqjR7vCJo0vCUmTaSJC3awCFZuoL3yvu1g0MQLmRS4kXLXN/txAx1EAMizttssBgoN32/6i36gCRuKXUg7VZdCrhle9l/DIHSwD/DvmaEzhw7qIc3Ss+5vY1gPZpVph4fUu/uQE51K3GgPjmLfDRTGpkmpshrSJgyk7qtGILyW8zTu6ZC+g7lLX5clvm4aj3VHA8/VkkxLTrX7btCuGWpdHfJAepbvGYVHm07c5HsZVL8WE81V/0raAxRE0b8Z6Z8pd8A8yJKCYI97JB7V2RnYcE2VhpK9S48gOC9eUQNPK7XD/4h8URQI0CxU0pbSNSHrnhYL+oDvlbo12SR/fBQZP0ftGKWPv/mtKvVpp5LKXxUJazG4M7Vbzd6oclTMlphsXcPuewAF5kr1/IBSeJ6IFWqHOODAsKPfoyULdeEPKq+57ugrE6L0AFztfqkkfQXuBQ7rHw1rwhCrPQ= X-OriginatorOrg: weidmueller.com X-MS-Exchange-CrossTenant-Network-Message-Id: 56fc3e71-c086-438c-787c-08d9af596d33 X-MS-Exchange-CrossTenant-AuthSource: PAXPR08MB6969.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Nov 2021 14:48:07.1353 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: e4289438-1c5f-4c95-a51a-ee553b8b18ec X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 2z/4ZxVtAuFbVJP3QqMDY5sz1crEioJhGwhggzY/hnbJIsQ60YBIojScvOZKL7AFM8mNK7bWSg/Y3W9qtDJanQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PR3PR08MB5801 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 ; Wed, 24 Nov 2021 14:48:12 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/158697 From: Stefan Herbrechtsmeier Rework the npm class to use plain npm commands and remove the usage of the npm cache to speed-up builds. Signed-off-by: Stefan Herbrechtsmeier --- meta/classes/npm.bbclass | 340 +++++++++++--------------------- scripts/lib/devtool/standard.py | 6 +- 2 files changed, 119 insertions(+), 227 deletions(-) diff --git a/meta/classes/npm.bbclass b/meta/classes/npm.bbclass index ba50fcac20..cb22dc6998 100644 --- a/meta/classes/npm.bbclass +++ b/meta/classes/npm.bbclass @@ -1,7 +1,12 @@ # Copyright (C) 2020 Savoir-Faire Linux # +# Copyright (C) 2021 Weidmüller Interface GmbH & Co. KG +# Author: Stefan Herbrechtsmeier +# # SPDX-License-Identifier: GPL-2.0-only # +# A bbclass to install an npm package and build its dependencies. +# # This bbclass builds and installs an npm package to the target. The package # sources files should be fetched in the calling recipe by using the SRC_URI # variable. The ${S} variable should be updated depending of your fetcher. @@ -16,18 +21,29 @@ # # NPM_INSTALL_DEV: # Set to 1 to also install devDependencies. +# +# NPM_BUILD_PRUNE_FOR_PRODUCTION +# Set to 0 to keep installed devDependencies. inherit python3native DEPENDS:prepend = "nodejs-native " -RDEPENDS:${PN}:append:class-target = " nodejs" +NPM_RDEPENDS = "nodejs" +RDEPENDS:${PN}:append:class-target = " ${NPM_RDEPENDS}" -EXTRA_OENPM = "" +EXTRA_OENPM ?= "" +EXTRA_OENPM_BUILD ?= "" NPM_INSTALL_DEV ?= "0" NPM_NODEDIR ?= "${RECIPE_SYSROOT_NATIVE}${prefix_native}" +def npm_flag_dev(value): + if bb.utils.to_boolean(value, False): + return "--also=development" + else: + return "--only=production" + def npm_target_arch_map(target_arch): """Maps arch names to npm arch names""" import re @@ -43,247 +59,124 @@ def npm_target_arch_map(target_arch): NPM_ARCH ?= "${@npm_target_arch_map(d.getVar("TARGET_ARCH"))}" -NPM_PACKAGE = "${WORKDIR}/npm-package" NPM_CACHE = "${WORKDIR}/npm-cache" -NPM_BUILD = "${WORKDIR}/npm-build" - -def npm_global_configs(d): - """Get the npm global configuration""" - configs = [] - # Ensure no network access is done - configs.append(("offline", "true")) - configs.append(("proxy", "http://invalid")) - # Configure the cache directory - configs.append(("cache", d.getVar("NPM_CACHE"))) - return configs - -def npm_pack(env, srcdir, workdir): - """Run 'npm pack' on a specified directory""" - import shlex - cmd = "npm pack %s" % shlex.quote(srcdir) - args = [("ignore-scripts", "true")] - tarball = env.run(cmd, args=args, workdir=workdir).strip("\n") - return os.path.join(workdir, tarball) - -python npm_do_configure() { - """ - Step one: configure the npm cache and the main npm package - - Every dependencies have been fetched and patched in the source directory. - They have to be packed (this remove unneeded files) and added to the npm - cache to be available for the next step. - - The main package and its associated manifest file and shrinkwrap file have - to be configured to take into account these cached dependencies. - """ - import base64 - import copy - import json - import re - import shlex - import tempfile - from bb.fetch2.npm import NpmEnvironment - from bb.fetch2.npm import npm_unpack - from bb.fetch2.npmsw import foreach_dependencies - from bb.progress import OutOfProgressHandler - - bb.utils.remove(d.getVar("NPM_CACHE"), recurse=True) - bb.utils.remove(d.getVar("NPM_PACKAGE"), recurse=True) - - env = NpmEnvironment(d, configs=npm_global_configs(d)) - - def _npm_cache_add(tarball): - """Run 'npm cache add' for a specified tarball""" - cmd = "npm cache add %s" % shlex.quote(tarball) - env.run(cmd) - - def _npm_integrity(tarball): - """Return the npm integrity of a specified tarball""" - sha512 = bb.utils.sha512_file(tarball) - return "sha512-" + base64.b64encode(bytes.fromhex(sha512)).decode() - - def _npm_version(tarball): - """Return the version of a specified tarball""" - regex = r"-(\d+\.\d+\.\d+(-.*)?(\+.*)?)\.tgz" - return re.search(regex, tarball).group(1) - - def _npmsw_dependency_dict(orig, deptree): - """ - Return the sub dictionary in the 'orig' dictionary corresponding to the - 'deptree' dependency tree. This function follows the shrinkwrap file - format. - """ - ptr = orig - for dep in deptree: - if "dependencies" not in ptr: - ptr["dependencies"] = {} - ptr = ptr["dependencies"] - if dep not in ptr: - ptr[dep] = {} - ptr = ptr[dep] - return ptr - - # Manage the manifest file and shrinkwrap files - orig_manifest_file = d.expand("${S}/package.json") - orig_shrinkwrap_file = d.expand("${S}/npm-shrinkwrap.json") - cached_manifest_file = d.expand("${NPM_PACKAGE}/package.json") - cached_shrinkwrap_file = d.expand("${NPM_PACKAGE}/npm-shrinkwrap.json") - - with open(orig_manifest_file, "r") as f: - orig_manifest = json.load(f) - - cached_manifest = copy.deepcopy(orig_manifest) - cached_manifest.pop("dependencies", None) - cached_manifest.pop("devDependencies", None) - - has_shrinkwrap_file = True - - try: - with open(orig_shrinkwrap_file, "r") as f: - orig_shrinkwrap = json.load(f) - except IOError: - has_shrinkwrap_file = False - - if has_shrinkwrap_file: - cached_shrinkwrap = copy.deepcopy(orig_shrinkwrap) - cached_shrinkwrap.pop("dependencies", None) - - # Manage the dependencies - progress = OutOfProgressHandler(d, r"^(\d+)/(\d+)$") - progress_total = 1 # also count the main package - progress_done = 0 - - def _count_dependency(name, params, deptree): - nonlocal progress_total - progress_total += 1 - - def _cache_dependency(name, params, deptree): - destsubdirs = [os.path.join("node_modules", dep) for dep in deptree] - destsuffix = os.path.join(*destsubdirs) - with tempfile.TemporaryDirectory() as tmpdir: - # Add the dependency to the npm cache - destdir = os.path.join(d.getVar("S"), destsuffix) - tarball = npm_pack(env, destdir, tmpdir) - _npm_cache_add(tarball) - # Add its signature to the cached shrinkwrap - dep = _npmsw_dependency_dict(cached_shrinkwrap, deptree) - dep["version"] = _npm_version(tarball) - dep["integrity"] = _npm_integrity(tarball) - if params.get("dev", False): - dep["dev"] = True - # Display progress - nonlocal progress_done - progress_done += 1 - progress.write("%d/%d" % (progress_done, progress_total)) - - dev = bb.utils.to_boolean(d.getVar("NPM_INSTALL_DEV"), False) - - if has_shrinkwrap_file: - foreach_dependencies(orig_shrinkwrap, _count_dependency, dev) - foreach_dependencies(orig_shrinkwrap, _cache_dependency, dev) - - # Configure the main package - with tempfile.TemporaryDirectory() as tmpdir: - tarball = npm_pack(env, d.getVar("S"), tmpdir) - npm_unpack(tarball, d.getVar("NPM_PACKAGE"), d) - - # Configure the cached manifest file and cached shrinkwrap file - def _update_manifest(depkey): - for name in orig_manifest.get(depkey, {}): - version = cached_shrinkwrap["dependencies"][name]["version"] - if depkey not in cached_manifest: - cached_manifest[depkey] = {} - cached_manifest[depkey][name] = version - - if has_shrinkwrap_file: - _update_manifest("dependencies") - - if dev: - if has_shrinkwrap_file: - _update_manifest("devDependencies") - - with open(cached_manifest_file, "w") as f: - json.dump(cached_manifest, f, indent=2) - - if has_shrinkwrap_file: - with open(cached_shrinkwrap_file, "w") as f: - json.dump(cached_shrinkwrap, f, indent=2) -} - -python npm_do_compile() { - """ - Step two: install the npm package - Use the configured main package and the cached dependencies to run the - installation process. The installation is done in a directory which is - not the destination directory yet. +NPM_PRUNE_FOR_PRODUCTION ?= "1" - A combination of 'npm pack' and 'npm install' is used to ensure that the - installed files are actual copies instead of symbolic links (which is the - default npm behavior). - """ - import shlex - import tempfile - from bb.fetch2.npm import NpmEnvironment +B = "${WORKDIR}/build" - bb.utils.remove(d.getVar("NPM_BUILD"), recurse=True) +NPM_SOURCEPATH ?= "${S}" - with tempfile.TemporaryDirectory() as tmpdir: - args = [] - configs = npm_global_configs(d) +export NPM_CONFIG_GLOBALCONFIG = "${WORKDIR}/npmrc" +export NPM_CONFIG_USERCONFIG = "/dev/null" - if bb.utils.to_boolean(d.getVar("NPM_INSTALL_DEV"), False): - configs.append(("also", "development")) - else: - configs.append(("only", "production")) - - # Report as many logs as possible for debugging purpose - configs.append(("loglevel", "silly")) +oe_runnpm_plain() { + HOME=${B}/root npm "$@" +} - # Configure the installation to be done globally in the build directory - configs.append(("global", "true")) - configs.append(("prefix", d.getVar("NPM_BUILD"))) +oe_runnpm() { + bbnote npm "$@" + oe_runnpm_plain "$@" +} - # Add node-gyp configuration - configs.append(("arch", d.getVar("NPM_ARCH"))) - configs.append(("release", "true")) - configs.append(("nodedir", d.getVar("NPM_NODEDIR"))) - configs.append(("python", d.getVar("PYTHON"))) +oe_runnpm_pack() { + oe_runnpm_plain pack --ignore-scripts --loglevel=warn "$@" +} - env = NpmEnvironment(d, configs) +oe_runnpm_rebuild() { + arch=$1 + shift - # Add node-pre-gyp configuration - args.append(("target_arch", d.getVar("NPM_ARCH"))) - args.append(("build-from-source", "true")) + # Create symlinks for package executables + # because rebuild doesn't respect the dependency tree + oe_runnpm rebuild --ignore-scripts - # Pack and install the main package - tarball = npm_pack(env, d.getVar("NPM_PACKAGE"), tmpdir) - cmd = "npm install %s %s" % (shlex.quote(tarball), d.getVar("EXTRA_OENPM")) - env.run(cmd, args=args) + # Rebuild dependencies + oe_runnpm rebuild \ + --arch=${arch} \ + --target_arch=${arch} \ + --build-from-source \ + "$@" } -npm_do_install() { - # Step three: final install - # - # The previous installation have to be filtered to remove some extra files. +do_generate_npmrc() { + cat > ${NPM_CONFIG_GLOBALCONFIG} <