bakabtw/packages
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- bump nagios to 2.10

Browse Source 
- fix install path for nagios (files are now in the right places,
  not any more in /ipkg-install/... )
- little cleanup of both Makefiles


git-svn-id: svn://svn.openwrt.org/openwrt/packages@10549 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
crazy_imp 2008-03-06 23:45:08 +00:00
parent 754e0c9fd7
commit 3c641afa29
2 changed files with 40 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
net/nagios-plugins/Makefile
View File

@ -1,5 +1,5 @@
# #
# Copyright (C) 2006 OpenWrt.org # Copyright (C) 2008 OpenWrt.org
# #
# This is free software, licensed under the GNU General Public License v2. # This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information. # See /LICENSE for more information.
@ -25,13 +25,13 @@ comma:= ,
define Package/nagios-plugins define Package/nagios-plugins
SECTION:=net SECTION:=net
CATEGORY:=Network CATEGORY:=Network
SUBMENU:=Monitoring
DEPENDS:=+uclibcxx DEPENDS:=+uclibcxx
TITLE:=plugins for Nagios checks TITLE:=plugins for Nagios checks
URL:=http://nagiosplug.sourceforge.net/ URL:=http://nagiosplug.sourceforge.net/
endef endef
define Build/Configure CONFIGURE_ARGS += \
$(call Build/Configure/Default, \
--without-mysql \ --without-mysql \
--with-openssl="$(STAGING_DIR)/usr" \ --with-openssl="$(STAGING_DIR)/usr" \
--with-ping-command="/bin/ping -c %d %s" \ --with-ping-command="/bin/ping -c %d %s" \
@ -41,16 +41,12 @@ define Build/Configure
--with-ps-varlist="&procuid$(comma)&procpid$(comma)&procvsz$(comma)procstat$(comma)procprog$(comma)&pos" \ --with-ps-varlist="&procuid$(comma)&procpid$(comma)&procvsz$(comma)procstat$(comma)procprog$(comma)&pos" \
--with-uptime-command="/usr/bin/uptime" \ --with-uptime-command="/usr/bin/uptime" \
--with-ssh-command="/usr/bin/ssh" \ --with-ssh-command="/usr/bin/ssh" \
--with-nslookup-command="/usr/bin/nslookup" \ --with-nslookup-command="/usr/bin/nslookup"
, \
)
endef
define Build/Compile define Build/Compile
$(call Build/Compile/Default,\ $(MAKE) -C $(PKG_BUILD_DIR) \
DESTDIR="$(PKG_INSTALL_DIR)" \ DESTDIR="$(PKG_INSTALL_DIR)" \
all install \ all install
)
endef endef
define Package/nagios-plugins/install define Package/nagios-plugins/install

43
net/nagios/Makefile
View File

@ -1,5 +1,5 @@
# #
# Copyright (C) 2007 OpenWrt.org # Copyright (C) 2008 OpenWrt.org
# #
# This is free software, licensed under the GNU General Public License v2. # This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information. # See /LICENSE for more information.
@ -9,12 +9,12 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=nagios PKG_NAME:=nagios
PKG_VERSION:=2.9 PKG_VERSION:=2.10
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=@SF/nagios PKG_SOURCE_URL:=@SF/nagios
PKG_MD5SUM:=b6e3a21c91edb063c00712c6001e15ec PKG_MD5SUM:=8c3a29e138f2ff8c8abbd3dd8a40c4b6
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
@ -25,7 +25,8 @@ PKG_BUILD_DEPENDS:=libnotimpl
define Package/nagios define Package/nagios
SECTION:=net SECTION:=net
CATEGORY:=Network CATEGORY:=Network
DEPENDS:=+libpthread +microperl SUBMENU:=Monitoring
DEPENDS:=+libpthread +microperl +libltdl
TITLE:=service and network monitoring program TITLE:=service and network monitoring program
URL:=http://www.nagios.org/ URL:=http://www.nagios.org/
endef endef
@ -34,31 +35,35 @@ define Package/nagios/description
service and network monitoring program service and network monitoring program
endef endef
define Package/send-nagios/conffiles
/etc/send_nagios.cfg
endef
EXTRA_CFLAGS += -I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include EXTRA_CFLAGS += -I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include
define Build/Configure CONFIGURE_ARGS += \
$(call Build/Configure/Default,\
--with-nagios-user="root" \ --with-nagios-user="root" \
--with-nagios-group="root", \ --with-nagios-group="root" \
CFLAGS="$(TARGET_CFLAGS) $(EXTRA_CFLAGS)" \ --sysconfdir="/etc/nagios" \
LIBS="-lnotimpl" \ --without-gd-lib \
) --without-gd-inc \
endef CFLAGS="$(TARGET_CFLAGS) $(EXTRA_CFLAGS)"
CONFIGURE_VARS += \
LIBS="-lnotimpl"
define Build/Compile define Build/Compile
$(call Build/Compile/Default,\ $(MAKE) -C $(PKG_BUILD_DIR) \
DESTDIR="$(PKG_INSTALL_DIR)" \ DESTDIR="$(PKG_INSTALL_DIR)" \
INSTALL_OPTS="" \ INSTALL_OPTS="" \
all install install-config \ all install install-config
)
endef endef
define Package/nagios/install define Package/nagios/install
$(CP) $(PKG_INSTALL_DIR) $(1)/ $(INSTALL_DIR) $(1)/etc/nagios
$(INSTALL_DATA) $(PKG_INSTALL_DIR)/etc/nagios/* $(1)/etc/nagios/
$(INSTALL_DIR) $(1)/usr/bin
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/{nagios,nagiostats} $(1)/usr/bin/
$(INSTALL_DIR) $(1)/usr/sbin
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/* $(1)/usr/sbin/
$(INSTALL_DIR) $(1)/usr/share
$(CP) $(PKG_INSTALL_DIR)/usr/share/* $(1)/usr/share/
endef endef
$(eval $(call BuildPackage,nagios)) $(eval $(call BuildPackage,nagios))