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 4C4D6A0542 for ; Fri, 7 Feb 2020 16:13:40 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 4345E1C11E; Fri, 7 Feb 2020 16:13:40 +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 134881C136 for ; Fri, 7 Feb 2020 16:13:38 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1581088418; 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=GMpKO36PgIaavNsHSXPTna2E7JCF9vbm4fu2vnPoB1s=; b=aAXfJEICRPXxlZvZqASi5nWuXmctutA+ul8FXtjDNXeaCZf+7JqbIRMSczmpCkpDwapNrh xYBfajZf+8FZor4miWGT8J+VzU8Wo6hOoVGF7hyNOCSjWqxNFkad448yIK76mqdNs86cCs pp9Nodcjt2ZIoFtbCGaGe/rs9DNUgVI= 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-384-et5v_B9TPieUvxUaDe1U3A-1; Fri, 07 Feb 2020 10:13:22 -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 A002DDB23; Fri, 7 Feb 2020 15:13:20 +0000 (UTC) Received: from rh.redhat.com (unknown [10.33.36.76]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6125A1001B34; Fri, 7 Feb 2020 15:13:19 +0000 (UTC) From: Kevin Traynor To: Bruce Richardson Cc: Aaron Conole , Luca Boccassi , dpdk stable Date: Fri, 7 Feb 2020 15:12:19 +0000 Message-Id: <20200207151248.29804-7-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: et5v_B9TPieUvxUaDe1U3A-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: reduce whitespace in meson build file' 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/42c459bc25ab65d7cf= 6f7d775ac20df84a33c5bc Thanks. Kevin. --- >From 42c459bc25ab65d7cf6f7d775ac20df84a33c5bc Mon Sep 17 00:00:00 2001 From: Bruce Richardson Date: Fri, 10 Jan 2020 21:52:03 +0000 Subject: [PATCH] doc: reduce whitespace in meson build file [ upstream commit affc17c821e37e53d786a1d0b7c179f533684ac1 ] For building the guides, we can make the meson.build easier to read by using the subdir_done function to quit early. Signed-off-by: Bruce Richardson Acked-by: Aaron Conole Acked-by: Luca Boccassi --- doc/guides/meson.build | 46 ++++++++++++++++++++++-------------------- 1 file changed, 24 insertions(+), 22 deletions(-) diff --git a/doc/guides/meson.build b/doc/guides/meson.build index 7931ef3bb5..80c21d1682 100644 --- a/doc/guides/meson.build +++ b/doc/guides/meson.build @@ -4,25 +4,27 @@ sphinx =3D find_program('sphinx-build', required: get_option('enable_docs'= )) =20 -if sphinx.found() -=09htmldir =3D join_paths('share', 'doc', 'dpdk') -=09html_guides_build =3D custom_target('html_guides_build', -=09=09input: meson.current_source_dir(), -=09=09output: 'guides', -=09=09command: [sphinx, '-b', 'html', -=09=09=09'-d', meson.current_build_dir() + '/.doctrees', -=09=09=09'@INPUT@', meson.current_build_dir() + '/guides'], -=09=09build_by_default: get_option('enable_docs'), -=09=09install: get_option('enable_docs'), -=09=09install_dir: htmldir) - -=09doc_targets +=3D html_guides_build -=09doc_target_names +=3D 'HTML_Guides' - -=09# sphinx leaves a .buildinfo in the target directory, which we don't -=09# want to install. Note that sh -c has to be used, otherwise the -=09# env var does not get expanded if calling rm/install directly. -=09meson.add_install_script('sh', '-c', -=09=09'rm -f $MESON_INSTALL_DESTDIR_PREFIX/share/doc/dpdk/guides/.buildinf= o') -=09meson.add_install_script('sh', '-c', -=09=09'install -D -m0644 $MESON_SOURCE_ROOT/doc/guides/custom.css $MESON_I= NSTALL_DESTDIR_PREFIX/share/doc/dpdk/guides/_static/css/custom.css') +if not sphinx.found() +=09subdir_done() endif + +htmldir =3D join_paths('share', 'doc', 'dpdk') +html_guides =3D custom_target('html_guides', +=09input: meson.current_source_dir(), +=09output: 'guides', +=09command: [sphinx, '-b', 'html', +=09=09'-d', meson.current_build_dir() + '/.doctrees', +=09=09'@INPUT@', meson.current_build_dir() + '/guides'], +=09build_by_default: get_option('enable_docs'), +=09install: get_option('enable_docs'), +=09install_dir: htmldir) + +doc_targets +=3D html_guides +doc_target_names +=3D 'HTML_Guides' + +# sphinx leaves a .buildinfo in the target directory, which we don't +# want to install. Note that sh -c has to be used, otherwise the +# env var does not get expanded if calling rm/install directly. +meson.add_install_script('sh', '-c', +=09'rm -f $MESON_INSTALL_DESTDIR_PREFIX/share/doc/dpdk/guides/.buildinfo') +meson.add_install_script('sh', '-c', +=09'install -D -m0644 $MESON_SOURCE_ROOT/doc/guides/custom.css $MESON_INST= ALL_DESTDIR_PREFIX/share/doc/dpdk/guides/_static/css/custom.css') --=20 2.21.1 --- Diff of the applied patch vs upstream commit (please double-check if non-= empty: --- --- -=092020-02-07 15:08:17.908106220 +0000 +++ 0007-doc-reduce-whitespace-in-meson-build-file.patch=092020-02-07 15:08= :17.492063242 +0000 @@ -1 +1 @@ -From affc17c821e37e53d786a1d0b7c179f533684ac1 Mon Sep 17 00:00:00 2001 +From 42c459bc25ab65d7cf6f7d775ac20df84a33c5bc Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit affc17c821e37e53d786a1d0b7c179f533684ac1 ] + @@ -8,2 +9,0 @@ - -Cc: stable@dpdk.org