[checkmk-commits] [tribe29/checkmk] 21744f: Minor cleanup

Branch: refs/heads/master Home: https://github.com/tribe29/checkmk Commit: 21744f8505c5d25417da9b859acbe4f32cb7fa6b https://github.com/tribe29/checkmk/commit/21744f8505c5d25417da9b859acbe4f32… Author: Lars Michelsen <lm(a)tribe29.com> Date: 2019-11-21 (Thu, 21 Nov 2019) Changed paths: M omd/packages/snap7/snap7.make Log Message: ----------- Minor cleanup Change-Id: I1f29ffff7f46f01f576a458515ebc99d5e3a3509 Commit: 13d1ccfad392dc9c0b528ded3d15bd94a12cb704 https://github.com/tribe29/checkmk/commit/13d1ccfad392dc9c0b528ded3d15bd94a… Author: Lars Michelsen <lm(a)tribe29.com> Date: 2019-11-21 (Thu, 21 Nov 2019) Changed paths: M omd/packages/snap7/snap7.make Log Message: ----------- Cleanup wrong dependency to python package Change-Id: I3004270055255f79d97ea9ea50075f7527b7c38e Commit: d4678f04a88cc08a7519615b207a85175eb4e7b0 https://github.com/tribe29/checkmk/commit/d4678f04a88cc08a7519615b207a85175… Author: Lars Michelsen <lm(a)tribe29.com> Date: 2019-11-21 (Thu, 21 Nov 2019) Changed paths: M omd/Makefile Log Message: ----------- deb: Only build the binary package Do not call the implicit clean/build/binary/... targets. We only want to build the binary package for the current platform. Change-Id: I1369025b60e948fb9a43852b2db2ea12e69a93d4 Commit: ba0424b74d771022b601c0f42a25add75f98010e https://github.com/tribe29/checkmk/commit/ba0424b74d771022b601c0f42a25add75… Author: Lars Michelsen <lm(a)tribe29.com> Date: 2019-11-21 (Thu, 21 Nov 2019) Changed paths: M omd/debian/control.in R omd/debian/patches/00template R omd/debian/patches/10_nagios_enable_epn.dpatch M omd/debian/rules Log Message: ----------- deb: Cleanup ancient debian specific patch stuff We dont have any debian specific patch. The patch that was located below debian/patches was not working at all. Better remove all this useless stuff. Change-Id: I8c7ede1c90f075b20d8da2d88770f166947ebb88 Commit: 38e403438402d8328d1d1e05f8cf9ac7b5cc2279 https://github.com/tribe29/checkmk/commit/38e403438402d8328d1d1e05f8cf9ac7b… Author: Lars Michelsen <lm(a)tribe29.com> Date: 2019-11-21 (Thu, 21 Nov 2019) Changed paths: M omd/debian/rules Log Message: ----------- deb: move phony declaration to the top Change-Id: I6b099fd1e118c82e7de09f585441c25e20e2c8fe Commit: f0c23a2a922397ad26fe9ed1f15e3d805ea3c221 https://github.com/tribe29/checkmk/commit/f0c23a2a922397ad26fe9ed1f15e3d805… Author: Lars Michelsen <lm(a)tribe29.com> Date: 2019-11-21 (Thu, 21 Nov 2019) Changed paths: M omd/Makefile A omd/debian/changelog.in R omd/debian/changelog.tmpl M omd/debian/compat M omd/debian/control.in M omd/debian/rules Log Message: ----------- deb: Cleanup different things * Bump debhelper compatibility version (see "man debhelper") * Simplify debian/changelog creation: Use same pattern as for other files. Create the changelog by replacing some macros in changelog.in. * deb target: removed commented out code * deb target: removed the creation of *-bin*.tar.gz which is not relevant for the deb build logic. * debian/rules: Remove the build-stamp stuff. Seems to be useless the way we are building at the moment. * debian/rules: Made removal of version independent files/folders optional, to make packaging work when only some PACKAGES are specified in omd/Makefile (useful for testing) Change-Id: Ia86c0498a33cdcc70f444621cb85fba30fb047e5 Commit: e3cc78960381c60223aa67ce3c710894bc241c76 https://github.com/tribe29/checkmk/commit/e3cc78960381c60223aa67ce3c710894b… Author: Lars Michelsen <lm(a)tribe29.com> Date: 2019-11-21 (Thu, 21 Nov 2019) Changed paths: M omd/Makefile Log Message: ----------- Some omd Makefile cleanups * Remove unused install-global target * Remove skel target and replace it's functionality with the install target, which is executed when building the debian package. * Added some comments Change-Id: If75d0b52b23c20ca18f41b90a02da3fae72dfc68 Commit: 81892032119a137a0be4e6a5bd7aa65f92743983 https://github.com/tribe29/checkmk/commit/81892032119a137a0be4e6a5bd7aa65f9… Author: Lars Michelsen <lm(a)tribe29.com> Date: 2019-11-21 (Thu, 21 Nov 2019) Changed paths: M omd/Makefile Log Message: ----------- Remove ancient make targets Change-Id: Iab92af6172df55ea2a94bb33a97d1ef2cc70e5fb Commit: 296defb006bb51790546a4743c17b5c6e90d1ac2 https://github.com/tribe29/checkmk/commit/296defb006bb51790546a4743c17b5c6e… Author: Lars Michelsen <lm(a)tribe29.com> Date: 2019-11-21 (Thu, 21 Nov 2019) Changed paths: M omd/Makefile Log Message: ----------- Small cleanups * Add missing phony targets * Cleanup redundant declaration Change-Id: I4a1ebb5db8adc272cc4e8c60df469eca16980726 Commit: a7b54af3338acb1c1225cfae3929e7b7d590e1af https://github.com/tribe29/checkmk/commit/a7b54af3338acb1c1225cfae3929e7b7d… Author: Lars Michelsen <lm(a)tribe29.com> Date: 2019-11-21 (Thu, 21 Nov 2019) Changed paths: M agents/Makefile M omd/Makefile M omd/packages/check_mk/check_mk.make M omd/packages/freetds/freetds.make M omd/packages/mk-livestatus/mk-livestatus.make M omd/packages/nagios/nagios.make M omd/packages/perl-modules/perl-modules.make M omd/packages/python-modules/python-modules.make M omd/packages/python3-modules/python3-modules.make M omd/packages/re2/re2.make M omd/packages/rrdtool/rrdtool.make Log Message: ----------- deb: Cleanup issues with DESTDIR set while executing build steps In the past the debian packaging mechanism in debian/rules was calling the omd Makefile once for building and once for installation. For our dependency logic it is easier to only call the Makefile once with the install target and make them resolve the dependencies on their own using the Makefile dependencies. The major difference are the set DESTDIR and MAKEFLAGS which confuse some "make install" calls. These calls now unset the variables as needed. Add some missing mkdir calls on the way. Change-Id: I399facdf9a27cafcbcfa16a58dd9d801897b41be Commit: 03d70e54a6ff559d1b7f5ad58045101941375286 https://github.com/tribe29/checkmk/commit/03d70e54a6ff559d1b7f5ad5804510194… Author: Lars Michelsen <lm(a)tribe29.com> Date: 2019-11-21 (Thu, 21 Nov 2019) Changed paths: M Makefile M omd/Makefile.omd M omd/packages/Python/Python.make M omd/packages/Python3/Python3.make M omd/packages/Webinject/Webinject.make M omd/packages/check_mk/check_mk.make M omd/packages/check_multi/check_multi.make M omd/packages/check_mysql_health/check_mysql_health.make M omd/packages/check_oracle_health/check_oracle_health.make M omd/packages/dokuwiki/dokuwiki.make M omd/packages/freetds/freetds.make M omd/packages/heirloom-mailx/heirloom-mailx.make M omd/packages/heirloom-pkgtools/heirloom-pkgtools.make M omd/packages/jmx4perl/jmx4perl.make M omd/packages/libgsf/libgsf.make M omd/packages/mk-livestatus/mk-livestatus.make M omd/packages/mod_fcgid/mod_fcgid.make M omd/packages/mod_wsgi/mod_wsgi.make M omd/packages/monitoring-plugins/monitoring-plugins.make M omd/packages/msitools/msitools.make M omd/packages/nagios/nagios.make M omd/packages/nagvis/nagvis.make M omd/packages/net-snmp/net-snmp.make M omd/packages/nrpe/nrpe.make M omd/packages/nsca/nsca.make M omd/packages/openhardwaremonitor/openhardwaremonitor.make M omd/packages/packages.make M omd/packages/patch/patch.make M omd/packages/perl-modules/.gitignore M omd/packages/perl-modules/perl-modules.make M omd/packages/pnp4nagios/pnp4nagios.make M omd/packages/python-modules/python-modules.make M omd/packages/python3-modules/python3-modules.make M omd/packages/re2/re2.make M omd/packages/rrdtool/rrdtool.make M omd/packages/snap7/snap7.make M omd/packages/stunnel/stunnel.make Log Message: ----------- Move build directories to PACKAGE_BUILD_DIR Change-Id: I953f2661c9194be4fe080d2cbfbe4bea7fc66c5e Commit: e72de7d3735f7093316b1aa1bd492722024ea4cd https://github.com/tribe29/checkmk/commit/e72de7d3735f7093316b1aa1bd4927220… Author: Lars Michelsen <lm(a)tribe29.com> Date: 2019-11-21 (Thu, 21 Nov 2019) Changed paths: M omd/Makefile.omd M omd/packages/libgsf/libgsf.make M omd/packages/msitools/msitools.make M omd/packages/perl-modules/perl-modules.make Log Message: ----------- Cleanup temporary install of libgsf Change-Id: I1908e5a65198fd22b8e7a639972dc4d39e6c1e51 Commit: 0e0e8c1360272d990f1ee918f6325128fa3690d9 https://github.com/tribe29/checkmk/commit/0e0e8c1360272d990f1ee918f6325128f… Author: Lars Michelsen <lm(a)tribe29.com> Date: 2019-11-21 (Thu, 21 Nov 2019) Changed paths: M omd/Makefile.omd M omd/packages/freetds/freetds.make M omd/packages/python-modules/python-modules.make M omd/packages/python3-modules/python3-modules.make Log Message: ----------- Cleanup temporary install of freetds Change-Id: Ia386b46402d5544eef93cdbdcd9cac498e856fcd Commit: 290e87fd4cd038403dcec8017a21a643d9ca0b03 https://github.com/tribe29/checkmk/commit/290e87fd4cd038403dcec8017a21a643d… Author: Lars Michelsen <lm(a)tribe29.com> Date: 2019-11-21 (Thu, 21 Nov 2019) Changed paths: M omd/Makefile M omd/Makefile.omd M omd/packages/Python/Python.make M omd/packages/mod_wsgi/mod_wsgi.make M omd/packages/net-snmp/net-snmp.make M omd/packages/omd/omd.make M omd/packages/python-modules/python-modules.make M omd/packages/rrdtool/rrdtool.make M omd/packages/snap7/snap7.make Log Message: ----------- Cleanup temporary install of Python Change-Id: I6c226bbd8342533542f77c8226d138728a77232d Commit: 1ea1cdc8f145bdf673e4cc1fa8e5158c71e631c8 https://github.com/tribe29/checkmk/commit/1ea1cdc8f145bdf673e4cc1fa8e5158c7… Author: Lars Michelsen <lm(a)tribe29.com> Date: 2019-11-21 (Thu, 21 Nov 2019) Changed paths: M omd/Makefile.omd M omd/packages/Python3/Python3.make M omd/packages/python3-modules/python3-modules.make Log Message: ----------- Cleanup temporary install of Python 3 Change-Id: I50e0573fd14280641b654b43dd5321a3cb2149a7 Commit: ef8b401c0e25a341b5d83def3a183566bef8cb88 https://github.com/tribe29/checkmk/commit/ef8b401c0e25a341b5d83def3a183566b… Author: Lars Michelsen <lm(a)tribe29.com> Date: 2019-11-21 (Thu, 21 Nov 2019) Changed paths: M omd/Makefile.omd M omd/packages/python-modules/python-modules.make M omd/packages/python3-modules/python3-modules.make Log Message: ----------- Move package specific definitions to package Makefiles; Remove unused ones Change-Id: I1e00c08583a5aa88baa4611bf4a1e8a634de0abf Commit: fe5c8941bdf5d4eadd8a1137f3c2a0833b2a7597 https://github.com/tribe29/checkmk/commit/fe5c8941bdf5d4eadd8a1137f3c2a0833… Author: Lars Michelsen <lm(a)tribe29.com> Date: 2019-11-21 (Thu, 21 Nov 2019) Changed paths: M omd/Makefile M omd/packages/Python/Python.make M omd/packages/Python3/Python3.make M omd/packages/mod_wsgi/mod_wsgi.make M omd/packages/net-snmp/net-snmp.make M omd/packages/omd/omd.make M omd/packages/patch/patch.make M omd/packages/python-modules/python-modules.make M omd/packages/python3-modules/python3-modules.make M omd/packages/rrdtool/rrdtool.make Log Message: ----------- Fix rebuilding of already cached packages * Give the cache processing target a better name * Use the cache processing target as dependency Change-Id: Ia9c8c4076661882b567d9776533dd0eb101b132f Commit: 9633f838f57210d5aadc31b428b4e54a364af859 https://github.com/tribe29/checkmk/commit/9633f838f57210d5aadc31b428b4e54a3… Author: Lars Michelsen <lm(a)tribe29.com> Date: 2019-11-21 (Thu, 21 Nov 2019) Changed paths: M omd/Makefile Log Message: ----------- Allow the package cache upload to fail Change-Id: I5a40e5b07e5675f2405c2aae0a0c80f865dde66c Commit: 72a0564b825f63e3cbd0c3cefbc18214284e71fb https://github.com/tribe29/checkmk/commit/72a0564b825f63e3cbd0c3cefbc182142… Author: Lars Michelsen <lm(a)tribe29.com> Date: 2019-11-21 (Thu, 21 Nov 2019) Changed paths: M omd/packages/omd/omd.make M omd/packages/python-modules/python-modules.make M omd/packages/rrdtool/rrdtool.make Log Message: ----------- python-modules: Use intermediate install step Cleanup the temporary installation of the python modules on the way Change-Id: I9aec9007fd904741f9f93f9cadcad6bd4094dc6b Commit: 9034035aad90529e907a861adaa7b303b9954f37 https://github.com/tribe29/checkmk/commit/9034035aad90529e907a861adaa7b303b… Author: Lars Michelsen <lm(a)tribe29.com> Date: 2019-11-21 (Thu, 21 Nov 2019) Changed paths: M omd/packages/python3-modules/python3-modules.make Log Message: ----------- python3-modules: Use intermediate install step Cleanup the temporary installation of the python modules on the way Change-Id: Ic27df6e89af744e4fcd44cab505a82def1f82f54 Commit: b4a76e6756b41e064908154683af248552c1c965 https://github.com/tribe29/checkmk/commit/b4a76e6756b41e064908154683af24855… Author: Lars Michelsen <lm(a)tribe29.com> Date: 2019-11-21 (Thu, 21 Nov 2019) Changed paths: M omd/Makefile M omd/omd.spec.in Log Message: ----------- rpm: Different cleanups * build RPMs in standard build directory * Extract omd.spec computation to dedicated target * Update descriptions and URLs Change-Id: Ib620da50575db9045853a996acf4d8e0a8f7ee96 Commit: ed2f7146464157e5a99464ef21764a2deb7088f6 https://github.com/tribe29/checkmk/commit/ed2f7146464157e5a99464ef21764a2de… Author: Lars Michelsen <lm(a)tribe29.com> Date: 2019-11-21 (Thu, 21 Nov 2019) Changed paths: M omd/Makefile M omd/omd.spec.in Log Message: ----------- rpm: Make packaging work more like deb packaging This now works on the current git clone without the need to pack some kind of temporary upstream package. It enables us do packaging for tests/development in incremental steps. Change-Id: Iad1f623aafffe815269e22b977e070dff9ebc066 Commit: 4ca6ad51faff2cd1fd3ec07ff674d7978665c631 https://github.com/tribe29/checkmk/commit/4ca6ad51faff2cd1fd3ec07ff674d7978… Author: Lars Michelsen <lm(a)tribe29.com> Date: 2019-11-22 (Fri, 22 Nov 2019) Changed paths: M omd/Makefile Log Message: ----------- Cleanup unused make targets Change-Id: I476f198d27252aca92aa64bc8dba34414d2cd035 Commit: 10929faad03d2814e49e5d58212fe5fa96760c6c https://github.com/tribe29/checkmk/commit/10929faad03d2814e49e5d58212fe5fa9… Author: Lars Michelsen <lm(a)tribe29.com> Date: 2019-11-22 (Fri, 22 Nov 2019) Changed paths: M omd/Makefile M omd/Makefile.omd Log Message: ----------- Centralize some definitions in Makefile.omd Change-Id: I2a9bca09ffdde7a29ba2a7191516650d513d3d9c Compare: https://github.com/tribe29/checkmk/compare/0692de7de6d2...10929faad03d