-
Notifications
You must be signed in to change notification settings - Fork 23
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
a38b2a7
commit fe204ad
Showing
9 changed files
with
110 additions
and
63 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,6 @@ | ||
| #!/bin/bash | ||
|
|
||
| VERSION="2.0.0p17" | ||
| VERSION="2.1.0p2" | ||
| SNAP7_VERSION="1.4.2" | ||
|
|
||
| if [ $# -gt 0 ]; then | ||
|
|
@@ -11,12 +11,12 @@ echo "building Check_MK ${VERSION}..." | |
|
|
||
| # get check_mk sources and build dependencies | ||
| if [ ${INSTALL_DEPENDENCIES:-0} -eq 1 ]; then | ||
| apt-get -y install apache2 build-essential cmake debhelper dnsutils dpatch flex fping git git-buildpackage make \ | ||
| rpcbind rrdtool smbclient snmp apache2-dev default-libmysqlclient-dev dietlibc-dev libboost-all-dev \ | ||
| libboost-dev libcurl4-openssl-dev libcloog-ppl1 libdbi-dev libevent-dev libffi-dev libfreeradius-dev libgd-dev \ | ||
| libglib2.0-dev libgnutls28-dev libgsf-1-dev libkrb5-dev libmcrypt-dev libncurses-dev libpango1.0-dev \ | ||
| libpcap-dev libperl-dev libpq-dev libreadline-dev librrd-dev libsqlite3-dev libssl-dev libxml2-dev \ | ||
| libxmlsec1-dev tk-dev uuid-dev | ||
| apt-get -y install apache2 build-essential chrpath cmake debhelper dnsutils dpatch flex fping freetds-dev git \ | ||
| git-buildpackage make rpcbind rrdtool smbclient snmp apache2-dev default-libmysqlclient-dev dietlibc-dev \ | ||
| libboost-all-dev libboost-dev libcurl4-openssl-dev libcloog-ppl1 libdbi-dev libevent-dev libffi-dev \ | ||
| libfreeradius-dev libgd-dev libglib2.0-dev libgnutls28-dev libgsf-1-dev libkrb5-dev libmcrypt-dev \ | ||
| libncurses-dev libpango1.0-dev libpcap-dev libperl-dev libpq-dev libreadline-dev librrd-dev libsasl2-dev \ | ||
| libsodium-dev libsqlite3-dev libssl-dev libxml2-dev libxmlsec1-dev patchelf python3-pip tk-dev uuid-dev | ||
| fi | ||
|
|
||
| wget -qO- https://download.checkmk.com/checkmk/${VERSION}/check-mk-raw-${VERSION}.cre.tar.gz | tar -xvz | ||
|
|
@@ -28,6 +28,8 @@ patch -p0 < ../omd-Makefile-remove-module-navicli.patch | |
| patch -p0 < ../omdlib-reduce-certificate-maximum-validity-period.patch | ||
| patch -p0 < ../python-make-add-fno-semantic-interposition.patch | ||
| patch -p0 < ../python-make-set-arm-architecture.patch | ||
| patch -p0 < ../protobuf-make-add-latomic.patch | ||
| patch -p0 < ../pipfile-remove-playwright.patch | ||
|
|
||
| # prepare snap7 | ||
| tar -xvzf omd/packages/snap7/snap7-${SNAP7_VERSION}.tar.gz -C omd/packages/snap7 | ||
|
|
@@ -37,6 +39,9 @@ cp omd/packages/snap7/snap7-${SNAP7_VERSION}/build/unix/arm_v7_linux.mk omd/pack | |
| ln -s arm_v7-linux omd/packages/snap7/snap7-${SNAP7_VERSION}/build/bin/armv7l-linux | ||
| tar czf omd/packages/snap7/snap7-${SNAP7_VERSION}.tar.gz -C omd/packages/snap7 snap7-${SNAP7_VERSION} | ||
|
|
||
| # setup pipenv | ||
| bash buildscripts/infrastructure/build-nodes/scripts/install-pipenv.sh | ||
|
|
||
| # compile and package | ||
| make deb DEBFULLNAME="Christian Hofer" [email protected] | ||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,6 @@ | ||
| #!/bin/bash | ||
|
|
||
| VERSION="2.0.0b3" | ||
| VERSION="2.1.0p2" | ||
| SNAP7_VERSION="1.4.2" | ||
|
|
||
| if [ $# -gt 0 ]; then | ||
|
|
@@ -24,6 +24,8 @@ patch -p0 < ../omd-Makefile-remove-module-navicli.patch | |
| patch -p0 < ../omdlib-reduce-certificate-maximum-validity-period.patch | ||
| patch -p0 < ../python-make-add-fno-semantic-interposition.patch | ||
| patch -p0 < ../python-make-set-aarch64-architecture.patch | ||
| patch -p0 < ../protobuf-make-add-latomic.patch | ||
| patch -p0 < ../pipfile-remove-playwright.patch | ||
|
|
||
| touch agents/windows/check_mk.user.yml | ||
| touch agents/windows/check_mk_agent_arm64.{exe,msi} | ||
|
|
@@ -60,5 +62,8 @@ sed -i 's/arm_v6/aarch64/' /tmp/snap7-${SNAP7_VERSION}/build/unix/aarch64_linux | |
| tar czf omd/packages/snap7/snap7-${SNAP7_VERSION}.tar.gz -C /tmp snap7-${SNAP7_VERSION} | ||
| rm -rf /tmp/snap7-${SNAP7_VERSION} | ||
|
|
||
| # setup pipenv | ||
| bash buildscripts/infrastructure/build-nodes/scripts/install-pipenv.sh | ||
|
|
||
| # compile and package | ||
| make deb DEBFULLNAME="Martin Petersen" [email protected] | ||
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,10 @@ | ||
| --- Pipfile 2022-05-26 01:02:30.000000000 +0100 | ||
| +++ Pipfile_v2 2022-06-11 19:53:11.919789661 +0100 | ||
| @@ -36,7 +36,6 @@ | ||
| types-redis = "==4.1.15" # used for type checking | ||
| types-protobuf = "==3.19.12" # used for type checking | ||
| types-setuptools = "==57.4.9" # used for type checking | ||
| -playwright = "==1.19.0" # used for in-browser testing | ||
| pydantic-factories = "==1.2.4" # used for pydantic model testing | ||
| pymongo = "==4.0.1" # used by mk_mongodb agent plugin | ||
| pytest = "==7.0.1" # used by various test/Makefile targets |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| --- omd/packages/protobuf/protobuf.make 2022-05-26 01:02:30.000000000 +0100 | ||
| +++ omd/packages/protobuf/protobuf.make_v2 2022-06-11 19:14:37.049881665 +0100 | ||
| @@ -63,7 +63,7 @@ | ||
| `: Let me know in case you got a cleaner approach. ` \ | ||
| cd src && \ | ||
| rm protoc && \ | ||
| - echo -e '\nprotoc-static: $(protoc_OBJECTS) $(protoc_DEPENDENCIES) $(EXTRA_protoc_DEPENDENCIES)\n\tg++ -pthread -DHAVE_PTHREAD=1 -DHAVE_ZLIB=1 -Wall -Wno-sign-compare -static-libgcc -static-libstdc++ -s -o protoc google/protobuf/compiler/main.o -lpthread ./.libs/libprotoc.a ./.libs/libprotobuf.a' >> Makefile && \ | ||
| + echo -e '\nprotoc-static: $(protoc_OBJECTS) $(protoc_DEPENDENCIES) $(EXTRA_protoc_DEPENDENCIES)\n\tg++ -pthread -DHAVE_PTHREAD=1 -DHAVE_ZLIB=1 -Wall -Wno-sign-compare -static-libgcc -static-libstdc++ -s -o protoc google/protobuf/compiler/main.o -lpthread ./.libs/libprotoc.a ./.libs/libprotobuf.a -latomic' >> Makefile && \ | ||
| make -j6 protoc-static && \ | ||
| file $(PROTOBUF_BUILD_DIR)/src/protoc | grep ELF >/dev/null && \ | ||
| ldd $(PROTOBUF_BUILD_DIR)/src/protoc | grep -v libstdc++ >/dev/null |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,12 +1,12 @@ | ||
| --- omd/packages/Python3/Python3.make 2020-12-01 00:14:17.000000000 +0100 | ||
| +++ omd/packages/Python3/Python3.make_v2 2020-12-22 12:07:15.176907155 +0100 | ||
| @@ -84,7 +84,8 @@ | ||
| --- omd/packages/Python/Python.make 2022-05-26 01:02:30.000000000 +0100 | ||
| +++ omd/packages/Python/Python.make_v2 2022-06-10 21:31:45.732838310 +0100 | ||
| @@ -83,7 +83,8 @@ | ||
| --with-ensurepip=install \ | ||
| --with-openssl=$(PACKAGE_OPENSSL_DESTDIR) \ | ||
| $(PYTHON_ENABLE_OPTIMIZATIONS) \ | ||
| - LDFLAGS="-Wl,--rpath,/omd/versions/xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx/lib $(PACKAGE_OPENSSL_LDFLAGS)" | ||
| + CFLAGS="${CFLAGS} -fno-semantic-interposition" \ | ||
| + LDFLAGS="-Wl,--rpath,/omd/versions/xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx/lib -fno-semantic-interposition $(PACKAGE_OPENSSL_LDFLAGS)" | ||
| cd $(PYTHON3_BUILD_DIR) ; \ | ||
| - LDFLAGS="-Wl,--rpath,/omd/versions/xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx/lib $(PACKAGE_OPENSSL_LDFLAGS)" | ||
| + CFLAGS="${CFLAGS} -fno-semantic-interposition" \ | ||
| + LDFLAGS="-Wl,--rpath,/omd/versions/xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx/lib -fno-semantic-interposition $(PACKAGE_OPENSSL_LDFLAGS)" | ||
| cd $(PYTHON_BUILD_DIR) ; \ | ||
| $(MAKE) -j2 | ||
| $(TOUCH) $@ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,15 +1,15 @@ | ||
| --- omd/packages/Python3/Python3.make 2020-12-22 15:07:15.000000000 +0000 | ||
| +++ omd/packages/Python3/Python3.make_v2 2021-01-09 16:33:02.235281131 +0000 | ||
| @@ -53,10 +53,10 @@ | ||
| --- omd/packages/Python/Python.make 2022-05-26 01:02:30.000000000 +0100 | ||
| +++ omd/packages/Python/Python.make_v2 2022-06-10 21:32:19.602657739 +0100 | ||
| @@ -56,10 +56,10 @@ | ||
| done | ||
| # Native modules built based on this version need to use the correct rpath | ||
| sed -i 's|--rpath,/omd/versions/[^/]*/lib|--rpath,$(OMD_ROOT)/lib|g' \ | ||
| - $(PACKAGE_PYTHON3_PYTHONPATH)/_sysconfigdata__linux_x86_64-linux-gnu.py | ||
| + $(PACKAGE_PYTHON3_PYTHONPATH)/_sysconfigdata__linux_aarch64-linux-gnu.py | ||
| LD_LIBRARY_PATH="$(PACKAGE_PYTHON3_LD_LIBRARY_PATH)" \ | ||
| $(PACKAGE_PYTHON3_EXECUTABLE) -m py_compile \ | ||
| - $(PACKAGE_PYTHON3_PYTHONPATH)/_sysconfigdata__linux_x86_64-linux-gnu.py | ||
| + $(PACKAGE_PYTHON3_PYTHONPATH)/_sysconfigdata__linux_aarch64-linux-gnu.py | ||
| $(TOUCH) $@ | ||
|
|
||
| $(PYTHON3_UNPACK): $(PACKAGE_DIR)/$(PYTHON3)/$(PYTHON3_DIR).tar.xz | ||
| - $(PACKAGE_PYTHON_PYTHONPATH)/_sysconfigdata__linux_x86_64-linux-gnu.py | ||
| + $(PACKAGE_PYTHON_PYTHONPATH)/_sysconfigdata__linux_aarch64-linux-gnu.py | ||
| LD_LIBRARY_PATH="$(PACKAGE_PYTHON_LD_LIBRARY_PATH)" \ | ||
| $(PACKAGE_PYTHON_EXECUTABLE) -m py_compile \ | ||
| - $(PACKAGE_PYTHON_PYTHONPATH)/_sysconfigdata__linux_x86_64-linux-gnu.py | ||
| + $(PACKAGE_PYTHON_PYTHONPATH)/_sysconfigdata__linux_aarch64-linux-gnu.py | ||
| if [ -d "$(PACKAGE_PYTHON_PYTHONPATH)/test" ] ; then \ | ||
| $(RM) -r $(PACKAGE_PYTHON_PYTHONPATH)/test ; \ | ||
| fi |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,15 +1,15 @@ | ||
| --- omd/packages/Python3/Python3.make 2021-03-09 19:34:46.582476044 +0100 | ||
| +++ omd/packages/Python3/Python3.make_v2 2021-03-10 18:32:36.914162777 +0100 | ||
| @@ -55,10 +55,10 @@ | ||
| --- omd/packages/Python/Python.make 2022-05-26 01:02:30.000000000 +0100 | ||
| +++ omd/packages/Python/Python.make_v2 2022-06-10 21:32:48.472505509 +0100 | ||
| @@ -56,10 +56,10 @@ | ||
| done | ||
| # Native modules built based on this version need to use the correct rpath | ||
| sed -i 's|--rpath,/omd/versions/[^/]*/lib|--rpath,$(OMD_ROOT)/lib|g' \ | ||
| - $(PACKAGE_PYTHON3_PYTHONPATH)/_sysconfigdata__linux_x86_64-linux-gnu.py | ||
| + $(PACKAGE_PYTHON3_PYTHONPATH)/_sysconfigdata__linux_arm-linux-gnueabihf.py | ||
| LD_LIBRARY_PATH="$(PACKAGE_PYTHON3_LD_LIBRARY_PATH)" \ | ||
| $(PACKAGE_PYTHON3_EXECUTABLE) -m py_compile \ | ||
| - $(PACKAGE_PYTHON3_PYTHONPATH)/_sysconfigdata__linux_x86_64-linux-gnu.py | ||
| + $(PACKAGE_PYTHON3_PYTHONPATH)/_sysconfigdata__linux_arm-linux-gnueabihf.py | ||
| rm -r $(PACKAGE_PYTHON3_PYTHONPATH)/test | ||
| $(TOUCH) $@ | ||
|
|
||
| - $(PACKAGE_PYTHON_PYTHONPATH)/_sysconfigdata__linux_x86_64-linux-gnu.py | ||
| + $(PACKAGE_PYTHON_PYTHONPATH)/_sysconfigdata__linux_arm-linux-gnueabihf.py | ||
| LD_LIBRARY_PATH="$(PACKAGE_PYTHON_LD_LIBRARY_PATH)" \ | ||
| $(PACKAGE_PYTHON_EXECUTABLE) -m py_compile \ | ||
| - $(PACKAGE_PYTHON_PYTHONPATH)/_sysconfigdata__linux_x86_64-linux-gnu.py | ||
| + $(PACKAGE_PYTHON_PYTHONPATH)/_sysconfigdata__linux_arm-linux-gnueabihf.py | ||
| if [ -d "$(PACKAGE_PYTHON_PYTHONPATH)/test" ] ; then \ | ||
| $(RM) -r $(PACKAGE_PYTHON_PYTHONPATH)/test ; \ | ||
| fi |