From patchwork Thu Sep 2 20:43:10 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Williams X-Patchwork-Id: 12472451 Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id BC8E729CA for ; Thu, 2 Sep 2021 20:43:11 +0000 (UTC) X-IronPort-AV: E=McAfee;i="6200,9189,10095"; a="304807341" X-IronPort-AV: E=Sophos;i="5.85,263,1624345200"; d="scan'208";a="304807341" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 02 Sep 2021 13:43:11 -0700 X-IronPort-AV: E=Sophos;i="5.85,263,1624345200"; d="scan'208";a="602548264" Received: from dwillia2-desk3.jf.intel.com (HELO dwillia2-desk3.amr.corp.intel.com) ([10.54.39.25]) by fmsmga001-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 02 Sep 2021 13:43:10 -0700 Subject: [ndctl PATCH v2 2/6] Documentation: Drop attrs.adoc include From: Dan Williams To: nvdimm@lists.linux.dev Cc: vishal.l.verma@intel.com, linux-cxl@vger.kernel.org Date: Thu, 02 Sep 2021 13:43:10 -0700 Message-ID: <163061539059.1943957.3717594871893118896.stgit@dwillia2-desk3.amr.corp.intel.com> In-Reply-To: <163061537869.1943957.8491829881215255815.stgit@dwillia2-desk3.amr.corp.intel.com> References: <163061537869.1943957.8491829881215255815.stgit@dwillia2-desk3.amr.corp.intel.com> User-Agent: StGit/0.18-3-g996c Precedence: bulk X-Mailing-List: nvdimm@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 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 | 14 ++++---------- 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, 5 insertions(+), 24 deletions(-) diff --git a/Documentation/ndctl/Makefile.am b/Documentation/ndctl/Makefile.am index f0d5b213057c..9ec5458c2268 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 \ @@ -76,8 +68,7 @@ XML_DEPS = \ xable-namespace-options.txt \ ars-description.txt \ labels-description.txt \ - labels-options.txt \ - attrs.adoc + labels-options.txt RM ?= rm -f @@ -88,6 +79,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) ==========================