date:20120320

[OpenWrt-Devel] [PATCH] ramips: rt305x: add profile for the Asus WL-330N board

2012-03-20 Thread Frédéric Leroy


Signed-off-by: Frédéric Leroy fr...@starox.org
---
 target/linux/ramips/base-files/etc/diag.sh |2 +-
 .../etc/hotplug.d/firmware/10-rt2x00-eeprom|1 +
 .../ramips/base-files/etc/uci-defaults/network |3 +-
 .../ramips/base-files/lib/preinit/06_set_iface_mac |1 +
 target/linux/ramips/base-files/lib/ramips.sh   |3 +
 .../ramips/base-files/lib/upgrade/platform.sh  |2 +-
 .../arch/mips/include/asm/mach-ralink/machine.h|1 +
 .../ramips/files/arch/mips/ralink/rt305x/Kconfig   |5 +
 .../ramips/files/arch/mips/ralink/rt305x/Makefile  |1 +
 .../files/arch/mips/ralink/rt305x/mach-wl-330n.c   |   94 
 target/linux/ramips/image/Makefile |5 +
 target/linux/ramips/rt305x/config-3.2  |1 +
 12 files changed, 116 insertions(+), 3 deletions(-)
 create mode 100644 
target/linux/ramips/files/arch/mips/ralink/rt305x/mach-wl-330n.c

diff --git a/target/linux/ramips/base-files/etc/diag.sh 
b/target/linux/ramips/base-files/etc/diag.sh
index f8dac49..95f608a 100755
--- a/target/linux/ramips/base-files/etc/diag.sh
+++ b/target/linux/ramips/base-files/etc/diag.sh
@@ -69,7 +69,7 @@ get_status_led() {
rt-n10-plus)
status_led=asus:green:wps
;;
-   rt-n56u)
+   rt-n56u | wl-330n )
status_led=asus:blue:power
;;
sl-r7205)
diff --git 
a/target/linux/ramips/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom 
b/target/linux/ramips/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom
index bc23208..d97fb24 100644
--- a/target/linux/ramips/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom
+++ b/target/linux/ramips/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom
@@ -49,6 +49,7 @@ case $FIRMWARE in
;;
 
all0256n | \
+   wl-330n | \
argus-atp52b | \
bc2 | \
esr-9753 | \
diff --git a/target/linux/ramips/base-files/etc/uci-defaults/network 
b/target/linux/ramips/base-files/etc/uci-defaults/network
index 77b65cb..a17fad8 100755
--- a/target/linux/ramips/base-files/etc/uci-defaults/network
+++ b/target/linux/ramips/base-files/etc/uci-defaults/network
@@ -16,7 +16,8 @@ ramips_setup_interfaces()
ucidef_set_interface_loopback
 
case $board in
-   all0256n)
+   all0256n | \
+   wl-330n)
ucidef_set_interface_lan eth0.1
;;
 
