Blame SOURCES/0084-ndctl-Jettison-autotools.patch

26ccd9
From 44f2f06c688fec84db41b26b47c2de45040906eb Mon Sep 17 00:00:00 2001
26ccd9
From: Dan Williams <dan.j.williams@intel.com>
26ccd9
Date: Wed, 5 Jan 2022 13:33:03 -0800
26ccd9
Subject: [PATCH 084/217] ndctl: Jettison autotools
26ccd9
26ccd9
Similar to several other projects, ndctl has run its course with autotools
26ccd9
and sees a better path forward with Meson. Now that the Meson conversion is
26ccd9
complete, remove the autotools infrastructure.
26ccd9
26ccd9
Link: https://lore.kernel.org/r/164141838349.3990253.14745993061779737304.stgit@dwillia2-desk3.amr.corp.intel.com
26ccd9
Tested-by: Alison Schofield <alison.schofield@intel.com>
26ccd9
Tested-by: Vaibhav Jain <vaibhav@linux.ibm.com>
26ccd9
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
26ccd9
Signed-off-by: Vishal Verma <vishal.l.verma@intel.com>
26ccd9
---
26ccd9
 .gitignore                        |  58 -------
26ccd9
 Documentation/cxl/Makefile.am     |  61 -------
26ccd9
 Documentation/cxl/lib/Makefile.am |  58 -------
26ccd9
 Documentation/daxctl/Makefile.am  |  72 --------
26ccd9
 Documentation/ndctl/Makefile.am   | 103 ------------
26ccd9
 Makefile.am                       | 104 ------------
26ccd9
 Makefile.am.in                    |  46 -----
26ccd9
 autogen.sh                        |  28 ----
26ccd9
 configure.ac                      | 270 ------------------------------
26ccd9
 cxl/Makefile.am                   |  25 ---
26ccd9
 cxl/lib/Makefile.am               |  32 ----
26ccd9
 daxctl/Makefile.am                |  45 -----
26ccd9
 daxctl/lib/Makefile.am            |  42 -----
26ccd9
 ndctl.spec.in                     |  28 +---
26ccd9
 ndctl/Makefile.am                 |  86 ----------
26ccd9
 ndctl/lib/Makefile.am             |  58 -------
26ccd9
 rhel/meson.build                  |   3 +-
26ccd9
 sles/meson.build                  |   3 +-
26ccd9
 test/Makefile.am                  | 169 -------------------
26ccd9
 19 files changed, 4 insertions(+), 1287 deletions(-)
26ccd9
 delete mode 100644 Documentation/cxl/Makefile.am
26ccd9
 delete mode 100644 Documentation/cxl/lib/Makefile.am
26ccd9
 delete mode 100644 Documentation/daxctl/Makefile.am
26ccd9
 delete mode 100644 Documentation/ndctl/Makefile.am
26ccd9
 delete mode 100644 Makefile.am
26ccd9
 delete mode 100644 Makefile.am.in
26ccd9
 delete mode 100755 autogen.sh
26ccd9
 delete mode 100644 configure.ac
26ccd9
 delete mode 100644 cxl/Makefile.am
26ccd9
 delete mode 100644 cxl/lib/Makefile.am
26ccd9
 delete mode 100644 daxctl/Makefile.am
26ccd9
 delete mode 100644 daxctl/lib/Makefile.am
26ccd9
 delete mode 100644 ndctl/Makefile.am
26ccd9
 delete mode 100644 ndctl/lib/Makefile.am
26ccd9
 delete mode 100644 test/Makefile.am
26ccd9
26ccd9
diff -up ndctl-71.1/.gitignore.orig ndctl-71.1/.gitignore
26ccd9
--- ndctl-71.1/.gitignore.orig	2022-10-07 18:39:13.182886649 -0400
26ccd9
+++ ndctl-71.1/.gitignore	2022-10-07 18:39:43.934991351 -0400
26ccd9
@@ -1,63 +1,5 @@
26ccd9
-*.o
26ccd9
-*.lo
26ccd9
-*.xml
26ccd9
-.deps/
26ccd9
-.libs/
26ccd9
-Makefile
26ccd9
-!contrib/Makefile
26ccd9
-Makefile.in
26ccd9
-/aclocal.m4
26ccd9
-/autom4te.cache
26ccd9
-/build-aux
26ccd9
-/config.h
26ccd9
-/config.log
26ccd9
-/config.status
26ccd9
-/configure
26ccd9
-/libtool
26ccd9
-/stamp-h1
26ccd9
-*.1
26ccd9
-*.3
26ccd9
-Documentation/daxctl/asciidoc.conf
26ccd9
-Documentation/ndctl/asciidoc.conf
26ccd9
-Documentation/cxl/asciidoc.conf
26ccd9
-Documentation/cxl/lib/asciidoc.conf
26ccd9
-Documentation/daxctl/asciidoctor-extensions.rb
26ccd9
-Documentation/ndctl/asciidoctor-extensions.rb
26ccd9
-Documentation/cxl/asciidoctor-extensions.rb
26ccd9
-Documentation/cxl/lib/asciidoctor-extensions.rb
26ccd9
-.dirstamp
26ccd9
 build/
26ccd9
-daxctl/config.h
26ccd9
-daxctl/daxctl
26ccd9
-daxctl/lib/libdaxctl.la
26ccd9
-daxctl/lib/libdaxctl.pc
26ccd9
-*.a
26ccd9
-ndctl/config.h
26ccd9
-ndctl/lib/libndctl.pc
26ccd9
-ndctl/ndctl
26ccd9
 rhel/ndctl.spec
26ccd9
 sles/ndctl.spec
26ccd9
-version.m4
26ccd9
 *.swp
26ccd9
-cscope.files
26ccd9
-cscope*.out
26ccd9
 tags
