Re: [ptxdist] [PATCH] monit: add new package

[Michael Olbrich <m.olbrich@pengutronix.de>]

On Tue, Jan 21, 2014 at 09:51:01AM +0100, Alexander Dahl wrote:
> Hei hei, 
> 
> because I did almost exactly the same yesterday, I just comment on this
> instead of sending my own patch.
> 
> Am 2014-01-20 20:30, schrieb Robert Schwebel:
> > This adds the system monitoring daemon 'monit'.
> > 
> > Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
> > ---
> >  rules/monit.in   | 20 ++++++++++++++++
> >  rules/monit.make | 70 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
> >  2 files changed, 90 insertions(+)
> >  create mode 100644 rules/monit.in
> >  create mode 100644 rules/monit.make
> > 
> > diff --git a/rules/monit.in b/rules/monit.in
> > new file mode 100644
> > index 0000000..281ab21
> > --- /dev/null
> > +++ b/rules/monit.in
> > @@ -0,0 +1,20 @@
> > +## SECTION=networking
> > +
> > +menuconfig MONIT
> > +	tristate
> > +	prompt "monit                         "
> > +	select OPENSSL if MONIT_SSL
> > +	help
> > +	  Monit is a tool for managing and monitoring processes, files,
> > +	  programs, directories and filesystems.
> > +
> > +if MONIT
> > +
> > +config MONIT_SSL
> > +
> > +	bool
> > +	prompt "SSL support"
> > +	help
> > +	  Enable Secure Socket Layer support, using OpenSSL.
> > +
> > +endif
> > diff --git a/rules/monit.make b/rules/monit.make
> > new file mode 100644
> > index 0000000..3430b0e
> > --- /dev/null
> > +++ b/rules/monit.make
> > @@ -0,0 +1,70 @@
> > +# -*-makefile-*-
> > +#
> > +# Copyright (C) 2014 by Robert Schwebel <r.schwebel@pengutronix.de>
> > +#
> > +# See CREDITS for details about who has contributed to this project.
> > +#
> > +# For further information about the PTXdist project and license conditions
> > +# see the README file.
> > +#
> > +
> > +#
> > +# We provide this package
> > +#
> > +PACKAGES-$(PTXCONF_MONIT) += monit
> > +
> > +#
> > +# Paths and names
> > +#
> > +MONIT_VERSION	:= 5.6
> > +MONIT_MD5	:= 19dfc1ce8512e832134d06eedd96ba50
> > +MONIT		:= monit-$(MONIT_VERSION)
> > +MONIT_SUFFIX	:= tar.gz
> > +MONIT_URL	:= http://mmonit.com/monit/dist/$(MONIT).$(MONIT_SUFFIX)
> > +MONIT_SOURCE	:= $(SRCDIR)/$(MONIT).$(MONIT_SUFFIX)
> > +MONIT_DIR	:= $(BUILDDIR)/$(MONIT)
> > +MONIT_LICENSE	:= AGPLv3 with OpenSSL exception
> > +
> > +# ----------------------------------------------------------------------------
> > +# Prepare
> > +# ----------------------------------------------------------------------------
> > +
> > +MONIT_CONF_ENV	:= $(CROSS_ENV) \
> > +	libmonit_cv_setjmp_available=yes \
> > +	libmonit_cv_vsnprintf_c99_conformant=yes
> > +
> > +#
> > +# autoconf
> > +#
> > +MONIT_CONF_TOOL	:= autoconf
> > +MONIT_CONF_OPT	:= \

break

	$(CROSS_AUTOCONF_USR) \
> > +	--enable-optimized \
> 
> This seems to always set -O3. Shouldn't this be set by the build system
> which can distinguish between Debug and Release builds?

Well ptxdist really only does release builds.

> > +	--without-pam \
> > +	--enable-largefile
> > +
> > +ifdef PTXCONF_MONIT_SSL
> > +MONIT_CONF_OPT += --with-ssl-dir=$(SYSROOT)/usr
> > +else
> > +MONIT_CONF_OPT += --without-ssl
> > +endif
> 
> What about just this?
> 
>      --$(call ptx/wwo, PTXCONF_MONIT_SSL)-ssl
> 
> Monit had no problems finding OpenSSL on my machine, so I didn't set
> ssl-dir.

	--$(call ptx/wwo, PTXCONF_MONIT_SSL)-ssl \
	--with-ssl-dir=$(SYSROOT)/usr

is correct. The dir is needed but is ignored for "--without-ssl". It
probably works for you because you have openssl in /usr.

mol

> 
> > +
> > +# ----------------------------------------------------------------------------
> > +# Target-Install
> > +# ----------------------------------------------------------------------------
> > +
> > +$(STATEDIR)/monit.targetinstall:
> > +	@$(call targetinfo)
> > +
> > +	@$(call install_init, monit)
> > +	@$(call install_fixup, monit,PRIORITY,optional)
> > +	@$(call install_fixup, monit,SECTION,base)
> > +	@$(call install_fixup, monit,AUTHOR,"Robert Schwebel
> > <r.schwebel@pengutronix.de>")
> > +	@$(call install_fixup, monit,DESCRIPTION,missing)
> > +
> > +	@$(call install_copy, monit, 0, 0, 0755, /usr/bin/monit)
> > +
> > +	@$(call install_finish, monit)
> > +
> > +	@$(call touch)
> > +
> > +# vim: syntax=make
> 
> This could be improved:
> 
> # vim: ft=make noet
> 
> I'm not entirely sure about filetype vs. syntax, I assumed filetype may
> not only set syntax, but a check may be useful. However noexpandtab is
> useful, because someone may have set expandtab in his general personal
> settings and this would lead to a corrupt Makefile which has to be
> indented with tabs.
> 
> > -- 
> > 1.8.5.2
> 
> Greets
> Alex
> 
> -- 
> »With the first link, the chain is forged. The first speech censured,
> the first thought forbidden, the first freedom denied, chains us all
> irrevocably.« (Jean-Luc Picard, quoting Judge Aaron Satie)
> *** GnuPG-FP: 02C8 A590 7FE5 CA5F 3601  D1D5 8FBA 7744 CC87 10D0 ***
> 
> -- 
> ptxdist mailing list
> ptxdist@pengutronix.de

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

-- 
ptxdist mailing list
ptxdist@pengutronix.de