From patchwork Wed Nov 13 14:45:42 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ola x Nilsson X-Patchwork-Id: 52418 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 0082ED462B9 for ; Wed, 13 Nov 2024 14:46:02 +0000 (UTC) Received: from EUR02-VI1-obe.outbound.protection.outlook.com (EUR02-VI1-obe.outbound.protection.outlook.com [40.107.241.57]) by mx.groups.io with SMTP id smtpd.web10.13422.1731509152695008748 for ; Wed, 13 Nov 2024 06:45:53 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: body hash did not verify" header.i=@axis.com header.s=selector1 header.b=VgRhnEtk; spf=pass (domain: axis.com, ip: 40.107.241.57, mailfrom: ola.x.nilsson@axis.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=qI5L+IZbtG9QwZkEsaDEjTxdjBynGYdhavw8NkGba+M715GEfHZkaxJbNtjNv/bRyRKec42vUvuJp4ZaNDB1g+dWev/KVCuQL0S/QUAL2l36sP7IfxRBjYTqtaWrhJWEIXV0SSVKApD6sWk/wKdUjIuDhtxsRexyyEZEwPUGnVucL/AY5qJIfeMKfOvA8fVeTdS+q9J9oLpQsrQVGauAbLZ9dj9PyZlZMA2oJDyBqhPS7sglfElRnH+tehlbHuSdFta69CXHek4bhWxWuYEdZhMDInxLHH+E8gbRr8ZjWE783PWeEdFugc4mgXR9Hgg8Ykvvt2bE0fQ/ES1F050FWg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=SHLI7fsfoKh49SQK2ToDksIDwFH/hs6YFLAiCyIAY8I=; b=qN1TfWzoqTyoi4k6T2NgMttERU+Xs56tw+ya3xiBC5Kn6IE49rw909ZWUU80/rsfIv4+gqhR1A0T8g/duWJIufydWrr1ntgAAGtPIwcV4siW8R7iEfnFsWF3aW5qFPqE9MWPcIeGdXSpQJR31r/AKCMRfhNWGgc3bjrH4Zv1J2lM2yZzgn9zNEcof1xznrvJrMWQpZdjjH9YeFFZ82xjfeSNvgdZgxk7qC7cZZwGeFxNhsqlPunwgkSJUdxbApkDdNLkU1g4fcjFtip6MObd20YDVtmAsbXGtQdW+TxVvOMpXgZ7zL63QJf2g4f8c/b35bLCblZ6bOmKYT9YQTu2ng== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 195.60.68.100) smtp.rcpttodomain=lists.openembedded.org smtp.mailfrom=axis.com; dmarc=pass (p=none sp=none pct=100) action=none header.from=axis.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=axis.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=SHLI7fsfoKh49SQK2ToDksIDwFH/hs6YFLAiCyIAY8I=; b=VgRhnEtkPch2GXb5TNqbUTvlML4Ez/zyOuLea9k0veTL5KHbTN0kfnO6vaAFOwqhfp4zGWxlAXCB/tGJbH9R5v36dRYOS1eeSUa1TeyLWEvsXxXG7ZrlXti744JSjX9D7ePS4nhfp/mYqkYKh0GszMF/guFjDF0Nb/qfBAg7OdY= Received: from AS8PR04CA0158.eurprd04.prod.outlook.com (2603:10a6:20b:331::13) by DB9PR02MB8370.eurprd02.prod.outlook.com (2603:10a6:10:399::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8158.17; Wed, 13 Nov 2024 14:45:49 +0000 Received: from AM3PEPF00009B9C.eurprd04.prod.outlook.com (2603:10a6:20b:331:cafe::54) by AS8PR04CA0158.outlook.office365.com (2603:10a6:20b:331::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8137.28 via Frontend Transport; Wed, 13 Nov 2024 14:45:49 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 195.60.68.100) smtp.mailfrom=axis.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=axis.com; Received-SPF: Pass (protection.outlook.com: domain of axis.com designates 195.60.68.100 as permitted sender) receiver=protection.outlook.com; client-ip=195.60.68.100; helo=mail.axis.com; pr=C Received: from mail.axis.com (195.60.68.100) by AM3PEPF00009B9C.mail.protection.outlook.com (10.167.16.21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8158.14 via Frontend Transport; Wed, 13 Nov 2024 14:45:49 +0000 Received: from SE-MAILARCH01W.axis.com (10.20.40.15) by se-mail01w.axis.com (10.20.40.7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.39; Wed, 13 Nov 2024 15:45:47 +0100 Received: from se-mail01w.axis.com (10.20.40.7) by SE-MAILARCH01W.axis.com (10.20.40.15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.39; Wed, 13 Nov 2024 15:45:47 +0100 Received: from se-intmail01x.se.axis.com (10.4.0.28) by se-mail01w.axis.com (10.20.40.7) with Microsoft SMTP Server id 15.1.2507.39 via Frontend Transport; Wed, 13 Nov 2024 15:45:47 +0100 Received: from pc58073-2410.se.axis.com (pc58073-2410.se.axis.com [10.88.67.1]) by se-intmail01x.se.axis.com (Postfix) with ESMTP id B837881C for ; Wed, 13 Nov 2024 15:45:47 +0100 (CET) From: To: Subject: [PATCH v2 1/6] acl: Fix the ptest path to test-driver Date: Wed, 13 Nov 2024 15:45:42 +0100 Message-ID: <20241113144547.3121036-2-olani@axis.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20241113144547.3121036-1-olani@axis.com> References: <20241113144547.3121036-1-olani@axis.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AM3PEPF00009B9C:EE_|DB9PR02MB8370:EE_ X-MS-Office365-Filtering-Correlation-Id: c58bd80b-35e0-4809-7fb8-08dd03f1dd7c X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|82310400026|36860700013|1800799024; X-Microsoft-Antispam-Message-Info: OF2zcqhUtI1CubBau2ajBhkAZDeE9Xbamdy35yjTmeXPSKssUXG19nZVsUKqGq8MXlOEoGnM6T6jjVnRRIjccbF7UVf3rNHPOV4iVFtCN5p9Ww6QdWccY5yvFipXOEHsly1kb+ybEuv/QIyBtJYzWZ75vzul2JoJKVoW3SIcEDL+D7pXGB6CAD8//Ub+YEIZMpb+lwkRvu3YymxWHLcAP3+pZ7wsGR4nzf9DgzfE79VrSH/47NAUj4A/V43Ud14249aFiI4vO0C7oiNBwfNNQCVqiav2dsuwNOcH3nKq8EUx58ABkEIv9DExEfith4EZPcTBpIl16r/6KpqO1r2q1d2wk/BgnCSjb8g1HN0Wh87esu4oZeae8My9PY8OMc4xxEEjf85QXOmHGkTH8ger3/TdWXXKOHbDHmNE6yYqxSZQU9JzRl9nICmM1Oq4nXHmREfFH5iM2rHfqSyBbm89OmIOqgsW9NYLhf6O2Z3Mc8dVMlE4xoza2iASxetgeZzFXbRrpnI12A7/7hp4stt6+sg5N7nVnCoMsP3PkdCCE0DL8DWBSuDfXPSbtuD/rxKZ3a5HRmkN+tge7U/2nclPtP4DPa08PIVOLTdWzK7sxDp+tA9SCZvvmciMWmF1QRPVGAjJPzJYOIr5IleJszpRUji7zl/jLCv3c6OsOnC9Vso0jiQRHt4qsIJ+HWdJ+BAZNVc0ALqzAIsoFpB4snwdGqapxyKZmEuGPXPQhTDabEAhONlmpP2EY+tgY4qVNewwcCp84LP95PUKfOVBeCWIgtFc3WV854lVivx0E2dGOPm9oZUQDmv3/sObygFQmvKoZLckWMdtoa3hHurDn1eNR5iVf84THoGegv+kUCYOSfbm0UIcK0rwR1wwPsgjNpUKsQxjSJEy/xVqBsZf8wLaK5XJFt9JJLtJjavpj6iGk0ktuxOqgjUwn0UtJM0In7yxn6AAn9pgRh1eI6MmShkv4JafbVitnyqLy4dVQoU6faVYDAgT58OsQWJFMIgUFX7NaqiqudQcTJJpKDBG8+FeMPs+zpxTnlrzqqLV5O1y8iousji7PpW7nt1z6Wz4nj9y8nyh3qryX5SvidliWYdYOg9ZPr4paRpmG+JHAj3R+myOLvxe56f6dODlVQH/fKabr8gnLgoe4rtAprNho6lwiSm2Rd+2LvUEEsJCRU4U5XLbv1yYWpPrhgkrKd1DKtDL1sxZz1m9HZpVDrGptSOGnW+fpet8U4ve/Aaoheh0trhg24pnWKzi8ciaEr2q33vxQpDIeIgIAFt24XuWRRf9SBhoHTpQXN9twZV9rOdaTU4Fw5xsimhnSTO80XoggJ2TVri6RKMkNPnDVXph433wwBjw8xaGGL2Fmdmnji0xgv+4U9XmOSdbEw5b3TDx3nvN0WgZWVbslTiVf8HsVx8qEw== X-Forefront-Antispam-Report: CIP:195.60.68.100;CTRY:SE;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:mail.axis.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(376014)(82310400026)(36860700013)(1800799024);DIR:OUT;SFP:1101; X-OriginatorOrg: axis.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Nov 2024 14:45:49.3935 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: c58bd80b-35e0-4809-7fb8-08dd03f1dd7c X-MS-Exchange-CrossTenant-Id: 78703d3c-b907-432f-b066-88f7af9ca3af X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=78703d3c-b907-432f-b066-88f7af9ca3af;Ip=[195.60.68.100];Helo=[mail.axis.com] X-MS-Exchange-CrossTenant-AuthSource: AM3PEPF00009B9C.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB9PR02MB8370 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 13 Nov 2024 14:46:01 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/207108 From: Ola x Nilsson Add a sed substitution for ${PTEST_PATH}/Makefile that transforms TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/build-aux/test-driver to TEST_LOG_DRIVER = $(SHELL) $(top_builddir)/build-aux/test-driver which is where the test-driver script can be found when installed. There used to be an oe-core automake patch to do this, but it broke non-ptest use of automake. Relates to [YOCTO #15635] Signed-off-by: Ola x Nilsson --- meta/recipes-support/attr/acl_2.3.2.bb | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/meta/recipes-support/attr/acl_2.3.2.bb b/meta/recipes-support/attr/acl_2.3.2.bb index 61784738738..dd959a5051b 100644 --- a/meta/recipes-support/attr/acl_2.3.2.bb +++ b/meta/recipes-support/attr/acl_2.3.2.bb @@ -52,10 +52,12 @@ do_install_ptest() { -e 's:${BASE_WORKDIR}/${MULTIMACH_TARGET_SYS}::g' \ -i ${D}${PTEST_PATH}/Makefile - sed -i "s|^srcdir =.*|srcdir = \.|g" ${D}${PTEST_PATH}/Makefile - sed -i "s|^abs_srcdir =.*|abs_srcdir = \.|g" ${D}${PTEST_PATH}/Makefile - sed -i "s|^abs_top_srcdir =.*|abs_top_srcdir = \.\.|g" ${D}${PTEST_PATH}/Makefile - sed -i "s|^Makefile:.*|Makefile:|g" ${D}${PTEST_PATH}/Makefile + sed -e "s|^srcdir =.*|srcdir = .|" \ + -e "s|^abs_srcdir =.*|abs_srcdir = .|" \ + -e "s|^abs_top_srcdir =.*|abs_top_srcdir = ..|" \ + -e "s|^Makefile:.*|Makefile:|" \ + -e "/^TEST_LOG_DRIVER =/s|(top_srcdir)|(top_builddir)|" \ + -i ${D}${PTEST_PATH}/Makefile rm ${D}${PTEST_PATH}/.libs/libtestlookup.lai } From patchwork Wed Nov 13 14:45:43 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ola x Nilsson X-Patchwork-Id: 52421 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 01701D462BE for ; Wed, 13 Nov 2024 14:46:02 +0000 (UTC) Received: from EUR02-VI1-obe.outbound.protection.outlook.com (EUR02-VI1-obe.outbound.protection.outlook.com [40.107.241.79]) by mx.groups.io with SMTP id smtpd.web11.13053.1731509152535532797 for ; Wed, 13 Nov 2024 06:45:52 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: body hash did not verify" header.i=@axis.com header.s=selector1 header.b=lHy1Dmrw; spf=pass (domain: axis.com, ip: 40.107.241.79, mailfrom: ola.x.nilsson@axis.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=STwQbGLbO1WdNzfw8kvdqiptuyAJQw0385wa4hsqag1P2Xx2m5uPTZ+aXskDCum6T2tSqXIfnQwueu6t3GRaTOud5MA9wxfrkDJKfgCBrKscUwyiIJ/MPSk52W4KGMrtQdElCTk5iDSEbgHZhBnUQ+Um/jArm0nyHhXCJuv3IyK/Y6+NUR2SOoGOpM1BPTB/2tlDqusw45mvdInoCSqqPHMUbB7Svaz+Bgn/2wMTca9dtMg5kLmY/q3HY8vXbwFZtdKU+CaygKm37XofWZb3SXgsTeltd08Wphb0Gow1eSCzXBva8JLsq+G4pJ58EtInm92m8/M4kutBAv5H3BOCCQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=qTEtn8nL/hjtQOlC+Qry31xY5QzdU+2fFxJ+3EZzmmQ=; b=PYqFNBWoIABEOR0vdI6rDDLeHlLlfOviWr7C+uNSdF7D26Chyb9T7EKQwhszUUXY7HUYWJdvPFUYfwzYczq01WpQncoWuFmMj+mbtgIBc4viZOxHhzOL5qwZj8MIM9qWkjhLCJS64xLuH6d6HYJFL8aF5nocm2SEPO+4CBPcwP54OWzOXuFMERWUDUzDg4hp0Ar7S/FaQmlGEHYXNsV4jZRDqNS1l2wGsgrSWgk7l3LzFXHCNSxEt11WWXE3/B2DjSq38IQtxqLrCkCBUznzSgcgKoG8cKIl6Oe5U3UqmxYKSU0lzTS59zuEjQs92AoR5xIxj89UB99cKXlOwK9C+g== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 195.60.68.100) smtp.rcpttodomain=lists.openembedded.org smtp.mailfrom=axis.com; dmarc=pass (p=none sp=none pct=100) action=none header.from=axis.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=axis.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=qTEtn8nL/hjtQOlC+Qry31xY5QzdU+2fFxJ+3EZzmmQ=; b=lHy1DmrwRL2vurA+xERUO+IAv4tba7wAu0N4N6xmZPSsexi+7UJCi1JpxGROM5DX/TwLPGSQutz3ox+w2+JepKUduSPB/k//oGOLRjXKivdrNxYDJToTRAF99aYOk3tPIUB72nIbE7tJkGUkCjQ+e+gSnOwE7EaHOj3rZvMAL2k= Received: from AS8PR04CA0152.eurprd04.prod.outlook.com (2603:10a6:20b:331::7) by AM0PR02MB5940.eurprd02.prod.outlook.com (2603:10a6:208:18d::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8158.17; Wed, 13 Nov 2024 14:45:48 +0000 Received: from AM3PEPF00009B9C.eurprd04.prod.outlook.com (2603:10a6:20b:331:cafe::fb) by AS8PR04CA0152.outlook.office365.com (2603:10a6:20b:331::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8158.17 via Frontend Transport; Wed, 13 Nov 2024 14:45:48 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 195.60.68.100) smtp.mailfrom=axis.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=axis.com; Received-SPF: Pass (protection.outlook.com: domain of axis.com designates 195.60.68.100 as permitted sender) receiver=protection.outlook.com; client-ip=195.60.68.100; helo=mail.axis.com; pr=C Received: from mail.axis.com (195.60.68.100) by AM3PEPF00009B9C.mail.protection.outlook.com (10.167.16.21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8158.14 via Frontend Transport; Wed, 13 Nov 2024 14:45:48 +0000 Received: from se-mail02w.axis.com (10.20.40.8) by se-mail01w.axis.com (10.20.40.7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.39; Wed, 13 Nov 2024 15:45:47 +0100 Received: from se-intmail01x.se.axis.com (10.4.0.28) by se-mail02w.axis.com (10.20.40.8) with Microsoft SMTP Server id 15.1.2507.39 via Frontend Transport; Wed, 13 Nov 2024 15:45:47 +0100 Received: from pc58073-2410.se.axis.com (pc58073-2410.se.axis.com [10.88.67.1]) by se-intmail01x.se.axis.com (Postfix) with ESMTP id BB1DF867 for ; Wed, 13 Nov 2024 15:45:47 +0100 (CET) From: To: Subject: [PATCH v2 2/6] attr: Fix the ptest path to test-driver Date: Wed, 13 Nov 2024 15:45:43 +0100 Message-ID: <20241113144547.3121036-3-olani@axis.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20241113144547.3121036-1-olani@axis.com> References: <20241113144547.3121036-1-olani@axis.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AM3PEPF00009B9C:EE_|AM0PR02MB5940:EE_ X-MS-Office365-Filtering-Correlation-Id: ca1d5f93-4b90-459a-fe6a-08dd03f1dcb8 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|82310400026|36860700013|1800799024; X-Microsoft-Antispam-Message-Info: MwF+bBqlhXZA8+5cZzLOJSzADvcGXcnDwfV3+Vse0Dv8wrLA0dfBh7vyPReCwUEuqLNJZszagm82QA7DIHZEGPcHWR+I7eMBo2NXwVzNFmgxHDCsKo21oQ68KQug9N7wBw/MZMunUXMe+Rskj6qw8seGOXIYyod2hvuU51OMt/SkJJanIBGq/htLAp+ZLBwiFPStTXNQfB1IKy4nQs6E8Qmof9n/wiz0GApRIO7PmXiqmGx5On/ych/Kp4ltt68powjg2ORy4BDKlD7rLtvesHOLVtvr7GNv57KRsLx8xs6G4r4H+x8VZ8wwJ4hMZDs8kGPmMykFi3RQNNcTXha0oQB/+JjA9VMZknKKUiGAuAwz2vniT4XlXt2WM9sgkhncDhrI/TwcVcdytgw0uTz/wbKwgNpD5r3CghmI8C//5lgeBWTfI8Uf79/QNG01GoiQe6gdiZ0SzclijzDnyG0YBg+O7iz/UG9rfHEL/nsb0ZLiDasf/AvxNRg1ygUC7lBYTAsjsDT9J1P26dvY1zdgBTc5zpDst3AW2s7b/twsF9lKEvcWyxacuftmz2tE9/27sOR68Cnst6Q4aTfuPXjfoQh9SxN6OvzGvviDatb3CKKAxnIcPr25OwlkmuIvAi6tYZGIcJthIHnA86TQkLy3Ill3K9HqLlc3Bu9w06SpLsPYUzN3/di/TQHQY6+CP0uRotWzUGKF+/IFIJWiUJv0q9Kqjw+211tr5rmdEChPxYHoaXhpy5Wb1SHWEzrrAJO0SBi78bwFPoo/blwqN5OwZFyfd7qw+cT4+odl1a80u1GlGo1Jukuc9yinbjaBk7UTu87/0hJ8w8+CPhwoQz1IHDIYzyD64xWh30rYlyz0j7U6LIoCoMcAYSnJlubB/f2LHx4f5Eqq9rHn29TvKGRCNxjDU+/R7b+0FK9ndCnMp3A++33nA6qaDyD99tVqgMOM+PiqUSja14JkOrwlnuJXLIbQXS66kPoGGjeqjoWVpmNdDw47P2hfuJ2gDR5gP4EI8NIs7bYUiTsg3VDsWKmcybXtlX6cpEKCAIb48LWgpbj7ZaDsZ3t6dxjl6ZdUyLFjW/Wvp/KMW0EuQdTwl/ADPaDw4f/jJfnksrhebAEE7Pkq91Pa3CxjiQiPd3yCiqDgGid4zUQx/RJxY5b1HWcb1Eeu29teQHJhTOaO6dU3oDYWvYmyDLHrN2bBEvIk5hHUBhL8IIxoqy8IVXgGDkGvMbnaPtafKy6WLaNu2/1Hlq2IV0Uz9b/UnpLCBjaBQhvOWCv1jFgqCj0QJuXZQa7szGc3rTINGN6+w/gR4OQOaHATwYiKX1rXU7aDBrPvSBw7omw9yhpHIK6RWDUDMDzYnA20NF2ECoNO7Hnno50j2kr//jKGNinlHG49NB9r9c8u5BuszY08T084UWZc4IgQmg== X-Forefront-Antispam-Report: CIP:195.60.68.100;CTRY:SE;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:mail.axis.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(376014)(82310400026)(36860700013)(1800799024);DIR:OUT;SFP:1101; X-OriginatorOrg: axis.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Nov 2024 14:45:48.1122 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: ca1d5f93-4b90-459a-fe6a-08dd03f1dcb8 X-MS-Exchange-CrossTenant-Id: 78703d3c-b907-432f-b066-88f7af9ca3af X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=78703d3c-b907-432f-b066-88f7af9ca3af;Ip=[195.60.68.100];Helo=[mail.axis.com] X-MS-Exchange-CrossTenant-AuthSource: AM3PEPF00009B9C.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR02MB5940 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 13 Nov 2024 14:46:02 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/207107 From: Ola x Nilsson Add a sed substitution for ${PTEST_PATH}/Makefile that transforms TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/build-aux/test-driver to TEST_LOG_DRIVER = $(SHELL) $(top_builddir)/build-aux/test-driver which is where the test-driver script can be found when installed. There used to be an oe-core automake patch to do this, but it broke non-ptest use of automake. Relates to [YOCTO #15635] Signed-off-by: Ola x Nilsson --- meta/recipes-support/attr/attr.inc | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/meta/recipes-support/attr/attr.inc b/meta/recipes-support/attr/attr.inc index 60339344015..5d6929fe507 100644 --- a/meta/recipes-support/attr/attr.inc +++ b/meta/recipes-support/attr/attr.inc @@ -42,10 +42,13 @@ do_install_ptest() { -e 's:${BASE_WORKDIR}/${MULTIMACH_TARGET_SYS}::g' \ -i ${D}${PTEST_PATH}/Makefile - sed -i "s|^srcdir =.*|srcdir = \.|g" ${D}${PTEST_PATH}/Makefile - sed -i "s|^abs_srcdir =.*|abs_srcdir = \.|g" ${D}${PTEST_PATH}/Makefile - sed -i "s|^abs_top_srcdir =.*|abs_top_srcdir = \.\.|g" ${D}${PTEST_PATH}/Makefile - sed -i "s|^Makefile:.*|Makefile:|g" ${D}${PTEST_PATH}/Makefile + sed -e "s|^srcdir =.*|srcdir = .|" \ + -e "s|^abs_srcdir =.*|abs_srcdir = .|" \ + -e "s|^abs_top_srcdir =.*|abs_top_srcdir = ..|" \ + -e "s|^Makefile:.*|Makefile:|" \ + -e "/^TEST_LOG_DRIVER =/s|(top_srcdir)|(top_builddir)|" \ + -i ${D}${PTEST_PATH}/Makefile + cp -rf ${S}/build-aux/ ${D}${PTEST_PATH} cp -rf ${S}/test/ ${D}${PTEST_PATH} } From patchwork Wed Nov 13 14:45:44 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ola x Nilsson X-Patchwork-Id: 52416 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 E60F0D462B4 for ; Wed, 13 Nov 2024 14:46:01 +0000 (UTC) Received: from EUR05-DB8-obe.outbound.protection.outlook.com (EUR05-DB8-obe.outbound.protection.outlook.com [40.107.20.57]) by mx.groups.io with SMTP id smtpd.web10.13421.1731509152484423555 for ; Wed, 13 Nov 2024 06:45:52 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: body hash did not verify" header.i=@axis.com header.s=selector1 header.b=jvVpdhP8; spf=pass (domain: axis.com, ip: 40.107.20.57, mailfrom: ola.x.nilsson@axis.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=G4Vnd+M0XW0SrQ50I4aLkMT7Lc/qDSxaHAGB50VztiiFaNP4Q9jEdThUHlIiyazgiZGQorvB0nUAAqSbuS84IJUpA8cZpm6OtzUcCvcsZkK5V0SlfVUE78JTUnH2qjmMJOoZPKf0EB5jWe/S8xqSyjWAyYMgE/NEJEJsOOCT3N5AiGjiVeocPKh7btrcXSUp2rwk6Wm3A3ypR+ad7PTa5zgzl/4NmMWWyo10bng7XaB1S2Sg02KD9TphJL7fLRsefHDXQ18MtYemN69QaFxM4xiIzW0mbDtlo95BK5d/Jn4VQjS7985nvEeOJIHR8/mUND7JxiDyq6Yhepw69s8CvA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=OvFp8hTamBR2Ols3hLy06cu/gk7oM3hm9ZtRGst4yEA=; b=ek3wY+oUm5LmNawY9LC5vXgqIloVb0ovAnk6Rrw0tSStGBm/g0sswD9N09mD1DmEONFGjexw938yLg0fv2tL1A4B/fjVqXZCSHwem6uF80lUL1h3VL6pRIuogKcuCqQzf9Wu2CpMuh7a9s1WkWFG5qQuuTtPjbIADRyFzfg2HqhVBLJ1ZTtkpFAawJ5yjtDG5dACI0EPYWpIRiti+nbmICRNpvhVNyx7AiTJt77aDqGEW0Z1xSL3WsfQXwMI/t6iMFICnAvQdOPSdzjIzXv6anrKPMOl49x+PTPFNTb0dfyJZzB/C27JUl9cgl35TKXkPcwZIaEcyGyFI5CGevrGig== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 195.60.68.100) smtp.rcpttodomain=lists.openembedded.org smtp.mailfrom=axis.com; dmarc=pass (p=none sp=none pct=100) action=none header.from=axis.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=axis.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=OvFp8hTamBR2Ols3hLy06cu/gk7oM3hm9ZtRGst4yEA=; b=jvVpdhP8yBp8IvIPa4JC4vWI6dQE2tn29pWrVKwunP5TplNUausRWLiv7JaHji0KGVmjqfS3OVI5izUiKol2vDnUcpXHo4m6/lkePXA4eUz0kI06WY/krv0JKs7wFzRC2bPm7yVQoBO4A7IvcWPY8woHhxn+gpD0ogsIuhi1p/U= Received: from DUZPR01CA0040.eurprd01.prod.exchangelabs.com (2603:10a6:10:468::18) by AS1PR02MB7822.eurprd02.prod.outlook.com (2603:10a6:20b:4ad::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8137.19; Wed, 13 Nov 2024 14:45:48 +0000 Received: from DB1PEPF00050A00.eurprd03.prod.outlook.com (2603:10a6:10:468:cafe::48) by DUZPR01CA0040.outlook.office365.com (2603:10a6:10:468::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8158.17 via Frontend Transport; Wed, 13 Nov 2024 14:45:48 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 195.60.68.100) smtp.mailfrom=axis.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=axis.com; Received-SPF: Pass (protection.outlook.com: domain of axis.com designates 195.60.68.100 as permitted sender) receiver=protection.outlook.com; client-ip=195.60.68.100; helo=mail.axis.com; pr=C Received: from mail.axis.com (195.60.68.100) by DB1PEPF00050A00.mail.protection.outlook.com (10.167.242.42) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8158.14 via Frontend Transport; Wed, 13 Nov 2024 14:45:48 +0000 Received: from se-mail01w.axis.com (10.20.40.7) by se-mail02w.axis.com (10.20.40.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.39; Wed, 13 Nov 2024 15:45:47 +0100 Received: from se-intmail01x.se.axis.com (10.4.0.28) by se-mail01w.axis.com (10.20.40.7) with Microsoft SMTP Server id 15.1.2507.39 via Frontend Transport; Wed, 13 Nov 2024 15:45:47 +0100 Received: from pc58073-2410.se.axis.com (pc58073-2410.se.axis.com [10.88.67.1]) by se-intmail01x.se.axis.com (Postfix) with ESMTP id BD7D288C for ; Wed, 13 Nov 2024 15:45:47 +0100 (CET) From: To: Subject: [PATCH v2 3/6] sed: Fix the ptest path to test-driver Date: Wed, 13 Nov 2024 15:45:44 +0100 Message-ID: <20241113144547.3121036-4-olani@axis.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20241113144547.3121036-1-olani@axis.com> References: <20241113144547.3121036-1-olani@axis.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DB1PEPF00050A00:EE_|AS1PR02MB7822:EE_ X-MS-Office365-Filtering-Correlation-Id: 5a2cf0a9-94fc-4953-0d9a-08dd03f1dcd2 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|36860700013|376014|82310400026; X-Microsoft-Antispam-Message-Info: QKxRw1CDOMh7QBUX5QqX9+WCSEvedv+gYblkEtjr4MbXctV7gzttZBB2XFLJMe1YBEI796RS0jDiZ2TZLQ0OmtdkdEA/hTNCZSXNJNUNL2BeHTjfRH6Xsz4v2CwEJqFihvjxUfb+3UDDmCC5j9xOg86U8eOy7HkPxk7L2BwKZlRE/tRZmKqrAeQzKPH38HdzsiQ2bhFfdE8Gu96eD/m/ZvGORl0TK/HTOs6SUVJu1028T/ewyOMRa5wTumGSoyiQ6hcnB/lpfSG2cSUO0rzDIEEGeB5mfgfI1R/h8YoRlf83xgpX4XvjknwZpVV4JYjXJmq2/hiSZqoekvmSF5yzyFFPGUzItxZbB9hBsJgbmomUyznRVN4jwh49nQshNAB7ZtZX5JmPq0DnJyf3axTlfZ/jeVuDKlOIzHwbSvdtnJQfn8Y/kKQYPD7IdzXi26jbWs4AKpSv7QBstEqU+A/CB7UAYbWRQdmpqXJO3NtSJQtZp990Ib8/VtphqkC0sPTeeoxCFsq+nWHU49JjSZqwYmyuDb9HQCEKGFqj+LuL5TbgM505DtjKzDn+1g4XcvwRv9s+rg/s7JKIXFrX+a0AHMl2KKfFjxtYqO6YYD1IUHPsPkifvXOK+USl1SMmc8UaTU7aSpRjcGk0fskQB2RNDM+EikqHROMlJdpd5oEMUn66uzJzp90tLQFgEglsbXsVr0KG0Hw3wHH4PiT/5UYBYWIYoh1YsLxZRWNwY2PgxHdggAk5eg4i7BVS4YB5el8q5dowq1XU//qUVZdTOabqj+UG0Up47WpMQYVy35fexkQ/utXGgcBv4F4rA+tyRq4nTGpqVmGx05UJeHMQGOVoTlsus4bZLuw18Q9kbx4VPs1z6UcCHZK1Vy1ZWpxxoXF+VbbwudIgOXAh4e/smP84uy2Kjkl7pfYJIQxJfWAnM73Vo3LeG/e9tLzKZ2D4B4/vnpidYoUnGTX6HL3dXI3tl1CLgbOy8ryCxJdEnqvhYHeApkRuEuz2/eBuVeNE4OKZz69WeoGtFFpPOspCEisu/G70/na9Vjt+Zuk2Uu8fDPhGMG17RGe+ctE3vwpSrewwnQ8a6i6kz2aKcgrySvNw1MQIJG7nN2GwaSX82P6sU9FKsDugTv/6zosPo3TanHpNbU6yZhEkf+quYIZkXBFwIjysBhcOjLiPOXEcsRdESRR8+353C4rtwAyWMteBqBKvxrLYitUnH+BS2B4oASTAHFr5AgTY07NL6uXTVywvCJdvNXbmBqv1Cen3o6ewhYtoeVAyS6sihdob6k7Z+4tD/7HLLt9Zc/Tz0+ke8iTZwjIoQqjKmGvAVwd+wKRfNBUuvfyJHD91PYSBLgw1w7D8DGJ8DiAebOzfzhXFXetj9XvmWvNw7XWB4VIbScsajChC8njGPdb4UuVmcr5GekeZtQ== X-Forefront-Antispam-Report: CIP:195.60.68.100;CTRY:SE;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:mail.axis.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(1800799024)(36860700013)(376014)(82310400026);DIR:OUT;SFP:1101; X-OriginatorOrg: axis.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Nov 2024 14:45:48.2608 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 5a2cf0a9-94fc-4953-0d9a-08dd03f1dcd2 X-MS-Exchange-CrossTenant-Id: 78703d3c-b907-432f-b066-88f7af9ca3af X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=78703d3c-b907-432f-b066-88f7af9ca3af;Ip=[195.60.68.100];Helo=[mail.axis.com] X-MS-Exchange-CrossTenant-AuthSource: DB1PEPF00050A00.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS1PR02MB7822 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 13 Nov 2024 14:46:01 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/207106 From: Ola x Nilsson Add a sed substitution for ${PTEST_PATH}/Makefile that transforms SH_LOG_DRIVER = $(SHELL) $(top_srcdir)/build-aux/test-driver PL_LOG_DRIVER = $(SHELL) $(top_srcdir)/build-aux/test-driver to SH_LOG_DRIVER = $(SHELL) $(top_builddir)/build-aux/test-driver PL_LOG_DRIVER = $(SHELL) $(top_builddir)/build-aux/test-driver which is where the test-driver script can be found when installed. There used to be an oe-core automake patch to do this, but it broke non-ptest use of automake. Relates to [YOCTO #15635] Signed-off-by: Ola x Nilsson --- meta/recipes-extended/sed/sed_4.9.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-extended/sed/sed_4.9.bb b/meta/recipes-extended/sed/sed_4.9.bb index c4d89c34b2a..b30ddc73ca6 100644 --- a/meta/recipes-extended/sed/sed_4.9.bb +++ b/meta/recipes-extended/sed/sed_4.9.bb @@ -59,6 +59,7 @@ do_install_ptest() { -e 's:abs_srcdir =.*:abs_srcdir = ..:g' \ -e 's:top_srcdir =.*:top_srcdir = ..:g' \ -e 's:${BASE_WORKDIR}/${MULTIMACH_TARGET_SYS}::g' \ + -e "/^\(PL\|SH\)_LOG_DRIVER =/s|(top_srcdir)|(top_builddir)|" \ -i ${D}${PTEST_PATH}/Makefile } From patchwork Wed Nov 13 14:45:45 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ola x Nilsson X-Patchwork-Id: 52419 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 00857D462BD for ; Wed, 13 Nov 2024 14:46:02 +0000 (UTC) Received: from EUR05-DB8-obe.outbound.protection.outlook.com (EUR05-DB8-obe.outbound.protection.outlook.com [40.107.20.87]) by mx.groups.io with SMTP id smtpd.web10.13423.1731509152895028376 for ; Wed, 13 Nov 2024 06:45:53 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: body hash did not verify" header.i=@axis.com header.s=selector1 header.b=atS7hIga; spf=pass (domain: axis.com, ip: 40.107.20.87, mailfrom: ola.x.nilsson@axis.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=PpzSqKsUWlTlNks34FRrCzxCZ5OATOaqUHDNL4BZugr0NeKi1aAglkBuP9iFUnlshlq2yZ06rru6e+Shp91K306TO2/M+OsvOfV2S2cL4nirOsKhiPd3FmITAgSQLrpYOuAk0b6VBtin+Qt8pNjMqkRJQq8Dpik3STFYiqINlTAdUf9feeV6AERl12LYJ/2rIX0oHVQdhrBGrmczGVUDUIt7DuquCa0heAoK1Rih7WNXCL2z9fGhA63WMwRBifrGo8erCs4BYVNbWyULOenwZyll7eakppzQiGvHYCDTyorIjjyNL42kI9z3bqqNuTAkKCZVIqh5i3eOwSoDDA7NIQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=bEZbUhKDdAYUyl07aOTfpCS1vWREKUdxrJCGSfIdSFQ=; b=q+bOhrUpsAnzJKzdaMhxnmwfu4Or16Rn1AEHkEblaMPAgzvws3yNVQb3magGLG8z70XC6nDoUDb7rdsnZbFqZwLpGltj/piRYiG0QUdDlJfLKyxhnZXa1sWyegJ2vOX12G8s2VnLE6+YvCYAeHXznkLUBFk++ERdWsW4IMne5rHcp96iCRsm0RvNwDKP9HF/NyiPzBtjDzHcqqmKzx1RENsC7LWJZiuxb4+Ei/F7hMKv6i2+GXcd324AIbUmb1NqPAu4izMHG+NIeBJp4//RwppvMgXdpkJebHny2jZ+36mMT9xF+onhZvRpcrldchoOyHdiRHRVUXRJfzzs9nzqxA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 195.60.68.100) smtp.rcpttodomain=lists.openembedded.org smtp.mailfrom=axis.com; dmarc=pass (p=none sp=none pct=100) action=none header.from=axis.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=axis.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=bEZbUhKDdAYUyl07aOTfpCS1vWREKUdxrJCGSfIdSFQ=; b=atS7hIga0pqifMXQGOxd0fXZg+kLCBVmyA+WTuyTaK0HiX5Zis5JHfV6lMB60oYVhOMx9ktqUz01YZ37IWbldySwpIXRzaD59Z83LmAKOoI3p+CLC/vz9WPE1KKdwYvlKapxWK/mBRKio2ePzIOzHiSiFAH0ntPpkpevDmopids= Received: from AS8PR04CA0154.eurprd04.prod.outlook.com (2603:10a6:20b:331::9) by DBAPR02MB6133.eurprd02.prod.outlook.com (2603:10a6:10:18f::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8137.29; Wed, 13 Nov 2024 14:45:49 +0000 Received: from AM3PEPF00009B9C.eurprd04.prod.outlook.com (2603:10a6:20b:331:cafe::6a) by AS8PR04CA0154.outlook.office365.com (2603:10a6:20b:331::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8137.28 via Frontend Transport; Wed, 13 Nov 2024 14:45:49 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 195.60.68.100) smtp.mailfrom=axis.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=axis.com; Received-SPF: Pass (protection.outlook.com: domain of axis.com designates 195.60.68.100 as permitted sender) receiver=protection.outlook.com; client-ip=195.60.68.100; helo=mail.axis.com; pr=C Received: from mail.axis.com (195.60.68.100) by AM3PEPF00009B9C.mail.protection.outlook.com (10.167.16.21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8158.14 via Frontend Transport; Wed, 13 Nov 2024 14:45:49 +0000 Received: from SE-MAILARCH01W.axis.com (10.20.40.15) by se-mail01w.axis.com (10.20.40.7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.39; Wed, 13 Nov 2024 15:45:48 +0100 Received: from se-mail02w.axis.com (10.20.40.8) by SE-MAILARCH01W.axis.com (10.20.40.15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.39; Wed, 13 Nov 2024 15:45:47 +0100 Received: from se-intmail01x.se.axis.com (10.4.0.28) by se-mail02w.axis.com (10.20.40.8) with Microsoft SMTP Server id 15.1.2507.39 via Frontend Transport; Wed, 13 Nov 2024 15:45:47 +0100 Received: from pc58073-2410.se.axis.com (pc58073-2410.se.axis.com [10.88.67.1]) by se-intmail01x.se.axis.com (Postfix) with ESMTP id C9C478B3 for ; Wed, 13 Nov 2024 15:45:47 +0100 (CET) From: To: Subject: [PATCH v2 4/6] parted: Fix the ptest path to test-driver Date: Wed, 13 Nov 2024 15:45:45 +0100 Message-ID: <20241113144547.3121036-5-olani@axis.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20241113144547.3121036-1-olani@axis.com> References: <20241113144547.3121036-1-olani@axis.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AM3PEPF00009B9C:EE_|DBAPR02MB6133:EE_ X-MS-Office365-Filtering-Correlation-Id: 2a31a78f-85af-405b-431a-08dd03f1dda0 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|376014|36860700013|82310400026; X-Microsoft-Antispam-Message-Info: I7ImFwou9cc/tm8161g5bV2eVmtRgfORUt2TCT6UGmwu7sItqLy2vgQMEhCJjfK6WQ0Lksduo0CVfwXomX6EWyMoZIDXtzLiho68S1LwTwhIBSx3zLhfbeDZlaRy1Ro3zEbpq2XM1gXvRC/KQYvlXRctQtsl1uYuCxfrk2JY/oqNfNwa+XSY1fJuHcF1Q8bU25VNkmZ5gbQ9znPo/jYqDrIjEJPhRid947iaF3cItHs1tRMWEWSindJs9/SjQZ4Utph1FJdnXjTkGqvuJyhiMnA0yUiE/vN2l+MkHyyNqJF4inBMsg1671e/dRBM95hFWjS50EhXb/9aOSAGXSqo4OjF7hv5Yk85dHjid2AxUQ161eWzXZw7z9g5TpzqTTldUZWWrI1bqdRLbuBUB1Q8r1yxaSPZh/dsAIhyFN8/UmqOf8bSIj6Nsts7wfflhKA+LL7IsHSMttG5XL8z4fflTY1c6cuSJGFtlih8muoOU5YZ4RjDWhWMPkJOgkCvF9nw4RRgbOz4j6fqzL9VfZPy8H4a37j1mLIVA2l9XfVgOyn0/qSBPLym/heRey/ATgnwD5n1aUuVv8WmyiuK1Y5XnpLeKjEKkqznKpgVug/JPQ9dOs8VuRDO/nkFEpqJJ8xrnri75qHOpqTQsaWXO/1PU6aWSz35Bblbmmf9A9/AmrD9MrHLVbMWK0es/XC24Gn5Jbu0uNbPFQf8kxuuDdJBqwfo5tgUF9l5P/8LpAxERCQOGeBLZKC4jfYSmmMxab239ez3JeNml/VXbjb7Tbjc0hIc/oC2DPIl/BpeOqBQl7F4fHKXqO7znxBxVILNLuGve+ZtS1n5x2LBKa8gfFLuPHI2+0vmxJpMyQzR0+rx8tV6E2wFQfszIJyj2nX6WFjHLWFdOlHu3MWSSGM7cs7hfSJHY6ji65W8/tsfidaPDtMX1zIwLE61GyVfQOSzPtsRK47Ut66kcvpOaqwkO28QWYQGmWEuT3+5ebk3CmQVf7tYLsXpWxKc9/KI1BhgXw3lyOspJVic17whJje1rPWsbcPI/tms9ovPPimMwcEWP4WGju0NYzA3dYmkRP6y+81PO6oEPrKxgLIJU7iR7RkfFeu4dMstTWBY+UJveJ9653IGDAzoCKNSkmj8EIs6HiLowEQ0gxVpjfquobR8ddFPEI6BcP0/IF/ES46dvoPkpS8Dp/XBl/QWJcrevSVB+6q38MbTy1mp8ntRwbt0u5aLSntKlVkHj6lbJ3cOAJVZXqxvxl8KiAWO7uCdgPRgVIX/hNVKIogkPBpOg/ed+Mr6BqgikYR06RicDakjZjsev9sVTNeqiAZRYfSkptB4fwtQ5JJzMkUQzd+SJjQt1IoWW3SjS0PbkbyWDvJ+FalzUdyNwSeZuxRifqYVUKD90zXJJt5yXcAzM3YDW+EwiGPiFA== X-Forefront-Antispam-Report: CIP:195.60.68.100;CTRY:SE;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:mail.axis.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(1800799024)(376014)(36860700013)(82310400026);DIR:OUT;SFP:1101; X-OriginatorOrg: axis.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Nov 2024 14:45:49.6279 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 2a31a78f-85af-405b-431a-08dd03f1dda0 X-MS-Exchange-CrossTenant-Id: 78703d3c-b907-432f-b066-88f7af9ca3af X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=78703d3c-b907-432f-b066-88f7af9ca3af;Ip=[195.60.68.100];Helo=[mail.axis.com] X-MS-Exchange-CrossTenant-AuthSource: AM3PEPF00009B9C.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBAPR02MB6133 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 13 Nov 2024 14:46:01 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/207109 From: Ola x Nilsson Add a sed substitution for ${PTEST_PATH}/tests/Makefile that transforms SH_LOG_DRIVER = $(SHELL) $(top_srcdir)/build-aux/test-driver to SH_LOG_DRIVER = $(SHELL) $(top_builddir)/build-aux/test-driver which is where the test-driver script can be found when installed. There used to be an oe-core automake patch to do this, but it broke non-ptest use of automake. Relates to [YOCTO #15635] Signed-off-by: Ola x Nilsson --- meta/recipes-extended/parted/parted_3.6.bb | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/meta/recipes-extended/parted/parted_3.6.bb b/meta/recipes-extended/parted/parted_3.6.bb index a537ef74dba..fae35815be9 100644 --- a/meta/recipes-extended/parted/parted_3.6.bb +++ b/meta/recipes-extended/parted/parted_3.6.bb @@ -35,13 +35,15 @@ do_install_ptest() { cp ${B}/tests/Makefile $t/tests/ mkdir $t/lib cp ${B}/lib/config.h $t/lib - sed -i "s|^VERSION.*|VERSION = ${PV}|g" $t/tests/Makefile - sed -i "s|^srcdir =.*|srcdir = \.|g" $t/tests/Makefile - sed -i "s|^abs_srcdir =.*|abs_srcdir = \.|g" $t/tests/Makefile - sed -i "s|^abs_top_srcdir =.*|abs_top_srcdir = "${PTEST_PATH}"|g" $t/tests/Makefile - sed -i "s|^abs_top_builddir =.*|abs_top_builddir = "${PTEST_PATH}"|g" $t/tests/Makefile - sed -i "s|^Makefile:.*|Makefile:|g" $t/tests/Makefile - sed -i "/^BUILDINFO.*$/d" $t/tests/Makefile + sed -e "s|^VERSION.*|VERSION = ${PV}|g" \ + -e "s|^srcdir =.*|srcdir = \.|g" \ + -e "s|^abs_srcdir =.*|abs_srcdir = \.|g" \ + -e "s|^abs_top_srcdir =.*|abs_top_srcdir = "${PTEST_PATH}"|g" \ + -e "s|^abs_top_builddir =.*|abs_top_builddir = "${PTEST_PATH}"|g" \ + -e "/^SH_LOG_DRIVER =/s|(top_srcdir)|(top_builddir)|" \ + -e "s|^Makefile:.*|Makefile:|g" \ + -e "/^BUILDINFO.*$/d" \ + -i $t/tests/Makefile for i in print-align print-max print-flags dup-clobber duplicate fs-resize; \ do cp ${B}/tests/.libs/$i $t/tests/; \ done From patchwork Wed Nov 13 14:45:46 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ola x Nilsson X-Patchwork-Id: 52420 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 E70E4D462B7 for ; Wed, 13 Nov 2024 14:46:01 +0000 (UTC) Received: from EUR03-DBA-obe.outbound.protection.outlook.com (EUR03-DBA-obe.outbound.protection.outlook.com [40.107.104.51]) by mx.groups.io with SMTP id smtpd.web10.13420.1731509152246411626 for ; Wed, 13 Nov 2024 06:45:52 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: body hash did not verify" header.i=@axis.com header.s=selector1 header.b=k8/AWHrf; spf=pass (domain: axis.com, ip: 40.107.104.51, mailfrom: ola.x.nilsson@axis.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=HcJmL7rAQJ2FNQ9HQrB3F3qIias40DXDnQXEqlptgqBBd7AsVCHKV+FlBbdyMr3TKBbAZD5Do2YVSKAHdvxVbs+CaMkQ0av5rqWdqjIkDViFDQ+JtBHbFbtcKUfblnUoc0U8m+0wwxYf/MrfE6Z4GRA79VXl4Q8KeiIOZQFwKlztuJVGIFHxBCDbg+Vr/RRxbDh4QkujwW+M3OzPX/iSIJ40eyPy9fOh16w9gKt8HunmtU4RUW6VhxWgmOUVC+TjOGxQ1pF9/Z+uUBKUsJwxiKboBFgyhYeaq641DENMwZwNmMIt5ZzkOnq9umZVPuxOa7fRRuzXP2GpMhBOmMl4Ww== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=uNOnu5JeYXWlF40057iQ0nY5jdRsP4/pTltF7Wj2Luc=; b=oYA0PdmrcArm+omykStBJcg0EqTJ+E0VFktnIJgVwn8W4U4MqsMSVe7ONGhhOtuYSONI3WHycD/KTeNA+0SZ/tcW7JM+2RaH0/qQay07E/18sCVD7VVROtgLyLZtyco33DxuUGV/K8CbwxFqc4eFdt7mb8xZx9ao82PKR3nTsQhsBt9kqfCyzDy0GSY8ZjAMFVu7HAANxpnf0X5GqXEEI7XYxk1iJe9Mms3nL60PyjX1lK08i3bpcyiQt4e9l37mOpF/egtKfskgQrrAU5AeEamQcrmZQL3P3xccksTP4YhahmA14u+8ayYOnNkV9tiIxAxPsIc+XkpGGZaPT/Yj8w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 195.60.68.100) smtp.rcpttodomain=lists.openembedded.org smtp.mailfrom=axis.com; dmarc=pass (p=none sp=none pct=100) action=none header.from=axis.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=axis.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=uNOnu5JeYXWlF40057iQ0nY5jdRsP4/pTltF7Wj2Luc=; b=k8/AWHrfnjpW6sGE+mU9YpupGdNVnOpIbS+5nk+u9unqW8+xvjUyjzcqSENaCC2PM1eMxN4WrUBi+IxdvlJqF3sw9uYCrW2GNgVnM/LW3gegQExG/cMIRBwcR72693Id/puXHCN/rhLikkdiuLnVG1hoZNmiEuLh2iezHPKFo04= Received: from DUZPR01CA0042.eurprd01.prod.exchangelabs.com (2603:10a6:10:468::9) by PR3PR02MB6075.eurprd02.prod.outlook.com (2603:10a6:102:6d::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8158.17; Wed, 13 Nov 2024 14:45:49 +0000 Received: from DB1PEPF00050A00.eurprd03.prod.outlook.com (2603:10a6:10:468:cafe::9d) by DUZPR01CA0042.outlook.office365.com (2603:10a6:10:468::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8137.28 via Frontend Transport; Wed, 13 Nov 2024 14:45:49 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 195.60.68.100) smtp.mailfrom=axis.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=axis.com; Received-SPF: Pass (protection.outlook.com: domain of axis.com designates 195.60.68.100 as permitted sender) receiver=protection.outlook.com; client-ip=195.60.68.100; helo=mail.axis.com; pr=C Received: from mail.axis.com (195.60.68.100) by DB1PEPF00050A00.mail.protection.outlook.com (10.167.242.42) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8158.14 via Frontend Transport; Wed, 13 Nov 2024 14:45:48 +0000 Received: from se-mail01w.axis.com (10.20.40.7) by se-mail02w.axis.com (10.20.40.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.39; Wed, 13 Nov 2024 15:45:47 +0100 Received: from se-intmail01x.se.axis.com (10.4.0.28) by se-mail01w.axis.com (10.20.40.7) with Microsoft SMTP Server id 15.1.2507.39 via Frontend Transport; Wed, 13 Nov 2024 15:45:47 +0100 Received: from pc58073-2410.se.axis.com (pc58073-2410.se.axis.com [10.88.67.1]) by se-intmail01x.se.axis.com (Postfix) with ESMTP id D6C958B4 for ; Wed, 13 Nov 2024 15:45:47 +0100 (CET) From: To: Subject: [PATCH v2 5/6] strace: Fix the ptest path to test-driver Date: Wed, 13 Nov 2024 15:45:46 +0100 Message-ID: <20241113144547.3121036-6-olani@axis.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20241113144547.3121036-1-olani@axis.com> References: <20241113144547.3121036-1-olani@axis.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DB1PEPF00050A00:EE_|PR3PR02MB6075:EE_ X-MS-Office365-Filtering-Correlation-Id: 4bc1e4ef-fb6e-4de9-6a6d-08dd03f1dd50 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|36860700013|1800799024|376014|82310400026; X-Microsoft-Antispam-Message-Info: b0d3tVQOd+Eq+5Eu2kg9ci1g07SBGdUhD2Q+Yn1IgXBxgcUB+5xkVBA/cBos9a/1ruBAAPOyv6nOZUr0R2o/Uux5WGxfPn90DAMW6U88umVBC5BC1G70muUIxgfx9betHzbCHi/AHPk+xS2iyc95rp30dHgm1DvBmqDqn/LW0IVW3jeQ+YxPK1iptKcNJQMb5BluCKb6BBLMCAFinzkrmYrEjrlF/VTkVo3TTVHuciqmEpOJmyZyDsQRUgxPCWh0wdkIYOQuhnY3BDlrYYuECoQXITj+MbGR9Lj25PqAA2wXizw2c6e+gfm4QGMAMk00gXfJnWTfpmzty3m1EdkpLCui0GjjJae2bEMA74ygmohvT/cmVEIhg8Im5YXgji6lCtAmxhrYmkT1e/Oaia7G2ccKxBC6lwXttPYpVelkiZcQXOdn/C4WImiaVbkAOHl8n6yRokjdRxn1j7Jz78I1S28gHEZmxKGG4ljC9FboBKa78ExS5vs3D6KAeUvY9M7ZSEaRETXr+os5fB6ItU9dubx1wNlimIqqjKL1G8Qj7prGKLmftkonkMw1DM2iNJhglP9ToHsWgiHgHdXGAm22Wb2PerzplTerA6Kd1V6NSHZGN0wigxig/SUlD+mn/U8vpiPoAITBv99aaY5iPMbsyO8I6csOIS4lRI+fkH0pCVmGezx+gMa9xvNG5oALo68ycAoRVED1a4ID5CFbXVzVrRgt+Wam6WWtfdUQ+CxgzVPpVt3e4Imo12YhzEEitxAxWLGjvV1Dd9XzFXkAqQUVrrCTshPCAZfmG7df0auEZ9eZpy7zwVx1HNr+VsonCaz7btWmUMsHqanYXMxUiYreHIV8A8xiqoQl/npVzsvlOlkaCuYnEnVarAE4NrfNWtZaPpxMSwHtH8kyvKQWJUEB3Vqsijzcb1cGlW84T7ZsX8YAzsWjbOGAfpyV7Mhqc+AZMb/0SIlhrJmyKSBE4gpbLCbGqSsFIyqwLY9IjiMlTyISEB0S1905gH0xyXZRZO1fhcJ4MFhxVYGNXyRFIEqGQ/IMODgBoaJxAg6BOIphmKLiIW8hAWt9C2R5tW2z+ydg0Z34ii14Da2K/p05t3FMXAZrx3NoYzMKvtiBLdmIcGver9Syn6XTV46jZ0yY7l3O18L8hSMSxQVXR2DkNKb1bGpUNFAsyZQ62EGqoT25Vi2jNviCEGQHKcnKtBMViBIEYjIsiFCBiF6L88R1iWVLxwk3BLtq8yNWhuc4dGVQH8rkcJUTjID9nsF4deY385kWyLg7v98mSC/Cgr9O9M4Mx3CGqmIFMCrntO50su0EqHP5iYxOTOPMPbk7GW/h8PKN8bd8v4Vhe2T/kipCekfNlIcV9novPnhAbrUyD8o5wAZQH28fyuOoO5gIBC86Gx0ckeAyAstDe+fFVii+VFoAOA== X-Forefront-Antispam-Report: CIP:195.60.68.100;CTRY:SE;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:mail.axis.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(36860700013)(1800799024)(376014)(82310400026);DIR:OUT;SFP:1101; X-OriginatorOrg: axis.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Nov 2024 14:45:48.9952 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 4bc1e4ef-fb6e-4de9-6a6d-08dd03f1dd50 X-MS-Exchange-CrossTenant-Id: 78703d3c-b907-432f-b066-88f7af9ca3af X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=78703d3c-b907-432f-b066-88f7af9ca3af;Ip=[195.60.68.100];Helo=[mail.axis.com] X-MS-Exchange-CrossTenant-AuthSource: DB1PEPF00050A00.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PR3PR02MB6075 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 13 Nov 2024 14:46:01 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/207105 From: Ola x Nilsson Add a sed substitution for ${PTEST_PATH}/tests/Makefile that transforms TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/build-aux/test-driver to TEST_LOG_DRIVER = $(SHELL) $(top_builddir)/build-aux/test-driver which is where the test-driver script can be found when installed. There used to be an oe-core automake patch to do this, but it broke non-ptest use of automake. Relates to [YOCTO #15635] Signed-off-by: Ola x Nilsson --- meta/recipes-devtools/strace/strace_6.11.bb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/meta/recipes-devtools/strace/strace_6.11.bb b/meta/recipes-devtools/strace/strace_6.11.bb index 4ab78e7a9b9..1bc8aa99e71 100644 --- a/meta/recipes-devtools/strace/strace_6.11.bb +++ b/meta/recipes-devtools/strace/strace_6.11.bb @@ -45,7 +45,9 @@ do_install_ptest() { mkdir -p ${D}${PTEST_PATH}/src install -m 755 ${S}/build-aux/test-driver ${D}${PTEST_PATH}/build-aux/ install -m 644 ${B}/src/config.h ${D}${PTEST_PATH}/src/ - sed -i -e '/^src/s/strace.*[0-9]/ptest/' ${D}/${PTEST_PATH}/${TESTDIR}/Makefile + sed -e '/^src/s/strace.*[0-9]/ptest/' \ + -e "/^TEST_LOG_DRIVER =/s|(top_srcdir)|(top_builddir)|" \ + -i ${D}/${PTEST_PATH}/${TESTDIR}/Makefile } RDEPENDS:${PN}-ptest += "make coreutils grep gawk sed locale-base-en-us" From patchwork Wed Nov 13 14:45:47 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ola x Nilsson X-Patchwork-Id: 52417 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 E8027D462B8 for ; Wed, 13 Nov 2024 14:46:01 +0000 (UTC) Received: from EUR03-VI1-obe.outbound.protection.outlook.com (EUR03-VI1-obe.outbound.protection.outlook.com [40.107.103.80]) by mx.groups.io with SMTP id smtpd.web11.13054.1731509153618312707 for ; Wed, 13 Nov 2024 06:45:54 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: body hash did not verify" header.i=@axis.com header.s=selector1 header.b=HDnyW+tp; spf=pass (domain: axis.com, ip: 40.107.103.80, mailfrom: ola.x.nilsson@axis.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=byB+lclrfF/KqP5TJk1ysJr7JlSGPgB1upcSnCraRYKlGjqlJYHAy6EIlaKF0MsS0pOCbj4k92oUv7U0wUGBFclIhdRmcBXQ6LgsG1iXVSlbPg/m1jMP8fcs6hQMkuTC0apdxQj8nnW/gyHnPa+9S/aAifVu2XtiNlYUoO+r7d/wvV91D7Vo1SBhdvg7ag86Ha/r1soMGfFq/QbpqBiVJDzDv35WIyFDLVqhcgydn0lJxCsS0KOSKmKs/9+FGlpATCBsTgIyMXlHZCYD6D5RCzHMQQ2cMv343RYuCtugB/3lwQ7fgbTde4dJQLVhyJXt/GdlTZgOGRlCrH7E4dNsgg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=1rd6/iotipbnf8nv6NAmGL4qQZsWSOK7sZvlEIUhpNI=; b=Y/JkciY9mgwCAFhHgtb3d6LkYvzm6UfNbhpL8hJHN70OC5/ynx+ncLZt4ao4XbjL3cZUdaY/GaM/lnB/mFVUq1Y3bjmvMgcB3inOhkcFZvhpkHRf4Le1vEg3zvpouMXrPG7r44Q4FqmiuNEo0Y618MIHI1XvBSLCLufEyhZl/7laKXZCttYi179dzyctDRM46bZxfvaqYVNuOGApCxZjVFTUDQ8NTGSZ1MDv+Ve34c4jzNqEShWHvRF9zi5QpTo48vVaUGJDaAQ45i83z39X4hdT02gpdZQdRaxH/d6PZDT45iUW91P+xXKxgLLxkUNLYLHrxFoIITLM8cI5Tu1L5g== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 195.60.68.100) smtp.rcpttodomain=lists.openembedded.org smtp.mailfrom=axis.com; dmarc=pass (p=none sp=none pct=100) action=none header.from=axis.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=axis.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=1rd6/iotipbnf8nv6NAmGL4qQZsWSOK7sZvlEIUhpNI=; b=HDnyW+tpV8unN57wyKOo+Asy6OcSsBMY/9PvUmrWuua3DKhh6byc/TFW8THsQPWiPutZSl7CrcHWj5y4G/qN9P8j5PqqiiQobGdSKhQI+l+qhWxKsGbFHOHuUKFoQKmfBOrP/HoxQPfvHMFD16syaPqwZIbL8zb8Bpb6KAgRCLo= Received: from DUZPR01CA0034.eurprd01.prod.exchangelabs.com (2603:10a6:10:468::10) by DB4PR02MB8438.eurprd02.prod.outlook.com (2603:10a6:10:37a::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8137.29; Wed, 13 Nov 2024 14:45:49 +0000 Received: from DB1PEPF00050A00.eurprd03.prod.outlook.com (2603:10a6:10:468:cafe::36) by DUZPR01CA0034.outlook.office365.com (2603:10a6:10:468::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8137.29 via Frontend Transport; Wed, 13 Nov 2024 14:45:49 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 195.60.68.100) smtp.mailfrom=axis.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=axis.com; Received-SPF: Pass (protection.outlook.com: domain of axis.com designates 195.60.68.100 as permitted sender) receiver=protection.outlook.com; client-ip=195.60.68.100; helo=mail.axis.com; pr=C Received: from mail.axis.com (195.60.68.100) by DB1PEPF00050A00.mail.protection.outlook.com (10.167.242.42) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8158.14 via Frontend Transport; Wed, 13 Nov 2024 14:45:49 +0000 Received: from SE-MAIL21W.axis.com (10.20.40.16) by se-mail02w.axis.com (10.20.40.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.39; Wed, 13 Nov 2024 15:45:48 +0100 Received: from se-mail02w.axis.com (10.20.40.8) by SE-MAIL21W.axis.com (10.20.40.16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.39; Wed, 13 Nov 2024 15:45:47 +0100 Received: from se-intmail01x.se.axis.com (10.4.0.28) by se-mail02w.axis.com (10.20.40.8) with Microsoft SMTP Server id 15.1.2507.39 via Frontend Transport; Wed, 13 Nov 2024 15:45:47 +0100 Received: from pc58073-2410.se.axis.com (pc58073-2410.se.axis.com [10.88.67.1]) by se-intmail01x.se.axis.com (Postfix) with ESMTP id E2A8E641 for ; Wed, 13 Nov 2024 15:45:47 +0100 (CET) From: To: Subject: [PATCH v2 6/6] automake: Remove patch that changes path to test-driver Date: Wed, 13 Nov 2024 15:45:47 +0100 Message-ID: <20241113144547.3121036-7-olani@axis.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20241113144547.3121036-1-olani@axis.com> References: <20241113144547.3121036-1-olani@axis.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DB1PEPF00050A00:EE_|DB4PR02MB8438:EE_ X-MS-Office365-Filtering-Correlation-Id: 88cba72b-ae70-4e66-0574-08dd03f1dd8c X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|36860700013|376014|82310400026|1800799024; X-Microsoft-Antispam-Message-Info: Pps5mSy7NvErEq/jZywRNGY3OauBHO/i47aghIXrWjzfT7oc8ZH7LwvD0uTgqNKTCI5WFWNBRjJlY7pGRatSRpvOdoxGITueuD6bo/3kaUe2WXW/rRQJpAU1wubMbY4/HD82oWjr9yBkWFyU6fzTTXCLTH7fYlNR9jxzp5gngucaDY2iMV1KxHHLvD9SwfHYCRRAq1rGF5+6b/dIQ4AMSa7Qwq9YpCghODdRDhWxr7C3y8yDLCIwtZaTJvFvMw/DUhMULucMMTDgN7rTDimTWrUVcuQTO8naJJ1mR7hwVEGNQ57FzFPjb5KLBWx7Kgj2vCLWkiO8M8eVhStA/JYXqZnGl6Y5aRpcTu57FZ5EbHIIO44tYq4awd8JjZY+q7v3TMmH/1EJSg+3TCtC4MSRY7TQCAVdpjtJCb1NCM6crDckcMS4p7LwkMlZqkl2b8TxktrXT2aj/hYh8N/eJBz5+xJE7gjLC/C9YTiKvebxt34pOhe6HGPOgtvM/cIMgyIDOFa0mB5fDlanuwyAoxFp209lBkEueSsJVazsVF80+LMmTMKuz+pEPG5Dla8xQ8DqbcujlJeDquNcbcjKb6ShgNJKAKkxEBOUjUrT2l+K4eZXg6Hq14/GJtovTUBOAZfB+/ypddlBO8OYnBNb6UgUhIP3QLq3qb5w+yn/3hravh0yy+1U6C4r1muXgVr2X7SH6Tl+0HLu4uEkciKTY24/KmxaQRFL3lC8z6v92JyG4qoMAmxgWsfiO43N4OSBRtamqzrFgb2YrAs1xo8SR2/XNCFiiBGEn+2CtAADLjDnz3rcQQCficNFKzjFUyDE/FkyKS1SkajJSkRdDr/+sg8UlRC/iYkCcYMA94HQ5sIVYmgeuvECYXSKQr8mMymRZAAunRN3/QeebiixNc3YWvXwYroAViQ4hKh19vZZiK4zhZCpsCDgzXF6Bc1SUcqUH3/NsYLU8vec4OpdW8NTeiheKtpnfSnxCLYcqj8gwj58qyjZQAFkUUc7825qDmStOD3r6Fld4kQs/AkEn0yBGZZxjmqlX8rDTarDj69+U60fNVIEe8tERhul57qPrQ4ei17mwAxojMN4TUr636LodbuhH/BnIEit/XPEO5zNsVDsF/y/CvEUGCj4159X6puUn8zxqjyq40zfEtieA7kqamn5f1AYVt37tjdIeahodbWvEKK0h93Dw6u9w+k4GqTDNShHTeljdRROUBthTtz4C8qajP+qkHi1rvAgQUZQGYeFyMvaeuI5VEf8BN6D9AfF7DM0D0x8vFYtz1AdsrtOativV18OASPkRMzGFo+3+5rVZsNGZ5cDtjjUSNR/LSr7SLyp+rKQYL2h+3Wr9CfkL616Umb4iuUbHKSLH4VWnp642N0pJpKxhe5RzWUlmfuEIPXeG0GiaSJxE8PI3VefQEx+bg== X-Forefront-Antispam-Report: CIP:195.60.68.100;CTRY:SE;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:mail.axis.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(36860700013)(376014)(82310400026)(1800799024);DIR:OUT;SFP:1101; X-OriginatorOrg: axis.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Nov 2024 14:45:49.4796 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 88cba72b-ae70-4e66-0574-08dd03f1dd8c X-MS-Exchange-CrossTenant-Id: 78703d3c-b907-432f-b066-88f7af9ca3af X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=78703d3c-b907-432f-b066-88f7af9ca3af;Ip=[195.60.68.100];Helo=[mail.axis.com] X-MS-Exchange-CrossTenant-AuthSource: DB1PEPF00050A00.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB4PR02MB8438 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 13 Nov 2024 14:46:01 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/207110 From: Ola x Nilsson The patch "Set relative to top_builddir path in Makefile to access" sets the default path of `test-driver` to `$(top_builddir)/$(config_aux_dir)` instead of the normal `$(top_srcdir)/$(config_aux_dir)`. This breaks `check test` for Automake projects in generated images, and probably other places like SDKs. A typical error would be /bin/sh: ./build-aux/test-driver: No such file or directory Removing the patch makes such checks complete successfully. Fixes [YOCTO #15635] Signed-off-by: Ola x Nilsson --- ...top_builddir-path-in-Makefile-to-acc.patch | 50 ------------------- .../automake/automake_1.17.bb | 1 - 2 files changed, 51 deletions(-) delete mode 100644 meta/recipes-devtools/automake/automake/0005-Set-relative-to-top_builddir-path-in-Makefile-to-acc.patch diff --git a/meta/recipes-devtools/automake/automake/0005-Set-relative-to-top_builddir-path-in-Makefile-to-acc.patch b/meta/recipes-devtools/automake/automake/0005-Set-relative-to-top_builddir-path-in-Makefile-to-acc.patch deleted file mode 100644 index a5bad068a45..00000000000 --- a/meta/recipes-devtools/automake/automake/0005-Set-relative-to-top_builddir-path-in-Makefile-to-acc.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 4f576c10613b43cbbfcdf5a451d893faecd6fea9 Mon Sep 17 00:00:00 2001 -From: Adrian Calianu -Date: Thu, 25 Feb 2016 16:08:04 +0100 -Subject: [PATCH 5/6] Set relative to top_builddir path in Makefile to access - test-driver - -Signed-off-by: Adrian Calianu -Upstream-Status: Inappropriate [specific to oe-core target ptest installation] -Bug-Report: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=19042 ---- - bin/automake.in | 9 ++++++++- - 1 file changed, 8 insertions(+), 1 deletion(-) - -diff --git a/bin/automake.in b/bin/automake.in -index 18626de..3aa8706 100644 ---- a/bin/automake.in -+++ b/bin/automake.in -@@ -325,6 +325,9 @@ my $config_aux_dir_set_in_configure_ac = 0; - # $AM_CONFIG_AUX_DIR is prefixed with $(top_srcdir), so it can be used - # in Makefiles. - my $am_config_aux_dir = ''; -+# Directory used at runtime like running test-driver that should not -+# depend on $(top_srcdir) -+my $am_config_rt_aux_dir = ''; - - # Directory to search for AC_LIBSOURCE files, as set by AC_CONFIG_LIBOBJ_DIR - # in configure.ac. -@@ -4917,7 +4920,7 @@ sub handle_per_suffix_test - { - require_conf_file ("parallel-tests", FOREIGN, 'test-driver'); - define_variable ("${pfx}LOG_DRIVER", -- "\$(SHELL) $am_config_aux_dir/test-driver", -+ "\$(SHELL) $am_config_rt_aux_dir/test-driver", - INTERNAL); - } - my $driver = '$(' . $pfx . 'LOG_DRIVER)'; -@@ -7554,6 +7557,10 @@ sub locate_aux_dir () - $am_config_aux_dir = - '$(top_srcdir)' . ($config_aux_dir eq '.' ? "" : "/$config_aux_dir"); - $am_config_aux_dir =~ s,/*$,,; -+ -+ $am_config_rt_aux_dir = -+ '$(top_builddir)' . ($config_aux_dir eq '.' ? "" : "/$config_aux_dir"); -+ $am_config_rt_aux_dir =~ s,/*$,,; - } - - --- -2.39.2 - diff --git a/meta/recipes-devtools/automake/automake_1.17.bb b/meta/recipes-devtools/automake/automake_1.17.bb index 27d8dfe1827..e22e51498bf 100644 --- a/meta/recipes-devtools/automake/automake_1.17.bb +++ b/meta/recipes-devtools/automake/automake_1.17.bb @@ -23,7 +23,6 @@ SRC_URI += "\ file://0002-automake-Update-for-python.m4-to-respect-libdir.patch \ file://0003-build-fix-race-in-parallel-builds.patch \ file://0004-Add-a-new-distro-feature-ptest.patch \ - file://0005-Set-relative-to-top_builddir-path-in-Makefile-to-acc.patch \ file://0006-automake-Remove-delays-in-configure-scripts-using-au.patch \ "