diff options
| author | nico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2005-10-20 09:09:55 +0000 |
|---|---|---|
| committer | nico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2005-10-20 09:09:55 +0000 |
| commit | 3264f38d691cf1a7a549c5276c893a7c5450daf1 (patch) | |
| tree | d30515f5af744a6f850b22c6928571d767f3c9c8 /package/monit/Makefile | |
| parent | 13aacddda0fae9561b50f847b4ba52d530830228 (diff) | |
update monit to new upstream release (v4.6),
split in 2 packages (w/ and w/o ssl support),
add a restart command to init-script.
git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@2193 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/monit/Makefile')
| -rw-r--r-- | package/monit/Makefile | 103 |
1 files changed, 74 insertions, 29 deletions
diff --git a/package/monit/Makefile b/package/monit/Makefile index bbb7c8670..ce4b73890 100644 --- a/package/monit/Makefile +++ b/package/monit/Makefile @@ -3,9 +3,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:=monit -PKG_VERSION:=4.5.1 +PKG_VERSION:=4.6 PKG_RELEASE:=1 -PKG_MD5SUM:=0f054ac39822b4be71789d49e4813754 +PKG_MD5SUM:=4e53aa44e4ca264e61c7c401cee4e697 PKG_SOURCE_URL:=http://www.tildeslash.com/monit/dist/ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz @@ -16,37 +16,72 @@ PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) include $(TOPDIR)/package/rules.mk $(eval $(call PKG_template,MONIT,monit,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) +$(eval $(call PKG_template,MONIT_NOSSL,monit-nossl,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) -$(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared - (cd $(PKG_BUILD_DIR); rm -rf config.{cache,status} ; \ +$(PKG_BUILD_DIR)/.configured: + touch $@ + +$(PKG_BUILD_DIR)/.built: +ifneq ($(BR2_PACKAGE_MONIT),) + ( cd $(PKG_BUILD_DIR); rm -rf config.{cache,status} ; \ $(TARGET_CONFIGURE_OPTS) \ CFLAGS="$(TARGET_CFLAGS)" \ ./configure \ - --target=$(GNU_TARGET_NAME) \ - --host=$(GNU_TARGET_NAME) \ - --build=$(GNU_HOST_NAME) \ - --program-prefix="" \ - --program-suffix="" \ - --prefix=/usr \ - --exec-prefix=/usr \ - --bindir=/usr/sbin \ - --datadir=/usr/share \ - --includedir=/usr/include \ - --infodir=/usr/share/info \ - --libdir=/usr/lib \ - --libexecdir=/usr/lib \ - --localstatedir=/var \ - --mandir=/usr/share/man \ - --sbindir=/usr/sbin \ - --sysconfdir=/etc \ - $(DISABLE_LARGEFILE) \ - $(DISABLE_NLS) \ - --without-ssl \ + --target=$(GNU_TARGET_NAME) \ + --host=$(GNU_TARGET_NAME) \ + --build=$(GNU_HOST_NAME) \ + --program-prefix="" \ + --program-suffix="" \ + --prefix=/usr \ + --exec-prefix=/usr \ + --bindir=/usr/sbin \ + --datadir=/usr/share \ + --includedir=/usr/include \ + --infodir=/usr/share/info \ + --libdir=/usr/lib \ + --libexecdir=/usr/lib \ + --localstatedir=/var \ + --mandir=/usr/share/man \ + --sbindir=/usr/sbin \ + --sysconfdir=/etc \ + $(DISABLE_LARGEFILE) \ + $(DISABLE_NLS) \ + --with-ssl \ + --with-ssl-dir="$(STAGING_DIR)/usr" \ ); - touch $@ - -$(PKG_BUILD_DIR)/.built: $(MAKE) -C $(PKG_BUILD_DIR) + ( cd $(PKG_BUILD_DIR); mv monit monit-ssl; ) +endif +ifneq ($(BR2_PACKAGE_MONIT),) + ( cd $(PKG_BUILD_DIR); rm -rf config.{cache,status} ; \ + $(TARGET_CONFIGURE_OPTS) \ + CFLAGS="$(TARGET_CFLAGS)" \ + ./configure \ + --target=$(GNU_TARGET_NAME) \ + --host=$(GNU_TARGET_NAME) \ + --build=$(GNU_HOST_NAME) \ + --program-prefix="" \ + --program-suffix="" \ + --prefix=/usr \ + --exec-prefix=/usr \ + --bindir=/usr/sbin \ + --datadir=/usr/share \ + --includedir=/usr/include \ + --infodir=/usr/share/info \ + --libdir=/usr/lib \ + --libexecdir=/usr/lib \ + --localstatedir=/var \ + --mandir=/usr/share/man \ + --sbindir=/usr/sbin \ + --sysconfdir=/etc \ + $(DISABLE_LARGEFILE) \ + $(DISABLE_NLS) \ + --without-ssl \ + ); + $(MAKE) -C $(PKG_BUILD_DIR) + ( cd $(PKG_BUILD_DIR); mv monit monit-nossl; ) + $(MAKE) -C $(PKG_BUILD_DIR) clean +endif touch $@ $(IPKG_MONIT): @@ -55,6 +90,16 @@ $(IPKG_MONIT): install -d -m0755 $(IDIR_MONIT)/etc/init.d install -m0755 ./files/monit.init $(IDIR_MONIT)/etc/init.d/monit install -d -m0755 $(IDIR_MONIT)/usr/sbin - cp -fpR $(PKG_BUILD_DIR)/monit $(IDIR_MONIT)/usr/sbin/ - $(STRIP) $(IDIR_MONIT)/usr/sbin/monit + install -m0755 $(PKG_BUILD_DIR)/monit-ssl $(IDIR_MONIT)/usr/sbin/monit + $(RSTRIP) $(IDIR_MONIT) $(IPKG_BUILD) $(IDIR_MONIT) $(PACKAGE_DIR) + +$(IPKG_MONIT_NOSSL): + install -d -m0755 $(IDIR_MONIT_NOSSL)/etc + install -m0600 $(PKG_BUILD_DIR)/monitrc $(IDIR_MONIT_NOSSL)/etc/ + install -d -m0755 $(IDIR_MONIT_NOSSL)/etc/init.d + install -m0755 ./files/monit.init $(IDIR_MONIT_NOSSL)/etc/init.d/monit + install -d -m0755 $(IDIR_MONIT_NOSSL)/usr/sbin + install -m0755 $(PKG_BUILD_DIR)/monit-nossl $(IDIR_MONIT_NOSSL)/usr/sbin/monit + $(RSTRIP) $(IDIR_MONIT_NOSSL) + $(IPKG_BUILD) $(IDIR_MONIT_NOSSL) $(PACKAGE_DIR) |