From patchwork Mon Nov 11 08:35:37 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: 52273 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 61E8CD6409B for ; Mon, 11 Nov 2024 08:35:48 +0000 (UTC) Received: from EUR02-AM0-obe.outbound.protection.outlook.com (EUR02-AM0-obe.outbound.protection.outlook.com [40.107.247.63]) by mx.groups.io with SMTP id smtpd.web10.54930.1731314147263707161 for ; Mon, 11 Nov 2024 00:35:47 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: body hash did not verify" header.i=@axis.com header.s=selector1 header.b=ehmg1qCf; spf=pass (domain: axis.com, ip: 40.107.247.63, mailfrom: ola.x.nilsson@axis.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=GUFIssZKYHoD7kZRXncCTsAKV4m3XnzQEAytPOBuhOdc1drlIqeBe6JUDKf7YVfzJq2b8qGMkcKNYMtFLB5qOGZGUJqi646lmfqtcqK++RT1FNzCTjoR/NG385iGnufuewG/DRUJ9LxRqAHW2mhhoTfcpkiBMbrsWIhg7dUQ4wFYNAzFF2noNhKSrXqjJxQTURU76nHorWO4Vt7KK0wPyXa7D/E0XxrOdWm31ynHYWxnVmj+dY6QWNuOm7JPe5f/pCOf8Z1EZrttYZi7JXmP7ebLL2MqlitHi2BOzlwx2kEQ1t45d6h55KNsDgOlm4UYF/NHQnc/XX9qbVRduVSZTg== 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=muXSABq+V/V9ZYOUBb9pcKWnAyBoQQ5oaKYoq5Nmybw=; b=mvjQjOKFjLeZWR2I4NINc6pU2Mzui+kJJnlnLfKsbyI6Tm0oWLnKqPFy1t+jLBm1JOwsvLqVm9wdaLM3lkvmbC7+SUsDqRq4p8Mq81pbHmN1dhBz+hPFcwDtLtu1yZrk8ygKWu8wBZnk4cjcbscfKIvd7OyPzDTeIke8gz/Uo+yUrwP43vjvZ6M0XMIQRAea5gNYhKspYIsOx/XSAXbyZvXfE+8sTD64Wuxp+LjSERAxakBYmNH2pz8yDiseHD9+uVjLEeGEOCwTrgdLKhTsrK9hnXgkwRuwCLNddYAh+0dtIPz+r44pXIoKy3nted5Bn5obOGb28TxkD0w3BGo1HA== 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=muXSABq+V/V9ZYOUBb9pcKWnAyBoQQ5oaKYoq5Nmybw=; b=ehmg1qCfdmSuRem/CxKhkzJ7AeY9hua1Kzx7xmPxlZgI9FZQcWKmO/CwxOd5aA3KWsoWxGSBMn/khCrMhb0kejy34HTihnrucfVRN5NTzuZh8Ft2XRI7VG3yPTI+0w5vhN7KDJLHQgolGB0vcTDhvtlw6C+QdzyoIVkLshOFzb8= Received: from AM9P250CA0025.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:21c::30) by AS8PR02MB6854.eurprd02.prod.outlook.com (2603:10a6:20b:251::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8137.28; Mon, 11 Nov 2024 08:35:43 +0000 Received: from AM1PEPF000252E0.eurprd07.prod.outlook.com (2603:10a6:20b:21c:cafe::c1) by AM9P250CA0025.outlook.office365.com (2603:10a6:20b:21c::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8137.28 via Frontend Transport; Mon, 11 Nov 2024 08:35:43 +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 AM1PEPF000252E0.mail.protection.outlook.com (10.167.16.58) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8158.14 via Frontend Transport; Mon, 11 Nov 2024 08:35:43 +0000 Received: from SE-MAIL21W.axis.com (10.20.40.16) 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; Mon, 11 Nov 2024 09:35:41 +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; Mon, 11 Nov 2024 09:35:41 +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; Mon, 11 Nov 2024 09:35:41 +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 666AE7B8 for ; Mon, 11 Nov 2024 09:35:41 +0100 (CET) From: To: Subject: [RFC PATCH 1/5] attr: Fix the ptest path to test-driver Date: Mon, 11 Nov 2024 09:35:37 +0100 Message-ID: <20241111083541.291594-2-olani@axis.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20241111083541.291594-1-olani@axis.com> References: <20241111083541.291594-1-olani@axis.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AM1PEPF000252E0:EE_|AS8PR02MB6854:EE_ X-MS-Office365-Filtering-Correlation-Id: 7237a160-b351-4f48-fd4c-08dd022bd4e0 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: ujlH+zi6t2nkVwr1cxH9mJCRat5cRKzxXp1hX7HPfriaYLZMncgOfd415TZtMg8h4VQWOTcl3HaOVuctLhA6oEP8/yPkcGmvxXaUcEzIKml/l+IKTGaaYfMlba1nAAdrowKRtEHSPbCWt8zbnGuSQhCw0k94CSJeb1iMjPb0BWLrF/1Mda4qQRq1Cll3NKGi5zm4HWKKDtOuAa5ur3rGXL5x3BCgZBuZGu5ttYNhUmjqFfq5WRe8MIhoCkk4iq8u7fNy92O5B1fhHAAxbmq5fHnagMhzU5b3e7mTyEYckogxdIMOFvQmW19969bbTtaDVlHw9H9ggv5FXAlfBeza6tmQHKZCfmSzxKlcPwMCbRpCMQFSU2qhwUVtqIF2RWGR/dQh7nDS8yQl3te+rtuMVJxLCsnsBWH5beRl6hBbGyqkii6pS86jaNTiHx2OqyVJrZ+8EN06NXuBZio1jZcawAqzbTNEYHVIIwQbPbOWbWy5L4dOFa2MEuZ4k76WEmR95M/xvGXGhkTUn4tpXaVGLFLUccYaLdlvt+ZplDdou4aHyxNj2qaQIKdVbZ6aXFVAHtihGD3Qf99HkFxkOj8ZXfEZey0lwj4b3CqWCX9/VNbZ0AujfdueHIQQJ712NKRJo4C686cpHh9reNr3WBgzCIMAbAShX06S4tf1LTsPGMAzNnBgzs3bs/4dOdfAxFO4RyLs6qu8LG+I6kQ/I+N/G4crLBKsVdzqWMNunpglSEIhuzoAw6K3QgPfJ+TGbCM1Q2OP8FDP9/4WVJ+nV8TgvoivgAkolNwgRNLdZ4Lkr/EgvQqPU16IG3Mj6qaPP0lU46ievH1SrhO4Qdvn/JhltNAfKSi+rbgmDBr6BIvHXu6dVOvVYdpXmqU5IbTC9Pg+JqAi6C8u3iSe9HBaPwICS8M5N9SCWF9glJ1lFhH3YaWrAX1jLInNEp+pR0JuA+uRECkhOFBfX0TulS0as6T1EB26coljsSh5st4ZRzaa2b6IZvdwDxHSSlvYeYDXv9ImawQUX9BR0uwnmwIZAUoFELu0lS7nJuGbxKWuNpI4PHA8cawO41j6hPoPPsncxfWCbCPh9evwl5Nah+/6YQKoFFp21gGvBLLKMxlktFXw5DvWVPCWkeXdTgyHkr0gLZKn4HXX4KR0cVB1vG3OwYvXrUIFwrEzRPa5IuYjs7//fXMDPQ6r7eVtpidMDNzGvEwuhlrFyckF+2zbi4ZGaozy9wjbGmTygSP0Av0dGNsB7k7ditf70+LFKoYEz/FzWAIfOoE1/9RyTqI5RFGeEiT82wSPtGvAOGnwfGe9DrakXw3MCsRLMPcPUs40jWptjTb1Pht2LmLGe2WL/lazwd2hCDW0ql+RIbmS5/4vZ66/MDRrL09ql5hMTp6LS1g2S3mOjRcAgNc7A9+E43kqE2XXCA== 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: 11 Nov 2024 08:35:43.4373 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 7237a160-b351-4f48-fd4c-08dd022bd4e0 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: AM1PEPF000252E0.eurprd07.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR02MB6854 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 ; Mon, 11 Nov 2024 08:35:48 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/206933 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] --- 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 Mon Nov 11 08:35:38 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: 52275 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 6526BE6781D for ; Mon, 11 Nov 2024 08:35:48 +0000 (UTC) Received: from DUZPR83CU001.outbound.protection.outlook.com (DUZPR83CU001.outbound.protection.outlook.com [52.101.67.40]) by mx.groups.io with SMTP id smtpd.web11.54965.1731314146453451050 for ; Mon, 11 Nov 2024 00:35:47 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: body hash did not verify" header.i=@axis.com header.s=selector1 header.b=RStpZkFO; spf=pass (domain: axis.com, ip: 52.101.67.40, mailfrom: ola.x.nilsson@axis.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=vlz3lOPstwc3wygMFzxFrgLZSn6J8hKd1k58gr20CQ+q0VjtkBloDgUZGEaEZYc151lcx6kGZGpwjQPYEOsel45LdMSQzecSuk3e1Hf6EgaXfKSWljcwg5eXQnbAsSYxU6rLDppAGoCKABUZxo/vhW+nyTtneTpbHATuAPDUub6Tau2oTs4UZuJ7qflMGRc9rBiVQ4Dag9SdPGlaShMl9j499hAdl5ya9qXJRTe5X68uOs3FWVD/jFNj7d/CWxs3sMTEr5ap79TyurP7BheJs+3IJO+GQ9TfITIsuebctRMc4oPqlVL9kJQtNeLwQdbbtlvhBRP1x6e5u8PAfHBgZQ== 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=v7qNULj525XvdoMxbyt8t26cy+k41JovN0VQ5wlY/aI=; b=onyFnObGsmyfaNrRWXixCZMX2gfVh/8OAvBHIzobK7biQkBF+jzvViusSjQHIy7ZmZEFmV8fRdk1CXmHEcJf56Fz5jQ1RvVWxZXtd1Xmjgjn77Y3MxylfVr8rQ2zBYKLMuUp4889OXqREIH4vPOze0wklizoGvkOziC41btK6gzGiNv73RRlyBfb/mSSSj2N24Oh/ZfAU9bydOqle6cIkQ+Qa9gVW0GQt+LEBP91OPXArz0nYRENHgyGtrJp3Ezxp2XjNC7heOXR43dri/1TdxBwepjs0EW3FzvRu7+KqZFmgjfahMaJ2Qovp4WCe/Kl1rIhqrNPP9u6X7ztOtXO9g== 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=v7qNULj525XvdoMxbyt8t26cy+k41JovN0VQ5wlY/aI=; b=RStpZkFOuWhfwu8W/IxBncmZQWj/19RZ+5LshvTnn6u1ElKzC3MRFf4h03Vy0BL9cbvyNwV8IX0p0VU5MrMJWx5Tki1C/z8ioF8giDpTFJvrnDB4kFQOJoBCn0X2IJiBTd3XoilwCiUo9ZLKJfz8nz2CryHyLf3wQrSmIM74/Wc= Received: from AM9P250CA0006.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:21c::11) by AS8PR02MB9933.eurprd02.prod.outlook.com (2603:10a6:20b:61a::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8137.27; Mon, 11 Nov 2024 08:35:43 +0000 Received: from AM1PEPF000252E0.eurprd07.prod.outlook.com (2603:10a6:20b:21c:cafe::5) by AM9P250CA0006.outlook.office365.com (2603:10a6:20b:21c::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8137.27 via Frontend Transport; Mon, 11 Nov 2024 08:35:42 +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 AM1PEPF000252E0.mail.protection.outlook.com (10.167.16.58) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8158.14 via Frontend Transport; Mon, 11 Nov 2024 08:35:42 +0000 Received: from se-mail01w.axis.com (10.20.40.7) 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; Mon, 11 Nov 2024 09:35:41 +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; Mon, 11 Nov 2024 09:35:41 +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 67EC17E2 for ; Mon, 11 Nov 2024 09:35:41 +0100 (CET) From: To: Subject: [RFC PATCH 2/5] sed: Fix the ptest path to test-driver Date: Mon, 11 Nov 2024 09:35:38 +0100 Message-ID: <20241111083541.291594-3-olani@axis.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20241111083541.291594-1-olani@axis.com> References: <20241111083541.291594-1-olani@axis.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AM1PEPF000252E0:EE_|AS8PR02MB9933:EE_ X-MS-Office365-Filtering-Correlation-Id: 9f566211-e2eb-4393-4fe5-08dd022bd492 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|36860700013|82310400026|1800799024|376014; X-Microsoft-Antispam-Message-Info: rfKVfkOtwnpB7iO3elDvlBfsJo7wzOWHs8fv4Thib4+pTaNVYe+vLW0XEQYSsEfmufrPoFhUSct5aEDerFGEtNucBU67mLooe8Y7oHOccuFbqXvf8x4cAInP0daDR3qK/mMmHVEVyDPRAfHrh5h04EBHHGfpomdOrXpjOcC3NYtmOvjYtsmohgWYaFGQEtFyk3MY/DNhOaH5c3LplkkZJ6z1MMfwA8vcTW1zBgTNjW7RvRvX+GLguYkA4SIa3SKukNlGFsyCc0OYhsoCeFtF37wjDXgy8bTeXrvKHrIT5Nf1V7R6fJ4SKqmEAbgj1NnXgtfaMugcKvtUhdo+JZbQUSCwh0Pilwoi7exEEYYKAkCUv2GUxkNNmAXIYagGcbfPPPty8jpVbzZaN3vXWoDN7hpZKZNAose/wSDSi1aBpIIfIJpmY9xmLCL0HcDSNa3e9NV7SpXwJCpCh76u2Hz4zXW1qKFLV8/L2F4wQr26SzaZszB4H7j5ooYQlih+YSXDvrSNU2lKVEu4i97O72iCor9TJBKPsx8kXL9ljfkdk9OcXJDcFGXffIw2wKCbk/5cyBlfNSXKjP9x93U6yY59bFmuMTKFxPqN69Li5vSFk5uzoXxKxc0r+m2EkMdHFg6aKap62jKbLKS7XN4QcWz1it5vvKhakK40eXskZlGIFwY/TX5Q/y1NyXR1m61qBnehzkjBOqmiGh9kd9Z93oyINn/mcBtmI7i0VsU3tUrO0Z+RLnogsDD9owLislXagXlAbBkd9CkQcZnRWgM023cnWbHKBtmBO5SoNyHN2CN7hJx14neVvZs5b+rXs2SjMLlGaN6u+qW10rOUZzW9RuLp9+9htmkZMhAuLnyy2+HMKL/GkUuVmTYa6yW0/pbWT9sTwMW/x5+PwRxG8ZI/7HZr7/FW1SJxu9kCcF3gDcwWJWZdYZluAdo+tT7xFl2jqzxdfLHVKQsq7M7E9wi/4yaxxZ/xoEJYestz4w7one7D+jutdJXZDlfjzqEiMww9L9COtHEyHhpjkLPxWzYGXbwvauY/ssYr0vNze7BKK9cPjSaa4Qxz19x6lYdCgeS6cz1mNFUpxLobI4rwLZ92Ik3SlPR/nfwFggDXiWeGpYkkgAJoXUkK8nmrLyPpE4CXa4dLzOPzYEWD8vb0FTBjX9ICG4IOZHlXb808V+t2RLsCslZBXMiVcMsHS+u7CnlZ2WOFX2RXST/bj3bF8bFUWrRZAEAJStP/ttra9gCbvkFdeSFSOhY+3B9Oa5z130lZsM9Np/sJvIqn+eYCL6NaogZEWrjVhQG0EKDdPa09R00t0A4rrECIVrYmIXiZXPRBrLd2bC2uNFDwksz+h21XlvmwpPcq0Z18HgQMTozyTiQbPKHddWWVwnEXApIeYwPn+D0/YOgCqQJy5iQy+npclpoiuw== 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)(82310400026)(1800799024)(376014);DIR:OUT;SFP:1101; X-OriginatorOrg: axis.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Nov 2024 08:35:42.9373 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 9f566211-e2eb-4393-4fe5-08dd022bd492 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: AM1PEPF000252E0.eurprd07.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR02MB9933 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 ; Mon, 11 Nov 2024 08:35:48 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/206932 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] --- 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 Mon Nov 11 08:35:39 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: 52274 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 635C4D5E392 for ; Mon, 11 Nov 2024 08:35:48 +0000 (UTC) Received: from EUR05-AM6-obe.outbound.protection.outlook.com (EUR05-AM6-obe.outbound.protection.outlook.com [40.107.22.62]) by mx.groups.io with SMTP id smtpd.web11.54966.1731314147800127358 for ; Mon, 11 Nov 2024 00:35:48 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: body hash did not verify" header.i=@axis.com header.s=selector1 header.b=LDo9/Gx/; spf=pass (domain: axis.com, ip: 40.107.22.62, mailfrom: ola.x.nilsson@axis.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=Jpgr/G9HP/NqtwE7LF9QUeeRFm/JGUICEBMzbKsHjZ8ecBGdbSx7dFZylj9fLt9GOdjYEFC5r43mr1axjOopTDgomV+PSA86rmwGtzEERVmE7jJOFEAxEabNl7jeziacyAo9OZ/HlqzENDclqTVBD0I3JG8ciluGXQoL/y2w0F7jlNR69zy+/pwbzV4wo4MHsPZdV2ugzdwNIOWLnBY24pc36EoAO8j3Zutuc6uebuURT4MTPObPE+tLWnbhS2L39lROJgyvm07NbXXOD2fyAgkzI1I+YJT2JvI4XVkfSvu7dCFge1gyiV4BO6WWVjaTVw8mtL5i3gqX+G+JX1VaWw== 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=YRDfRqNMcejMuoQ/bT5UPIMW+SrgihoDVomso3ooti8=; b=kzSUVXC4KRoQhdZQ1241Eagmy73jQwPrDDNeavcybEETaY2vHxGrMNbL1ZTPQTcP6JQdmf5stMMiqK97Mg2IdeJT3HBSziZ/YYb1J68xj5qjlL/lvursfLTdFDnMMzUfLqcWB5PS1BXM5sND0vSTQe4oJZvVE1nhd7B1Wt6KdOr1czJf9BA+BHNx7P97cPvNXNXSeLlmvl+Fvnprn8oMUviueCVRpMwQU4b/30/TqmmkUUhRaMDqlGABuOJnTglM/0NH/vjQ/DQxyA73J7kHiEmE7AOhhNrS+DYzKIjQh23sTEVibxc6+ExbKvf9N3xeF3ZHJGA7QbhWY70del/HfA== 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=YRDfRqNMcejMuoQ/bT5UPIMW+SrgihoDVomso3ooti8=; b=LDo9/Gx/YHfrWHHTqur0tz/LrmKT8OhcBEZxX9B2ODA8zqx79o3MzBrTjfDhB00rWvWmPF097ptTJqcvwPlMCmOxTwhWHK+93IFzSBWLjUNKgQwlwNR2Q5XF2spO8IfeDKYGc5GaDJ7mppkRQKDoKC6bMosc43IiTmbPC5XMQhY= Received: from AM9P250CA0026.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:21c::31) by GV2PR02MB8602.eurprd02.prod.outlook.com (2603:10a6:150:76::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8137.25; Mon, 11 Nov 2024 08:35:42 +0000 Received: from AM1PEPF000252E0.eurprd07.prod.outlook.com (2603:10a6:20b:21c:cafe::94) by AM9P250CA0026.outlook.office365.com (2603:10a6:20b:21c::31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8137.27 via Frontend Transport; Mon, 11 Nov 2024 08:35:42 +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 AM1PEPF000252E0.mail.protection.outlook.com (10.167.16.58) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8158.14 via Frontend Transport; Mon, 11 Nov 2024 08:35:41 +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; Mon, 11 Nov 2024 09:35:41 +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; Mon, 11 Nov 2024 09:35:41 +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 73194800 for ; Mon, 11 Nov 2024 09:35:41 +0100 (CET) From: To: Subject: [RFC PATCH 3/5] parted: Fix the ptest path to test-driver Date: Mon, 11 Nov 2024 09:35:39 +0100 Message-ID: <20241111083541.291594-4-olani@axis.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20241111083541.291594-1-olani@axis.com> References: <20241111083541.291594-1-olani@axis.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AM1PEPF000252E0:EE_|GV2PR02MB8602:EE_ X-MS-Office365-Filtering-Correlation-Id: dae831aa-c56e-4297-e1f8-08dd022bd3e1 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: rUuOa9GG9a+FWZi3G8glXtlNPyF68e4uVf/cRfRSjLEdBY3rSaXxYVCxpwXuJdLlaazaP0AEDGQex6LYRkWfM51IKPZlm7AE1KbPKostjsAmWwUuAtApbND1SHdOT9lajbN2gohDVxgc73wrgKt3GO92ewaJhlWOu5o9JfN5Kk68vXXZiNi2dygdrJIxLtF4csSZZYy348Eevkfn7gPnZd1H2nKLyxEso3xGGes0wB6nfinMiO47ulh8m6xFcuHt4HfXnYk1gZu/37LX+ydNwZfNHwTpWbzQY6auo1vMkGV5ydgPym7OYQ+EEeBrKsQ30n8liPd2q2Ef5EGNzOoJyRa73MztfS8mhxkNYD7xOl2HFq5fbUQ9i6dCRIZ/KLQDOZTg0BddQjo1gur9nAaOEdS0Dvo5H1DKBS/3oLJwWqqtXZPSclWB3pBqVHpG+yGgR8HhJnWfokueP8NUjdviPbzgENPWHp3Db3AVTUQdaVBvfqSrl0bUF8KVZfA1Ot7q9XdXE2sP5rxXsMNUFr6clgyUHHamNlaU4gr4/FsIamxfCjtwARDws2uMmwwo2zlcGHt6epDxp84oA2hkexi/GJ0i2moJJrgkXcoK+znMh44eLR5d0mMouOxiG6bxLwTH7N4zj/PYC6osvV7byGToDULKXTO824t+21ygOnzHbmABOfjfuSIv9z/7WNN/Ezq0Dw4D69t54ewi7uE4XyvPWBiTyME3CQFO5lWIrLtW8P4yflcpp/RlGeNpBAf7WVUrzTA5MpbTrkp4ZchCnB0z3/vlamcFzVY/OFq/HvnGu9iKTaqEVA2l2FTv7U4gKXjPidmCKfsJ7H4cqekdUY+Xg5pLL55OOybv+F8HhXrU4KNysG1MOGFZWNcXFmY2/HSyMK0yUow5bDQTRz5UV6GNBJkqTz0lN9lBZPIOsEQzF8SDkuKigPiHosLJ3OB31sUYr3gyJxYa/9b0YuWymG32Iw+mzZYGsAzP5ZPaHepmtSMOUvzr/HTFhceqK5sA1L+Qtwe3iddPRqwU9enD8CMm6gtOufOOLPsfTlxNogO+7Zzo2z++0d2vHkkMnrwZmMEYP2LaxrEHG9fpa7XC3DdIuNDDFAw/S+eEWaNBkBIP1rH7tNV38BTrm9XcsKpI8lWVJBRP4yb7VI9agpJmtE4iuNYh2LhX/eVEhZJU0jsRgS7SoU9g9T3m1hkiXPKqBAI39DI8EK3veBIZ78VOug00XbR2ASf1axdylXDtPHDu5ur7IFTbL5YLBPbn9fKbn5KTCu2PSAAg9ZJQlY0GNDMaoJEF6DfrLvvYkJYDa0fCwPktsVXtGAdho1p82hZFS6FnNCZVr9lfmtiogqHkbHOq8uiKneXjh1fcxV0yorzoA/QDpYRCUE6JOjqJynF4AFtqOqkio2Yz1UeW3h4zSCU+gw== 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: 11 Nov 2024 08:35:41.7655 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: dae831aa-c56e-4297-e1f8-08dd022bd3e1 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: AM1PEPF000252E0.eurprd07.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: GV2PR02MB8602 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 ; Mon, 11 Nov 2024 08:35:48 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/206934 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] --- 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 Mon Nov 11 08:35:40 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: 52276 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 4AB6DD2E9C0 for ; Mon, 11 Nov 2024 08:35:58 +0000 (UTC) Received: from EUR05-VI1-obe.outbound.protection.outlook.com (EUR05-VI1-obe.outbound.protection.outlook.com [40.107.21.85]) by mx.groups.io with SMTP id smtpd.web10.54931.1731314149821098524 for ; Mon, 11 Nov 2024 00:35:50 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: body hash did not verify" header.i=@axis.com header.s=selector1 header.b=VdotROje; spf=pass (domain: axis.com, ip: 40.107.21.85, mailfrom: ola.x.nilsson@axis.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=QxJAdINd03ph7qlGedynpFxg7UYkQhr3Gnd5siW0RaINV08Swv0TdbmXyDnCj4i1p7O2AvNP9Ms6NHD7osEpqpE7prgJf90XYPmIQijGI/rV4rkoaobupw1g9+N06EKP0A3Z4bQPbM9/icSAw6MHXSQECepB+5p0CwFvYy1Ko57gXikWW60als1Ui11OncJ1sobjnmuhW5aUdTjIoQ59gC+gpBndpk0AQiRGZ2HDEX3IajiNeKwiQjI/YnD8RPRlRH3vr/9BBKSyostoVe9nRGmGnYMFJeK/DPzI/s0YeEfjSkAnb/gM540+bEmurcjNX4o22b7bOfCPIpsuR5NdjQ== 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=snSH9i91muf3pH2vZP/WeYsF1wctSh7SHSLAFCVEZHI=; b=WOoLNOqsuGZaVOhqO+RZTrIWJoBwYTFVqZ957hYEpeoWepzd40V6gom6QoFjwQ0W5bZbaWwNsJW+E4pzy33Uh0QUWOnKKoS+Jn+s6yARTCSm2M1etmTxMas8YfoAF5NhANhWYxeOxXgkHfJNBptckW2XdPvblvE0cl0u2pFR67G+EyUaKxMPAB0l75z5Junl0le+rVGU41VBvx1F0d2775YAG1/rs2q5Ouks5OV8Km2yG8A1egQIRiwJXHAh4Ua0X0YE6/Z6zQsL+TswHKb+sLZzBYtHUYyFJHNRL/M7ZdVvLpSRBfLwccOVsBKt3h13YHh6+470jDsjkUrG8YsrMA== 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=snSH9i91muf3pH2vZP/WeYsF1wctSh7SHSLAFCVEZHI=; b=VdotROjeu5Ejn3Tkw4jE/AveY8Ig99b90zMGruTXlUaKpu/gPj/FXOdUHndIBguCuAYu31jsq5v5SXqQVOJD+xAipNGEhJyp9ci1IinH+EKGq1LTv9Y981/7Gh5PtFIlp/kXN9ASDkE9zLqkJW92s2ff/nHpCQdxEk+MHXJfcgg= Received: from AM9P250CA0025.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:21c::30) by DU0PR02MB8980.eurprd02.prod.outlook.com (2603:10a6:10:476::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8137.20; Mon, 11 Nov 2024 08:35:43 +0000 Received: from AM1PEPF000252E0.eurprd07.prod.outlook.com (2603:10a6:20b:21c:cafe::68) by AM9P250CA0025.outlook.office365.com (2603:10a6:20b:21c::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8137.28 via Frontend Transport; Mon, 11 Nov 2024 08:35:43 +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 AM1PEPF000252E0.mail.protection.outlook.com (10.167.16.58) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8158.14 via Frontend Transport; Mon, 11 Nov 2024 08:35:43 +0000 Received: from SE-MAIL21W.axis.com (10.20.40.16) 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; Mon, 11 Nov 2024 09:35:41 +0100 Received: from se-mail01w.axis.com (10.20.40.7) 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; Mon, 11 Nov 2024 09:35:41 +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; Mon, 11 Nov 2024 09:35:41 +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 74E68829 for ; Mon, 11 Nov 2024 09:35:41 +0100 (CET) From: To: Subject: [RFC PATCH 4/5] strace: Fix the ptest path to test-driver Date: Mon, 11 Nov 2024 09:35:40 +0100 Message-ID: <20241111083541.291594-5-olani@axis.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20241111083541.291594-1-olani@axis.com> References: <20241111083541.291594-1-olani@axis.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AM1PEPF000252E0:EE_|DU0PR02MB8980:EE_ X-MS-Office365-Filtering-Correlation-Id: 20fd05f1-fbe1-4f08-c090-08dd022bd504 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|376014|82310400026|36860700013; X-Microsoft-Antispam-Message-Info: mD/xSPWcqUgpQQ+oSAgjLktHNMWrNucSCBoYI7wmaBYU1KbCYilbdi6vXrB4OCBaFP97eiBW+7O0UlBqd2ePz4tS7/ZntZ7saoafx7nLW3sVRxAPj371tCWZz/MeYHwb9IlEv4GA2NEOvsZokXcGbuNKfSRDenwpBgAfcSbuPp7i1GlwdocSjHVgDNxY90LlIEQ5I1ZEVPVZND0RGjfKdkvPIOwUpAx6b1tN63bF8mUM+KV1BohTsq/zRnvq81iqOxmZZLi9fHS40cOnAMwv0c4iBIgIAN5XNf81R/HB3Di37luu7o4h5/qxe2UAxA3vJRtjwCrzoLxSNQSoZdmgvIKuKQPNZz5iJpXT8m/CZlFmWUdmcBS5dASiUz9Hse8YbmRj3ysQ2WdZmzDlhmFRMXg4EynbQODmaOEvbeb6DyNtfljmi61Ue2NxmEV6tj7VRYOHgES3Dh2XvUrYruZTEfB9PBo7Vq7qOM5IGfjr5yMUXFazQdUd6V+00syx8kPaxZE5HDvwLKqItIDYmDLJDEF8Gf3iivZ42O4R/Xe0041Oh9t5rg3HAg14J1gRzdLq0+Cm+NaIQHs1llT1qoIFuhnOH9ZRBWf91O550nNRMFDsi0rw3IT23VxRs0+YYNLi7GMIXA8YvDWCHIM83iIjdLzBVsKTAxCAXuZ9SFyqHiQP885P5BpJBEgF4gdwg05WtvH+FzAoVK0fMfeL14RTrhCnHSuDy7/oE3Wfu2+rwSfYzs0u+R+0wnKRKfGrgHJ83pve+NH6rLXICfeGlzEhBixZabDg42nTz1G+i/uFg99i18WYV6e33CbRIm2Zbl5P7GgSmBm8IYK4J8Nq9UkvEzA+6w8XUl+ny6jRZqqi1WoD5Dl6jH8EyFqcMdER9UBatbvoYZy+jecISEdc80KmMS/Y+yw1u/XW/KpAwnQ9wr6fevnbUF2kzydXtp43zfpOriJx5Ck5AQOkeruAMUa7fFM2H+UKyuXvqjVSN7oEyAYfCkw+NINN5hwJLKdI4aFeTvAn1KNqwzpaSahfUcQSknV+odF+Bg2NMREXuurlQYQEM4XjgEpqfONT4zmeICdAKGKtHMIuV6fSFcDIB8SPRBWluvx8T4HrmBikYid/rq4kiDY6ntyTl3BNuZug8fPW02poO/mDwvkU4V7/6S66GLSx+U8aqeksM3qzNs07t60e9dufOpKDOJoS1Sp8Xvp50D3A1f+8HhQQjNH1W16NEZPWTUmWKtOx4kE/6mFjwYC92ecFX8HDCaCr/Tn8+D/lWM4lHWig3kmWTpVZK0b8Yu9ItsXgb/2ieTXjLvtPcodVRkFxXoKAk1Mm/lzmsZBt6zJo+XEaRbTxyEYpj6IQNl73Gl+rL+dBPyadHLeaS5S9w4XmO9To4aOX2NHNo9Xz9aADTsCsKjfj3NjWoCjpXw== 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)(82310400026)(36860700013);DIR:OUT;SFP:1101; X-OriginatorOrg: axis.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Nov 2024 08:35:43.6717 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 20fd05f1-fbe1-4f08-c090-08dd022bd504 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: AM1PEPF000252E0.eurprd07.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DU0PR02MB8980 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 ; Mon, 11 Nov 2024 08:35:58 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/206936 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] --- 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 Mon Nov 11 08:35:41 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: 52277 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 45D1BE6781E for ; Mon, 11 Nov 2024 08:35:58 +0000 (UTC) Received: from EUR02-VI1-obe.outbound.protection.outlook.com (EUR02-VI1-obe.outbound.protection.outlook.com [40.107.241.55]) by mx.groups.io with SMTP id smtpd.web11.54967.1731314148143275923 for ; Mon, 11 Nov 2024 00:35:48 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: body hash did not verify" header.i=@axis.com header.s=selector1 header.b=PlgwEVBN; spf=pass (domain: axis.com, ip: 40.107.241.55, mailfrom: ola.x.nilsson@axis.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=wZIUWhwMEkzMeKpu8Oyavq5KStCLaoMdEv8LNp+lXMMeSboiOpfJO/IpG6j5MNbSUybynZtY8L8xXNZ/b8iwMqBpeUmffjkP4DCbOc7uXyoBMt4w30zO24L/CbBM5ItjVMwX2RXIJJJ9EGluowkGKPsNKYhOdAbkQl/0p433bds7DE8Q5NyU7NJe6dFQwnOgtsxyZ3kS/0QMhq65oc4k8D7Q5sGlucHVrz+wv7X+7xTxNPWlNI/BRz8iWmkSZ2wylx6UXnYswsbNyA0vubMbTIblP2Mt8IeylhTPrAr5CYnQdNmnULNaOXNNZAjq4n5mQxqiYlMGWGcnuCU9xmG5/A== 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=yH1HqjvXuHVtsoJC+KyhPbnAzkaZfMYvQj2H8r1X6yo=; b=qTAQnj1DIkiobgEJfqmvAhwfYkYe/FkoxdyNJufx/Ss+JNVPjrRbVeaiZXccFFOZdHbnfNIa04Pu50Te0wxDYYO648TbWPnLSxEOEo4OXzPyiKecH6yfC87g9BeQrNe+O/VXiYw0VuVLOH2ebux1mWAd+dKP/94AmXQL6PkcDa3YW9Abwj9vLBGkt6Xp6sMsjsGtE0Vm8tc80Jqu0o8EHYyNitnTKjnTYo3xbfU2tgxgmVOWujPanS3/q6BLx7z4/qkV5IeQE2Hfx6b3E9rYi74bVmGfv8vtsD+wU4EI+LnuGrSLsypMAfsSlWaEH7ZS8XwWNX3TphQTer8PhW/hTA== 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=yH1HqjvXuHVtsoJC+KyhPbnAzkaZfMYvQj2H8r1X6yo=; b=PlgwEVBNPnx9hqYA5WXjIkNaeV4u6gFlmujB/9JLWaenj9Kmf72ZIzFJ165PEKuiOlJ7FAXSrZ7dSvaNqUbXpNcoDzuaE5hH5Uq3WRPrMaRiyHOB8nadA6b+lqFeeUt82VkB6HmKWsmrBz/D/4BFncEY4IxjeJBOMKlstCzARaI= Received: from AM9P250CA0020.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:21c::25) by PAWPR02MB9807.eurprd02.prod.outlook.com (2603:10a6:102:2f2::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8137.28; Mon, 11 Nov 2024 08:35:43 +0000 Received: from AM1PEPF000252E0.eurprd07.prod.outlook.com (2603:10a6:20b:21c:cafe::16) by AM9P250CA0020.outlook.office365.com (2603:10a6:20b:21c::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8137.27 via Frontend Transport; Mon, 11 Nov 2024 08:35:43 +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 AM1PEPF000252E0.mail.protection.outlook.com (10.167.16.58) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8158.14 via Frontend Transport; Mon, 11 Nov 2024 08:35:43 +0000 Received: from se-mail01w.axis.com (10.20.40.7) 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; Mon, 11 Nov 2024 09:35:41 +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; Mon, 11 Nov 2024 09:35:41 +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 7FFED830 for ; Mon, 11 Nov 2024 09:35:41 +0100 (CET) From: To: Subject: [RFC PATCH 5/5] automake: Remove patch that changes path to test-driver Date: Mon, 11 Nov 2024 09:35:41 +0100 Message-ID: <20241111083541.291594-6-olani@axis.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20241111083541.291594-1-olani@axis.com> References: <20241111083541.291594-1-olani@axis.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AM1PEPF000252E0:EE_|PAWPR02MB9807:EE_ X-MS-Office365-Filtering-Correlation-Id: d2a46d25-b9c2-4a12-ebec-08dd022bd4ae 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: WKo0IDp75SR34HXq8IifP1SdHfNH2nGCacm5Za4BQOM/ibmFFCBWE8SW1sjRuDx2oWzOWQUNZuxgVsE8p2TNSFts3ZewaiQepmYff3MsjpzOQL8HIbSNLzFBXbYPoOy29RQVTQETtS0KouXOXqVrZhJygpHlCfHHYVVd40zQ4rGiHshvgulkouwsSRfnKsRWU5i8QRzZ/dBGnACUZPhQ0+l+zG1lWRlKpjP16EkOvxNs+xGWakoKIlVwTR/BfhDHGyRcxbSJr2/UkMKzfcdFDUJfsl+7uNU7vfsGnAFS7hmd0uKFC5Twrq0IB4GH+2o7GH5XwDp1DyXQrMaRa8lCfnSBTf+xvEUUTsj7wyBWPv5QQHNeBahcJ60KGWewIRcNtT7JJQ19ZNwvFg4sEz6RozMzK5+h51e54zMB0Pbgs4H/IF9Q6VoY8hkvnvm7rD9DjofGr0c6JYUkeyVPtHNdBy/VxDQiVPOGRTboUoDQNtfPbC1J1VvSix+A7K1ySoXnIwshvw6n4MTQnF9Q8LnZTi5pvuBtjnxdnTK4UCWkxooUqFXEKbd8nhg8sH0URk4IdT6BgrH5LSXgrV/1z1EqlPZHMspccTSfF8A+TaaaI//yvohDwA9K3CfwnPVyhQsWQFm2sUYix7rWra4a/c8hgufHPC0wrmQaXVA5rZ31gg6jd1upCS4s0pMS1T2jbKKj4DKqbQZhUvvid0AHknlXArPS84GWls6VrIfh0a3VvdQCknMsx4mGw5/40rt6CIx8hWvSamgT4qSMPNN5jDgLPHSRFGzyIJf13RornD8eoRY6EPcObAs2Vjvt+ZXI6NptRZMJOpl/Nn6gB1st1G7SrQf9RQGkxEzmJN5tXY62jVCV7WvYtqJMSl5AEW+t7j3rcv2ghhnImt7i1yiP5nOaPpFoVA8o4M3XW9NnQVQlc5tawPD/qxM/xmvpt/6Cya733l8O8B88IPCg5oqvsA4B7dNxHq/2ft7KxiA+JrbyuthBW6nEYZli+ov3rzP/WVK8XWhyN/TTzOGoqOsY0RcA3DhE9Kmp8h4DrDsBbVEOElfhwaXLKhi6GHnDhbUk+a1v6Ir5fWKH7Lm+QlnLRkzzGtOVHQSSg2dEla0KidP/6wyOV2f0JA4LnhixE55PVDPnhoSAOYlpDIy7FWjDVWKZAz1e8inw+ZolZcX0KviQ8GiTlG4CrZ8JlC2MZW4g3kBotFwHoG9hEu2fEQFeCs0vsElEVF4uUcRczkj0Awrw1CQuHhndqFBmatC04tLAyrC83Qq6lyJQasBU/MgdQ9BJZRi+cjXs7cSmGN9zpHZ2jeglFOQUvdX9AskOM+ul5iH6CLz/2jPJhv260pvTVxj7+pE36wl2/eCB4fO4Pc24Yoz3mbmicH5Pd+vYsSWM2WLasfSB5cLKAxyrmgNfstwRkA== 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: 11 Nov 2024 08:35:43.1248 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: d2a46d25-b9c2-4a12-ebec-08dd022bd4ae 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: AM1PEPF000252E0.eurprd07.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAWPR02MB9807 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 ; Mon, 11 Nov 2024 08:35:58 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/206935 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] --- ...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 \ "