X-Git-Url: https://code.grnet.gr/git/ganeti-local/blobdiff_plain/6b604e1d251756b3a62ec7f82e6320c7feb10bcf..f1b816b72e895bab13041ca570d7f72fb72987ed:/Makefile.am diff --git a/Makefile.am b/Makefile.am index 65ad570..d00379d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -40,9 +40,31 @@ CONVERT_CONSTANTS = $(top_srcdir)/autotools/convert-constants BUILD_RPC = $(top_srcdir)/autotools/build-rpc SHELL_ENV_INIT = autotools/shell-env-init -# starting as of Ganeti 2.10, all files are stored in a single directory, +# starting as of Ganeti 2.10, all files are stored in two directories, # with only symbolic links added at other places. -versiondir = $(libdir)/ganeti-$(VERSION) +# +# $(versiondir) contains most of Ganeti and all architecture-dependent files +# $(versionedsharedir) contains only architecture-independent files; all python +# executables need to go directly to $(versionedsharedir), as all ganeti python +# mdules are installed outside the usual python path, i.e., as private modules. +# +# $(defaultversiondir) and $(defaultversionedsharedir) are the corresponding +# directories for "the currently running" version of Ganeti. We never install +# there, but all symbolic links go there, rather than directory to $(versiondir) +# or $(versionedsharedir). Note that all links to $(default*dir) need to be stable; +# so, if some currently architecture-independent executable is replaced by an +# architecture-dependent one (and hence has to go under $(versiondir)), add a link +# under $(versionedsharedir) but do not change the external links. +if USE_VERSION_FULL +DIRVERSION=$(VERSION_FULL) +else +DIRVERSION=$(VERSION_MAJOR).$(VERSION_MINOR) +endif +versiondir = $(libdir)/ganeti/$(DIRVERSION) +defaultversiondir = $(libdir)/ganeti/default +versionedsharedir = $(prefix)/share/ganeti/$(DIRVERSION) +defaultversionedsharedir = $(prefix)/share/ganeti/default + # Note: these are automake-specific variables, and must be named after # the directory + 'dir' suffix @@ -50,8 +72,12 @@ pkglibdir = $(versiondir)$(libdir)/ganeti myexeclibdir = $(pkglibdir) bindir = $(versiondir)$(exec_prefix)/bin sbindir = $(versiondir)$(exec_prefix)/sbin -mandir = $(versiondir)$(datarootdir)/man -pkgpythondir = $(versiondir)$(pythondir)/ganeti +mandir = $(versionedsharedir)$(datarootdir)/man +pkgpythondir = $(versionedsharedir)/ganeti +gntpythondir = $(versionedsharedir) +pkgpython_bindir = $(versionedsharedir) +gnt_python_sbindir = $(versionedsharedir) +tools_pythondir = $(versionedsharedir) clientdir = $(pkgpythondir)/client cmdlibdir = $(pkgpythondir)/cmdlib @@ -71,16 +97,15 @@ pytoolsdir = $(pkgpythondir)/tools docdir = $(versiondir)$(datadir)/doc/$(PACKAGE) SYMLINK_TARGET_DIRS = \ - $(pythondir) \ + $(sysconfdir)/ganeti \ $(libdir)/ganeti/iallocators \ + $(libdir)/ganeti/tools \ + $(prefix)/share/ganeti \ $(exec_prefix)/bin \ $(exec_prefix)/sbin \ $(datarootdir)/man/man1 \ $(datarootdir)/man/man7 \ $(datarootdir)/man/man8 -SYMLINK_DIRS = \ - $(pythondir)/ganeti \ - $(libdir)/ganeti/tools # Delete output file if an error occurred while building it .DELETE_ON_ERROR: @@ -213,6 +238,7 @@ CLEANFILES = \ $(addsuffix /*.hi,$(HS_DIRS)) \ $(addsuffix /*.o,$(HS_DIRS)) \ $(PYTHON_BOOTSTRAP) \ + $(gnt_python_sbin_SCRIPTS) \ epydoc.conf \ $(REPLACE_VARS_SED) \ $(SHELL_ENV_INIT) \ @@ -237,6 +263,7 @@ CLEANFILES = \ stamp-directories \ stamp-srclinks \ $(nodist_pkgpython_PYTHON) \ + $(gnt_scripts) \ $(HS_ALL_PROGS) $(HS_BUILT_SRCS) \ $(HS_BUILT_TEST_HELPERS) \ src/ganeti-confd \ @@ -249,7 +276,8 @@ CLEANFILES = \ GENERATED_FILES = \ $(built_base_sources) \ $(BUILT_PYTHON_SOURCES) \ - $(PYTHON_BOOTSTRAP) + $(PYTHON_BOOTSTRAP) \ + $(gnt_python_sbin_SCRIPTS) HS_GENERATED_FILES = if WANT_HTOOLS @@ -268,7 +296,6 @@ built_base_sources = \ stamp-srclinks built_python_base_sources = \ - lib/_autoconf.py \ lib/_constants.py \ lib/_vcsversion.py \ lib/opcodes.py @@ -295,6 +322,12 @@ BUILT_EXAMPLES = \ nodist_pkgpython_PYTHON = \ $(BUILT_PYTHON_SOURCES) +nodist_pkgpython_bin_SCRIPTS = \ + $(nodist_pkglib_python_scripts) + +pkgpython_bin_SCRIPTS = \ + $(pkglib_python_scripts) + noinst_PYTHON = \ lib/build/__init__.py \ lib/build/shell_example_lexer.py \ @@ -450,6 +483,7 @@ utils_PYTHON = \ lib/utils/retry.py \ lib/utils/storage.py \ lib/utils/text.py \ + lib/utils/version.py \ lib/utils/wrapper.py \ lib/utils/x509.py @@ -475,6 +509,8 @@ docinput = \ doc/design-device-uuid-name.rst \ doc/design-draft.rst \ doc/design-hotplug.rst \ + doc/design-glusterfs-ganeti-support.rst \ + doc/design-daemons.rst \ doc/design-htools-2.3.rst \ doc/design-http-server.rst \ doc/design-impexp2.rst \ @@ -485,6 +521,7 @@ docinput = \ doc/design-network.rst \ doc/design-node-add.rst \ doc/design-oob.rst \ + doc/design-openvswitch.rst \ doc/design-ovf-support.rst \ doc/design-opportunistic-locking.rst \ doc/design-optables.rst \ @@ -501,6 +538,7 @@ docinput = \ doc/design-hroller.rst \ doc/design-storagetypes.rst \ doc/design-upgrade.rst \ + doc/design-hsqueeze.rst \ doc/devnotes.rst \ doc/glossary.rst \ doc/hooks.rst \ @@ -547,14 +585,20 @@ HS_PROGS = $(HS_BIN_PROGS) $(HS_MYEXECLIB_PROGS) HS_BIN_ROLES = harep hbal hscan hspace hinfo hcheck hroller HS_HTOOLS_PROGS = $(HS_BIN_ROLES) hail -HS_ALL_PROGS = \ - $(HS_PROGS) \ +# Haskell programs that cannot be disabled at configure (e.g., unlike +# 'mon-collector') +HS_DEFAULT_PROGS = \ + $(HS_BIN_PROGS) \ test/hs/hpc-htools \ test/hs/hpc-mon-collector \ test/hs/htest \ $(HS_COMPILE_PROGS) -HS_PROG_SRCS = $(patsubst %,%.hs,$(HS_ALL_PROGS)) src/hs2py-constants.hs +HS_ALL_PROGS = $(HS_DEFAULT_PROGS) $(HS_MYEXECLIB_PROGS) + +HS_PROG_SRCS = $(patsubst %,%.hs,$(HS_DEFAULT_PROGS)) \ + src/mon-collector.hs \ + src/hs2py-constants.hs HS_BUILT_TEST_HELPERS = $(HS_BIN_ROLES:%=test/hs/%) test/hs/hail HFLAGS = \ @@ -686,6 +730,7 @@ HS_TEST_SRCS = \ test/hs/Test/Ganeti/Common.hs \ test/hs/Test/Ganeti/Confd/Types.hs \ test/hs/Test/Ganeti/Confd/Utils.hs \ + test/hs/Test/Ganeti/Constants.hs \ test/hs/Test/Ganeti/Daemon.hs \ test/hs/Test/Ganeti/Errors.hs \ test/hs/Test/Ganeti/HTools/Backend/Simu.hs \ @@ -693,6 +738,7 @@ HS_TEST_SRCS = \ test/hs/Test/Ganeti/HTools/CLI.hs \ test/hs/Test/Ganeti/HTools/Cluster.hs \ test/hs/Test/Ganeti/HTools/Container.hs \ + test/hs/Test/Ganeti/HTools/ExtLoader.hs \ test/hs/Test/Ganeti/HTools/Graph.hs \ test/hs/Test/Ganeti/HTools/Instance.hs \ test/hs/Test/Ganeti/HTools/Loader.hs \ @@ -750,7 +796,7 @@ doc/man-html/index.html: ENABLE_MANPAGES = 1 doc/man-html/index.html: doc/manpages-enabled.rst $(mandocrst) # Note: we use here an order-only prerequisite, as the contents of -# _autoconf.py are not actually influencing the html build output: it +# _constants.py are not actually influencing the html build output: it # has to exist in order for the sphinx module to be loaded # successfully, but we certainly don't want the docs to be rebuilt if # it changes @@ -867,15 +913,21 @@ gnt_scripts = \ scripts/gnt-os \ scripts/gnt-storage +gnt_scripts_basenames = \ + $(patsubst scripts/%,%,$(patsubst daemons/%,%,$(gnt_scripts) $(gnt_python_sbin_SCRIPTS))) + +gnt_python_sbin_SCRIPTS = \ + $(PYTHON_BOOTSTRAP_SBIN) + +gntpython_SCRIPTS = $(gnt_scripts) + PYTHON_BOOTSTRAP_SBIN = \ daemons/ganeti-masterd \ daemons/ganeti-noded \ daemons/ganeti-rapi \ - daemons/ganeti-watcher \ - $(gnt_scripts) + daemons/ganeti-watcher PYTHON_BOOTSTRAP = \ - $(PYTHON_BOOTSTRAP_SBIN) \ tools/burnin \ tools/ensure-dirs \ tools/node-cleanup \ @@ -919,8 +971,9 @@ endif # the reason for this is because 'hs2py-constants' needs to generate # Python code, and 'Ganeti.Constants' is generated by Python. src/hs2py-constants: src/hs2py-constants.hs src/AutoConf.hs \ - src/Ganeti/BasicTypes.hs src/Ganeti/JSON.hs \ - src/Ganeti/THH.hs src/Ganeti/Hs2Py/GenConstants.hs \ + src/Ganeti/BasicTypes.hs src/Ganeti/ConstantUtils.hs \ + src/Ganeti/JSON.hs src/Ganeti/THH.hs \ + src/Ganeti/Hs2Py/GenConstants.hs \ src/Ganeti/Hs2Py/ListConstants.hs \ src/Ganeti/HsConstants.hs \ src/Ganeti/PyValueInstances.hs \ @@ -982,7 +1035,6 @@ dist_sbin_SCRIPTS = \ tools/ganeti-listrunner nodist_sbin_SCRIPTS = \ - $(PYTHON_BOOTSTRAP_SBIN) \ daemons/ganeti-cleaner # strip path prefixes off the sbin scripts @@ -1018,20 +1070,26 @@ python_scripts = \ tools/sanitize-config dist_tools_SCRIPTS = \ - $(python_scripts) \ - tools/burnin \ tools/kvm-console-wrapper \ tools/master-ip-setup \ tools/xen-console-wrapper -nodist_tools_python_scripts = \ +dist_tools_python_SCRIPTS = \ + $(python_scripts) \ + tools/burnin + +nodist_tools_python_SCRIPTS = \ tools/node-cleanup +tools_python_basenames = $(patsubst tools/%,%,\ + $(dist_tools_python_SCRIPTS) $(nodist_tools_python_SCRIPTS)) + nodist_tools_SCRIPTS = \ - $(nodist_tools_python_scripts) \ tools/users-setup \ tools/vcluster-setup +tools_basenames = $(patsubst tools/%,%,$(nodist_tools_SCRIPTS) $(dist_tools_SCRIPTS)) + pkglib_python_scripts = \ daemons/import-export \ tools/check-cert-expired @@ -1041,21 +1099,20 @@ nodist_pkglib_python_scripts = \ tools/node-daemon-setup \ tools/prepare-node-join +pkglib_python_basenames = \ + $(patsubst daemons/%,%,$(patsubst tools/%,%,\ + $(pkglib_python_scripts) $(nodist_pkglib_python_scripts))) + myexeclib_SCRIPTS = \ daemons/daemon-util \ tools/kvm-ifup \ tools/vif-ganeti \ tools/net-common \ - $(pkglib_python_scripts) \ $(HS_MYEXECLIB_PROGS) -nodist_myexeclib_SCRIPTS = \ - $(nodist_pkglib_python_scripts) - -# strip path prefixes off the lib python scripts -all_myexeclib_scripts = \ - $(patsubst tools/%,%,$(patsubst daemons/%,%,\ - $(patsubst src/%,%,$(myexeclib_SCRIPTS) $(nodist_myexeclib_SCRIPTS)))) +# compute the basenames of the myexeclib_scripts +myexeclib_scripts_basenames = \ + $(patsubst tools/%,%,$(patsubst daemons/%,%,$(patsubst src/%,%,$(myexeclib_SCRIPTS)))) EXTRA_DIST = \ NEWS \ @@ -1181,6 +1238,7 @@ TEST_FILES = \ test/data/htools/hail-invalid-reloc.json \ test/data/htools/hail-node-evac.json \ test/data/htools/hail-reloc-drbd.json \ + test/data/htools/hbal-dyn.data \ test/data/htools/hbal-excl-tags.data \ test/data/htools/hbal-split-insts.data \ test/data/htools/hspace-tiered-dualspec-exclusive.data \ @@ -1321,7 +1379,10 @@ python_tests = \ test/py/cmdlib/cmdlib_unittest.py \ test/py/cmdlib/group_unittest.py \ test/py/cmdlib/instance_unittest.py \ + test/py/cmdlib/instance_migration_unittest.py \ + test/py/cmdlib/instance_query_unittest.py \ test/py/cmdlib/instance_storage_unittest.py \ + test/py/cmdlib/node_unittest.py \ test/py/cmdlib/test_unittest.py \ test/py/cfgupgrade_unittest.py \ test/py/docs_unittest.py \ @@ -1396,6 +1457,7 @@ python_tests = \ test/py/ganeti.utils.retry_unittest.py \ test/py/ganeti.utils.storage_unittest.py \ test/py/ganeti.utils.text_unittest.py \ + test/py/ganeti.utils.version_unittest.py \ test/py/ganeti.utils.wrapper_unittest.py \ test/py/ganeti.utils.x509_unittest.py \ test/py/ganeti.utils_unittest.py \ @@ -1520,6 +1582,7 @@ lint_python_code = \ $(CHECK_IMPORTS) \ $(CHECK_HEADER) \ $(DOCPP) \ + $(gnt_python_sbin_SCRIPTS) \ $(PYTHON_BOOTSTRAP) standalone_python_modules = \ @@ -1536,6 +1599,7 @@ pep8_python_code = \ $(CHECK_HEADER) \ $(DOCPP) \ $(PYTHON_BOOTSTRAP) \ + $(gnt_python_sbin_SCRIPTS) \ qa \ $(python_test_support) @@ -1681,12 +1745,12 @@ src/Ganeti/Hs2Py/ListConstants.hs: src/Ganeti/Hs2Py/ListConstants.hs.in \ ## adminstDown = ... ## becomes ## 'adminstDown - NAMES=$$(sed -n -e "/=/ s/\(.*\) =.*/ '\1:/g p" \ - $(abs_top_srcdir)/src/Ganeti/HsConstants.hs); \ + NAMES=$$(sed -e "/^--/ d" $(abs_top_srcdir)/src/Ganeti/HsConstants.hs |\ + sed -n -e "/=/ s/\(.*\) =.*/ '\1:/g p"); \ m4 -DPY_CONSTANT_NAMES="$$NAMES" $(abs_top_srcdir)/$< > $@ src/Ganeti/PyConstants.hs: src/Ganeti/PyConstants.hs.in \ - lib/constants.py lib/_autoconf.py lib/luxi.py lib/errors.py \ + lib/constants.py lib/luxi.py lib/errors.py \ lib/jstore.py $(RUN_IN_TEMPDIR) \ $(CONVERT_CONSTANTS) $(built_base_sources) \ | lib/_vcsversion.py @@ -1708,88 +1772,6 @@ test/hs/Test/Ganeti/TestImports.hs: test/hs/Test/Ganeti/TestImports.hs.in \ done ; \ } > $@ -lib/_autoconf.py: Makefile | stamp-directories - set -e; \ - { echo '# This file is automatically generated, do not edit!'; \ - echo '#'; \ - echo ''; \ - echo '"""Build-time configuration for Ganeti.'; \ - echo '';\ - echo 'This file is autogenerated by the build process.'; \ - echo 'For any changes you need to re-run ./configure (and'; \ - echo 'not edit by hand).'; \ - echo ''; \ - echo '"""'; \ - echo ''; \ - echo '# pylint: disable=C0301,C0324'; \ - echo '# because this is autogenerated, we do not want'; \ - echo '# style warnings' ; \ - echo ''; \ - echo "PACKAGE_VERSION = '$(PACKAGE_VERSION)'"; \ - echo "VERSION_MAJOR = '$(VERSION_MAJOR)'"; \ - echo "VERSION_MINOR = '$(VERSION_MINOR)'"; \ - echo "VERSION_REVISION = '$(VERSION_REVISION)'"; \ - echo "VERSION_SUFFIX = '$(VERSION_SUFFIX)'"; \ - echo "VERSION_FULL = '$(VERSION_FULL)'"; \ - echo "LOCALSTATEDIR = '$(localstatedir)'"; \ - echo "SYSCONFDIR = '$(sysconfdir)'"; \ - echo "SSH_CONFIG_DIR = '$(SSH_CONFIG_DIR)'"; \ - echo "SSH_LOGIN_USER = '$(SSH_LOGIN_USER)'"; \ - echo "SSH_CONSOLE_USER = '$(SSH_CONSOLE_USER)'"; \ - echo "EXPORT_DIR = '$(EXPORT_DIR)'"; \ - echo "OS_SEARCH_PATH = [$(OS_SEARCH_PATH)]"; \ - echo "ES_SEARCH_PATH = [$(ES_SEARCH_PATH)]"; \ - echo "XEN_BOOTLOADER = '$(XEN_BOOTLOADER)'"; \ - echo "XEN_CONFIG_DIR = '$(XEN_CONFIG_DIR)'"; \ - echo "XEN_KERNEL = '$(XEN_KERNEL)'"; \ - echo "XEN_INITRD = '$(XEN_INITRD)'"; \ - echo "KVM_KERNEL = '$(KVM_KERNEL)'"; \ - echo "SHARED_FILE_STORAGE_DIR = '$(SHARED_FILE_STORAGE_DIR)'"; \ - echo "IALLOCATOR_SEARCH_PATH = [$(IALLOCATOR_SEARCH_PATH)]"; \ - echo "KVM_PATH = '$(KVM_PATH)'"; \ - echo "IP_PATH = '$(IP_PATH)'"; \ - echo "SOCAT_PATH = '$(SOCAT)'"; \ - echo "SOCAT_USE_ESCAPE = $(SOCAT_USE_ESCAPE)"; \ - echo "SOCAT_USE_COMPRESS = $(SOCAT_USE_COMPRESS)"; \ - echo "LVM_STRIPECOUNT = $(LVM_STRIPECOUNT)"; \ - echo "TOOLSDIR = '$(toolsdir)'"; \ - echo "GNT_SCRIPTS = [$(foreach i,$(notdir $(gnt_scripts)),'$(i)',)]"; \ - echo "HTOOLS_PROGS = [$(foreach i,$(HS_HTOOLS_PROGS),'$(i)',)]"; \ - echo "PKGLIBDIR = '$(pkglibdir)'"; \ - echo "DRBD_BARRIERS = '$(DRBD_BARRIERS)'"; \ - echo "DRBD_NO_META_FLUSH = $(DRBD_NO_META_FLUSH)"; \ - echo "SYSLOG_USAGE = '$(SYSLOG_USAGE)'"; \ - echo "DAEMONS_GROUP = '$(DAEMONS_GROUP)'"; \ - echo "ADMIN_GROUP = '$(ADMIN_GROUP)'"; \ - echo "MASTERD_USER = '$(MASTERD_USER)'"; \ - echo "MASTERD_GROUP = '$(MASTERD_GROUP)'"; \ - echo "RAPI_USER = '$(RAPI_USER)'"; \ - echo "RAPI_GROUP = '$(RAPI_GROUP)'"; \ - echo "CONFD_USER = '$(CONFD_USER)'"; \ - echo "CONFD_GROUP = '$(CONFD_GROUP)'"; \ - echo "LUXID_USER = '$(LUXID_USER)'"; \ - echo "LUXID_GROUP = '$(LUXID_GROUP)'"; \ - echo "NODED_USER = '$(NODED_USER)'"; \ - echo "NODED_GROUP = '$(NODED_GROUP)'"; \ - echo "MOND_USER = '$(MOND_USER)'"; \ - echo "MOND_GROUP = '$(MOND_GROUP)'"; \ - echo "DISK_SEPARATOR = '$(DISK_SEPARATOR)'"; \ - echo "QEMUIMG_PATH = '$(QEMUIMG_PATH)'"; \ - echo "HTOOLS = True"; \ - echo "ENABLE_CONFD = $(ENABLE_CONFD)"; \ - echo "XEN_CMD = '$(XEN_CMD)'"; \ - echo "ENABLE_SPLIT_QUERY = $(ENABLE_SPLIT_QUERY)"; \ - echo "ENABLE_RESTRICTED_COMMANDS = $(ENABLE_RESTRICTED_COMMANDS)"; \ - echo "ENABLE_MOND = $(ENABLE_MOND)"; \ -## Write dictionary with man page name as the key and the section number as the -## value - echo "MAN_PAGES = {"; \ - for i in $(notdir $(man_MANS)); do \ - echo "$$i" | sed -re 's/^(.*)\.([0-9]+)$$/ "\1": \2,/g'; \ - done; \ - echo "}"; \ - } > $@ - lib/_constants.py: Makefile lib/_constants.py.in src/hs2py-constants \ | stamp-directories cat $(abs_top_srcdir)/lib/_constants.py.in > $@ @@ -1805,31 +1787,34 @@ src/AutoConf.hs: Makefile src/AutoConf.hs.in | stamp-directories -DVERSION_REVISION="$(VERSION_REVISION)" \ -DVERSION_SUFFIX="$(VERSION_SUFFIX)" \ -DVERSION_FULL="$(VERSION_FULL)" \ + -DDIRVERSION="$(DIRVERSION)" \ -DLOCALSTATEDIR="$(localstatedir)" \ -DSYSCONFDIR="$(sysconfdir)" \ -DSSH_CONFIG_DIR="$(SSH_CONFIG_DIR)" \ -DSSH_LOGIN_USER="$(SSH_LOGIN_USER)" \ -DSSH_CONSOLE_USER="$(SSH_CONSOLE_USER)" \ -DEXPORT_DIR="$(EXPORT_DIR)" \ - -DOS_SEARCH_PATH="$(foreach i,$(OS_SEARCH_PATH),\"$(i)\":)" \ - -DES_SEARCH_PATH="$(foreach i,$(ES_SEARCH_PATH),\"$(i)\":)" \ + -DOS_SEARCH_PATH="\"$(OS_SEARCH_PATH)\"" \ + -DES_SEARCH_PATH="\"$(ES_SEARCH_PATH)\"" \ -DXEN_BOOTLOADER="$(XEN_BOOTLOADER)" \ -DXEN_CONFIG_DIR="$(XEN_CONFIG_DIR)" \ -DXEN_KERNEL="$(XEN_KERNEL)" \ -DXEN_INITRD="$(XEN_INITRD)" \ -DKVM_KERNEL="$(KVM_KERNEL)" \ -DSHARED_FILE_STORAGE_DIR="$(SHARED_FILE_STORAGE_DIR)" \ - -DIALLOCATOR_SEARCH_PATH="$(foreach i,$(IALLOCATOR_SEARCH_PATH),\"$(i)\":)" \ + -DIALLOCATOR_SEARCH_PATH="\"$(IALLOCATOR_SEARCH_PATH)\"" \ -DKVM_PATH="$(KVM_PATH)" \ -DIP_PATH="$(IP_PATH)" \ -DSOCAT_PATH="$(SOCAT)" \ -DSOCAT_USE_ESCAPE="$(SOCAT_USE_ESCAPE)" \ -DSOCAT_USE_COMPRESS="$(SOCAT_USE_COMPRESS)" \ -DLVM_STRIPECOUNT="$(LVM_STRIPECOUNT)" \ - -DTOOLSDIR="$(toolsdir)" \ + -DTOOLSDIR="$(libdir)/ganeti/tools" \ -DGNT_SCRIPTS="$(foreach i,$(notdir $(gnt_scripts)),\"$(i)\":)" \ -DHS_HTOOLS_PROGS="$(foreach i,$(HS_HTOOLS_PROGS),\"$(i)\":)" \ - -DPKGLIBDIR="$(pkglibdir)" \ + -DPKGLIBDIR="$(libdir)/ganeti" \ + -DSHAREDIR="$(prefix)/share/ganeti" \ + -DVERSIONEDSHAREDIR="$(versionedsharedir)" \ -DDRBD_BARRIERS="$(DRBD_BARRIERS)" \ -DDRBD_NO_META_FLUSH="$(DRBD_NO_META_FLUSH)" \ -DSYSLOG_USAGE="$(SYSLOG_USAGE)" \ @@ -1855,6 +1840,7 @@ src/AutoConf.hs: Makefile src/AutoConf.hs.in | stamp-directories -DENABLE_SPLIT_QUERY="$(ENABLE_SPLIT_QUERY)" \ -DENABLE_RESTRICTED_COMMANDS="$(ENABLE_RESTRICTED_COMMANDS)" \ -DENABLE_MOND="$(ENABLE_MOND)" \ + -DHAS_GNU_LN="$(HAS_GNU_LN)" \ -DMAN_PAGES="$$(for i in $(notdir $(man_MANS)); do \ echo -n "$$i" | sed -re 's/^(.*)\.([0-9]+)$$/("\1",\2):/g'; \ done)" \ @@ -1897,7 +1883,7 @@ $(SHELL_ENV_INIT): Makefile stamp-directories echo 'readonly LOCALSTATEDIR=$${LOCALSTATEDIR:-$${GANETI_ROOTDIR:-}$(localstatedir)}'; \ echo 'readonly SYSCONFDIR=$${SYSCONFDIR:-$${GANETI_ROOTDIR:-}$(sysconfdir)}'; \ echo; \ - echo 'readonly PKGLIBDIR=$(pkglibdir)'; \ + echo 'readonly PKGLIBDIR=$(libdir)/ganeti'; \ echo 'readonly LOG_DIR="$$LOCALSTATEDIR/log/ganeti"'; \ echo 'readonly RUN_DIR="$$LOCALSTATEDIR/run/ganeti"'; \ echo 'readonly DATA_DIR="$$LOCALSTATEDIR/lib/ganeti"'; \ @@ -1958,7 +1944,7 @@ tools/prepare-node-join: MODULE = ganeti.tools.prepare_node_join tools/node-cleanup: MODULE = ganeti.tools.node_cleanup $(HS_BUILT_TEST_HELPERS): TESTROLE = $(patsubst test/hs/%,%,$@) -$(PYTHON_BOOTSTRAP): Makefile | stamp-directories +$(PYTHON_BOOTSTRAP) $(gnt_scripts) $(gnt_python_sbin_SCRIPTS): Makefile | stamp-directories test -n "$(MODULE)" || { echo Missing module; exit 1; } set -e; \ { echo '#!/usr/bin/python'; \ @@ -2109,6 +2095,7 @@ hs-check: hs-tests hs-shell # (since our indent level is not 4) # E125: continuation line does not distinguish itself from next logical line # (since our indent level is not 4) +# E123: closing bracket does not match indentation of opening bracket's line # E127: continuation line over-indented for visual indent # (since our indent level is not 4) # note: do NOT add E128 here; it's a valid style error in most cases! @@ -2117,7 +2104,7 @@ hs-check: hs-tests hs-shell # instead of silencing it # E261: at least two spaces before inline comment # E501: line too long (80 characters) -PEP8_IGNORE = E111,E121,E125,E127,E261,E501 +PEP8_IGNORE = E111,E121,E123,E125,E127,E261,E501 # For excluding pep8 expects filenames only, not whole paths PEP8_EXCLUDE = $(subst $(space),$(comma),$(strip $(notdir $(BUILT_PYTHON_SOURCES)))) @@ -2238,28 +2225,41 @@ install-exec-local: @mkdir_p@ "$(DESTDIR)${localstatedir}/lib/ganeti" \ "$(DESTDIR)${localstatedir}/log/ganeti" \ "$(DESTDIR)${localstatedir}/run/ganeti" -if INSTALL_SYMLINKS for dir in $(SYMLINK_TARGET_DIRS); do \ @mkdir_p@ $(DESTDIR)$$dir; \ done + $(LN_S) -f $(sysconfdir)/ganeti/lib $(DESTDIR)$(defaultversiondir) + $(LN_S) -f $(sysconfdir)/ganeti/share $(DESTDIR)$(defaultversionedsharedir) for prog in $(HS_BIN_ROLES); do \ - $(LN_S) $(bindir)/$$prog $(DESTDIR)$(exec_prefix)/bin/$$prog; \ + $(LN_S) -f $(defaultversiondir)$(exec_prefix)/bin/$$prog $(DESTDIR)$(exec_prefix)/bin/$$prog; \ done - $(LN_S) $(bindir)/htools $(DESTDIR)$(libdir)/ganeti/iallocators/hail + $(LN_S) -f $(defaultversiondir)$(libdir)/ganeti/iallocators/hail $(DESTDIR)$(libdir)/ganeti/iallocators/hail for prog in $(all_sbin_scripts); do \ - $(LN_S) $(sbindir)/$$prog $(DESTDIR)$(exec_prefix)/sbin/$$prog; \ + $(LN_S) -f $(defaultversiondir)$(exec_prefix)/sbin/$$prog $(DESTDIR)$(exec_prefix)/sbin/$$prog; \ + done + for prog in $(gnt_scripts_basenames); do \ + $(LN_S) -f $(defaultversionedsharedir)/$$prog $(DESTDIR)$(exec_prefix)/sbin/$$prog; \ + done + for prog in $(pkglib_python_basenames); do \ + $(LN_S) -f $(defaultversionedsharedir)/$$prog $(DESTDIR)$(libdir)/ganeti/$$prog; \ done - for link in $(SYMLINK_DIRS); do \ - $(LN_S) $(versiondir)$$link $(DESTDIR)$$link; \ + for prog in $(tools_python_basenames); do \ + $(LN_S) -f $(defaultversionedsharedir)/$$prog $(DESTDIR)$(libdir)/ganeti/tools/$$prog; \ done - for prog in $(all_myexeclib_scripts); do \ - $(LN_S) $(pkglibdir)/$$prog $(DESTDIR)$(libdir)/ganeti/$$prog; \ + for prog in $(tools_basenames); do \ + $(LN_S) -f $(defaultversiondir)/$(libdir)/ganeti/tools/$$prog $(DESTDIR)$(libdir)/ganeti/tools/$$prog; \ done if ! test -n '$(ENABLE_MANPAGES)'; then \ for man in $(manfullpath); do \ - $(LN_S) $(versiondir)$(datarootdir)/man/$$man $(DESTDIR)$(datarootdir)/man/$$man; \ + $(LN_S) -f $(defaultversionedsharedir)$(datarootdir)/man/$$man $(DESTDIR)$(datarootdir)/man/$$man; \ done; \ fi + for prog in $(myexeclib_scripts_basenames); do \ + $(LN_S) -f $(defaultversiondir)$(libdir)/ganeti/$$prog $(DESTDIR)$(libdir)/ganeti/$$prog; \ + done +if INSTALL_SYMLINKS + $(LN_S) -f $(versionedsharedir) $(DESTDIR)$(sysconfdir)/ganeti/share + $(LN_S) -f $(versiondir) $(DESTDIR)$(sysconfdir)/ganeti/lib endif .PHONY: apidoc