[checkmk-commits] CMK-1134: rework OMD Makefiles

Module: check_mk Branch: master Commit: 82632174979bd68f564da4b1c32476e6734d23e4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=82632174979bd6… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Nov 13 13:18:05 2018 +0100 CMK-1134: rework OMD Makefiles omd/Makefile - includes omd/packages/packages.mk - definitions of common recepies and Variables - Tools defined by Variable - includes omd/packages/*/*.mk - Package Makefiles include speciffic recepies for each Package - Define Package Dependencies - Are incremental buildable - helper files in build-helper/ - build-helper files used as reference for dependencies Genereal naming scheme: Package-name = folder-name Makefile-name = folder-name.make Archive-name = folder-name-version.extension Build-helper-files = folder-name-version-{build,install,patching...} # patching instad of patch to avoid confusion (tool patch) Change-Id: I2b476dcca50f0d317fe95eb6968e912b5c5a9f86 --- Makefile | 2 +- agents/windows/test/build-googletest | 2 +- omd/Makefile | 64 +++-- omd/packages/{python => Python}/.f12 | 0 omd/packages/{python => Python}/.gitignore | 0 omd/packages/{python => Python}/Python-2.7.15.tgz | Bin omd/packages/Python/Python.make | 125 +++++++++ .../patches/pycompile_compile_atomic.dif | 0 omd/packages/{python => Python}/sitecustomize.py | 0 .../{check_webinject => Webinject}/.gitignore | 0 .../Webinject-1.88.tar.gz | Bin omd/packages/Webinject/Webinject.make | 30 ++ .../patches/0001-no_auto_install.dif} | 0 .../apache-omd/{Makefile => apache-omd.make} | 62 +++-- omd/packages/boost/{Makefile => boost.make} | 44 +-- omd/packages/check_mk/{Makefile => check_mk.make} | 80 +++--- .../check_multi/{Makefile => check_multi.make} | 70 ++--- omd/packages/check_mysql_health/Makefile | 29 -- .../check_mysql_health/check_mysql_health.make | 39 +++ omd/packages/check_oracle_health/Makefile | 29 -- .../check_oracle_health/check_oracle_health.make | 37 +++ omd/packages/check_webinject/Makefile | 26 -- omd/packages/dokuwiki/Makefile | 70 ----- omd/packages/dokuwiki/dokuwiki.make | 80 ++++++ ...01-style-arctic.patch => 0001-style-arctic.dif} | 0 .../{0002-pdflink.patch => 0002-pdflink.dif} | 0 ...tyle-dokuwiki.patch => 0003-style-dokuwiki.dif} | 0 omd/packages/freetds/Makefile | 47 ---- omd/packages/freetds/freetds.make | 39 +++ .../googletest/{Makefile => googletest.make} | 0 omd/packages/{nail => heirloom-mailx}/.gitignore | 0 .../heirloom-mailx-12.5.tar.gz | Bin omd/packages/heirloom-mailx/heirloom-mailx.make | 29 ++ .../patches/0001-disable-ssl-and-kerberos.dif | 0 .../{nail => heirloom-mailx}/skel/etc/mail.rc | 0 omd/packages/heirloom-pkgtools/Makefile | 32 --- .../heirloom-pkgtools/heirloom-pkgtools.make | 32 +++ omd/packages/icinga/Makefile | 68 ----- omd/packages/icinga/icinga.make | 68 +++++ omd/packages/jmx4perl/Makefile | 46 --- omd/packages/jmx4perl/jmx4perl.make | 47 ++++ omd/packages/libgsf/Makefile | 24 -- omd/packages/libgsf/libgsf.make | 30 ++ omd/packages/maintenance/Makefile | 20 -- omd/packages/maintenance/maintenance.make | 24 ++ omd/packages/mk-livestatus/Makefile | 33 --- omd/packages/mk-livestatus/mk-livestatus.make | 41 +++ omd/packages/mod_fcgid/Makefile | 37 --- omd/packages/mod_fcgid/mod_fcgid.make | 45 +++ ...roc_unix.c.patch => 0001-fcgid_proc_unix.c.dif} | 0 ...id_pm_unix.c.patch => 0002-fcgid_pm_unix.c.dif} | 0 omd/packages/mod_wsgi/Makefile | 57 ---- omd/packages/mod_wsgi/mod_wsgi.make | 62 +++++ omd/packages/monitoring-plugins/Makefile | 46 --- .../monitoring-plugins/monitoring-plugins.make | 46 +++ omd/packages/msitools/Makefile | 55 ---- omd/packages/msitools/msitools.make | 51 ++++ omd/packages/nagios/Makefile | 101 ------- omd/packages/nagios/nagios.make | 91 ++++++ omd/packages/nagvis/Makefile | 55 ---- omd/packages/nagvis/nagvis.make | 57 ++++ .../{0001-global.php.patch => 0001-global.php.dif} | 0 .../{0002-cmkadmin.patch => 0002-cmkadmin.dif} | 0 omd/packages/nail/Makefile | 28 -- omd/packages/navicli/{Makefile => navicli.make} | 33 ++- omd/packages/net-snmp/{Makefile => net-snmp.make} | 59 ++-- omd/packages/nrpe/Makefile | 33 --- omd/packages/nrpe/nrpe.make | 36 +++ omd/packages/nsca/Makefile | 35 --- omd/packages/nsca/nsca.make | 38 +++ ...lation.diff => 0001-fix-broken-compilation.dif} | 0 omd/packages/omd/Makefile | 40 --- omd/packages/omd/omd.make | 44 +++ omd/packages/openhardwaremonitor/Makefile | 54 ---- .../openhardwaremonitor/openhardwaremonitor.make | 59 ++++ omd/packages/packages.make | 105 +++++++ omd/packages/patch/Makefile | 20 -- omd/packages/patch/patch.make | 27 ++ .../perl-modules/{Makefile => perl-modules.make} | 58 ++-- .../pnp4nagios/{Makefile => pnp4nagios.make} | 54 ++-- omd/packages/python-modules/Makefile | 293 -------------------- omd/packages/python-modules/python-modules.make | 308 +++++++++++++++++++++ omd/packages/python/Makefile | 107 ------- omd/packages/re2/{Makefile => re2.make} | 39 +-- ...iff => 0001-xff_field_missing_from_rrdinfo.dif} | 0 omd/packages/rrdtool/{Makefile => rrdtool.make} | 62 +++-- omd/packages/snap7/Makefile | 36 --- omd/packages/snap7/snap7.make | 42 +++ 88 files changed, 1973 insertions(+), 1709 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=8263217497…