summaryrefslogtreecommitdiff
path: root/openwrt
diff options
context:
space:
mode:
authornico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73>2005-09-08 22:01:19 +0000
committernico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73>2005-09-08 22:01:19 +0000
commitbd2218a04ffa7abbbcda591b53d526d6e8eba605 (patch)
tree0989a9c3ae1610495bfad510d17427982da59c16 /openwrt
parent1739772b6f5411320fa0e11d5aa70634cd406d9b (diff)
add rrdtool1 (v1.0.x) and enable it by default,
disable rrdtool (v1.2.x), change Maintainer in control files, tweak Makefiles git-svn-id: svn://svn.openwrt.org/openwrt/trunk@1881 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'openwrt')
-rw-r--r--openwrt/package/Config.in5
-rw-r--r--openwrt/package/Makefile7
-rw-r--r--openwrt/package/rrdcollect/Config.in2
-rw-r--r--openwrt/package/rrdcollect/Makefile12
-rw-r--r--openwrt/package/rrdcollect/ipkg/rrdcollect.control4
-rw-r--r--openwrt/package/rrdtool/Config.in23
-rw-r--r--openwrt/package/rrdtool/Makefile21
-rw-r--r--openwrt/package/rrdtool/ipkg/librrd.control2
-rw-r--r--openwrt/package/rrdtool/ipkg/rrdcgi.control2
-rw-r--r--openwrt/package/rrdtool/ipkg/rrdtool.control2
-rw-r--r--openwrt/package/rrdtool1/Config.in73
-rw-r--r--openwrt/package/rrdtool1/Makefile105
-rw-r--r--openwrt/package/rrdtool1/ipkg/librrd1.control20
-rw-r--r--openwrt/package/rrdtool1/ipkg/rrdcgi1.control21
-rw-r--r--openwrt/package/rrdtool1/ipkg/rrdtool1.control20
15 files changed, 285 insertions, 34 deletions
diff --git a/openwrt/package/Config.in b/openwrt/package/Config.in
index c97fec2916..905fca2def 100644
--- a/openwrt/package/Config.in
+++ b/openwrt/package/Config.in
@@ -25,8 +25,11 @@ source "package/sablevm/Config.in"
source "package/sablevm-classpath/Config.in"
source "package/libffi-sable/Config.in"
endmenu
-source "package/rrdcollect/Config.in"
+menu "rrdtool - Round-Robin Database (RRD) libraries and tools"
source "package/rrdtool/Config.in"
+source "package/rrdtool1/Config.in"
+source "package/rrdcollect/Config.in"
+endmenu
source "package/screen/Config.in"
comment "Networking"
diff --git a/openwrt/package/Makefile b/openwrt/package/Makefile
index e078d18800..cdc592bdde 100644
--- a/openwrt/package/Makefile
+++ b/openwrt/package/Makefile
@@ -135,6 +135,7 @@ package-$(BR2_PACKAGE_ROBOCFG) += robocfg
package-$(BR2_PACKAGE_RP_PPPOE) += rp-pppoe
package-$(BR2_PACKAGE_RRDCOLLECT) += rrdcollect
package-$(BR2_COMPILE_RRDTOOL) += rrdtool
+package-$(BR2_COMPILE_RRDTOOL1) += rrdtool1
package-$(BR2_PACKAGE_RSYNC) += rsync
package-$(BR2_PACKAGE_SABLEVM) += sablevm
package-$(BR2_PACKAGE_SABLEVM_CLASSPATH) += sablevm-classpath
@@ -230,8 +231,14 @@ portmap-compile: tcp_wrappers-compile
postgresql-compile: zlib-compile
ppp-compile: linux-atm-compile
quagga-compile: readline-compile ncurses-compile
+ifneq ($(BR2_PACKAGE_LIBRRD),)
rrdcollect-compile: rrdtool-compile
+endif
+ifneq ($(BR2_PACKAGE_LIBRRD1),)
+rrdcollect-compile: rrdtool1-compile
+endif
rrdtool-compile: cgilib-compile freetype-compile libart-compile libpng-compile
+rrdtool1-compile: zlib-compile
rsync-compile: popt-compile
samba-compile: cups-compile
screen-compile: ncurses-compile
diff --git a/openwrt/package/rrdcollect/Config.in b/openwrt/package/rrdcollect/Config.in
index e7f2919058..7dad23275f 100644
--- a/openwrt/package/rrdcollect/Config.in
+++ b/openwrt/package/rrdcollect/Config.in
@@ -1,7 +1,7 @@
config BR2_PACKAGE_RRDCOLLECT
tristate "rrdcollect - Round-Robin Database (RRD) collecting daemon"
default m if CONFIG_DEVEL
- select BR2_PACKAGE_LIBRRD
+ depends BR2_PACKAGE_LIBRRD || BR2_PACKAGE_LIBRRD1
help
RRDcollect is a daemon which polls ceratin files in /proc/
directory, gathering data and storing it inside RRDtool's
diff --git a/openwrt/package/rrdcollect/Makefile b/openwrt/package/rrdcollect/Makefile
index 94dea16a30..b3be69a983 100644
--- a/openwrt/package/rrdcollect/Makefile
+++ b/openwrt/package/rrdcollect/Makefile
@@ -14,6 +14,10 @@ PKG_CAT:=zcat
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
+ifneq ($(BR2_PACKAGE_LIBRRD),)
+RRDTOOL_LIBS:=-lart_lgpl_2 -lfreetype -lpng
+endif
+
include $(TOPDIR)/package/rules.mk
$(eval $(call PKG_template,RRDCOLLECT,rrdcollect,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
@@ -23,9 +27,9 @@ $(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
(cd $(PKG_BUILD_DIR); rm -rf config.{cache,status} ; \
$(TARGET_CONFIGURE_OPTS) \
CFLAGS="$(TARGET_CFLAGS) -DSOCKET_COMM" \
- CPPFLAGS="-I$(STAGING_DIR)/usr/include" \
- LDFLAGS="-L$(STAGING_DIR)/lib -L$(STAGING_DIR)/usr/lib" \
- LIBS="-lart_lgpl_2 -lfreetype -lpng -lz" \
+ CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \
+ LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \
+ LIBS="$(RRDTOOL_LIBS) -lz" \
PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig" \
ac_cv_func_malloc_0_nonnull=yes \
./configure \
@@ -48,6 +52,8 @@ $(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
$(DISABLE_LARGEFILE) \
--enable-shared \
--disable-static \
+ --disable-rpath \
+ --with-gnu-ld \
--enable-exec \
--without-rrdtool \
--with-librrd \
diff --git a/openwrt/package/rrdcollect/ipkg/rrdcollect.control b/openwrt/package/rrdcollect/ipkg/rrdcollect.control
index e1429b63ac..bdc7adb692 100644
--- a/openwrt/package/rrdcollect/ipkg/rrdcollect.control
+++ b/openwrt/package/rrdcollect/ipkg/rrdcollect.control
@@ -1,9 +1,9 @@
Package: rrdcollect
Priority: optional
Section: admin
-Maintainer: Oliver Ertl <oliver@ertl-net.net>, OpenWrt Developers <bugs@openwrt.org>
+Maintainer: OpenWrt Developers Team <openwrt-devel@openwrt.org>, Oliver Ertl <oliver@ertl-net.net>
Source: http://openwrt.org/cgi-bin/viewcvs.cgi/openwrt/package/rrdcollect/
-Depends: librrd
+Depends: librrd | librrd1
Description: Round-Robin Database (RRD) collecting daemon
RRDcollect is a daemon which polls certain files in /proc/
directory, gathering data and storing it inside RRDtool's
diff --git a/openwrt/package/rrdtool/Config.in b/openwrt/package/rrdtool/Config.in
index 058fe4e713..f464af23e4 100644
--- a/openwrt/package/rrdtool/Config.in
+++ b/openwrt/package/rrdtool/Config.in
@@ -1,18 +1,17 @@
-menu "rrdtool - Round Robin Database (RRD) management tools and library"
-
config BR2_COMPILE_RRDTOOL
bool
default no
- depends BR2_PACKAGE_LIBRRD || BR2_PACKAGE_RRDCGI || BR2_PACKAGE_RRDTOOL
+ depends BR2_PACKAGE_LIBRRD
config BR2_PACKAGE_LIBRRD
- tristate "librrd - Round Robin Database (RRD) management library"
-# default m if CONFIG_DEVEL
+ tristate "librrd - Round Robin Database (RRD) management library (v1.2.x)"
default n
+ depends !BR2_COMPILE_RRDTOOL1
select BR2_COMPILE_RRDTOOL
select BR2_PACKAGE_LIBART
select BR2_PACKAGE_LIBFREETYPE
select BR2_PACKAGE_LIBPNG
+ select BR2_PACKAGE_ZLIB
help
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,
@@ -28,12 +27,10 @@ config BR2_PACKAGE_LIBRRD
config BR2_PACKAGE_RRDCGI
- tristate "rrdcgi - Round Robin Database (RRD) CGI graphing tool"
-# default m if CONFIG_DEVEL
+ tristate "rrdcgi - Round Robin Database (RRD) CGI graphing tool (v1.2.x)"
default n
- select BR2_COMPILE_RRDTOOL
+ depends BR2_PACKAGE_LIBRRD
select BR2_PACKAGE_CGILIB
- select BR2_PACKAGE_LIBRRD
help
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,
@@ -50,11 +47,9 @@ config BR2_PACKAGE_RRDCGI
config BR2_PACKAGE_RRDTOOL
- tristate "rrdtool - Round Robin Database (RRD) management tools"
-# default m if CONFIG_DEVEL
+ tristate "rrdtool - Round Robin Database (RRD) management tools (v1.2.x)"
default n
- select BR2_COMPILE_RRDTOOL
- select BR2_PACKAGE_LIBRRD
+ depends BR2_PACKAGE_LIBRRD
help
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,
@@ -69,5 +64,3 @@ config BR2_PACKAGE_RRDTOOL
This package contains command line tools used to manage RRDs.
-endmenu
-
diff --git a/openwrt/package/rrdtool/Makefile b/openwrt/package/rrdtool/Makefile
index 2b97a530e7..4daedd960f 100644
--- a/openwrt/package/rrdtool/Makefile
+++ b/openwrt/package/rrdtool/Makefile
@@ -22,11 +22,11 @@ $(eval $(call PKG_template,RRDTOOL,rrdtool,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)
$(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
(cd $(PKG_BUILD_DIR); rm -rf config.{cache,status} ; \
+ $(TARGET_CONFIGURE_OPTS) \
CFLAGS="$(TARGET_CFLAGS)" \
- CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/usr/include/freetype2 -I$(STAGING_DIR)/usr/include/libart-2.0" \
- LDFLAGS="-L$(STAGING_DIR)/lib -L$(STAGING_DIR)/usr/lib" \
+ CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include -I$(STAGING_DIR)/usr/include/freetype2 -I$(STAGING_DIR)/usr/include/libart-2.0" \
+ LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib " \
PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig" \
- $(TARGET_CONFIGURE_OPTS) \
rd_cv_ieee_works=yes \
./configure \
--target=$(GNU_TARGET_NAME) \
@@ -49,6 +49,7 @@ $(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
--enable-shared=yes \
--enable-static=yes \
--disable-rpath \
+ --with-gnu-ld \
--enable-rrdcgi \
--disable-mmap \
--disable-perl \
@@ -69,20 +70,20 @@ $(PKG_BUILD_DIR)/.built:
$(IPKG_RRDTOOL):
install -d -m0755 $(IDIR_RRDTOOL)/usr/bin
- cp -fpR $(PKG_INSTALL_DIR)/usr/bin/rrdtool $(IDIR_RRDTOOL)/usr/bin/rrdtool
- cp -fpR $(PKG_INSTALL_DIR)/usr/bin/rrdupdate $(IDIR_RRDTOOL)/usr/bin/rrdupdate
+ cp -fpR $(PKG_INSTALL_DIR)/usr/bin/rrdtool $(IDIR_RRDTOOL)/usr/bin/
+ cp -fpR $(PKG_INSTALL_DIR)/usr/bin/rrdupdate $(IDIR_RRDTOOL)/usr/bin/
$(RSTRIP) $(IDIR_RRDTOOL)
$(IPKG_BUILD) $(IDIR_RRDTOOL) $(PACKAGE_DIR)
$(IPKG_RRDCGI):
install -d -m0755 $(IDIR_RRDCGI)/usr/bin
- cp -fpR $(PKG_INSTALL_DIR)/usr/bin/rrdcgi $(IDIR_RRDCGI)/usr/bin/rrdcgi
+ cp -fpR $(PKG_INSTALL_DIR)/usr/bin/rrdcgi $(IDIR_RRDCGI)/usr/bin/
$(RSTRIP) $(IDIR_RRDCGI)
$(IPKG_BUILD) $(IDIR_RRDCGI) $(PACKAGE_DIR)
$(IPKG_LIBRRD):
install -d -m0755 $(IDIR_LIBRRD)/usr/lib
- cp -fpR $(PKG_INSTALL_DIR)/usr/lib/librrd.so.* $(IDIR_LIBRRD)/usr/lib
+ cp -fpR $(PKG_INSTALL_DIR)/usr/lib/librrd.so.* $(IDIR_LIBRRD)/usr/lib/
install -d -m0755 $(IDIR_LIBRRD)/usr/share/rrdtool/fonts
cp -fpR $(PKG_BUILD_DIR)/src/DejaVuSansMono-Roman.ttf \
$(IDIR_LIBRRD)/usr/share/rrdtool/fonts/
@@ -93,7 +94,8 @@ $(STAGING_DIR)/usr/lib/librrd.so: $(PKG_BUILD_DIR)/.built
mkdir -p $(STAGING_DIR)/usr/include
cp -fpR $(PKG_INSTALL_DIR)/usr/include/rrd.h $(STAGING_DIR)/usr/include/
mkdir -p $(STAGING_DIR)/usr/lib
- cp -fpR $(PKG_INSTALL_DIR)/usr/lib/librrd.{a,so*} $(STAGING_DIR)/usr/lib/
+ cp -fpR $(PKG_INSTALL_DIR)/usr/lib/librrd.a $(STAGING_DIR)/usr/lib/
+ cp -fpR $(PKG_INSTALL_DIR)/usr/lib/librrd.so* $(STAGING_DIR)/usr/lib/
touch $@
install-dev: $(STAGING_DIR)/usr/lib/librrd.so
@@ -101,7 +103,8 @@ install-dev: $(STAGING_DIR)/usr/lib/librrd.so
uninstall-dev:
rm -rf \
$(STAGING_DIR)/usr/include/rrd.h \
- $(STAGING_DIR)/usr/lib/librrd.{a,so*} \
+ $(STAGING_DIR)/usr/lib/librrd.a \
+ $(STAGING_DIR)/usr/lib/librrd.so* \
compile: install-dev
clean: uninstall-dev
diff --git a/openwrt/package/rrdtool/ipkg/librrd.control b/openwrt/package/rrdtool/ipkg/librrd.control
index 6ee92811f6..7585836534 100644
--- a/openwrt/package/rrdtool/ipkg/librrd.control
+++ b/openwrt/package/rrdtool/ipkg/librrd.control
@@ -1,7 +1,7 @@
Package: librrd
Priority: optional
Section: libs
-Maintainer: Oliver Ertl <oliver@ertl-net.net>, OpenWrt Developers <bugs@openwrt.org>
+Maintainer: OpenWrt Developers Team <openwrt-devel@openwrt.org>, Oliver Ertl <oliver@ertl-net.net>
Source: http://openwrt.org/cgi-bin/viewcvs.cgi/openwrt/package/rrdtool/
Depends: libart, libfreetype, libpng, zlib
Description: Round Robin Database (RRD) management library.
diff --git a/openwrt/package/rrdtool/ipkg/rrdcgi.control b/openwrt/package/rrdtool/ipkg/rrdcgi.control
index b73f4808a0..d5079fcd0d 100644
--- a/openwrt/package/rrdtool/ipkg/rrdcgi.control
+++ b/openwrt/package/rrdtool/ipkg/rrdcgi.control
@@ -1,7 +1,7 @@
Package: rrdcgi
Priority: optional
Section: web
-Maintainer: Oliver Ertl <oliver@ertl-net.net>, OpenWrt Developers <bugs@openwrt.org>
+Maintainer: OpenWrt Developers Team <openwrt-devel@openwrt.org>, Oliver Ertl <oliver@ertl-net.net>
Source: http://openwrt.org/cgi-bin/viewcvs.cgi/openwrt/package/rrdtool/
Depends: cgilib, librrd
Description: Round Robin Database (RRD) CGI graphing tool.
diff --git a/openwrt/package/rrdtool/ipkg/rrdtool.control b/openwrt/package/rrdtool/ipkg/rrdtool.control
index 6b4d8e8b57..5da8e7a0e7 100644
--- a/openwrt/package/rrdtool/ipkg/rrdtool.control
+++ b/openwrt/package/rrdtool/ipkg/rrdtool.control
@@ -1,7 +1,7 @@
Package: rrdtool
Priority: optional
Section: admin
-Maintainer: Oliver Ertl <oliver@ertl-net.net>, OpenWrt Developers <bugs@openwrt.org>
+Maintainer: OpenWrt Developers Team <openwrt-devel@openwrt.org>, Oliver Ertl <oliver@ertl-net.net>
Source: http://openwrt.org/cgi-bin/viewcvs.cgi/openwrt/package/rrdtool/
Depends: librrd
Description: Round Robin Database (RRD) management tools.
diff --git a/openwrt/package/rrdtool1/Config.in b/openwrt/package/rrdtool1/Config.in
new file mode 100644
index 0000000000..556708b676
--- /dev/null
+++ b/openwrt/package/rrdtool1/Config.in
@@ -0,0 +1,73 @@
+config BR2_COMPILE_RRDTOOL1
+ bool
+ default no
+ depends BR2_PACKAGE_LIBRRD1
+
+config BR2_PACKAGE_LIBRRD1
+ tristate "librrd1 - Round Robin Database (RRD) management library (v1.0.x)"
+ default m if CONFIG_DEVEL
+ depends !BR2_COMPILE_RRDTOOL
+ select BR2_COMPILE_RRDTOOL1
+ select BR2_PACKAGE_ZLIB
+ help
+ 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.
+
+ http://people.ee.ethz.ch/~oetiker/webtools/rrdtool/
+
+ This package contains command line tools used to manage RRDs.
+
+ 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.
+
+
+config BR2_PACKAGE_RRDCGI1
+ tristate "rrdcgi1 - Round Robin Database (RRD) CGI graphing tool (v1.0.x)"
+ default m if CONFIG_DEVEL
+ depends BR2_PACKAGE_LIBRRD1
+ help
+ 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.
+
+ http://people.ee.ethz.ch/~oetiker/webtools/rrdtool/
+
+ This package contains the rrdcgi tool used to create web pages containing
+ RRD graphs based on templates.
+
+ 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.
+
+
+config BR2_PACKAGE_RRDTOOL1
+ tristate "rrdtool1 - Round Robin Database (RRD) management tools (v1.0.x)"
+ default m if CONFIG_DEVEL
+ depends BR2_PACKAGE_LIBRRD1
+ help
+ 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.
+
+ http://people.ee.ethz.ch/~oetiker/webtools/rrdtool/
+
+ This package contains command line tools used to manage RRDs.
+
+ 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.
+
diff --git a/openwrt/package/rrdtool1/Makefile b/openwrt/package/rrdtool1/Makefile
new file mode 100644
index 0000000000..7df6210bb2
--- /dev/null
+++ b/openwrt/package/rrdtool1/Makefile
@@ -0,0 +1,105 @@
+# $Id$
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=rrdtool1
+PKG_VERSION:=1.0.50
+PKG_RELEASE:=1
+PKG_MD5SUM:=c466e2e7df95fa8e318e46437da87686
+
+PKG_SOURCE_URL:=http://people.ee.ethz.ch/~oetiker/webtools/rrdtool/pub/rrdtool-1.0.x
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_CAT:=zcat
+
+PKG_BUILD_DIR:=$(BUILD_DIR)/rrdtool-$(PKG_VERSION)
+PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
+
+include $(TOPDIR)/package/rules.mk
+
+$(eval $(call PKG_template,LIBRRD1,librrd1,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
+$(eval $(call PKG_template,RRDCGI1,rrdcgi1,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
+$(eval $(call PKG_template,RRDTOOL1,rrdtool1,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
+
+$(PKG_BUILD_DIR)/.configured:
+ (cd $(PKG_BUILD_DIR); rm -rf config.{status,cache} ; \
+ $(TARGET_CONFIGURE_OPTS) \
+ CFLAGS="$(TARGET_CFLAGS)" \
+ CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \
+ LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \
+ ac_cv_path_PERL=no \
+ rd_cv_ieee_works=yes \
+ shrext_cmds=".so" \
+ ./configure \
+ --target=$(GNU_TARGET_NAME) \
+ --host=$(GNU_TARGET_NAME) \
+ --build=$(GNU_HOST_NAME) \
+ --program-prefix="" \
+ --program-suffix="" \
+ --prefix=/usr \
+ --exec-prefix=/usr \
+ --bindir=/usr/bin \
+ --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) \
+ --enable-shared=yes \
+ --enable-static=yes \
+ --disable-rpath \
+ --with-gnu-ld \
+ --enable-local-zlib \
+ );
+ touch $@
+
+$(PKG_BUILD_DIR)/.built:
+ rm -rf $(PKG_INSTALL_DIR)
+ mkdir -p $(PKG_INSTALL_DIR)
+ $(MAKE) -C $(PKG_BUILD_DIR) \
+ DESTDIR="$(PKG_INSTALL_DIR)" \
+ shrext_cmds=".so" \
+ all install
+ touch $@
+
+$(IPKG_RRDTOOL1):
+ install -d -m0755 $(IDIR_RRDTOOL1)/usr/bin
+ cp -fpR $(PKG_INSTALL_DIR)/usr/bin/rrdtool $(IDIR_RRDTOOL1)/usr/bin/
+ cp -fpR $(PKG_INSTALL_DIR)/usr/bin/rrdupdate $(IDIR_RRDTOOL1)/usr/bin/
+ $(RSTRIP) $(IDIR_RRDTOOL1)
+ $(IPKG_BUILD) $(IDIR_RRDTOOL1) $(PACKAGE_DIR)
+
+$(IPKG_RRDCGI1):
+ install -d -m0755 $(IDIR_RRDCGI1)/usr/bin
+ cp -fpR $(PKG_INSTALL_DIR)/usr/bin/rrdcgi $(IDIR_RRDCGI1)/usr/bin/
+ $(RSTRIP) $(IDIR_RRDCGI1)
+ $(IPKG_BUILD) $(IDIR_RRDCGI1) $(PACKAGE_DIR)
+
+$(IPKG_LIBRRD1):
+ install -d -m0755 $(IDIR_LIBRRD1)/usr/lib
+ cp -fpR $(PKG_INSTALL_DIR)/usr/lib/librrd.so.* $(IDIR_LIBRRD1)/usr/lib/
+ $(RSTRIP) $(IDIR_LIBRRD1)
+ $(IPKG_BUILD) $(IDIR_LIBRRD1) $(PACKAGE_DIR)
+
+$(STAGING_DIR)/usr/lib/librrd.so: $(PKG_BUILD_DIR)/.built
+ mkdir -p $(STAGING_DIR)/usr/include
+ cp -fpR $(PKG_INSTALL_DIR)/usr/include/rrd.h $(STAGING_DIR)/usr/include/
+ mkdir -p $(STAGING_DIR)/usr/lib
+ cp -fpR $(PKG_INSTALL_DIR)/usr/lib/librrd.a $(STAGING_DIR)/usr/lib/
+ cp -fpR $(PKG_INSTALL_DIR)/usr/lib/librrd.so* $(STAGING_DIR)/usr/lib/
+ touch $@
+
+install-dev: $(STAGING_DIR)/usr/lib/librrd.so
+
+uninstall-dev:
+ rm -rf \
+ $(STAGING_DIR)/usr/include/rrd.h \
+ $(STAGING_DIR)/usr/lib/librrd.a \
+ $(STAGING_DIR)/usr/lib/librrd.so* \
+
+compile: install-dev
+clean: uninstall-dev
diff --git a/openwrt/package/rrdtool1/ipkg/librrd1.control b/openwrt/package/rrdtool1/ipkg/librrd1.control
new file mode 100644
index 0000000000..9903904aec
--- /dev/null
+++ b/openwrt/package/rrdtool1/ipkg/librrd1.control
@@ -0,0 +1,20 @@
+Package: librrd1
+Priority: optional
+Section: libs
+Maintainer: OpenWrt Developers Team <openwrt-devel@openwrt.org>, Christian Magnusson <mag@mag.cx>
+Source: http://openwrt.org/cgi-bin/viewcvs.cgi/openwrt/package/rrdtool1/
+Depends: zlib
+Description: Round Robin Database (RRD) management library.
+ 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 package contains the shared library used to manage RRDs.
+ .
+ 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.
diff --git a/openwrt/package/rrdtool1/ipkg/rrdcgi1.control b/openwrt/package/rrdtool1/ipkg/rrdcgi1.control
new file mode 100644
index 0000000000..6fccaa731f
--- /dev/null
+++ b/openwrt/package/rrdtool1/ipkg/rrdcgi1.control
@@ -0,0 +1,21 @@
+Package: rrdcgi1
+Priority: optional
+Section: web
+Maintainer: OpenWrt Developers Team <openwrt-devel@openwrt.org>, Christian Magnusson <mag@mag.cx>
+Source: http://home.mag.cx/openwrt/package/rrdtool1/
+Depends: librrd1
+Description: Round Robin Database (RRD) CGI graphing tool.
+ 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 package contains the rrdcgi tool used to create web pages containing
+ RRD graphs based on templates.
+ .
+ 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.
diff --git a/openwrt/package/rrdtool1/ipkg/rrdtool1.control b/openwrt/package/rrdtool1/ipkg/rrdtool1.control
new file mode 100644
index 0000000000..7363bcc818
--- /dev/null
+++ b/openwrt/package/rrdtool1/ipkg/rrdtool1.control
@@ -0,0 +1,20 @@
+Package: rrdtool1
+Priority: optional
+Section: admin
+Maintainer: OpenWrt Developers Team <openwrt-devel@openwrt.org>, Christian Magnusson <mag@mag.cx>
+Source: http://openwrt.org/cgi-bin/viewcvs.cgi/openwrt/package/rrdtool1/
+Depends: librrd1
+Description: Round Robin Database (RRD) management tools.
+ 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 package contains command line tools used to manage RRDs.
+ .
+ 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.