|
 |
e0018b |
From 524ad09d5eda320b299468324a2f94fc1802ef00 Mon Sep 17 00:00:00 2001
|
|
|
e0018b |
From: Michal Suchanek <msuchanek@suse.de>
|
|
|
e0018b |
Date: Thu, 10 Mar 2022 14:30:55 +0100
|
|
|
e0018b |
Subject: [PATCH 168/217] meson: make modprobedatadir an option
|
|
|
e0018b |
|
|
|
e0018b |
The modprobe.d directory location is hardcoded.
|
|
|
e0018b |
|
|
|
e0018b |
Link: https://lore.kernel.org/r/20220310133055.GA106731@kunlun.suse.cz
|
|
|
e0018b |
Fixes: 4e5faa1 ("build: Add meson build infrastructure")
|
|
|
e0018b |
Signed-off-by: Michal Suchanek <msuchanek@suse.de>
|
|
|
e0018b |
Signed-off-by: Vishal Verma <vishal.l.verma@intel.com>
|
|
|
e0018b |
---
|
|
|
e0018b |
contrib/meson.build | 5 ++++-
|
|
|
e0018b |
meson_options.txt | 2 ++
|
|
|
e0018b |
2 files changed, 6 insertions(+), 1 deletion(-)
|
|
|
e0018b |
|
|
|
e0018b |
diff -up ndctl-71.1/contrib/meson.build.orig ndctl-71.1/contrib/meson.build
|
|
|
e0018b |
--- ndctl-71.1/contrib/meson.build.orig 2022-10-07 16:42:24.750025016 -0400
|
|
|
e0018b |
+++ ndctl-71.1/contrib/meson.build 2022-10-07 16:42:39.374074806 -0400
|
|
|
e0018b |
@@ -24,5 +24,8 @@ if bashcompletiondir != 'no'
|
|
|
e0018b |
install_data('ndctl', rename : 'cxl', install_dir : bashcompletiondir)
|
|
|
e0018b |
endif
|
|
|
e0018b |
|
|
|
e0018b |
-modprobedatadir = get_option('sysconfdir') + '/modprobe.d/'
|
|
|
e0018b |
+modprobedatadir = get_option('modprobedatadir')
|
|
|
e0018b |
+if modprobedatadir == ''
|
|
|
e0018b |
+ modprobedatadir = get_option('modprobedatadir')
|
|
|
e0018b |
+endif
|
|
|
e0018b |
install_data('nvdimm-security.conf', install_dir : modprobedatadir)
|
|
|
e0018b |
diff -up ndctl-71.1/meson_options.txt.orig ndctl-71.1/meson_options.txt
|
|
|
e0018b |
--- ndctl-71.1/meson_options.txt.orig 2022-10-07 16:42:39.375074810 -0400
|
|
|
e0018b |
+++ ndctl-71.1/meson_options.txt 2022-10-07 16:43:10.553180961 -0400
|
|
|
e0018b |
@@ -23,3 +23,5 @@ option('pkgconfiglibdir', type : 'string
|
|
|
e0018b |
description : 'directory for standard pkg-config files')
|
|
|
e0018b |
option('bashcompletiondir', type : 'string',
|
|
|
e0018b |
description : '''${datadir}/bash-completion/completions''')
|
|
|
e0018b |
+option('modprobedatadir', type : 'string',
|
|
|
e0018b |
+ description : '''${sysconfdir}/modprobe.d/''')
|