diff --git a/target/linux/ramips/base-files/lib/preinit/06_set_iface_mac 
b/target/linux/ramips/base-files/lib/preinit/06_set_iface_mac
index 97cacfa..be6fecb 100644
--- a/target/linux/ramips/base-files/lib/preinit/06_set_iface_mac
+++ b/target/linux/ramips/base-files/lib/preinit/06_set_iface_mac
@@ -24,6 +24,7 @@ preinit_set_mac_address() {
 ifconfig eth0 hw ether $mac 2/dev/null
 ;;
all0256n |\
+   wl-330n |\
hw550-3g |\
nbg-419n |\
omni-emb |\
diff --git a/target/linux/ramips/base-files/lib/ramips.sh 
b/target/linux/ramips/base-files/lib/ramips.sh
index faa2485..6e1da23 100755
--- a/target/linux/ramips/base-files/lib/ramips.sh
+++ b/target/linux/ramips/base-files/lib/ramips.sh
@@ -53,6 +53,9 @@ ramips_board_name() {
*Argus ATP-52B)
name=argus-atp52b
;;
+   *Asus WL-330N)
+   name=wl-330n
+   ;;
*Aztech HW550-3G)
name=hw550-3g
;;
diff --git a/target/linux/ramips/base-files/lib/upgrade/platform.sh 
b/target/linux/ramips/base-files/lib/upgrade/platform.sh
index 1f6910d..abb0dc8 100755
--- a/target/linux/ramips/base-files/lib/upgrade/platform.sh
+++ b/target/linux/ramips/base-files/lib/upgrade/platform.sh
@@ -34,7 +34,7 @@ platform_check_image() {
w502u |\
wr6202 |\
v22rw-2x2 | \
-   wl341v3 | \
+   wl-330n | \
wli-tx4-ag300n | \
whr-g300n |\
wr512-3gn)
diff --git 
a/target/linux/ramips/files/arch/mips/include/asm/mach-ralink/machine.h 
b/target/linux/ramips/files/arch/mips/include/asm/mach-ralink/machine.h
index 8234164..27733e0 100644
--- a/target/linux/ramips/files/arch/mips/include/asm/mach-ralink/machine.h
+++ b/target/linux/ramips/files/arch/mips/include/asm/mach-ralink/machine.h
@@ -27,6 +27,7 @@ enum ramips_mach_type {
RAMIPS_MACH_DIR_600_B2, /* D-Link DIR-600 B2 */
RAMIPS_MACH_RT_G32_B1,  /* Asus RT-G32 B1 */
RAMIPS_MACH_RT_N10_PLUS,/* Asus RT-N10+ */
+   RAMIPS_MACH_WL_330N,/* Asus WL-330N */
RAMIPS_MACH_NW718,  /* Netcore NW718 */
 
/* RT3052 based machines */
diff --git a/target/linux/ramips/files/arch/mips/ralink/rt305x/Kconfig 
b/target/linux/ramips/files/arch/mips/ralink/rt305x/Kconfig
index 1bf960f..6c5a62f 100644
--- a/target/linux/ramips/files/arch/mips/ralink/rt305x/Kconfig
+++ b/target/linux/ramips/files/arch/mips/ralink/rt305x/Kconfig
@@ -31,6 +31,11 @@ config

[OpenWrt-Devel] Porting rrdtool 1.4 to openwrt

2012-03-20 Thread Roberto Riggio


Hi,

I'm try to compile the latest rrdtool for openwrt. I did manage to 
compile it without support for graph, however when I try to compile it 
WITH supprot for graphs I get the following error during the configure 
phase:


checking for pango_cairo_context_set_font_options in -lpango-1.0... no
checking for pkg-config... (cached) pkg-config
checking for pango_cairo_context_set_font_options in -lpango-1.0... no
configure: WARNING:

* I could not find a working copy of pangocairo. Check config.log for 
hints on why



Both cairo and pango are compiled and installed by openwrt (they are 
even in the host system since I tried to compile rrdtool on my laptop).


Any hints?


--

Roberto Riggio, Ph.D.
CREATE-NET
Network  Security Solutions for Pervasive Computing Systems (iNSPIRE)
Senior Researcher
Via alla Cascata 56/D - 38123 Povo Trento (Italy)
e-mail: roberto.rig...@create-net.org
Tel: (+39) 0461 408400 - interno/extension 708
Fax: (+39) 0461 421157
www.create-net.org/~rriggio


The information transmitted is intended only for the person or entity to
which it is addressed and may contain confidential and/or privileged
material. Any review, retransmission, dissemination or other use of, or
taking of any action in reliance upon, this information by persons or
entities other than the intended recipient is prohibited according to
the Italian Law 196/2003 of the Legislature. If you received this in
error, please contact the sender and delete the material from any
computer.

Le informazioni contenute in questo messaggio di posta elettronica e nei
file allegati sono da considerarsi strettamente riservate. Il loro
utilizzo e' consentito esclusivamente al destinatario del messaggio, per
le finalita' indicate nel messaggio stesso. Qualora riceveste questo
messaggio senza esserne il destinatario, Vi preghiamo cortesemente di
darcene notizia via e-mail e di procedere alla cancellazione del
messaggio stesso dal Vostro sistema. Trattenere il messaggio stesso,
divulgarlo anche in parte, distribuirlo ad altri soggetti, copiarlo,
od utilizzarlo per finalita' diverse, costituisce comportamento
contrario ai principi dettati dal D. Lgs. 196/2003.
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel

Re: [OpenWrt-Devel] Porting rrdtool 1.4 to openwrt

2012-03-20 Thread Jo-Philipp Wich

 * I could not find a working copy of pangocairo. Check config.log for
 hints on why

As usual, dig through config.log

~ Jow
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel

Re: [OpenWrt-Devel] Porting rrdtool 1.4 to openwrt

2012-03-20 Thread Roberto Riggio


On 03/20/2012 01:17 PM, Jo-Philipp Wich wrote:

* I could not find a working copy of pangocairo. Check config.log for
hints on why


As usual, dig through config.log


This is what I've found:

/usr/include/libxml2/libxml/encoding.h:28:19: fatal error: iconv.h: No 
such file or directory


libiconv is selected and compiled too.



~ Jow


R
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel

Re: [OpenWrt-Devel] Porting rrdtool 1.4 to openwrt

2012-03-20 Thread Jo-Philipp Wich

You need

include $(INCLUDE_DIR)/nls.mk

in your OpenWrt makefile. That will add the needed iconv search paths to
TARGET_CFLAGS.

~ Jow
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel

Re: [OpenWrt-Devel] Porting rrdtool 1.4 to openwrt

2012-03-20 Thread Roberto Riggio


On 03/20/2012 02:21 PM, Jo-Philipp Wich wrote:

You need

include $(INCLUDE_DIR)/nls.mk

in your OpenWrt makefile. That will add the needed iconv search paths to
TARGET_CFLAGS.


Thanks, this works. However now I'm getting this after the compile 
process has started:


make[5]: Entering directory 
`/home/rriggio/src/kamikaze/build_dir/target-i386_uClibc-0.9.33/rrdtool-1.4.7/po'
*** error: gettext infrastructure mismatch: using a Makefile.in.in from 
gettext version 0.17 but the autoconf macros are from gettext version 0.18

make[5]: *** [check-macro-version] Error 1

which at the end produces (I think):

make[6]: Leaving directory 
`/home/rriggio/src/kamikaze/build_dir/target-i386_uClibc-0.9.33/rrdtool-1.4.7/bindings'
make[5]: Leaving directory 
`/home/rriggio/src/kamikaze/build_dir/target-i386_uClibc-0.9.33/rrdtool-1.4.7/bindings'
make[5]: Entering directory 
`/home/rriggio/src/kamikaze/build_dir/target-i386_uClibc-0.9.33/rrdtool-1.4.7'
make[5]: Leaving directory 
`/home/rriggio/src/kamikaze/build_dir/target-i386_uClibc-0.9.33/rrdtool-1.4.7'

make[4]: *** [all-recursive] Error 1
make[4]: Leaving directory 
`/home/rriggio/src/kamikaze/build_dir/target-i386_uClibc-0.9.33/rrdtool-1.4.7'

make[3]: *** [all] Error 2
make[3]: Leaving directory 
`/home/rriggio/src/kamikaze/build_dir/target-i386_uClibc-0.9.33/rrdtool-1.4.7'
make[2]: *** 
[/home/rriggio/src/kamikaze/build_dir/target-i386_uClibc-0.9.33/rrdtool-1.4.7/.built] 
Error 2
make[2]: Leaving directory 
`/home/rriggio/src/kamikaze/feeds/packages/utils/rrdtool'

make[1]: *** [package/feeds/packages/rrdtool/install] Error 2
make[1]: Leaving directory `/home/rriggio/src/kamikaze'
make: *** [package/rrdtool/install] Error 2



~ Jow


R.
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel

Re: [OpenWrt-Devel] Porting rrdtool 1.4 to openwrt

2012-03-20 Thread Roberto Riggio


On 03/20/2012 04:28 PM, Roberto Riggio wrote:

Thanks, this works. However now I'm getting this after the compile
process has started:

make[5]: Entering directory
`/home/rriggio/src/kamikaze/build_dir/target-i386_uClibc-0.9.33/rrdtool-1.4.7/po'


Forget about this. I little patch to a Makefile solved the issue.

The package now compiles fine.

I'm gonna submit a patch to the ML soon, however i do not know how to 
proceed with some external dependencies, namely pango and cairo that are 
now fetched from the xorg feed but are not available in the packages 
feed. Suggestions about how to proceed?


R.
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel

Re: [OpenWrt-Devel] Porting rrdtool 1.4 to openwrt

2012-03-20 Thread Jo-Philipp Wich

Yes, you need to patch out intltool related stuff.
Usually its enough to remove the po from SUBDIRS in the Makefile.am
and then declaring PKG_FIXUP:=autoreconf in the OpenWrt Makefile.

~ Jow
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel

Re: [OpenWrt-Devel] Porting rrdtool 1.4 to openwrt

2012-03-20 Thread Michael Heimpold

Hi,

several weeks ago I also tried to upgrade this package. Here's my patch which 
is only
compile tested and not yet cleaned up.


diff --git a/utils/rrdtool/Makefile b/utils/rrdtool/Makefile
index c73b4e1..62feeed 100644
--- a/utils/rrdtool/Makefile
+++ b/utils/rrdtool/Makefile
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=rrdtool
-PKG_VERSION:=1.2.30
-PKG_RELEASE:=2
+PKG_VERSION:=1.4.7
+PKG_RELEASE:=1
 
 PKG_SOURCE_URL:=http://oss.oetiker.ch/rrdtool/pub/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_MD5SUM:=19b24f7184a8dbf7b48c1bbb565ad9fb
+PKG_MD5SUM:=ffe369d8921b4dfdeaaf43812100c38f
 
 PKG_BUILD_DEPENDS:=python
 
@@ -21,7 +21,8 @@ PKG_CONFIG_DEPENDS:= \
CONFIG_PACKAGE_python-rrd \
CONFIG_PACKAGE_rrdcgi \
 
-PKG_FIXUP:=libtool
+#PKG_FIXUP:=libtool
+#PKG_FIXUP:=autoreconf
 
 PKG_INSTALL:=1
 
@@ -39,19 +40,19 @@ define Package/librrd
 $(call Package/rrdtool/Default)
   SECTION:=libs
   CATEGORY:=Libraries
-  TITLE+= management library (v1.2.x)
-  DEPENDS+= +libart +libfreetype +libpng +zlib
+  TITLE+= management library (v1.4.x)
+  DEPENDS+= +cairo +pango +libart +libfreetype +libpng +libxml2 +zlib
 endef
 
 define Package/rrdcgi
 $(call Package/rrdtool/Default)
-  TITLE+= CGI graphing tool (v1.2.x)
+  TITLE+= CGI graphing tool (v1.4.x)
   DEPENDS+= +librrd +cgilib
 endef
 
 define Package/rrdtool
 $(call Package/rrdtool/Default)
-  TITLE+= management tools (v1.2.x)
+  TITLE+= management tools (v1.4.x)
   DEPENDS+= +librrd
 endef
 
@@ -60,7 +61,7 @@ $(call Package/rrdtool/Default)
   SUBMENU:=Python
   SECTION:=lang
   CATEGORY:=Languages
-  TITLE+= python bindings (v1.2.x)
+  TITLE+= python bindings (v1.4.x)
   DEPENDS+= +python-mini +librrd
 endef
 
@@ -73,7 +74,7 @@ CONFIGURE_ARGS += \
--disable-perl \
--disable-tcl \
--disable-ruby \
-   --without-x \
+   --disable-lua \
--with-rrd-default-font=/usr/share/rrdtool/fonts/DejaVuSansMono-Roman.ttf 
\
 
 CONFIGURE_VARS += \
@@ -96,25 +97,25 @@ else
   CONFIGURE_ARGS += --disable-python
 endif
 
+TARGET_CPPFLAGS+= -I$(STAGING_DIR)/usr/include/pango-1.0 
-I$(STAGING_DIR)/usr/include/libxml2
+TARGET_LDFLAGS+= -Wl,-rpath-link=$(STAGING_DIR)/usr/lib
+
 define Build/Compile
$(if $(Build/Compile/PyMod),,@echo Python packaging code not found.; false)
$(call Build/Compile/Default)
 endef
 
 define Build/InstallDev
-   $(INSTALL_DIR) $(1)/usr/lib/rrdtool-1.2/include
-   $(CP) $(PKG_INSTALL_DIR)/usr/include/rrd.h $(1)/usr/lib/rrdtool-1.2/include/
-   $(INSTALL_DIR) $(1)/usr/lib/rrdtool-1.2/lib
-   $(CP) $(PKG_INSTALL_DIR)/usr/lib/librrd{,_th}.{a,so*} 
$(1)/usr/lib/rrdtool-1.2/lib/
+   $(INSTALL_DIR) $(1)/usr/lib/rrdtool-1.4/include
+   $(CP) $(PKG_INSTALL_DIR)/usr/include/rrd.h $(1)/usr/lib/rrdtool-1.4/include/
+   $(INSTALL_DIR) $(1)/usr/lib/rrdtool-1.4/lib
+   $(CP) $(PKG_INSTALL_DIR)/usr/lib/librrd{,_th}.{a,so*} 
$(1)/usr/lib/rrdtool-1.4/lib/
 endef
 
 define Package/librrd/install
$(INSTALL_DIR) $(1)/usr/lib
$(CP) $(PKG_INSTALL_DIR)/usr/lib/librrd.so.* $(1)/usr/lib/
$(CP) $(PKG_INSTALL_DIR)/usr/lib/librrd_th.so.* $(1)/usr/lib/
-   $(INSTALL_DIR) $(1)/usr/share/rrdtool/fonts
-   $(CP) $(PKG_BUILD_DIR)/src/DejaVuSansMono-Roman.ttf \
-   $(1)/usr/share/rrdtool/fonts/
 endef
 
 define Package/rrdcgi/install
diff --git a/utils/rrdtool/patches/010-dont-add-host-include-paths.patch 
b/utils/rrdtool/patches/010-dont-add-host-include-paths.patch
deleted file mode 100644
index 507a0e9..000
--- a/utils/rrdtool/patches/010-dont-add-host-include-paths.patch
+++ /dev/null
@@ -1,34 +0,0 @@
 a/configure
-+++ b/configure
-@@ -26319,9 +26319,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
-  ex_check_save_LIBS=${LIBS}
-  ex_check_save_CPPFLAGS=${CPPFLAGS}
-  ex_check_save_LDFLAGS=${LDFLAGS}
-- if test x/usr/include/libart-2.0 != x; then
--   CPPFLAGS=$CPPFLAGS -I/usr/include/libart-2.0
-- fi
-   { echo $as_me:$LINENO: checking for art_vpath_add_point in -lart_lgpl_2 
5
- echo $ECHO_N checking for art_vpath_add_point in -lart_lgpl_2... $ECHO_C 
6; }
- if test ${ac_cv_lib_art_lgpl_2_art_vpath_add_point+set} = set; then
-@@ -27915,9 +27912,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
-  ex_check_save_LIBS=${LIBS}
-  ex_check_save_CPPFLAGS=${CPPFLAGS}
-  ex_check_save_LDFLAGS=${LDFLAGS}
-- if test x/usr/include/freetype2 != x; then
--   CPPFLAGS=$CPPFLAGS -I/usr/include/freetype2
-- fi
-   { echo $as_me:$LINENO: checking for FT_Init_FreeType in -lfreetype 5
- echo $ECHO_N checking for FT_Init_FreeType in -lfreetype... $ECHO_C 6; }
- if test ${ac_cv_lib_freetype_FT_Init_FreeType+set} = set; then
 a/acinclude.m4
-+++ b/acinclude.m4
-@@ -20,9 +20,6 @@ AC_DEFUN([EX_CHECK_ALL],
-  ex_check_save_LIBS=${LIBS}
-  ex_check_save_CPPFLAGS=${CPPFLAGS}
-  ex_check_save_LDFLAGS=${LDFLAGS}
-- if test x$7 != x; then
--   CPPFLAGS=$CPPFLAGS -I$7
-- fi
-  dnl try compiling naked first
-  AC_CHECK_LIB($1,$2, [
- AC_CHECK_HEADER($3,[LIBS=-l$1 ${LIBS};EX_CHECK_STATE=YES],[])],[])
diff --git

Re: [OpenWrt-Devel] Porting rrdtool 1.4 to openwrt

2012-03-20 Thread Roberto Riggio


I still have two problems with my patch:

1) when running an rrdtool create command using as filename something like:

/etc/rrds/sampple.rrd

I get:

ERROR: creating '/etc/rrds/sampple.rrd': Invalid argument

Everything works fine if I use /tmp/sample.rrd as filename.

2) whe I try to compile the python bindings I get:

