From patchwork Sun Oct 15 10:50:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Piotr_=C5=81obacz?= X-Patchwork-Id: 32240 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 1595ECDB493 for ; Sun, 15 Oct 2023 13:19:07 +0000 (UTC) Received: from EUR05-DB8-obe.outbound.protection.outlook.com (EUR05-DB8-obe.outbound.protection.outlook.com [40.107.20.56]) by mx.groups.io with SMTP id smtpd.web10.89879.1697367075405928676 for ; Sun, 15 Oct 2023 03:51:17 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: body hash did not verify" header.i=@welotec.com header.s=selector1 header.b=S/Yu+GPO; spf=pass (domain: welotec.com, ip: 40.107.20.56, mailfrom: p.lobacz@welotec.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=BIttzEtGF+hKT+boKKQLLBg40lqr6ZX1AZ3pG6n2sgPGdK5aRNUBZCXFLLnlLwW4xC0agCflizMGW1RWIy9brwlhOXKVKzjQWSGT+0xThKekJL1bj7TO0C95upXq08efbXhNPolTf5FXIa9e43wmdXuYwNFVyRBDHC5RI9gJ6+w3IMjfVABa2bXJRhe5g9Oz3miNbMXhmLKP2ualTucFFZBX+PA0yQXnv/FwgIExYH08lNXCux/iaEaJ6QCbO75yRC6z2B3FfU+ikJjn1RFfJFDXJLe4ej5ZxrzUFFWcmuA2cjLuuOmZGru9tHzRYDaq141jSQJdtwlZN8MB+vz30g== 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=TLXSQT+v4yRbOoAidvosZ/GsLd7NCnFo9+kqyF1NMus=; b=ebZwIjSgQHUL3LtMpaPdnJrOHxp12WvBxSKRYZMQ2T8+1cuIE7DfRVfWqmxadKEFfyioghwTZVRLki3FYxOAW3zjUmfGZpBg/Qgff/iQFqmSeVQqth/BxIhLScVsAHCsEBGyr/wkkCnAVjb4s8XHi0yQrtsSpOAvkAwBgNf6bGD/jhv8LUqBva1LICXppMd7vunzfKDQ2BXRCL6bXw8xk1Z0gM+MQk0X3xmZ+JLqXCDiMzclAtkJaHm/NkWjRfi7/899sz44R+O9k1dd+vNYUtASV3Cp8qCnsMKka20s8GJJSv/MrhtB0GtEFTwd5UnvAk7mbETwYu6sUYFqZ5UOOQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=welotec.com; dmarc=pass action=none header.from=welotec.com; dkim=pass header.d=welotec.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=welotec.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=TLXSQT+v4yRbOoAidvosZ/GsLd7NCnFo9+kqyF1NMus=; b=S/Yu+GPOZn5H3vsjn2tH4e2oPhRr5xPvfqabYKng5WUX9aF5cP+OK+Esqeq6+RQUMkl96Qz8XDCwa0SQiHuk1alxQ+WxDOJGQoWtFOjfYe78pyxkumWdL/+TRfvAzdDzmIxKvg2fnbFqRRshBt1gRt1lzhiDXJrDJtCmbzDsQhedwM1nfslqWugR38v9aCsBH2vuDy/ug5adYKgWT786b2vSnA62CbRePFMAO9M4Bww8qmtXX8/7N8MiTgSm1NR0wgxfJta23k6EOn3YfKNGVgKpGheFryqWgHIWW3+PE/QvqLFYTzwJqcflzSGRJLDmj6ZgHc2BZDioePii8i6DfQ== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=welotec.com; Received: from VI1PR04MB5373.eurprd04.prod.outlook.com (2603:10a6:803:da::22) by AM9PR04MB8308.eurprd04.prod.outlook.com (2603:10a6:20b:3e3::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6886.34; Sun, 15 Oct 2023 10:51:12 +0000 Received: from VI1PR04MB5373.eurprd04.prod.outlook.com ([fe80::3090:4af6:ae14:b9c3]) by VI1PR04MB5373.eurprd04.prod.outlook.com ([fe80::3090:4af6:ae14:b9c3%6]) with mapi id 15.20.6886.034; Sun, 15 Oct 2023 10:51:12 +0000 From: =?utf-8?q?Piotr_=C5=81obacz?= To: openembedded-devel@lists.openembedded.org CC: =?utf-8?q?Piotr_=C5=81obacz?= Subject: [OE-Core][PATCH v14 03/11] sstate.bbclass: override tar with tar-native Date: Sun, 15 Oct 2023 12:50:47 +0200 Message-ID: <20231015105055.52510-3-p.lobacz@welotec.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231015105055.52510-1-p.lobacz@welotec.com> References: <20231015105055.52510-1-p.lobacz@welotec.com> X-ClientProxiedBy: FR2P281CA0168.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:99::17) To VI1PR04MB5373.eurprd04.prod.outlook.com (2603:10a6:803:da::22) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: VI1PR04MB5373:EE_|AM9PR04MB8308:EE_ X-MS-Office365-Filtering-Correlation-Id: d511ff2b-3ad4-4f06-7739-08dbcd6ca5db X-MS-Exchange-AtpMessageProperties: SA X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: L/QBY7KfWAr8ugwo/EmXXuSpzT4GgIGdytuq/SpQIOPQtz5dLk5BFHfb9fGr5f/2r0azwK8+fWQnfgCg0vhdV6NMtAQusNibYerL/pP8W5737dUe7JDlH3Suqn8FPuhvC5UkWrL8bggERvm1IxhWsMT0p8g4o+jZcBurie2JRFaeX+H9rAQbIY/yeZCyc5fNv4uMMRGksv5f2MyUcGq1NfB3uXizs0DbZlIY19OUYxHjQkUAcymvzk3z9Lq+AyKFJao8jEgW7g3vOetKws+0BQt+EwTiyuM50LHLkXOcJxk42BEXp7vdnK7VmoZ1fsLQKoDjcak0CP0bKdu8v+0FbcFeDZjXNkjR5ZeJfk+Hm9Q/ZnYfsc2aHnobUx0QOs8GHniW5lotw/Qs9P/6lSbQHHo3hHN6IfK7BOei+/1vu1UzidUylhpYvIJCeKv4CcDbDLmFAPXYE1NE9mR7CLJBmcbfpbFA5lwcAr2xpPsKIPhwWz33zbWp+U6E7IsK78QOQ57b7L52MeMJwXn1OSTAHzBm7mFLfGr57nCT9gb5yCTW7ADx+y8Ss58P9wZYxGYboxVxLwMGZa/jRS1EwG32eK5U6g6f6zNLut0wkCNOKMo= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:VI1PR04MB5373.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(136003)(346002)(376002)(39830400003)(396003)(366004)(1800799009)(64100799003)(451199024)(186009)(38100700002)(6512007)(26005)(66574015)(107886003)(2616005)(1076003)(478600001)(966005)(6486002)(5660300002)(8676002)(4326008)(8936002)(86362001)(2906002)(6916009)(316002)(36756003)(41300700001)(66476007)(66556008)(66946007)(6666004)(52116002)(6506007)(38350700005)(83380400001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 13nz06+K0fXTwzZM1dTY9Ik7WOBIad/VYY0vj3KRMm95XyN5unDWA2/zNueOFoz08aKwW0lLmYBDhtushFynlc0LtuZBjdutRK98W45HxFC7tn4lBbqxo/IOeWPY7i2r4eB20tF2bG1gFH/obHgcs5Em/B3RC9I8vo4X+kluR0VpNh4d6Hn+5xsOVoSscV9w3YcGxGmsJ+SwvloSA3cum8VkXpBe1+J43SCpFamdychrNGA2WZPngZ/8RpGQ8+FfTbSsu0nv8NvOPqsCk5jbHrCn0nSDznsRJm86boJdj1pho6p1N129jGl9+SAR+pvkhde9bWeR0Rah55e1dT6LKa5jUHldewDlLBGGsgX929bQr3rc6UAw7QwQIc7CNocnRGlWAGPvJVwDoaDWsebH877YKKcdOn4fKxHDK3rrhYYU+xviHSYXWoJoZonWjxrHimHtihRbgJW4KnFo7Iub6XdW8TGwdfh73JTM1dAhJE0mdcmDrbJtPh8pPHcdXd2rysjh1cSpZ0YfR3uVF+BAb+s9SrhIyO6pIYeZ2KaNHIPpJ4fVtjCgevtvM4njACtsSzrqwk49zVZX1dJYb9UqW8gKXt86zIhZH2UGa4lYZtbuD8t9jzPkB89bfZjHfKKNMAyZbPmJd7NPYW+loYfl8cv5E5EQJUwSS2S+kvGKPrPqvWXQBrTMoRtuIZMUU7zp/APv+gCrHQ3iF7S56hZK8YKBMLN7bNmkwfMQo96NaC7LagThOBuZVFR/2617dTl8UCM1xhgHno6jomuHtMrtHeSNFscpWPFuKl7we3merr7BQx6J771t5MV0l6GqcNnhIIOVYxkxGUQrxL732Bx73VFS0ly9GAMnODKklkCesddmA5+XmKb+ybuk3oz7Wq7gJqDjri3lbXeeJFRXhTpB0lY5rWXz/7jhjOvE+iXPwY+v1gGFOSKpNWQaTlgfwhpH2iEql3P5RBxVq9DjTbF/wKr5W14oW1ZlHygKWZYRIPaH3eolaZnxb4rRzRGu3NySNsFvSqve8YDjbiQ+FBjm8ezrZfjTi9Tx/Z9OtEKCb9BhgjZUxoNMTpNAy6GjT6FaggySYJYWhIuGUdsvGJHJpWxE5dWZGuXRYbB1B5MBPhxPdFTi/9eI38HXQ3woqvIKk8dpHoTwKEB/eL2mRQwZ6xhbcAC9jwtrudtcWJ+mccaCgTNNwTgSCN/4RjOi5gCHtASaiG9ft32ysVrdK2fDHKsXnBW/XnWH3I1ByCoIzqcpbtC1PaS7hx5/k7uX9i5lj/ITvDqlOHkDzo+CoyIx3eMVgtL1KI2mmRYs/cQfMzYeE4execf2HDo3z/Q1nAKihE/TQ7dvEj55BYRpcqc/Nb++yGBujdKRUmT0towQ6SY+TUab/iOhM8cmg8V40pjJjaW/auTCbxtn/9eeQ7CHPDAOaZr9UVf9nd8lMdtLlLf6Kxv/+DwFdihLftDRUR/x4hb/GLjPBiOuU1+1Vwm9te0gNDvqz13rm6tBtafaobUc/zsWr9T+iUAShFgXXxImWV/kSpQ9uuHzMgupnXl/SYD7nGsN7Z99cg11xmcOq3cDFUe5s4CqKbyf9Y1myBYv X-OriginatorOrg: welotec.com X-MS-Exchange-CrossTenant-Network-Message-Id: d511ff2b-3ad4-4f06-7739-08dbcd6ca5db X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5373.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Oct 2023 10:51:12.7146 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 25111a7f-1d5a-4c51-a4ca-7f8e44011b39 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: n5hgtBfpLDmaWeU+lbaODUbKNSWakanZRdAjgnBpjl6fs9eqhaV069S60Ai/3VVJBDGDaU6siF60cnBRzCtlVg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM9PR04MB8308 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 ; Sun, 15 Oct 2023 13:19:07 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/105497 Due to the bugs https://savannah.gnu.org/bugs/?61934 and https://savannah.gnu.org/bugs/?59184, which are fixed in tar version 1.35, we need to force yocto to use it instead of the one provided by the host machine. sstate_create_package and sstate_unpack_package functions, will use the tar provided by tar recipe, which is already in proper version. Signed-off-by: Piotr Łobacz --- meta/classes-global/sstate.bbclass | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/meta/classes-global/sstate.bbclass b/meta/classes-global/sstate.bbclass index 2676f18e0a..5ae6f515f2 100644 --- a/meta/classes-global/sstate.bbclass +++ b/meta/classes-global/sstate.bbclass @@ -152,7 +152,9 @@ python () { else: d.setVar('SSTATE_MANMACH', d.expand("${PACKAGE_ARCH}")) - if bb.data.inherits_class('native', d) or bb.data.inherits_class('crosssdk', d) or bb.data.inherits_class('cross', d): + is_native = bb.data.inherits_class('native', d) or bb.data.inherits_class('crosssdk', d) or bb.data.inherits_class('cross', d) + + if is_native: d.setVar('SSTATE_EXTRAPATH', "${NATIVELSBSTRING}/") d.setVar('BB_HASHFILENAME', "True ${SSTATE_PKGSPEC} ${SSTATE_SWSPEC}") d.setVar('SSTATE_EXTRAPATHWILDCARD', "${NATIVELSBSTRING}/") @@ -164,6 +166,8 @@ python () { d.appendVarFlag(task, 'postfuncs', " sstate_task_postfunc") d.setVarFlag(task, 'network', '1') d.setVarFlag(task + "_setscene", 'network', '1') + if not is_native: + d.appendVarFlag(task, 'deptask', ' tar-replacement-native:do_populate_sysroot') } def sstate_init(task, d): From patchwork Sun Oct 15 10:50:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Piotr_=C5=81obacz?= X-Patchwork-Id: 32238 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 117EBCDB48F for ; Sun, 15 Oct 2023 13:19:07 +0000 (UTC) Received: from EUR04-HE1-obe.outbound.protection.outlook.com (EUR04-HE1-obe.outbound.protection.outlook.com [40.107.7.52]) by mx.groups.io with SMTP id smtpd.web10.89880.1697367079777818269 for ; Sun, 15 Oct 2023 03:51:20 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: body hash did not verify" header.i=@welotec.com header.s=selector1 header.b=tOf4LH1V; spf=pass (domain: welotec.com, ip: 40.107.7.52, mailfrom: p.lobacz@welotec.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=dk1GCrLgogN3X0SahQI9nNOvcnuRcCyw17BSLrKWyr+Ee3OL+wICxYalKpkSTxeopp2vkGtxJyXxXi3DTKARu4dSCwdm7YR3UfD02Cwt4ovD74FOgRTZnZuuIwi1HA7wV2ngUMPIDxZOVljRDkkZUbqNe75VzaBD1ONXOGuPNhg/fiau60RoilsY7jl0I6260u1g9ix9B1Pt3Gj+2Fa+PVcZAi7TA72l+3nP7GkG8boZ3rB9mcjFy9iA1UH2zl8wGeRzg75vNAszxvvhECikiN1GNzHYkXtcgUoN68kedpsSlvSzEWJRiiHRo0Bi4P+20pCV+pIYWs8JVSHwoyLQpQ== 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=AONqEpsjzkHLtlO0IyMbeBemSbONL8PFfff+5FD+yYo=; b=Y5iiL7l3mqOUP9McvW3TDrWY+3ZkdITZoIcdNveZZwMetue/J3xwDkvvo9yG+5SsPi+pcjOIXFSS+qc36yjgVtC+dCzHbhCkJ5KCfIbGDvKTf7CL4HW5GUoXLjCyS/5YvXaxUxaOY/COh0q4U3qyJWduyaYunF2MQFNqrjRT6pzkvAXTfCiwMRc8R7HBvKVvDzdcZu5/gHx9LPbBIcZ7VUxdTkJG+mOCebtu4RxnwfFbXI792XdjWN3b6oITcYTI+bEVBHnxQumbqvRcO/HX50Daomy24daus3fCuxm+E5H1NF+cnAElc4/qkJg3Z373peQ9nfKPC1wvrp54yzE3uA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=welotec.com; dmarc=pass action=none header.from=welotec.com; dkim=pass header.d=welotec.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=welotec.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=AONqEpsjzkHLtlO0IyMbeBemSbONL8PFfff+5FD+yYo=; b=tOf4LH1VnBvCyLk/hA/u3Eo81WWP+KAa5c25pXuvTzYJXO58x2I7sYKaxeIIKvmrU48UEOif8C1dkBxiDRYo8LuW1sLPMihn6HnGj/nZMrwvXYYIdIyFGz0pyEH1POhT/ZJgr+27CZrPYXKvxwnwVZmDrjswZN3vQSPQJymM8afau6SDXRw7AWCN2z1Iu08LZx2CjMsYgX/iRv2TWzxV9dCm87WmQZF+m0/wHrEQWjn92zXCp/+3qkVpiEkLKbzaScS1vU/LGPqK9qLJCI7GFMDbKKOMsiDnTAErKr5hnBA0kLuyQ86iNv1t//nvMOmibCYoKKMSctbXXcPxzT9iVA== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=welotec.com; Received: from VI1PR04MB5373.eurprd04.prod.outlook.com (2603:10a6:803:da::22) by AM9PR04MB8308.eurprd04.prod.outlook.com (2603:10a6:20b:3e3::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6886.34; Sun, 15 Oct 2023 10:51:13 +0000 Received: from VI1PR04MB5373.eurprd04.prod.outlook.com ([fe80::3090:4af6:ae14:b9c3]) by VI1PR04MB5373.eurprd04.prod.outlook.com ([fe80::3090:4af6:ae14:b9c3%6]) with mapi id 15.20.6886.034; Sun, 15 Oct 2023 10:51:13 +0000 From: =?utf-8?q?Piotr_=C5=81obacz?= To: openembedded-devel@lists.openembedded.org CC: =?utf-8?q?Piotr_=C5=81obacz?= Subject: [OE-Core][PATCH v14 05/11] package_ipk.bbclass: add support for ACLs and xattr Date: Sun, 15 Oct 2023 12:50:49 +0200 Message-ID: <20231015105055.52510-5-p.lobacz@welotec.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231015105055.52510-1-p.lobacz@welotec.com> References: <20231015105055.52510-1-p.lobacz@welotec.com> X-ClientProxiedBy: FR2P281CA0168.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:99::17) To VI1PR04MB5373.eurprd04.prod.outlook.com (2603:10a6:803:da::22) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: VI1PR04MB5373:EE_|AM9PR04MB8308:EE_ X-MS-Office365-Filtering-Correlation-Id: 6b0037e5-d44c-45dd-82fd-08dbcd6ca689 X-MS-Exchange-AtpMessageProperties: SA X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 6E6xNZpq2YakEliRNZgDXmMqVwx++wQNStzE/hAAKw/591iJLE36BVjB2SLDF17x38PToc77xVLKqKFVg32rV5oo//M3LbC77rTO3KNHvrH1FOblplJtrWnWu4/tBAdc2+iUEeTBiMz8Xiu4/jFUf6J5Ut96NQmw25WfcrGTXrumCaizG9B+3kP6ZMk0xln9/zk5ng4EDPzN/mEbzN++4VkGuJvbxOxoSz1Jw1E/D+gvdqwHmlOvWL1gGiLT1eC5QYTieBlYKRDLmwb0jjvX9VX6+DG6nLsD6Y4uz3FEghoIZyNXuXmp64vvhEmtpbmg492Ys0xr1f5SolfZokvasqzH9v3ctal3HbzX/OczJS1nlluqGmMgx+wj8Us5j68frHMQO790ayl+Ab7RluuK5+YAQjb5+E9RrH/HmSxI6MG9XTG3IvjSsWzDKRjAsfoV/nRCL2e1E2qZNFtBITK2l01Eb+XvNJ2/6yu9eLbJYdRJr993HxBgCfPgnujs5PuagztXk4BewuIe0y85qOV2dWXEUPKlhJAQwjdrYn7eipVV1iIMTn2B2qWKwtkA6XeDzpJtsJoVvyowhS5trkTe3uHkV0keq5BgTFNpnDqg908= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:VI1PR04MB5373.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(136003)(346002)(376002)(39830400003)(396003)(366004)(1800799009)(64100799003)(451199024)(186009)(38100700002)(6512007)(26005)(66574015)(107886003)(2616005)(1076003)(478600001)(966005)(6486002)(5660300002)(8676002)(4326008)(8936002)(86362001)(2906002)(6916009)(316002)(36756003)(41300700001)(66476007)(66556008)(66946007)(6666004)(52116002)(6506007)(38350700005)(83380400001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: uJxjAVyvxpGYq1nQF/g6lcgC8AUuv+MKsEI66NeiuyHWINO/kOen5zWPLFV2UubWlse5M2CRDQ1RH0wl2NjZOQbpdU23x5HJg34KHkT6KlWfYDaVzDHAIsIhCXv4owhE+hB3K0Wo+p1VrTwvD+sFHo0iETEjq25+tN3cfuurQlNxWKdWROFOR6tNi7flbEmU+XdLpm1lGnWOtDiDhXJQy7jErwkSyYrtjfGSRwnsgm60iqepg6qCRo5SlHalyQTIwKiq1FDsyDGLU52+KrgfQimtg4AFJTvzp/OU/fQjOrzX1uPuCprZ0yand9sfCyMDtyDuqDcjIkAVoL2FtO2hQ1dL5bYVbOxkdCOvOifp+JhYDv6A3w9nsVgKLET1HssCM8Ykbnm0ZfhLKKXDwAz6C5AGoWKAAuZLD1wvUpKS0CSfjPawDi5s4K6Vyye58KpBW+BG01MQdvVWwHKI8mfk79ck04YbrXKnGdtx4CaoRSdKfHv/RLb4glH96UDM9fljIBIoVJBB8uB4s7lXI4ZUBN9PwU67Oomvr/cU5ez0cYDfjOUIZeEcE/pPjg7QqDmxOcR5/KBUoian0pFl3D9hfIFwPzkT6Q/w3S95Nt7+IabprYX/P2o+1oW0+n6Ao8l+xeoB6+qc0Vo+0xejMsgdMO5QHpxH0EWstszSLSeKLH7SoObcAxiUBmKEngD4dKkGF6Hz8Cz5Uu4408C2mCSNRM9BlWQVBEZM6cUrE5rQPn3fEkSCctt4C9Q8jj06J7e0nY0qcAbY1T20wcznm79R7lJnV8HFgW+CcigWtzJYhf87YGEPa/TLvvjW6KeNU4r9sU9LvDv5fC0eFQFVPYmzk7/s3PhFYKbKpMTqyVbXJmsZ1C4FT42yp+RidbwJauGpwb7Y/Q+SvSzodQPgFn5eiKly9BtM0NPII1L7QjGlfnnnJTDiCmHiCO2CwHroP4KrVmacrvM/x/g0CV2jpyppBy6Qt2uW0A1E9Qo1O+5HRUooFSYd9L6xBY37tXAfifLDpTHKgzhSH6hHl6G/eV5L88666+Blw56b7/37scwBRE3W9aipS0/s7y+2ikq6GlRiaXYWSHa3mOdE8IeGqzpdcvtHqFg8nqZRsiEUoB2pC+H39l9s3RjqZld5qJ39kjkbiwuQHaC6CVyayuXpG+0F5e2AA2fF6CuL8MP4Sx3LfjyAfcaKqYnGUWOYPTGG/8zRRcWDkWxzxovXF/ye/UQ5tK7WXdB/7g1ZpMPbOA3XRfZjMC0rURkluU9/px39N8hLnkMZvHX1vuvXJnD80miTVtk+0Qh51kUIJuurahaXdnkv4Y44gSfeaNFUEEvfra5RYU43JdsfGmMkCqAH76kekx3p1On1A1Ocf34xYIHyT9w4wMYjivZwMde7vzCdD3tt/CLKlcXMZY4kUQXaLpgFj4QBOVi5ktcgY1hp/4gg8+sOGgBVHDuc2bjNd2nehEDFhFe8cWyYERWxlrrq5XmQa6VFF3T4hcFPuqU4WLfRbGVLl+QOkiRHSlGJqcfWSWS223ifebGH7TAeHr2k9PzwLpT/N3ODHGAAo4PajdIuGtdPEd2Qdbf+dZuilk/wwy8w X-OriginatorOrg: welotec.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6b0037e5-d44c-45dd-82fd-08dbcd6ca689 X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5373.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Oct 2023 10:51:13.8743 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 25111a7f-1d5a-4c51-a4ca-7f8e44011b39 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: JzJx4tY3xAr9qze+1IvkdVIhejO/uT0vtetg64uaohubaUm29UaD8outmDATB8lG1HZ/tNPU6muekcml0ju/6A== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM9PR04MB8308 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 ; Sun, 15 Oct 2023 13:19:07 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/105498 Extend OPKGBUILDCMD variable, with additional parameters, depending on target distro features, in order to support ACLs and xattr. With fix pushed to the opkg-devel: https://groups.google.com/g/opkg-devel/c/dYNHrLjDwg8 opkg-build is able to create tar archives with ACLs and xattr. Signed-off-by: Piotr Łobacz --- meta/classes-global/package_ipk.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes-global/package_ipk.bbclass b/meta/classes-global/package_ipk.bbclass index b4b7bc9ac2..a0f106e4ad 100644 --- a/meta/classes-global/package_ipk.bbclass +++ b/meta/classes-global/package_ipk.bbclass @@ -15,7 +15,7 @@ IPKGCONF_SDK_TARGET = "${WORKDIR}/opkg-sdk-target.conf" PKGWRITEDIRIPK = "${WORKDIR}/deploy-ipks" # Program to be used to build opkg packages -OPKGBUILDCMD ??= 'opkg-build -Z xz -a "${XZ_DEFAULTS}"' +OPKGBUILDCMD ??= 'opkg-build -Z xz -a "${XZ_DEFAULTS}" ${@bb.utils.contains('DISTRO_FEATURES', 'acl', '-A', '', d)} ${@bb.utils.contains('DISTRO_FEATURES', 'xattr', '-X', '', d)}' OPKG_ARGS += "--force_postinstall --prefer-arch-to-version" OPKG_ARGS += "${@['', '--no-install-recommends'][d.getVar("NO_RECOMMENDATIONS") == "1"]}" From patchwork Sun Oct 15 11:01:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Piotr_=C5=81obacz?= X-Patchwork-Id: 32236 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 047EECDB48E for ; Sun, 15 Oct 2023 13:19:07 +0000 (UTC) Received: from EUR05-VI1-obe.outbound.protection.outlook.com (EUR05-VI1-obe.outbound.protection.outlook.com [40.107.21.83]) by mx.groups.io with SMTP id smtpd.web11.89851.1697367731043602381 for ; Sun, 15 Oct 2023 04:02:12 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: body hash did not verify" header.i=@welotec.com header.s=selector1 header.b=rXRtgzmd; spf=pass (domain: welotec.com, ip: 40.107.21.83, mailfrom: p.lobacz@welotec.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=c3LlC6Pk2KNOrbKLC4zy/KEBtglDLP9aPHe483SrwymBImLVZ80Mu8crAgf9p7OTfnkwDQUcMOxlWix7fs4NoXXf2a8PlGAoqYCpYOZGb/N5nUq4/HD1Wu83NiYvaekDCG1me47ns7wRB7JYCkbfxkZwdQ66ACcuSrmusYdFYZO5H+jlaEn//4lwHZD+4qaQLBUNwsE4WVkjbtRk6OQQe6vcFK2YfNudLrIglTDB4HX+ly1pe4yYaJMitKsnHgxTkvGR+cgxOUOM2412BuEbxdG3mVKprCQB9UbzhS/DHSmg3Gew9PWUB7a5jY5SMwNoQEowyiMEE7tbDzJsv3zfUA== 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=aMcad87igkPOQdlt5omEoFA/YQ0WOqE9pSirTeraGHY=; b=RPPNMejuWI+WI+uOoQq8OkrLZ3z+YxHvx0mmGBR5uB8sMr1pvfy24+ESpotu0FTANefaD0w2fubcFry5+5bjqzN9p4dO737TuSgxdKbh2nWAFsmkLVYJ4h8Xdn38egDNJt1DhNHVlZOuTU45WDcNYTLaewSsAPO5jiRDa99YEuj64jgxboZScD/ZFRHU/BoIFQ0Ii+mfAZFRhIjywA7zCl+VZOqqT5lVSyzb4qfOImcb274FI1XiUJHXPx+4GzvMABZB0C2fKX8x/uLynjLIpuzxE2fmS5owATjaeg+6yWgVXEWZiFzxCaew9IER4wXa0VkJls4yf6JkftD6kO/cyQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=welotec.com; dmarc=pass action=none header.from=welotec.com; dkim=pass header.d=welotec.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=welotec.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=aMcad87igkPOQdlt5omEoFA/YQ0WOqE9pSirTeraGHY=; b=rXRtgzmd1LAcRhsL8VOjIdGqzfO4MskoRKk+LiOkv3Hp0jFtrTYXAr3aamtsrqVXd9qsrSMZNIg9XIEQROcyel5rlxlcv3c9eAZjmH9JYdCnTJlXydKNYcxfH74A6QPPXf2faVOmwdmMQ/uMf5KgySAc7fX90F5xuoD9eKOKTne8ehEi8w1RZ0IQiCpslnIDlPQ84x17dqjh+9jmnpguJoDZe06uQGd5OifX7Tc3XlXFRocAzw2LpdeUipw0SwquBxZM35KbgJ7oNCPtkqh2o0Ji0nrhvnpx7lNaBteB8BHL97HWMcuDeBRuWQXnZ4nade1dkFgNP6JIz3aHs4IGBA== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=welotec.com; Received: from VI1PR04MB5373.eurprd04.prod.outlook.com (2603:10a6:803:da::22) by AS8PR04MB7925.eurprd04.prod.outlook.com (2603:10a6:20b:2a2::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6886.34; Sun, 15 Oct 2023 11:02:06 +0000 Received: from VI1PR04MB5373.eurprd04.prod.outlook.com ([fe80::3090:4af6:ae14:b9c3]) by VI1PR04MB5373.eurprd04.prod.outlook.com ([fe80::3090:4af6:ae14:b9c3%6]) with mapi id 15.20.6886.034; Sun, 15 Oct 2023 11:02:06 +0000 From: =?utf-8?q?Piotr_=C5=81obacz?= To: openembedded-devel@lists.openembedded.org CC: =?utf-8?q?Piotr_=C5=81obacz?= Subject: [OE-Core][PATCH v14 06/11] package.bbclass: add support for ACLs and xattr Date: Sun, 15 Oct 2023 13:01:49 +0200 Message-ID: <20231015110154.53364-6-p.lobacz@welotec.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231015110154.53364-1-p.lobacz@welotec.com> References: <20231015110154.53364-1-p.lobacz@welotec.com> X-ClientProxiedBy: BE1P281CA0087.DEUP281.PROD.OUTLOOK.COM (2603:10a6:b10:78::17) To VI1PR04MB5373.eurprd04.prod.outlook.com (2603:10a6:803:da::22) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: VI1PR04MB5373:EE_|AS8PR04MB7925:EE_ X-MS-Office365-Filtering-Correlation-Id: f203c0aa-adf7-4615-adf5-08dbcd6e2bab X-MS-Exchange-AtpMessageProperties: SA X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: KmuEp9CMNlhusCJOsCI3XpWJXvA+eEzp1d7Ah931HK79xjVI8DxEfh9V422qTSSkoAHYGcKTbFf593H+HeceKKoefvJHTBtyMIPdNA7TZ0A6ayP8e7VLVLN0za9ipvun1JjIB/R2P6KWgOcb38JXFbgC5r1EOrA/AJLz4rhz0JFURIT8yPaoGIw7TzFV+aGEjQyS98ZNOBtRYpfuld9E2ExcoWauuqSfzynzikeHnfeEIO6ICSe5qnLeStMxndjSA3Q5VlFGTELUrFhT+dtyLK81/mvTl1Nvr+Hws7zVSBg2mERSuMFSt7tC42uD4NpPR3o903nK3yptEhL2uMMFxR7lbwlOsAP65zVwQKnMJXz1Hddf3IFYI2cOd5BcZAuU7PBzJeBAjyApBPzlqsPLjBboxqU4inpZcYtOLBoN/RuGT+hc8eatEY5KuvjsZJQ8pkF8CIQoWvRy7eQroD9Dt/UIo7lGmNVfq3anaMf5hPmXBPdrdTYXpA64MH+GIY/tNUrCA+8C8qXkE7kBWcsQE7xHaM/9hy6kNLPCte6huJIDT0qscf164s6Fb8gpn9LvxwZvwWHUyrqPAMtDsr6jpSqG7LfXpRZC0ALmPpTclt5quIF1wtrCbkbXXExP5Sl/ X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:VI1PR04MB5373.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(366004)(346002)(376002)(39830400003)(136003)(396003)(186009)(1800799009)(64100799003)(451199024)(6666004)(6506007)(6512007)(52116002)(478600001)(6486002)(83380400001)(107886003)(1076003)(2616005)(66574015)(26005)(2906002)(6916009)(66476007)(5660300002)(66946007)(41300700001)(66556008)(316002)(8936002)(4326008)(8676002)(86362001)(36756003)(38100700002)(38350700005);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: ENds5DcR7Aw/YJP2Xz5D7e2r77aesmJlVNiGxoclT6RHeUzfMb9g00/jxwIUDtTOCazK1qEvoWhr1WBJ+272c0NYzCeVIgWL1qFI3FXDq+8tcDm90XjEJbHOq6NHXYdLtq0aWN6kjlTP1WAgbhsPpIVXp4v1uYzH+aHjJ3vzzTIwjqlS2EPnjb3SBr4BKfz7B+WYGraDXTt/j7sNx0i6Th0p/40zLCxi5kzWvPMXC6Q0MPVJ4ShVWWjueni/cEsWqoqUD2HEy0/QmJz38DpCPYuuMmxFSMNnER9WK6lQjoALIQyYYP43bFr8p8M3cXyV3LGhmPUNVoOuYzEGhy2kcT84NVvSRuzHmRC5s/kKVY7dXOsSPcKuw4hZz8O3BamIla7Tv2m0dzHsfeDSpoWKmdUwoicc6J+4ng2HdPtkBdq+X0I7bVzhDP6SvY9lms3y9xg5Douy3wA13QJuRtgWVYkP0il2QYuu5AksnitMEAVVdaILh2DBpkNEzbUnGr9etyyBBurenmslK8pSTA8/8ebm9dR7CoiF/pbBKeC1Rl9oxqWzd9mSUizcpy0RE7MjInVHSCUmOd9C4ERE+Wp20ZXvuLm5wODO5Fm5mQrPCMWGaOUXSQ29nARRhFlGw8SBOXOjsrVk9TnfaYL6CVOgn1U9F0KKVBH9zjJQkrAaSfgNcqOahIGZWu5W5ebGCB7DhaHu1PYkPgOSK99/MxasIVcKvdSUfxUiZD03Tf0rIH9N8UyhCNBYK48NyvqgFiAYO7wgq4xDX4Kn4uLzg9Ge7K19UCrZKkLZlRIrM0fWYS3u69ybrKwIvv6xVVZRBiN0nS2AeNbL9DzFnSaP8YL3eyxVe5vw6WLbTdR4Kiu12xU3AYlR/ohRje54JfZPBaln+zBE73bNxCVp8k2qfK4W6jzDwmnZlwD0EME+zadszNrT8pPt1lB5zws7jeH/NKP8Zf4t0Jn7AsHHaKC32J0ozT+V6dLX1BWNvArOKL41RRF1KI+emR6CLU1lbwyk5dEM7zCYxHf/R0/Ro669RDnvGOUi8F+giJezOgWr7UP/ZY/hJWHDeCcuz9gnOosQnl9WJQgQupfKyolH+h4Yg1z8K8uAXjBNW1i1j9nw3t9RM2xGUWHx/vfin4EydM/aFXpkmoj7IvfDvb6QfFGv1x8PRVLNskHvfOOXZZsMyYjGAPs07RiXm4BipslUvPdFclPIZLLSMiTSkEgWDf38YRjl1Vr6dJzK0b+oAjqgSix6zOQkyx2lu0nOUzQcGc46O5zYWYZws1X7dKPp1PPjd/MOfMO4hga79dz3HIsmfHReXNf0HoSmxiOXWootjr3zOdzFPwRJ0MwI7J6aSMagJuB+PXBdqVzEuIhnIe9qqgGOyXCgkRIx3qJhYLRzplKuC/TjByX7Q1g/WMudVZAszsxzyL+r0UlJSLGh2QWs43U+Oh+jisO5Ayatd/VubtQ3BVJERSV2oTZOvueiZ+r7LLk1vCFs5IALni6dQqvzc3tC0tYN37iUz09YWwaBQ/v/hAryP7hBrF02e8BxI/N2JWctxBEq8cST21WrcWs3ZfPJlK2aSiH+eG9u8ttitm0uKSFU X-OriginatorOrg: welotec.com X-MS-Exchange-CrossTenant-Network-Message-Id: f203c0aa-adf7-4615-adf5-08dbcd6e2bab X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5373.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Oct 2023 11:02:06.7176 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 25111a7f-1d5a-4c51-a4ca-7f8e44011b39 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: pyj1wV3Fqh7bMCjFcST0F102nSGFFO5lTjTUpQhsByw0HsSudhU13EDq/g3ZeuqIGiAU4RFp+qA9LkOu2wIC1Q== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR04MB7925 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 ; Sun, 15 Oct 2023 13:19:07 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/105511 Extend `tar` command, with additional parameters, depending on choosen package class and target distro features, in order to support ACLs and xattr. Currently only `package_ipk` supports fully ACLs and xattr. Signed-off-by: Piotr Łobacz --- meta/classes-global/package.bbclass | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/meta/classes-global/package.bbclass b/meta/classes-global/package.bbclass index 580884cd83..22af6552d7 100644 --- a/meta/classes-global/package.bbclass +++ b/meta/classes-global/package.bbclass @@ -353,8 +353,13 @@ python perform_packagecopy () { # Start by package population by taking a copy of the installed # files to operate on - # Preserve sparse files and hard links - cmd = 'tar --exclude=./sysroot-only -cf - -C %s -p -S . | tar -xf - -C %s' % (dest, dvar) + # Preserve sparse files, hard links, ACLs and extended attributes + # TODO: for the moment only ipk packages are supporting ACLs and extended attributes + # we need to add support for other package systems as well, but that doesn't bother + # tar from creating archives with acl and/or xattr support + acl = bb.utils.contains('DISTRO_FEATURES', 'acl', '--acls', '', d) + xattr = bb.utils.contains('DISTRO_FEATURES', 'xattr', '--xattrs', '', d) + cmd = f'tar --format=posix {acl} {xattr} --numeric-owner --exclude=./sysroot-only -cf - -C {dest} -p -S . | tar --format=posix {acl} {xattr} -xf - -C {dvar}' subprocess.check_output(cmd, shell=True, stderr=subprocess.STDOUT) # replace RPATHs for the nativesdk binaries, to make them relocatable From patchwork Sun Oct 15 10:50:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Piotr_=C5=81obacz?= X-Patchwork-Id: 32241 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 07789CDB490 for ; Sun, 15 Oct 2023 13:19:07 +0000 (UTC) Received: from EUR04-HE1-obe.outbound.protection.outlook.com (EUR04-HE1-obe.outbound.protection.outlook.com [40.107.7.52]) by mx.groups.io with SMTP id smtpd.web10.89880.1697367079777818269 for ; Sun, 15 Oct 2023 03:51:21 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: body hash did not verify" header.i=@welotec.com header.s=selector1 header.b=TqefWG3m; spf=pass (domain: welotec.com, ip: 40.107.7.52, mailfrom: p.lobacz@welotec.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=SICsG9SN/dRzuNj1RqzLu76sSulbp2J8GK8V4r6M0l0ODvADkyBQcOlhFFzVbmYBwjIqMC6QQjxVsvztp4jWFe5TDdMTnu/Gts3WhJgrUivrPaI3EdDxomM+HGb41psHduWogPsJGrZHSDMM1blcOF/fvnVUw0Rx0LjOCgGNEWpeSQD7Ey2QLbBp0XLmShDrBrnklEeXO9n0PoqBVyldi+pdlvNL0hgWjunlolSH+ajyJP23wY9hiSpNHfyQMg9ONMLCrwLgiyrpObnLUz1WzqWl0pw/EuSRd6BaszxCVe7LaCMVUd59yi3sp5TZKTgvrxQZR/nCcmcivPe2vc8yYQ== 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=962+Qutmx7yOQMSpDwCTL5Y8ribZgRBYEVAZLIMnMYY=; b=XrDCuSC/WrM1F+mKF+HmAZAtr1GYw9UGN6pwPqGhL9GVPCXY1w4TStOcEkezj1FVgEgffww6P7U716oz3DC6DirmcM8ji0IqxZaj97osyr9CKvYFWFBovLNQyVX2KZQLDXSrO5QKFLiDLTazfeUazGVpbSjJVKIR+iSMvg3KCtic6lFEb4JO1yB0MDM2h+sWG7fiugQ4IaCairOm0ol4HbrpYmjejckzFZWKhDbQRnFcGf3NQIe16Hc58SP3vpxca51ajwjwvt4DAXXwn7eFTE01q2eHj9oZXrRqA9T3suqCybgv/u8CAw3ZOLpZZzYf09puSSlGODTDYcjc5wbrLQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=welotec.com; dmarc=pass action=none header.from=welotec.com; dkim=pass header.d=welotec.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=welotec.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=962+Qutmx7yOQMSpDwCTL5Y8ribZgRBYEVAZLIMnMYY=; b=TqefWG3mg9+qs6DZ5BiyTwGuRSkdoRM1YNnon/593MguciEhKQCdPXFYpVOUf7RA3HV99kc29sWOidEdoqyMmAjV4hGe04z4sl5ztUs+60DSlMDtzuDzViGXBgGHF/s4yAYtAWaUsLnKqFWiKhyyDahfw54TAPmdei0CwNqEhzirV3Diwv3obsnNYSgm527TkqAhnno9dHNjq35GG1JflNHwqbIjmeFfq+hmXgTMjgvP9s9GxDif5s/mBDj6kSGsePWIknK+SQ5trXPInANO4D19+ulBMlYB0Jhw9TdvR2835i6xiYVDquB1eAr6G4GhxcUGFYV7xeyDSNZAlI77zQ== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=welotec.com; Received: from VI1PR04MB5373.eurprd04.prod.outlook.com (2603:10a6:803:da::22) by AM9PR04MB8308.eurprd04.prod.outlook.com (2603:10a6:20b:3e3::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6886.34; Sun, 15 Oct 2023 10:51:14 +0000 Received: from VI1PR04MB5373.eurprd04.prod.outlook.com ([fe80::3090:4af6:ae14:b9c3]) by VI1PR04MB5373.eurprd04.prod.outlook.com ([fe80::3090:4af6:ae14:b9c3%6]) with mapi id 15.20.6886.034; Sun, 15 Oct 2023 10:51:14 +0000 From: =?utf-8?q?Piotr_=C5=81obacz?= To: openembedded-devel@lists.openembedded.org CC: =?utf-8?q?Piotr_=C5=81obacz?= Subject: [OE-Core][PATCH v14 07/11] sstate.bbclass: add support for ACLs and xattr Date: Sun, 15 Oct 2023 12:50:51 +0200 Message-ID: <20231015105055.52510-7-p.lobacz@welotec.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231015105055.52510-1-p.lobacz@welotec.com> References: <20231015105055.52510-1-p.lobacz@welotec.com> X-ClientProxiedBy: FR2P281CA0168.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:99::17) To VI1PR04MB5373.eurprd04.prod.outlook.com (2603:10a6:803:da::22) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: VI1PR04MB5373:EE_|AM9PR04MB8308:EE_ X-MS-Office365-Filtering-Correlation-Id: ebad915b-9cc0-455e-7b7a-08dbcd6ca724 X-MS-Exchange-AtpMessageProperties: SA X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: gm04zhn99yYoxQ6EBHCXek+FPu4qAGpe/tnRg5DfouzyNLFXZkalndZnBZftGOytLSRPjdbQRTBbrtHoV715KBYCy/rph6hgk3u/KWvp3mo1/dAf9G9cTc+mJx7IvSLn92/5V7NMREx7O9mwV1jFLMQpjYs8xb/lLUIIChyULxCI25h/IebOitJZSMfeutxyaaZpcAk7vtkRcGZpwe6JFOITiSfWSx1H2pEXWYlnlga22q76Us9uqk563l/PNweTRgk3xTjkcEV/feuBFcYYCzmOylgALqhgKCyUi43HxDLxS25Ozj0i2jdARkZKZriRSU/UsVqbaolU9e5zOF6N/KxdcOKbGDJHx8yxJfa31act2PsqlvMsfFHSGwOLiPie5rj6ZZJRVISPEpD4S9MXKxlgwYJe6zT4YfTCsOVsPh9eug2xgOaRsj20aMjcmKfAra7j8za2DrkM1YcwvgDkwTnidm8cYQfHe2X+t5Al7c/OOpUi4OGAP4ekglDuPVYRwf3s94uRMd9kNuEjluBwwi8vvm88DTlXY/CESnW1cacVjArZ28n6HjWq0r+NV8rAuA4w0guLuLzDCB6UCAIOkLAv6HR27IQhEH9sgIxwFJo= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:VI1PR04MB5373.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(136003)(346002)(376002)(39830400003)(396003)(366004)(1800799009)(64100799003)(451199024)(186009)(38100700002)(6512007)(26005)(66574015)(107886003)(2616005)(1076003)(478600001)(966005)(6486002)(5660300002)(8676002)(4326008)(8936002)(86362001)(2906002)(6916009)(316002)(36756003)(41300700001)(66476007)(66556008)(66946007)(6666004)(52116002)(6506007)(38350700005)(83380400001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: BuaxJKtaHyhFYubyozGP9CkbcXOLlm7z6UPqy5k92mztMoSHnott/Jwiv6crtFzD7S6zjDAPz86C1ClS8WTJBkZe0AjD4OOWqH+hsgn1Q4LWhoJDgcOwEnPuERVIWk9y9lt1pDdB8jiT2hYVe4JzHQ5GnziwgNGj/FpPoLcR4HdDyxjUzwkqJgoX+UOQ/qR+46ZSFsArfFh+qSuSkCOeeePiwdzBFocF/2jlADngz16pcE6kUsqAs6hz1mQc+VSlHLOaME7mRj1Q3478ZsS+u1Ug066JCaa8G5YNKKovuvv/oVBPoUK7ddnR+LfpCBcM3xviRcVjA61DhYs5v7QZe4Dca8sHMbUTOqsOCyGeT7GitWnJy6gbNCQwzgtNH/4cl6oQZSPxNU7nwZN5tqj7d4idlAtsrS0aTtevhpoEfCo8S3hweqYe3e5C9zHqo0UjgciWtoUQ5eFVScmllTbhF+02c0XonSJ6WbCncelahKp3VeDGHiLeiASctLhfl4Kah27gc3sJqZp5T5IpZagdjdBPLRb2HKGdrWJQ/dw/2SCofAMfFu/3U99wQYJKkKgvvkcomQvcmH2ahWLqURgOp+vaUllASA4zDLVWcfB63q6QRs97Sduq8jIUZcz1tC/xbFeRAqSenzCLwHQK9P4BBWVy7+bpSRjULvEgc2S96oPZpuz1UXh38yQ1Jmiw7cHYDcVqvYrr4QW+LPHh5/3YW/6Rp5Ln4wyGPgObcZG0RG9IjhXM424MbGrBRCCg6wkwfjeSRBOE2+rnqHlvclvEMu7ucdr6M3o6YIVOi0XqmwL5ig60uLK95ca00g7KXA4uzgsTPxjC7182fyN8Pvdf8a8NAKALTgNy3C6BXZsiCSrqWGISubxIaGMLJON3eA2Ml1BPRuOJAmGnptIkdu//6GCb/Fhuh9BRSfw6QnPs1wwJO09onCSffybKtqVaF7qDdJuZ4/RLpgg7mB48hY2y9/NVZDn0BVkrL2X571COEN9hFwUDl4rkPYTBsbVoi9MjhyEMuPUvkoadcRnhqXWh1MxjSW7PaHprtD8KDfeyNXiZZH7HgATp7ktmRGuqpTRLfkt3YcSY7ymaUCW9e8srtW28cEBCPYTT7/9kLLae6AAQFhnnXqeqW1pcgf+DXKWoyRKOtBIIsvo1kAZLKFxaLDca5cifr7lLKXZElOoygC8sLYXkkASiCreiUhUYDzZ1p5D669WD2HoE8kn+XJS1DEnUkEDsVMHvdbflF5piYJ1NTJynvqJ6aFnrRkhKd53cxUijb1UzXDD+/eTQqgQpFHJgIoNKB/I9CkNNAW8sopytEVJV1Xk98yS8DmYU4A/hHPUWBh9m1CAlB+wVFC5y7dyeyi6BZNbbBWfMNRTqwWRNeOgqjIu8g4siV6CsKYJtsvonShi9J3xKJGM3dXK3Jy+TWYy4+3VeTtgDg5PvFYgRqqtNAPoWlFCIBfOkP6sfW2kKF3+48mykbpQnYCBnDkKGCzf/6ZahC46a3ulxYxbdXFiMYl3Vicz59u9IgLAjHX54RsCuvE14WaJxCN4xd1tXwMk6M1XvHEXE0uGahONbbxzBws69lPeJYAuk39dd X-OriginatorOrg: welotec.com X-MS-Exchange-CrossTenant-Network-Message-Id: ebad915b-9cc0-455e-7b7a-08dbcd6ca724 X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5373.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Oct 2023 10:51:14.8944 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 25111a7f-1d5a-4c51-a4ca-7f8e44011b39 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: f6yxuOdbq3IGo9GHSxUim6twB6MsekJLTvkJ7e0lDoEBphpHCoLmIzd8l/PHmpFW+Mb/qZmbdJhkL8NwO0mbOA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM9PR04MB8308 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 ; Sun, 15 Oct 2023 13:19:07 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/105500 Extend `tar` command, with additional parameters, depending on choosen package class and target distro features, in order to support ACLs and xattr. Additionaly set archive posix format, in order to preserve milliseconds in timestamps for reproducibility tests. Currently only `package_ipk` supports fully ACLs and xattr. Signed-off-by: Piotr Łobacz --- meta/classes-global/sstate.bbclass | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/meta/classes-global/sstate.bbclass b/meta/classes-global/sstate.bbclass index 5ae6f515f2..3e7b2ce474 100644 --- a/meta/classes-global/sstate.bbclass +++ b/meta/classes-global/sstate.bbclass @@ -829,7 +829,22 @@ sstate_create_package () { mkdir --mode=0775 -p `dirname ${SSTATE_PKG}` TFILE=`mktemp ${SSTATE_PKG}.XXXXXXXX` - OPT="-cS" + # Notice, that if you create an archive in POSIX format (see section GNU tar and POSIX tar) and the environment variable POSIXLY_CORRECT is set, + # then the two archives created using the same options on the same set of files will not be byte-to-byte equivalent even with the above option. + # This is because the posix default for extended header names includes the PID of the tar process, which is different at each run. To produce + # byte-to-byte equivalent archives in this case, either unset POSIXLY_CORRECT, or use the following option: + # + # --pax-option=exthdr.name=%d/PaxHeaders/%f,atime:=0,ctime:=0 + # + # https://www.gnu.org/software/tar/manual/html_node/PAX-keywords.html + MTIME_ARGS="--mtime=@${SOURCE_DATE_EPOCH:-$(date +%s)} --pax-option=exthdr.name=%d/PaxHeaders/%f,atime:=0,ctime:=0" + # --clamp-mtime requires tar > 1.28. Only use it if SOURCE_DATE_EPOCH is set, to avoid having a generic case dependency on tar > 1.28. + # this setting will make sure files generated at build time have consistent mtimes, for reproducible builds. + if [ ! -z "$SOURCE_DATE_EPOCH" ]; then + MTIME_ARGS="$MTIME_ARGS --clamp-mtime" + fi + + OPT="--format=posix ${@bb.utils.contains('DISTRO_FEATURES', 'acl', '--acls', '', d)} ${@bb.utils.contains('DISTRO_FEATURES', 'xattr', '--xattrs', '', d)} --numeric-owner ${MTIME_ARGS} -cS" ZSTD="zstd -${SSTATE_ZSTD_CLEVEL} -T${ZSTD_THREADS}" # Use pzstd if available if [ -x "$(command -v pzstd)" ]; then @@ -895,7 +910,7 @@ sstate_unpack_package () { ZSTD="pzstd -p ${ZSTD_THREADS}" fi - tar -I "$ZSTD" -xvpf ${SSTATE_PKG} + tar -I "$ZSTD" --format=posix ${@bb.utils.contains('DISTRO_FEATURES', 'acl', '--acls', '', d)} ${@bb.utils.contains('DISTRO_FEATURES', 'xattr', '--xattrs', '', d)} -xvpf ${SSTATE_PKG} # update .siginfo atime on local/NFS mirror if it is a symbolic link [ ! -h ${SSTATE_PKG}.siginfo ] || [ ! -e ${SSTATE_PKG}.siginfo ] || touch -a ${SSTATE_PKG}.siginfo 2>/dev/null || true # update each symbolic link instead of any referenced file From patchwork Sun Oct 15 10:50:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Piotr_=C5=81obacz?= X-Patchwork-Id: 32239 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 0768ECDB48C for ; Sun, 15 Oct 2023 13:19:07 +0000 (UTC) Received: from EUR04-HE1-obe.outbound.protection.outlook.com (EUR04-HE1-obe.outbound.protection.outlook.com [40.107.7.83]) by mx.groups.io with SMTP id smtpd.web10.89881.1697367080398083208 for ; Sun, 15 Oct 2023 03:51:21 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: body hash did not verify" header.i=@welotec.com header.s=selector1 header.b=n1hzqm5L; spf=pass (domain: welotec.com, ip: 40.107.7.83, mailfrom: p.lobacz@welotec.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=AM8xBn95MUYamsnU4DhROfPWKsC0U6eczSKZIeGxWcgGdST6Dm8mEV+kvQAYhqVxPvx+Dgq5W0JUMtRg59w9YTxEWxdPIPOMBFLte8Yn6AwijXbLpH9+NTmxf0G7NZW4sfm3tO41hCAE/GcwMyy2guJzBnrXBSFOtT058mUrSsuAHBRlnAlp0zQdSNSBEKr4MTSOGTnIXADNJVrLYGeQJcb1gPDnDuQjmvo+br29xf5Rb423q1xmQL1y4KFoaAyS0SvFl5LHjwc1XmiqJIe7IqSsJOfa1d8Aqwt37WJIZXrASvRvXT+vDAUi5RSGIkQ6Kd7ufwhpCZMx5bhGd0QmZg== 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=/pCHrGgRW8Gp1h1gb1SRnmIAa/LM7Qk5jOvHDwzHCbk=; b=bXBHzAxs+PDlZWDpSSIn8g3NlwrK/l0BlFwnkTTw7OY3u3LU7JyXUBkDmHr0uzYSFsochPwJpkHDlsxB7GvHMqZudxF77cHyg7UXMfguRHcwaz2n7QsVz554/dsiJxM9Gj1KypeW+dOPrLed/VK/AZ2r3ZcduBl9F6XnUP3fY1SgeRve3ixbaTTrOl5W9Kr6gy31CK1rFgXBrhGfvmiH4X4z9AxIoZ3DefhfXkOvVRwIltGh2yKXrYO7ZtxMlSdMpdIBQw1Uxcxxq4VIL9ILgMaM1wR/PLNKmW0uURdninHJotN5GXeaUtd6NtEqtCbBai09I+vUPbvxYVa80JiXJw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=welotec.com; dmarc=pass action=none header.from=welotec.com; dkim=pass header.d=welotec.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=welotec.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=/pCHrGgRW8Gp1h1gb1SRnmIAa/LM7Qk5jOvHDwzHCbk=; b=n1hzqm5LOeR5Ws3tbSHEyTOH4o0oQQ+KO4lgB8Xofl5jCdruXfaf+Nl+dtabvU8XlceGgotFkcHH2QGa8gHO+3mB6ja908RmhQxTtjSRPAQ2SrwTkvhwu57Yc9/FWgUKkAc9IChMlUKvZpE6HxMw6BnVsPJP+vH/1QcUxVWVUZyo49uS2DzNGVZQ7J6dClqGbvh8Cfl1frHTWouGPT2WqRlpuqcdFFQ1nkkxYtV7uVXGIZSeQXOF20hQ/QKO7qHzUpP169RYVIBv7B5deJ0MwwOs1K/eZ6vbs1FdkZGtgWBuxKjNQpBEWVzWhYZxSwBWEapSntXCYn5N2W9LQBOsLA== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=welotec.com; Received: from VI1PR04MB5373.eurprd04.prod.outlook.com (2603:10a6:803:da::22) by AM9PR04MB8308.eurprd04.prod.outlook.com (2603:10a6:20b:3e3::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6886.34; Sun, 15 Oct 2023 10:51:15 +0000 Received: from VI1PR04MB5373.eurprd04.prod.outlook.com ([fe80::3090:4af6:ae14:b9c3]) by VI1PR04MB5373.eurprd04.prod.outlook.com ([fe80::3090:4af6:ae14:b9c3%6]) with mapi id 15.20.6886.034; Sun, 15 Oct 2023 10:51:15 +0000 From: =?utf-8?q?Piotr_=C5=81obacz?= To: openembedded-devel@lists.openembedded.org CC: =?utf-8?q?Piotr_=C5=81obacz?= Subject: [OE-Core][PATCH v14 08/11] sstatesig.py: fix hash calculation for timestamp Date: Sun, 15 Oct 2023 12:50:52 +0200 Message-ID: <20231015105055.52510-8-p.lobacz@welotec.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231015105055.52510-1-p.lobacz@welotec.com> References: <20231015105055.52510-1-p.lobacz@welotec.com> X-ClientProxiedBy: FR2P281CA0168.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:99::17) To VI1PR04MB5373.eurprd04.prod.outlook.com (2603:10a6:803:da::22) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: VI1PR04MB5373:EE_|AM9PR04MB8308:EE_ X-MS-Office365-Filtering-Correlation-Id: 748163b9-cf17-4629-6440-08dbcd6ca76e X-MS-Exchange-AtpMessageProperties: SA X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: KOECDlASlmlpp8NCCBM6qglkhrf62nzXO9NEHM4M8Zv34botm1bAJVXWNRD2YghzaojHhdIrPPJ7elUA8L0AwHjYLfILsGws3kJ5iPSM/JXPw6Bd+15Adk87UtN13Buj4M+ZAhLAaabXWjaRyF6tXKE6x9VIkT1ZgB/qRcT7CWNs2j+/9Cx4Jw6GqcFl2toPeI+VzaJk1DxlvWUUMs9E7GSO5aOs8S5YSd1yxhRh8RZ+Udt9g91YZLkugwVmV+VUhauSU1zQ4m3L3b7EAqoHPuo5KcrpQNmLTJNtgzzsQHuvQrAEl2CuaqVtyPB/Z4ocw2YYRqboEAXBi2gNNEDru9HrblaUlwPqAsCrgulZfxQB3jbahEIidx0LKgf6tgvW7qQfT8Cu8/t+eek5gZAyDIUNgVbtDpaCSFtVhGSkuZz4YpWNX/7mjiElZh7/bQW9wNh3kWN4rzeNcqKu7+uBiAhMevpE29OCXfvT8aMP/tW01DU5O4TSZTM1Kyqaiar9zkutjynCKeC9SfrsOL3WUjVT0dhWLH3/h/rcpwnH+T2LJup9gNbG4nDw2IywJJEL7PP8ixUmaDmzKUQ/RRg5+gsfVRzsnZYjqdh3YPzIXrwVLVS3d31ZIWIolucnjj5Z X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:VI1PR04MB5373.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(136003)(346002)(376002)(39830400003)(396003)(366004)(1800799009)(64100799003)(451199024)(186009)(38100700002)(6512007)(26005)(66574015)(107886003)(2616005)(1076003)(478600001)(6486002)(5660300002)(8676002)(4326008)(8936002)(86362001)(2906002)(4744005)(6916009)(316002)(36756003)(41300700001)(66476007)(66556008)(66946007)(6666004)(52116002)(6506007)(38350700005)(83380400001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: po2+MNXZHux6ZmdPixZMnIyapUFCbzMPr9EgUFgiuhbZQSNtpBVI+IAUYiyMyRxb5LtDVDtc9h+0I6+1cqMc7aoUl7zdZt7SobJcKPaIqaGyGfZQQbxH5sUYKy1wDsJZ9UddFWMacCGhLn7D62wEwOmdbn6AomD/Bx9I9OFmEMQAhcpuGQUPewH2D50YxcEgClQcepvTwSmZ1wutzly7okp3xs9KoRjt7qpoQl7CAnHwU4B17wrBaCpuG0YzMAmkI0xfztewRvYfNCrjNNlqAMhR7P9PQ/H+vOwEEL8MTpD/S0gufK+RBqAvIF08Nxrt6mOcXIQfx/iLMTmCdbG66tTYtW4qduvF5RgHvFpxTLQAGscwkJ0lr4dgBnoMAe1h5biU9NUJIyTfvwDOqbw6168jVPY+sdagF+WUUHVp6svnn74xS5DwIgbBKoyU3yn1pzLwGkttcfHZEV6kmecaPSFVoLS2vTktUBIb1njER6C/k1WWxRnGhO4lzChd3om48TeDdjjpvq3ZqWA4Hn+MI2SoDhNFWromPaU0/Fy9cGqiESLjZse43A3kdpwEoIjzcaHgF7qIdWas5cu7Sa9SF1rXxb1uguzzKcSvCgqOz3RBqDiDkgIxJQwF+wNW4zBbGfvPdrxMPCWYLePGCnwHraI/jLDT7A4wtWXlSTaC955nHToc3u9F7Wl01i24nXPK9yed3JolD60aqXwiaVOAaSlQr9Z8Oze+EWgr+4orajSennYi9ckdDQmjdIQJvIcB3UKVMRNXR9yKqEpwmDSa4ektqcDFoB6aQmxQsih5RD54D6laz3nbzncMCfZZLtLetx+Dn4i8LlYBKBwwoefA95kj91/ROUXenk0jv7FYpp0pY3XdJdvZtSKFifqZmIKKxeDItiKiebwYJfH8z42F/M3NDke+N6TqIhlRuCVFiOZwiB6fnpb4L863nPhrf7ul6PIMJpKpaGQNSS53V7yPux3ziq+HgnrStQxIed9OlAnHluetZFUmfEc6CSAJQN9m1vqf5A6dUlaL67SxPyMc5TBMhYYiXj9IYKxh0xsgT1qLpgRWr84hntio9Wt+4dZ3MsaM+rkTcJ+L/p12FyEn8cghBaVahgRUSiEvkYelAwHENM2xMKJNyU+TsNk7fwJrQSBksp00CKNXvZ1KCwkkXbKWTKrYypw2RuIW6rEI/zK2Hzf1+UymOpMmrWUWPAD8vRf1LL+wGnKIyIGgRsIbx+Q3g8hb9/KiKGUMtIfWO5wbg2VwlcIpA88ZKmNkdBadkH8QwFpVcKTn2O/0kVNg26qebbp3vlhuMM56aa6DfTol8sqARFyGkfKA9dojJDKMR0P8BItHM55Cpx/LOCOOzQrZpFAhpYpIrYf/moFlAA5hruYVIg+Sh6xu1GzQzAbjNHYFmRVjdesWboZaF4T9EKpRkltIzH1p2/EycrwcRj6PJNJrjR6VCf7nmZQEAaWYl7gXBCd36xHDBrfQNXHiYL7CrAbWDXKr3sEXNYY+7ayMMPlbGgXWqFSVOjY60DjRB1as/mvTiQFJbkkTOukNfTwQ0caTYviLMoOg6DmQCcwUYNrUoW6eT2vBRun2ir1p X-OriginatorOrg: welotec.com X-MS-Exchange-CrossTenant-Network-Message-Id: 748163b9-cf17-4629-6440-08dbcd6ca76e X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5373.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Oct 2023 10:51:15.4054 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 25111a7f-1d5a-4c51-a4ca-7f8e44011b39 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: Pyo6s2OPVsFjH1+cY6U4mkMkI8eQiHD5CUPFDZ2YNvq7/yroeXZGE/RabPGGW7zXCom40cLtzPSYnVjk6I5k/A== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM9PR04MB8308 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 ; Sun, 15 Oct 2023 13:19:07 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/105501 Passing timestamp as an integer was losing precision, which led to problems with badly recreated sstate cache. Passing it as floating point number fixes the issue. Signed-off-by: Piotr Łobacz --- meta/lib/oe/sstatesig.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/lib/oe/sstatesig.py b/meta/lib/oe/sstatesig.py index 5bf1697e72..f1f9de253d 100644 --- a/meta/lib/oe/sstatesig.py +++ b/meta/lib/oe/sstatesig.py @@ -604,7 +604,7 @@ def OEOuthashBasic(path, sigfile, task, d): raise Exception(msg).with_traceback(e.__traceback__) if include_timestamps: - update_hash(" %10d" % s.st_mtime) + update_hash(" %f" % s.st_mtime) update_hash(" ") if stat.S_ISBLK(s.st_mode) or stat.S_ISCHR(s.st_mode): From patchwork Sun Oct 15 10:50:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Piotr_=C5=81obacz?= X-Patchwork-Id: 32237 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 ED561CDB48B for ; Sun, 15 Oct 2023 13:19:06 +0000 (UTC) Received: from EUR04-HE1-obe.outbound.protection.outlook.com (EUR04-HE1-obe.outbound.protection.outlook.com [40.107.7.52]) by mx.groups.io with SMTP id smtpd.web10.89880.1697367079777818269 for ; Sun, 15 Oct 2023 03:51:21 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: body hash did not verify" header.i=@welotec.com header.s=selector1 header.b=dFJmXpSO; spf=pass (domain: welotec.com, ip: 40.107.7.52, mailfrom: p.lobacz@welotec.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=e3idzjVU4tPd3DU2+n51Awc5EaODTZ5qlBIY3tjWT4vo96ToLbE23ttga/obmTikD8y5L073jvLc9QOpTqLtPGCe4IZc4jpJz2j+2056k9T5MOXllMcD+gsNTM5EJCrGw8UaJDC6zviDP52Zj8KhriAY04Nt1scNcnznwBvtVa11iZ5Pls2K4cPeOctDUcyfF6qsP8+q32CIfPHiFYozr8bevGM7wAHry62MCjk8jhhDu9SlMJhYbgaT+uDJtntIZtaaI2bGEYWykVhHZOJcojvFaOSWVQ3xoLUWIF49EWS/Tsg8MjPoMnOsRUFyGJVnD8T1QIKdHwdclmeNucZUWQ== 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=L0r37I+i7IcUwDLpxeh9T2YIhLPLA6sWmKLn9yi2Maw=; b=jYDtOS0lnNVE9uw2rR+1sfoydiWeton94hJZUblbXflGalZqtGbsSwi03d1Au3spKv+CINtSYxsgeLG1+eJbzgB2cyssqsTatjX3KAwfEbXfm1CLGHGhs3tSOAwgQY1L4ys7zZs2UaXf5lHKCWmRvpTOWk0gaCt33GCGNGhTqoO/kRnoMjt0z5JL8oekvzIh4zimEkEgS1HQDqAIzSNO0wI8P33r1HLd/9NnFXhFZ1K8w8Ily1n+zowCAaniyX1n+80R4RkPd6HrnKAx/g2V+kn9np+F1uz+TZIreLgUeY9pALsTHaErtkZ085jIWK4zVpB9FVUWBwm0xtfFkaPuHA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=welotec.com; dmarc=pass action=none header.from=welotec.com; dkim=pass header.d=welotec.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=welotec.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=L0r37I+i7IcUwDLpxeh9T2YIhLPLA6sWmKLn9yi2Maw=; b=dFJmXpSO8vCIUCac3kiHJ10Ik46COOm/kKtAgfLaccgnqcch4KavqbF6osQQR5dBhXSoSPGQZMZrqn034eZDmMj7FcWuIv//XV4sR1i/kh/N1/J8i8JhR0s9u8la1Q+mXisdFxIdbQRdjp0Ymok4lV114nbYqGnm2LNKv7Qvw4O4Pv67FtWS+lOOq5ZFxUwc1tFlqhTGOrZ108VzzHZXDJZEMKQUoPDj+vqWwRCU1YbLAeT0pmNxdRx1siI+Q1Gm5xA6OPkx77zks2+7vnKZ4Pujdw1n+8QRHbUu53uE57kRo0ZX9U1whvwcRvRxgAWG+9GcJd7USXQWcYxoWKAsaw== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=welotec.com; Received: from VI1PR04MB5373.eurprd04.prod.outlook.com (2603:10a6:803:da::22) by AM9PR04MB8308.eurprd04.prod.outlook.com (2603:10a6:20b:3e3::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6886.34; Sun, 15 Oct 2023 10:51:16 +0000 Received: from VI1PR04MB5373.eurprd04.prod.outlook.com ([fe80::3090:4af6:ae14:b9c3]) by VI1PR04MB5373.eurprd04.prod.outlook.com ([fe80::3090:4af6:ae14:b9c3%6]) with mapi id 15.20.6886.034; Sun, 15 Oct 2023 10:51:15 +0000 From: =?utf-8?q?Piotr_=C5=81obacz?= To: openembedded-devel@lists.openembedded.org CC: =?utf-8?q?Piotr_=C5=81obacz?= Subject: [OE-Core][PATCH v14 09/11] opkg-utils: add acl and xattr support Date: Sun, 15 Oct 2023 12:50:53 +0200 Message-ID: <20231015105055.52510-9-p.lobacz@welotec.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231015105055.52510-1-p.lobacz@welotec.com> References: <20231015105055.52510-1-p.lobacz@welotec.com> X-ClientProxiedBy: FR2P281CA0168.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:99::17) To VI1PR04MB5373.eurprd04.prod.outlook.com (2603:10a6:803:da::22) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: VI1PR04MB5373:EE_|AM9PR04MB8308:EE_ X-MS-Office365-Filtering-Correlation-Id: 4783be3d-bafd-4374-11d7-08dbcd6ca7bd X-MS-Exchange-AtpMessageProperties: SA X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: NnqO91rXLbcA9SZ63rfysT1cI7WEY6+b8X+9UheM4cP76AAUYhvFOP/CptVudFgUb36af8TAP3cVAZgaIjNJZViXjatBb/iN1xkds2ZJ1/BHGRAt2op5oobcUG0GNF3wSwMrfkXyEypDfeZ2xDvnCLCz+0B4FJ25npIS6H1b6EyM75gcE7h3jdE6borQqCnwMEmunvYzuYaesS/FXwbKN/38tR968ph3sVxarIa9ZBT46aZP1tL/0kcNg91xAlRX7YcEh5bxHS/h1fHkT3tYeu+S9qOlCO/2GBzTdueAou6lepsWPxb08t/B0K0A+o6qh/I8nu91Etfv3TUu094H+TaLfUpvHia/Jz4+9uERT4bYtjN0iBnJgtvqwQ6pCR0+QJKYqjeK7Vofwdu5cXJo4S9pwXNmfCRhgCrPvoganKt94ilLZU96G/JL22BGbjGQSQkaxp+bzHioekFAqvkAN0UK1eVC8eC7cK0jBKdlD+hZJ6GTKKoG1WW4w5mUVOE03IktVzkUDKtFWgPLYsklaFyNsunTrdpD6uh3BumqCEU3w4Ofl9OVT7GcFZDr5AnXuYzYuGp4Rg+kIKr4q+11GOZ9ihjTab1a/qWXfnCpZVY= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:VI1PR04MB5373.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(136003)(346002)(376002)(39830400003)(396003)(366004)(1800799009)(64100799003)(451199024)(186009)(38100700002)(6512007)(26005)(66574015)(107886003)(2616005)(1076003)(478600001)(966005)(6486002)(5660300002)(8676002)(4326008)(8936002)(86362001)(2906002)(6916009)(316002)(36756003)(41300700001)(66476007)(66556008)(66946007)(6666004)(52116002)(6506007)(38350700005)(83380400001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 13M3j9HtSRW8XkcnPxMBSiNFyCqnGHJz6p2irSqToGhZm60+GfE09VEb7I+uC7nolsU2AE7T6LqeDyA7C1pRZX1vlf+1JqtGadpwZsChYw5ojzKLZ2Gp5r3+4/OUu/DLzRXB5uOCFXOYw6UXHMbCkMUr5bqveeW9t7qTAxFCTP5TJF2/y2BboID/VTShJ0beyOMm6hYtYLqrGtQGJFiLk/6MaMLA1ekJjlir/eam9zmLx363vY/ZoKOlwME1ZGT0nPSD9+/WdzwkY98IPhFQEjtmcQ3nipYEjkshco8i0cOl/elSYaFWqNgnQ9vVumRiLkT0rtqWwujvOwjpdIEFjnaYXAX4ej8hxehy2gryX2k0Uw92YF7PCgab3oywl0lGZHqDy/vQV+druSAgZ2381QOpByfHsejnGN351iQVfNS9KveOH09AKu0DrLYfJk1uynggVWfziKU72BhhgL5ArmG0lotLOWoh39abW/JXMFtHtpziiJTLGU/uTgpg3Cfcr7ASIS6T+3IZ4LzU2gRP+4hiIysG9UQegn3Kb2DIfmQdyjNG6kZTb5Rc8k7++QMeWIfo0DJ23sR+5htzjGV2w7XBVgdpOWB/fnOXW8mbB5iAHjTMAz2QA5UxiK6mrXK0iyg1jnmgIXNCksbfsMtSu3x7rP8Lmm2BFk44n+7p7YWZTc9O4O3guFGDcIjGMDqoDS5Gs2NpBSp1JONuZFXkyY5FjFsZANHRfRHa5qElDFRRoT6Pi5vuK6DyF7NXlua7CLSC8DnwK9YM3sYoFTiSV4OVSZHBPLkcHDzy2jc2lhJ6bni3qaIT0ewOUoQXExlTQvSGu7Tz7aRZAbA2/oFHz9TsdBDAd2rAnKoPPmu9UvcjM0HfElZFy56LGc5hLtPfBOCESu23VUSMGhDN31aG7NFwZznTPlnboGePp281a49TgBCKG4xVhYcaZW7vAI35R/r+XPp9bHRvaTOXaAOSU7LSeIFZS5c4RSUz0HlZYcZkiOq1ohzDKLoKrGsZqQHHiFe4LbpkkGqb8VWA4zg+Nw8fhC1eYQ2lD1gZNZ2I0l08CGLwBlHBwAyGmKhoLLjcJbDzZA5h5nuLcceqKYk7g0SHBvHJKC2IzPwIcRcQMMHczYKHMEW0jMThbyhx2Ba7R7hnZUza+jjBIN2uHSbGQE3pGCB56Drdi/DU/aZ8N3qgO78vJKrVZ0VEO2rzuFtoxo2Go0t93F/k7esRScVZZpi8bacMQRYeRqyUpEyYLCrmNfo15RYZMIkkPi0DpRCtFxE5JYf8VJbUNvcQ1PoCLcaj50E+phuGP/y/grJ0JiObQOT3RPKG7cF8wbM1XbrvBJgFKwZpkM2nU2W6Xl0Aszxhsi7HeZlkLFsiB7Mhp1PNPnn8VgU17OFIBTE8Jl9/UWMmyWjl8K7geTd5iS2343Cr9yDT82mVXEdcQlgfrvaaFZYnxPEcxdaBXWYfWiZBAcdHxwqh+ZgLMhpKfffJdGTL0HTCdUgk1YybExAHwRmKw1bbiqgeKP5FQNdv8Wl8LITIU6hv77CvsDLRtuAvXhiPGUjy/htDiMiNOofPnfKAYXBFXobGb1gls2+j+B1C X-OriginatorOrg: welotec.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4783be3d-bafd-4374-11d7-08dbcd6ca7bd X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5373.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Oct 2023 10:51:15.8559 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 25111a7f-1d5a-4c51-a4ca-7f8e44011b39 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 7J1mB9b9pL1bVAU7A9zYLB6JX3R8FGi+pSpwCCnEX2kSnFrau+YTnIucVQfu62/6roDj4O2cuL8RyvatU/U9mw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM9PR04MB8308 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 ; Sun, 15 Oct 2023 13:19:06 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/105502 Add support for tar archives created with --acls and/or --xattrs options, PAX header format. GNU tar and libarchive already supports ACLs and extended attributes. We can now add this support as well to opkg-build script in order to use fsetattr or setcap inside do_install command and end up with a file in an image with the relevant ACLs and xattrs. Signed-off-by: Piotr Łobacz --- ...kg-build-Add-acls-and-xattrs-support.patch | 174 ++++++++++++++++++ .../opkg-utils/opkg-utils_0.6.2.bb | 1 + 2 files changed, 175 insertions(+) create mode 100644 meta/recipes-devtools/opkg-utils/opkg-utils/0002-opkg-build-Add-acls-and-xattrs-support.patch diff --git a/meta/recipes-devtools/opkg-utils/opkg-utils/0002-opkg-build-Add-acls-and-xattrs-support.patch b/meta/recipes-devtools/opkg-utils/opkg-utils/0002-opkg-build-Add-acls-and-xattrs-support.patch new file mode 100644 index 0000000000..6cc81d3241 --- /dev/null +++ b/meta/recipes-devtools/opkg-utils/opkg-utils/0002-opkg-build-Add-acls-and-xattrs-support.patch @@ -0,0 +1,174 @@ +From 8d9953dd8d589e9b740307976cbe474e0ce292a0 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Piotr=20=C5=81obacz?= +Date: Wed, 16 Aug 2023 14:59:35 +0200 +Subject: [PATCH 1/2] opkg-build: Add acls and xattrs support +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Add support for tar archives created with --acls and/or --xattrs options, +PAX header format. + +GNU tar and libarchive already supports ACLs and extended attributes. +We can now add this support as well to opkg-build script in order to use +fsetattr or setcap inside do_install command and end up with a file in +an image with the relevant ACLs and xattrs. + +Upstream-Status: Backport [8d9953dd8d589e9b740307976cbe474e0ce292a0] + +[1] https://bugzilla.yoctoproject.org/show_bug.cgi?id=15097 +[2] https://groups.google.com/g/opkg-devel/c/aEGL7XRXfaA + +Signed-off-by: Piotr Łobacz +--- + opkg-build | 81 +++++++++++++++++++++++++++++++++++------------------- + 1 file changed, 53 insertions(+), 28 deletions(-) + +diff --git a/opkg-build b/opkg-build +index a9e45d4..fb0873d 100755 +--- a/opkg-build ++++ b/opkg-build +@@ -145,6 +145,7 @@ You probably want to chown these to a system user: " >&2 + ### + # opkg-build "main" + ### ++attributesargs="" + ogargs="" + outer=ar + noclean=0 +@@ -153,22 +154,6 @@ compressor=gzip + zipargs="-9n" + compressorargs="" + +-# Determine if tar supports the --format argument by checking the help output. +-# +-# This is needed because: +-# - Busybox tar doesn't support '--format' +-# - On some Linux distros, tar now defaults to posix format if '--format' +-# isn't explicitly specified +-# - Opkg doesn't currently support posix format archives +-# +-# It's easier to check for mention of the '--format' option than to detect the +-# tar implementation and maintain a list of which support '--format'. +-tarformat="" +-if tar --help 2>&1 | grep -- "--format" > /dev/null; +-then +- tarformat="--format=gnu" +-fi +- + compressor_ext() { + case $1 in + gzip|pigz) +@@ -197,20 +182,24 @@ compressor_ext() { + : <<=cut + =head1 SYNOPSIS + +-B [B<-c>] [B<-C>] [B<-Z> I] [B<-a>] [B<-O>] [B<-o> I] [B<-g> I] I [I] ++B [B<-A>] [B<-X>] [B<-c>] [B<-C>] [B<-Z> I] [B<-a>] [B<-O>] [B<-o> I] [B<-g> I] I [I] + + =cut + +-usage="Usage: $0 [-c] [-C] [-Z compressor] [-a compressor_args] [-O] [-o owner] [-g group] []" +-while getopts "a:cCg:ho:vOZ:" opt; do ++usage="Usage: $0 [-A] [-X] [-c] [-C] [-Z compressor] [-a compressor_args] [-O] [-o owner] [-g group] []" ++while getopts "Aa:cCg:ho:vOXZ:" opt; do + case $opt in ++ A ) attributesargs="${attributesargs:+$attributesargs }--acls" ++ ;; ++ X ) attributesargs="${attributesargs:+$attributesargs }--xattrs" ++ ;; + o ) owner=$OPTARG +- ogargs="--owner=$owner" ++ ogargs="${ogargs:+$ogargs }--owner=$owner" + ;; + O ) opkext=1 + ;; + g ) group=$OPTARG +- ogargs="$ogargs --group=$group" ++ ogargs="${ogargs:+$ogargs }--group=$group" + ;; + c ) outer=tar + ;; +@@ -232,6 +221,32 @@ while getopts "a:cCg:ho:vOZ:" opt; do + esac + done + ++# Determine if tar supports the --format argument by checking the help output. ++# ++# This is needed because: ++# - Busybox tar doesn't support '--format' ++# - On some Linux distros, tar now defaults to posix format if '--format' ++# isn't explicitly specified ++# - Opkg currently supports posix format archives, but gnu format is left ++# here intentionally for backward compatibility ++# ++# It's easier to check for mention of the '--format' option than to detect the ++# tar implementation and maintain a list of which support '--format'. ++tarformat="" ++if tar --help 2>&1 | grep -- "--format" > /dev/null; ++then ++ # For ACLs or xattr support, gnu format will not work ++ # we need to set posix format instead ++ if [ ! -z "$attributesargs" ] ; then ++ tarformat="--format=posix" ++ else ++ tarformat="--format=gnu" ++ fi ++elif [ ! -z "$attributesargs" ] ; then ++ echo "*** Error: Attributes: $attributesargs, don't work, without posix format, which is not supported by host's tar command." >&2 ++ exit 1 ++fi ++ + cext=$(compressor_ext $compressor) + + # pgzip requires -T to avoid timestamps on the gzip archive +@@ -301,21 +316,31 @@ fi + tmp_dir=$dest_dir/IPKG_BUILD.$$ + mkdir $tmp_dir + +-build_date="${SOURCE_DATE_EPOCH:-$(date +%s)}" +- +-mtime_args="" ++mtime_args="--mtime=@${SOURCE_DATE_EPOCH:-$(date +%s)}" + # --clamp-mtime requires tar > 1.28. Only use it if SOURCE_DATE_EPOCH is set, to avoid having a generic case dependency on tar > 1.28. + # this setting will make sure files generated at build time have consistent mtimes, for reproducible builds. + if [ ! -z "$SOURCE_DATE_EPOCH" ]; then +- mtime_args="--mtime=@$build_date --clamp-mtime" ++ mtime_args="$mtime_args --clamp-mtime" ++fi ++ ++# Notice, that if you create an archive in POSIX format (see section GNU tar and POSIX tar) and the environment variable POSIXLY_CORRECT is set, ++# then the two archives created using the same options on the same set of files will not be byte-to-byte equivalent even with the above option. ++# This is because the posix default for extended header names includes the PID of the tar process, which is different at each run. To produce ++# byte-to-byte equivalent archives in this case, either unset POSIXLY_CORRECT, or use the following option: ++# ++# --pax-option=exthdr.name=%d/PaxHeaders/%f,atime:=0,ctime:=0 ++# ++# https://www.gnu.org/software/tar/manual/html_node/PAX-keywords.html ++if [[ "$tarformat" == "--format=posix" ]]; then ++ mtime_args="$mtime_args --pax-option=exthdr.name=%d/PaxHeaders/%f,atime:=0,ctime:=0" + fi + + export LANG=C + export LC_ALL=C + ( cd $pkg_dir/$CONTROL && find . -type f | sort > $tmp_dir/control_list ) + ( cd $pkg_dir && find . -path ./$CONTROL -prune -o -path . -o -print | sort > $tmp_dir/file_list ) +-( cd $pkg_dir && tar $ogargs $tsortargs --no-recursion $mtime_args -c $tarformat -T $tmp_dir/file_list | $compressor $compressorargs > $tmp_dir/data.tar.$cext ) +-( cd $pkg_dir/$CONTROL && tar $ogargs $tsortargs --no-recursion --mtime=@$build_date -c $tarformat -T $tmp_dir/control_list | gzip $zipargs > $tmp_dir/control.tar.gz ) ++( cd $pkg_dir && tar $attributesargs $ogargs $tsortargs --numeric-owner --no-recursion $mtime_args -c $tarformat -T $tmp_dir/file_list | $compressor $compressorargs > $tmp_dir/data.tar.$cext ) ++( cd $pkg_dir/$CONTROL && tar $ogargs $tsortargs --no-recursion $mtime_args -c $tarformat -T $tmp_dir/control_list | gzip $zipargs > $tmp_dir/control.tar.gz ) + rm $tmp_dir/file_list + rm $tmp_dir/control_list + +@@ -331,7 +356,7 @@ rm -f $pkg_file + if [ "$outer" = "ar" ] ; then + ( cd $tmp_dir && ar -crfD $pkg_file ./debian-binary ./control.tar.gz ./data.tar.$cext ) + else +- ( cd $tmp_dir && tar -c $tsortargs --mtime=@$build_date $tarformat ./debian-binary ./control.tar.gz ./data.tar.$cext | gzip $zipargs > $pkg_file ) ++ ( cd $tmp_dir && tar -c $tsortargs $mtime_args $tarformat ./debian-binary ./control.tar.gz ./data.tar.$cext | gzip $zipargs > $pkg_file ) + fi + + rm $tmp_dir/debian-binary $tmp_dir/data.tar.$cext $tmp_dir/control.tar.gz +-- +2.34.1 + diff --git a/meta/recipes-devtools/opkg-utils/opkg-utils_0.6.2.bb b/meta/recipes-devtools/opkg-utils/opkg-utils_0.6.2.bb index eb88b9b734..d5ce2cfbe2 100644 --- a/meta/recipes-devtools/opkg-utils/opkg-utils_0.6.2.bb +++ b/meta/recipes-devtools/opkg-utils/opkg-utils_0.6.2.bb @@ -9,6 +9,7 @@ PROVIDES += "${@bb.utils.contains('PACKAGECONFIG', 'update-alternatives', 'virtu SRC_URI = "git://git.yoctoproject.org/opkg-utils;protocol=https;branch=master \ file://0001-update-alternatives-correctly-match-priority.patch \ + file://0002-opkg-build-Add-acls-and-xattrs-support.patch \ " SRCREV = "67994e62dc598282830385da75ba9b1abbbda941"