summaryrefslogtreecommitdiff
path: root/Makefile
Commit message (Collapse)AuthorAgeFilesLines
* Preparing for version 2.1.8. (#370)Lee Duncan2022-09-261-1/+1
|
* Use meson as the main build system (#365)Lee Duncan2022-09-211-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
* Small bug fixes (#364)Lee Duncan2022-09-061-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * build: move utils/sysdeps to top-level The routines here are used by iscsiuio, so move them to the top level. * libopeniscsiusr: fix kernel-doc bugs There were errors in four places, effecting the generated manual pages. * libopeniscsiusr: clean up kernel-doc usage Simplify generation of library interface documentation using the kernel-doc script: * make the kernel-doc perl script executble (the only visible change) * remove mention of sed (not used) * stop compressing man pages -- let distros do that * improve kernel-doc so that doc-preclean.pl and split-man.pl are no longer needed * add list-man-pages.sh to simplify things (copied from libnvme) * build: keep current version number in one place Move the current version number (now 2.1.7) into the top-level Makefile, and out of usr/version.h and libopeniscsiusr/version.h, completely eliminating the need for the latter. Note that this ties the libopeniscsiusr library idea of "version" to the usr/ (iscsid, etc) idea of version, even though they used to be defined separately. But they always had the same value, so nothing lost. * build: insteall man pages uncompressed We were delivering some man pages compressed and other not, and it turns out distros know how to install man pages using the compression they prefer, so stop doing it for them.
* Add a 'distclean' Makefile top-level targetLee Duncan2022-05-091-9/+11
| | | | | | | | | | This cleans up a little more than "make clean", in particular removing files generated from templates, and automake-generated files in iscsiuio. Also, a ".PHONY:" target was added where needed so that each Makefile has a complete list of phony targets.
* Build: add RULESDIR to top-level MakefileLee Duncan2022-04-041-1/+2
| | | | | | | Commit 9a2d2f2cf391 ("Make DB and ISCSIHOME directories configurable.") added use of RULESDIR in utils/Makefile, but it needs to be passed down from the top-level Makefile, as well, for it to be configurable at build time.
* Build: remove unused Makefile HOMEDIR creationLee Duncan2022-04-041-3/+0
| | | | | The "HOMEDIR" (/etc/iscsi by default) is no referenced in the top-level Makefile, so no need to create it here.
* Use DESTDIR correctly for HOMEDIR and DBROOTLee Duncan2022-04-031-1/+1
| | | | | | The top-level Makefile was adding in DESTDIR to HOMEDIR and DBROOT before passing them down to etc, where DESTDIR was being added again.
* Build: upate "depend" target to include sysdepsLee Duncan2022-03-311-1/+1
|
* Build: Cleanup fwparam_ibft and sysdeps subdirs.Lee Duncan2022-03-311-2/+0
| | | | | | | | | | | | This commit moves the "fwparam_ibft" subdirectory from being under "utils" to being under "usr", where its actually used. It also updates usr/Makefile so that it's smarter about how and when to build the fwparam_ibft object files it needs, as well as how to build sysdeps.o. From the top-level Makefile, "make user" will now make the fwparam_ibft files, as needed for the "user" targets, before building iscsid and friends.
* Make DB and ISCSIHOME directories configurable.Lee Duncan2022-03-251-32/+31
| | | | | | | | | | | | | | | | | | | | This commit adds two new top-level build options: one for the "home" directory for open-iscsi called "HOMEDIR", and one for the "database" directory, called "DBROOT". One can now override the defaults of "/etc/iscsi" for either or both of these directories on the make command line. The README and man pages are updated with details about these new options. Some Makefile cleanup/repair was done as well. Installation of the initiatorname.iscsi file, was moved out of the top-level Makefile into the etc subdirectory, and installation of man ages moved from the top-level Makefile to the doc subdirectory. Also, this fixes some issues from commit fd14dd8316b1 ("Clean p Makefile build system."), which incorrectly changed the DESTDIR ariable in the Makefiles. This current commit also fixes the top-level variable names for moving DBROOT and HOMEDIR.
* Remove no-longer-used Makefile target for subdirLee Duncan2022-03-231-5/+5
| | | | | | Commit fd14dd8316b1 ("Clean up Makefile build system.") cleaned up the Makefiles, but it left install_etc in the top-level Makefile, which is not used. Removed it.
* Clean up Makefile build system.Lee Duncan2022-03-201-85/+33
| | | | | | | | | | | | | | | | | | | | | | | A major overdue overhaul of the Make layout, including moving lots of lower-level things out of the top-level Makefile into the Makefiles for the appropriate subdirectory, renaming the template files (where @SBINDIR@ gets translated) so that their purpose is more obvious, making the build more idempotent (no need to install a file if it's not newer). Should be no functional change, as no script or C file changed. Main difference from before: now the udev rules gets made and installed by default (as part of "make"/"make install"), and the iscsiuio daemon is now installed for "make install". One should now be able to go into any subdirectory and type "make"/"make install" to build and install the targets from that directory, at least for the etc, utils, and usr subdirectories. This change is in preparation for more template translations coming.
* General Makefile/README cleanupLee Duncan2022-03-171-15/+15
| | | | | | | Cleaning up the Makefiles, in preperation for adding the ability to move files out of /etc/iscsi more easily. Also, clean up the README file by updating it with help updated help messages, alignment, and those pesky spaces at the ends of lines.
* Remove SUSE init.d startup filesLee Duncan2022-03-151-10/+1
| | | | These files have not been used for years.
* Fix wrong install_systemd destination pathWenchao Hao2022-01-281-1/+1
| | | | | | | | | Previous implement would installl systemd files to "/usr/lib/systemd/system/system" which should be "/usr/lib/systemd/system". Fix this by updating variable systemddir. Signed-off-by: Wenchao Hao <haowenchao@huawei.com>
* Install new man page for iscsi-gen-initiatornameLee Duncan2021-12-031-1/+1
|
* remove redundant params in MakefileLee Duncan2021-11-111-1/+1
| | | | remove a merge error
* Finish ability to have binary location configurable.Lee Duncan2021-10-281-6/+16
| | | | | | | | | | A Recent commit, fff82c57f5df ("Use "sbindir" for path in systemd service files") added the ability to have our binaries in another location rather than /sbin (e.g. /usr/sbin), but it was incomplete. This commit finishes the job. Fixes: fff82c57f5dfe6d3db795f1195b4d2ebc497d33c
* Use "sbindir" for path in systemd service filesLee Duncan2021-09-301-0/+4
| | | | | | | | | | Use a variable for the sbin directory where executables go in our systemd unit files, so that the files can be configured, during installation, to have the correct path, instead of just hard-coding these paths. Now "make sbindir=/SOME/PATH ..." works correctly for different paths.
* Add etc/systemd/iscsi-init.service to SYSTEMDFILES Makefile variableJohn Schaeffer2020-12-271-0/+1
| | | | | | | | | | iscsi-init.service is not included in the SYSTEMDFILES Makefile variable, causing it to be skipped when the install_systemd rule is executed. This causes the iscsi systemd service to fail on a fresh install, as it requires the iscsi-init service. This commit adds etc/systemd/iscsi-init.service to the list of files in SYSTEMDFILES to correct this issue.
* Add target to install systemd unitsDaniel Schaefer2019-08-291-0/+8
|
* Handle systemd disablement correctly in iscsiuioLee Duncan2019-06-051-1/+4
| | | | | | | | | | | Commit c1870ae6dddb7bc2dbdc750df68edbbe1a80763f added systemd support to iscsiuio, but it was not integrated with the autoconf script there, so this commit rectifies that. Now one can build without systemd support, from the top, using: $ make OPTFLAGS="... -DNO_SYSTEMD ... which now works for both iscsid and iscsiuio.
* Make iscsid systemd usage optionalLee Duncan2019-05-141-0/+5
| | | | | | | | | You can compile without system now by using something like: make OPTFLAGS="-DNO_SYSTEMD ..." NO_SYSTEMD=1 This will skip systemd code for iscsid and iscsiuio.
* iscsistart is not installedLee Duncan2018-10-241-1/+2
| | | | | Found by dualdm on github, who suggested a fix but then went away, so this is submitted for him.
* Makefile: Trivial change on aligning output.Gris Ge2018-04-031-1/+1
| | | | Signed-off-by: Gris Ge <fge@redhat.com>
* remove kernel subdir from clean Makefile targetLee Duncan2018-01-221-1/+0
| | | | the kernel subdirectory no longer exists
* Introducing iSCSI userspace library.Gris Ge2018-01-221-1/+10
| | | | | | | | | | * This is the initial patch of the library libopenscsiusr.so, so we have no actual code on iscsi functionality, just introduce a code layout. * The library is created by following the guideline of libabc. * Documentation is done by using linux kernel-doc script generating manpages out of header files. Signed-off-by: Gris Ge <fge@redhat.com>
* Remove white spaces.Gris Ge2018-01-191-1/+1
| | | | Signed-off-by: Gris Ge <fge@redhat.com>
* Add some scripts and manpages to the top Makefile.Lee Duncan2018-01-181-2/+4
| | | | | This is just cleanup, as these scripts and man pages are present but just not named in the top-level Makefile.
* Merge pull request #80 from cleech/masterLee Duncan2018-01-171-14/+1
|\ | | | | Repo cleanup, delete old kernel stuff and unused stub code
| * delete old kernel codeChris Leech2018-01-161-14/+1
| | | | | | | | | | | | The out of tree kernel code in this repo has not been maintained for a very long time. We're only maintaining the user-space tools here, the kernel side is in the Linux kernel.
* | Automate logging into iSCSI FW targets.Lee Duncan2018-01-161-3/+11
|/ | | | | | | Add a script that logs into all iSCSI firmware targets, and add a udev rule to call that script when new targets are detected. Also, add a man page for the script.
* Use system-wide open-isns, not internal version.Lee Duncan2015-08-241-8/+2
| | | | | | | This preceeds removing of the internal version of open-isns. All open-isns includes are changed from "file.h" to <libisns/file.h>, and the Makefiles remove all use of the local open-isns files.
* buildsys: respect CFLAGS and LDFLAGS from the outsideChristian Seiler2015-06-051-1/+12
| | | | | | | | | | | | Make the build systsem respect CFLAGS and LDFLAGS set from the outside. Previously, OPTFLAGS could be set to alter CFLAGS (which were overridden completely), but that is non-standard, so also check for user-set CFLAGS. This will make life easier when packaging this for distributions. If OPTFLAGS is set, prefer that to CFLAGS to retain the old behavior in that case (and not break current builds). Additionally, also use LDFLAGS for linking the binaries, which was not respected at all previously.
* buildsys: make 'make clean' idempotentChristian Seiler2015-06-051-3/+4
| | | | | Make sure 'make clean' will always succeed. Also make distclean in iscsiuio subdirectory.
* Add missing DESTDIRLee Duncan2014-01-311-3/+3
| | | | | | | | Several Makefile targets are missing DESTDIR, making it hard for packagers. Signed-off-by: Lee Duncan <lduncan@suse.com> Signed-off-by: Hannes Reinecke <hare@suse.de>
* iscsiuio: Update automake filesHannes Reinecke2014-01-311-0/+3
| | | | | | | The automake files from iscsiuio are somewhat oldish. So update them to the current standard. Signed-off-by: Hannes Reinecke <hare@suse.de>
* ISCSID: Modified the Makefile for iscsiuio compilationEddie Wai2013-05-281-3/+9
| | | | | | | This patch modifies the open-iscsi Makefile to include the compilation, binary/manpage install, and clean of the iscsiuio source. Signed-off-by: Eddie Wai <eddie.wai@broadcom.com>
* Do not run configure for open-isns on every buildMike Christie2011-10-101-2/+5
| | | | | | | | We only need to run configure in open-isns if either the configure script or Makefile.in has changed. Otherwise it's perfectly okay just to call a plain 'make' here. Signed-off-by: Hannes Reinecke <hare@suse.de>
* iscsi tools/kernel: switch make defaultsMike Christie2011-03-091-2/+2
| | | | | | | | | | | | | | | | | With stable kernels and the iscsi kernel modules stablizing, there is less of a need to distribute kernel modules with the tarball. I also do not have time to update and maintain ports of the modules for so many kernels. So this patch changes the build default behavior. Running "make" use to build the kernel modules and tools. Now, it will only create the tools. "make install" used to install the tools and kernel modules and now it only installs the tools. I am not removing the kernel modules, but I will not be updating them anymore. They will remain for users of very old kernels. To build you now need to do and to install do
* iscsi tools: disable isns dsa codeMike Christie2011-01-311-1/+1
| | | | | | For discovery we do not use the isns dsa code but still build against libcrypto. This disables the code until we add support.
* Fix makefile cleanupMike Christie2010-03-221-1/+2
| | | | | | | Mv isns cleanup to last step incase it has not been built. It will then not stop the makefile from other processing. Signed-off-by: Mike Christie <michaelc@cs.wisc.edu>
* iscsi tools: use open-isns servicesMike Christie2010-03-221-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This replaces the native isns code with open-isns's libisns. I included the open-isns code in the open-iscsi tarball to make distribution easier since some distros use different isns clients and may not want to carry open-isns. This is based on open-isns commit 5e09f36d3446e41de0b8361601ffec4cd140d513. Changes in iSNS behavior/use: - To do discovery you must pass the ip and optionally the port to iscsiadm: iscsiadm -m discovery -t st -p 10.15.0.9 This command accepts the same ops as sendtargets so you can add/remove/update the node records that are created. It also supports ifaces properly now. - isns.address and isns.port in iscsid.conf are no longer used. - ESI is temporarily not supported. This will be fixed in the next patch when SCNs support is added. - The iscsiadm isns discovery command is not marked as stable. Signed-off-by: Mike Christie <michaelc@cs.wisc.edu>
* Use DESTDIR when generating an InitiatorName.Wulf C. Krueger2010-01-061-2/+2
| | | | | | | For packaging, it's very useful to to check for /etc/iscsi/initiatorname.iscsi in the real filesystem but if we have to generate a new one, this should be done inside DESTDIR and not in the real filesystem as we might be in a sandboxed environment without being able to write anywhere else.
* iscsi tool make: add notification that iscsi start was madeMike Christie2009-02-071-0/+1
| | | | When doing a make notify user that iscsistart was built.
* iscsi tools: convert from strncat to strlcatMike Christie2009-02-071-0/+2
| | | | | We messed up strncat in so many different ways that strlat could fix. This patch converts the userspace uses of strncat to strlcat.
* open-iscsi: Makefile: separate out user: and kernel: make targetsBoaz Harrosh2009-02-071-11/+14
| | | | | | | | Separate out the build of "kernel:" and "user:" targets. [Mike please revisit the @echo output if we need anything added] Signed-off-by: Boaz Harrosh <bharrosh@panasas.com>
* build: add a make userMike Christie2009-01-231-9/+15
| | | | | | | | | | | | | Users may want to install the userspace tools but use the distro kernel modules. This adds a make user to build the userspace tools. And it adds a make user_install to install the userspace tools.
* Update SUSE init scriptsHannes Reinecke2008-04-091-0/+2
| | | | | | | | | These are some updates to the SUSE init scripts, plus a new boot.open-iscsi script for SUSE. The latter is used for root on iscsi, to start iscsid as early as possible to avoid deadlocks on the root fs. Signed-off-by: Hannes Reinecke <hare@suse.de>
* fix up Makefile install_etc fixMike Christie2007-12-141-2/+2
| | | | | | from Albert: Need some ;\ to break up lines.
View Lorry Controller Status