[dpdk-stable] patch 'doc: fix warning with meson' has been queued to LTS release 18.11.7

Kevin Traynor ktraynor at redhat.com
Fri Feb 7 16:12:18 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/13/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/21d2e1a6041fa95e6fe399a7701032066c09a600

Thanks.

Kevin.

---
>From 21d2e1a6041fa95e6fe399a7701032066c09a600 Mon Sep 17 00:00:00 2001
From: Bruce Richardson <bruce.richardson at intel.com>
Date: Fri, 10 Jan 2020 21:52:02 +0000
Subject: [PATCH] doc: fix warning with meson

[ upstream commit b1e1bd379afb89495b7d72a4edad89292c21d17a ]

The install parameter to configure_file is new in 0.50 and generates a
warning since it is newer than our minimum version of 0.47.1. The
parameter, however, is unneeded as the documentation states:

"When omitted it defaults to true when install_dir is set and not empty,
false otherwise."

Given that install_dir is not set for this file, install defaults to false
so no need to explicitly specify it.

Fixes: 720b14db3ae2 ("build: generate API documentation with meson")

Signed-off-by: Bruce Richardson <bruce.richardson at intel.com>
Acked-by: Aaron Conole <aconole at redhat.com>
Acked-by: Luca Boccassi <bluca at debian.org>
---
 doc/api/meson.build | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/doc/api/meson.build b/doc/api/meson.build
index 1c48b7672e..23a7dfc759 100644
--- a/doc/api/meson.build
+++ b/doc/api/meson.build
@@ -39,6 +39,5 @@ if doxygen.found()
 	doxy_conf = configure_file(input: 'doxy-api.conf.in',
 		output: 'doxy-api.conf',
-		configuration: cdata,
-		install: false)
+		configuration: cdata)
 
 	doxy_build = custom_target('doxygen',
-- 
2.21.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-02-07 15:08:17.861787053 +0000
+++ 0006-doc-fix-warning-with-meson.patch	2020-02-07 15:08:17.492063242 +0000
@@ -1 +1 @@
-From b1e1bd379afb89495b7d72a4edad89292c21d17a Mon Sep 17 00:00:00 2001
+From 21d2e1a6041fa95e6fe399a7701032066c09a600 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit b1e1bd379afb89495b7d72a4edad89292c21d17a ]
+
@@ -17 +18,0 @@
-Cc: stable at dpdk.org



More information about the stable mailing list