From: Michal Suchanek <msuchanek@suse.de>
To: nvdimm@lists.linux.dev
Cc: Michal Suchanek <msuchanek@suse.de>
Subject: [PATCH] meson: make modprobedatadir an option.
Date: Sun, 10 Apr 2022 14:32:05 +0200 [thread overview]
Message-ID: <20220410123205.6045-3-msuchanek@suse.de> (raw)
In-Reply-To: <20220410123205.6045-1-msuchanek@suse.de>
The modprobe.d directory location is hardcoded.
Fixes: 4e5faa1 ("build: Add meson build infrastructure")
Signed-off-by: Michal Suchanek <msuchanek@suse.de>
---
contrib/meson.build | 5 ++++-
meson_options.txt | 2 ++
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/contrib/meson.build b/contrib/meson.build
index 4ed3c20..ad63a50 100644
--- a/contrib/meson.build
+++ b/contrib/meson.build
@@ -24,5 +24,8 @@ if bashcompletiondir != 'no'
install_data('ndctl', rename : 'cxl', install_dir : bashcompletiondir)
endif
-modprobedatadir = get_option('sysconfdir') + '/modprobe.d/'
+modprobedatadir = get_option('modprobedatadir')
+if modprobedatadir == ''
+ modprobedatadir = get_option('modprobedatadir')
+endif
install_data('nvdimm-security.conf', install_dir : modprobedatadir)
diff --git a/meson_options.txt b/meson_options.txt
index aa4a6dc..3a68460 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -23,3 +23,5 @@ option('pkgconfiglibdir', type : 'string', value : '',
description : 'directory for standard pkg-config files')
option('bashcompletiondir', type : 'string',
description : '''${datadir}/bash-completion/completions''')
+option('modprobedatadir', type : 'string',
+ description : '''${sysconfdir}/modprobe.d/''')
--
2.35.1
next prev parent reply other threads:[~2022-04-10 12:32 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-04-10 12:32 [PATCH] namespace-action: Drop more zero namespace checks Michal Suchanek
2022-04-10 12:32 ` [PATCH] daxctl: Fix kernel option typo in "Soft Reservation" theory of operation Michal Suchanek
2022-04-10 12:32 ` Michal Suchanek [this message]
-- strict thread matches above, loose matches on Subject: below --
2022-03-10 13:30 [PATCH] meson: make modprobedatadir an option Michal Suchanek
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220410123205.6045-3-msuchanek@suse.de \
--to=msuchanek@suse.de \
--cc=nvdimm@lists.linux.dev \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.