[dpdk-stable] patch 'bpf: fix headers install with meson' has been queued to LTS release 18.11.7

Kevin Traynor ktraynor at redhat.com
Fri Feb 14 18:03:35 CET 2020


Hi,

FYI, your patch has been queued to LTS release 18.11.7

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 02/20/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/1736f09ef069ead760a61150a4f66d42b7b057e0

Thanks.

Kevin.

---
>From 1736f09ef069ead760a61150a4f66d42b7b057e0 Mon Sep 17 00:00:00 2001
From: Junxiao Shi <git at mail1.yoursunny.com>
Date: Mon, 27 Jan 2020 14:38:00 -0700
Subject: [PATCH] bpf: fix headers install with meson

[ upstream commit 0e8d1ea327d4bd45fd24948be45dcc6716473753 ]

Previously, when librte_bpf is built with meson+ninja, its
headers such as bpf_def is not installed to the system.
This commit fixes this problem.

Fixes: 94972f35a02e ("bpf: add BPF loading and execution framework")

Signed-off-by: Junxiao Shi <git at mail1.yoursunny.com>
Acked-by: Bruce Richardson <bruce.richardson at intel.com>
---
 lib/librte_bpf/meson.build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/librte_bpf/meson.build b/lib/librte_bpf/meson.build
index 4fbb29d7c3..55662771bd 100644
--- a/lib/librte_bpf/meson.build
+++ b/lib/librte_bpf/meson.build
@@ -13,5 +13,5 @@ if arch_subdir == 'x86' and dpdk_conf.get('RTE_ARCH_64')
 endif
 
-install_headers = files('bpf_def.h',
+install_headers('bpf_def.h',
 			'rte_bpf.h',
 			'rte_bpf_ethdev.h')
-- 
2.21.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-02-14 17:02:39.326923378 +0000
+++ 0041-bpf-fix-headers-install-with-meson.patch	2020-02-14 17:02:37.061405643 +0000
@@ -1 +1 @@
-From 0e8d1ea327d4bd45fd24948be45dcc6716473753 Mon Sep 17 00:00:00 2001
+From 1736f09ef069ead760a61150a4f66d42b7b057e0 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 0e8d1ea327d4bd45fd24948be45dcc6716473753 ]
+
@@ -11 +12,0 @@
-Cc: stable at dpdk.org
@@ -20 +21 @@
-index 13fc02db38..52cfaf9ac2 100644
+index 4fbb29d7c3..55662771bd 100644
@@ -23 +24 @@
-@@ -15,5 +15,5 @@ elif dpdk_conf.has('RTE_ARCH_ARM64')
+@@ -13,5 +13,5 @@ if arch_subdir == 'x86' and dpdk_conf.get('RTE_ARCH_64')



More information about the stable mailing list