diff options
author | Lee Duncan <lduncan@suse.com> | 2022-09-21 09:33:56 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-09-21 09:33:56 -0700 |
commit | 531039d15c3fe34fcd373d0923e0c7a34786c58c (patch) | |
tree | 0948146a9f7ae95fbcf081550504a8d0d8aa55f5 /usr | |
parent | 7726ecc89015edb49057473a605c63ac9354f5cb (diff) | |
download | open-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 'usr')
-rw-r--r-- | usr/fwparam_ibft/meson.build | 6 | ||||
-rw-r--r-- | usr/meson.build | 56 |
2 files changed, 62 insertions, 0 deletions
diff --git a/usr/fwparam_ibft/meson.build b/usr/fwparam_ibft/meson.build new file mode 100644 index 0000000..9fa4a17 --- /dev/null +++ b/usr/fwparam_ibft/meson.build @@ -0,0 +1,6 @@ +fwparam_files = files([ + 'fw_entry.c', + 'fwparam_ppc.c', + 'fwparam_sysfs.c', + 'prom_lex.c', + 'prom_parse.tab.c']) diff --git a/usr/meson.build b/usr/meson.build new file mode 100644 index 0000000..b2bfe60 --- /dev/null +++ b/usr/meson.build @@ -0,0 +1,56 @@ +subdir('fwparam_ibft') + +iscsi_lib_srcs = [ + 'iscsi_util.c', + 'io.c', + 'auth.c', + 'iscsi_timer.c', + 'login.c', + 'log.c', + 'iface.c', + 'idbm.c', + 'sysfs.c', + 'host.c', + 'session_info.c', + 'iscsi_sysfs.c', + 'iscsi_net_util.c', + 'iscsid_req.c', + 'transport.c', + 'iser.c', + 'cxgbi.c', + 'be2iscsi.c', + 'initiator_common.c', + 'iscsi_err.c', + 'flashnode.c', + 'uip_mgmt_ipc.c', + 'netlink.c'] +initiator_srcs = [ + 'initiator.c', + 'scsi.c', + 'actor.c', + 'event_poll.c', + 'mgmt_ipc.c', + 'kern_err_table.c'] +discovery_srcs = [ + 'local_strings.c', + 'discovery.c'] +iscsid_srcs = [ + 'iscsid.c', + 'session_mgmt.c', + 'discoveryd.c', + 'mntcheck.c'] +iscsiadm_srcs = [ + 'iscsiadm.c', + 'session_mgmt.c', + 'mntcheck.c'] +iscsistart_srcs = [ + 'iscsistart.c'] + +iscsid_src_files = files([iscsi_lib_srcs, initiator_srcs, discovery_srcs, iscsid_srcs]) +iscsiadm_src_files = files([iscsi_lib_srcs, discovery_srcs, iscsiadm_srcs]) +iscsistart_src_files = files([iscsi_lib_srcs, initiator_srcs, iscsistart_srcs]) + +iscsi_usr_arr = { + 'iscsid': iscsid_src_files, + 'iscsiadm': iscsiadm_src_files, + 'iscsistart': iscsistart_src_files} |