DAOS-5551 build: Install into CONF_DIR (#4635)

There are a few remnants of files being installed into $PREFIX/etc. Move them to CONF_DIR. Signed-off-by: Brian J. Murrell <[email protected]>
daos-stack · Feb 17, 2021 · 13375a5 · 13375a5
1 parent a771e61
commit 13375a5
Show file tree

Hide file tree

Showing 10 changed files with 22 additions and 21 deletions.
diff --git a/SConstruct b/SConstruct
@@ -425,7 +425,7 @@ def scons(): # pylint: disable=too-many-locals
     daos_build.install(env, "lib/daos/", ['.build_vars.sh', '.build_vars.json'])
     env.Install("$PREFIX/lib64/daos", "VERSION")
 
-    env.Install('$PREFIX/etc/bash_completion.d', ['utils/completion/daos.bash'])
+    env.Install(conf_dir + '/bash_completion.d', ['utils/completion/daos.bash'])
     env.Install('$PREFIX/lib/daos/TESTING/ftest/util',
                 ['utils/sl/env_modules.py'])
     env.Install('$PREFIX/lib/daos/TESTING/ftest/',

diff --git a/debian/daos-tests.install b/debian/daos-tests.install
@@ -24,7 +24,7 @@ usr/bin/daos_gen_io_conf
 usr/bin/daos_run_io_conf
 usr/bin/crt_launch
 usr/bin/fault_status
-usr/etc/fault-inject-cart.yaml
+etc/daos/fault-inject-cart.yaml
 # For avocado tests
 usr/lib/daos/.build_vars.json
 usr/lib/daos/.build_vars.sh
diff --git a/debian/daos.install b/debian/daos.install
@@ -11,12 +11,12 @@ usr/bin/pl_bench
 usr/bin/rdbt
 usr/lib64/libvos.so
 usr/lib64/libdaos_common.so
-usr/etc/memcheck-cart.supp
-usr/etc/vos_size_input.yaml
+etc/daos/memcheck-cart.supp
+etc/daos/vos_size_input.yaml
 # TODO: this should move from daos_srv to daos
 usr/lib64/daos_srv/libplacement.so
 # Certificate generation files
 usr/lib64/daos/certgen/*
 usr/lib64/daos/VERSION
-usr/etc/bash_completion.d/daos.bash
+etc/bash_completion.d/daos.bash
 usr/lib64/libdaos_common_pmem.so
diff --git a/debian/rules b/debian/rules
@@ -57,7 +57,7 @@ override_dh_auto_install:
 	install -m 644 utils/systemd/daos_server.service ${buildroot}$(prefix)/lib/systemd/system
 	install -m 644 utils/systemd/daos_agent.service ${buildroot}$(prefix)/lib/systemd/system
 	mkdir -p ${buildroot}$(sysconfdir)/daos/certs/clients
-	find debian/tmp -type f | xargs ls -ld
+	mv ${buildroot}$(sysconfdir)/daos/bash_completion.d ${buildroot}$(sysconfdir)/
 
 override_dh_missing:
 	# we want builds to break if files are unpackaged

diff --git a/src/cart/SConscript b/src/cart/SConscript
@@ -61,6 +61,7 @@ def scons():
     Default('swim')
 
     Import('env', 'prereqs', 'swim_targets', 'gurt_lib', 'CART_VERSION')
+    Import('conf_dir')
 
     env.Alias('install', '$PREFIX')
 
@@ -121,8 +122,8 @@ def scons():
 
     Export('env', 'prereqs')
 
-    env.Install('$PREFIX/etc', ['utils/memcheck-cart.supp',
-                                'utils/fault-inject-cart.yaml'])
+    env.Install(conf_dir, ['utils/memcheck-cart.supp',
+                           'utils/fault-inject-cart.yaml'])
 
 
 if __name__ == "SCons.Script":

diff --git a/src/tests/ftest/cart/rpc/cart_rpc_one_node.yaml b/src/tests/ftest/cart/rpc/cart_rpc_one_node.yaml
@@ -59,11 +59,11 @@ tests: !mux
     name: test_group_basic
     test_servers_bin: crt_launch
     test_servers_arg: "-e ../tests/test_group_np_srv --name tg_srv_grp --use_cfg 0"
-    test_servers_env: "-x D_FI_CONFIG=/usr/etc/fault-inject-cart.yaml"
+    test_servers_env: "-x D_FI_CONFIG=/etc/daos/fault-inject-cart.yaml"
     test_servers_ppn: "1"
     test_clients_bin: ../tests/test_group_np_cli
     test_clients_arg: "--name client_group --attach_to tg_srv_grp"
-    test_clients_env: "-x D_FI_CONFIG=/usr/etc/fault-inject-cart.yaml"
+    test_clients_env: "-x D_FI_CONFIG=/etc/daos/fault-inject-cart.yaml"
     test_clients_ppn: "1"
   ep_credits_1:
     name: ep_credits_1

diff --git a/src/tests/ftest/cart/rpc/cart_rpc_two_node.yaml b/src/tests/ftest/cart/rpc/cart_rpc_two_node.yaml
@@ -59,11 +59,11 @@ tests: !mux
     name: test_group_basic
     test_servers_bin: crt_launch
     test_servers_arg: "-e ../tests/test_group_np_srv --name tg_srv_grp --use_cfg 0"
-    test_servers_env: "-x D_FI_CONFIG=/usr/etc/fault-inject-cart.yaml"
+    test_servers_env: "-x D_FI_CONFIG=/etc/daos/fault-inject-cart.yaml"
     test_servers_ppn: "1"
     test_clients_bin: ../tests/test_group_np_cli
     test_clients_arg: "--name client_group --attach_to tg_srv_grp"
-    test_clients_env: "-x D_FI_CONFIG=/usr/etc/fault-inject-cart.yaml"
+    test_clients_env: "-x D_FI_CONFIG=/etc/daos/fault-inject-cart.yaml"
     test_clients_ppn: "1"
   ep_credits_1:
     name: ep_credits_1

diff --git a/src/tests/ftest/config_file_gen.py b/src/tests/ftest/config_file_gen.py
@@ -113,7 +113,7 @@ def main():
         "",
         "Examples:",
         "\tconfig_file_gen.py -n host-10 -g daos_server -a "
-        "/usr/etc/daos_agent.yml -s /usr/etc/daos_server.yml",
+        "/etc/daos/daos_agent.yml -s /etc/daos/daos_server.yml",
         "",
         "Return codes:",
         "\t0 - all configuration files generated successfully",

diff --git a/src/vos/tests/SConscript b/src/vos/tests/SConscript
@@ -3,7 +3,7 @@ import daos_build
 
 def scons():
     """Execute build"""
-    Import('denv', 'prereqs', 'utest_utils')
+    Import('denv', 'prereqs', 'utest_utils', 'conf_dir')
 
     libraries = ['vos', 'bio', 'abt', 'pthread', 'daos_common_pmem',
                  'daos_tests', 'gurt', 'cart', 'uuid', 'pthread',
@@ -28,7 +28,7 @@ def scons():
                                  LIBS=libraries)
 
     denv.Install('$PREFIX/bin/', [vos_tests, evt_ctl])
-    denv.Install('$PREFIX/etc/', ['vos_size_input.yaml'])
+    denv.Install(conf_dir, ['vos_size_input.yaml'])
 
 if __name__ == "SCons.Script":
     scons()
diff --git a/utils/rpms/daos.spec b/utils/rpms/daos.spec
@@ -237,7 +237,7 @@ mkdir -p %{?buildroot}/%{_unitdir}
 install -m 644 utils/systemd/%{server_svc_name} %{?buildroot}/%{_unitdir}
 install -m 644 utils/systemd/%{agent_svc_name} %{?buildroot}/%{_unitdir}
 mkdir -p %{?buildroot}/%{conf_dir}/certs/clients
-mv %{?buildroot}/%{_prefix}/etc/bash_completion.d %{?buildroot}/%{_sysconfdir}
+mv %{?buildroot}/%{_sysconfdir}/daos/bash_completion.d %{?buildroot}/%{_sysconfdir}
 
 %pre server
 getent group daos_metrics >/dev/null || groupadd -r daos_metrics
@@ -279,9 +279,9 @@ getent passwd daos_agent >/dev/null || useradd -s /sbin/nologin -r -g daos_agent
 %{_libdir}/libvos.so
 %{_libdir}/libcart*
 %{_libdir}/libgurt*
-%{_prefix}/%{_sysconfdir}/memcheck-cart.supp
-%dir %{_prefix}%{_sysconfdir}
-%{_prefix}%{_sysconfdir}/vos_size_input.yaml
+%{_sysconfdir}/daos/memcheck-cart.supp
+%dir %{_sysconfdir}/daos
+%{_sysconfdir}/daos/vos_size_input.yaml
 %dir %{_sysconfdir}/bash_completion.d
 %{_sysconfdir}/bash_completion.d/daos.bash
 %{_libdir}/libdaos_common.so
@@ -400,7 +400,7 @@ getent passwd daos_agent >/dev/null || useradd -s /sbin/nologin -r -g daos_agent
 %{_bindir}/daos_run_io_conf
 %{_bindir}/crt_launch
 %{_bindir}/daos_metrics
-%{_prefix}/etc/fault-inject-cart.yaml
+%{_sysconfdir}/daos/fault-inject-cart.yaml
 %{_bindir}/fault_status
 # For avocado tests
 %{_prefix}/lib/daos/.build_vars.json
@@ -418,7 +418,7 @@ getent passwd daos_agent >/dev/null || useradd -s /sbin/nologin -r -g daos_agent
 * Tue Feb 9 2021 Vish Venkatesan <[email protected]> 1.1.2.1-11
 - Add new pmem specific version of DAOS common library
 
-* Fri Feb 6 2021 Saurabh Tandan <[email protected]> 1.1.2.1-10
+* Fri Feb 5 2021 Saurabh Tandan <[email protected]> 1.1.2.1-10
 - Added dbench as requirement for test package.
 
 * Wed Feb 3 2021 Hua Kuang <[email protected]> 1.1.2.1-9