From ecf77fade9ad4ec99af59169eb02fade7c130aa4 Mon Sep 17 00:00:00 2001 From: Joerg Deckert Date: Mon, 15 Apr 2024 10:23:41 +0200 Subject: [PATCH] install the Zabbix header files via /etc/portage/env/net-analyzer --- Makefile | 7 ++++++- package.use | 2 +- world | 1 + zabbix/portage-env-zabbix | 5 +++++ 4 files changed, 13 insertions(+), 2 deletions(-) create mode 100644 zabbix/portage-env-zabbix diff --git a/Makefile b/Makefile index a224433..9d7f0c4 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,7 @@ 02firstboot = $(CHROOT)/usr/local/bin/02firstboot.start cert-renew.sh = $(CHROOT)/etc/ssl/cert-renew.sh zabbix-userparameter = $(CHROOT)/var/lib/zabbix/userparameter_mysql.conf +portage-env-zabbix = $(CHROOT)/etc/portage/env/net-analyzer/zabbix systemd-units: appliance/MySQL-Backup.sh appliance/backup.service appliance/backup.timer appliance/cert-renew.service appliance/cert-renew.timer mkdir -p $(CHROOT)/usr/local/bin @@ -72,6 +73,10 @@ $(zabbix-userparameter): zabbix/userparameter_mysql.conf mkdir -p $(CHROOT)/var/lib/zabbix cp $< $@ +$(portage-env-zabbix): zabbix/portage-env-zabbix + mkdir -p $(CHROOT)/etc/portage/env/net-analyzer + cp $< $@ + zabbix-syslog: # Zabbix Syslog (https://github.com/v-zhuravlev/zabbix-syslog) mkdir -p $(CHROOT)/etc/zabbix/scripts/lib @@ -140,6 +145,6 @@ snmp-conf: chmod 0775 $(CHROOT)/var/log/snmptt RUN chown zabbix:zabbix /var/log/snmptt -preinstall: +preinstall: $(portage-env-zabbix) postinstall: systemd-units $(02firstboot) $(cert-renew.sh) $(CHROOT)/var/lib/mysql apache-php zabbix-services zabbix-webapp $(zabbix-userparameter) zabbix-syslog zabbix-config fping-perm snmp-conf diff --git a/package.use b/package.use index d82b983..d8f5c92 100644 --- a/package.use +++ b/package.use @@ -6,7 +6,7 @@ dev-java/openjdk-bin headless-awt dev-lang/php apache2 bcmath curl gd ldap mysql mysqli odbc sockets sysvipc truetype xmlreader xmlwriter media-libs/gd jpeg png net-analyzer/zabbix -agent agent2 curl frontend java ldap libxml2 mysql odbc openipmi -postgres proxy server snmp ssh xmpp -net-analyzer/zabbix-headers -agent agent2 curl frontend java ldap libxml2 mysql odbc openipmi -postgres proxy server snmp ssh xmpp net-analyzer/net-snmp perl net-analyzer/fping suid net-print/cups-filters -foomatic -postscript +virtual/jdk headless-awt diff --git a/world b/world index 99c51f8..b72c090 100644 --- a/world +++ b/world @@ -12,6 +12,7 @@ net-analyzer/net-snmp net-analyzer/nmap net-analyzer/snmptt net-analyzer/traceroute +net-analyzer/zabbix net-dns/bind-tools net-im/sendxmpp net-misc/netkit-telnetd diff --git a/zabbix/portage-env-zabbix b/zabbix/portage-env-zabbix new file mode 100644 index 0000000..e1db81d --- /dev/null +++ b/zabbix/portage-env-zabbix @@ -0,0 +1,5 @@ +function post_src_install() { + einfo "Install zabbix includes" + insinto /usr/include/zabbix + doins include/*.h +}