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

[package] fix zabbix dependencies, remove whitespaces

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/packages@18993 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
florian 2010-01-02 12:14:14 +00:00
parent 48a0b2056c
commit 38cea02224
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
admin/zabbix/Makefile
View File

@ -1,5 +1,5 @@
# #
# Copyright (C) 2006 OpenWrt.org # Copyright (C) 2006-2009 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,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=zabbix PKG_NAME:=zabbix
PKG_VERSION:=1.6 PKG_VERSION:=1.6
PKG_RELEASE:=1 PKG_RELEASE:=2
PKG_MD5SUM:=39d4c871439b1b4f0429964b4abbfc45 PKG_MD5SUM:=39d4c871439b1b4f0429964b4abbfc45
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
@ -25,7 +25,7 @@ define Package/zabbix/Default
TITLE:=Zabbix TITLE:=Zabbix
URL:=http://www.zabbix.com/ URL:=http://www.zabbix.com/
SUBMENU:=zabbix SUBMENU:=zabbix
DEPENDS:=libcurl DEPENDS:=+libcurl
endef endef
define Package/zabbix-agent define Package/zabbix-agent
@ -41,7 +41,7 @@ endef
define Package/zabbix-server define Package/zabbix-server
$(call Package/zabbix/Default) $(call Package/zabbix/Default)
TITLE+= server TITLE+= server
DEPENDS:=+libsqlite3 DEPENDS += +libsqlite3
endef endef
@ -86,10 +86,10 @@ endef
define Package/zabbix-agent/postinst define Package/zabbix-agent/postinst
#!/bin/sh #!/bin/sh
name=zabbix name=zabbix
id=53 id=53
# do not change below # do not change below
# check if we are on real system # check if we are on real system
if [ -z "$${IPKG_INSTROOT}" ]; then if [ -z "$${IPKG_INSTROOT}" ]; then
@ -108,16 +108,18 @@ if [ -z "$${IPKG_INSTROOT}" ]; then
fi fi
echo "" echo ""
if [ -z "$$(grep ^\\$${name}: $${IPKG_INSTROOT}/etc/group)" ]; then if [ -z "$$(grep ^\\$${name}: $${IPKG_INSTROOT}/etc/group)" ]; then
echo "adding group $$name to /etc/group" echo "adding group $$name to /etc/group"
echo "$${name}:x:$${id}:" >> $${IPKG_INSTROOT}/etc/group echo "$${name}:x:$${id}:" >> $${IPKG_INSTROOT}/etc/group
fi fi
if [ -z "$$(grep ^\\$${name}: $${IPKG_INSTROOT}/etc/passwd)" ]; then if [ -z "$$(grep ^\\$${name}: $${IPKG_INSTROOT}/etc/passwd)" ]; then
echo "adding user $$name to /etc/passwd" echo "adding user $$name to /etc/passwd"
echo "$${name}:x:$${id}:$${id}:$${name}:/tmp/.$${name}:/bin/false" >> $${IPKG_INSTROOT}/etc/passwd echo "$${name}:x:$${id}:$${id}:$${name}:/tmp/.$${name}:/bin/false" >> $${IPKG_INSTROOT}/etc/passwd
fi fi
chown $${name} $${IPKG_INSTROOT}/etc/zabbix/zabbix_agentd.conf
endef endef
define Package/zabbix-sender/install define Package/zabbix-sender/install