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 0CEC0A0542 for ; Fri, 7 Feb 2020 16:13:38 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id F3DAE1C11E; Fri, 7 Feb 2020 16:13:37 +0100 (CET) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by dpdk.org (Postfix) with ESMTP id 97F121C11E for ; Fri, 7 Feb 2020 16:13:36 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1581088416; 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=PcDiw/s0cGdunuvIVfwpj603v7FjVJGzwrNBE4tHS/8=; b=RPXFaHKxG7CjWm2gdOxSiPQBB/+F7Ub4JO6HZVyPw4KP1X3p5/hn2j/rOMGElVotIOzdNV 04tgH6ZxEXIrXKS+hDVO5PL13uT+9zcpgokIJu8b/IAa3PMLV88kE44vfO3nqrnVkckD4U 0xqBjj7TVRSopshcW1Ec8XYgoY1xQrM= 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-320-HvNfwqz3NWSQI3dJfmJijg-1; Fri, 07 Feb 2020 10:13:20 -0500 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 0619610054E3; Fri, 7 Feb 2020 15:13:19 +0000 (UTC) Received: from rh.redhat.com (unknown [10.33.36.76]) by smtp.corp.redhat.com (Postfix) with ESMTP id A585110016DA; Fri, 7 Feb 2020 15:13:17 +0000 (UTC) From: Kevin Traynor To: Bruce Richardson Cc: Aaron Conole , Luca Boccassi , dpdk stable Date: Fri, 7 Feb 2020 15:12:18 +0000 Message-Id: <20200207151248.29804-6-ktraynor@redhat.com> In-Reply-To: <20200207151248.29804-1-ktraynor@redhat.com> References: <20200207151248.29804-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-MC-Unique: HvNfwqz3NWSQI3dJfmJijg-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 'doc: fix warning 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/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 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/21d2e1a6041fa95e6f= e399a7701032066c09a600 Thanks. Kevin. --- >From 21d2e1a6041fa95e6fe399a7701032066c09a600 Mon Sep 17 00:00:00 2001 From: Bruce Richardson 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 Acked-by: Aaron Conole Acked-by: Luca Boccassi --- 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() =09doxy_conf =3D configure_file(input: 'doxy-api.conf.in', =09=09output: 'doxy-api.conf', -=09=09configuration: cdata, -=09=09install: false) +=09=09configuration: cdata) =20 =09doxy_build =3D custom_target('doxygen', --=20 2.21.1 --- Diff of the applied patch vs upstream commit (please double-check if non-= empty: --- --- -=092020-02-07 15:08:17.861787053 +0000 +++ 0006-doc-fix-warning-with-meson.patch=092020-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@dpdk.org