At build time, ndctl_keysdir (/etc/nddctl/keys/) was empty, and thus it never gets created. Since the directory is listed in the %files section of the RPM spec, RPM checks for it and fails since it is not present.
Fix this by adding a simple 'keys.readme' file to the keys dorectory that points the user to the setup-passphrase man page, and installing it during the build. Cc: Dan Williams <[email protected]> Signed-off-by: Vishal Verma <[email protected]> --- configure.ac | 2 ++ ndctl.spec.in | 1 + ndctl/Makefile.am | 2 ++ ndctl/keys.readme | 1 + 4 files changed, 6 insertions(+) create mode 100644 ndctl/keys.readme diff --git a/configure.ac b/configure.ac index b08ddaf..d27a2b1 100644 --- a/configure.ac +++ b/configure.ac @@ -179,7 +179,9 @@ AS_IF([test "x$with_keyutils" = "xyes"], AM_CONDITIONAL([ENABLE_KEYUTILS], [test "x$with_keyutils" = "xyes"]) ndctl_keysdir=${sysconfdir}/ndctl/keys +ndctl_keysreadme=keys.readme AC_SUBST([ndctl_keysdir]) +AC_SUBST([ndctl_keysreadme]) my_CFLAGS="\ -Wall \ diff --git a/ndctl.spec.in b/ndctl.spec.in index 5ceb27a..8abccbf 100644 --- a/ndctl.spec.in +++ b/ndctl.spec.in @@ -110,6 +110,7 @@ make check %{bashcompdir}/ %{_unitdir}/ndctl-monitor.service %dir %{_sysconfdir}/ndctl/keys/ +%{_sysconfdir}/ndctl/keys/keys.readme %{_sysconfdir}/modprobe.d/nvdimm-security.conf %config(noreplace) %{_sysconfdir}/ndctl/monitor.conf diff --git a/ndctl/Makefile.am b/ndctl/Makefile.am index cd3312b..3287dbb 100644 --- a/ndctl/Makefile.am +++ b/ndctl/Makefile.am @@ -29,6 +29,8 @@ ndctl_SOURCES = ndctl.c \ if ENABLE_KEYUTILS ndctl_SOURCES += util/keys.c \ load-keys.c +keys_configdir = $(ndctl_keysdir) +keys_config_DATA = $(ndctl_keysreadme) endif if ENABLE_DESTRUCTIVE diff --git a/ndctl/keys.readme b/ndctl/keys.readme new file mode 100644 index 0000000..506678a --- /dev/null +++ b/ndctl/keys.readme @@ -0,0 +1 @@ +See 'ndctl setup-passphrase --help' -- 2.20.1 _______________________________________________ Linux-nvdimm mailing list [email protected] https://lists.01.org/mailman/listinfo/linux-nvdimm
