summaryrefslogtreecommitdiff
path: root/etc
diff options
context:
space:
mode:
authorLee Duncan <lduncan@suse.com>2022-09-21 09:33:56 -0700
committerGitHub <noreply@github.com>2022-09-21 09:33:56 -0700
commit531039d15c3fe34fcd373d0923e0c7a34786c58c (patch)
tree0948146a9f7ae95fbcf081550504a8d0d8aa55f5 /etc
parent7726ecc89015edb49057473a605c63ac9354f5cb (diff)
downloadopen-iscsi-531039d15c3fe34fcd373d0923e0c7a34786c58c.tar.gz
Use meson as the main build system (#365)
* Build: Add an iscsiuio 'build_date.sh' script This is currently unused, but will be used by meson to build the "build_date.[ch]" files used by iscsiuio. * Build: have git ignore file '.setup' I commonly use this file for shell aliases/functions. * Add framework to support building using meson. This adds the ability to use meson/ninja to build open-iscsi and iscsiuio, rather than the current system that uses 'autoconf' for iscsiuio and uses 'make' for everything else. The old make/autoconf system is left in place, for now, but deprecated, including a warning about that when running 'make all' or 'make user' from the top-level. * utils/build: enhance iscsi-iname to generate prefix Added new "-g/--generate-iname-prefix" argument to generate the InitiatorName= prefix. Also, updated iscsi-iname to use getopts. Also, use the new option from meson. * git/meson: remove 'builddir' from ignored files The build directory can be called anything. Suggested by: Eli Schwartz * iscsiuio build: fix new build_date.sh script Fixed several issues: - fix option handling for "-S" - fix epoch date handling from env (noticed by Eli Schwartz) - remove debug statements * iscsiuio meson: warn when not creating a symlink for iscsiuio * meson: install man pages more efficiently We don't need to specify path or subdirectory * iscsiuio meson: remove unused source date epoch option This option was never used, since we pass this info from the environment. * meson: no need to set libdir: default is fine * iscsiuio meson: no need to add c_args: already there * Don't generate initiatorname when cross-building (#367) Let it be generated by the iscsi-init service. Signed-off-by: TIAN Yuanhao <tianyuanhao3@163.com> * Set ISCSI_CONFIG_ROOT by meson Signed-off-by: TIAN Yuanhao <tianyuanhao3@163.com> * Set LOCK_DIR from home_dir to lock_dir Signed-off-by: TIAN Yuanhao <tianyuanhao3@163.com> * Install iface.example to db_root/ifaces Signed-off-by: TIAN Yuanhao <tianyuanhao3@163.com> Signed-off-by: TIAN Yuanhao <tianyuanhao3@163.com> Co-authored-by: TIAN Yuanhao <78596099+tianyuanhao@users.noreply.github.com> Co-authored-by: TIAN Yuanhao <tianyuanhao3@163.com>
Diffstat (limited to 'etc')
-rw-r--r--etc/meson.build9
-rw-r--r--etc/systemd/meson.build16
2 files changed, 25 insertions, 0 deletions
diff --git a/etc/meson.build b/etc/meson.build
new file mode 100644
index 0000000..3d44f54
--- /dev/null
+++ b/etc/meson.build
@@ -0,0 +1,9 @@
+# meson build file for etc
+
+subdir('systemd')
+
+# for our interface example file
+iscsi_etc_iface_file_src = files('iface.example')
+
+# for our config file
+iscsi_etc_config_file_src = files('iscsid.conf')
diff --git a/etc/systemd/meson.build b/etc/systemd/meson.build
new file mode 100644
index 0000000..90082c7
--- /dev/null
+++ b/etc/systemd/meson.build
@@ -0,0 +1,16 @@
+#
+# iscsi systemd stuff
+#
+
+# templated systemd service files
+iscsi_etc_systemd_service_units = ['iscsi-init', 'iscsid', 'iscsi', 'iscsiuio']
+iscsi_etc_systemd_service_units_arr = {}
+foreach u: iscsi_etc_systemd_service_units
+ iscsi_etc_systemd_service_units_arr += {u + '.service': files(u + '.service.template')}
+endforeach
+
+# socket files
+iscsi_etc_systemd_socket_units = files(['iscsid.socket', 'iscsiuio.socket'])
+
+# systemd generator file
+iscsi_etc_systemd_generator_src = files('ibft-rule-generator')