i486-openwrt-linux-uclibc-gcc -shared 
-L/home/rriggio/src/kamikaze/staging_dir/target-i386_uClibc-0.9.33/usr/lib 
-L/home/rriggio/src/kamikaze/staging_dir/target-i386_uClibc-0.9.33/lib 
-L/home/rriggio/src/kamikaze/staging_dir/toolchain-i386_gcc-4.6-linaro_uClibc-0.9.33/usr/lib 
-L/home/rriggio/src/kamikaze/staging_dir/toolchain-i386_gcc-4.6-linaro_uClibc-0.9.33/lib 
-L/home/rriggio/src/kamikaze/staging_dir/target-i386_uClibc-0.9.33/usr/lib/libiconv-stub/lib 
-L/home/rriggio/src/kamikaze/staging_dir/target-i386_uClibc-0.9.33/usr/lib/libintl-stub/lib 
-L/home/rriggio/src/kamikaze/staging_dir/target-i386_uClibc-0.9.33/usr/lib 
-L/home/rriggio/src/kamikaze/staging_dir/target-i386_uClibc-0.9.33/usr/lib 
-march=geode -Os -mmmx -m3dnow -fno-align-jumps -fno-align-functions 
-fno-align-labels -fno-align-loops -pipe -fomit-frame-pointer 
-fhonour-copts -Wno-error=unused-but-set-variable 
-I/home/rriggio/src/kamikaze/staging_dir/target-i386_uClibc-0.9.33/usr/lib/libiconv-stub/include 
-I/home/rriggio/src/kamikaze/staging_dir/target-i386_uClibc-0.9.33/usr/lib/libintl-stub/include 
-D_GNU_SOURCE -fno-strict-aliasing -Wall -std=gnu99 -pedantic -Wundef 
-Wshadow -Wpointer-arith -Wcast-align -Wmissing-prototypes 
-Wmissing-declarations -Wnested-externs -Winline -Wold-style-definition 
-W -fPIC -DPIC build/temp.linux-i686-2.6/rrdtoolmodule.o 
-L../../src/.libs -R/usr/lib -lrrd -o 
build/lib.linux-i686-2.6/rrdtoolmodule.so

