From 531039d15c3fe34fcd373d0923e0c7a34786c58c Mon Sep 17 00:00:00 2001 From: Lee Duncan Date: Wed, 21 Sep 2022 09:33:56 -0700 Subject: 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 * Set ISCSI_CONFIG_ROOT by meson Signed-off-by: TIAN Yuanhao * Set LOCK_DIR from home_dir to lock_dir Signed-off-by: TIAN Yuanhao * Install iface.example to db_root/ifaces Signed-off-by: TIAN Yuanhao Signed-off-by: TIAN Yuanhao Co-authored-by: TIAN Yuanhao <78596099+tianyuanhao@users.noreply.github.com> Co-authored-by: TIAN Yuanhao --- Makefile | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 83db9d3..7efacc9 100644 --- a/Makefile +++ b/Makefile @@ -52,7 +52,13 @@ all: user make_utils: $(MAKE) $(MFLAGS) -C utils -user: iscsiuio/Makefile +deprecation_msg: + @echo "***" + @echo "*** Warning: using 'make' is being deprecated, in favor of 'meson'" + @echo "*** Please see the README file for more information." + @echo "***" + +user: deprecation_msg iscsiuio/Makefile $(MAKE) $(MFLAGS) -C libopeniscsiusr $(MAKE) $(MFLAGS) -C sysdeps $(MAKE) $(MFLAGS) -C usr -- cgit v1.2.1