openwrt: add rrdtool 1.0.x to the build
This commit is contained in:
Bart Van Der Meerssche
parent
05bb8a88d3
commit
af6a4d20ce
|
|
@ -1,7 +1,7 @@
|
|||
#
|
||||
# Automatically generated make config: don't edit
|
||||
# OpenWrt version: Backfire (r24714)
|
||||
# Tue Dec 21 21:44:29 2010
|
||||
# Tue Dec 21 21:54:26 2010
|
||||
#
|
||||
CONFIG_HAVE_DOT_CONFIG=y
|
||||
# CONFIG_TARGET_ppc40x is not set
|
||||
|
|
@ -1078,11 +1078,12 @@ CONFIG_PACKAGE_libncurses=y
|
|||
CONFIG_PACKAGE_libnl-tiny=y
|
||||
# CONFIG_PACKAGE_libpcap is not set
|
||||
# CONFIG_PACKAGE_libreadline is not set
|
||||
CONFIG_PACKAGE_librrd1=y
|
||||
CONFIG_PACKAGE_libuci=y
|
||||
CONFIG_PACKAGE_libuci-lua=y
|
||||
CONFIG_PACKAGE_libxtables=y
|
||||
# CONFIG_PACKAGE_linux-atm is not set
|
||||
# CONFIG_PACKAGE_zlib is not set
|
||||
CONFIG_PACKAGE_zlib=y
|
||||
|
||||
#
|
||||
# Network
|
||||
|
|
@ -1587,6 +1588,8 @@ CONFIG_PACKAGE_gpioctl=y
|
|||
# CONFIG_PACKAGE_openssl-util is not set
|
||||
# CONFIG_PACKAGE_px5g is not set
|
||||
# CONFIG_PACKAGE_robocfg is not set
|
||||
CONFIG_PACKAGE_rrdcgi1=y
|
||||
CONFIG_PACKAGE_rrdtool1=y
|
||||
# CONFIG_PACKAGE_spidev-test is not set
|
||||
# CONFIG_PACKAGE_uboot-envtools is not set
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,65 @@
|
|||
10
|
||||
|
||||
dir
|
||||
24751
|
||||
svn://svn.openwrt.org/openwrt/packages/libs/rrdtool-1.0.x
|
||||
svn://svn.openwrt.org/openwrt
|
||||
|
||||
|
||||
|
||||
2010-12-10T23:12:35.846894Z
|
||||
24462
|
||||
jow
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
3c298f89-4303-0410-b956-a3cf2f4a3e73
|
||||
|
||||
patches
|
||||
dir
|
||||
|
||||
Makefile
|
||||
file
|
||||
|
||||
|
||||
|
||||
|
||||
2010-12-21T20:35:59.516046Z
|
||||
f2bc0816a76315c71b13c872ef9ab867
|
||||
2010-12-10T23:12:35.846894Z
|
||||
24462
|
||||
jow
|
||||
has-props
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
3601
|
||||
|
||||
|
|
@ -0,0 +1,13 @@
|
|||
K 9
|
||||
copyright
|
||||
V 30
|
||||
Copyright (C) 2006 OpenWrt.org
|
||||
K 7
|
||||
licence
|
||||
V 5
|
||||
GPLv2
|
||||
K 13
|
||||
svn:eol-style
|
||||
V 6
|
||||
native
|
||||
END
|
||||
|
|
@ -0,0 +1,132 @@
|
|||
#
|
||||
# Copyright (C) 2006-2010 OpenWrt.org
|
||||
#
|
||||
# This is free software, licensed under the GNU General Public License v2.
|
||||
# See /LICENSE for more information.
|
||||
#
|
||||
|
||||
include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=rrdtool1
|
||||
PKG_VERSION:=1.0.50
|
||||
PKG_RELEASE:=1
|
||||
|
||||
PKG_BUILD_DIR:=$(BUILD_DIR)/rrdtool-$(PKG_VERSION)
|
||||
PKG_SOURCE:=rrdtool-$(PKG_VERSION).tar.gz
|
||||
PKG_SOURCE_URL:= \
|
||||
http://oss.oetiker.ch/rrdtool/pub/rrdtool-1.0.x \
|
||||
http://www.fastmirrors.org/rrdtool/rrdtool-1.0.x \
|
||||
ftp://ftp.sunet.se/pub/network/monitoring/rrdtool/rrdtool-1.0.x
|
||||
PKG_MD5SUM:=c466e2e7df95fa8e318e46437da87686
|
||||
|
||||
PKG_FIXUP:=libtool
|
||||
|
||||
include $(INCLUDE_DIR)/package.mk
|
||||
|
||||
define Package/rrdtool1/Default
|
||||
TITLE:=Round Robin Database (RRD)
|
||||
URL:=http://oss.oetiker.ch/rrdtool/
|
||||
endef
|
||||
|
||||
define Package/rrdtool1/description/Default
|
||||
RRD is the Acronym for Round Robin Database. RRD is a system to store and
|
||||
display time-series data (i.e. network bandwidth, machine-room temperature,
|
||||
server load average). It stores the data in a very compact way that will
|
||||
not expand over time, and it presents useful graphs by processing the data
|
||||
to enforce a certain data density. It can be used either via simple wrapper
|
||||
scripts (from shell or Perl) or via frontends that poll network devices and
|
||||
put friendly user interface on it.
|
||||
|
||||
This is version 1.0.x with cgilib-0.4, gd1.3 and libpng-1.0.9 linked into
|
||||
librrd.so. The library is much smaller compared to the 1.2.x version with
|
||||
separate dynamic linked libraries.
|
||||
endef
|
||||
|
||||
define Package/librrd1
|
||||
$(call Package/rrdtool1/Default)
|
||||
SECTION:=libs
|
||||
CATEGORY:=Libraries
|
||||
DEPENDS:=+zlib
|
||||
TITLE+= management library
|
||||
endef
|
||||
|
||||
define Package/librrd1/description
|
||||
$(call Package/rrdtool1/description/Default)
|
||||
This package contains a shared library, used by other programs.
|
||||
endef
|
||||
|
||||
define Package/rrdcgi1
|
||||
$(call Package/rrdtool1/Default)
|
||||
SECTION:=utils
|
||||
CATEGORY:=Utilities
|
||||
DEPENDS:=+librrd1
|
||||
TITLE+= CGI graphing tool
|
||||
endef
|
||||
|
||||
define Package/rrdcgi1/description
|
||||
$(call Package/rrdtool1/description/Default)
|
||||
This package contains the rrdcgi tool used to create web pages containing
|
||||
RRD graphs based on templates.
|
||||
endef
|
||||
|
||||
define Package/rrdtool1
|
||||
$(call Package/rrdtool1/Default)
|
||||
SECTION:=utils
|
||||
CATEGORY:=Utilities
|
||||
DEPENDS:=+librrd1
|
||||
TITLE+= management tools
|
||||
endef
|
||||
|
||||
define Package/rrdtool1/description
|
||||
$(call Package/rrdtool1/description/Default)
|
||||
This package contains command line tools used to manage RRDs.
|
||||
endef
|
||||
|
||||
TARGET_CFLAGS += $(FPIC) --std=c99
|
||||
|
||||
CONFIGURE_ARGS += \
|
||||
$(DISABLE_LARGEFILE) \
|
||||
$(DISABLE_NLS) \
|
||||
--enable-shared=yes \
|
||||
--enable-static=yes \
|
||||
--disable-rpath \
|
||||
--with-gnu-ld \
|
||||
--enable-local-zlib
|
||||
|
||||
CONFIGURE_VARS += \
|
||||
ac_cv_path_PERL=no \
|
||||
rd_cv_ieee_works=yes \
|
||||
shrext_cmds=".so"
|
||||
|
||||
define Build/Compile
|
||||
$(MAKE) -C $(PKG_BUILD_DIR) \
|
||||
DESTDIR="$(PKG_INSTALL_DIR)" \
|
||||
shrext_cmds=".so" \
|
||||
all install
|
||||
endef
|
||||
|
||||
define Package/rrdtool1/install
|
||||
$(INSTALL_DIR) $(1)/usr/bin
|
||||
$(CP) $(PKG_INSTALL_DIR)/usr/bin/rrd{tool,update} $(1)/usr/bin/
|
||||
endef
|
||||
|
||||
define Package/rrdcgi1/install
|
||||
$(INSTALL_DIR) $(1)/usr/bin
|
||||
$(CP) $(PKG_INSTALL_DIR)/usr/bin/rrdcgi $(1)/usr/bin/
|
||||
endef
|
||||
|
||||
define Package/librrd1/install
|
||||
$(INSTALL_DIR) $(1)/usr/lib
|
||||
$(CP) $(PKG_INSTALL_DIR)/usr/lib/librrd.so.* $(1)/usr/lib/
|
||||
endef
|
||||
|
||||
define Build/InstallDev
|
||||
$(INSTALL_DIR) $(1)/usr/lib/rrdtool-1.0/include
|
||||
$(CP) $(PKG_INSTALL_DIR)/usr/include/rrd.h $(1)/usr/lib/rrdtool-1.0/include/
|
||||
$(INSTALL_DIR) $(1)/usr/lib/rrdtool-1.0/lib
|
||||
$(CP) $(PKG_INSTALL_DIR)/usr/lib/librrd.{a,so*} $(1)/usr/lib/rrdtool-1.0/lib/
|
||||
endef
|
||||
|
||||
$(eval $(call BuildPackage,librrd1))
|
||||
$(eval $(call BuildPackage,rrdcgi1))
|
||||
$(eval $(call BuildPackage,rrdtool1))
|
||||
|
|
@ -0,0 +1,132 @@
|
|||
#
|
||||
# Copyright (C) 2006-2010 OpenWrt.org
|
||||
#
|
||||
# This is free software, licensed under the GNU General Public License v2.
|
||||
# See /LICENSE for more information.
|
||||
#
|
||||
|
||||
include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=rrdtool1
|
||||
PKG_VERSION:=1.0.50
|
||||
PKG_RELEASE:=1
|
||||
|
||||
PKG_BUILD_DIR:=$(BUILD_DIR)/rrdtool-$(PKG_VERSION)
|
||||
PKG_SOURCE:=rrdtool-$(PKG_VERSION).tar.gz
|
||||
PKG_SOURCE_URL:= \
|
||||
http://oss.oetiker.ch/rrdtool/pub/rrdtool-1.0.x \
|
||||
http://www.fastmirrors.org/rrdtool/rrdtool-1.0.x \
|
||||
ftp://ftp.sunet.se/pub/network/monitoring/rrdtool/rrdtool-1.0.x
|
||||
PKG_MD5SUM:=c466e2e7df95fa8e318e46437da87686
|
||||
|
||||
PKG_FIXUP:=libtool
|
||||
|
||||
include $(INCLUDE_DIR)/package.mk
|
||||
|
||||
define Package/rrdtool1/Default
|
||||
TITLE:=Round Robin Database (RRD)
|
||||
URL:=http://oss.oetiker.ch/rrdtool/
|
||||
endef
|
||||
|
||||
define Package/rrdtool1/description/Default
|
||||
RRD is the Acronym for Round Robin Database. RRD is a system to store and
|
||||
display time-series data (i.e. network bandwidth, machine-room temperature,
|
||||
server load average). It stores the data in a very compact way that will
|
||||
not expand over time, and it presents useful graphs by processing the data
|
||||
to enforce a certain data density. It can be used either via simple wrapper
|
||||
scripts (from shell or Perl) or via frontends that poll network devices and
|
||||
put friendly user interface on it.
|
||||
|
||||
This is version 1.0.x with cgilib-0.4, gd1.3 and libpng-1.0.9 linked into
|
||||
librrd.so. The library is much smaller compared to the 1.2.x version with
|
||||
separate dynamic linked libraries.
|
||||
endef
|
||||
|
||||
define Package/librrd1
|
||||
$(call Package/rrdtool1/Default)
|
||||
SECTION:=libs
|
||||
CATEGORY:=Libraries
|
||||
DEPENDS:=+zlib
|
||||
TITLE+= management library
|
||||
endef
|
||||
|
||||
define Package/librrd1/description
|
||||
$(call Package/rrdtool1/description/Default)
|
||||
This package contains a shared library, used by other programs.
|
||||
endef
|
||||
|
||||
define Package/rrdcgi1
|
||||
$(call Package/rrdtool1/Default)
|
||||
SECTION:=utils
|
||||
CATEGORY:=Utilities
|
||||
DEPENDS:=+librrd1
|
||||
TITLE+= CGI graphing tool
|
||||
endef
|
||||
|
||||
define Package/rrdcgi1/description
|
||||
$(call Package/rrdtool1/description/Default)
|
||||
This package contains the rrdcgi tool used to create web pages containing
|
||||
RRD graphs based on templates.
|
||||
endef
|
||||
|
||||
define Package/rrdtool1
|
||||
$(call Package/rrdtool1/Default)
|
||||
SECTION:=utils
|
||||
CATEGORY:=Utilities
|
||||
DEPENDS:=+librrd1
|
||||
TITLE+= management tools
|
||||
endef
|
||||
|
||||
define Package/rrdtool1/description
|
||||
$(call Package/rrdtool1/description/Default)
|
||||
This package contains command line tools used to manage RRDs.
|
||||
endef
|
||||
|
||||
TARGET_CFLAGS += $(FPIC) --std=c99
|
||||
|
||||
CONFIGURE_ARGS += \
|
||||
$(DISABLE_LARGEFILE) \
|
||||
$(DISABLE_NLS) \
|
||||
--enable-shared=yes \
|
||||
--enable-static=yes \
|
||||
--disable-rpath \
|
||||
--with-gnu-ld \
|
||||
--enable-local-zlib
|
||||
|
||||
CONFIGURE_VARS += \
|
||||
ac_cv_path_PERL=no \
|
||||
rd_cv_ieee_works=yes \
|
||||
shrext_cmds=".so"
|
||||
|
||||
define Build/Compile
|
||||
$(MAKE) -C $(PKG_BUILD_DIR) \
|
||||
DESTDIR="$(PKG_INSTALL_DIR)" \
|
||||
shrext_cmds=".so" \
|
||||
all install
|
||||
endef
|
||||
|
||||
define Package/rrdtool1/install
|
||||
$(INSTALL_DIR) $(1)/usr/bin
|
||||
$(CP) $(PKG_INSTALL_DIR)/usr/bin/rrd{tool,update} $(1)/usr/bin/
|
||||
endef
|
||||
|
||||
define Package/rrdcgi1/install
|
||||
$(INSTALL_DIR) $(1)/usr/bin
|
||||
$(CP) $(PKG_INSTALL_DIR)/usr/bin/rrdcgi $(1)/usr/bin/
|
||||
endef
|
||||
|
||||
define Package/librrd1/install
|
||||
$(INSTALL_DIR) $(1)/usr/lib
|
||||
$(CP) $(PKG_INSTALL_DIR)/usr/lib/librrd.so.* $(1)/usr/lib/
|
||||
endef
|
||||
|
||||
define Build/InstallDev
|
||||
$(INSTALL_DIR) $(1)/usr/lib/rrdtool-1.0/include
|
||||
$(CP) $(PKG_INSTALL_DIR)/usr/include/rrd.h $(1)/usr/lib/rrdtool-1.0/include/
|
||||
$(INSTALL_DIR) $(1)/usr/lib/rrdtool-1.0/lib
|
||||
$(CP) $(PKG_INSTALL_DIR)/usr/lib/librrd.{a,so*} $(1)/usr/lib/rrdtool-1.0/lib/
|
||||
endef
|
||||
|
||||
$(eval $(call BuildPackage,librrd1))
|
||||
$(eval $(call BuildPackage,rrdcgi1))
|
||||
$(eval $(call BuildPackage,rrdtool1))
|
||||
|
|
@ -0,0 +1,96 @@
|
|||
10
|
||||
|
||||
dir
|
||||
24751
|
||||
svn://svn.openwrt.org/openwrt/packages/libs/rrdtool-1.0.x/patches
|
||||
svn://svn.openwrt.org/openwrt
|
||||
|
||||
|
||||
|
||||
2009-05-04T15:21:38.500706Z
|
||||
15590
|
||||
nbd
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
3c298f89-4303-0410-b956-a3cf2f4a3e73
|
||||
|
||||
001-no_ordering_cd_joke.patch
|
||||
file
|
||||
|
||||
|
||||
|
||||
|
||||
2010-07-24T18:00:01.808389Z
|
||||
da517f078fdb1cf40f7dd6a9d61af4d0
|
||||
2009-03-09T16:31:42.286405Z
|
||||
14820
|
||||
florian
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
656
|
||||
|
||||
002-no_timezone.patch
|
||||
file
|
||||
|
||||
|
||||
|
||||
|
||||
2010-07-24T18:00:01.808389Z
|
||||
56c60b8643cc8609670ee9bb637debd2
|
||||
2009-05-04T15:21:38.500706Z
|
||||
15590
|
||||
nbd
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
653
|
||||
|
||||
|
|
@ -0,0 +1,21 @@
|
|||
diff -urN rrdtool-1.0.50/configure rrdtool-1.0.50.new/configure
|
||||
--- rrdtool-1.0.50/configure 2005-04-25 22:48:09.000000000 +0200
|
||||
+++ rrdtool-1.0.50.new/configure 2009-03-09 17:25:38.000000000 +0100
|
||||
@@ -24873,17 +24873,12 @@
|
||||
echo "${ECHO_T}and out again" >&6
|
||||
|
||||
echo $ECHO_N "ordering CD from http://people.ee.ethz.ch/~oetiker/wish $ac_c" 1>&6
|
||||
-sleep 1
|
||||
echo $ECHO_N ".$ac_c" 1>&6
|
||||
-sleep 2
|
||||
echo $ECHO_N ".$ac_c" 1>&6
|
||||
-sleep 1
|
||||
echo $ECHO_N ".$ac_c" 1>&6
|
||||
-sleep 3
|
||||
echo $ECHO_N ".$ac_c" 1>&6
|
||||
echo $ECHO_N ".$ac_c" 1>&6
|
||||
echo $ECHO_N ".$ac_c" 1>&6
|
||||
-sleep 2
|
||||
echo "$as_me:$LINENO: result: just kidding ;-)" >&5
|
||||
echo "${ECHO_T} just kidding ;-)" >&6
|
||||
echo
|
||||
|
|
@ -0,0 +1,24 @@
|
|||
--- a/src/rrd_tool.c
|
||||
+++ b/src/rrd_tool.c
|
||||
@@ -225,11 +225,8 @@
|
||||
struct rusage myusage;
|
||||
struct timeval starttime;
|
||||
struct timeval currenttime;
|
||||
- struct timezone tz;
|
||||
|
||||
- tz.tz_minuteswest =0;
|
||||
- tz.tz_dsttime=0;
|
||||
- gettimeofday(&starttime,&tz);
|
||||
+ gettimeofday(&starttime,NULL);
|
||||
#endif
|
||||
|
||||
while (fgets(aLine, sizeof(aLine)-1, stdin)){
|
||||
@@ -252,7 +249,7 @@
|
||||
|
||||
#if HAVE_GETRUSAGE
|
||||
getrusage(RUSAGE_SELF,&myusage);
|
||||
- gettimeofday(¤ttime,&tz);
|
||||
+ gettimeofday(¤ttime,NULL);
|
||||
printf("OK u:%1.2f s:%1.2f r:%1.2f\n",
|
||||
(double)myusage.ru_utime.tv_sec+
|
||||
(double)myusage.ru_utime.tv_usec/1000000.0,
|
||||
|
|
@ -0,0 +1,21 @@
|
|||
diff -urN rrdtool-1.0.50/configure rrdtool-1.0.50.new/configure
|
||||
--- rrdtool-1.0.50/configure 2005-04-25 22:48:09.000000000 +0200
|
||||
+++ rrdtool-1.0.50.new/configure 2009-03-09 17:25:38.000000000 +0100
|
||||
@@ -24873,17 +24873,12 @@
|
||||
echo "${ECHO_T}and out again" >&6
|
||||
|
||||
echo $ECHO_N "ordering CD from http://people.ee.ethz.ch/~oetiker/wish $ac_c" 1>&6
|
||||
-sleep 1
|
||||
echo $ECHO_N ".$ac_c" 1>&6
|
||||
-sleep 2
|
||||
echo $ECHO_N ".$ac_c" 1>&6
|
||||
-sleep 1
|
||||
echo $ECHO_N ".$ac_c" 1>&6
|
||||
-sleep 3
|
||||
echo $ECHO_N ".$ac_c" 1>&6
|
||||
echo $ECHO_N ".$ac_c" 1>&6
|
||||
echo $ECHO_N ".$ac_c" 1>&6
|
||||
-sleep 2
|
||||
echo "$as_me:$LINENO: result: just kidding ;-)" >&5
|
||||
echo "${ECHO_T} just kidding ;-)" >&6
|
||||
echo
|
||||
|
|
@ -0,0 +1,24 @@
|
|||
--- a/src/rrd_tool.c
|
||||
+++ b/src/rrd_tool.c
|
||||
@@ -225,11 +225,8 @@
|
||||
struct rusage myusage;
|
||||
struct timeval starttime;
|
||||
struct timeval currenttime;
|
||||
- struct timezone tz;
|
||||
|
||||
- tz.tz_minuteswest =0;
|
||||
- tz.tz_dsttime=0;
|
||||
- gettimeofday(&starttime,&tz);
|
||||
+ gettimeofday(&starttime,NULL);
|
||||
#endif
|
||||
|
||||
while (fgets(aLine, sizeof(aLine)-1, stdin)){
|
||||
@@ -252,7 +249,7 @@
|
||||
|
||||
#if HAVE_GETRUSAGE
|
||||
getrusage(RUSAGE_SELF,&myusage);
|
||||
- gettimeofday(¤ttime,&tz);
|
||||
+ gettimeofday(¤ttime,NULL);
|
||||
printf("OK u:%1.2f s:%1.2f r:%1.2f\n",
|
||||
(double)myusage.ru_utime.tv_sec+
|
||||
(double)myusage.ru_utime.tv_usec/1000000.0,
|
||||
Loading…
Reference in New Issue