i486-openwrt-linux-uclibc-gcc: error: unrecognized option '-R'
error: command 'i486-openwrt-linux-uclibc-gcc' failed with exit status 1



On 03/20/2012 07:53 PM, Michael Heimpold wrote:

Hi,

several weeks ago I also tried to upgrade this package. Here's my patch which 
is only
compile tested and not yet cleaned up.


diff --git a/utils/rrdtool/Makefile b/utils/rrdtool/Makefile
index c73b4e1..62feeed 100644
--- a/utils/rrdtool/Makefile
+++ b/utils/rrdtool/Makefile
@@ -8,12 +8,12 @@
  include $(TOPDIR)/rules.mk

  PKG_NAME:=rrdtool
-PKG_VERSION:=1.2.30
-PKG_RELEASE:=2
+PKG_VERSION:=1.4.7
+PKG_RELEASE:=1

  PKG_SOURCE_URL:=http://oss.oetiker.ch/rrdtool/pub/
  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_MD5SUM:=19b24f7184a8dbf7b48c1bbb565ad9fb
+PKG_MD5SUM:=ffe369d8921b4dfdeaaf43812100c38f

  PKG_BUILD_DEPENDS:=python

@@ -21,7 +21,8 @@ PKG_CONFIG_DEPENDS:= \
 CONFIG_PACKAGE_python-rrd \
 CONFIG_PACKAGE_rrdcgi \

