From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-14.0 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5302CC07E9C for ; Fri, 9 Jul 2021 19:52:56 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 2FFAF613CA for ; Fri, 9 Jul 2021 19:52:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229535AbhGITzj (ORCPT ); Fri, 9 Jul 2021 15:55:39 -0400 Received: from mga09.intel.com ([134.134.136.24]:54795 "EHLO mga09.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229459AbhGITzj (ORCPT ); Fri, 9 Jul 2021 15:55:39 -0400 X-IronPort-AV: E=McAfee;i="6200,9189,10040"; a="209727592" X-IronPort-AV: E=Sophos;i="5.84,227,1620716400"; d="scan'208";a="209727592" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Jul 2021 12:52:51 -0700 X-IronPort-AV: E=Sophos;i="5.84,227,1620716400"; d="scan'208";a="499477484" Received: from dwillia2-desk3.jf.intel.com (HELO dwillia2-desk3.amr.corp.intel.com) ([10.54.39.25]) by fmsmga002-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Jul 2021 12:52:51 -0700 Subject: [ndctl PATCH 2/6] Documentation: Drop attrs.adoc include From: Dan Williams To: nvdimm@lists.linux.dev Cc: linux-cxl@vger.kernel.org Date: Fri, 09 Jul 2021 12:52:50 -0700 Message-ID: <162586037092.1431180.13230763034223009538.stgit@dwillia2-desk3.amr.corp.intel.com> In-Reply-To: <162586035908.1431180.14991721381432827647.stgit@dwillia2-desk3.amr.corp.intel.com> References: <162586035908.1431180.14991721381432827647.stgit@dwillia2-desk3.amr.corp.intel.com> User-Agent: StGit/0.18-3-g996c MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-cxl@vger.kernel.org In preparation for switching build systems, drop the attrs.adoc include for communicating variables to asciidoc. Simply add the necessary variable values to the invocation of the command using the --attribute argument. Signed-off-by: Dan Williams --- Documentation/ndctl/Makefile.am | 11 +++-------- Documentation/ndctl/intel-nvdimm-security.txt | 2 -- Documentation/ndctl/ndctl-load-keys.txt | 2 -- Documentation/ndctl/ndctl-monitor.txt | 5 +---- Documentation/ndctl/ndctl-sanitize-dimm.txt | 2 -- Documentation/ndctl/ndctl-setup-passphrase.txt | 2 -- Documentation/ndctl/ndctl-update-passphrase.txt | 2 -- 7 files changed, 4 insertions(+), 22 deletions(-) diff --git a/Documentation/ndctl/Makefile.am b/Documentation/ndctl/Makefile.am index f0d5b213057c..aa5763f68666 100644 --- a/Documentation/ndctl/Makefile.am +++ b/Documentation/ndctl/Makefile.am @@ -56,14 +56,6 @@ EXTRA_DIST = $(man1_MANS) CLEANFILES = $(man1_MANS) -.ONESHELL: -attrs.adoc: $(srcdir)/Makefile.am - $(AM_V_GEN) cat <<- EOF >$@ - :ndctl_monitorconfdir: $(ndctl_monitorconfdir) - :ndctl_monitorconf: $(ndctl_monitorconf) - :ndctl_keysdir: $(ndctl_keysdir) - EOF - XML_DEPS = \ ../../version.m4 \ Makefile \ @@ -88,6 +80,9 @@ if USE_ASCIIDOCTOR $(ASCIIDOC) -b manpage -d manpage -acompat-mode \ -I. -rasciidoctor-extensions \ -amansource=ndctl -amanmanual="ndctl Manual" \ + -andctl_monitorconf=$(ndctl_monitorconfdir)/$(ndctl_monitorconf) \ + -andctl_monitorconfdir=$(ndctl_monitorconfdir) \ + -andctl_keysdir=$(ndctl_keysdir) \ -andctl_version=$(VERSION) -o $@+ $< && \ mv $@+ $@ diff --git a/Documentation/ndctl/intel-nvdimm-security.txt b/Documentation/ndctl/intel-nvdimm-security.txt index 142b4603db69..88b305b81978 100644 --- a/Documentation/ndctl/intel-nvdimm-security.txt +++ b/Documentation/ndctl/intel-nvdimm-security.txt @@ -1,7 +1,5 @@ // SPDX-License-Identifier: GPL-2.0 -include::attrs.adoc[] - THEORY OF OPERATION ------------------- The Intel Device Specific Methods (DSM) specification v1.7 and v1.8 [1] diff --git a/Documentation/ndctl/ndctl-load-keys.txt b/Documentation/ndctl/ndctl-load-keys.txt index a064f97fd069..70db57441820 100644 --- a/Documentation/ndctl/ndctl-load-keys.txt +++ b/Documentation/ndctl/ndctl-load-keys.txt @@ -1,7 +1,5 @@ // SPDX-License-Identifier: GPL-2.0 -include::attrs.adoc[] - ndctl-load-keys(1) ================== diff --git a/Documentation/ndctl/ndctl-monitor.txt b/Documentation/ndctl/ndctl-monitor.txt index dbc9070c6331..14e0026c657e 100644 --- a/Documentation/ndctl/ndctl-monitor.txt +++ b/Documentation/ndctl/ndctl-monitor.txt @@ -1,7 +1,5 @@ // SPDX-License-Identifier: GPL-2.0 -include::attrs.adoc[] - ndctl-monitor(1) ================ @@ -21,8 +19,7 @@ objects and dumping the json format notifications to syslog, standard output or a logfile. The objects to monitor and smart events to notify can be selected by -setting options and/or the configuration file at -{ndctl_monitorconfdir}/{ndctl_monitorconf} +setting options and/or the configuration file at {ndctl_monitorconf} Both, the values in configuration file and in options will work. If there is a conflict, the values in options will override the values in diff --git a/Documentation/ndctl/ndctl-sanitize-dimm.txt b/Documentation/ndctl/ndctl-sanitize-dimm.txt index b2e5fde9ecb3..e04467856ca4 100644 --- a/Documentation/ndctl/ndctl-sanitize-dimm.txt +++ b/Documentation/ndctl/ndctl-sanitize-dimm.txt @@ -1,7 +1,5 @@ // SPDX-License-Identifier: GPL-2.0 -include::attrs.adoc[] - ndctl-sanitize-dimm(1) ====================== diff --git a/Documentation/ndctl/ndctl-setup-passphrase.txt b/Documentation/ndctl/ndctl-setup-passphrase.txt index 1219279b4c66..96f709b468fc 100644 --- a/Documentation/ndctl/ndctl-setup-passphrase.txt +++ b/Documentation/ndctl/ndctl-setup-passphrase.txt @@ -1,7 +1,5 @@ // SPDX-License-Identifier: GPL-2.0 -include::attrs.adoc[] - ndctl-setup-passphrase(1) ========================= diff --git a/Documentation/ndctl/ndctl-update-passphrase.txt b/Documentation/ndctl/ndctl-update-passphrase.txt index c7c1bfc8ab0b..591ce44ebc3e 100644 --- a/Documentation/ndctl/ndctl-update-passphrase.txt +++ b/Documentation/ndctl/ndctl-update-passphrase.txt @@ -1,7 +1,5 @@ // SPDX-License-Identifier: GPL-2.0 -include::attrs.adoc[] - ndctl-update-passphrase(1) ==========================