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 136B6A054C for ; Fri, 14 Feb 2020 18:06:33 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id F1907262E; Fri, 14 Feb 2020 18:06:32 +0100 (CET) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) by dpdk.org (Postfix) with ESMTP id 8E36B1D9E for ; Fri, 14 Feb 2020 18:06:31 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1581699991; 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: in-reply-to:in-reply-to:references:references; bh=LFcA9rSIR2xf3fIBe+C5ZmBed+08EGuhDKv+T30FdE0=; b=EPj8k6L5Ucqu3suUrthijQiBiGEkgePqQen+JrMv+SHoTnFyxY0K+bMfSKV2pLqmFguwsW aZRTRMOQsGOMxZt8OqVMna4knDI850oBJY8eKwPJr94gZNe3WeUAebXNx6s+u+ii7FmaH5 1leB5kGH5/SCshThtv1QzN52LpqseNY= 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-3-KaTkQRspNQClaBPq-aueMg-1; Fri, 14 Feb 2020 12:06:28 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 1D6D71005514; Fri, 14 Feb 2020 17:06:27 +0000 (UTC) Received: from rh.redhat.com (unknown [10.33.36.13]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6F4A389F3C; Fri, 14 Feb 2020 17:06:25 +0000 (UTC) From: Kevin Traynor To: Junxiao Shi Cc: Bruce Richardson , dpdk stable Date: Fri, 14 Feb 2020 17:03:35 +0000 Message-Id: <20200214170337.25093-41-ktraynor@redhat.com> In-Reply-To: <20200214170337.25093-1-ktraynor@redhat.com> References: <20200214170337.25093-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-MC-Unique: KaTkQRspNQClaBPq-aueMg-1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Subject: [dpdk-stable] patch 'bpf: fix headers install with meson' has been queued to LTS release 18.11.7 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.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 rebasi= ng (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/1736f09ef069ead760= a61150a4f66d42b7b057e0 Thanks. Kevin. --- >From 1736f09ef069ead760a61150a4f66d42b7b057e0 Mon Sep 17 00:00:00 2001 From: Junxiao Shi 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 Acked-by: Bruce Richardson --- 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 =3D=3D 'x86' and dpdk_conf.get('RTE_ARCH_6= 4') endif =20 -install_headers =3D files('bpf_def.h', +install_headers('bpf_def.h', =09=09=09'rte_bpf.h', =09=09=09'rte_bpf_ethdev.h') --=20 2.21.1 --- Diff of the applied patch vs upstream commit (please double-check if non-= empty: --- --- -=092020-02-14 17:02:39.326923378 +0000 +++ 0041-bpf-fix-headers-install-with-meson.patch=092020-02-14 17:02:37.061= 405643 +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@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 =3D=3D 'x86' and dpdk_conf.get('RTE_ARCH_= 64')