From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 28E5CA04AF for ; Thu, 20 Aug 2020 17:34:08 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 13B291BEC4; Thu, 20 Aug 2020 17:34:08 +0200 (CEST) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) by dpdk.org (Postfix) with ESMTP id 346291BEC4 for ; Thu, 20 Aug 2020 17:34:06 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597937645; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=q3I8so99hIubMP0lN3vUmk17DcKWfk9rH+/JoSgoExo=; b=IcLRNnZGpGCrB110hyK/sqsqnnhxBvuWYpxmLujA4oFbiiXPTUPK3G99sZ0KdAF39vgsQi vzZ2gH+QGieUVmgL2Bf2uCrj2ZgJ7RY/DYQYaaMsdfXkfL6k4BNkumaDsKxAv3mRTBov9G vuNDRS/kkT0lVS0FvaoR3HZwuDdnBtc= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-43-6sTLm_SIMLykzhEpw7IQWA-1; Thu, 20 Aug 2020 11:34:02 -0400 X-MC-Unique: 6sTLm_SIMLykzhEpw7IQWA-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id BA5551084C91; Thu, 20 Aug 2020 15:34:01 +0000 (UTC) Received: from rh.redhat.com (unknown [10.33.36.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9442E10027A6; Thu, 20 Aug 2020 15:33:57 +0000 (UTC) From: Kevin Traynor To: Timothy Redaelli Cc: Bruce Richardson , dpdk stable Date: Thu, 20 Aug 2020 16:33:06 +0100 Message-Id: <20200820153341.171927-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ktraynor@redhat.com X-Mimecast-Spam-Score: 0.001 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'test: fix rpath for drivers with meson' has been queued to LTS release 18.11.10 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" Hi, FYI, your patch has been queued to LTS release 18.11.10 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 08/25/20. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/kevintraynor/dpdk-stable-queue This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable-queue/commit/42c9b85315164d8c78037edf13511fae532eeee2 Thanks. Kevin. --- >From 42c9b85315164d8c78037edf13511fae532eeee2 Mon Sep 17 00:00:00 2001 From: Timothy Redaelli Date: Wed, 1 Jul 2020 19:16:38 +0200 Subject: [PATCH] test: fix rpath for drivers with meson [ upstream commit f62093e7390d39c160205a4915ce0b4de116a0c3 ] This commit fixes the setting of relative rpath on dpdk-test for drivers ($libdir/dpdk/pmd-$abiver) to the correct absolute rpath ($prefix$libdir/dpdk/pmd-$abiver). Fixes: b5dc795a8a55 ("test: build app with meson as dpdk-test") Signed-off-by: Timothy Redaelli Acked-by: Bruce Richardson --- test/test/meson.build | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test/test/meson.build b/test/test/meson.build index c097840f65..09b51a7ca6 100644 --- a/test/test/meson.build +++ b/test/test/meson.build @@ -288,5 +288,6 @@ if get_option('tests') dependencies: test_dep_objs, c_args: [cflags, '-DALLOW_EXPERIMENTAL_API'], - install_rpath: driver_install_path, + install_rpath: join_paths(get_option('prefix'), + driver_install_path), install: true) -- 2.26.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-08-20 16:26:15.889435614 +0100 +++ 0001-test-fix-rpath-for-drivers-with-meson.patch 2020-08-20 16:26:15.749323644 +0100 @@ -1 +1 @@ -From f62093e7390d39c160205a4915ce0b4de116a0c3 Mon Sep 17 00:00:00 2001 +From 42c9b85315164d8c78037edf13511fae532eeee2 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit f62093e7390d39c160205a4915ce0b4de116a0c3 ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org @@ -16 +17 @@ - app/test/meson.build | 3 ++- + test/test/meson.build | 3 ++- @@ -19,11 +20,11 @@ -diff --git a/app/test/meson.build b/app/test/meson.build -index 56591db4e0..39f295d737 100644 ---- a/app/test/meson.build -+++ b/app/test/meson.build -@@ -426,5 +426,6 @@ dpdk_test = executable('dpdk-test', - dependencies: test_dep_objs, - c_args: cflags, -- install_rpath: driver_install_path, -+ install_rpath: join_paths(get_option('prefix'), -+ driver_install_path), - install: true) +diff --git a/test/test/meson.build b/test/test/meson.build +index c097840f65..09b51a7ca6 100644 +--- a/test/test/meson.build ++++ b/test/test/meson.build +@@ -288,5 +288,6 @@ if get_option('tests') + dependencies: test_dep_objs, + c_args: [cflags, '-DALLOW_EXPERIMENTAL_API'], +- install_rpath: driver_install_path, ++ install_rpath: join_paths(get_option('prefix'), ++ driver_install_path), + install: true)