| Message ID | 1453220588.3109.36.camel@intel.com |
|---|---|
| State | Changes Requested |
| Headers | show |
Ray, On Tue, 19 Jan 2016 16:23:08 +0000, Kinsella, Ray wrote: > wview is a collection of unix daemons which interface with a > supported weather station to retrieve archive record > (if generated by the station) current conditions. > > Signed-off-by: Ray Kinsella <ray.kinsella@intel.com<mailto:ray.kinsella@intel.com>> I'm sorry, but this patch is far, far from being ready. To be honest, I am not even sure you even tested it considering the numerous issues I found. See below. > diff --git a/package/Config.in b/package/Config.in > index b971494..be2b0ba 100644 > --- a/package/Config.in > +++ b/package/Config.in > @@ -1279,6 +1279,7 @@ menu "Miscellaneous" > source "package/snowball-init/Config.in" > source "package/wine/Config.in" > source "package/xutil_util-macros/Config.in" > + source "package/wview/Config.in" Wrong indentation, alphabetic ordering not sepected. > endmenu > > menu "Networking applications" > diff --git a/package/wview/0001-fix-absolute-path.patch b/package/wview/0001-fix-absolute-path.patch > new file mode 100644 > index 0000000..d0ccced > --- /dev/null > +++ b/package/wview/0001-fix-absolute-path.patch Patch lacks description + SoB. > @@ -0,0 +1,220 @@ > +diff -Naur a/alarms/Makefile.am b/alarms/Makefile.am > +--- a/alarms/Makefile.am 2014-05-28 01:22:49.000000000 +0100 > ++++ b/alarms/Makefile.am 2016-01-18 15:40:26.229746967 +0000 > +@@ -39,6 +39,5 @@ > + wvalarmd_LDFLAGS = -L$(prefix)/lib -L/usr/lib The -L/usr/lib is quite certainly the thing to remove. So should -L$(prefix)/lib, as prefix=/usr, so it would become -L/usr/lib as well. Please fix this globally. > diff --git a/package/wview/Config.in b/package/wview/Config.in > new file mode 100644 > index 0000000..a0f0bc9 > --- /dev/null > +++ b/package/wview/Config.in > @@ -0,0 +1,23 @@ > +comment "wview needs a toolchain w/ C++, wchar and udev /dev management" > + depends on !(BR2_INSTALL_LIBSTDCPP && BR2_USE_WCHAR && BR2_PACKAGE_HAS_UDEV) We normally write such conditions as: depends on !<foo> || !<bar> || !<baz> > + > +config BR2_PACKAGE_WVIEW > + bool "wview" > + depends on BR2_INSTALL_LIBSTDCPP > + depends on BR2_USE_WCHAR > + depends on BR2_PACKAGE_HAS_UDEV > + depends on BR2_PACKAGE_APACHE Why ? > + depends on BR2_PACKAGE_PHP Why ? > + select BR2_PACKAGE_RADLIB There is no such package in Buildroot. > + select BR2_PACKAGE_LIBCURL > + select BR2_PACKAGE_GD > + select BR2_PACKAGE_LIBPNG > + select BR2_PACKAGE_LIBUSB > + select BR2_PACKAGE_OPENSSL The package also needs sqlite, as can be seen in its configure script: AC_CHECK_LIB([sqlite3], [sqlite3_open], [], [echo "libsqlite3 is missing!";exit -1]) Thread support is also needed, as can be seen in the configure script: AC_CHECK_LIB([pthread], [pthread_create], [], [echo "libpthread is missing!";exit -1]) > + help > + wview is a collection of unix daemons which interface with a > + supported weather station to retrieve archive records > + (if generated by the station) and current conditions. > + > + http://sourceforge.net/projects/radlib/ Is this the right URL ? > diff --git a/package/wview/S61wview b/package/wview/S61wview > new file mode 100644 > index 0000000..c64a014 > --- /dev/null > +++ b/package/wview/S61wview > @@ -0,0 +1,205 @@ > +#!/bin/sh > + > +# add to the shared library search path > +export LD_LIBRARY_PATH=/lib:/usr/lib Not needed. > +CONF_DIRECTORY=/etc/wview > +RUN_DIRECTORY=/var/wview > +WVIEW_INSTALL_DIR=/usr/bin > +# chkconfig: - 89 11 Not needed. > +# description: wview is a unix weather program > +# > +# wview Start/Stop the wview daemons > +# > +# processnames: wviewd htmlgend wviewftpd wvalarmd wvcwopd wviewsshd wvhttpd > +# config: $prefix/etc/wview > +# pidfiles: $prefix/var/wview/*.pid > + > +# Source function library: > +#. /etc/init.d/functions Not needed. > + > +WVIEWD_FILE=`cat $CONF_DIRECTORY/wview-binary` > +WVIEWD_BIN=$WVIEW_INSTALL_DIR/$WVIEWD_FILE > +test -x $WVIEWD_BIN || exit 5 > + > +HTMLD_BIN=$WVIEW_INSTALL_DIR/htmlgend > +test -x $HTMLD_BIN || exit 6 > + > +FTPD_BIN=$WVIEW_INSTALL_DIR/wviewftpd > +test -x $FTPD_BIN || exit 7 > + > +SSHD_BIN=$WVIEW_INSTALL_DIR/wviewsshd > +test -x $SSHD_BIN || exit 7 > + > +ALARMD_BIN=$WVIEW_INSTALL_DIR/wvalarmd > +test -x $ALARMD_BIN || exit 8 > + > +CWOPD_BIN=$WVIEW_INSTALL_DIR/wvcwopd > +test -x $CWOPD_BIN || exit 9 All those checks are useless, we now Buildroot will have installed those binaries. > +HTTP_BIN=$WVIEW_INSTALL_DIR/wvhttpd > + > +SQLD_BIN=$WVIEW_INSTALL_DIR/wviewsqld > + > +RADROUTER_BIN=$WVIEW_INSTALL_DIR/radmrouted > + > +PMOND_BIN=$WVIEW_INSTALL_DIR/wvpmond > +test -x $PMOND_BIN || exit 10 > + > +WVIEWD_PID=$RUN_DIRECTORY/wviewd.pid > +HTMLD_PID=$RUN_DIRECTORY/htmlgend.pid > +FTPD_PID=$RUN_DIRECTORY/wviewftpd.pid > +SSHD_PID=$RUN_DIRECTORY/wviewsshd.pid > +ALARMD_PID=$RUN_DIRECTORY/wvalarmd.pid > +CWOPD_PID=$RUN_DIRECTORY/wvcwopd.pid > +HTTP_PID=$RUN_DIRECTORY/wvhttpd.pid > +SQLD_PID=$RUN_DIRECTORY/wviewsqld.pid > +RADROUTER_PID=$RUN_DIRECTORY/radmrouted.pid > +PMOND_PID=$RUN_DIRECTORY/wvpmond.pid > + > +wait_for_time_set() { > + THOUSAND=1000 > + CURRVAL=`date +%s` > + while [ "$CURRVAL" -lt "$THOUSAND" ]; do > + sleep 1 > + CURRVAL=`date +%s` > + done > +} Why is this needed ? > + > +kill_running_processes() { > + if [ -f $RADROUTER_PID ]; then > + echo "radlib router pid file $RADROUTER_PID exists - killing existing process" > + kill -15 `cat $RADROUTER_PID` > + rm -f $RADROUTER_PID > + fi > + if [ -f $WVIEWD_PID ]; then > + echo "wviewd pid file $WVIEWD_PID exists - killing existing process" > + kill -15 `cat $WVIEWD_PID` > + rm -f $WVIEWD_PID > + fi > + if [ -f $HTMLD_PID ]; then > + echo "htmlgend pid file $HTMLD_PID exists - killing existing process" > + kill -15 `cat $HTMLD_PID` > + rm -f $HTMLD_PID > + fi > + if [ -f $FTPD_PID ]; then > + echo "wviewftpd pid file $FTPD_PID exists - killing existing process" > + kill -15 `cat $FTPD_PID` > + rm -f $FTPD_PID > + fi > + if [ -f $SSHD_PID ]; then > + echo "wviewsshd pid file $SSHD_PID exists - killing existing process" > + kill -15 `cat $SSHD_PID` > + rm -f $SSHD_PID > + fi > + if [ -f $ALARMD_PID ]; then > + echo "wvalarmd pid file $ALARMD_PID exists - killing existing process" > + kill -15 `cat $ALARMD_PID` > + rm -f $ALARMD_PID > + fi > + if [ -f $CWOPD_PID ]; then > + echo "wvcwopd pid file $CWOPD_PID exists - killing existing process" > + kill -15 `cat $CWOPD_PID` > + rm -f $CWOPD_PID > + fi > + if [ -f $HTTP_PID ]; then > + echo "wvhttpd pid file $HTTP_PID exists - killing existing process" > + kill -15 `cat $HTTP_PID` > + rm -f $HTTP_PID > + fi > + if [ -f $PMOND_PID ]; then > + echo "wvpmond pid file $PMOND_PID exists - killing existing process" > + kill -15 `cat $PMOND_PID` > + rm -f $PMOND_PID > + fi Please use start-stop-daemon instead of this code. > +} > + > +case "$1" in > + start) > + kill_running_processes > + > + wait_for_time_set > + > + echo "Starting wview daemons:" > + > + if [ -x $RADROUTER_BIN ]; then > + $RADROUTER_BIN 1 $RUN_DIRECTORY > + else > + echo "Cannot find $RADROUTER_BIN - exiting!" > + exit 10 > + fi > + sleep 1 > + $WVIEWD_BIN > + sleep 1 > + $HTMLD_BIN > + $ALARMD_BIN > + $CWOPD_BIN > + $HTTP_BIN > + $FTPD_BIN > + $SSHD_BIN > + $PMOND_BIN Use start-stop-daemon. > + ;; > + start-trace) > + kill_running_processes > + > + echo "Starting wview daemons (tracing to $RUN_DIRECTORY):" > + echo "Warning: traced processes run very slowly and may effect performance." > + > + if [ -x $RADROUTER_BIN ]; then > + $RADROUTER_BIN 1 $RUN_DIRECTORY > + else > + echo "Cannot find $RADROUTER_BIN - exiting!" > + exit 10 > + fi > + sleep 1 > + strace -o $RUN_DIRECTORY/$WVIEWD_FILE.trace $WVIEWD_BIN -f &> /dev/null & > + sleep 1 > + strace -o $RUN_DIRECTORY/htmlgend.trace $HTMLD_BIN -f &> /dev/null & > + strace -o $RUN_DIRECTORY/wvalarmd.trace $ALARMD_BIN -f &> /dev/null & > + strace -o $RUN_DIRECTORY/wvcwopd.trace $CWOPD_BIN -f &> /dev/null & > + strace -o $RUN_DIRECTORY/wvhttpd.trace $HTTP_BIN -f &> /dev/null & > + strace -o $RUN_DIRECTORY/wviewftpd.trace $FTPD_BIN -f &> /dev/null & > + strace -o $RUN_DIRECTORY/wviewsshd.trace $SSHD_BIN -f &> /dev/null & > + strace -o $RUN_DIRECTORY/wvpmond.trace $PMOND_BIN -f &> /dev/null & > + ;; Remove all of this. > + stop) > + echo "Shutting down wview daemons..." > + if [ -f $PMOND_PID ]; then > + kill -15 `cat $PMOND_PID` > + fi > + if [ -f $HTTP_PID ]; then > + kill -15 `cat $HTTP_PID` > + fi > + if [ -f $CWOPD_PID ]; then > + kill -15 `cat $CWOPD_PID` > + fi > + if [ -f $ALARMD_PID ]; then > + kill -15 `cat $ALARMD_PID` > + fi > + if [ -f $SSHD_PID ]; then > + kill -15 `cat $SSHD_PID` > + fi > + if [ -f $FTPD_PID ]; then > + kill -15 `cat $FTPD_PID` > + fi > + if [ -f $HTMLD_PID ]; then > + kill -15 `cat $HTMLD_PID` > + fi > + if [ -f $WVIEWD_PID ]; then > + kill -15 `cat $WVIEWD_PID` > + fi > + sleep 1 > + if [ -f $RADROUTER_PID ]; then > + kill -15 `cat $RADROUTER_PID` > + fi Use start-stop-daemon, and remove kill_running_processes. > index 0000000..701bf9f > --- /dev/null > +++ b/package/wview/wview.hash > @@ -0,0 +1 @@ > +sha256 460b34fcdf36f4905edf65e150ec83118e1e631c5532901feefcdc0266a27453 wview-5.21.7.tar.gz > diff --git a/package/wview/wview.mk b/package/wview/wview.mk > new file mode 100644 > index 0000000..5f53ed0 > --- /dev/null > +++ b/package/wview/wview.mk > @@ -0,0 +1,23 @@ > +################################################################################ > +# > +# wview > +# > +################################################################################ > + > +WVIEW_VERSION = 5.21.7 > +WVIEW_SOURCE = wview-$(WVIEW_VERSION).tar.gz > +WVIEW_SITE = http://downloads.sourceforge.net/wview > +WVIEW_INSTALL_STAGING = YES > +WVIEW_LICENSE = GPL v2 Should be "GPLv2" > +WVIEW_LICENSE_FILES = COPYING > +VIEW_DEPENDENCIES = radlib libcurl gd libpng udev libusb openssl mysql VIEW_DEPENDENCIES is never taken into account since the variable prefix is not correct. This very mistake is a good indication that you have never built this package. Whenever you submit a new package in Buildroot, please at least make sure that it builds fine in a configuration that has *only* this package selected in menuconfig, and that a build from scratch of this configuration works fine. radlib doesn't exist in Buildroot. You have "mysql" in this variable, but it is not selected in the Config.in file. Plus, I don't see any mysql use in the source code itself. You need to add sqlite in there. > +WVIEW_AUTORECONF = YES > + > +WVIEW_CONF_OPTS += --enable-mysql --prefix=$(STAGING_DIR)/usr There is no --enable-mysql configuration option. Passing --prefix=$(STAGING_DIR)/usr is completely wrong. Leave --prefix to its default value. If the program doesn't build with --prefix=/usr, then something else is broken in the package Makefiles, and passing a different --prefix is 1/ papering over the problem and 2/ potentially harmful. Hint: the problem is at least the -L$(prefix)/lib in the Makefile.am, as pointed above. I've marked the patch as Changes Requested. Please resubmit a new version addressing the above issues. Thanks! Thomas
Hi Thomas, Sorry I only saw your response to this email now. Clearly I messed up badly when building this before sending this patch, apologies. Much of the feedback below is already done, the rest I will sort out before sending a v2. ( BTW I was trying to reuse a system daemon script from WVIEW - clearly a bad idea, I will write one from scratch ). Ray K On Sun, 2016-03-06 at 16:34 +0100, Thomas Petazzoni wrote: > Ray, > > I'm sorry, but this patch is far, far from being ready. To be honest, > I am not even sure you even tested it considering the numerous issues > I found. See below. > > > diff --git a/package/Config.in b/package/Config.in > > index b971494..be2b0ba 100644 > > --- a/package/Config.in > > +++ b/package/Config.in > > @@ -1279,6 +1279,7 @@ menu "Miscellaneous" > > source "package/snowball-init/Config.in" > > source "package/wine/Config.in" > > source "package/xutil_util-macros/Config.in" > > + source "package/wview/Config.in" > > Wrong indentation, alphabetic ordering not sepected. Will fix. > > > endmenu > > > > menu "Networking applications" > > diff --git a/package/wview/0001-fix-absolute-path.patch > > b/package/wview/0001-fix-absolute-path.patch > > new file mode 100644 > > index 0000000..d0ccced > > --- /dev/null > > +++ b/package/wview/0001-fix-absolute-path.patch > > Patch lacks description + SoB. Fixed + Fixed. > > > @@ -0,0 +1,220 @@ > > +diff -Naur a/alarms/Makefile.am b/alarms/Makefile.am > > +--- a/alarms/Makefile.am 2014-05-28 01:22:49.000000000 +0100 > > ++++ b/alarms/Makefile.am 2016-01-18 15:40:26.229746967 +0000 > > +@@ -39,6 +39,5 @@ > > + wvalarmd_LDFLAGS = -L$(prefix)/lib -L/usr/lib > > The -L/usr/lib is quite certainly the thing to remove. So should > -L$(prefix)/lib, as prefix=/usr, so it would become -L/usr/lib as > well. > Please fix this globally. Fixed across the board. > > > diff --git a/package/wview/Config.in b/package/wview/Config.in > > new file mode 100644 > > index 0000000..a0f0bc9 > > --- /dev/null > > +++ b/package/wview/Config.in > > @@ -0,0 +1,23 @@ > > +comment "wview needs a toolchain w/ C++, wchar and udev /dev > > management" > > + depends on !(BR2_INSTALL_LIBSTDCPP && BR2_USE_WCHAR && > > BR2_PACKAGE_HAS_UDEV) > > We normally write such conditions as: > > depends on !<foo> || !<bar> || !<baz> Fixed > > + > > +config BR2_PACKAGE_WVIEW > > + bool "wview" > > + depends on BR2_INSTALL_LIBSTDCPP > > + depends on BR2_USE_WCHAR > > + depends on BR2_PACKAGE_HAS_UDEV > > + depends on BR2_PACKAGE_APACHE > > Why ? The daemon have a dependency on a webserver. It uses apache + php to generate rolling graphs. AUTOTOOLs checks for them as I remember. > > > + depends on BR2_PACKAGE_PHP > > Why ? as above ... > > > + select BR2_PACKAGE_RADLIB > > There is no such package in Buildroot. radklib v5 is on the mailing list. > > > + select BR2_PACKAGE_LIBCURL > > + select BR2_PACKAGE_GD > > + select BR2_PACKAGE_LIBPNG > > + select BR2_PACKAGE_LIBUSB > > + select BR2_PACKAGE_OPENSSL > > The package also needs sqlite, as can be seen in its configure > script: > > AC_CHECK_LIB([sqlite3], [sqlite3_open], [], [echo "libsqlite3 is > missing!";exit -1]) Let me look into that one, it may not be accurate. > > Thread support is also needed, as can be seen in the configure > script: > > AC_CHECK_LIB([pthread], [pthread_create], [], [echo "libpthread is > missing!";exit -1]) Will look into this. > > > + help > > + wview is a collection of unix daemons which interface > > with a > > + supported weather station to retrieve archive records > > + (if generated by the station) and current conditions. > > + > > + http://sourceforge.net/projects/radlib/ > > Is this the right URL ? Have fixed > > diff --git a/package/wview/S61wview b/package/wview/S61wview > > new file mode 100644 > > index 0000000..c64a014 > > --- /dev/null > > +++ b/package/wview/S61wview > > @@ -0,0 +1,205 @@ > > +#!/bin/sh > > + > > +# add to the shared library search path > > +export LD_LIBRARY_PATH=/lib:/usr/lib > > Not needed. ok > > > +CONF_DIRECTORY=/etc/wview > > +RUN_DIRECTORY=/var/wview > > +WVIEW_INSTALL_DIR=/usr/bin > > +# chkconfig: - 89 11 > > Not needed. ok > > > +# description: wview is a unix weather program > > +# > > +# wview Start/Stop the wview daemons > > +# > > +# processnames: wviewd htmlgend wviewftpd wvalarmd wvcwopd > > wviewsshd wvhttpd > > +# config: $prefix/etc/wview > > +# pidfiles: $prefix/var/wview/*.pid > > + > > +# Source function library: > > +#. /etc/init.d/functions > > Not needed. ok > > + > > +WVIEWD_FILE=`cat $CONF_DIRECTORY/wview-binary` > > +WVIEWD_BIN=$WVIEW_INSTALL_DIR/$WVIEWD_FILE > > +test -x $WVIEWD_BIN || exit 5 > > + > > +HTMLD_BIN=$WVIEW_INSTALL_DIR/htmlgend > > +test -x $HTMLD_BIN || exit 6 > > + > > +FTPD_BIN=$WVIEW_INSTALL_DIR/wviewftpd > > +test -x $FTPD_BIN || exit 7 > > + > > +SSHD_BIN=$WVIEW_INSTALL_DIR/wviewsshd > > +test -x $SSHD_BIN || exit 7 > > + > > +ALARMD_BIN=$WVIEW_INSTALL_DIR/wvalarmd > > +test -x $ALARMD_BIN || exit 8 > > + > > +CWOPD_BIN=$WVIEW_INSTALL_DIR/wvcwopd > > +test -x $CWOPD_BIN || exit 9 > > All those checks are useless, we now Buildroot will have installed > those binaries. ok > > > +HTTP_BIN=$WVIEW_INSTALL_DIR/wvhttpd > > + > > +SQLD_BIN=$WVIEW_INSTALL_DIR/wviewsqld > > + > > +RADROUTER_BIN=$WVIEW_INSTALL_DIR/radmrouted > > + > > +PMOND_BIN=$WVIEW_INSTALL_DIR/wvpmond > > +test -x $PMOND_BIN || exit 10 > > + > > +WVIEWD_PID=$RUN_DIRECTORY/wviewd.pid > > +HTMLD_PID=$RUN_DIRECTORY/htmlgend.pid > > +FTPD_PID=$RUN_DIRECTORY/wviewftpd.pid > > +SSHD_PID=$RUN_DIRECTORY/wviewsshd.pid > > +ALARMD_PID=$RUN_DIRECTORY/wvalarmd.pid > > +CWOPD_PID=$RUN_DIRECTORY/wvcwopd.pid > > +HTTP_PID=$RUN_DIRECTORY/wvhttpd.pid > > +SQLD_PID=$RUN_DIRECTORY/wviewsqld.pid > > +RADROUTER_PID=$RUN_DIRECTORY/radmrouted.pid > > +PMOND_PID=$RUN_DIRECTORY/wvpmond.pid > > + > > +wait_for_time_set() { > > + THOUSAND=1000 > > + CURRVAL=`date +%s` > > + while [ "$CURRVAL" -lt "$THOUSAND" ]; do > > + sleep 1 > > + CURRVAL=`date +%s` > > + done > > +} > > Why is this needed ? I will investigate. > > + > > +kill_running_processes() { > > + if [ -f $RADROUTER_PID ]; then > > + echo "radlib router pid file $RADROUTER_PID exists > > - killing existing process" > > + kill -15 `cat $RADROUTER_PID` > > + rm -f $RADROUTER_PID > > + fi > > + if [ -f $WVIEWD_PID ]; then > > + echo "wviewd pid file $WVIEWD_PID exists - killing > > existing process" > > + kill -15 `cat $WVIEWD_PID` > > + rm -f $WVIEWD_PID > > + fi > > + if [ -f $HTMLD_PID ]; then > > + echo "htmlgend pid file $HTMLD_PID exists - killing > > existing process" > > + kill -15 `cat $HTMLD_PID` > > + rm -f $HTMLD_PID > > + fi > > + if [ -f $FTPD_PID ]; then > > + echo "wviewftpd pid file $FTPD_PID exists - killing > > existing process" > > + kill -15 `cat $FTPD_PID` > > + rm -f $FTPD_PID > > + fi > > + if [ -f $SSHD_PID ]; then > > + echo "wviewsshd pid file $SSHD_PID exists - killing > > existing process" > > + kill -15 `cat $SSHD_PID` > > + rm -f $SSHD_PID > > + fi > > + if [ -f $ALARMD_PID ]; then > > + echo "wvalarmd pid file $ALARMD_PID exists - > > killing existing process" > > + kill -15 `cat $ALARMD_PID` > > + rm -f $ALARMD_PID > > + fi > > + if [ -f $CWOPD_PID ]; then > > + echo "wvcwopd pid file $CWOPD_PID exists - killing > > existing process" > > + kill -15 `cat $CWOPD_PID` > > + rm -f $CWOPD_PID > > + fi > > + if [ -f $HTTP_PID ]; then > > + echo "wvhttpd pid file $HTTP_PID exists - killing > > existing process" > > + kill -15 `cat $HTTP_PID` > > + rm -f $HTTP_PID > > + fi > > + if [ -f $PMOND_PID ]; then > > + echo "wvpmond pid file $PMOND_PID exists - killing > > existing process" > > + kill -15 `cat $PMOND_PID` > > + rm -f $PMOND_PID > > + fi > > Please use start-stop-daemon instead of this code. ok > > +} > > + > > +case "$1" in > > + start) > > + kill_running_processes > > + > > + wait_for_time_set > > + > > + echo "Starting wview daemons:" > > + > > + if [ -x $RADROUTER_BIN ]; then > > + $RADROUTER_BIN 1 $RUN_DIRECTORY > > + else > > + echo "Cannot find $RADROUTER_BIN - exiting!" > > + exit 10 > > + fi > > + sleep 1 > > + $WVIEWD_BIN > > + sleep 1 > > + $HTMLD_BIN > > + $ALARMD_BIN > > + $CWOPD_BIN > > + $HTTP_BIN > > + $FTPD_BIN > > + $SSHD_BIN > > + $PMOND_BIN > > Use start-stop-daemon. ok > + ;; > > + start-trace) > > + kill_running_processes > > + > > + echo "Starting wview daemons (tracing to $RUN_DIRECTORY):" > > + echo "Warning: traced processes run very slowly and may > > effect performance." > > + > > + if [ -x $RADROUTER_BIN ]; then > > + $RADROUTER_BIN 1 $RUN_DIRECTORY > > + else > > + echo "Cannot find $RADROUTER_BIN - exiting!" > > + exit 10 > > + fi > > + sleep 1 > > + strace -o $RUN_DIRECTORY/$WVIEWD_FILE.trace $WVIEWD_BIN -f > > &> /dev/null & > > + sleep 1 > > + strace -o $RUN_DIRECTORY/htmlgend.trace $HTMLD_BIN -f &> > > /dev/null & > > + strace -o $RUN_DIRECTORY/wvalarmd.trace $ALARMD_BIN -f &> > > /dev/null & > > + strace -o $RUN_DIRECTORY/wvcwopd.trace $CWOPD_BIN -f &> > > /dev/null & > > + strace -o $RUN_DIRECTORY/wvhttpd.trace $HTTP_BIN -f &> > > /dev/null & > > + strace -o $RUN_DIRECTORY/wviewftpd.trace $FTPD_BIN -f &> > > /dev/null & > > + strace -o $RUN_DIRECTORY/wviewsshd.trace $SSHD_BIN -f &> > > /dev/null & > > + strace -o $RUN_DIRECTORY/wvpmond.trace $PMOND_BIN -f &> > > /dev/null & > > + ;; > > Remove all of this. ok > > > + stop) > > + echo "Shutting down wview daemons..." > > + if [ -f $PMOND_PID ]; then > > + kill -15 `cat $PMOND_PID` > > + fi > > + if [ -f $HTTP_PID ]; then > > + kill -15 `cat $HTTP_PID` > > + fi > > + if [ -f $CWOPD_PID ]; then > > + kill -15 `cat $CWOPD_PID` > > + fi > > + if [ -f $ALARMD_PID ]; then > > + kill -15 `cat $ALARMD_PID` > > + fi > > + if [ -f $SSHD_PID ]; then > > + kill -15 `cat $SSHD_PID` > > + fi > > + if [ -f $FTPD_PID ]; then > > + kill -15 `cat $FTPD_PID` > > + fi > > + if [ -f $HTMLD_PID ]; then > > + kill -15 `cat $HTMLD_PID` > > + fi > > + if [ -f $WVIEWD_PID ]; then > > + kill -15 `cat $WVIEWD_PID` > > + fi > > + sleep 1 > > + if [ -f $RADROUTER_PID ]; then > > + kill -15 `cat $RADROUTER_PID` > > + fi > > Use start-stop-daemon, and remove kill_running_processes. > > index 0000000..701bf9f > > --- /dev/null > > +++ b/package/wview/wview.hash > > @@ -0,0 +1 @@ > > +sha256 > > 460b34fcdf36f4905edf65e150ec83118e1e631c5532901feefcdc0266a27453 > > wview-5.21.7.tar.gz > > diff --git a/package/wview/wview.mk b/package/wview/wview.mk > > new file mode 100644 > > index 0000000..5f53ed0 > > --- /dev/null > > +++ b/package/wview/wview.mk > > @@ -0,0 +1,23 @@ > > +################################################################## > > ############## > > +# > > +# wview > > +# > > +################################################################## > > ############## > > + > > +WVIEW_VERSION = 5.21.7 > > +WVIEW_SOURCE = wview-$(WVIEW_VERSION).tar.gz > > +WVIEW_SITE = http://downloads.sourceforge.net/wview > > +WVIEW_INSTALL_STAGING = YES > > +WVIEW_LICENSE = GPL v2 > > Should be "GPLv2" ok > > +WVIEW_LICENSE_FILES = COPYING > > +VIEW_DEPENDENCIES = radlib libcurl gd libpng udev libusb openssl > > mysql > > VIEW_DEPENDENCIES is never taken into account since the variable > prefix > is not correct. This very mistake is a good indication that you have > never built this package. Ok - my mistake. > Whenever you submit a new package in > Buildroot, please at least make sure that it builds fine in a > configuration that has *only* this package selected in menuconfig, > and > that a build from scratch of this configuration works fine. Apologies I thought I had, I clearly messed up - I usually do a 'rm -rf output'. > radlib doesn't exist in Buildroot. radlib patch is in v5 on the BL mailing list. > > You have "mysql" in this variable, but it is not selected in the > Config.in file. Plus, I don't see any mysql use in the source code > itself. I will look into this, I am pretty sure it is required. I will confirm. > > You need to add sqlite in there. I will look into this. > > +WVIEW_AUTORECONF = YES > > + > > +WVIEW_CONF_OPTS += --enable-mysql --prefix=$(STAGING_DIR)/usr > > There is no --enable-mysql configuration option. > I will look into this. > Passing --prefix=$(STAGING_DIR)/usr is completely wrong. Leave - > -prefix > to its default value. If the program doesn't build with - > -prefix=/usr, > then something else is broken in the package Makefiles, and passing a > different --prefix is 1/ papering over the problem and 2/ potentially > harmful. Yes - this is the same mess that there was radlib, have had to make similar changes there. > > Hint: the problem is at least the -L$(prefix)/lib in the Makefile.am, > as pointed above. > > I've marked the patch as Changes Requested. Please resubmit a new > version addressing the above issues. Thanks! Thanks Thomas - apologies for the mess. > Thomas
diff --git a/package/Config.in b/package/Config.in index b971494..be2b0ba 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1279,6 +1279,7 @@ menu "Miscellaneous" source "package/snowball-init/Config.in" source "package/wine/Config.in" source "package/xutil_util-macros/Config.in" + source "package/wview/Config.in" endmenu menu "Networking applications" diff --git a/package/wview/0001-fix-absolute-path.patch b/package/wview/0001-fix-absolute-path.patch new file mode 100644 index 0000000..d0ccced --- /dev/null +++ b/package/wview/0001-fix-absolute-path.patch @@ -0,0 +1,220 @@ +diff -Naur a/alarms/Makefile.am b/alarms/Makefile.am +--- a/alarms/Makefile.am 2014-05-28 01:22:49.000000000 +0100 ++++ b/alarms/Makefile.am 2016-01-18 15:40:26.229746967 +0000 +@@ -39,6 +39,5 @@ + wvalarmd_LDFLAGS = -L$(prefix)/lib -L/usr/lib + + if CROSSCOMPILE +-wvalarmd_LDFLAGS += $(prefix)/lib/crt1.o $(prefix)/lib/crti.o $(prefix)/lib/crtn.o + endif + +diff -Naur a/cwop/Makefile.am b/cwop/Makefile.am +--- a/cwop/Makefile.am 2014-05-28 01:22:50.000000000 +0100 ++++ b/cwop/Makefile.am 2016-01-18 15:40:26.203745644 +0000 +@@ -35,6 +35,5 @@ + wvcwopd_LDFLAGS = -L$(prefix)/lib -L/usr/lib + + if CROSSCOMPILE +-wvcwopd_LDFLAGS += $(prefix)/lib/crt1.o $(prefix)/lib/crti.o $(prefix)/lib/crtn.o + endif + +diff -Naur a/ftp/Makefile.am b/ftp/Makefile.am +--- a/ftp/Makefile.am 2014-05-28 01:22:51.000000000 +0100 ++++ b/ftp/Makefile.am 2016-01-18 15:40:26.201745542 +0000 +@@ -36,6 +36,5 @@ + wviewftpd_LDFLAGS = -L$(prefix)/lib -L/usr/lib + + if CROSSCOMPILE +-wviewftpd_LDFLAGS += $(prefix)/lib/crt1.o $(prefix)/lib/crti.o $(prefix)/lib/crtn.o + endif + +diff -Naur a/htmlgenerator/Makefile.am b/htmlgenerator/Makefile.am +--- a/htmlgenerator/Makefile.am 2014-05-28 01:22:50.000000000 +0100 ++++ b/htmlgenerator/Makefile.am 2016-01-18 15:40:26.207745847 +0000 +@@ -69,6 +69,5 @@ + htmlgend_LDFLAGS = -L$(prefix)/lib -L/usr/lib + + if CROSSCOMPILE +-htmlgend_LDFLAGS += $(prefix)/lib/crt1.o $(prefix)/lib/crti.o $(prefix)/lib/crtn.o + endif + +diff -Naur a/http/Makefile.am b/http/Makefile.am +--- a/http/Makefile.am 2014-05-28 01:22:51.000000000 +0100 ++++ b/http/Makefile.am 2016-01-18 15:40:59.436436718 +0000 +@@ -9,8 +9,6 @@ + INCLUDES = \ + -I$(top_srcdir)/common \ + -I$(prefix)/include \ +- -I/usr/include \ +- -I/usr/local/include \ + -D_GNU_SOURCE \ + -DWV_CONFIG_DIR=\"$(sysconfdir)/wview\" \ + -DWV_RUN_DIR=\"$(localstatedir)/wview\" \ +@@ -41,6 +39,5 @@ + wvhttpd_LDFLAGS = -L$(prefix)/lib -L/usr/lib + + if CROSSCOMPILE +-wvhttpd_LDFLAGS += $(prefix)/lib/crt1.o $(prefix)/lib/crti.o $(prefix)/lib/crtn.o + endif + +diff -Naur a/procmon/Makefile.am b/procmon/Makefile.am +--- a/procmon/Makefile.am 2014-05-28 01:22:51.000000000 +0100 ++++ b/procmon/Makefile.am 2016-01-18 15:40:26.254748239 +0000 +@@ -36,6 +36,5 @@ + wvpmond_LDFLAGS = -L$(prefix)/lib -L/usr/lib + + if CROSSCOMPILE +-wvpmond_LDFLAGS += $(prefix)/lib/crt1.o $(prefix)/lib/crti.o $(prefix)/lib/crtn.o + endif + +diff -Naur a/ssh/Makefile.am b/ssh/Makefile.am +--- a/ssh/Makefile.am 2014-05-28 01:22:50.000000000 +0100 ++++ b/ssh/Makefile.am 2016-01-18 15:40:26.225746763 +0000 +@@ -36,6 +36,5 @@ + wviewsshd_LDFLAGS = -L$(prefix)/lib -L/usr/lib + + if CROSSCOMPILE +-wviewsshd_LDFLAGS += $(prefix)/lib/crt1.o $(prefix)/lib/crti.o $(prefix)/lib/crtn.o + endif + +diff -Naur a/stations/Simulator/Makefile.am b/stations/Simulator/Makefile.am +--- a/stations/Simulator/Makefile.am 2014-05-28 01:22:49.000000000 +0100 ++++ b/stations/Simulator/Makefile.am 2016-01-18 15:40:26.233747170 +0000 +@@ -55,6 +55,5 @@ + wviewd_sim_LDFLAGS = -L$(prefix)/lib -L/usr/lib + + if CROSSCOMPILE +-wviewd_sim_LDFLAGS += $(prefix)/lib/crt1.o $(prefix)/lib/crti.o $(prefix)/lib/crtn.o + endif + +diff -Naur a/stations/TWI/Makefile.am b/stations/TWI/Makefile.am +--- a/stations/TWI/Makefile.am 2014-05-28 01:22:48.000000000 +0100 ++++ b/stations/TWI/Makefile.am 2016-01-18 15:40:26.241747578 +0000 +@@ -60,6 +60,5 @@ + wviewd_twi_LDFLAGS = -L$(prefix)/lib -L/usr/lib + + if CROSSCOMPILE +-wviewd_twi_LDFLAGS += $(prefix)/lib/crt1.o $(prefix)/lib/crti.o $(prefix)/lib/crtn.o + endif + +diff -Naur a/stations/VantagePro/Makefile.am b/stations/VantagePro/Makefile.am +--- a/stations/VantagePro/Makefile.am 2014-05-28 01:22:49.000000000 +0100 ++++ b/stations/VantagePro/Makefile.am 2016-01-18 15:40:26.245747781 +0000 +@@ -59,6 +59,5 @@ + wviewd_vpro_LDFLAGS = -L$(prefix)/lib -L/usr/lib + + if CROSSCOMPILE +-wviewd_vpro_LDFLAGS += $(prefix)/lib/crt1.o $(prefix)/lib/crti.o $(prefix)/lib/crtn.o + endif + +diff -Naur a/stations/VantagePro/vpconfig/Makefile.am b/stations/VantagePro/vpconfig/Makefile.am +--- a/stations/VantagePro/vpconfig/Makefile.am 2014-05-28 01:22:49.000000000 +0100 ++++ b/stations/VantagePro/vpconfig/Makefile.am 2016-01-18 15:40:26.244747730 +0000 +@@ -43,7 +43,6 @@ + vpconfig_LDFLAGS = -L$(prefix)/lib -L/usr/lib + + if CROSSCOMPILE +-vpconfig_LDFLAGS += $(prefix)/lib/crt1.o $(prefix)/lib/crti.o $(prefix)/lib/crtn.o + endif + + CLEANFILES = $(bin_SCRIPTS) +diff -Naur a/stations/Virtual/Makefile.am b/stations/Virtual/Makefile.am +--- a/stations/Virtual/Makefile.am 2014-05-28 01:22:49.000000000 +0100 ++++ b/stations/Virtual/Makefile.am 2016-01-18 15:40:26.249747985 +0000 +@@ -61,6 +61,5 @@ + wviewd_virtual_LDFLAGS = -L$(prefix)/lib -L/usr/lib + + if CROSSCOMPILE +-wviewd_virtual_LDFLAGS += $(prefix)/lib/crt1.o $(prefix)/lib/crti.o $(prefix)/lib/crtn.o + endif + +diff -Naur a/stations/WMR918/Makefile.am b/stations/WMR918/Makefile.am +--- a/stations/WMR918/Makefile.am 2014-05-28 01:22:49.000000000 +0100 ++++ b/stations/WMR918/Makefile.am 2016-01-18 15:40:26.235747272 +0000 +@@ -59,6 +59,5 @@ + wviewd_wmr918_LDFLAGS = -L$(prefix)/lib -L/usr/lib + + if CROSSCOMPILE +-wviewd_wmr918_LDFLAGS += $(prefix)/lib/crt1.o $(prefix)/lib/crti.o $(prefix)/lib/crtn.o + endif + +diff -Naur a/stations/WS-2300/Makefile.am b/stations/WS-2300/Makefile.am +--- a/stations/WS-2300/Makefile.am 2014-05-28 01:22:49.000000000 +0100 ++++ b/stations/WS-2300/Makefile.am 2016-01-18 15:40:26.248747934 +0000 +@@ -59,6 +59,5 @@ + wviewd_ws2300_LDFLAGS = -L$(prefix)/lib -L/usr/lib + + if CROSSCOMPILE +-wviewd_ws2300_LDFLAGS += $(prefix)/lib/crt1.o $(prefix)/lib/crti.o $(prefix)/lib/crtn.o + endif + +diff -Naur a/stations/WXT510/Makefile.am b/stations/WXT510/Makefile.am +--- a/stations/WXT510/Makefile.am 2014-05-28 01:22:49.000000000 +0100 ++++ b/stations/WXT510/Makefile.am 2016-01-18 15:40:26.238747425 +0000 +@@ -62,6 +62,5 @@ + wviewd_wxt510_LDFLAGS = -L$(prefix)/lib -L/usr/lib + + if CROSSCOMPILE +-wviewd_wxt510_LDFLAGS += $(prefix)/lib/crt1.o $(prefix)/lib/crti.o $(prefix)/lib/crtn.o + endif + +diff -Naur a/stations/WXT510/wxt510config/Makefile.am b/stations/WXT510/wxt510config/Makefile.am +--- a/stations/WXT510/wxt510config/Makefile.am 2014-05-28 01:22:49.000000000 +0100 ++++ b/stations/WXT510/wxt510config/Makefile.am 2016-01-18 15:40:26.240747527 +0000 +@@ -41,6 +41,5 @@ + wxt510config_LDFLAGS = -L$(prefix)/lib -L/usr/lib + + if CROSSCOMPILE +-wxt510config_LDFLAGS += $(prefix)/lib/crt1.o $(prefix)/lib/crti.o $(prefix)/lib/crtn.o + endif + +diff -Naur a/utilities/archive-be2le/Makefile.am b/utilities/archive-be2le/Makefile.am +--- a/utilities/archive-be2le/Makefile.am 2014-05-28 01:22:50.000000000 +0100 ++++ b/utilities/archive-be2le/Makefile.am 2016-01-18 15:40:26.196745288 +0000 +@@ -34,6 +34,5 @@ + arc_be2le_LDFLAGS = -L$(prefix)/lib -L/usr/lib + + if CROSSCOMPILE +-arc_be2le_LDFLAGS += $(prefix)/lib/crt1.o $(prefix)/lib/crti.o $(prefix)/lib/crtn.o + endif + +diff -Naur a/utilities/archive-le2be/Makefile.am b/utilities/archive-le2be/Makefile.am +--- a/utilities/archive-le2be/Makefile.am 2014-05-28 01:22:50.000000000 +0100 ++++ b/utilities/archive-le2be/Makefile.am 2016-01-18 15:40:26.190744982 +0000 +@@ -34,6 +34,5 @@ + arc_le2be_LDFLAGS = -L$(prefix)/lib -L/usr/lib + + if CROSSCOMPILE +-arc_le2be_LDFLAGS += $(prefix)/lib/crt1.o $(prefix)/lib/crti.o $(prefix)/lib/crtn.o + endif + +diff -Naur a/utilities/hilowcreate/Makefile.am b/utilities/hilowcreate/Makefile.am +--- a/utilities/hilowcreate/Makefile.am 2014-05-28 01:22:51.000000000 +0100 ++++ b/utilities/hilowcreate/Makefile.am 2016-01-18 15:40:26.193745135 +0000 +@@ -31,6 +31,5 @@ + hilowcreate_LDFLAGS = -L$(prefix)/lib -L/usr/lib + + if CROSSCOMPILE +-hilowcreate_LDFLAGS += $(prefix)/lib/crt1.o $(prefix)/lib/crti.o $(prefix)/lib/crtn.o + endif + +diff -Naur a/utilities/sqlite2wlk/Makefile.am b/utilities/sqlite2wlk/Makefile.am +--- a/utilities/sqlite2wlk/Makefile.am 2014-05-28 01:22:50.000000000 +0100 ++++ b/utilities/sqlite2wlk/Makefile.am 2016-01-18 15:40:26.192745084 +0000 +@@ -32,6 +32,5 @@ + sqlite2wlk_LDFLAGS = -L$(prefix)/lib -L/usr/lib + + if CROSSCOMPILE +-sqlite2wlk_LDFLAGS += $(prefix)/lib/crt1.o $(prefix)/lib/crti.o $(prefix)/lib/crtn.o + endif + +diff -Naur a/utilities/wlk2sqlite/Makefile.am b/utilities/wlk2sqlite/Makefile.am +--- a/utilities/wlk2sqlite/Makefile.am 2014-05-28 01:22:51.000000000 +0100 ++++ b/utilities/wlk2sqlite/Makefile.am 2016-01-18 15:40:26.199745440 +0000 +@@ -32,6 +32,5 @@ + wlk2sqlite_LDFLAGS = -L$(prefix)/lib -L/usr/lib + + if CROSSCOMPILE +-wlk2sqlite_LDFLAGS += $(prefix)/lib/crt1.o $(prefix)/lib/crti.o $(prefix)/lib/crtn.o + endif + diff --git a/package/wview/Config.in b/package/wview/Config.in new file mode 100644 index 0000000..a0f0bc9 --- /dev/null +++ b/package/wview/Config.in @@ -0,0 +1,23 @@ +comment "wview needs a toolchain w/ C++, wchar and udev /dev management" + depends on !(BR2_INSTALL_LIBSTDCPP && BR2_USE_WCHAR && BR2_PACKAGE_HAS_UDEV) + +config BR2_PACKAGE_WVIEW + bool "wview" + depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_USE_WCHAR + depends on BR2_PACKAGE_HAS_UDEV + depends on BR2_PACKAGE_APACHE + depends on BR2_PACKAGE_PHP + depends on BR2_PACKAGE_PHP_EXT_SQLITE + select BR2_PACKAGE_RADLIB + select BR2_PACKAGE_LIBCURL + select BR2_PACKAGE_GD + select BR2_PACKAGE_LIBPNG + select BR2_PACKAGE_LIBUSB + select BR2_PACKAGE_OPENSSL + help + wview is a collection of unix daemons which interface with a + supported weather station to retrieve archive records + (if generated by the station) and current conditions. + + http://sourceforge.net/projects/radlib/ diff --git a/package/wview/S61wview b/package/wview/S61wview new file mode 100644 index 0000000..c64a014 --- /dev/null +++ b/package/wview/S61wview @@ -0,0 +1,205 @@ +#!/bin/sh + +# add to the shared library search path +export LD_LIBRARY_PATH=/lib:/usr/lib +CONF_DIRECTORY=/etc/wview +RUN_DIRECTORY=/var/wview +WVIEW_INSTALL_DIR=/usr/bin +# chkconfig: - 89 11 +# description: wview is a unix weather program +# +# wview Start/Stop the wview daemons +# +# processnames: wviewd htmlgend wviewftpd wvalarmd wvcwopd wviewsshd wvhttpd +# config: $prefix/etc/wview +# pidfiles: $prefix/var/wview/*.pid + +# Source function library: +#. /etc/init.d/functions + +WVIEWD_FILE=`cat $CONF_DIRECTORY/wview-binary` +WVIEWD_BIN=$WVIEW_INSTALL_DIR/$WVIEWD_FILE +test -x $WVIEWD_BIN || exit 5 + +HTMLD_BIN=$WVIEW_INSTALL_DIR/htmlgend +test -x $HTMLD_BIN || exit 6 + +FTPD_BIN=$WVIEW_INSTALL_DIR/wviewftpd +test -x $FTPD_BIN || exit 7 + +SSHD_BIN=$WVIEW_INSTALL_DIR/wviewsshd +test -x $SSHD_BIN || exit 7 + +ALARMD_BIN=$WVIEW_INSTALL_DIR/wvalarmd +test -x $ALARMD_BIN || exit 8 + +CWOPD_BIN=$WVIEW_INSTALL_DIR/wvcwopd +test -x $CWOPD_BIN || exit 9 + +HTTP_BIN=$WVIEW_INSTALL_DIR/wvhttpd + +SQLD_BIN=$WVIEW_INSTALL_DIR/wviewsqld + +RADROUTER_BIN=$WVIEW_INSTALL_DIR/radmrouted + +PMOND_BIN=$WVIEW_INSTALL_DIR/wvpmond +test -x $PMOND_BIN || exit 10 + +WVIEWD_PID=$RUN_DIRECTORY/wviewd.pid +HTMLD_PID=$RUN_DIRECTORY/htmlgend.pid +FTPD_PID=$RUN_DIRECTORY/wviewftpd.pid +SSHD_PID=$RUN_DIRECTORY/wviewsshd.pid +ALARMD_PID=$RUN_DIRECTORY/wvalarmd.pid +CWOPD_PID=$RUN_DIRECTORY/wvcwopd.pid +HTTP_PID=$RUN_DIRECTORY/wvhttpd.pid +SQLD_PID=$RUN_DIRECTORY/wviewsqld.pid +RADROUTER_PID=$RUN_DIRECTORY/radmrouted.pid +PMOND_PID=$RUN_DIRECTORY/wvpmond.pid + +wait_for_time_set() { + THOUSAND=1000 + CURRVAL=`date +%s` + while [ "$CURRVAL" -lt "$THOUSAND" ]; do + sleep 1 + CURRVAL=`date +%s` + done +} + +kill_running_processes() { + if [ -f $RADROUTER_PID ]; then + echo "radlib router pid file $RADROUTER_PID exists - killing existing process" + kill -15 `cat $RADROUTER_PID` + rm -f $RADROUTER_PID + fi + if [ -f $WVIEWD_PID ]; then + echo "wviewd pid file $WVIEWD_PID exists - killing existing process" + kill -15 `cat $WVIEWD_PID` + rm -f $WVIEWD_PID + fi + if [ -f $HTMLD_PID ]; then + echo "htmlgend pid file $HTMLD_PID exists - killing existing process" + kill -15 `cat $HTMLD_PID` + rm -f $HTMLD_PID + fi + if [ -f $FTPD_PID ]; then + echo "wviewftpd pid file $FTPD_PID exists - killing existing process" + kill -15 `cat $FTPD_PID` + rm -f $FTPD_PID + fi + if [ -f $SSHD_PID ]; then + echo "wviewsshd pid file $SSHD_PID exists - killing existing process" + kill -15 `cat $SSHD_PID` + rm -f $SSHD_PID + fi + if [ -f $ALARMD_PID ]; then + echo "wvalarmd pid file $ALARMD_PID exists - killing existing process" + kill -15 `cat $ALARMD_PID` + rm -f $ALARMD_PID + fi + if [ -f $CWOPD_PID ]; then + echo "wvcwopd pid file $CWOPD_PID exists - killing existing process" + kill -15 `cat $CWOPD_PID` + rm -f $CWOPD_PID + fi + if [ -f $HTTP_PID ]; then + echo "wvhttpd pid file $HTTP_PID exists - killing existing process" + kill -15 `cat $HTTP_PID` + rm -f $HTTP_PID + fi + if [ -f $PMOND_PID ]; then + echo "wvpmond pid file $PMOND_PID exists - killing existing process" + kill -15 `cat $PMOND_PID` + rm -f $PMOND_PID + fi +} + +case "$1" in + start) + kill_running_processes + + wait_for_time_set + + echo "Starting wview daemons:" + + if [ -x $RADROUTER_BIN ]; then + $RADROUTER_BIN 1 $RUN_DIRECTORY + else + echo "Cannot find $RADROUTER_BIN - exiting!" + exit 10 + fi + sleep 1 + $WVIEWD_BIN + sleep 1 + $HTMLD_BIN + $ALARMD_BIN + $CWOPD_BIN + $HTTP_BIN + $FTPD_BIN + $SSHD_BIN + $PMOND_BIN + ;; + start-trace) + kill_running_processes + + echo "Starting wview daemons (tracing to $RUN_DIRECTORY):" + echo "Warning: traced processes run very slowly and may effect performance." + + if [ -x $RADROUTER_BIN ]; then + $RADROUTER_BIN 1 $RUN_DIRECTORY + else + echo "Cannot find $RADROUTER_BIN - exiting!" + exit 10 + fi + sleep 1 + strace -o $RUN_DIRECTORY/$WVIEWD_FILE.trace $WVIEWD_BIN -f &> /dev/null & + sleep 1 + strace -o $RUN_DIRECTORY/htmlgend.trace $HTMLD_BIN -f &> /dev/null & + strace -o $RUN_DIRECTORY/wvalarmd.trace $ALARMD_BIN -f &> /dev/null & + strace -o $RUN_DIRECTORY/wvcwopd.trace $CWOPD_BIN -f &> /dev/null & + strace -o $RUN_DIRECTORY/wvhttpd.trace $HTTP_BIN -f &> /dev/null & + strace -o $RUN_DIRECTORY/wviewftpd.trace $FTPD_BIN -f &> /dev/null & + strace -o $RUN_DIRECTORY/wviewsshd.trace $SSHD_BIN -f &> /dev/null & + strace -o $RUN_DIRECTORY/wvpmond.trace $PMOND_BIN -f &> /dev/null & + ;; + stop) + echo "Shutting down wview daemons..." + if [ -f $PMOND_PID ]; then + kill -15 `cat $PMOND_PID` + fi + if [ -f $HTTP_PID ]; then + kill -15 `cat $HTTP_PID` + fi + if [ -f $CWOPD_PID ]; then + kill -15 `cat $CWOPD_PID` + fi + if [ -f $ALARMD_PID ]; then + kill -15 `cat $ALARMD_PID` + fi + if [ -f $SSHD_PID ]; then + kill -15 `cat $SSHD_PID` + fi + if [ -f $FTPD_PID ]; then + kill -15 `cat $FTPD_PID` + fi + if [ -f $HTMLD_PID ]; then + kill -15 `cat $HTMLD_PID` + fi + if [ -f $WVIEWD_PID ]; then + kill -15 `cat $WVIEWD_PID` + fi + sleep 1 + if [ -f $RADROUTER_PID ]; then + kill -15 `cat $RADROUTER_PID` + fi + ;; + restart) + $0 stop && sleep 2 + $0 start + ;; + *) + echo "Usage: $0 {start|start-trace|stop|restart}" + exit 1 +esac + +exit 0 + diff --git a/package/wview/wview.hash b/package/wview/wview.hash new file mode 100644 index 0000000..701bf9f --- /dev/null +++ b/package/wview/wview.hash @@ -0,0 +1 @@ +sha256 460b34fcdf36f4905edf65e150ec83118e1e631c5532901feefcdc0266a27453 wview-5.21.7.tar.gz diff --git a/package/wview/wview.mk b/package/wview/wview.mk new file mode 100644 index 0000000..5f53ed0 --- /dev/null +++ b/package/wview/wview.mk @@ -0,0 +1,23 @@ +################################################################################ +# +# wview +# +################################################################################ + +WVIEW_VERSION = 5.21.7 +WVIEW_SOURCE = wview-$(WVIEW_VERSION).tar.gz +WVIEW_SITE = http://downloads.sourceforge.net/wview +WVIEW_INSTALL_STAGING = YES +WVIEW_LICENSE = GPL v2 +WVIEW_LICENSE_FILES = COPYING +VIEW_DEPENDENCIES = radlib libcurl gd libpng udev libusb openssl mysql +WVIEW_AUTORECONF = YES + +WVIEW_CONF_OPTS += --enable-mysql --prefix=$(STAGING_DIR)/usr + +define WVIEW_INSTALL_INIT_SYSV + $(INSTALL) -m 0755 package/wview/S61wview \ + $(TARGET_DIR)/etc/init.d/ +endef + +$(eval $(autotools-package))
wview is a collection of unix daemons which interface with a supported weather station to retrieve archive record (if generated by the station) current conditions. Signed-off-by: Ray Kinsella <ray.kinsella@intel.com<mailto:ray.kinsella@intel.com>> --- package/Config.in | 1 + package/wview/0001-fix-absolute-path.patch | 220 +++++++++++++++++++++++++++++ package/wview/Config.in | 23 +++ package/wview/S61wview | 205 +++++++++++++++++++++++++++ package/wview/wview.hash | 1 + package/wview/wview.mk | 23 +++ 6 files changed, 473 insertions(+) create mode 100644 package/wview/0001-fix-absolute-path.patch create mode 100644 package/wview/Config.in create mode 100644 package/wview/S61wview create mode 100644 package/wview/wview.hash create mode 100644 package/wview/wview.mk -- 2.4.3