26ccd9
-test/*.log
26ccd9
-test/*.trs
26ccd9
-test/dax-dev
26ccd9
-test/dax-errors
26ccd9
-test/dax-pmd
26ccd9
-test/daxdev-errors
26ccd9
-test/device-dax
26ccd9
-test/dsm-fail
26ccd9
-test/hugetlb
26ccd9
-test/image
26ccd9
-test/libndctl
26ccd9
-test/mmap
26ccd9
-test/pmem-ns
26ccd9
-test/smart-listen
26ccd9
-test/smart-notify
26ccd9
-test/fio.job
26ccd9
-test/local-write-0-verify.state
26ccd9
-test/ack-shutdown-count-set
26ccd9
-test/list-smart-dimm
26ccd9
diff -up ndctl-71.1/Documentation/cxl/Makefile.am.orig /dev/null
26ccd9
--- ndctl-71.1/Documentation/cxl/Makefile.am	2022-10-07 18:39:13.067886258 -0400
26ccd9
+++ /dev/null	2022-07-27 11:30:34.495212588 -0400
26ccd9
@@ -1,61 +0,0 @@
26ccd9
-# SPDX-License-Identifier: GPL-2.0
26ccd9
-# Copyright (C) 2020-2021 Intel Corporation. All rights reserved.
26ccd9
-
26ccd9
-if USE_ASCIIDOCTOR
26ccd9
-
26ccd9
-do_subst = sed -e 's,@Utility@,Cxl,g' -e's,@utility@,cxl,g'
26ccd9
-CONFFILE = asciidoctor-extensions.rb
26ccd9
-asciidoctor-extensions.rb: ../asciidoctor-extensions.rb.in
26ccd9
-	$(AM_V_GEN) $(do_subst) < $< > $@
26ccd9
-
26ccd9
-else
26ccd9
-
26ccd9
-do_subst = sed -e 's,UTILITY,cxl,g'
26ccd9
-CONFFILE = asciidoc.conf
26ccd9
-asciidoc.conf: ../asciidoc.conf.in
26ccd9
-	$(AM_V_GEN) $(do_subst) < $< > $@
26ccd9
-
26ccd9
-endif
26ccd9
-
26ccd9
-man1_MANS = \
26ccd9
-	cxl.1 \
26ccd9
-	cxl-list.1 \
26ccd9
-	cxl-read-labels.1 \
26ccd9
-	cxl-write-labels.1 \
26ccd9
-	cxl-zero-labels.1
26ccd9
-
26ccd9
-EXTRA_DIST = $(man1_MANS)
26ccd9
-
26ccd9
-CLEANFILES = $(man1_MANS)
26ccd9
-
26ccd9
-XML_DEPS = \
26ccd9
-	../../version.m4 \
26ccd9
-	../copyright.txt \
26ccd9
-	Makefile \
26ccd9
-	$(CONFFILE)
26ccd9
-
26ccd9
-RM ?= rm -f
26ccd9
-
26ccd9
-if USE_ASCIIDOCTOR
26ccd9
-
26ccd9
-%.1: %.txt $(XML_DEPS)
26ccd9
-	$(AM_V_GEN)$(RM) $@+ $@ && \
26ccd9
-		$(ASCIIDOC) -b manpage -d manpage -acompat-mode \
26ccd9
-		-I. -rasciidoctor-extensions \
26ccd9
-		-amansource=cxl -amanmanual="cxl Manual" \
26ccd9
-		-andctl_version=$(VERSION) -o $@+ $< && \
26ccd9
-		mv $@+ $@
26ccd9
-
26ccd9
-else
26ccd9
-
26ccd9
-%.xml: %.txt $(XML_DEPS)
26ccd9
-	$(AM_V_GEN)$(RM) $@+ $@ && \
26ccd9
-		$(ASCIIDOC) -b docbook -d manpage -f asciidoc.conf \
26ccd9
-		--unsafe -acxl_version=$(VERSION) -o $@+ $< && \
26ccd9
-		mv $@+ $@
26ccd9
-
26ccd9
-%.1: %.xml $(XML_DEPS)
26ccd9
-	$(AM_V_GEN)$(RM) $@ && \
26ccd9
-		$(XMLTO) -o . -m ../manpage-normal.xsl man $<
26ccd9
-
26ccd9
-endif
26ccd9
diff -up ndctl-71.1/Documentation/cxl/lib/Makefile.am /dev/null
26ccd9
--- ndctl-71.1/Documentation/cxl/lib/Makefile.am	2022-10-07 18:39:13.071886271 -0400
26ccd9
+++ /dev/null	2022-07-27 11:30:34.495212588 -0400
26ccd9
@@ -1,58 +0,0 @@
26ccd9
-# SPDX-License-Identifier: GPL-2.0
26ccd9
-# Copyright (C) 2020-2021 Intel Corporation. All rights reserved.
26ccd9
-
26ccd9
-if USE_ASCIIDOCTOR
26ccd9
-
26ccd9
-do_subst = sed -e 's,@Utility@,Libcxl,g' -e's,@utility@,libcxl,g'
26ccd9
-CONFFILE = asciidoctor-extensions.rb
26ccd9
-asciidoctor-extensions.rb: ../../asciidoctor-extensions.rb.in
26ccd9
-	$(AM_V_GEN) $(do_subst) < $< > $@
26ccd9
-
26ccd9
-else
26ccd9
-
26ccd9
-do_subst = sed -e 's,UTILITY,libcxl,g'
26ccd9
-CONFFILE = asciidoc.conf
26ccd9
-asciidoc.conf: ../../asciidoc.conf.in
26ccd9
-	$(AM_V_GEN) $(do_subst) < $< > $@
26ccd9
-
26ccd9
-endif
26ccd9
-
26ccd9
-man3_MANS = \
26ccd9
-	libcxl.3 \
26ccd9
-	cxl_new.3
26ccd9
-
26ccd9
-EXTRA_DIST = $(man3_MANS)
26ccd9
-
26ccd9
-CLEANFILES = $(man3_MANS)
26ccd9
-
26ccd9
-XML_DEPS = \
26ccd9
-	../../../version.m4 \
26ccd9
-	../../copyright.txt \
26ccd9
-	Makefile \
26ccd9
-	$(CONFFILE)
26ccd9
-
26ccd9
-RM ?= rm -f
26ccd9
-
26ccd9
-if USE_ASCIIDOCTOR
26ccd9
-
26ccd9
-%.3: %.txt $(XML_DEPS)
26ccd9
-	$(AM_V_GEN)$(RM) $@+ $@ && \
26ccd9
-		$(ASCIIDOC) -b manpage -d manpage -acompat-mode \
26ccd9
-		-I. -rasciidoctor-extensions \
26ccd9
-		-amansource=libcxl -amanmanual="libcxl Manual" \
26ccd9
-		-andctl_version=$(VERSION) -o $@+ $< && \
26ccd9
-		mv $@+ $@
26ccd9
-
26ccd9
-else
26ccd9
-
26ccd9
-%.xml: %.txt $(XML_DEPS)
26ccd9
-	$(AM_V_GEN)$(RM) $@+ $@ && \
26ccd9
-		$(ASCIIDOC) -b docbook -d manpage -f asciidoc.conf \
26ccd9
-		--unsafe -alibcxl_version=$(VERSION) -o $@+ $< && \
26ccd9
-		mv $@+ $@
26ccd9
-
26ccd9
-%.3: %.xml $(XML_DEPS)
26ccd9
-	$(AM_V_GEN)$(RM) $@ && \
26ccd9
-		$(XMLTO) -o . -m ../../manpage-normal.xsl man $<
26ccd9
-
26ccd9
-endif
26ccd9
diff -up ndctl-71.1/Documentation/daxctl/Makefile.am /dev/null
26ccd9
--- ndctl-71.1/Documentation/daxctl/Makefile.am	2022-10-07 18:42:19.341520462 -0400
26ccd9
+++ /dev/null	2022-07-27 11:30:34.495212588 -0400
26ccd9
@@ -1,66 +0,0 @@
26ccd9
-# SPDX-License-Identifier: GPL-2.0
26ccd9
-# Copyright (C) 2015-2020 Intel Corporation. All rights reserved.
26ccd9
-
26ccd9
-if USE_ASCIIDOCTOR
26ccd9
-
26ccd9
-do_subst = sed -e 's,@Utility@,Daxctl,g' -e's,@utility@,daxctl,g'
26ccd9
-CONFFILE = asciidoctor-extensions.rb
26ccd9
-asciidoctor-extensions.rb: ../asciidoctor-extensions.rb.in
26ccd9
-	$(AM_V_GEN) $(do_subst) < $< > $@
26ccd9
-
26ccd9
-else
26ccd9
-
26ccd9
-do_subst = sed -e 's,UTILITY,daxctl,g'
26ccd9
-CONFFILE = asciidoc.conf
26ccd9
-asciidoc.conf: ../asciidoc.conf.in
26ccd9
-	$(AM_V_GEN) $(do_subst) < $< > $@
26ccd9
-
26ccd9
-endif
26ccd9
-
26ccd9
-man1_MANS = \
26ccd9
-	daxctl.1 \
26ccd9
-	daxctl-list.1 \
26ccd9
-	daxctl-migrate-device-model.1 \
26ccd9
-	daxctl-reconfigure-device.1 \
26ccd9
-	daxctl-online-memory.1 \
26ccd9
-	daxctl-offline-memory.1 \
26ccd9
-	daxctl-disable-device.1 \
26ccd9
-	daxctl-enable-device.1 \
26ccd9
-	daxctl-create-device.1 \
26ccd9
-	daxctl-destroy-device.1
26ccd9
-
26ccd9
-EXTRA_DIST = $(man1_MANS)
26ccd9
-
26ccd9
-CLEANFILES = $(man1_MANS)
26ccd9
-
26ccd9
-XML_DEPS = \
26ccd9
-	../../version.m4 \
26ccd9
-	../copyright.txt \
26ccd9
-	Makefile \
26ccd9
-	$(CONFFILE)
26ccd9
-
26ccd9
-RM ?= rm -f
26ccd9
-
26ccd9
-if USE_ASCIIDOCTOR
26ccd9
-
26ccd9
-%.1: %.txt $(XML_DEPS)
26ccd9
-	$(AM_V_GEN)$(RM) $@+ $@ && \
26ccd9
-		$(ASCIIDOC) -b manpage -d manpage -acompat-mode \
26ccd9
-		-I. -rasciidoctor-extensions \
26ccd9
-		-amansource=daxctl -amanmanual="daxctl Manual" \
26ccd9
-		-andctl_version=$(VERSION) -o $@+ $< && \
26ccd9
-		mv $@+ $@
26ccd9
-
26ccd9
-else
26ccd9
-
26ccd9
-%.xml: %.txt $(XML_DEPS)
26ccd9
-	$(AM_V_GEN)$(RM) $@+ $@ && \
26ccd9
-		$(ASCIIDOC) -b docbook -d manpage -f asciidoc.conf \
26ccd9
-		--unsafe -adaxctl_version=$(VERSION) -o $@+ $< && \
26ccd9
-		mv $@+ $@
26ccd9
-
26ccd9
-%.1: %.xml $(XML_DEPS)
26ccd9
-	$(AM_V_GEN)$(RM) $@ && \
26ccd9
-		$(XMLTO) -o . -m ../manpage-normal.xsl man $<
26ccd9
-
26ccd9
-endif
26ccd9
diff -up ndctl-71.1/Documentation/ndctl/Makefile.am /dev/null
26ccd9
--- ndctl-71.1/Documentation/ndctl/Makefile.am	2020-12-22 16:44:57.000000000 -0500
26ccd9
+++ /dev/null	2022-07-27 11:30:34.495212588 -0400
26ccd9
@@ -1,106 +0,0 @@
26ccd9
-# SPDX-License-Identifier: GPL-2.0
26ccd9
-# Copyright (C) 2015-2020 Intel Corporation. All rights reserved.
26ccd9
-
26ccd9
-if USE_ASCIIDOCTOR
26ccd9
-
26ccd9
-do_subst = sed -e 's,@Utility@,Ndctl,g' -e's,@utility@,ndctl,g'
26ccd9
-CONFFILE = asciidoctor-extensions.rb
26ccd9
-asciidoctor-extensions.rb: ../asciidoctor-extensions.rb.in
26ccd9
-	$(AM_V_GEN) $(do_subst) < $< > $@
26ccd9
-
26ccd9
-else
26ccd9
-
26ccd9
-do_subst = sed -e 's,UTILITY,ndctl,g'
26ccd9
-CONFFILE = asciidoc.conf
26ccd9
-asciidoc.conf: ../asciidoc.conf.in
26ccd9
-	$(AM_V_GEN) $(do_subst) < $< > $@
26ccd9
-
26ccd9
-endif
26ccd9
-
26ccd9
-man1_MANS = \
26ccd9
-	ndctl.1 \
26ccd9
-	ndctl-wait-scrub.1 \
26ccd9
-	ndctl-start-scrub.1 \
26ccd9
-	ndctl-zero-labels.1 \
26ccd9
-	ndctl-read-labels.1 \
26ccd9
-	ndctl-write-labels.1 \
26ccd9
-	ndctl-init-labels.1 \
26ccd9
-	ndctl-check-labels.1 \
26ccd9
-	ndctl-enable-region.1 \
26ccd9
-	ndctl-disable-region.1 \
26ccd9
-	ndctl-enable-dimm.1 \
26ccd9
-	ndctl-disable-dimm.1 \
26ccd9
-	ndctl-enable-namespace.1 \
26ccd9
-	ndctl-disable-namespace.1 \
26ccd9
-	ndctl-create-namespace.1 \
26ccd9
-	ndctl-destroy-namespace.1 \
26ccd9
-	ndctl-check-namespace.1 \
26ccd9
-	ndctl-clear-errors.1 \
26ccd9
-	ndctl-inject-error.1 \
26ccd9
-	ndctl-inject-smart.1 \
26ccd9
-	ndctl-update-firmware.1 \
26ccd9
-	ndctl-list.1 \
26ccd9
-	ndctl-monitor.1 \
26ccd9
-	ndctl-setup-passphrase.1 \
26ccd9
-	ndctl-update-passphrase.1 \
26ccd9
-	ndctl-remove-passphrase.1 \
26ccd9
-	ndctl-freeze-security.1 \
26ccd9
-	ndctl-sanitize-dimm.1 \
26ccd9
-	ndctl-load-keys.1 \
26ccd9
-	ndctl-wait-overwrite.1 \
26ccd9
-	ndctl-read-infoblock.1 \
26ccd9
-	ndctl-write-infoblock.1 \
26ccd9
-	ndctl-activate-firmware.1
26ccd9
-
26ccd9
-EXTRA_DIST = $(man1_MANS)
26ccd9
-
26ccd9
-CLEANFILES = $(man1_MANS)
26ccd9
-
26ccd9
-.ONESHELL:
26ccd9
-attrs.adoc: $(srcdir)/Makefile.am
26ccd9
-	$(AM_V_GEN) cat <<- EOF >$@
26ccd9
-		:ndctl_monitorconfdir: $(ndctl_monitorconfdir)
26ccd9
-		:ndctl_monitorconf: $(ndctl_monitorconf)
26ccd9
-		:ndctl_keysdir: $(ndctl_keysdir)
26ccd9
-		EOF
26ccd9
-
26ccd9
-XML_DEPS = \
26ccd9
-	../../version.m4 \
26ccd9
-	Makefile \
26ccd9
-	$(CONFFILE) \
26ccd9
-	../copyright.txt \
26ccd9
-	region-description.txt \
26ccd9
-	xable-region-options.txt \
26ccd9
-	dimm-description.txt \
26ccd9
-	xable-dimm-options.txt \
26ccd9
-	xable-namespace-options.txt \
26ccd9
-	ars-description.txt \
26ccd9
-	labels-description.txt \
26ccd9
-	labels-options.txt \
26ccd9
-	attrs.adoc
26ccd9
-
26ccd9
-RM ?= rm -f
26ccd9
-
26ccd9
-if USE_ASCIIDOCTOR
26ccd9
-
26ccd9
-%.1: %.txt $(XML_DEPS)
26ccd9
-	$(AM_V_GEN)$(RM) $@+ $@ && \
26ccd9
-		$(ASCIIDOC) -b manpage -d manpage -acompat-mode \
26ccd9
-		-I. -rasciidoctor-extensions \
26ccd9
-		-amansource=ndctl -amanmanual="ndctl Manual" \
26ccd9
-		-andctl_version=$(VERSION) -o $@+ $< && \
26ccd9
-		mv $@+ $@
26ccd9
-
26ccd9
-else
26ccd9
-
26ccd9
-%.xml: %.txt $(XML_DEPS)
26ccd9
-	$(AM_V_GEN)$(RM) $@+ $@ && \
26ccd9
-		$(ASCIIDOC) -b docbook -d manpage -f asciidoc.conf \
26ccd9
-		--unsafe -andctl_version=$(VERSION) -o $@+ $< && \
26ccd9
-		mv $@+ $@
26ccd9
-
26ccd9
-%.1: %.xml $(XML_DEPS)
26ccd9
-	$(AM_V_GEN)$(RM) $@ && \
26ccd9
-		$(XMLTO) -o . -m ../manpage-normal.xsl man $<
26ccd9
-
26ccd9
-endif
26ccd9
diff -up ndctl-71.1/Makefile.am.in /dev/null
26ccd9
--- ndctl-71.1/Makefile.am.in	2022-10-07 18:39:13.130886472 -0400
26ccd9
+++ /dev/null	2022-07-27 11:30:34.495212588 -0400
26ccd9
@@ -1,46 +0,0 @@
26ccd9
-EXTRA_DIST =
26ccd9
-CLEANFILES =
26ccd9
-
26ccd9
-AM_MAKEFLAGS = --no-print-directory
26ccd9
-
26ccd9
-AM_CPPFLAGS = \
26ccd9
-	-include $(top_builddir)/config.h \
26ccd9
-	-DSYSCONFDIR=\""$(sysconfdir)"\" \
26ccd9
-	-DLIBEXECDIR=\""$(libexecdir)"\" \
26ccd9
-	-DPREFIX=\""$(prefix)"\" \
26ccd9
-	-DNDCTL_MAN_PATH=\""$(mandir)"\" \
26ccd9
-	-I${top_srcdir}/ \
26ccd9
-	$(KMOD_CFLAGS) \
26ccd9
-	$(UDEV_CFLAGS) \
26ccd9
-	$(UUID_CFLAGS) \
26ccd9
-	$(JSON_CFLAGS)
26ccd9
-
26ccd9
-AM_CFLAGS = ${my_CFLAGS} \
26ccd9
-	-fvisibility=hidden \
26ccd9
-	-ffunction-sections \
26ccd9
-	-fdata-sections
26ccd9
-
26ccd9
-AM_LDFLAGS = \
26ccd9
-	-Wl,--gc-sections \
26ccd9
-	-Wl,--as-needed
26ccd9
-
26ccd9
-SED_PROCESS = \
26ccd9
-	$(AM_V_GEN)$(MKDIR_P) $(dir $@) && $(SED) \
26ccd9
-	-e 's,@VERSION\@,$(VERSION),g' \
26ccd9
-	-e 's,@prefix\@,$(prefix),g' \
26ccd9
-	-e 's,@exec_prefix\@,$(exec_prefix),g' \
26ccd9
-	-e 's,@libdir\@,$(libdir),g' \
26ccd9
-	-e 's,@includedir\@,$(includedir),g' \
26ccd9
-	< $< > $@ || rm $@
26ccd9
-
26ccd9
-LIBNDCTL_CURRENT=26
26ccd9
-LIBNDCTL_REVISION=1
26ccd9
-LIBNDCTL_AGE=20
26ccd9
-
26ccd9
-LIBDAXCTL_CURRENT=7
26ccd9
-LIBDAXCTL_REVISION=0
26ccd9
-LIBDAXCTL_AGE=6
26ccd9
-
26ccd9
-LIBCXL_CURRENT=1
26ccd9
-LIBCXL_REVISION=0
26ccd9
-LIBCXL_AGE=0
26ccd9
diff -up ndctl-71.1/Makefile.am /dev/null
26ccd9
--- ndctl-71.1/Makefile.am	2022-10-07 18:39:13.182886649 -0400
26ccd9
+++ /dev/null	2022-07-27 11:30:34.495212588 -0400
26ccd9
@@ -1,102 +0,0 @@
26ccd9
-include Makefile.am.in
26ccd9
-
26ccd9
-ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
26ccd9
-SUBDIRS = . cxl/lib daxctl/lib ndctl/lib cxl ndctl daxctl
26ccd9
-if ENABLE_DOCS
26ccd9
-SUBDIRS += Documentation/ndctl Documentation/daxctl Documentation/cxl
26ccd9
-SUBDIRS += Documentation/cxl/lib
26ccd9
-endif
26ccd9
-SUBDIRS += test
26ccd9
-
26ccd9
-BUILT_SOURCES = version.m4
26ccd9
-version.m4: FORCE
26ccd9
-	$(AM_V_GEN)$(top_srcdir)/git-version-gen
26ccd9
-
26ccd9
-FORCE:
26ccd9
-
26ccd9
-EXTRA_DIST += ndctl.spec.in \
26ccd9
-		sles/header \
26ccd9
-		contrib/nvdimm-security.conf
26ccd9
-
26ccd9
-noinst_SCRIPTS = rhel/ndctl.spec sles/ndctl.spec
26ccd9
-CLEANFILES += $(noinst_SCRIPTS)
26ccd9
-
26ccd9
-do_rhel_subst = sed -e 's,VERSION,$(VERSION),g' \
26ccd9
-            -e 's,MESON,0,g' \
26ccd9
-            -e 's,DAX_DNAME,daxctl-devel,g' \
26ccd9
-            -e 's,CXL_DNAME,cxl-devel,g' \
26ccd9
-            -e 's,DNAME,ndctl-devel,g' \
26ccd9
-            -e '/^%defattr.*/d' \
26ccd9
-	    -e 's,DAX_LNAME,daxctl-libs,g' \
26ccd9
-	    -e 's,CXL_LNAME,cxl-libs,g' \
26ccd9
-	    -e 's,LNAME,ndctl-libs,g'
26ccd9
-
26ccd9
-do_sles_subst = sed -e 's,VERSION,$(VERSION),g' \
26ccd9
-            -e 's,MESON,0,g' \
26ccd9
-            -e 's,DAX_DNAME,libdaxctl-devel,g' \
26ccd9
-            -e 's,CXL_DNAME,libcxl-devel,g' \
26ccd9
-            -e 's,DNAME,libndctl-devel,g' \
26ccd9
-            -e 's,%license,%doc,g' \
26ccd9
-            -e 's,\(^License:.*GPL\)v2,\1-2.0,g' \
26ccd9
-            -e "s,DAX_LNAME,libdaxctl$$(($(LIBDAXCTL_CURRENT) - $(LIBDAXCTL_AGE))),g" \
26ccd9
-            -e "s,CXL_LNAME,libcxl$$(($(LIBCXL_CURRENT) - $(LIBCXL_AGE))),g" \
26ccd9
-            -e "s,LNAME,libndctl$$(($(LIBNDCTL_CURRENT) - $(LIBNDCTL_AGE))),g"
26ccd9
-
26ccd9
-rhel/ndctl.spec: ndctl.spec.in Makefile.am version.m4
26ccd9
-	$(AM_V_GEN)$(MKDIR_P) rhel; $(do_rhel_subst) < $< > $@
26ccd9
-
26ccd9
-sles/ndctl.spec: sles/header ndctl.spec.in Makefile.am version.m4
26ccd9
-	$(AM_V_GEN)$(MKDIR_P) sles; cat sles/header $< | $(do_sles_subst) > $@
26ccd9
-
26ccd9
-if ENABLE_BASH_COMPLETION
26ccd9
-bashcompletiondir = $(BASH_COMPLETION_DIR)
26ccd9
-dist_bashcompletion_DATA = contrib/ndctl
26ccd9
-install-data-hook:
26ccd9
-	$(LN_S) -f $(BASH_COMPLETION_DIR)/ndctl $(DESTDIR)/$(BASH_COMPLETION_DIR)/daxctl
26ccd9
-	$(LN_S) -f $(BASH_COMPLETION_DIR)/ndctl $(DESTDIR)/$(BASH_COMPLETION_DIR)/cxl
26ccd9
-endif
26ccd9
-
26ccd9
-modprobe_file = contrib/nvdimm-security.conf
26ccd9
-modprobedir = $(sysconfdir)/modprobe.d/
26ccd9
-modprobe_DATA = $(modprobe_file)
26ccd9
-
26ccd9
-noinst_LIBRARIES = libccan.a
26ccd9
-libccan_a_SOURCES = \
26ccd9
-	ccan/str/str.h \
26ccd9
-	ccan/str/str_debug.h \
26ccd9
-	ccan/str/str.c \
26ccd9
-	ccan/str/debug.c \
26ccd9
-	ccan/list/list.h \
26ccd9
-	ccan/list/list.c \
26ccd9
-	ccan/container_of/container_of.h \
26ccd9
-	ccan/check_type/check_type.h \
26ccd9
-	ccan/build_assert/build_assert.h \
26ccd9
-	ccan/array_size/array_size.h \
26ccd9
-	ccan/minmax/minmax.h \
26ccd9
-	ccan/short_types/short_types.h \
26ccd9
-	ccan/endian/endian.h
26ccd9
-
26ccd9
-noinst_LIBRARIES += libutil.a
26ccd9
-libutil_a_SOURCES = \
26ccd9
-	util/parse-options.c \
26ccd9
-	util/parse-options.h \
26ccd9
-	util/usage.c \
26ccd9
-	util/size.c \
26ccd9
-	util/main.c \
26ccd9
-	util/help.c \
26ccd9
-	util/strbuf.c \
26ccd9
-	util/wrapper.c \
26ccd9
-	util/bitmap.c \
26ccd9
-	util/abspath.c \
26ccd9
-	util/iomem.c \
26ccd9
-	util/util.h \
26ccd9
-	util/strbuf.h \
26ccd9
-	util/size.h \
26ccd9
-	util/main.h \
26ccd9
-	util/filter.h \
26ccd9
-	util/bitmap.h
26ccd9
-
26ccd9
-nobase_include_HEADERS = \
26ccd9
-	daxctl/libdaxctl.h \
26ccd9
-	cxl/libcxl.h \
26ccd9
-	cxl/cxl_mem.h
26ccd9
diff -up ndctl-71.1/autogen.sh /dev/null
26ccd9
--- ndctl-71.1/autogen.sh	2020-12-22 16:44:57.000000000 -0500
26ccd9
+++ /dev/null	2022-07-27 11:30:34.495212588 -0400
26ccd9
@@ -1,28 +0,0 @@
26ccd9
-#!/bin/sh -e
26ccd9
-
26ccd9
-if [ -f .git/hooks/pre-commit.sample -a ! -f .git/hooks/pre-commit ] ; then
26ccd9
-        cp -p .git/hooks/pre-commit.sample .git/hooks/pre-commit && \
26ccd9
-        chmod +x .git/hooks/pre-commit && \
26ccd9
-        echo "Activated pre-commit hook."
26ccd9
-fi
26ccd9
-
26ccd9
-$(dirname $0)/git-version-gen
26ccd9
-reconf_args=''
26ccd9
-[ -n "$*" ] && reconf_args="$*"
26ccd9
-autoreconf --install --symlink $reconf_args
26ccd9
-
26ccd9
-libdir() {
26ccd9
-        echo $(cd $1/$(gcc -print-multi-os-directory); pwd)
26ccd9
-}
26ccd9
-
26ccd9
-args="--prefix=/usr \
26ccd9
---sysconfdir=/etc \
26ccd9
---libdir=$(libdir /usr/lib)"
26ccd9
-
26ccd9
-echo
26ccd9
-echo "----------------------------------------------------------------"
26ccd9
-echo "Initialized build system. For a common configuration please run:"
26ccd9
-echo "----------------------------------------------------------------"
26ccd9
-echo
26ccd9
-echo "./configure CFLAGS='-g -O2' $args"
26ccd9
-echo
26ccd9
diff -up ndctl-71.1/configure.ac /dev/null
26ccd9
--- ndctl-71.1/configure.ac	2022-10-07 18:39:13.083886312 -0400
26ccd9
+++ /dev/null	2022-07-27 11:30:34.495212588 -0400
26ccd9
@@ -1,254 +0,0 @@
26ccd9
-AC_PREREQ(2.60)
26ccd9
-m4_include([version.m4])
26ccd9
-AC_INIT([ndctl],
26ccd9
-        GIT_VERSION,
26ccd9
-        [nvdimm@lists.linux.dev],
26ccd9
-        [ndctl],
26ccd9
-        [https://github.com/pmem/ndctl])
26ccd9
-AC_CONFIG_SRCDIR([ndctl/lib/libndctl.c])
26ccd9
-AC_CONFIG_AUX_DIR([build-aux])
26ccd9
-AM_INIT_AUTOMAKE([
26ccd9
-	foreign
26ccd9
-	1.11
26ccd9
-	-Wall
26ccd9
-	-Wno-portability
26ccd9
-	silent-rules
26ccd9
-	tar-pax
26ccd9
-	no-dist-gzip
26ccd9
-	dist-xz
26ccd9
-	subdir-objects
26ccd9
-])
26ccd9
-AC_PROG_CC_STDC
26ccd9
-AC_USE_SYSTEM_EXTENSIONS
26ccd9
-AC_SYS_LARGEFILE
26ccd9
-AC_CONFIG_MACRO_DIR([m4])
26ccd9
-AM_SILENT_RULES([yes])
26ccd9
-LT_INIT([
26ccd9
-	disable-static
26ccd9
-	pic-only
26ccd9
-])
26ccd9
-AC_PREFIX_DEFAULT([/usr])
26ccd9
-
26ccd9
-AC_PROG_SED
26ccd9
-AC_PROG_MKDIR_P
26ccd9
-AC_PROG_LN_S
26ccd9
-
26ccd9
-AC_ARG_ENABLE([docs],
26ccd9
-        AS_HELP_STRING([--disable-docs],
26ccd9
-	[disable documentation build @<:@default=enabled@:>@]),
26ccd9
-        [], enable_docs=yes)
26ccd9
-AS_IF([test "x$enable_docs" = "xyes"], [
26ccd9
-        AC_DEFINE(ENABLE_DOCS, [1], [Documentation / man pages.])
26ccd9
-])
26ccd9
-AM_CONDITIONAL([ENABLE_DOCS], [test "x$enable_docs" = "xyes"])
26ccd9
-
26ccd9
-AC_ARG_ENABLE([asciidoctor],
26ccd9
-	AS_HELP_STRING([--enable-asciidoctor],
26ccd9
-	[use asciidoctor for documentation build]),
26ccd9
-	[], enable_asciidoctor=yes)
26ccd9
-AM_CONDITIONAL([USE_ASCIIDOCTOR], [test "x$enable_asciidoctor" = "xyes"])
26ccd9
-if test "x$enable_asciidoctor" = "xyes"; then
26ccd9
-	asciidoc="asciidoctor"
26ccd9
-else
26ccd9
-	asciidoc="asciidoc"
26ccd9
-fi
26ccd9
-AC_CHECK_PROG(ASCIIDOC, [$asciidoc], [$(which $asciidoc)], [missing])
26ccd9
-if test "x$ASCIIDOC" = xmissing -a "x$enable_docs" = "xyes"; then
26ccd9
-	AC_MSG_ERROR([$asciidoc needed to build documentation])
26ccd9
-fi
26ccd9
-AC_SUBST([ASCIIDOC])
26ccd9
-
26ccd9
-if test x"$asciidoc" = x"asciidoc"; then
26ccd9
-AC_CHECK_PROG(XMLTO, [xmlto], [$(which xmlto)], [missing])
26ccd9
-if test "x$XMLTO" = xmissing -a "x$enable_docs" = "xyes"; then
26ccd9
-       AC_MSG_ERROR([xmlto needed to build documentation])
26ccd9
-fi
26ccd9
-AC_SUBST([XMLTO])
26ccd9
-fi
26ccd9
-
26ccd9
-AC_C_TYPEOF
26ccd9
-AC_DEFINE([HAVE_STATEMENT_EXPR], 1, [Define to 1 if you have statement expressions.])
26ccd9
-
26ccd9
-AC_C_BIGENDIAN(
26ccd9
-	AC_DEFINE(HAVE_BIG_ENDIAN, 1, [Define to 1 if big-endian-arch]),
26ccd9
-	AC_DEFINE(HAVE_LITTLE_ENDIAN, 1, [Define to 1 if little-endian-arch]),
26ccd9
-	[], [])
26ccd9
-
26ccd9
-AC_ARG_ENABLE([logging],
26ccd9
-        AS_HELP_STRING([--disable-logging], [disable system logging @<:@default=enabled@:>@]),
26ccd9
-        [], enable_logging=yes)
26ccd9
-AS_IF([test "x$enable_logging" = "xyes"], [
26ccd9
-        AC_DEFINE(ENABLE_LOGGING, [1], [System logging.])
26ccd9
-])
26ccd9
-
26ccd9
-AC_ARG_ENABLE([debug],
26ccd9
-        AS_HELP_STRING([--enable-debug], [enable debug messages @<:@default=disabled@:>@]),
26ccd9
-        [], [enable_debug=no])
26ccd9
-AS_IF([test "x$enable_debug" = "xyes"], [
26ccd9
-        AC_DEFINE(ENABLE_DEBUG, [1], [Debug messages.])
26ccd9
-])
26ccd9
-
26ccd9
-AC_ARG_ENABLE([destructive],
26ccd9
-        AS_HELP_STRING([--enable-destructive], [enable destructive functional tests @<:@default=disabled@:>@]),
26ccd9
-        [], [enable_destructive=no])
26ccd9
-AS_IF([test "x$enable_destructive" = "xyes"],
26ccd9
-	[AC_DEFINE([ENABLE_DESTRUCTIVE], [1], [destructive functional tests support])])
26ccd9
-AM_CONDITIONAL([ENABLE_DESTRUCTIVE], [test "x$enable_destructive" = "xyes"])
26ccd9
-
26ccd9
-AC_ARG_ENABLE([test],
26ccd9
-        AS_HELP_STRING([--enable-test], [enable ndctl test command @<:@default=disabled@:>@]),
26ccd9
-        [], [enable_test=$enable_destructive])
26ccd9
-AS_IF([test "x$enable_test" = "xyes"],
26ccd9
-	[AC_DEFINE([ENABLE_TEST], [1], [ndctl test support])])
26ccd9
-AM_CONDITIONAL([ENABLE_TEST], [test "x$enable_test" = "xyes"])
26ccd9
-
26ccd9
-AC_CHECK_DECLS([BUS_MCEERR_AR], [enable_bus_mc_err=yes], [], [[#include <signal.h>]])
26ccd9
-AC_CHECK_DECLS([MAP_SHARED_VALIDATE], [kernel_map_shared_validate=yes], [], [[#include <linux/mman.h>]])
26ccd9
-AC_CHECK_DECLS([MAP_SYNC], [kernel_map_sync=yes], [], [[#include <linux/mman.h>]])
26ccd9
-AS_UNSET([ac_cv_have_decl_MAP_SHARED_VALIDATE])
26ccd9
-AS_UNSET([ac_cv_have_decl_MAP_SYNC])
26ccd9
-AC_CHECK_DECLS([MAP_SHARED_VALIDATE], [enable_map_shared_validate=yes], [], [[#include <sys/mman.h>]])
26ccd9
-AC_CHECK_DECLS([MAP_SYNC], [enable_map_sync=yes], [], [[#include <sys/mman.h>]])
26ccd9
-
26ccd9
-if test "x$kernel_map_shared_validate" = "xyes" -a "x$enable_map_shared_validate" != "xyes" ; then
26ccd9
-	AC_MSG_WARN([MAP_SHARED_VALIDATE supported by kernel but not by <sys/mman.h>, consider installing glibc-2.28 or later.])
26ccd9
-fi
26ccd9
-if test "x$kernel_map_shared_validate" != "xyes" -a "x$enable_map_shared_validate" != "xyes" ; then
26ccd9
-	AC_MSG_WARN([MAP_SHARED_VALIDATE not supported by kernel, consider installing kernel-4.15 or later.])
26ccd9
-fi
26ccd9
-if test "x$kernel_map_sync" = "xyes" -a "x$enable_map_sync" != "xyes" ; then
26ccd9
-	AC_MSG_WARN([MAP_SYNC supported by kernel but not by <sys/mman.h>, consider installing glibc-2.28 or later.])
26ccd9
-fi
26ccd9
-if test "x$kernel_map_sync" != "xyes" -a "x$enable_map_sync" != "xyes" ; then
26ccd9
-	AC_MSG_WARN([MAP_SYNC not supported by kernel or architecture, consider installing kernel-4.15 or later.])
26ccd9
-fi
26ccd9
-
26ccd9
-AS_IF([test "x$enable_bus_mc_err" = "xyes" -a "x$enable_map_sync" = "xyes" -a "x$enable_map_shared_validate" = "xyes"],
26ccd9
-	[AC_DEFINE([ENABLE_POISON], [1], [ndctl test poison support])])
26ccd9
-AM_CONDITIONAL([ENABLE_POISON],
26ccd9
-	[test "x$enable_bus_mc_err" = "xyes" -a "x$enable_map_sync" = "xyes" -a "x$enable_map_shared_validate" = "xyes"])
26ccd9
-
26ccd9
-PKG_CHECK_MODULES([KMOD], [libkmod])
26ccd9
-PKG_CHECK_MODULES([UDEV], [libudev])
26ccd9
-PKG_CHECK_MODULES([UUID], [uuid],
26ccd9
-	[AC_DEFINE([HAVE_UUID], [1], [Define to 1 if using libuuid])])
26ccd9
-PKG_CHECK_MODULES([JSON], [json-c])
26ccd9
-
26ccd9
-AC_ARG_WITH([bash],
26ccd9
-	AS_HELP_STRING([--with-bash],
26ccd9
-		[Enable bash auto-completion. @<:@default=yes@:>@]),
26ccd9
-	[],
26ccd9
-	[with_bash=yes])
26ccd9
-
26ccd9
-if test "x$with_bash" = "xyes"; then
26ccd9
-	PKG_CHECK_MODULES([BASH_COMPLETION], [bash-completion >= 2.0],
26ccd9
-		[BASH_COMPLETION_DIR=$($PKG_CONFIG --variable=completionsdir bash-completion)], [])
26ccd9
-fi
26ccd9
-
26ccd9
-AC_SUBST([BASH_COMPLETION_DIR])
26ccd9
-AM_CONDITIONAL([ENABLE_BASH_COMPLETION], [test "x$with_bash" = "xyes"])
26ccd9
-
26ccd9
-AC_ARG_ENABLE([local],
26ccd9
-        AS_HELP_STRING([--disable-local], [build against kernel ndctl.h @<:@default=system@:>@]),
26ccd9
-        [], [enable_local=yes])
26ccd9
-
26ccd9
-AC_CHECK_HEADERS_ONCE([linux/version.h])
26ccd9
-
26ccd9
-AC_CHECK_FUNCS([ \
26ccd9
-	__secure_getenv \
26ccd9
-	secure_getenv\
26ccd9
-])
26ccd9
-
26ccd9
-AC_ARG_WITH([systemd],
26ccd9
-	AS_HELP_STRING([--with-systemd],
26ccd9
-		[Enable systemd functionality (monitor). @<:@default=yes@:>@]),
26ccd9
-	[], [with_systemd=yes])
26ccd9
-
26ccd9
-if test "x$with_systemd" = "xyes"; then
26ccd9
-	PKG_CHECK_MODULES([SYSTEMD], [systemd],
26ccd9
-	[systemd_unitdir=$($PKG_CONFIG --variable=systemdsystemunitdir systemd)], [])
26ccd9
-fi
26ccd9
-
26ccd9
-AC_SUBST([systemd_unitdir])
26ccd9
-AM_CONDITIONAL([ENABLE_SYSTEMD_UNITS], [test "x$with_systemd" = "xyes"])
26ccd9
-
26ccd9
-ndctl_monitorconfdir=${sysconfdir}/ndctl
26ccd9
-ndctl_monitorconf=monitor.conf
26ccd9
-AC_SUBST([ndctl_monitorconfdir])
26ccd9
-AC_SUBST([ndctl_monitorconf])
26ccd9
-
26ccd9
-daxctl_modprobe_datadir=${datadir}/daxctl
26ccd9
-daxctl_modprobe_data=daxctl.conf
26ccd9
-AC_SUBST([daxctl_modprobe_datadir])
26ccd9
-AC_SUBST([daxctl_modprobe_data])
26ccd9
-
26ccd9
-AC_ARG_WITH([keyutils],
26ccd9
-	    AS_HELP_STRING([--with-keyutils],
26ccd9
-			[Enable keyutils functionality (security).  @<:@default=yes@:>@]), [], [with_keyutils=yes])
26ccd9
-
26ccd9
-if test "x$with_keyutils" = "xyes"; then
26ccd9
-	AC_CHECK_HEADERS([keyutils.h],,[
26ccd9
-		AC_MSG_ERROR([keyutils.h not found, consider installing the keyutils library development package (variously named keyutils-libs-devel, keyutils-devel, or libkeyutils-dev).])
26ccd9
-		])
26ccd9
-fi
26ccd9
-AS_IF([test "x$with_keyutils" = "xyes"],
26ccd9
-	[AC_DEFINE([ENABLE_KEYUTILS], [1], [Enable keyutils support])])
26ccd9
-AM_CONDITIONAL([ENABLE_KEYUTILS], [test "x$with_keyutils" = "xyes"])
26ccd9
-
26ccd9
-ndctl_keysdir=${sysconfdir}/ndctl/keys
26ccd9
-ndctl_keysreadme=keys.readme
26ccd9
-AC_SUBST([ndctl_keysdir])
26ccd9
-AC_SUBST([ndctl_keysreadme])
26ccd9
-
26ccd9
-my_CFLAGS="\
26ccd9
--Wall \
26ccd9
--Wchar-subscripts \
26ccd9
--Wformat-security \
26ccd9
--Wmissing-declarations \
26ccd9
--Wmissing-prototypes \
26ccd9
--Wnested-externs \
26ccd9
--Wshadow \
26ccd9
--Wsign-compare \
26ccd9
--Wstrict-prototypes \
26ccd9
--Wtype-limits \
26ccd9
--Wmaybe-uninitialized \
26ccd9
--Wdeclaration-after-statement \
26ccd9
--Wunused-result \
26ccd9
--D_FORTIFY_SOURCE=2 \
26ccd9
--O2
26ccd9
-"
26ccd9
-AC_SUBST([my_CFLAGS])
26ccd9
-
26ccd9
-AC_CONFIG_HEADERS(config.h)
26ccd9
-AC_CONFIG_FILES([
26ccd9
-        Makefile
26ccd9
-        daxctl/lib/Makefile
26ccd9
-        cxl/lib/Makefile
26ccd9
-        ndctl/lib/Makefile
26ccd9
-        ndctl/Makefile
26ccd9
-        daxctl/Makefile
26ccd9
-        cxl/Makefile
26ccd9
-        test/Makefile
26ccd9
-        Documentation/ndctl/Makefile
26ccd9
-        Documentation/daxctl/Makefile
26ccd9
-        Documentation/cxl/Makefile
26ccd9
-        Documentation/cxl/lib/Makefile
26ccd9
-])
26ccd9
-
26ccd9
-AC_OUTPUT
26ccd9
-AC_MSG_RESULT([
26ccd9
-        $PACKAGE $VERSION
26ccd9
-        =====
26ccd9
-
26ccd9
-        prefix:                 ${prefix}
26ccd9
-        sysconfdir:             ${sysconfdir}
26ccd9
-        libdir:                 ${libdir}
26ccd9
-        includedir:             ${includedir}
26ccd9
-
26ccd9
-        compiler:               ${CC}
26ccd9
-        cflags:                 ${CFLAGS}
26ccd9
-        ldflags:                ${LDFLAGS}
26ccd9
-
26ccd9
-        logging:                ${enable_logging}
26ccd9
-        debug:                  ${enable_debug}
26ccd9
-])
26ccd9
diff -up ndctl-71.1/cxl/Makefile.am /dev/null
26ccd9
--- ndctl-71.1/cxl/Makefile.am	2022-10-07 18:39:13.131886476 -0400
26ccd9
+++ /dev/null	2022-07-27 11:30:34.495212588 -0400
26ccd9
@@ -1,25 +0,0 @@
26ccd9
-include $(top_srcdir)/Makefile.am.in
26ccd9
-
26ccd9
-bin_PROGRAMS = cxl
26ccd9
-
26ccd9
-DISTCLEANFILES = config.h
26ccd9
-BUILT_SOURCES = config.h
26ccd9
-config.h: $(srcdir)/Makefile.am
26ccd9
-	$(AM_V_GEN) echo "/* Autogenerated by cxl/Makefile.am */" >$@
26ccd9
-
26ccd9
-cxl_SOURCES =\
26ccd9
-		cxl.c \
26ccd9
-		list.c \
26ccd9
-		memdev.c \
26ccd9
-		../util/json.c \
26ccd9
-		json.c \
26ccd9
-		filter.c \
26ccd9
-		filter.h \
26ccd9
-		builtin.h
26ccd9
-
26ccd9
-cxl_LDADD =\
26ccd9
-	lib/libcxl.la \
26ccd9
-	../libutil.a \
26ccd9
-	$(UUID_LIBS) \
26ccd9
-	$(KMOD_LIBS) \
26ccd9
-	$(JSON_LIBS)
26ccd9
diff -up ndctl-71.1/cxl/lib/Makefile.am /dev/null
26ccd9
--- ndctl-71.1/cxl/lib/Makefile.am	2022-10-07 18:39:13.041886169 -0400
26ccd9
+++ /dev/null	2022-07-27 11:30:34.495212588 -0400
26ccd9
@@ -1,32 +0,0 @@
26ccd9
-include $(top_srcdir)/Makefile.am.in
26ccd9
-
26ccd9
-%.pc: %.pc.in Makefile
26ccd9
-	$(SED_PROCESS)
26ccd9
-
26ccd9
-pkginclude_HEADERS = ../libcxl.h ../cxl_mem.h
26ccd9
-lib_LTLIBRARIES = libcxl.la
26ccd9
-
26ccd9
-libcxl_la_SOURCES =\
26ccd9
-	../libcxl.h \
26ccd9
-	private.h \
26ccd9
-	../../util/sysfs.c \
26ccd9
-	../../util/sysfs.h \
26ccd9
-	../../util/log.c \
26ccd9
-	../../util/log.h \
26ccd9
-	libcxl.c
26ccd9
-
26ccd9
-libcxl_la_LIBADD =\
26ccd9
-	$(UUID_LIBS) \
26ccd9
-	$(KMOD_LIBS)
26ccd9
-
26ccd9
-EXTRA_DIST += libcxl.sym
26ccd9
-
26ccd9
-libcxl_la_LDFLAGS = $(AM_LDFLAGS) \
26ccd9
-	-version-info $(LIBCXL_CURRENT):$(LIBCXL_REVISION):$(LIBCXL_AGE) \
26ccd9
-	-Wl,--version-script=$(top_srcdir)/cxl/lib/libcxl.sym
26ccd9
-libcxl_la_DEPENDENCIES = libcxl.sym
26ccd9
-
26ccd9
-pkgconfigdir = $(libdir)/pkgconfig
26ccd9
-pkgconfig_DATA = libcxl.pc
26ccd9
-EXTRA_DIST += libcxl.pc.in
26ccd9
-CLEANFILES += libcxl.pc
26ccd9
diff -up ndctl-71.1/daxctl/Makefile.am /dev/null
26ccd9
--- ndctl-71.1/daxctl/Makefile.am	2022-10-07 18:39:13.132886479 -0400
26ccd9
+++ /dev/null	2022-07-27 11:30:34.495212588 -0400
26ccd9
@@ -1,33 +0,0 @@
26ccd9
-include $(top_srcdir)/Makefile.am.in
26ccd9
-
26ccd9
-bin_PROGRAMS = daxctl
26ccd9
-
26ccd9
-DISTCLEANFILES = config.h
26ccd9
-BUILT_SOURCES = config.h
26ccd9
-config.h: $(srcdir)/Makefile.am
26ccd9
-	$(AM_V_GEN) echo "/* Autogenerated by daxctl/Makefile.am */" >$@ && \
26ccd9
-	echo '#define DAXCTL_MODPROBE_DATA \
26ccd9
-		"$(daxctl_modprobe_datadir)/$(daxctl_modprobe_data)"' >>$@ && \
26ccd9
-	echo '#define DAXCTL_MODPROBE_INSTALL \
26ccd9
-		"$(sysconfdir)/modprobe.d/$(daxctl_modprobe_data)"' >>$@
26ccd9
-
26ccd9
-daxctl_SOURCES =\
26ccd9
-		daxctl.c \
26ccd9
-		acpi.c \
26ccd9
-		list.c \
26ccd9
-		migrate.c \
26ccd9
-		device.c \
26ccd9
-		../util/json.c \
26ccd9
-		../util/json.h \
26ccd9
-		json.c \
26ccd9
-		json.h \
26ccd9
-		filter.c \
26ccd9
-		filter.h \
26ccd9
-		builtin.h
26ccd9
-
26ccd9
-daxctl_LDADD =\
26ccd9
-	lib/libdaxctl.la \
26ccd9
-	../libutil.a \
26ccd9
-	$(UUID_LIBS) \
26ccd9
-	$(KMOD_LIBS) \
26ccd9
-	$(JSON_LIBS)
26ccd9
diff -up ndctl-71.1/daxctl/lib/Makefile.am /dev/null
26ccd9
--- ndctl-71.1/daxctl/lib/Makefile.am	2020-12-22 16:44:57.000000000 -0500
26ccd9
+++ /dev/null	2022-07-27 11:30:34.495212588 -0400
26ccd9
@@ -1,36 +0,0 @@
26ccd9
-include $(top_srcdir)/Makefile.am.in
26ccd9
-
26ccd9
-%.pc: %.pc.in Makefile
26ccd9
-	$(SED_PROCESS)
26ccd9
-
26ccd9
-pkginclude_HEADERS = ../libdaxctl.h
26ccd9
-lib_LTLIBRARIES = libdaxctl.la
26ccd9
-
26ccd9
-libdaxctl_la_SOURCES =\
26ccd9
-	../libdaxctl.h \
26ccd9
-	libdaxctl-private.h \
26ccd9
-	../../util/iomem.c \
26ccd9
-	../../util/iomem.h \
26ccd9
-	../../util/sysfs.c \
26ccd9
-	../../util/sysfs.h \
26ccd9
-	../../util/log.c \
26ccd9
-	../../util/log.h \
26ccd9
-	libdaxctl.c
26ccd9
-
26ccd9
-libdaxctl_la_LIBADD =\
26ccd9
-	$(UUID_LIBS) \
26ccd9
-	$(KMOD_LIBS)
26ccd9
-
26ccd9
-daxctl_modprobe_data_DATA = daxctl.conf
26ccd9
-
26ccd9
-EXTRA_DIST += libdaxctl.sym daxctl.conf
26ccd9
-
26ccd9
-libdaxctl_la_LDFLAGS = $(AM_LDFLAGS) \
26ccd9
-	-version-info $(LIBDAXCTL_CURRENT):$(LIBDAXCTL_REVISION):$(LIBDAXCTL_AGE) \
26ccd9
-	-Wl,--version-script=$(top_srcdir)/daxctl/lib/libdaxctl.sym
26ccd9
-libdaxctl_la_DEPENDENCIES = libdaxctl.sym
26ccd9
-
26ccd9
-pkgconfigdir = $(libdir)/pkgconfig
26ccd9
-pkgconfig_DATA = libdaxctl.pc
26ccd9
-EXTRA_DIST += libdaxctl.pc.in
26ccd9
-CLEANFILES += libdaxctl.pc
26ccd9
diff -up ndctl-71.1/ndctl.spec.in.orig ndctl-71.1/ndctl.spec.in
26ccd9
--- ndctl-71.1/ndctl.spec.in.orig	2022-10-07 18:39:13.183886653 -0400
26ccd9
+++ ndctl-71.1/ndctl.spec.in	2022-10-07 18:44:39.333997092 -0400
26ccd9
@@ -6,21 +6,16 @@ License:	GPLv2
26ccd9
 Url:		https://github.com/pmem/ndctl
26ccd9
 Source0:	https://github.com/pmem/%{name}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
26ccd9
 
26ccd9
-%define with_meson MESON
26ccd9
 Requires:	LNAME%{?_isa} = %{version}-%{release}
26ccd9
 Requires:	DAX_LNAME%{?_isa} = %{version}-%{release}
26ccd9
 Requires:	CXL_LNAME%{?_isa} = %{version}-%{release}
26ccd9
 BuildRequires:	autoconf
26ccd9
 %if 0%{?rhel} < 9
26ccd9
 BuildRequires:	asciidoc
26ccd9
-%if !%{with_meson}
26ccd9
-%define asciidoc --disable-asciidoctor
26ccd9
-%endif
26ccd9
+%define asciidoctor -Dasciidoctor=disabled
26ccd9
 %else
26ccd9
-%if %{with_meson}
26ccd9
-%define asciidoctor -Dasciidoctor=enabled
26ccd9
-%endif
26ccd9
 BuildRequires:	rubygem-asciidoctor
26ccd9
+%define asciidoctor -Dasciidoctor=enabled
26ccd9
 %endif
26ccd9
 BuildRequires:	xmlto
26ccd9
 BuildRequires:	automake
26ccd9
@@ -34,9 +29,7 @@ BuildRequires:	pkgconfig(bash-completion
26ccd9
 BuildRequires:	pkgconfig(systemd)
26ccd9
 BuildRequires:	keyutils-libs-devel
26ccd9
 
26ccd9
-%if %{with_meson}
26ccd9
 BuildRequires:	meson
26ccd9
-%endif
26ccd9
 
26ccd9
 %description
26ccd9
 Utility library for managing the "libnvdimm" subsystem.  The "libnvdimm"
26ccd9
@@ -125,30 +118,14 @@ libcxl is a library for enumerating and
26ccd9
 %setup -q ndctl-%{version}
26ccd9
 
26ccd9
 %build
26ccd9
-%if %{with_meson}
26ccd9
 %meson %{?asciidoctor} -Dversion-tag=%{version}
26ccd9
 %meson_build
26ccd9
-%else
26ccd9
-echo %{version} > version
26ccd9
-./autogen.sh
26ccd9
-%configure --disable-static --disable-silent-rules %{?asciidoc}
26ccd9
-make %{?_smp_mflags}
26ccd9
-%endif
26ccd9
 
26ccd9
 %install
26ccd9
-%if %{with_meson}
26ccd9
 %meson_install
26ccd9
-%else
26ccd9
-%make_install
26ccd9
-find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
26ccd9
-%endif
26ccd9
 
26ccd9
 %check
26ccd9
-%if %{with_meson}
26ccd9
 %meson_test
26ccd9
-%else
26ccd9
-make check
26ccd9
-%endif
26ccd9
 
26ccd9
 %ldconfig_scriptlets -n LNAME
26ccd9
 
26ccd9
diff -up ndctl-71.1/ndctl/Makefile.am /dev/null
26ccd9
--- ndctl-71.1/ndctl/Makefile.am	2022-10-07 18:39:13.135886489 -0400
26ccd9
+++ /dev/null	2022-07-27 11:30:34.495212588 -0400
26ccd9
@@ -1,83 +0,0 @@
26ccd9
-include $(top_srcdir)/Makefile.am.in
26ccd9
-
26ccd9
-bin_PROGRAMS = ndctl
26ccd9
-
26ccd9
-DISTCLEANFILES = config.h
26ccd9
-BUILT_SOURCES = config.h
26ccd9
-config.h: $(srcdir)/Makefile.am
26ccd9
-	$(AM_V_GEN) echo "/* Autogenerated by ndctl/Makefile.am */" >$@ && \
26ccd9
-	echo '#define NDCTL_CONF_FILE \
26ccd9
-		"$(ndctl_monitorconfdir)/$(ndctl_monitorconf)"' >>$@
26ccd9
-	$(AM_V_GEN) echo '#define NDCTL_KEYS_DIR  "$(ndctl_keysdir)"' >>$@
26ccd9
-
26ccd9
-ndctl_SOURCES = ndctl.c \
26ccd9
-		builtin.h \
26ccd9
-		bus.c \
26ccd9
-		create-nfit.c \
26ccd9
-		namespace.c \
26ccd9
-		check.c \
26ccd9
-		region.c \
26ccd9
-		dimm.c \
26ccd9
-		../util/log.c \
26ccd9
-		../daxctl/filter.c \
26ccd9
-		../daxctl/filter.h \
26ccd9
-		filter.c \
26ccd9
-		filter.h \
26ccd9
-		list.c \
26ccd9
-		../util/json.c \
26ccd9
-		../util/json.h \
26ccd9
-		../daxctl/json.c \
26ccd9
-		../daxctl/json.h \
26ccd9
-		json.c \
26ccd9
-		json.h \
26ccd9
-		json-smart.c \
26ccd9
-		keys.h \
26ccd9
-		inject-error.c \
26ccd9
-		inject-smart.c \
26ccd9
-		monitor.c \
26ccd9
-		namespace.h \
26ccd9
-		action.h \
26ccd9
-		../nfit.h \
26ccd9
-		../test.h \
26ccd9
-		firmware-update.h
26ccd9
-
26ccd9
-if ENABLE_KEYUTILS
26ccd9
-ndctl_SOURCES += keys.c \
26ccd9
-		load-keys.c
26ccd9
-keys_configdir = $(ndctl_keysdir)
26ccd9
-keys_config_DATA = $(ndctl_keysreadme)
26ccd9
-endif
26ccd9
-
26ccd9
-EXTRA_DIST += keys.readme monitor.conf ndctl-monitor.service
26ccd9
-
26ccd9
-if ENABLE_DESTRUCTIVE
26ccd9
-ndctl_SOURCES += ../test/pmem_namespaces.c
26ccd9
-ndctl_SOURCES += bat.c
26ccd9
-endif
26ccd9
-
26ccd9
-ndctl_LDADD =\
26ccd9
-	lib/libndctl.la \
26ccd9
-	../daxctl/lib/libdaxctl.la \
26ccd9
-	../libutil.a \
26ccd9
-	$(UUID_LIBS) \
26ccd9
-	$(KMOD_LIBS) \
26ccd9
-	$(JSON_LIBS)
26ccd9
-
26ccd9
-if ENABLE_KEYUTILS
26ccd9
-ndctl_LDADD += -lkeyutils
26ccd9
-endif
26ccd9
-
26ccd9
-if ENABLE_TEST
26ccd9
-ndctl_SOURCES += ../test/libndctl.c \
26ccd9
-		 ../test/dsm-fail.c \
26ccd9
-		 ../util/sysfs.c \
26ccd9
-		 ../test/core.c \
26ccd9
-		 test.c
26ccd9
-endif
26ccd9
-
26ccd9
-monitor_configdir = $(ndctl_monitorconfdir)
26ccd9
-monitor_config_DATA = $(ndctl_monitorconf)
26ccd9
-
26ccd9
-if ENABLE_SYSTEMD_UNITS
26ccd9
-systemd_unit_DATA = ndctl-monitor.service
26ccd9
-endif
26ccd9
diff -up ndctl-71.1/ndctl/lib/Makefile.am /dev/null
26ccd9
--- ndctl-71.1/ndctl/lib/Makefile.am	2020-12-22 16:44:57.000000000 -0500
26ccd9
+++ /dev/null	2022-07-27 11:30:34.495212588 -0400
26ccd9
@@ -1,52 +0,0 @@
26ccd9
-include $(top_srcdir)/Makefile.am.in
26ccd9
-
26ccd9
-%.pc: %.pc.in Makefile
26ccd9
-	$(SED_PROCESS)
26ccd9
-
26ccd9
-pkginclude_HEADERS = ../libndctl.h ../ndctl.h
26ccd9
-lib_LTLIBRARIES = libndctl.la
26ccd9
-
26ccd9
-libndctl_la_SOURCES =\
26ccd9
-	../libndctl.h \
26ccd9
-	private.h \
26ccd9
-	../../util/list.h \
26ccd9
-	../../util/log.c \
26ccd9
-	../../util/log.h \
26ccd9
-	../../util/sysfs.c \
26ccd9
-	../../util/sysfs.h \
26ccd9
-	../../util/fletcher.h \
26ccd9
-	dimm.c \
26ccd9
-	inject.c \
26ccd9
-	nfit.c \
26ccd9
-	smart.c \
26ccd9
-	intel.c \
26ccd9
-	hpe1.c \
26ccd9
-	msft.c \
26ccd9
-	hyperv.c \
26ccd9
-	papr.c \
26ccd9
-	ars.c \
26ccd9
-	firmware.c \
26ccd9
-	libndctl.c \
26ccd9
-	intel.h \
26ccd9
-	hpe1.h \
26ccd9
-	msft.h \
26ccd9
-	hyperv.h \
26ccd9
-	../../ndctl/libndctl-nfit.h
26ccd9
-
26ccd9
-libndctl_la_LIBADD =\
26ccd9
-	../../daxctl/lib/libdaxctl.la \
26ccd9
-	$(UDEV_LIBS) \
26ccd9
-	$(UUID_LIBS) \
26ccd9
-	$(KMOD_LIBS)
26ccd9
-
26ccd9
-EXTRA_DIST += libndctl.sym
26ccd9
-
26ccd9
-libndctl_la_LDFLAGS = $(AM_LDFLAGS) \
26ccd9
-	-version-info $(LIBNDCTL_CURRENT):$(LIBNDCTL_REVISION):$(LIBNDCTL_AGE) \
26ccd9
-	-Wl,--version-script=$(top_srcdir)/ndctl/lib/libndctl.sym
26ccd9
-libndctl_la_DEPENDENCIES = libndctl.sym
26ccd9
-
26ccd9
-pkgconfigdir = $(libdir)/pkgconfig
26ccd9
-pkgconfig_DATA = libndctl.pc
26ccd9
-EXTRA_DIST += libndctl.pc.in
26ccd9
-CLEANFILES += libndctl.pc
26ccd9
diff -up ndctl-71.1/rhel/meson.build.orig ndctl-71.1/rhel/meson.build
26ccd9
--- ndctl-71.1/rhel/meson.build.orig	2022-10-07 18:39:13.184886656 -0400
26ccd9
+++ ndctl-71.1/rhel/meson.build	2022-10-07 18:41:13.892297627 -0400
26ccd9
@@ -7,8 +7,7 @@ rhel_spec1 = vcs_tag(
26ccd9
 
26ccd9
 rhel_spec2 = custom_target('ndctl.spec',
26ccd9
   command : [
26ccd9
-    'sed', '-e', 's,MESON,1,g',
26ccd9
-	   '-e', 's,DAX_DNAME,daxctl-devel,g',
26ccd9
+    'sed', '-e', 's,DAX_DNAME,daxctl-devel,g',
26ccd9
 	   '-e', 's,CXL_DNAME,cxl-devel,g',
26ccd9
 	   '-e', 's,DNAME,ndctl-devel,g',
26ccd9
 	   '-e', '/^%defattr.*/d',
26ccd9
diff -up ndctl-71.1/sles/meson.build.orig ndctl-71.1/sles/meson.build
26ccd9
--- ndctl-71.1/sles/meson.build.orig	2022-10-07 18:39:13.184886656 -0400
26ccd9
+++ ndctl-71.1/sles/meson.build	2022-10-07 18:41:13.893297631 -0400
26ccd9
@@ -18,8 +18,7 @@ sles_spec2 = custom_target('ndctl.spec.i
26ccd9
 
26ccd9
 sles_spec3 = custom_target('ndctl.spec',
26ccd9
   command : [
26ccd9
-    'sed', '-e', 's,MESON,1,g',
26ccd9
-           '-e', 's,DAX_DNAME,libdaxctl-devel,g',
26ccd9
+    'sed', '-e', 's,DAX_DNAME,libdaxctl-devel,g',
26ccd9
            '-e', 's,CXL_DNAME,libcxl-devel,g',
26ccd9
            '-e', 's,DNAME,libndctl-devel,g',
26ccd9
            '-e', 's,%license,%doc,g',
26ccd9
diff -up ndctl-71.1/test/Makefile.am /dev/null
26ccd9
--- ndctl-71.1/test/Makefile.am	2022-10-07 18:39:13.146886527 -0400
26ccd9
+++ /dev/null	2022-07-27 11:30:34.495212588 -0400
26ccd9
@@ -1,169 +0,0 @@
26ccd9
-include $(top_srcdir)/Makefile.am.in
26ccd9
-
26ccd9
-TESTS =\
26ccd9
-	libndctl \
26ccd9
-	dsm-fail \
26ccd9
-	create.sh \
26ccd9
-	clear.sh \
26ccd9
-	pmem-errors.sh \
26ccd9
-	daxdev-errors.sh \
26ccd9
-	multi-dax.sh \
26ccd9
-	btt-check.sh \
26ccd9
-	label-compat.sh \
26ccd9
-	sector-mode.sh \
26ccd9
-	inject-error.sh \
26ccd9
-	btt-errors.sh \
26ccd9
-	hugetlb \
26ccd9
-	btt-pad-compat.sh \
26ccd9
-	firmware-update.sh \
26ccd9
-	ack-shutdown-count-set \
26ccd9
-	rescan-partitions.sh \
26ccd9
-	inject-smart.sh \
26ccd9
-	monitor.sh \
26ccd9
-	max_available_extent_ns.sh \
26ccd9
-	pfn-meta-errors.sh \
26ccd9
-	track-uuid.sh
26ccd9
-
26ccd9
-EXTRA_DIST += $(TESTS) common \
26ccd9
-		btt-pad-compat.xxd \
26ccd9
-		nmem1.bin nmem2.bin nmem3.bin nmem4.bin
26ccd9
-
26ccd9
-check_PROGRAMS =\
26ccd9
-	libndctl \
26ccd9
-	dsm-fail \
26ccd9
-	dax-errors \
26ccd9
-	smart-notify \
26ccd9
-	smart-listen \
26ccd9
-	hugetlb \
26ccd9
-	daxdev-errors \
26ccd9
-	ack-shutdown-count-set \
26ccd9
-	list-smart-dimm
26ccd9
-
26ccd9
-if ENABLE_DESTRUCTIVE
26ccd9
-TESTS +=\
26ccd9
-	pmem-ns \
26ccd9
-	sub-section.sh \
26ccd9
-	dax-dev \
26ccd9
-	dax-ext4.sh \
26ccd9
-	dax-xfs.sh \
26ccd9
-	align.sh \
26ccd9
-	device-dax \
26ccd9
-	revoke-devmem \
26ccd9
-	device-dax-fio.sh \
26ccd9
-	daxctl-devices.sh \
26ccd9
-	daxctl-create.sh \
26ccd9
-	dm.sh \
26ccd9
-	mmap.sh
26ccd9
-
26ccd9
-if ENABLE_KEYUTILS
26ccd9
-TESTS += security.sh
26ccd9
-endif
26ccd9
-
26ccd9
-check_PROGRAMS +=\
26ccd9
-	pmem-ns \
26ccd9
-	dax-dev \
26ccd9
-	dax-pmd \
26ccd9
-	device-dax \
26ccd9
-	revoke-devmem \
26ccd9
-	mmap
26ccd9
-endif
26ccd9
-
26ccd9
-LIBNDCTL_LIB =\
26ccd9
-       ../ndctl/lib/libndctl.la \
26ccd9
-       ../daxctl/lib/libdaxctl.la
26ccd9
-
26ccd9
-testcore =\
26ccd9
-	core.c \
26ccd9
-	../util/log.c \
26ccd9
-	../util/sysfs.c
26ccd9
-
26ccd9
-libndctl_SOURCES = libndctl.c $(testcore)
26ccd9
-libndctl_LDADD = $(LIBNDCTL_LIB) $(UUID_LIBS) $(KMOD_LIBS)
26ccd9
-
26ccd9
-namespace_core =\
26ccd9
-	../ndctl/namespace.c \
26ccd9
-	../ndctl/filter.c \
26ccd9
-	../ndctl/check.c \
26ccd9
-	../util/json.c \
26ccd9
-	../ndctl/json.c \
26ccd9
-	../daxctl/filter.c \
26ccd9
-	../daxctl/json.c
26ccd9
-
26ccd9
-dsm_fail_SOURCES =\
26ccd9
-	dsm-fail.c \
26ccd9
-	$(testcore) \
26ccd9
-	$(namespace_core)
26ccd9
-
26ccd9
-dsm_fail_LDADD = $(LIBNDCTL_LIB) \
26ccd9
-		$(KMOD_LIBS) \
26ccd9
-		$(JSON_LIBS) \
26ccd9
-		$(UUID_LIBS) \
26ccd9
-		../libutil.a
26ccd9
-
26ccd9
-ack_shutdown_count_set_SOURCES =\
26ccd9
-	ack-shutdown-count-set.c \
26ccd9
-	$(testcore)
26ccd9
-
26ccd9
-ack_shutdown_count_set_LDADD = $(LIBNDCTL_LIB) $(KMOD_LIBS)
26ccd9
-
26ccd9
-pmem_ns_SOURCES = pmem_namespaces.c $(testcore)
26ccd9
-pmem_ns_LDADD = $(LIBNDCTL_LIB) $(KMOD_LIBS) $(UUID_LIBS)
26ccd9
-
26ccd9
-dax_dev_SOURCES = dax-dev.c $(testcore)
26ccd9
-dax_dev_LDADD = $(LIBNDCTL_LIB) $(KMOD_LIBS)
26ccd9
-
26ccd9
-dax_pmd_SOURCES = dax-pmd.c \
26ccd9
-		$(testcore)
26ccd9
-
26ccd9
-hugetlb_SOURCES = hugetlb.c \
26ccd9
-		  dax-pmd.c
26ccd9
-
26ccd9
-mmap_SOURCES = mmap.c
26ccd9
-dax_errors_SOURCES = dax-errors.c
26ccd9
-daxdev_errors_SOURCES = daxdev-errors.c \
26ccd9
-			../util/log.c \
26ccd9
-			../util/sysfs.c
26ccd9
-daxdev_errors_LDADD = $(LIBNDCTL_LIB)
26ccd9
-device_dax_SOURCES = \
26ccd9
-		device-dax.c \
26ccd9
-		dax-dev.c \
26ccd9
-		dax-pmd.c \
26ccd9
-		$(testcore) \
26ccd9
-		$(namespace_core)
26ccd9
-
26ccd9
-if ENABLE_POISON
26ccd9
-dax_pmd_SOURCES += dax-poison.c
26ccd9
-hugetlb_SOURCES += dax-poison.c
26ccd9
-device_dax_SOURCES += dax-poison.c
26ccd9
-endif
26ccd9
-
26ccd9
-device_dax_LDADD = \
26ccd9
-		$(LIBNDCTL_LIB) \
26ccd9
-		$(KMOD_LIBS) \
26ccd9
-		$(JSON_LIBS) \
26ccd9
-                $(UUID_LIBS) \
26ccd9
-		../libutil.a
26ccd9
-
26ccd9
-revoke_devmem_SOURCES = \
26ccd9
-		revoke-devmem.c \
26ccd9
-		dax-dev.c \
26ccd9
-		$(testcore)
26ccd9
-
26ccd9
-revoke_devmem_LDADD = $(LIBNDCTL_LIB)
26ccd9
-
26ccd9
-smart_notify_SOURCES = smart-notify.c
26ccd9
-smart_notify_LDADD = $(LIBNDCTL_LIB)
26ccd9
-smart_listen_SOURCES = smart-listen.c
26ccd9
-smart_listen_LDADD = $(LIBNDCTL_LIB)
26ccd9
-
26ccd9
-list_smart_dimm_SOURCES = \
26ccd9
-		list-smart-dimm.c \
26ccd9
-		../ndctl/filter.c \
26ccd9
-		../util/json.c \
26ccd9
-		../ndctl/json.c
26ccd9
-
26ccd9
-list_smart_dimm_LDADD = \
26ccd9
-		$(LIBNDCTL_LIB) \
26ccd9
-		$(JSON_LIBS) \
26ccd9
-		$(UUID_LIBS) \
26ccd9
-		../libutil.a