-PKG_FIXUP:=libtool
+#PKG_FIXUP:=libtool
+#PKG_FIXUP:=autoreconf

  PKG_INSTALL:=1

@@ -39,19 +40,19 @@ define Package/librrd
  $(call Package/rrdtool/Default)
SECTION:=libs
CATEGORY:=Libraries
-  TITLE+= management library (v1.2.x)
-  DEPENDS+= +libart +libfreetype +libpng +zlib
+  TITLE+= management library (v1.4.x)
+  DEPENDS+= +cairo +pango +libart +libfreetype +libpng +libxml2 +zlib
  endef

  define Package/rrdcgi
  $(call Package/rrdtool/Default)
-  TITLE+= CGI graphing tool (v1.2.x)
+  TITLE+= CGI graphing tool (v1.4.x)
DEPENDS+= +librrd +cgilib
  endef

  define Package/rrdtool
  $(call Package/rrdtool/Default)
-  TITLE+= management tools (v1.2.x)
+  TITLE+= management tools (v1.4.x)
DEPENDS+= +librrd
  endef

@@ -60,7 +61,7 @@ $(call Package/rrdtool/Default)
SUBMENU:=Python
SECTION:=lang
CATEGORY:=Languages
-  TITLE+= python bindings (v1.2.x)
+  TITLE+= python bindings (v1.4.x)
DEPENDS+= +python-mini +librrd
  endef

