From patchwork Thu Nov 25 12:59:51 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Herbrechtsmeier X-Patchwork-Id: 84 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 0B22FC433F5 for ; Thu, 25 Nov 2021 13:00:20 +0000 (UTC) Received: from EUR02-VE1-obe.outbound.protection.outlook.com (EUR02-VE1-obe.outbound.protection.outlook.com [40.107.2.59]) by mx.groups.io with SMTP id smtpd.web10.11801.1637845217309637017 for ; Thu, 25 Nov 2021 05:00:19 -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=Iov0nSsZ; spf=pass (domain: weidmueller.com, ip: 40.107.2.59, mailfrom: stefan.herbrechtsmeier-oss@weidmueller.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Rd8cv11B+H2V2UlCKCj4HLTDmkRTIEnrW4PL5l2A+KQTxgkYMsPHHk3srK3zCNdB0iniQmAvftOrZc2f/HdfCmwLLxA6ix+4RjDIefEKLw1r9bHcTJNUilesl98CsjkzmDd0KQ6WJ57N4VHeftWZVYI3vR+5Gn+vj3qHUmu6KzsMfBt+j6fwXymsrApy+uBt5LKNBy1NNnCh05YiuSiFFXk3PdMTN8gYxxuY3hPkoePoRCo6QG90W7mfWNDXg3EbAUWp2urLoKBAFY2dfCDhnFRPiCLY1euW27CVDGInVTFyW3uEg47EmhjwQgmD0WJOHRXkHdibuNfrr8d0qw2Hew== 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=2z2xQ5E38EvVALRJiU9UnUKA/0swZjqTeYDX2SMXtak=; b=VBjLBuYB60W3vbPvtuHpcjgBoM0ceunSZ/3/0QZ2e+42IwKAqV1ro5Q/nIcuF8WMp4rycKFcavrFSff8xT/LUTWeCV9wJ2bl3RC9Vo1t6wcxVeEHg48w9x0ijKFynYOq8mOq4PziBB3N+1PtwX2STd1XcfrWRa+D0hsuU1Ku9lZ3f0HAvqLuQFtvU00poBRQIN/rndMQYhwTmBU68eyPnI/bQXwI3m4V4msJ8ThOlnbcfZMDkrJp5uYsKVS5gcCijVBfVSgzpOta256tQWImDkYOnUAGmuPBM9yqcvY9wXohv1HheiAlrElRsI0Kno58Bxwp2mvTZ6TVVHHNtUVcPg== 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=2z2xQ5E38EvVALRJiU9UnUKA/0swZjqTeYDX2SMXtak=; b=Iov0nSsZY/6YPx2pc5UfYJ9sz6V1iarcnewlR9mZAdFjjrbKDWAcCQqZs0X07XocWE1iJhDM0aIjER0C5kHl+miEBu+TgEv+0U4EfEOqRkuom5kq9ETTywJobhD5Mokb2gPWzzfKZef+Yflt12DenTILXaztx4wPuEGlV9qzsIk= 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 PAXPR08MB7020.eurprd08.prod.outlook.com (2603:10a6:102:203::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4713.22; Thu, 25 Nov 2021 13:00:14 +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; Thu, 25 Nov 2021 13:00:14 +0000 From: Stefan Herbrechtsmeier To: bitbake-devel@lists.openembedded.org, Alexander Kanavin , Jasper Orschulko , Martin Koppehel , Richard Purdie CC: Stefan Herbrechtsmeier Subject: [PATCH 1/4] fetch2: Unify tar command in unpack Date: Thu, 25 Nov 2021 13:59:51 +0100 Message-ID: <20211125125954.15890-1-stefan.herbrechtsmeier-oss@weidmueller.com> X-Mailer: git-send-email 2.20.1 X-ClientProxiedBy: AS8PR04CA0172.eurprd04.prod.outlook.com (2603:10a6:20b:331::27) To PAXPR08MB6969.eurprd08.prod.outlook.com (2603:10a6:102:1d8::23) MIME-Version: 1.0 Received: from DE10512.weidmueller.com (94.134.181.29) by AS8PR04CA0172.eurprd04.prod.outlook.com (2603:10a6:20b:331::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4734.22 via Frontend Transport; Thu, 25 Nov 2021 13:00:13 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: e5d80d4a-8f84-4c36-d8b3-08d9b013854d X-MS-TrafficTypeDiagnostic: PAXPR08MB7020: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:1775; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 83ikpFSN65dsfEGGEPRjvEhQTJs/DSlENHZY0ezzybc/sGOaG9Utrkf57CO4yb9+XwhNcDfuuW3CJGBrAo/c0YUqGHBkGDtzXzHJ6Ok+sxQa1mhKnWgL68skY+lAP+fN1ckhTaXFlh8O9jrnpd3A1hu51pgCTgoK8w4s/Q7S5xAMGOb08jYmxV/0TfgfUdA7rDvrDHvp3CJz5yKbOiW0Hd6UFFvapXcr/Z507tyhIZT4UvM6DQN2JVVyYAKvjI1BiXa7gA5tG8xwYotNaWm3A2JXCz8u80d9gnMQOFXhQoGVNUNMQb7Uu5pHqnj+SRu7ZnhADkh7NThwRHeuWRBlYF6yaME2H5LoTx8XYwatZZMjq0YZkBsGkyVoCec1U9btalAHBCMjyL/CpARFtZYsPqMHchYgml8fknSWS0aaUlFnb+a+z17M91AX1rLWcsWYRJGw78PaZo/UYdnNmJ23GUsxLa9YuQu3wfNxDcrqRynq3/O/6MrAReTFtKRyG2H+tyW5vpExojdzdvOVNZP4ejbjve6YVHKl1rB+k8ECyfFf7wjEOVG8kfYN/z4C+dPgivpYAahQXbj2HUedcuTK2QaM3qRRvayh1gdXtpCKts7c/LTeRxfRYE006UOtmKJCFeC4UcLyi1KyPHG0gXRUNL63uzz/MgQwbae76kMJmko6d0qYXHI2h9OP1oM0OZ+3r5G9/IUZaJz5Ug5puCVRZg== 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)(66476007)(38350700002)(66556008)(2906002)(1076003)(8936002)(38100700002)(83380400001)(107886003)(66946007)(110136005)(7696005)(5660300002)(4326008)(36756003)(6666004)(8676002)(52116002)(26005)(508600001)(2616005)(316002)(186003)(86362001)(956004)(6486002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Rj4t+e5WA5/5Vz5iqWhOZwwhi0zRmg74kv++Pvma1j9fc5sAa3R4QI1cY/TkatqKOL0FArqPwu/Xx6f6ICAIEHBOCg7hrxs1Qz8wnJL5z2anj2tk1GUZHCvS660frX1nPNqIphFnMpseJoWZl4dDai9jmbqDIcyDF4AE7Xs/ZMOkthC3AtCR/z+ofeOdb39rM1wie5A9K6WY35QZ2eee6N8RccLDKXoUiacFzKjrQuGmRpp0ZSlAJcEcuHkJ5J+8vt+YiVuZiBJ9bxlKt1Aw4v+tls8/JnMkfovLOqn8VXMm8d7PkPHlxhPI6CWkMcpsmu3oAdDa8sYAnyD5hKEMb4kkeNJ+ijqLRYvxJ/YZ6b3sYGOQtenPfosFLVo2RWGGb+9/fXbxyEGNTDWsC7Lee9D1MJ1O9WDeq0ohPlI/xpzgZllY7DaljUtgZZ2xSUciaLU0DDKIUUfa4rTNMH5hRmn2ayBTarNT+HEfWis/dykWYMQyeu1sdjOp7cqDSGSvy17KzZXLCpSqyG8aH4KEO7Imp2nnE/Ds5M7coxBz93xDXDhFFfxU3eOS7uTwOuM4FBpsyB5//vMIXWb6NfiyaLdDU4YCQLuiBYG+9t+T0hlHUgFsXaYdwawSNmhy6zGWJZTY/ybhqA2M1GH4lD2RZhmrnigMz75EI9N8QI2M+YE85v+A2WI172ZkGeCZyyay5bHUUxgSsNvGxI2FE3SPlZruoN7aQv0pYzpUG52vvJBsc0NmaJytVNcMWWUMplYvDk1jPM9+xFFI/lzam4eLuLP5gHhPwYbMNbF78SVYqc3JzbwaKctUBlQEWQBHTJO20DznfX6glw6e026P3CzB6vDgKycvxlKw2hxgYzlZokHz36lbLONk2nuCe5QJtSau7QqAatMwwFnaLU07l3pHgsUZpU6rNgUEjHsOe5zdgM/tQ4tqwlmq5GTw/S8SNl3DdVC4xXIISqjN2jnxS/yh1c5lZhAjD7Zgmcj01g8oZnmR9OvZhoKZKDMEpusUufDsofQFos+l9dHcOkWx6WUMzuojCNQHGiUB6swv0aKujy2Dp4+AipCSEk6L7WSXWetYFakOc3NhwSXhC7g4j94kQY+ekxdQ5g6TWilt+PZW4O+K3k/8aKNOAmFfEDUnLBiCWxKTGHI2mcUdMrwRWDT+C9kuRrtZq+s0Uihl8mx2v6fD+WwzJfcegJQuefjbYluQFSvSvHiIj/6/Fu1Qjjjt3VbBBTanmHmbK43P4YYBuoUPDihkAMRd9jTeuT5Iu7tjhryRqsWSF/hCyBvsN4iRVyVIhjP7aUlhMmvqalLPJmrWFKPFKAJcZJtODy8hpqJtvwCHLE4RHapKiD2zIcRABY/g0UGoox/EKFwNv9FvDexGOd/5P88O0LGkP3L1BaGwFgnfZlU3YU9kierAYbYujdIhrw/P9PlUfV3IelC1fhjzTlRaZKqpkcDaClaACJJk8+RTD2VBuP9DB9RmIP+5JUSy3q9n8B4jg4y/8VRlyRzPUbtEUrEs18TntvkjTU3zi/1mM8l5AJs55hkk0HNaDX0X1LPy2bZtvGMMAAeRFH7XIvyG1ZaFwT/XDE0gBKKxKazlkvh0rBSyebz7N8NHrF0wY0qifU6DE4UqxnAEI8M= X-OriginatorOrg: weidmueller.com X-MS-Exchange-CrossTenant-Network-Message-Id: e5d80d4a-8f84-4c36-d8b3-08d9b013854d X-MS-Exchange-CrossTenant-AuthSource: PAXPR08MB6969.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Nov 2021 13:00:14.1096 (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: ylzzHVkIdc34u4fX05Y+fXoGNeSejmhWrNbqnLSKDYsYY0BhalcnU9xU5OSP9y9mJlSh1xdYTXODaaTihdI2uw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXPR08MB7020 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 ; Thu, 25 Nov 2021 13:00:20 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/bitbake-devel/message/13107 From: Stefan Herbrechtsmeier The tar command and its arguments are repeated for many archive types in the unpack function. Unify the common parts in a variable to prepare further extension. Signed-off-by: Stefan Herbrechtsmeier --- lib/bb/fetch2/__init__.py | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/lib/bb/fetch2/__init__.py b/lib/bb/fetch2/__init__.py index ded31061..b0d5508d 100644 --- a/lib/bb/fetch2/__init__.py +++ b/lib/bb/fetch2/__init__.py @@ -1458,30 +1458,31 @@ class FetchMethod(object): cmd = None if unpack: + tar_cmd = 'tar --extract --no-same-owner' if file.endswith('.tar'): - cmd = 'tar x --no-same-owner -f %s' % file + cmd = '%s -f %s' % (tar_cmd, file) elif file.endswith('.tgz') or file.endswith('.tar.gz') or file.endswith('.tar.Z'): - cmd = 'tar xz --no-same-owner -f %s' % file + cmd = '%s -z -f %s' % (tar_cmd, file) elif file.endswith('.tbz') or file.endswith('.tbz2') or file.endswith('.tar.bz2'): - cmd = 'bzip2 -dc %s | tar x --no-same-owner -f -' % file + cmd = 'bzip2 -dc %s | %s -f -' % (file, tar_cmd) elif file.endswith('.gz') or file.endswith('.Z') or file.endswith('.z'): cmd = 'gzip -dc %s > %s' % (file, efile) elif file.endswith('.bz2'): cmd = 'bzip2 -dc %s > %s' % (file, efile) elif file.endswith('.txz') or file.endswith('.tar.xz'): - cmd = 'xz -dc %s | tar x --no-same-owner -f -' % file + cmd = 'xz -dc %s | %s -f -' % (file, tar_cmd) elif file.endswith('.xz'): cmd = 'xz -dc %s > %s' % (file, efile) elif file.endswith('.tar.lz'): - cmd = 'lzip -dc %s | tar x --no-same-owner -f -' % file + cmd = 'lzip -dc %s | %s -f -' % (file, tar_cmd) elif file.endswith('.lz'): cmd = 'lzip -dc %s > %s' % (file, efile) elif file.endswith('.tar.7z'): - cmd = '7z x -so %s | tar x --no-same-owner -f -' % file + cmd = '7z x -so %s | %s -f -' % (file, tar_cmd) elif file.endswith('.7z'): cmd = '7za x -y %s 1>/dev/null' % file elif file.endswith('.tzst') or file.endswith('.tar.zst'): - cmd = 'zstd --decompress --stdout %s | tar x --no-same-owner -f -' % file + cmd = 'zstd --decompress --stdout %s | %s -f -' % (file, tar_cmd) elif file.endswith('.zst'): cmd = 'zstd --decompress --stdout %s > %s' % (file, efile) elif file.endswith('.zip') or file.endswith('.jar'): @@ -1514,7 +1515,7 @@ class FetchMethod(object): raise UnpackError("Unable to unpack deb/ipk package - does not contain data.tar.* file", urldata.url) else: raise UnpackError("Unable to unpack deb/ipk package - could not list contents", urldata.url) - cmd = 'ar x %s %s && tar --no-same-owner -xpf %s && rm %s' % (file, datafile, datafile, datafile) + cmd = 'ar x %s %s && %s -p -f %s && rm %s' % (file, datafile, tar_cmd, datafile, datafile) # If 'subdir' param exists, create a dir and use it as destination for unpack cmd if 'subdir' in urldata.parm: From patchwork Thu Nov 25 12:59:52 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Herbrechtsmeier X-Patchwork-Id: 85 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 E9264C433FE for ; Thu, 25 Nov 2021 13:00:22 +0000 (UTC) Received: from EUR02-VE1-obe.outbound.protection.outlook.com (EUR02-VE1-obe.outbound.protection.outlook.com [40.107.2.59]) by mx.groups.io with SMTP id smtpd.web10.11801.1637845217309637017 for ; Thu, 25 Nov 2021 05:00:22 -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=3gU+dqcG; spf=pass (domain: weidmueller.com, ip: 40.107.2.59, mailfrom: stefan.herbrechtsmeier-oss@weidmueller.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=kIJri4k6INOgk8ZFFs4UjH1t6iqAX6njohUp5exHyrAx7YhaPG16invM1jNGmGmNeXdfFIIgCUlkumIRi2weZ9D6yEU+THEH3d5nv0e/FwK9eNmV+d2OXyupBiiChTVkLRLcuRl3cqkLRNUFo2ob4u73yAdPQTIXdYK2IUUwCzcpTvcU7EfRHZ9+IPxq7TEQ28zyegNn0OkfYlwAycN3d1xzuHlqpjX9Cvq5J7PGLZ0BgZ/1w+VMDme3gBO/pmwSVLwuB1riSajMVsnkiDIxoBOpOvMqpSsljUcF7zHB9ofCC0tbZIagmIGKxODH2kxgfTNU5+Up8pDJHeKPo+zaiw== 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=DZgwLcpmV5KSUjJ9ZtwwSPejrhXzOZwzWUDA5EUJtwI=; b=RlxTpZJdFMM3ar1LbHjy5mWVMy8Ah0TfVdLfd5yU9qmEBcBc/YAqaEcT883182OEx13oE0JOICWe9UdzPf8AQfSG3V0FvgluleFm/cGgBs/OoV/Bul+mgchUMQBNuPvVk5zbVgvjnoLTcmvQxvSuzfkDIvYbLXZBSPksv10zhrN5e/lZ4ptj1ZOh/GOZYYf6+QvYOR+E9f95U0KqawNZ7MvDCXTUMekPh3SewEgLEQ/4D2S/44flhfr+1m4BDnuAxlhOGt+/aJ0ZhJGB76uszhGCBklXfmnzYUwaBQilKy1wOOhqpb4/a2bVB5uPUxVV2lTDDzfzpXBTcQrPubWPQQ== 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=DZgwLcpmV5KSUjJ9ZtwwSPejrhXzOZwzWUDA5EUJtwI=; b=3gU+dqcGCdpuusqZnIpXJzAdV3w7ItEpMWJkBRnjesi5l/SsZ2N3tB9D29Oo23rZzsobCDtlzOmg7tNNQ3wrMa8hDN+EVtjMMeKEj9vsX3oyJa9+qbuo9qvdHKX0U2wOdQdG9If5rSvAW81gl7ny+iDKrn+LIiJtBI3ioZ4P7R4= 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 PAXPR08MB7020.eurprd08.prod.outlook.com (2603:10a6:102:203::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4713.22; Thu, 25 Nov 2021 13:00:15 +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; Thu, 25 Nov 2021 13:00:15 +0000 From: Stefan Herbrechtsmeier To: bitbake-devel@lists.openembedded.org, Alexander Kanavin , Jasper Orschulko , Martin Koppehel , Richard Purdie CC: Stefan Herbrechtsmeier Subject: [PATCH 2/4] fetch2: Add striplevel support to unpack Date: Thu, 25 Nov 2021 13:59:52 +0100 Message-ID: <20211125125954.15890-2-stefan.herbrechtsmeier-oss@weidmueller.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20211125125954.15890-1-stefan.herbrechtsmeier-oss@weidmueller.com> References: <20211125125954.15890-1-stefan.herbrechtsmeier-oss@weidmueller.com> X-ClientProxiedBy: AS8PR04CA0172.eurprd04.prod.outlook.com (2603:10a6:20b:331::27) To PAXPR08MB6969.eurprd08.prod.outlook.com (2603:10a6:102:1d8::23) MIME-Version: 1.0 Received: from DE10512.weidmueller.com (94.134.181.29) by AS8PR04CA0172.eurprd04.prod.outlook.com (2603:10a6:20b:331::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4734.22 via Frontend Transport; Thu, 25 Nov 2021 13:00:14 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: b30106a4-4635-4aeb-82ac-08d9b01385c9 X-MS-TrafficTypeDiagnostic: PAXPR08MB7020: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:1265; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: QO6sRL9v4vInF19odn5WWNfczgcJ+3EY4IF0JIuVXYDK5guFPkU9495bJhYSQmOky/ZrgYGpiPIHvwry4JTvaneCh3ufIMSJVf7ukmNkn7I2TGGg1GkgppSdJSDHxoNPpLKKnYTlNkJLfU37A0NzpM7Pj9yNcCCLLtq2jW7R+/u6fQ7hqn+wpm0opQB0dKDXZK8kWA1vF9KSQCAaFztP8NWzJB3y+pfFSiElL/g65dQ1iyNEzt67JknaaFXqdAht0b3QaWvrWz84cuysZ5U/C0v5MhlJItGjoCxrZLlMSG7FAHxtGPF/MOo7TPMy7m+lKcjvZxiaDwLE5vORw0PTJGXw4DGMCw0JOK7bwUfyaNDTN3KioJ/scZbdfJFLCt/Z5pIZF0Tej21ZXDKkaZJAJjNRscb/gvppBdlxYRkRrsy/isTVp21wBmmkFR1zMaADOSePs8TuYQmK9j5yT0hGZujBXT5tCa3p8HxalxD0tL3fAMY4lRoxc01rtzOOcjpYYyV6piyPnrau5nquKj9FSYmdgastY1gv1dNDjajI0KhbXcm/Z7Urb71DY2Og8F6vQ1U6KrQIwGkVnTG5MfbzNdF/hEdOWeAftFE/uxVGazQjC1TZ0RRHXrSO3oAc50n61y5CszYI87j+u2EXejRAVl3z6zgp4OXc7yYhZ1j9P5PYLg4++jlGPkbcDnEaK8KP 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)(66476007)(38350700002)(66556008)(2906002)(1076003)(8936002)(38100700002)(107886003)(66946007)(110136005)(7696005)(5660300002)(4326008)(36756003)(6666004)(8676002)(52116002)(26005)(508600001)(2616005)(316002)(186003)(86362001)(956004)(6486002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: HB1e3Yqpt1fI/2+thGZ7VxD4cb3wbkLlNAI8YAGK1JH7DITFxTUznJYhRgjcUYpoFuRZkxJm/eJPhOUve+VaTtN5d2QpWcNq8Zp2kD6m8ORF+y4dEfEtj107mnXVQUgiPIu2bXzSbyuSwqCoJmJd9Tje1wtlU4vSkLYd+InkMcbT7gwRc22QXde3rsnAxRgnTHbTXNjcjezlATMfyLx0cI+KufnbM8/8jXTJxCYm/qNdN/BnVob/QjXDe/DlelWca87dM8DcBggFjgPptBP6OBEFHWH7OAaiNMkUXd8byPt+ypLO6xgJa7Bp3A0a6fBdnp32XguzH8RclOhQTfWu9jqvleFXF6P8f2a2Wh9SbXb2GYlBkgWevFZjtKObGBT+9CX4yOJWWfQMv3kvrcYKGQ4j7FM3FH1nkQd0advzXgVgs76O4+B+nTsOB8MuO3yI1IpF7NT6JFpEKYYY146Chp3VX3D9Mp0e1dJ6SVvS9zbPYtiAxMOx8rs3HpF0iQdVV0tc8/l5+2WTZXxxwlUyKg0H5ovc2b4I2HtgEf4iVoj1OM2wgSfc1TRR+KmmDgWg7efOomKBBHpAxo+x9PMwvcqSuJMjKYNTq3ctrKQxZulQgQ56VUTuZ/HJ38V1kN+l8qp12ipeisSv83P4t87VJBW+kAHtLA70m90WgN1bAiXAWtGcIofS6ogFmIWPn+p87Agpf8aZmvs1r/NkMD4rOY+xiJLCg3lwQYZuVxqoVFwAqufejZAPeu9Z9ALbMliM82YYvT6WThbn9FfJNIvBxnvhotDKTBGosVoI+ynHkGMdbRbtA+eZoNVZiJ/MAUGYhgnAy5jhTeBThm2tCsydrXsHxmoqekLwSJGvxz7K26u3VzvGc3N79YUmZHzGd2vbwdlkT3Q/30ZuC3WaKPHGtjJBogk/aGsceBThawj7JJAyvOPNt3wg8DbkfdhyzQm8FBU/He3UmsKa+Sm7pI3KDbVXP4P8/7h0aZM7jmWxkzc+EJveYTbwzjHIdPxKKwOoC9N7QdyWYUJwKHyNhZu1n2cruITY7aXxQbU0utxE4i+Fwz4fMVkpksy+1pVrFghX5ikGyMlKMfjbk5yhQww9YjE+Il9VWQ0FC/xm45VcoofYyfJq5UphsbhrqQGXFZvNCVKsvDdaX9ericow1RoWigpqmcy8KeJ6FwezK+iipM0qLWUSK27C7X/u2lKoe8rik6cBrLgBLbYKH1pbKw6w38H+ibysJF+eZDf2jyzex3NlbnaGD81egxxFv9bTzkHu8/jpGsbYq4FD2rrmwhsCOlZXQiXUyzjmMg3KT+p8PYpYVcDu/VpdzU3ECeX6FOVmrrjFLpADwGxuD6VilVmIFPFQNBf35k3vlmbL5Q9+eSCgFRGZbQ6nngx9jtpmZlesGT0FFL9FSMRGiUeNUBQTCAvRfVFK1qDSbiywDiOrMVwipKsdimlHc9Yb619lX5vEglH+J8G+6YIvuoKnVVmDqRwwXAauvKAp8mL5BTVzyWbfT5DQLuGpEUv+SIGumB1Aqc/IO6o910CWADrqnRcnp5yaKIxtK3rX+NCjo5gB0EY+NJNmUC0ecAwxFuI+xY14bcVP4/H2TTSwUKwT9lixuMXBH5H1WvhOyJG6XUF54Mg= X-OriginatorOrg: weidmueller.com X-MS-Exchange-CrossTenant-Network-Message-Id: b30106a4-4635-4aeb-82ac-08d9b01385c9 X-MS-Exchange-CrossTenant-AuthSource: PAXPR08MB6969.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Nov 2021 13:00:15.0057 (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: 6UeOFt2r7UyCaKoyM1BGVubmVoK85yvOXipiyyBT2OnKDeCYpj6pjO5X2QHfsnSfkoS2bK8nywP/UcbL5tgFtQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXPR08MB7020 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 ; Thu, 25 Nov 2021 13:00:22 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/bitbake-devel/message/13109 From: Stefan Herbrechtsmeier Add a parameter `striplevel` to the SRC_URI to strip NUMBER leading components (levels) from file names on extraction. For example, if the archive `archive.tar.gz` contains `some/file`, the SRC_URI `https://.../archive.tar.gz;subdir=other;striplevel=1` will extract `some/file` to `other/file`. This is useful to extract archives to a specified directory instead of the original root component of the archive. The feature is required for the npm support. The npm package contents should reside in a subfolder inside a npm archive (usually it is called package/). npm strips one directory layer when installing the package. Signed-off-by: Stefan Herbrechtsmeier --- lib/bb/fetch2/__init__.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/bb/fetch2/__init__.py b/lib/bb/fetch2/__init__.py index b0d5508d..0b39ea6a 100644 --- a/lib/bb/fetch2/__init__.py +++ b/lib/bb/fetch2/__init__.py @@ -1459,6 +1459,8 @@ class FetchMethod(object): if unpack: tar_cmd = 'tar --extract --no-same-owner' + if 'striplevel' in urldata.parm: + tar_cmd += ' --strip-components=%s' % urldata.parm['striplevel'] if file.endswith('.tar'): cmd = '%s -f %s' % (tar_cmd, file) elif file.endswith('.tgz') or file.endswith('.tar.gz') or file.endswith('.tar.Z'): From patchwork Thu Nov 25 12:59:53 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Herbrechtsmeier X-Patchwork-Id: 87 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 E9E05C433EF for ; Thu, 25 Nov 2021 13:00:25 +0000 (UTC) Received: from EUR04-DB3-obe.outbound.protection.outlook.com (EUR04-DB3-obe.outbound.protection.outlook.com [40.107.6.64]) by mx.groups.io with SMTP id smtpd.web09.11568.1637845224322893921 for ; Thu, 25 Nov 2021 05:00:25 -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=GBhptpAe; spf=pass (domain: weidmueller.com, ip: 40.107.6.64, mailfrom: stefan.herbrechtsmeier-oss@weidmueller.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=hpkT4GqIjzj/fAL7c9xCvh7MoW0SYYt6RGFY/V1QbXbLOBbFXeJxqFCS36n9S5sEl8CET454Ot46J/1xjVou7Zgj7aKVQjOzgF64LuzXtskZwwpvPbT7cB2ZA9QLU3gKLv22/NduCGlvxK557yYYjPxIIEsW9enDyUXdU/GGPXpC306iA3eQigrLAeQ52IACghoqcV9xP9T/4rbIAZ2+3MK2hlqN37T/x30p5xry6d99+Z+vQiyeqJAPD6WiMv3rUPHSKEYS92U/86g9oyopqPn9xMiLu3+plhsEQhpHNOF0KGuZkz427qol+zdmX3br8J/NJoI+uXvGVTVtB1hEfg== 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=HaoQUHb+XkUdmljcy+QQ6oMKNGzvaXhfM5iR1hcZ/MI=; b=DST58K6y0mtpOB/YYqk1IPLJhbhVEa9/R5HV/iqnDzLVtzYu5SsrlbASypVvUkbYWlL/Eoui5/zPREi/EWGQHSNWtumZRGlL0rmSFLytjJL5Rq7P5L2ajx9+o2IuQAl5zjSO09L/mwoYegb91HJBG+Qmz+ggvkJdAEjrwYsynTTI0xHIPXB6tHvdJbzUiCBJf0Fybmpgg2OEjK3l0+T1i9aWVBi0mukkZcM9r9rDavBp/40o+D/H28kIrMs0q+3HDnr0BkUDhJtSfh/JATG49dPiikZa5iJS+vWqCWvO/5+RqRx4Tb0cuLXiOPzMXbP3avT7KW6WpgS7FLYg9Nu8+A== 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=HaoQUHb+XkUdmljcy+QQ6oMKNGzvaXhfM5iR1hcZ/MI=; b=GBhptpAe6ENTQTfbMNB6FrxL54FO8FlYWJj+cwrZ3Tzx6jXXmII4/qvkds6IP0zDBjv/6VVs6tHgch5NrdzKzEA2MMdVUcDKPJ5BFmbasGilONBkeYwtd0pzp1U1XrqEkrxuroyo3Vu7jvaMfr+J/q5inA231F/FD2D2MYX2Xbk= 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 PAXPR08MB7020.eurprd08.prod.outlook.com (2603:10a6:102:203::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4713.22; Thu, 25 Nov 2021 13:00:16 +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; Thu, 25 Nov 2021 13:00:16 +0000 From: Stefan Herbrechtsmeier To: bitbake-devel@lists.openembedded.org, Alexander Kanavin , Jasper Orschulko , Martin Koppehel , Richard Purdie CC: Stefan Herbrechtsmeier Subject: [PATCH 3/4] bitbake-user-manual: Add striplevel unpack parameter Date: Thu, 25 Nov 2021 13:59:53 +0100 Message-ID: <20211125125954.15890-3-stefan.herbrechtsmeier-oss@weidmueller.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20211125125954.15890-1-stefan.herbrechtsmeier-oss@weidmueller.com> References: <20211125125954.15890-1-stefan.herbrechtsmeier-oss@weidmueller.com> X-ClientProxiedBy: AS8PR04CA0172.eurprd04.prod.outlook.com (2603:10a6:20b:331::27) To PAXPR08MB6969.eurprd08.prod.outlook.com (2603:10a6:102:1d8::23) MIME-Version: 1.0 Received: from DE10512.weidmueller.com (94.134.181.29) by AS8PR04CA0172.eurprd04.prod.outlook.com (2603:10a6:20b:331::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4734.22 via Frontend Transport; Thu, 25 Nov 2021 13:00:15 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: ca1787c5-cf6b-4f02-29ba-08d9b013864c X-MS-TrafficTypeDiagnostic: PAXPR08MB7020: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:2331; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: aZJxe7IXi/lAbWuW+Q8eR2nXW6ZvD/y4id8sN9gMxFgt1enlH4Qfjh7NMUMi3hq4UMNNAKwxFGeR9Go7EqxlBqO0ZxwUnn5tryLXO57eqBVrxlqVBqUOY4PhXcGWz/UsXnXCQ1pQpyjtnVLlQpGa+xP7iwPE548WPM0RHePvk6MIFMQ9zGgLOXWEYdWN9o9aiQmeOYB3zzeFgTyxlPln7l/8M693MHGCr00Ds+QqcuwVVtrTLwv2BCKAiuVN14rBPmqErXQ3IA+RUMW9nNvdq7kf8IaL5deC9d99MPbFhvLrmf/GiFLJTpDtf3MNWviZGetWfSkyUc6h8SWhCDCuJqlQ0+czX3pyMitjkXlEPSPhybR367B8H6RLMMfqSKNAr2E+FTk/M2PqLLjUF63xbWL85zFIv9Y0tjngsu9LHpu55uKRmdCNLocCVBHpy30hukJRUFRVeTleaAj3VnqAZtuzMlaWKZTFFGFWj+aTCR62lGvSQAXzZJUgS5DunDNMVU27KZGqB2vb8Jm7Cv2TOzpS+vt97Enrn9LYriGEc3sji+gFZgYAkxZk0lCCpjYFWSOvX4QoHqI8lIA90UIEBJImYzu4X8Nvp727wc0Oo/8QCHQKXEULSQ+2aeX3tyZKf3I1NTbDAohbHlv6JZ7al6YCCkhPm1KUw9vWo6d2EMNZMItZvRB673loJ9qLCcAc0zItVTZXx8JocBMXrGXgcA== 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)(66476007)(38350700002)(66556008)(2906002)(1076003)(8936002)(38100700002)(107886003)(66946007)(110136005)(7696005)(5660300002)(4326008)(36756003)(6666004)(8676002)(52116002)(26005)(508600001)(2616005)(316002)(186003)(86362001)(956004)(4744005)(6486002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: oS1Bmrwdh2BT25uq8QblKvVXrKLCzKJTsJc2yYvbEdUPkqPE7uKNo+R0i9NE3gbflNDOzXM1wUPNls0dAu2Z0yg6ICpxloKcH6PMKuvXTWbCGf9b+xzcc3YL4INPc3jwi1Gn5dkY7uKij8jihJxqq00g038HZtHtPt3xg6xGKKDjmYAIlvC37/id0j6gMrlVKLIwON9vqaCrd+uImvFwZmdDYYiMJygCX1D0ac+4CeB5cYemEewaDYCisk1rbcxmWdRUBpHIi1PyfVajeIYDjVw3WR2DZv75KnGGEJeBBBZIBjG+8dAWrL8aEfLXTc84T5NV1kaN4zyzp43DbDHh6MXFaSURHA7letsejG5/gMhmTz/DYfcdMAnEcuFJKyqtRb7KIakNvoc7Vcf7r03pamRtoBUy2t5EXcboeD1c5SUxpMloJLbYehOhhXdSs5zQRlEHWWlykHBIhgzOoyXklRUxQTN7QwcvojCGIRV+4dhTZScrGEbJMXkYsos/R1cC+2Om2LJoNu23qqiMT8lAPcgcF6hdWMbyi0V3P3o3WwQ8Hy7XWzn/j9b7mwBou7wJFx4CZPuwJVPM0X1WUrgCFviSmKRHnytVkP2Fqv/xGu+jDDeVJo2Cbvb91XtqZdPMmxvQ1ysGRpjRAzbgzCh2VbkVtasCCYjIoOd8btzPSeCvinLNQZvqQqYVcVHDm0rTBGN/AvxZ+pfA3zTDheZE4stQY35L+KsC9ISjyZxQtE7lgHaeetXH9walBHoRpyjSeQ42g5rfIEFMbCA2cbL/Jc76sZZi6bImjz7MsFyg6jVVSP/lOoYKCIVt1HSuCOGfQPEP2fjqNgeNKv8ZuhW8MJqiPc0IgtaKTGBOqnDrH6pO0ZFu0CMQX5SMgUL9byPfOtT4o+2cDSEO4Sh+UCjZl9fMrHBz0RXLmbrBjucAJa+z7jfb61IWNkcsoeuSixl3BFkHAIvxSi3w3SnF/CS3Cg7RdZTqbpHvkH++wdMoHhXnxOpL6XZu0oMfZDsDjwc2o7EWuIjiIc9MOGaWb78FRo3aRbURnGC92CovKCvpTXPYRknJSvriZ27lrEyTqrP2csjJkORfL0cdIvB9B5LzOn6xgY1WtPAFuMrbdzicWj+fwk+HO92DLaoT292ES3EykwJzmOHxrSNfJo+HO4RC6nl5RLR/CBMhoLEtGFyX61HkM9llolO3MWGdiwUVQyB0ID9D5+aMQI2x84m+wccbL6zbazluUnnqGxUGA+q78GU2VOmWpVGVr8y+rcRROtUVmM4OGc8lxNu+cjfDHD/ptyeJgLAgQuA19f2r65QJTYNJzeLUAEQWN6Xv4ckmKfLi9GQTXJfKspl4VMo4Q98fWUVQiIiioXyIdFMiPk3wynLWH1ly/PVLyMbpYzT22CqTeoew3vv61ku30v1LKFdvFLipLCoU5h89aOZNBCIVHYsrNLbsBzj/aIJWDyGJ7IWFP9k2HyANkVnOmn8XQrv5OayzY8siZnHzOhUsiJtykW5mLi5FT9zJ5LLsYynTHVSsa7HHjnu58/06bSsQo5xJPhDbiLawQpTPlmf8sLvTPzofVSqBRbA8m6om4w13u4iFmpgAREld0YOooZPAB0Q8jRWgujpJfjd5jXKSUTaE2uQ= X-OriginatorOrg: weidmueller.com X-MS-Exchange-CrossTenant-Network-Message-Id: ca1787c5-cf6b-4f02-29ba-08d9b013864c X-MS-Exchange-CrossTenant-AuthSource: PAXPR08MB6969.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Nov 2021 13:00:15.9515 (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: DqGLSnETB/7TAeEswamev0EAy/E3u1BY0YiHT6iM672NDitNeX7nG3ATibS8foIbdMIClmH708puSSxyy3OhbQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXPR08MB7020 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 ; Thu, 25 Nov 2021 13:00:25 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/bitbake-devel/message/13110 From: Stefan Herbrechtsmeier Signed-off-by: Stefan Herbrechtsmeier --- doc/bitbake-user-manual/bitbake-user-manual-fetching.rst | 3 +++ 1 file changed, 3 insertions(+) diff --git a/doc/bitbake-user-manual/bitbake-user-manual-fetching.rst b/doc/bitbake-user-manual/bitbake-user-manual-fetching.rst index c882dfa7..51ab233a 100644 --- a/doc/bitbake-user-manual/bitbake-user-manual-fetching.rst +++ b/doc/bitbake-user-manual/bitbake-user-manual-fetching.rst @@ -167,6 +167,9 @@ govern the behavior of the unpack stage: - *dos:* Applies to ``.zip`` and ``.jar`` files and specifies whether to use DOS line ending conversion on text files. +- *striplevel:* Strip specified number of leading components (levels) + from file names on extraction + - *subdir:* Unpacks the specific URL to the specified subdirectory within the root directory. From patchwork Thu Nov 25 12:59:54 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Herbrechtsmeier X-Patchwork-Id: 86 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 E8FCBC433F5 for ; Thu, 25 Nov 2021 13:00:22 +0000 (UTC) Received: from EUR05-VI1-obe.outbound.protection.outlook.com (EUR05-VI1-obe.outbound.protection.outlook.com [40.107.21.53]) by mx.groups.io with SMTP id smtpd.web12.11588.1637845220665090110 for ; Thu, 25 Nov 2021 05:00:22 -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=DsvKUkH8; spf=pass (domain: weidmueller.com, ip: 40.107.21.53, mailfrom: stefan.herbrechtsmeier-oss@weidmueller.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=KlGrvjuXG/XRfzhw5k217ZpFLNyUMj3ElzNjIL7OJEMwi7gUjhZLYym6TRcZiMVrh4+hcB0L+/fGrD8VaNut4mGchxNbkgjoEf3YQSoleQIsn+w/cDilpmYjRlshXI33ft8AKLv4Di+MVbRKfhCBenKvSiLv2mFzef+Qt1lTiMWr7AeqzjymAA/W2f6tTF0kejRL4ArPgd1xQnggCFWtZuZG04VFghwP8fqLqGhoU2HMhbxRD6V1QrIsbwGFJ+nvkabtZHUC2mCz7G/ZLfRhECQfNHlzDkoaGgTu7dCvvAHl1LZ4iVxyWAMGqdlyqPI64JgMQF1RwHVUwnsGU5iYBA== 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=9MtG/ZnaQYaC3LkXIwzROTukLBc03qwPzRwcyM2nAnY=; b=nIwy6dxrm2vJL+TxNRlUHcVION+7ovX2Q0Wz2+ertujfHLdU/aE7L/JZ9OJfXGMcIrd3D9RpFzEO8ME1h38O/h2mguIF4OuTNJZox2vfMqBKkIxXoeEQ2iiEalJOBiwLgA9UW/YN2wuRxMpv9LXTHnID2xq5iG2dij6lGzxz3q/HWJGoF5cHiXYQEDZJHeYbkYtW4h4BTs6KSqK1mztBGp5QPFHdaV3N+21J3obsxH9BDU3LstiQKf5dqHZEqvYyHb9Ey5HFBHWzVVmV00LBsOjx5CDrp3a4o6gJx7zRRRnPiRytrw84CctlMJmfX0w5ihXwGb0roVRI2+KltOtdgQ== 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=9MtG/ZnaQYaC3LkXIwzROTukLBc03qwPzRwcyM2nAnY=; b=DsvKUkH8HPtyHqHWBWNh46T7vGNL0vO7/mt4tNR9hhsMuOPC3s0v2kYGNzfi4L6bsTe5Q4pfYzRtqqw886p0Fr1XOCYqlmhxOjGm9NDzJ34Ue9LQdjNt/wG7KxnyLL+Y1QEoFtUtKrg2ajXAGr5BZxILSK97p2VrolC5s4p6r90= 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 PR2PR08MB5228.eurprd08.prod.outlook.com (2603:10a6:101:21::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4713.22; Thu, 25 Nov 2021 13:00:17 +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; Thu, 25 Nov 2021 13:00:17 +0000 From: Stefan Herbrechtsmeier To: bitbake-devel@lists.openembedded.org, Alexander Kanavin , Jasper Orschulko , Martin Koppehel , Richard Purdie CC: Stefan Herbrechtsmeier Subject: [PATCH 4/4] test/fetch: Add striplevel unpack parameter test Date: Thu, 25 Nov 2021 13:59:54 +0100 Message-ID: <20211125125954.15890-4-stefan.herbrechtsmeier-oss@weidmueller.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20211125125954.15890-1-stefan.herbrechtsmeier-oss@weidmueller.com> References: <20211125125954.15890-1-stefan.herbrechtsmeier-oss@weidmueller.com> X-ClientProxiedBy: AS8PR04CA0172.eurprd04.prod.outlook.com (2603:10a6:20b:331::27) To PAXPR08MB6969.eurprd08.prod.outlook.com (2603:10a6:102:1d8::23) MIME-Version: 1.0 Received: from DE10512.weidmueller.com (94.134.181.29) by AS8PR04CA0172.eurprd04.prod.outlook.com (2603:10a6:20b:331::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4734.22 via Frontend Transport; Thu, 25 Nov 2021 13:00:16 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 2b49b5e9-94f5-49dd-1fe2-08d9b01386f3 X-MS-TrafficTypeDiagnostic: PR2PR08MB5228: 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: TsO6w1YeifYqxtdD/qjrNGjhTRVFPF26MHFDa9DadxKV/kXAdkEo/0saR5yJZBBx2EH5D08IC7LG8GkSO3vifDBkWsycgmfYJSaXvtDYyhX3e6V0nMwPGVJUV7eDIByErRGherUkr79W4aMT8D0/LmawHkSXYwVMxIJed+31pDM3+uorgzCCiD3THhAjE37tnqegV9EzJYz7Blb1xnPcaFmjM1yT9OcKBIHeyHwmgxPMQRdOgOJyYD/9I3EVafSrD5p2W3QiaM3lC1tQsd4VnXRIWH0+bHXGk1dKSVoUYOyDcIqcQPmfpP2GOEpiTrCkxJ45C5RQEWlSMaIhAodWLYCupF9Qdh1W9ouDhjn7V8zbUogWecz7uDnv9A8q6xtCmhaCnsZRtTPqQDINNE1ZWvq/BGVIg7rz5wFR1ekFXILD9s0fe5p9tb0ANL37Ld05oefeHqRFnnoHKVwrfgpdje1Oda7c64rORgZZUEFWkKGIN35z5IFfyeFIojvza8JDD7nSIbpyEhdQp1MD1opMpFzAxILw2ZVlc26nArWIfzGE2OxgYmRAa8FGlEgfsqB18Jk6Qvxq6bQZ4nwPq4eEOV/RropiuRT5yELEoomp8Nug1q6GbqNlMVnjH6GhgtLPGt26KZGjZOC62n9JB5uQfpLjv3MHFJYLT5y3MYvfvnL6JzKd6cSrbuXUDh+3IkeiTNOpz9xYreu3EX7u7hEvnA== 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)(186003)(4326008)(1076003)(26005)(316002)(66946007)(6486002)(8676002)(8936002)(956004)(110136005)(38100700002)(107886003)(2906002)(38350700002)(7696005)(508600001)(36756003)(52116002)(66476007)(66556008)(5660300002)(2616005)(86362001)(6666004);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: koUMqalYrJEh3rvVuTB1ni8ROTcDIK24tZ15h7IluDkW+uqdCGFDolzLQFLz+sfM5hTG5krIkenKbmbJWmrMeum/RqDvJqSSjkMVtzXCRR1o6rK6q3j8dRMu3LKnSlDipr90Np9YliquA67Q8kzkFatAPolgKWpmc1u0LGBdCvxreeB0MB2WzrPwh7sd0mia50Mx5i8Ug05M4u8hn3ImpDjhcy7S25yjMqi3JZIRR0c5alrSpXnGnQEzfadKR+6iKBiHYXvkxYvcstE5aEBv7YPYtLMb0c6gkQ6O3LiERHSoisQDNlGIfSj05rFYTR7WH+H+mN8PvWkB9xH726JThLrHYf3PKLTFi9Eb7O7YpPKxj9Q2kH8Fn9+cPtgDDpz5jIWILHe1l9rT8xQo5v3B4dh4XRj3femYHsqy3BtFbc6wkz+0eLrS/stLGTiqqLjaKBlMi+caLVub8y8wlzTHsl1z8ucVHGwBXR6H2Cu8rzcbRTqR65KsUDfUttlEQdCd5hrLGVQZFUgQByjuQXKRlK65DaHdsxJOIfZ0DI6g0h3a1N10RL2omn3iKoPB5LivGVP/Zujb7irAQi5qxsC6HOc/tqH3e+Vwh3KubiVsXaIqgorxzLPp6Ws5Y4RUFRqAHhW1RwXT3wiR6aV7q2fTu/n0tv+jbmFtm7GEAMvgZcETk1tiYTmjtvsfzsMW7HMRaXlOkYP9d9Nrs57O4Fj1g+L0KyjhJW76KXPyN83MGi8Jo5oz7U7RZVIxt8LJuQmiwKjuFE5cSfxSlV5LFPz1MTFtu7suNGrZM6NlmyXpqwnYwJNXxNxPXPqGNiVCZncrdVYsNyPqX2dlhKc15mPAFJiN42wQPG+nNC7pnPqkZndRD5CuZY9uaGuXf3a4NofO4/JCbN9rveeJtvpOib/I2XQqZ3Uk270MQ7LjY59GT6UQ6t6R8o4B52I6dZXYvb5s3SsEPQ8tf78l+ukttIo8EV93idqu3xD9sun2OsPPnVBWHgCTwUuJifQH3FoUEorqFLIrsEo0oR27GHsQl8xQmNAp7NdMqOAjrKRoDnvrxHeHP2Xy2kMV4XNODeMPSJGIiBNUH38EUsUds+kqBIwxIy/mid0sMKbAMBoF2+Vo2sMObyvz1211mwwsG/V8nbJEMJus87jtQ46b7E6DQAsOZUE6iPkvqPdGmxIipDlGC+0JsYNkTDGKqnE1/ruqC1Ff8GfdCD2wtBSEgfjiQZTWDf+OCgnGZre4tD/IxTcjCx3G2S2ar6Cg2PwIin0g7ejG5AFB/1sgz4E+GReLpOXFe59vcBEqq73Trn3IyghiZzc5See5rCvpHx202fA4rqBv2CHxwGyy3zqMD/AMDmCCdBzm6+H82sFOwyJT/kx/WNBWN+Cm3jF2JKICUeliNSF4LFQLQX/ms9BXZX5vXOluufH9j/NF67tA9ppQo4aj+mSEKvJrevwEld9ON5KYDS3zESQs43HtmkGpNbb9GQc+a7MDwdtFz+PS1vwxFI6SdJhMT4rg62T9pXRaQZv8Qtzf/rvaXo7HyvJQO5mVb7rND8qfIM4EzDyKEiho5iRrru2jqGEZ3tKBd4Jt2qyTBulKiIfSxQ0ma55+eLzUW1KHRMALKIDFIe1s4ANFStyaLUg= X-OriginatorOrg: weidmueller.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2b49b5e9-94f5-49dd-1fe2-08d9b01386f3 X-MS-Exchange-CrossTenant-AuthSource: PAXPR08MB6969.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Nov 2021 13:00:17.0288 (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: HHsqHQHaLhc6QZZNgLSzxCCLtPAQ4Ewj+XuZST9veWFbZBPLuJ2CcsELct7kf559VB65/C1XoiWbPX7r7gtdlg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PR2PR08MB5228 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 ; Thu, 25 Nov 2021 13:00:22 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/bitbake-devel/message/13108 From: Stefan Herbrechtsmeier Signed-off-by: Stefan Herbrechtsmeier --- lib/bb/tests/fetch.py | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/lib/bb/tests/fetch.py b/lib/bb/tests/fetch.py index d6c0af78..dc45eb2e 100644 --- a/lib/bb/tests/fetch.py +++ b/lib/bb/tests/fetch.py @@ -626,6 +626,9 @@ class FetcherLocalTest(FetcherTest): os.makedirs(os.path.join(self.localsrcdir, 'dir', 'subdir')) touch(os.path.join(self.localsrcdir, 'dir', 'subdir', 'e')) touch(os.path.join(self.localsrcdir, r'backslash\x2dsystemd-unit.device')) + bb.process.run('tar cf archive.tar -C dir .', cwd=self.localsrcdir) + bb.process.run('tar czf archive.tar.gz -C dir .', cwd=self.localsrcdir) + bb.process.run('tar cjf archive.tar.bz2 -C dir .', cwd=self.localsrcdir) self.d.setVar("FILESPATH", self.localsrcdir) def fetchUnpack(self, uris): @@ -680,6 +683,18 @@ class FetcherLocalTest(FetcherTest): with self.assertRaises(bb.fetch2.UnpackError): self.fetchUnpack(['file://a;subdir=/bin/sh']) + def test_local_striplevel(self): + tree = self.fetchUnpack(['file://archive.tar;subdir=bar;striplevel=1']) + self.assertEqual(tree, ['bar/c', 'bar/d', 'bar/subdir/e']) + + def test_local_striplevel_gzip(self): + tree = self.fetchUnpack(['file://archive.tar.gz;subdir=bar;striplevel=1']) + self.assertEqual(tree, ['bar/c', 'bar/d', 'bar/subdir/e']) + + def test_local_striplevel_bzip2(self): + tree = self.fetchUnpack(['file://archive.tar.bz2;subdir=bar;striplevel=1']) + self.assertEqual(tree, ['bar/c', 'bar/d', 'bar/subdir/e']) + def dummyGitTest(self, suffix): # Create dummy local Git repo src_dir = tempfile.mkdtemp(dir=self.tempdir,