From patchwork Sun Oct 15 11:23:28 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: 32265 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 21A6FCDB489 for ; Sun, 15 Oct 2023 15:06:28 +0000 (UTC) Received: from EUR02-DB5-obe.outbound.protection.outlook.com (EUR02-DB5-obe.outbound.protection.outlook.com [40.107.249.60]) by mx.groups.io with SMTP id smtpd.web11.90066.1697369032343148425 for ; Sun, 15 Oct 2023 04:23:53 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: body hash did not verify" header.i=@welotec.com header.s=selector1 header.b=aoPN8CED; spf=pass (domain: welotec.com, ip: 40.107.249.60, mailfrom: p.lobacz@welotec.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=lKDjHpJmjaDrZtHZSBr9zOppKb3TKhqzupWa2aT3psDGESrRS2LZWsz1/sgUMBw7YfekLCjdGCmccG6JHGWU5FRuQLDlZgr4zQfv+XyLn8Q1MWP4nX8ZR1Z4/4Lq2IXHhTj04ueI9WzfZ+i4HBhwcodia0KZJ1CwdlqVCr9t9uiMwSuNB9JJSnXx8rAoIemdG0139yF/aL5Ip/+P5eo+bj8xADbi6MElO0jNfdA8HzmUnpL0t2QFrKDOxdrnVF+ZERqRw9gtGiZBEfgB5mKsyS5bqXgvCyaecI60KzT7dIa+XqIr2uRz0bz6YnPIcz92Bq1BL/1JiPppr/S7ay90Dw== 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=bo8bRfzEJ+Z6m1AEYMXdDiu5v4gMlVFwLGXvi55XQQDsQTeEI5B2v5VKcAGPW0Q23qL6BJU3J8+dVwn0XJ0LmFVYiVf8t5H5pu3hfn82q+Tccc1ldhlt23zDzvdr2SJJuLnWWURpfnaMI/rsh3Z8G0nBcHm3uxu9ayTkajXFPlXUEOhsQMWD1FcpMnUeJDGBXAy9gomDwQPzMFKHGPoiNtfQfzfQhIZLCSVPPLkFniqPW+CqQknU3cXWMYEt4EvQW8jX7DBSw9vpe4nnkTh83RRqg/RmPJ4xnI2xhV52an5mhKhbsJXD6QV8+27t5B3sNcCZICOKG+o9jFZGGM46zQ== 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=aoPN8CEDhe4U4AC/tQe1O1usCwaaMIfxAcnDEbvdjmyprjxKk/9oey9r0azNJ1UclU5OEtlnp/2prRdHHy+uxb4UeoliODnnpLXNqZA1CIwO9F8Xx67+MlhC3XLHarmWFPkjkEL7POI8bhhIzqDFpsMCqgO+A31O+1rwTK3IFNmsVO0DL4gEXHw0A2N3lpguq6tMqXzlhWuNVB2VeaAdb8oRRCRURRP+l1pdwpMtT9KqyyTZX4/iPiM2mSXF6dI7giqE4dN8u8tz8Gs6gqrxSI1IC52Xmk7vVgfaUDjCv97cZj9DkW0oAlw+pC6hZZl+2ilV3tG/fhc2kv0weyEGsw== 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 AM9PR04MB8113.eurprd04.prod.outlook.com (2603:10a6:20b:3b5::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6863.47; Sun, 15 Oct 2023 11:23:49 +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:23:49 +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 13:23:28 +0200 Message-ID: <20231015112336.55722-3-p.lobacz@welotec.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231015112336.55722-1-p.lobacz@welotec.com> References: <20231015112336.55722-1-p.lobacz@welotec.com> X-ClientProxiedBy: FR3P281CA0100.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:a1::18) To VI1PR04MB5373.eurprd04.prod.outlook.com (2603:10a6:803:da::22) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: VI1PR04MB5373:EE_|AM9PR04MB8113:EE_ X-MS-Office365-Filtering-Correlation-Id: 4368b426-0cc7-4657-a046-08dbcd71341c 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: GvugwxbIQGlJivfIVrEZz+DOym00pDh2h4s/MOe8Hnso2/a+GH5KkVDktB9tTsdshdSqh3iboLyRggghcMB3oKDMdmTqowXwCsZIG8+lccQyuRxcxoq1xiG5FwP9ZzD56ILJvAHiXcJTdEhW3vP117KNK61E0xWmbNEwtLE9t825JOP2bkRslDneEoWn6GcB1xq3akxHGJpFMtkLPgBJOhXl1Puel/KKMw93n2U28cpiY8KmH0Ns/pu3H0g/5AiDaidHt9owOCDOEskntw99jY2PNZq00gOL+eAQINionPWMYVUg/y72hBBr30Cgn0+uVqwQfelxkLo2uZoFYkQVze7XJI9oSBG8CePx97PF2ZEU5789FicrsFVOpjaz5BCm1aWPGqgLuoyu7vyTfOp80fK09uquaU1j+ucohHVMQdYy8UWTW2haW9S1Vs4Sm1dHm79gzVn7OSR46KT7/MUc76sI8tG8xOeADbLJFmRM9Ni5EVP/iTkHZDFVIIEx7eA1sWThnWVhDeOEbiHVXTjfGLb4rMqxo8nGm6kXa5aQN298qL4QeAHl5NPHc+RvTgr+bk6YbMtagX9nVdrAqGrzo1g8vvgMOm0RbIcD8NUdgLA= 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)(136003)(376002)(346002)(396003)(39830400003)(186009)(1800799009)(451199024)(64100799003)(478600001)(966005)(6486002)(66946007)(6916009)(66476007)(66556008)(6666004)(83380400001)(86362001)(38100700002)(316002)(6512007)(66574015)(26005)(1076003)(107886003)(52116002)(6506007)(2616005)(5660300002)(41300700001)(36756003)(8936002)(8676002)(4326008)(38350700005)(2906002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: GG/ERrcUpAnYqc/3jJP3FF7MTilmXzvy3Y25pPK/6GiwRGIjaDQKZBeN+EYMxKqfadk6fQ7twJ7S0aF91LA6gNtdqYJC4OUPmQ9rcDZfIwf0mxBVPp+CU4Odv+X08yBljJYQiFPgg5K1sWSQHyGgdbZ2i3oOWO6nBNWKBZsBJKAAP56VXClsiFTsAwVLu4BgbasqBy/Eoo0XQVMPgFceub/806DtMcU5CZTYgblYJCagW3SsmOuZTbYF1oZ6NYGTfOIYJPuFJVQRAU0YzUrPbFOUinMZl2H9W94iFceF6QwkuGRB/SKUcwonriyRznaWZZ/ceHzczn66L6+57rxbqJmym4XaxBoryskd4j+ObRxJD9RrUFpwx7B2C2g+KXjHT+A65ftNzEWAif7qaSV4PxOqhXpjishSxSx4aun8+4nBSRE7CKeBgth9P/U+c9Qr5u/4cS56dxaQGu+97O5dFn7d7JfrvbVwi5yeHwHcwz1Zgyjt23RbOPAO93jIKaZwKpKiv5wQQ1kH9VSo5Mfn02p1DQQz0LoFxg7SIm6/g95kegr4antEHMCRJQR+/4MtrkaGBoF/kymtso9OaTaikW2WXxHkGQSCd4iugRJ6/E2I/v/I2sAs0bvItYAeEDqPXa6eLgY6s1E5rKiz2Te8KFVwaYfU/aZ/aZ6LaIoDzlIvlnncyZNOWxEpMPFGamS28uRJgGVVUso9D56tvzhlfO0xgyyS40iKe7f87z5f8XR+/2CNBOKYxQPkV3XnY+OI2iru/FH4C4HdXT6XdfLkdSjR1qwzJF5CiOQnK0B2EgZt1KnxnJZMjyyn38jn5UzK7VSVqs64S4rGTDn3uWjeIT4RGpyXrscwP9mh289kGV4RaREhy0NX78TjWMST4U+hKxsjdUx1wsDWHypj+T4N69xZrbMkOBCZ2KNVKf7kDtpL0bRSeBxz29LyFWdKj3VwX+i3ashq51xBKIQodfhUvk22Fu6EHSM3n7kMKGCdj8VtnvTMENDgZqBaO8Zb5FgSyr3lULgHhzuqj0o0FUDTbWkPVjAP5pk28HW+XbuYOFM4z6Vx7QNl1U7jgHmgDsxnHcMQUk/V39QhoYO7acstaeJ2w2NzRBm27ktAWLBCHOtb4ULGviKrChzFvE+nTJyJgG/RFryuSXFnR3vn+xtQQZDK0aR62cbvGHeY5RParhGkNR26vUHIM9398yVZQDJlQX91I5Hbg3TQAHKRFQ/+kZ1Rny+JEyE8EbGbg2mvsO13uXaGDvMhFLOLBGhcPRErjfcwe4tQJGEF8oY0KJHiZ2a1UuXUZOwam0qYuE4kc/dJRF01f64DCOxrm93jH4YMffgTOtVtu58jYz/eDdICKc6dNul0YWss8PVSPIwT9hvW3EYMAZMzjr8CRvzeXd3mq/8yfECGS0aO3A/uoJJ2yA6d1ESbck/t0pz5AsjTdljBKiOqyafrqJ2e3x94j8p2T9h42wFT3E8gahXim6EgrPHTSJdIcKuKeFbYJZX5rJzttoojb02LxFXNcfdSBCFBAcvQoK4chtduRvqLU/jKbLSCQTkLwKF9Olmm2+o9XdfNezWPmUgk5NduAyrjdsrt X-OriginatorOrg: welotec.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4368b426-0cc7-4657-a046-08dbcd71341c 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:23:49.4496 (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: igVAQ+vBmnRMnobGlyrwpb8ztDqslHIgdBrfizEuEvAfvzp+oyOvEZgJGpdgYb2lVrozVnjo2t7rv2FUHiJuKQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM9PR04MB8113 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 15:06:28 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/105531 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 11:05:21 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: 32270 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 4EB8BCDB492 for ; Sun, 15 Oct 2023 15:06:28 +0000 (UTC) Received: from EUR03-DBA-obe.outbound.protection.outlook.com (EUR03-DBA-obe.outbound.protection.outlook.com [40.107.104.48]) by mx.groups.io with SMTP id smtpd.web11.89878.1697367950849094118 for ; Sun, 15 Oct 2023 04:05:54 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: body hash did not verify" header.i=@welotec.com header.s=selector1 header.b=vJl17R52; spf=pass (domain: welotec.com, ip: 40.107.104.48, mailfrom: p.lobacz@welotec.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ft7N+OSNM2AmL975KWrbLkr4IEBS/J15FMHVP3r+xdNU7X9UeB+XhKrZNX5N1+mAySckd3XjBD1RRm/r2UBSFDSaz/f+54qbVAB+22GTMUrfuK2fX8F8FWvNhaVAgNAqGl5GelZA+JLd6HV6d8dTQUSsRkj6qVS/Qpg031PTKnEFwU3xhLumL3Fjl3oR8Ml7yyZ3mkYyvgLyIP2FQNZ/z58GKyw5NpB6Zl3jsaCGO7WPQw+CNm1JE6b8SUmQi1ydlIoB1PFlcehK4z/2hD87Qek9j2GOUGxibVgHlKDyoWSHq5f2l7SDeMCTVm/9qfdFlDo1LPVEThqLLbvLFacl+w== 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=WhgY5vr1wYNLz5CX9eGtCAW3Akkpa/sk0p6AmOo0l45JSWK8qttZG89CgZqR6hl6jER6h2fZaYIQqffdH97uLTcqFZp6RCuee+5ai3b8K3oe0/PgTt80FgifNimD9k1krwdhaZ+GplM7dGAPPb4UXUuqpv3vVLfTrJ8RgWecZGebYh8baXLbOYtuaUQW2cBxi1/BCC/Zyk5KjsxorM1JUj14JBQi3lCI/3szJArOGgGlAU8lbLVilYbyhQNroAQUBAMt4gyiODuTAtGOF8I+UGGmu4JY9hvAwmE3AF2rAS5l47VxcuGok/Nmgu18i+XIfhL7JZkAVp/RGVZAkYJUqg== 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=vJl17R524ySSPuXa/5+sbti7RBSzbtZCxNG2FiJrVF6Z53b1BcvRi0LxyG0FKexzadf8B451MyHBlYYa3xyrranUEgRmlJQvBaAisBrLvGTmmZRbk6Hdq4wPGETGW20zLi/VRkYcyLKxrGTEr9w+70gAeGQ7Wuxi0Fl9OMjn2AADtWHfZY3Xr+QmfPjlvbDBap9xGM61eWnOb3a+D9FO9GdI1x8BxO3BmNQe2pV0FC1HY8piEWptMSAveKU/eCLQavJeqnCjJ3CXjBudKIBLuOGWlieQucHtObk/u9TeZDJet79iI/5pANXN5HM594q6aPnsy1McUpZQsHJII1XDVA== 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:05:51 +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:05:51 +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:05:21 +0200 Message-ID: <20231015110526.53738-6-p.lobacz@welotec.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231015110526.53738-1-p.lobacz@welotec.com> References: <20231015110526.53738-1-p.lobacz@welotec.com> X-ClientProxiedBy: FR4P281CA0049.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:cc::13) 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: 8e3b4cab-107e-442b-cede-08dbcd6eb157 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: SbvvObAeuDibJ/fGGuTteIaxNGqo8RZlKop7e8Hzpx+3VhvIFZDBvndRPQ/KRNkoUeMDttfWsZ0R6+GTYMTRHEf7Fg8qFCBKzjt/+s4HKI1BRcFGUKq31pkIeCHpkSbPfkj9gp1Hx8CWBD2fVDl5l1QtFPdLu8mFwuyxdgN/AylVPYNscA1kbC8596BtDoL7M04Xt5Wk20hi8VdRkFQJfC0pcJUJVn1AqsxVH+C8XI4+yTQEnidKvFJkplQd6fBJOMY5HIOA7A28dXlRWrGuqACAggT2tTWjnF0gMw2z+TBz3ei90q3s4jfqvgDA6n+EDPmgFtQGOTwPGtrcR1LsR6yBVKN5+wLevPHn6pXxtdGpROYY/fU24N+LjaIhUxZm01C8ox/ksCZFgfwtbIKt1qNYX+UYVvBLnlUugLO6QmkUr1oye1eCM2thjBrAx+WAkRcRVKbYQOV2uF/NCwo5ujSNNwHrzVWEH8SejKyoc81xPFzDH6PXvUCut7TueXKzNUUgKuRfGzu/mRyNWFOR7k5CarUod452DHVb8QnkUu20pvjgYNHI3MV6UDsRbKYjp8tMDmTkxctXGiCc8mwpkiQMpm6QPYaS3UhcuB/V5pWg9NSbtZAONmiECcQTa8Pl 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: YKYsT6/oZjIId/ru+1lz8uqhwu1LHHn55cJ2EKoJF2E+yvhWbgKjewFxW5As3hF1QDualjf14cnAXKyCNhuWKIcVFP66u8KeRazVwFL3VMHdcqD7XX90YXLPSovYEhsWuBmlkiFCtJZoeVa6ifqyE8x8WoL37vKHkrp857ElVy+TIC416yX9sGtfmcLLMpxSH3Wlf9FdXS/XgK5JGN/mrvWvVlsKbe0D16DdRZeaiVKdkVBFQXLzLQU9WzEes+QhsIZHkd8F9djoEpUjGdI9aunhx8NGgzghQ3GHQXT0W0KQL5bVmVgk/MtiXh1QHXgYIGboYNOLUwE29EQM4UYNF8AspuFtmuX9iTQ8LVacWzoGyO1CVFSDhusK5/uevZ992GPuWF7lX/M+nXfcVbzuxoFSUskfR0Ac5bc8ZXXr9KfQUtMiOebimxkPC70SHIWJ+bp0FlKuv6AVRM6ruJZ2pr4x8uj02xBuVVVpXiaA5CvD7rtkF3vrnW6ySCgM+S+rS92bVjMa32tTrTe6l4xP1R13RSyJdg3mYYdSjANTxGIUStHuDso3p3Wxp46citk6SZisCH1bTdnZfbhIs5IXCHh+1eSKf1v1M7cSrfNlejrdz9inIZ7H26L1y52sf3SALES1N2JRhlsBWRaBSQu1KxUzj0RmnsuRJoiF0IExW3Hm/wc1YmVJBxfgaOSlEjnC0vXwXjBbp02yjXJAX0m+SXVYnMOsk4GDnBP4wcWDI03GNqqQqody8m9AGCenIVfOespZ+kEj5nNF8ezKn7ZW+KMlg9jpIDlS/rPlPOyedbqSWMGCXSjzM27fS5xSrHIiNwPIsWiIFZ0VYF1nMeQd2ttvy8rmiPTQS+r5EUc1+ccgI3FjPDvKHqmLxvwc9KMk9DTWf9aPWrHTf44BABdBtqYCUl6wPECPedE/2Z1qGmbtMwZXgkOLe9NUa1qOuQtGevuX9/SS4GHyOes5DZqHSo5rYOHMGSDrkC/G+veM/fcPlK6gn75LqlMiphn63/vKWes9xFYi2csfofAKyJfnP+RMw3dSGBnVCjG+fZAp7Sb1RvjQek864UOGyYtg5Q5mLa1ThXddCw4A/63pwpx3EopLbwIkL/QyAbdZYSdEgEnTFt8WcT3htYwlC7oRgN2wPXjmiqshSSA1H8oFsDzL+h5Uwb8KBtv6NIwbprSfA9C7AhwYFMucEyjcEpldVTi2ZmQuWpMW3ndjGXAaC/1K/T5PoX33oi1RVGfbr++O/ZmYV12rcVdtqhVjtLH/Vioe2XIG9Lpl0sR8Z3AUpUCxBSfft9fOeAe2m6R4xzu5FFOBQc8hm48ZlvWj2AN27pJFacaNVmc13LOYrNlDYuXiECjn75IdcwjRI1Ucho7+jaPs3jwZkRkgRIT3dVw/mSfm7IIs373ML1LwGn3Re1DrxAS49ZSJWCsah1RUxAoRwr5vkz68CScNdQlda5ntOgkyvxZhCDkIzMlAXe39+oTkiV1hBdwb2a+mm67cky2xY4sxf7huyHvA9hkgTLdUSTb10VGHQt8zuhNCn1jk4zwqOEaMFaMrImpzIZat2LPCwNw/uz92qnnxtjg+zZ7+pavH X-OriginatorOrg: welotec.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8e3b4cab-107e-442b-cede-08dbcd6eb157 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:05:50.9700 (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: 4JTnrwe7yCBPOJeEeQIJ8KRFfWuC/Qu6e7IDTwgi7OY7g4vpt2jBA5pYu2/8ARGmauMbzSmzzSXhYvTVWj/5+Q== 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 15:06:28 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/105523 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 11:05:24 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: 32271 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 4182ECDB48E for ; Sun, 15 Oct 2023 15:06:28 +0000 (UTC) Received: from EUR02-AM0-obe.outbound.protection.outlook.com (EUR02-AM0-obe.outbound.protection.outlook.com [40.107.247.53]) by mx.groups.io with SMTP id smtpd.web11.89880.1697367955844343434 for ; Sun, 15 Oct 2023 04:05:56 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: body hash did not verify" header.i=@welotec.com header.s=selector1 header.b=i9h3cl8t; spf=pass (domain: welotec.com, ip: 40.107.247.53, mailfrom: p.lobacz@welotec.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=a85oUXyaJ3eq21IoTuPLGEYLsfe7EiPPp0DraLhXTgQnxL6EFX6B59kzi6uzq7pwauvQl2mVOe9RvEE3cqoUlmDKniiNmt5yLKJVlC8JRJoQhX0BKvEHyf3rFlCHdABnqLN5WhtG+rJ2zxKhSC9TyIUu/+YKxvXFDkNIOeEBLsk5G2RT/ZkXJAWoy+IFI0n4aB7iTb6AEKdiInYHzFd61Y388spIY4LPwakCel0EQhmE9w8K4t7fOPCyxSlSrJy9UYhRV5vlTaYlUYR5U1oCYtbH1OODy1r7s6liUUfh/4pJDrk2smQy+dpUdM3U/HeTmRH/065QIH1MQV4VAmzEZQ== 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=J4P7sBpzLKpv6kkMHkMap+0VXXRiesod7PKaZFdW+9QsZtf148d2Pjm4GHZWuGRTEnn3BWE0CFiWqs9XiIJF7e7nGooiVpERvi8pEOjMhkyl4yValz/BIBAXlHD3yEM74VV8E3WiaKeYyfhOE73vJamCSJJcfZ75jMhqJgFtcp7QxIZXQJP+/U0YRQUEjpNUwmtfOU6PfAyCJk/QEyyGCM4ys/ftAI70EmF0Bl+NM9r+eM3591zqAE6A3DlQR7WCsjJ30E5/d28jxjFW48IINxlZhPoF7uBlxLjGZf+1N4feHntGonsKrHhGdVpuuUqCU8UWJmhyiSfXUTAk+e1TgA== 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=i9h3cl8tKCjXqR41w0ikYdBauIMCdP3oAm2wkGLWaNlCJas1mQ98tV8COmgAds/2JmPve8VnhDkrGtAMwCICVgKs77gQNrRnO1wzCgdh3NmVwybDHLshZIGMoS+rkF98viZKtm7IUMCk1RsBBlp16YW5vowsnUsYhGhXuZ7aMZL2HK7GMl/Bgpx/gROtS+7pVREOPIpGG8lde6OOYOAtBrJisqGxE5fbV/0SLu6fHzsyM229kPqZ+VFOfR4xiRrtrNW/7Mm6MlEwIR7pdeyaeeL0+Cy9Lrgn4BCBrT3xwIu0jwTudoaVcn8BliHswEqLi1Fci6ZjHRC6/i7qYoEysw== 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 AM9PR04MB8940.eurprd04.prod.outlook.com (2603:10a6:20b:40b::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6886.35; Sun, 15 Oct 2023 11:05:52 +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:05:52 +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 13:05:24 +0200 Message-ID: <20231015110526.53738-9-p.lobacz@welotec.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231015110526.53738-1-p.lobacz@welotec.com> References: <20231015110526.53738-1-p.lobacz@welotec.com> X-ClientProxiedBy: FR4P281CA0049.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:cc::13) To VI1PR04MB5373.eurprd04.prod.outlook.com (2603:10a6:803:da::22) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: VI1PR04MB5373:EE_|AM9PR04MB8940:EE_ X-MS-Office365-Filtering-Correlation-Id: 3865a686-7da0-4fcf-6116-08dbcd6eb24d 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: 95nzxEniITFNSJFySo3/WMyhnn3K3VwdBXw7A+Wy8VWa/38wCRB2j/dyw8OCmJiWapVTmqGwEFp9iTWA2nebWf0Om7OrUwheoi/TourZSnZApWU5PvLwHRjrqhf3ossTyY8aIGRGvwKD1W+8YmkajNZqi7xqGQqlx8a3WuBA2VRCoygXnYgmdiYApnKTRwbOwav+2S+xNVKKqDQvZQo9iKMGcCqp/uG9keU/7IXA0fsYv/mZaUMsnN8GViobuiBy02DMzxDugFxblGQEr8xCxm5xnyTLeRfq7D0nH0ktjSZ0VN6PSgMbNoSxxucHOu/aqc4V6l+nRGf3T7erYlz0Fgjtb4MtjZaNXiXnLMQutjlNUhLCwS0GEQSwStsHs6Ly3VFxpoB+9MC7WInax2BEFBEMQbwGc+M7gxeLxLkG2RAZ1hR4lOvWvqEuVMsbGS8KWRdwQBYiXFsEOPOUFiS+HCD6ujMw4cryzC4dRodZYkTatbgXu3FC3E5ZFuz6VN3/1/TBSr6eW5hEE2Rh9/wXtdA3eE/vjTKmK4XEfnaaO+uzsxj2f8tZ5XJelgqAOIF/b0mAsDEO16k+/k39EnjGmwBlqoYeVw5pq+ece/rVioc= 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: Iej5FZi7A+zwlKUvGsbeEyMwb+o/ZfDKX+spBk37C4/8eI8opSGvz7I+7RIDpmzA0MAd+zjmcpi4IFEqWNojNm6nKNej6JWvdJnbgk7oYmnw0Cg+tjS4fEUSY15Vs2gv/2ljCt9cSodcvpijf9xtAmejl++8wtPVSXQT/Yzw1OMvC96ZF8AvifPF+jZ9GNz+rCQ5josrYcIvMjAucuCwFfGoq8gGjFSk+ED1Q93+Qf/La4EvtZcycb5k4D0jLigRnJ3bKEPizCpILuT4eDvD+8yGxjlF6mbKIOBCGjq9MNWw3mb+Ov4IPrgu0WLvahIoziMKArCeJE+Eu2/3eKoQ2RaDexemsMKIMJmpCz/canKCnrxAVWiKqwFuD1dOM56rdU3WbPnRUfOnxeJmhHoVHq7PaFh324GICSiwdtDwZwzAUsyu7XY3zSxmcxNAMXh2nYLJS1VCHj00R6boqKKXSUT/J/fr/S1yPENbmxufFg3eKx+s5Z66GPqBv1tblJuAafYdnTwHkIn9ca5IYk13mUq+zWjsLucduJT1C4yzZVE02Op+QMRy7fdQtKXHQ/RAm+4woDodG/tfinZ/7kasKZi0iyXAsGziD2VY2PRFhf6i2LbQaL2aJe+1p4eNfzU44wKK/t+9iILEcl2FyR9nsbPsOx0um1EJSf+7GCvqKEGlaNKC54QM8Oh9QEA5ZK8AGShsqsr1+I7M8Fx1Sn026MZvYcY1rAdft9Fj9HRTtNBQOaTocyAWXc0zwIJlkvlWw26C1IrQA3aHhFQVqU+KkkhPVW8FKMFxva216VhMyb+97bB3OzUaZRwZozV3BiJs6OOF3eLKSpDVVc/0t2LEwwGAF1DBy9T5vhomrystpWJw48rzS5CRY/9bkBKm2ppYM6Yrenwokk6fpSglgjVM3lLe3djX6U/GIcPHQc3tfDcM72twYWQbZxQOg+/nhA9m04Tnt/3ZBIiqy4odR4M7MaxGeTQyOvdP5suGNKK9F2F3YkrLjB2gJU85+cYhQuQbjEaXCfQ24rwb1UQt6ziBBv2QUh5UeGWobulLJjEMDunjNqmyxrnI49qzLevtILo5n3gjG0wqm1sHspwwWbK4zhPcwJE16W1eiYD33jvisjKgnS9fG05bTftR/guSiebUqC/KsUyA8BhtjtueMD6IA8Jb4fRepa1D0TBdhU1SFuOBDCpCJMfazyvWDgJZHnVWimhwmyvE/hdbdJKhtTCL64Kbd1HxcK82zkgSLhfjnS1vDwFRCfm13YGZB9aACio1yxOgL3EVx/aU5fbraux9sCg5WhyFJ2eQVVBOzMG81okxKP55DbTgszytqmWuWwq1lRBLgn3anteram/OErfpLF9YU1gbGj5n3H4j0X5mGpcpE5Y5eQSCu6IJywAk4JikE94bdJSTlqNGLRXrgCLlJMFxPRCpbvOvXs775m0zvLZR7em97aIOHLCo2P0zdBJD6WOghB+slqIFlRRjKWEMPv26JdagfB7h7bBioqhTvvNHTN0BJJhQiuf/dTC7RaaSpP6u+XVQrrJBTsgE2g+PQjKw2P6dVJDZoyMla5tFzR2dtKEvPDLlAHlRBq/Udlka X-OriginatorOrg: welotec.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3865a686-7da0-4fcf-6116-08dbcd6eb24d 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:05:52.5997 (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: xuLMTqwGPSQK2nSh+pL0BQCWtqYt7Zx4SoYDZlr+9H7YdTKPVSNcau9lHguoktOwKZffVkabMcz+d+4HDmv3pA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM9PR04MB8940 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 15:06:28 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/105526 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" From patchwork Sun Oct 15 11:05:25 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: 32269 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 354E3CDB48F for ; Sun, 15 Oct 2023 15:06:28 +0000 (UTC) Received: from EUR02-AM0-obe.outbound.protection.outlook.com (EUR02-AM0-obe.outbound.protection.outlook.com [40.107.247.53]) by mx.groups.io with SMTP id smtpd.web11.89880.1697367955844343434 for ; Sun, 15 Oct 2023 04:05:57 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: body hash did not verify" header.i=@welotec.com header.s=selector1 header.b=Vkjh/y+M; spf=pass (domain: welotec.com, ip: 40.107.247.53, mailfrom: p.lobacz@welotec.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=HW2E+3z5l7lPzA2OfuTSRIhD8Wq4dFD9znpdbmhkx+21cqU6uCNZ99Q+4Ruw5VlM9H5tNneKvdHaQuTzsVio2Nj3ntrFbh+/Ck2JGuGMt6sxf1smhhpwb+hTojY+W2EY12CoN/9JPGWBvCyDdqttZql6uIAkZpVnM9qaFJm9F5ryH5K9+NZtbK2HEFao6L5yMYXACRSQetmoTdmXtQRullBHfhfdGDGZDJK+OU1+MSaC8K8NpJdttWfHvaeS6NxoqB0psVXfJf9Z3Ts+PkBJAdvTVUyWLn6UOi5bM4vgPzMPe/xuW2jQoyY20H6Kdt2i5a0NY6w/e1Yg3AtOTJ6PzA== 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=aufmz5XXUPx3GT5C7Upri0nkPs2fm01KEawbIS+GMqA=; b=VepfykKkeIq+HsEGc3yPer6E1jm5gjDGWHA/AiOHeTfFE9XNyo4xobs555qMjigeMqWSrMIfvndK2lwuUdLMQWIhhEzMLNG6qUkZmd1ymEHwS6sDk0U+UDDty81FVpCXN7VxLqg0JjREYKWSGc3jvDFcZjO21OWhzsS9ZowfKMYVoTEyUSEe0LVrGHBuJGuvdg3BNK7oAm/ncEP/wSXziEPUuan3w33uaQe0lsROnRBMXjFKfJrnyieeGjZzvGAptufxdVKcjC2cxq3TtV4uGqgwtiwpC4r7Eut0I3HAAl1Vgd1W1KukI6mI7aw/A5cv+xHm+8CnmhTcD/UYyAFSyg== 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=aufmz5XXUPx3GT5C7Upri0nkPs2fm01KEawbIS+GMqA=; b=Vkjh/y+MgDZkUdbwMR51oq9SxqlLK8o3GTOuNG/7k7T+RJUykY4pTHGLTT3264z7IbR2u2lt1wp/O375XeVef3DNtLwGY2M71dVzxJyvJULw6lb6N8BFYlECZJYCJM6K8x+eEIcH8wjfQjZODosF5p7WV5Kxnj8o0e/NWM5dqLALoclT8jXeKG6ZiTlAFm/++afrQuuAOL6XhFH4P3WsIxLJ80rnNBb3CAhrvx1uNb+EfAJne+mykohQBs2fLDx/94RqtWb3Vj/qtvpPP4cWA5NW2NJz+U4uEVeqDYEcTTrbLZ9EtBi0XkEym2mktyteqWiDy3Ep3mEDVT0cAzAIXA== 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 AM9PR04MB8940.eurprd04.prod.outlook.com (2603:10a6:20b:40b::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6886.35; Sun, 15 Oct 2023 11:05:53 +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:05:53 +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 10/11] opkg: add options to enable support for acl and xattr Date: Sun, 15 Oct 2023 13:05:25 +0200 Message-ID: <20231015110526.53738-10-p.lobacz@welotec.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231015110526.53738-1-p.lobacz@welotec.com> References: <20231015110526.53738-1-p.lobacz@welotec.com> X-ClientProxiedBy: FR4P281CA0049.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:cc::13) To VI1PR04MB5373.eurprd04.prod.outlook.com (2603:10a6:803:da::22) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: VI1PR04MB5373:EE_|AM9PR04MB8940:EE_ X-MS-Office365-Filtering-Correlation-Id: c1eac84b-69eb-48e3-3af1-08dbcd6eb2c2 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: aXJqT/map3myNmHag+NCD6qrnBTm4D3xjL9PXHIUCxHKqk/2L/F7J9X28ttmRvQ69toebeJHyhK6jumm2O2ZLnhSM0dXxR7OFkVCexXyM/z2111V90HuNwcym2Xp9v3muDd8g+UdjNrAYHXw3TvJyYxW8xX/Fi42rD8taBmORoh0MLiI8xC7YHLl/MDRPpQShqmeetjPbS4XMj5hzgHOUSdYHjbs9u4DlZQm2zjLwh+Vz7e3SsRYu16cdvvNG0a5jdQtTF9MIfDiQntmbPj1eWOsrqqxouJk4UTAHhR22FRPbEeiiY23L6bDWUVeapluQy1QiNUwK0+BMXqvTvfGTKUwuea42UQMsRKRL904Nb51w9r99Qm5Rxjw3EuGCjexVd4gqWWDP25WTJFEVS1y4SdeRIJoNKbOM9CxDctzHu7R/b2WjCeeiUD7PrQi32uY+ydE771rozWgY0DgSPmyMQ4pSvSCxUxvoGWd7Rv5vAKAYcbsGXsb/U1fVvuGb0DqX434fgH7lanPeyuvh1dI73Zn0x7lKmqW/2Yp5tejAY9oPoFZU1azYlfD0AFfclqjg6nXL2yjHFriiE5/IBwbRyqvbcLUe5wsPOa1gG47wm4= 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: 5A/k2/I9teSWZVUsAph+wa8IjCejOTZhZWuQKNpOdRiPVn8uCIawq01B1Eaf2zZDMwuacj6m2STG2smuUKEUaX8GIFNQCq9Zbl7Zy2vOR/4dsM4kmo0/lN1+Faqr0JK8jb6zl51VT4H3pqfK8NTsU7A1dTzICM3VaI7A491xAATmPY7muDAjZJBrVst69f3Z7FB6LSUGNClCyKmTihvNs+LID2Aic6N8i9lr7yvlUKZB8f5KqRr2uvIeq4jcQhTfOCzxfXNq6oF4ZEc1O/Lz7rPGCcQoTbM19hNmAGqjr4PsB4/Luf0XjsdWHvtS7FLqbV1YtwJrnT7PxVVBa+BPTRS1PaMvTW/nHQL+Hedk9fL5mkfzMLruzluLBIpF2iCAYjcJ92OIue6g3AJgLsjL+f8l4Marw90jw7Xlr33mJRvH29zkZvaxb5vU4E914aHzVFWUIy1t3tY9cGbOs8IWfLqomnjFDOSKcm76S1kjBSYhmpdsmbVv1LENCU0wdRFKKoqP5/oAOhegWGs0Z30Ubts6x6wNFFA/TlsqVYFKzan7TdWC4gl3pm04i23yUZM7RULu3a/k0RsjYRsfH0t3iAHAJhBJo9rIigsa4IMPBh4wD0REfVg/VYZWmIoWq2AvipRtk9rN4Q8CGN0l2DmepnOZbk3pvVctUxb2AkYB1n0lG4+MvZ5y6l+0eEu8hOxxFRQJAdbFTfAUV5zVJ9DeOtoRNqOeHVRQHwCjXzLmtHRT8W6IYqN1YfyyzFcbEQ/qg0bsvdqoifTUzdyNiFxc6Q2yDodr+QkClq3QqVTEBbtJEWMS1WkVrRn2VTUtOczUpBpz7vlnsFIUOVRN9ss3m6KwjKyDUTv5ZrN2WMWn23p6ZAfaVRGF1Md0isQNEE9wG9+0EO+TTLJRFH0FmOvSrKuPVhcano98IcmMv/ojKFyWlnnQkS0kGeMKO4h8UeAnVXUeRmfeMU8/BlCDxCnodypBuxAj6mCVZ07pjGxPxY//PZ7CDYlwOUYTYfOJRVuGny+h0+3oB11d7a/Eqj+6PKKKvQr8a7W3ClXT4LZwvzTlpLju+Hfovdw8yj3JiUPYc5/sLKeQtzesAnabAIhqUX+A4KwIebT86U8ksCagDj6blNKniDgemUMFXphdWCC6EMA638nIpHOK+4vMIH1UY4HR+h0thO5IY1fPOthQ/jQ3/JBPGO5tPQFcyJyYPAIXC5qtVWd9RjaKQW2FGovJc9K+sKIGqG5PnQ5zYdX+DkjaL47hPC0TVbkl53KDNVd2Jzhc2FV/2TdAMF+Y3NVqTXWRzOdwAUGwtL+LBJXwgGW5D6iW4P1DR+C/7ZwNZGdW+lrBWQAwrUMvVO9w2ohPgjfYgJdBQRFb7sAkbO4E38DtNHcLci44c/BkBu3cFm5J5L2TgpJWCuAV6eGvbXoSUz6KdrvhsDLbko3EcB8JjoDVACNhcRJFR+pKpnAOR3G5TeHmocITKvLci6IrxxOCZABHN5VC5oH0H6XYEhUW2ddwOoPiWfranx/S4ZSpFkDP1lgvMpwi9kUPzRaHiBrIA5kmKRSIwqFfT2K14PYquNG9W2j1ZTYcfxb53nXEnIFM X-OriginatorOrg: welotec.com X-MS-Exchange-CrossTenant-Network-Message-Id: c1eac84b-69eb-48e3-3af1-08dbcd6eb2c2 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:05:53.3534 (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: 9l2yTHISZOOIMbI83c7lrpCjPE+r0+5INJTdHLNgMDaVNStS24OwmTmPnZydcJAtUr5NdYhIEUGby4jiWbJUSA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM9PR04MB8940 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 15:06:28 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/105527 The libarchive library, which is being used by opkg, supports ACLs and xattr already. More informations can be read at this link: https://github.com/libarchive/libarchive/pull/691 Signed-off-by: Piotr Łobacz --- ...-to-enable-support-for-acl-and-xattr.patch | 70 +++++++++++++++++++ meta/recipes-devtools/opkg/opkg_0.6.2.bb | 5 +- 2 files changed, 74 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-devtools/opkg/opkg/0002-Add-options-to-enable-support-for-acl-and-xattr.patch diff --git a/meta/recipes-devtools/opkg/opkg/0002-Add-options-to-enable-support-for-acl-and-xattr.patch b/meta/recipes-devtools/opkg/opkg/0002-Add-options-to-enable-support-for-acl-and-xattr.patch new file mode 100644 index 0000000000..26b2a36c42 --- /dev/null +++ b/meta/recipes-devtools/opkg/opkg/0002-Add-options-to-enable-support-for-acl-and-xattr.patch @@ -0,0 +1,70 @@ +From 1c935e994bd572d9fff436f660ac1a060a434df0 Mon Sep 17 00:00:00 2001 +From: Maciej Liszewski +Date: Tue, 4 Jul 2023 22:01:58 +0200 +Subject: [PATCH] Add options to enable support for acl and xattr +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +The libarchive library, which is being used by opkg, supports ACLs +and xattr already. + +More informations can be read at this link: +https://github.com/libarchive/libarchive/pull/691 + +Upstream-Status: Backport [ef743b75745939df210a9e6a70a44d69181ef05a] + +[1] https://bugzilla.yoctoproject.org/show_bug.cgi?id=15097 + +Signed-off-by: Maciej Liszewski +Signed-off-by: Piotr Łobacz +--- + configure.ac | 12 ++++++++++++ + libopkg/opkg_archive.c | 8 ++++++++ + 2 files changed, 20 insertions(+) + +diff --git a/configure.ac b/configure.ac +index 389a818..46949cd 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -158,6 +158,18 @@ return OPENSSL_VERSION_NUMBER; ], + AC_SUBST(OPENSSL_LIBS) + fi + ++# check for ACL support ++AC_ARG_WITH([acl], [AS_HELP_STRING([--with-acl], [Enable ACL support])]) ++if test "x$with_acl" = "xyes"; then ++ AC_DEFINE([ENABLE_ACL], [1], [Enable ACL support]) ++fi ++ ++# check for xattr support ++AC_ARG_WITH([xattr], [AS_HELP_STRING([--with-xattr], [Enable xattr support])]) ++if test "x$with_xattr" = "xyes"; then ++ AC_DEFINE([ENABLE_XATTR], [1], [Enable xattr support]) ++fi ++ + # check for libsolv solver + AC_ARG_WITH(libsolv, AC_HELP_STRING([--with-libsolv], [Use libsolv solver support. + ]), [], [with_libsolv="no"]) +diff --git a/libopkg/opkg_archive.c b/libopkg/opkg_archive.c +index 03a4afb..8dd902d 100644 +--- a/libopkg/opkg_archive.c ++++ b/libopkg/opkg_archive.c +@@ -912,6 +912,14 @@ struct opkg_ar *ar_open_pkg_data_archive(const char *filename) + ar->extract_flags = ARCHIVE_EXTRACT_OWNER | ARCHIVE_EXTRACT_PERM | + ARCHIVE_EXTRACT_TIME | ARCHIVE_EXTRACT_UNLINK | ARCHIVE_EXTRACT_NO_OVERWRITE; + ++#ifdef ENABLE_ACL ++ ar->extract_flags |= ARCHIVE_EXTRACT_ACL; ++#endif ++ ++#ifdef ENABLE_XATTR ++ ar->extract_flags |= ARCHIVE_EXTRACT_FFLAGS | ARCHIVE_EXTRACT_XATTR; ++#endif ++ + if (opkg_config->ignore_uid) + ar->extract_flags &= ~ARCHIVE_EXTRACT_OWNER; + +-- +2.34.1 + diff --git a/meta/recipes-devtools/opkg/opkg_0.6.2.bb b/meta/recipes-devtools/opkg/opkg_0.6.2.bb index 46be137354..d7dc6ab715 100644 --- a/meta/recipes-devtools/opkg/opkg_0.6.2.bb +++ b/meta/recipes-devtools/opkg/opkg_0.6.2.bb @@ -15,6 +15,7 @@ PE = "1" SRC_URI = "http://downloads.yoctoproject.org/releases/${BPN}/${BPN}-${PV}.tar.gz \ file://opkg.conf \ file://0001-opkg_conf-create-opkg.lock-in-run-instead-of-var-run.patch \ + file://0002-Add-options-to-enable-support-for-acl-and-xattr.patch \ file://run-ptest \ " @@ -30,8 +31,10 @@ inherit autotools pkgconfig ptest target_localstatedir := "${localstatedir}" OPKGLIBDIR ??= "${target_localstatedir}/lib" -PACKAGECONFIG ??= "libsolv" +PACKAGECONFIG ??= "libsolv ${@bb.utils.filter('DISTRO_FEATURES', 'acl xattr', d)}" +PACKAGECONFIG[acl] = "--with-acl,--without-acl" +PACKAGECONFIG[xattr] = "--with-xattr,--without-xattr" PACKAGECONFIG[gpg] = "--enable-gpg,--disable-gpg,\ gnupg gpgme libgpg-error,\ ${@ "gnupg" if ("native" in d.getVar("PN")) else "gnupg-gpg"}\ From patchwork Sun Oct 15 11:05:26 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: 32268 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 30544CDB48D for ; Sun, 15 Oct 2023 15:06:28 +0000 (UTC) Received: from EUR02-AM0-obe.outbound.protection.outlook.com (EUR02-AM0-obe.outbound.protection.outlook.com [40.107.247.53]) by mx.groups.io with SMTP id smtpd.web11.89880.1697367955844343434 for ; Sun, 15 Oct 2023 04:05:58 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: body hash did not verify" header.i=@welotec.com header.s=selector1 header.b=dKm9LXRj; spf=pass (domain: welotec.com, ip: 40.107.247.53, mailfrom: p.lobacz@welotec.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=dEqRahVKIfRCd5Ctd5f04UGQJlzwN5qvsZ+d1KeXuVYSCY4sJneB8jDiJISXkm01Eo9uPNLuz8DYsFESjcdGdz+Te3pfi8T++XR+HopCYE/K/l87yAFrBUJxM0hjUtFaZxYadbLKIC2q+oqZHtsj0Q3bvyEA+66HUk/ZGy1OTerQ081fwRQ5a9AJeWUZ7JJg3BvjlCkAAGyKbaa7ARWUzj0MCEcaY4fyeI27fY1Vv9iPbKbvqRco/cuikdrJhv+EqLPJ3g7vzONniqc2mft/7rUdtCSGwY80GVASOtfQLEy1kI8nWoRHBIVQYKIbDpJqOM0zK8MrW4mR1C195jahSg== 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=N4yzEzAGIfJSEA08tZtSwRV6ZJ4LHjSKlNoa9U3S6bE=; b=CIrZgHikYb+lraO8bTUWkouQYnMpfw1sO1D4ZOLC0HEegb4ZQSjWI1v5xgCoU5BXnyw0J/Y9limCD9bjrANvokvUNb5OuJE+1lUqg4W1z08JoZACHxgK1YaFPh2LdKW5Lq+oDA63PTbuPECKx88Ah9x3YsIeZc1GHo/I55HUFfZ4uK6BW98S8fzWeiidPfJMQwt0Om4EAHxGOy7Txmq6H6XKEarhd7BPSIaNMG9jhmvrOxGkXL8RLxnyI4oaUr21b7Buhk4sO81HPbMFGXKRjHMV0ixrj1CTxxroEZq9z/z8Ldy35Bf+nkZv5l7g47O/sA+SLEtT2R2QjRJUxp23DA== 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=N4yzEzAGIfJSEA08tZtSwRV6ZJ4LHjSKlNoa9U3S6bE=; b=dKm9LXRjVhjRHmS9r+cAa+fKTFPh6OpVcLNmeLQFvJIIQKGyHh4aFEt+TzINDDDdSIVrvFcquXJMDBAcUAvZsFUZyxOuhQJ8sh2GiHZ82/aUVRONLLgqoBa2yOZStLodzeUIIDyZFys+5PTcsoSglEy2QnVaIdJlIOkR9RgPqcT6NVjVOqaeX7LNWqdM+bdYxxS8DmnnHAKio1OZhdeXIvbVV5FJ1IeH33wouFUVuMRQNAvBT+NWqUxwn3RNarwQicHRLDxrF8P/fetI9tF3CFikjt8SBpe+HhClvD12cq0AWFjN84mGrI/cImp0NFz2jW+uuNvBseDu5xbY35h/QA== 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 AM9PR04MB8940.eurprd04.prod.outlook.com (2603:10a6:20b:40b::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6886.35; Sun, 15 Oct 2023 11:05:54 +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:05:54 +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 11/11] opkg: set locale from system environment variables Date: Sun, 15 Oct 2023 13:05:26 +0200 Message-ID: <20231015110526.53738-11-p.lobacz@welotec.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231015110526.53738-1-p.lobacz@welotec.com> References: <20231015110526.53738-1-p.lobacz@welotec.com> X-ClientProxiedBy: FR4P281CA0049.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:cc::13) To VI1PR04MB5373.eurprd04.prod.outlook.com (2603:10a6:803:da::22) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: VI1PR04MB5373:EE_|AM9PR04MB8940:EE_ X-MS-Office365-Filtering-Correlation-Id: f45f66cd-c705-4970-7c20-08dbcd6eb34c 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: 4vqOM7VDygHoaRHZmQVIVM4ROMuvu23Ac5ZPXiqhJXKEQrH6WpgC512N0QBx0u937yZUIoe1+Sr/zfXLdDerfRuRa6xbnKF0MlEQkh8MskY6LQFZNNJYfN6PnBRAVylGHoy6aFfIcxWX0zF+bWVKA7TqpeYLuU8v9GCjK1Mf7ufQxEMePHsPNbfBRiSXoPltRnQrdOJSEz9ldSfB1QHu8ZumfmE7YBzZNP6/7WEG+sbzGjNkcKHnB0Ivil25huQ000+KsELgJhxqlZ8wiapyLauOeBHhMABnc7gUdEWNno9wSR2wHyeEoktNtyG0/Av/r/s91IBm+9hH09iN8FsebokH7EcF+t1we7O/Bqu3cTLqnWVmV1Nq+2l3PsNIzgsWA+kXgZYln5Z3NDG541xL9Z6A4vXJLSlJ/f+ywTIy5K6r+yjvlg1F/1Q9OxSMnHtWfML0RD6r7SMhx54TNyFpTo5HbCHjYLSun1smqV1Vwes6B+1WTzvzRHxwOIPD21FELl+Ot7TXNVI435cKGkgMuYBKYG2jaUXzuOutf99obQFuGkUyql9Z2DZbl+ESEivY+4kyhKmLSW35VCBabweajrqgqaA7e4k8BOsydykgTMo= 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: F6lzmzQ77i7bh2G/NsQEUIFZa8YSHIel0bzGdxnJLVmnctDgyZ6zJuY6uoUb/NgFvr541Jb4LRtcEcYq0jL2QgThA8E9WeWvy213FF6Swwgf5/l0t9ThA7StZTaIvq53b306olnKIECkkEaJg2MzWsTypxCwzC6+O9Sr/oBf3dtQoenSdXIBIP9j7bYw3NZ5QBzrH4QK7JQpGiXpWinhZ0GAYjkhfxFQZrMW7b4fscvR1MT2OOBl+h2vWpBwCNUboORIEyLHicaj7r0Ugnn/u9ie/zTbAETfx8jRLh3ch7q1gBxOmVEictOh1kBWYSVMbvL9TaU09ZywQOI+SJGQMMD9TpCtF7uTtmL01vAIwEDqr4nD6MzTBqEKp8wfDB33cyIIXCrZP7nWgcEVT5JeersMd/mHQho4iJ1VwWIIq4v0isg0fzLel5JV/nTQgmBpehC+xOpe70rtXY1J63SZ7fNz4bw6+Iwt9Awf30H3i+fEDdbtc4VhCjkoj6A+ehT2xOu5QX2XJ7YlD/C+jYoVnjDEn6L1MJ9SWvC2VH4KFoRPbbozzZpakk4VV7SbcaEMjrNUPRaX/6NplzwzpoeXARz7D1uZGzr7byy6IIt3kftHEh090f2mRHYNHoDQJfsEM/lH+NgFfwWbgn5gE78iDqpuwDkO3JCWYMXjsTaeRxDG6SFyuty+boEVsFyle79ZK1skw3pliHzPoWfv46oAReooqx0QyuAHct5jShdyzQSKRQGfTYYO3ojtESUfToDwxf2N6n1QMnh84g+3C6j9AXUpHfiy5q+l/FGVz6ok0h6xEGyx4rHvnxZstaaSsR2pKeFblrtuPreyKrNYDOsV1EaTtyBWlGUXz5IMZRWEoLLSDd4DsGX/el3DNMrdZeruYWJUAFKq73Nsy779EiphxNsDdJF6gUUpNw1Yw+r1BTOP5ho71angwe813NtvxSmTJshbClBCf3FwhYfQZsnvylaWWo71hwM1aOPQwkNj3owyl5pSXy6zuqEFMBp4T9+wOx+TEsufuEOGF7O5n8X7cJkmoQ0v4BnuvbucdJMl0nfBrQAYQWeQEGQldgQOpxtUezYK9mj0z1UmEnEb59aQHZeRcIHlEXcgUdC6xD/EB8srNHERSWAUa7+WQR2mFbancBdevqnhQulGK19cdXsK2Vl+pjoRd7dj2BC169HtGBZTbVZNp+Cc6xm1WLiVW0d/1rdY9nPepaMG3739NBQ39/t8e679S9H+bTMB75Ez7ir5ovmSTuxy0z+pn2NiYm0ks7ySYVpcOP3/G3/nFClJJnDBNl2vK94QPkusJo2cadY3YXp3gwPfYmPCyBahQR3Fq6o7vH4U2/A+hObk0dUFw5JzgLrGYgd/QwQCmMBVW3YJyQLfdgl9PCYI5v0mxYO/PThdXB/PuAkIG0DMXjapyeHb3abp7iZ+Ry/ylWbULKH2wWwcf0P3RFlLvqXmt5e9rxyriImNYyVTHzSI13ZOtlWfvaFJAKQZFDYEmfW4WsfIlPLvjbjXCyVGt/Ho+hWY+/Vl8V4jOYvUf7unvTZ1CAizXwf4adhwsMs8hdHdnTEGvCDS8ZwIDaE6eg+LzkPH X-OriginatorOrg: welotec.com X-MS-Exchange-CrossTenant-Network-Message-Id: f45f66cd-c705-4970-7c20-08dbcd6eb34c 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:05:54.2669 (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: vnsHT4o80wA5QA7B0fuVww2y2Q9EniuGL80l62YUi0v7/daCV3Jm/9OINtsLLzALp41VEVcJVWJC1KgfXlB4pg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM9PR04MB8940 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 15:06:28 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/105528 A C program inherits its locale environment variables when it starts up. This happens automatically. However, these variables do not automatically control the locale used by the library functions, because ISO C says that all programs start by default in the standard ‘C’ locale. Fixes warnings: Warning when reading ar archive header: Pathname can't be converted from UTF-8 to current locale. (errno=84) Signed-off-by: Piotr Łobacz --- ...le-from-system-environment-variables.patch | 48 +++++++++++++++++++ meta/recipes-devtools/opkg/opkg_0.6.2.bb | 1 + 2 files changed, 49 insertions(+) create mode 100644 meta/recipes-devtools/opkg/opkg/0003-opkg-set-locale-from-system-environment-variables.patch diff --git a/meta/recipes-devtools/opkg/opkg/0003-opkg-set-locale-from-system-environment-variables.patch b/meta/recipes-devtools/opkg/opkg/0003-opkg-set-locale-from-system-environment-variables.patch new file mode 100644 index 0000000000..7bf191beab --- /dev/null +++ b/meta/recipes-devtools/opkg/opkg/0003-opkg-set-locale-from-system-environment-variables.patch @@ -0,0 +1,48 @@ +From 712895b1914bf63ee4d669863bfd106814329076 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Piotr=20=C5=81obacz?= +Date: Wed, 19 Jul 2023 21:26:09 +0200 +Subject: [PATCH] opkg: set locale from system environment variables +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +A C program inherits its locale environment variables when it starts up. +This happens automatically. However, these variables do not automatically +control the locale used by the library functions, because ISO C says that +all programs start by default in the standard ‘C’ locale. + +Fixes warnings: +Warning when reading ar archive header: Pathname can't be converted from UTF-8 to current locale. (errno=84) + +Upstream-Status: Backport [9e62a38a4a52974007e9ea174504c42069da1a02] + +[1] https://www.gnu.org/software/libc/manual/html_node/Setting-the-Locale.html + +Signed-off-by: Piotr Łobacz +--- + src/opkg.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/opkg.c b/src/opkg.c +index 544c58a..0c729ff 100644 +--- a/src/opkg.c ++++ b/src/opkg.c +@@ -27,6 +27,7 @@ + #include + #include + #include ++#include + + #include "opkg_conf.h" + #include "opkg_cmd.h" +@@ -408,6 +409,7 @@ int main(int argc, char *argv[]) + if (opkg_conf_init()) + goto err0; + ++ setlocale(LC_ALL, ""); + opkg_config->verbosity = NOTICE; + + opts = args_parse(argc, argv); +-- +2.34.1 + diff --git a/meta/recipes-devtools/opkg/opkg_0.6.2.bb b/meta/recipes-devtools/opkg/opkg_0.6.2.bb index d7dc6ab715..3b5d51d74a 100644 --- a/meta/recipes-devtools/opkg/opkg_0.6.2.bb +++ b/meta/recipes-devtools/opkg/opkg_0.6.2.bb @@ -16,6 +16,7 @@ SRC_URI = "http://downloads.yoctoproject.org/releases/${BPN}/${BPN}-${PV}.tar.gz file://opkg.conf \ file://0001-opkg_conf-create-opkg.lock-in-run-instead-of-var-run.patch \ file://0002-Add-options-to-enable-support-for-acl-and-xattr.patch \ + file://0003-opkg-set-locale-from-system-environment-variables.patch \ file://run-ptest \ "