@@ -73,7 +74,7 @@ CONFIGURE_ARGS += \
 --disable-perl \
 --disable-tcl \
 --disable-ruby \
-   --without-x \
+   --disable-lua \
 
--with-rrd-default-font=/usr/share/rrdtool/fonts/DejaVuSansMono-Roman.ttf \

  CONFIGURE_VARS += \
@@ -96,25 +97,25 @@ else
CONFIGURE_ARGS += --disable-python
  endif

+TARGET_CPPFLAGS+= -I$(STAGING_DIR)/usr/include/pango-1.0 
-I$(STAGING_DIR)/usr/include/libxml2
+TARGET_LDFLAGS+= -Wl,-rpath-link=$(STAGING_DIR)/usr/lib
+
  define Build/Compile
 $(if $(Build/Compile/PyMod),,@echo Python packaging code not found.; false)
 $(call Build/Compile/Default)
  endef

  define Build/InstallDev
-   $(INSTALL_DIR) $(1)/usr/lib/rrdtool-1.2/include
-   $(CP) $(PKG_INSTALL_DIR)/usr/include/rrd.h $(1)/usr/lib/rrdtool-1.2/include/
-   $(INSTALL_DIR) $(1)/usr/lib/rrdtool-1.2/lib
-   $(CP) $(PKG_INSTALL_DIR)/usr/lib/librrd{,_th}.{a,so*} 
$(1)/usr/lib/rrdtool-1.2/lib/
+   $(INSTALL_DIR) $(1)/usr/lib/rrdtool-1.4/include
+   $(CP) $(PKG_INSTALL_DIR)/usr/include/rrd.h $(1)/usr/lib/rrdtool-1.4/include/
+   $(INSTALL_DIR) $(1)/usr/lib/rrdtool-1.4/lib
+   $(CP) $(PKG_INSTALL_DIR)/usr/lib/librrd{,_th}.{a,so*} 
$(1)/usr/lib/rrdtool-1.4/lib/
  endef

  define Package/librrd/install
 $(INSTALL_DIR) $(1)/usr/lib
 $(CP) $(PKG_INSTALL_DIR)/usr/lib/librrd.so.* $(1)/usr/lib/

Re: [OpenWrt-Devel] Porting rrdtool 1.4 to openwrt

2012-03-20 Thread Jo-Philipp Wich

-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1

Hi,

-R is a linker option but unknown to gcc. Either (if you can) change
-R/usr/lib to -Wl,-rpath=/usr/lib or make sure that LD points to the
cross ld and not the cross gcc.

~ Jow
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.10 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAk9o+pcACgkQdputYINPTPPecwCeLKHPqV2Nrn+9fR7UXVd8Eo3C
NxQAoIlzgoFAUlaruC8DDj719S3eTTbd
=/fuS
-END PGP SIGNATURE-
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel

[OpenWrt-Devel] finding module dependencies.

2012-03-20 Thread abhinav narain

hi,
 I am modifying mac80211. but when I reboot the router, I get a set of
erros which is due to module dependencies.
lsmod shows : ath9k as the only dependency and I am removing the module
before inserting the modified mac80211  module.

The only other way I to fix this is to remove all the modules before
inserting the modified mac80211 module.
But the problem is lsmod shows only the number of modules which are
dependent on a particular module than showing the listing also (for few
entries) and I am not able to figure out which are these modules.

Can someone please help to find out how to fix this
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel

Re: [OpenWrt-Devel] Porting rrdtool 1.4 to openwrt

2012-03-20 Thread david


On Tue, 20 Mar 2012, Roberto Riggio wrote:


On 03/20/2012 04:28 PM, Roberto Riggio wrote:

Thanks, this works. However now I'm getting this after the compile
process has started:

make[5]: Entering directory
`/home/rriggio/src/kamikaze/build_dir/target-i386_uClibc-0.9.33/rrdtool-1.4.7/po'


Forget about this. I little patch to a Makefile solved the issue.

The package now compiles fine.

I'm gonna submit a patch to the ML soon, however i do not know how to proceed 
with some external dependencies, namely pango and cairo that are now fetched 
from the xorg feed but are not available in the packages feed. Suggestions 
about how to proceed?


Would it be possible to break this into two packages, one without the 
graphing and the second the graphing tools?


The graphing has a lot of additional dependancies, and so pulls in a lot 
of additional libraries.


You may think that it's worthless without the graphing tools, but 
especially with the ability in 1.4 to update a .rrd file on another 
machine, you can have your route gathering the data and a different 
machine storing it and generating the graphs.


David Lang
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel

[OpenWrt-Devel] DHCP support for SRV records

2012-03-20 Thread Philip Prindeville

Could we add the following?

config 'srv'
option service  $1
option proto$2
option port $3
option class$4
option priority $5
option host $6

would generate:

srv-host=$1.$2.mydomain,$6,$3,$4,$5

This is really useful for configuring IP phones...
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel

Re: [OpenWrt-Devel] finding module dependencies.

2012-03-20 Thread Philip Prindeville

On 3/20/12 5:56 PM, abhinav narain wrote:
 hi, 
  I am modifying mac80211. but when I reboot the router, I get a set of erros 
 which is due to module dependencies.
 lsmod shows : ath9k as the only dependency and I am removing the module 
 before inserting the modified mac80211  module.
 
 The only other way I to fix this is to remove all the modules before 
 inserting the modified mac80211 module.
 But the problem is lsmod shows only the number of modules which are dependent 
 on a particular module than showing the listing also (for few entries) and I 
 am not able to figure out which are these modules.
 
 Can someone please help to find out how to fix this 


Try adding:

CONFIG_BUSYBOX_CONFIG_MODINFO=y

to your config, rebuilt and reboot.

Then try modinfo modname to see what its dependencies are.

___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel

[OpenWrt-Devel] [PATCH 1/1] dnsmasq: add keywords for SRV RR class/weight

2012-03-20 Thread Philip Prindeville

The SRV record also requires the class and weight fields... Currently you can 
overload the port keyword as:

option port ,class,weight

but this is counter-intuitive. Here we fix this.

Signed-off-by: Philip Prindeville phil...@redfish-solutions.com
Index: package/dnsmasq/files/dhcp.conf
===
--- package/dnsmasq/files/dhcp.conf (revision 30968)
+++ package/dnsmasq/files/dhcp.conf (working copy)
@@ -6,19 +6,19 @@
option rebind_protection 1  # disable if upstream must serve RFC1918 
addresses
option rebind_localhost 1  # enable for RBL checking and similar 
services
#list rebind_domain example.lan  # whitelist RFC1918 responses for 
domains
-   option local'/lan/'
-   option domain   'lan'
+   option local/lan/
+   option domain   lan
option expandhosts  1
option nonegcache   0
option authoritative1
option readethers   1
-   option leasefile'/tmp/dhcp.leases'
-   option resolvfile   '/tmp/resolv.conf.auto'
-   #list server'/mycompany.local/1.2.3.4'
+   option leasefile/tmp/dhcp.leases
+   option resolvfile   /tmp/resolv.conf.auto
+   #list server/mycompany.local/1.2.3.4
#option nonwildcard 1
#list interface br-lan
#list notinterface  lo
-   #list bogusnxdomain '64.94.110.11'
+   #list bogusnxdomain 64.94.110.11
 
 config dhcp lan
option interfacelan
Index: package/dnsmasq/files/dnsmasq.init
===
--- package/dnsmasq/files/dnsmasq.init  (revision 30968)
+++ package/dnsmasq/files/dnsmasq.init  (working copy)
@@ -364,6 +364,12 @@
local service=$srv,$target
[ -n $port ]  service=$service,$port
 
+   config_get class $cfg class
+   [ -n $class ]  service=$service,$class
+
+   config_get weight $cfg weight
+   [ -n $weight ]  service=$service,$weight
+
append args -W $service
 }
 
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel

[OpenWrt-Devel] [PATCH v2 1/1] dnsmasq: add keywords for SRV RR class/weight

2012-03-20 Thread Philip Prindeville

The SRV record also requires the class and weight fields... Currently you can 
overload the port keyword as:

option port ,class,weight

but this is counter-intuitive. Here we fix this.

Signed-off-by: Philip Prindeville phil...@redfish-solutions.com

Index: package/dnsmasq/files/dnsmasq.init
===
--- package/dnsmasq/files/dnsmasq.init  (revision 30968)
+++ package/dnsmasq/files/dnsmasq.init  (working copy)
@@ -364,6 +364,12 @@
local service=$srv,$target
[ -n $port ]  service=$service,$port
 
+   config_get class $cfg class
+   [ -n $class ]  service=$service,$class
+
+   config_get weight $cfg weight
+   [ -n $weight ]  service=$service,$weight
+
append args -W $service
 }
 
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel

[OpenWrt-Devel] [PATCH 1/1] dnsmasq: add mx record support

2012-03-20 Thread Philip Prindeville

Adding the following syntax support:

config mxhost
option domain mydomain.com
option relay svr10.ironport.com
option pref 50

and this will generate an MX record for mydomain.com pointing at the relay with 
a given preference.

Signed-off-by: Philip Prindeville phil...@redfish-solutions.com
Index: package/dnsmasq/files/dnsmasq.init
===
--- package/dnsmasq/files/dnsmasq.init  (revision 30968)
+++ package/dnsmasq/files/dnsmasq.init  (working copy)
@@ -367,6 +367,23 @@
append args -W $service
 }
 
+dhcp_mx_add() {
+   local cfg=$1
+
+   config_get domain $cfg domain
+   [ -n $domain ] || return 0
+
+   config_get relay $cfg relay
+   [ -n $relay ] || return 0
+
+   config_get pref $cfg pref
+   [ -n $pref ] || return 0
+
+   local service=$domain,$relay,$pref
+
+   append args -m $service
+}
+
 dhcp_cname_add() {
local cfg=$1
local cname target
@@ -401,6 +424,7 @@
config_foreach dhcp_subscrid_add subscrid
config_foreach dhcp_domain_add domain
config_foreach dhcp_srv_add srvhost
+   config_foreach dhcp_mx_add mxhost
config_foreach dhcp_add dhcp
config_foreach dhcp_cname_add cname
 
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel

Re: [OpenWrt-Devel] [PATCH 1/1] dnsmasq: add mx record support

2012-03-20 Thread Dave Taht

While you are poking around in here, I note that the latest dnsmasq
version and the upcoming one has some nice new features.

From the changelog for 2.6.1 (WIP)

Add ra-names DHCPv6 keyword which adds  records
for dual-stack hosts which get IPv6 addresses via SLAAC.

Add --dhcp-duid to allow DUID-EN uids to be used.

Add --host-record.

Add --dhcp-client-update option.

In the recently shipped 2.6.0

Support DHCPv6. Support is there for the sort of things
the existing v4 server does, including tags, options,
static addresses and relay support. Missing is prefix
delegation, which is probably not required in the dnsmasq
niche, and an easy way to accept prefix delegations from
an upstream DHCPv6 server, which is. Future plans include
support for DHCPv6 router option and MAC address option
(to make selecting clients by MAC address work like IPv4).
These will be added as the standards mature.
This code has been tested, but this is the first release,
so don't bet the farm on it just yet.

Add --dhcp-client-update option.

 Support IPv6 router advertisements. This is a
simple-minded implementation, aimed at providing the
vestigial RA needed to go alongside IPv6. Is picks up


On Tue, Mar 20, 2012 at 8:55 PM, Philip Prindeville
philipp_s...@redfish-solutions.com wrote:
 Adding the following syntax support:

 config mxhost
        option domain mydomain.com
        option relay svr10.ironport.com
        option pref 50

 and this will generate an MX record for mydomain.com pointing at the relay 
 with a given preference.

 Signed-off-by: Philip Prindeville phil...@redfish-solutions.com

 ___
 openwrt-devel mailing list
 openwrt-devel@lists.openwrt.org
 https://lists.openwrt.org/mailman/listinfo/openwrt-devel




-- 
Dave Täht
SKYPE: davetaht
US Tel: 1-239-829-5608
http://www.bufferbloat.net
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel

[OpenWrt-Devel] [PATCH] ramips: rt305x: add profile for the Asus WL-330N board

[OpenWrt-Devel] Porting rrdtool 1.4 to openwrt

Re: [OpenWrt-Devel] Porting rrdtool 1.4 to openwrt

Re: [OpenWrt-Devel] Porting rrdtool 1.4 to openwrt

Re: [OpenWrt-Devel] Porting rrdtool 1.4 to openwrt

Re: [OpenWrt-Devel] Porting rrdtool 1.4 to openwrt

Re: [OpenWrt-Devel] Porting rrdtool 1.4 to openwrt

Re: [OpenWrt-Devel] Porting rrdtool 1.4 to openwrt

Re: [OpenWrt-Devel] Porting rrdtool 1.4 to openwrt

Re: [OpenWrt-Devel] Porting rrdtool 1.4 to openwrt

Re: [OpenWrt-Devel] Porting rrdtool 1.4 to openwrt

[OpenWrt-Devel] finding module dependencies.

Re: [OpenWrt-Devel] Porting rrdtool 1.4 to openwrt

[OpenWrt-Devel] DHCP support for SRV records

Re: [OpenWrt-Devel] finding module dependencies.

[OpenWrt-Devel] [PATCH 1/1] dnsmasq: add keywords for SRV RR class/weight

[OpenWrt-Devel] [PATCH v2 1/1] dnsmasq: add keywords for SRV RR class/weight

[OpenWrt-Devel] [PATCH 1/1] dnsmasq: add mx record support

Re: [OpenWrt-Devel] [PATCH 1/1] dnsmasq: add mx record support

19 matches

Site Navigation

Mail list logo

Footer information