[OpenWrt-Devel] [PATCH] [packages] php5-pecl-http: upgrade to 1.7.6
Signed-off-by: Michael Heimpold --- lang/php5-pecl-http/Makefile |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lang/php5-pecl-http/Makefile b/lang/php5-pecl-http/Makefile index 15a0c69..0b4a00d 100644 --- a/lang/php5-pecl-http/Makefile +++ b/lang/php5-pecl-http/Makefile @@ -10,9 +10,9 @@ include $(TOPDIR)/rules.mk PECL_NAME:=pecl_http PECL_LONGNAME:=Extended HTTP Support -PKG_VERSION:=1.7.4 -PKG_RELEASE:=2 -PKG_MD5SUM:=288bae57b89d8de4bdd7d7dc5954cf8c +PKG_VERSION:=1.7.6 +PKG_RELEASE:=1 +PKG_MD5SUM:=4926c17a24a11a9b1cf3ec613fad97cb PKG_NAME:=php5-pecl-http PKG_SOURCE:=$(PECL_NAME)-$(PKG_VERSION).tgz -- 1.7.10.4 ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] [packages] php5-pecl-libevent: upgrade to 0.1.0
Signed-off-by: Michael Heimpold --- lang/php5-pecl-libevent/Makefile |8 .../patches/100-openwrt-libevent-include.patch | 20 .../patches/101-openwrt-libevent-libdir.patch | 13 - 3 files changed, 4 insertions(+), 37 deletions(-) delete mode 100644 lang/php5-pecl-libevent/patches/100-openwrt-libevent-include.patch delete mode 100644 lang/php5-pecl-libevent/patches/101-openwrt-libevent-libdir.patch diff --git a/lang/php5-pecl-libevent/Makefile b/lang/php5-pecl-libevent/Makefile index 3358c9e..a4c9e40 100644 --- a/lang/php5-pecl-libevent/Makefile +++ b/lang/php5-pecl-libevent/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2012 OpenWrt.org +# Copyright (C) 2012-2013 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -10,9 +10,9 @@ include $(TOPDIR)/rules.mk PECL_NAME:=libevent PECL_LONGNAME:=Libevent - event notification -PKG_VERSION:=0.0.5 +PKG_VERSION:=0.1.0 PKG_RELEASE:=1 -PKG_MD5SUM:=5539f4e1f44879d5a9afae7d75a96112 +PKG_MD5SUM:=e091371a9e714098a4c04a6e3daeb56a PKG_NAME:=php5-pecl-$(PECL_NAME) PKG_SOURCE:=$(PECL_NAME)-$(PKG_VERSION).tgz @@ -27,5 +27,5 @@ include ../php5/pecl.mk CONFIGURE_ARGS+= --with-libevent=shared,"$(STAGING_DIR)/usr" -$(eval $(call PECLPackage,$(PECL_NAME),$(PECL_LONGNAME),+libevent)) +$(eval $(call PECLPackage,$(PECL_NAME),$(PECL_LONGNAME),+libevent2)) $(eval $(call BuildPackage,$(PKG_NAME))) diff --git a/lang/php5-pecl-libevent/patches/100-openwrt-libevent-include.patch b/lang/php5-pecl-libevent/patches/100-openwrt-libevent-include.patch deleted file mode 100644 index aef038e..000 --- a/lang/php5-pecl-libevent/patches/100-openwrt-libevent-include.patch +++ /dev/null @@ -1,20 +0,0 @@ a/config.m4 -+++ b/config.m4 -@@ -5,7 +5,7 @@ PHP_ARG_WITH(libevent, for libevent supp - - if test "$PHP_LIBEVENT" != "no"; then - SEARCH_PATH="/usr /usr/local" -- SEARCH_FOR="/include/event.h" -+ SEARCH_FOR="/include/libevent/event.h" - - if test "$PHP_LIBEVENT" = "yes"; then - AC_MSG_CHECKING([for libevent headers in default path]) -@@ -28,7 +28,7 @@ if test "$PHP_LIBEVENT" != "no"; then - AC_MSG_ERROR([Cannot find libevent headers]) - fi - -- PHP_ADD_INCLUDE($LIBEVENT_DIR/include) -+ PHP_ADD_INCLUDE($LIBEVENT_DIR/include/libevent) - - LIBNAME=event - LIBSYMBOL=event_base_new diff --git a/lang/php5-pecl-libevent/patches/101-openwrt-libevent-libdir.patch b/lang/php5-pecl-libevent/patches/101-openwrt-libevent-libdir.patch deleted file mode 100644 index e6c2835..000 --- a/lang/php5-pecl-libevent/patches/101-openwrt-libevent-libdir.patch +++ /dev/null @@ -1,13 +0,0 @@ a/config.m4 -+++ b/config.m4 -@@ -33,9 +33,7 @@ if test "$PHP_LIBEVENT" != "no"; then - LIBNAME=event - LIBSYMBOL=event_base_new - -- if test "x$PHP_LIBDIR" = "x"; then --PHP_LIBDIR=lib -- fi -+ PHP_LIBDIR=lib/libevent - - PHP_CHECK_LIBRARY($LIBNAME,$LIBSYMBOL, - [ -- 1.7.10.4 ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCHv3 2/2] imx23: Add target for i.MX23
Here too, I would factor out the stuff touching the already existing kernel/modules makefiles and then adding the imx23 stuff on top. Just my 2ct's, BR, Michael ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCHv3 1/2] [tools]: Add tools support for i.MX23
Am Donnerstag, 23. Mai 2013, 13:39:31 schrieb Zoltan HERPAI: > Adding tools support for booting up an i.MX23-based board via bootlets. > Index: package/imx-bootlets > ... > Index: tools/elftosb/ I would prefer this patch splitted into two parts: first one adding imx-bootlets, second one the remaining elftosb stuff. Is simpler for reviewer. BR, Michael ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH] [RFC] imx61: add support for i.MX6 target
Hi, > +ARCH:=arm > +BOARD:=imx61 I'm working on patches to add support for Freescale i.MX28 based boards, not yet published, but I've choosen BOARD:=mxs This is like the kernel already does in arm/mach-mxs. Does it make sense for you to choose BOARD:=imx ? (i.MX61 is mach-imx I guess) BR, Michael ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [RFC] Patch for invoking (pre)init
Hi devs,
could anybody explain the idea behind the patch
target/linux/generic/patches-3.9/921-use_preinit_as_init.patch ?
The current patch drops all references to the "standard init locations" and only
use /etc/preinit.
I would like to have the ability to use the same kernel tree with other
distributions, too (yeah, shame on me - but some customers have asked for
Debain... :-)
So I would propose to replace this patch with the following. It looks for
OpenWRT's
preinit at first and if this script does not exist, the standard init locations
were
tried as usual.
I did not tried the patch yet.
Want do you think? Do I miss anything?
BR, Michael
--- a/init/main.c
+++ b/init/main.c
@@ -835,7 +835,8 @@ static int __ref kernel_init(void *unuse
printk(KERN_WARNING "Failed to execute %s. Attempting "
"defaults...\n", execute_command);
}
- if (!run_init_process("/sbin/init") ||
+ if (!run_init_process("/etc/preinit") ||
+ !run_init_process("/sbin/init") ||
!run_init_process("/etc/init") ||
!run_init_process("/bin/init") ||
!run_init_process("/bin/sh"))
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] openvpn/uhttpd: drop private section_enabled and append_{bool, string} functions in favour of the new globally available ones
Signed-off-by: Michael Heimpold
---
package/network/services/openvpn/Makefile |4 +-
.../network/services/openvpn/files/openvpn.init|6 ---
package/network/services/uhttpd/Makefile |4 +-
package/network/services/uhttpd/files/uhttpd.init | 56 ++--
4 files changed, 21 insertions(+), 49 deletions(-)
diff --git a/package/network/services/openvpn/Makefile
b/package/network/services/openvpn/Makefile
index d0ba233..01c18ac 100644
--- a/package/network/services/openvpn/Makefile
+++ b/package/network/services/openvpn/Makefile
@@ -1,5 +1,5 @@
#
-# Copyright (C) 2010-2012 OpenWrt.org
+# Copyright (C) 2010-2013 OpenWrt.org
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=openvpn
PKG_VERSION:=2.3.0
-PKG_RELEASE=1
+PKG_RELEASE=2
PKG_SOURCE_URL:=http://swupdate.openvpn.net/community/releases
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
diff --git a/package/network/services/openvpn/files/openvpn.init
b/package/network/services/openvpn/files/openvpn.init
index c58f005..3b1f352 100644
--- a/package/network/services/openvpn/files/openvpn.init
+++ b/package/network/services/openvpn/files/openvpn.init
@@ -45,12 +45,6 @@ append_params() {
done
}
-section_enabled() {
- config_get_bool enable "$1" 'enable' 0
- config_get_bool enabled "$1" 'enabled' 0
- [ $enable -gt 0 ] || [ $enabled -gt 0 ]
-}
-
start_instance() {
local s="$1"
diff --git a/package/network/services/uhttpd/Makefile
b/package/network/services/uhttpd/Makefile
index f03ecc4..53597a5 100644
--- a/package/network/services/uhttpd/Makefile
+++ b/package/network/services/uhttpd/Makefile
@@ -1,5 +1,5 @@
#
-# Copyright (C) 2010-2012 Jo-Philipp Wich
+# Copyright (C) 2010-2013 Jo-Philipp Wich
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
@@ -8,7 +8,7 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=uhttpd
-PKG_VERSION:=2013-01-22
+PKG_VERSION:=2013-02-19
PKG_RELEASE=$(PKG_SOURCE_VERSION)
PKG_SOURCE_PROTO:=git
diff --git a/package/network/services/uhttpd/files/uhttpd.init
b/package/network/services/uhttpd/files/uhttpd.init
index ad46d2c..6b499ed 100755
--- a/package/network/services/uhttpd/files/uhttpd.init
+++ b/package/network/services/uhttpd/files/uhttpd.init
@@ -9,28 +9,6 @@ SERVICE_WRITE_PID=1
UHTTPD_BIN="/usr/sbin/uhttpd"
PX5G_BIN="/usr/sbin/px5g"
-append_arg() {
- local cfg="$1"
- local var="$2"
- local opt="$3"
- local def="$4"
- local val
-
- config_get val "$cfg" "$var"
- [ -n "$val" -o -n "$def" ] && append UHTTPD_ARGS "$opt ${val:-$def}"
-}
-
-append_bool() {
- local cfg="$1"
- local var="$2"
- local opt="$3"
- local def="$4"
- local val
-
- config_get_bool val "$cfg" "$var" "$def"
- [ "$val" = 1 ] && append UHTTPD_ARGS "$opt"
-}
-
generate_keys() {
local cfg="$1"
local key="$2"
@@ -61,21 +39,21 @@ start_instance()
local realm="$(uci_get system.@system[0].hostname)"
local listen http https interpreter indexes path
- append_arg "$cfg" home "-h"
- append_arg "$cfg" realm "-r" "${realm:-OpenWrt}"
- append_arg "$cfg" config "-c"
- append_arg "$cfg" cgi_prefix "-x"
- append_arg "$cfg" lua_prefix "-l"
- append_arg "$cfg" lua_handler "-L"
- append_arg "$cfg" script_timeout "-t"
- append_arg "$cfg" network_timeout "-T"
- append_arg "$cfg" tcp_keepalive "-A"
- append_arg "$cfg" error_page "-E"
- append_arg "$cfg" max_requests "-n" 3
-
- append_bool "$cfg" no_symlinks "-S" 0
- append_bool "$cfg" no_dirlists "-D" 0
- append_bool "$cfg" rfc1918_filter "-R" 0
+ append_string UHTTPD_ARGS "$cfg" home "-h"
+ append_string UHTTPD_ARGS "$cfg" realm "-r" "${realm:-OpenWrt}"
+ append_string UHTTPD_ARGS "$cfg" config "-c"
+ append_string UHTTPD_ARGS "$cfg" cgi_prefix "-x"
+ append_string UHTTPD_ARGS "$cfg" lua_prefix "-l"
+ append_string UHTTPD_ARGS "$cfg" lua_handler "-L"
+ append_string UHTTPD_ARGS "$cfg" script_time
[OpenWrt-Devel] [PATCH v2] Provide global section_enabled, append_bool and append_string functions
Since various packages implement such functions already on their own,
it seems reasonable to provide these in globally available functions.
Signed-off-by: Michael Heimpold
---
package/base-files/files/lib/functions.sh | 31 +
1 file changed, 31 insertions(+)
diff --git a/package/base-files/files/lib/functions.sh
b/package/base-files/files/lib/functions.sh
index f51bfea..4555f62 100755
--- a/package/base-files/files/lib/functions.sh
+++ b/package/base-files/files/lib/functions.sh
@@ -29,6 +29,30 @@ append() {
eval "export ${NO_EXPORT:+-n} --
\"$var=\${$var:+\${$var}\${value:+\$sep}}\$value\""
}
+append_bool() {
+ local env="$1"
+ local cfg="$2"
+ local var="$3"
+ local opt="$4"
+ local def="$5"
+ local val
+
+ config_get_bool val "$cfg" "$var" "$def"
+ [ "$val" -gt 0 ] && append "$env" "$opt"
+}
+
+append_string() {
+ local env="$1"
+ local cfg="$2"
+ local var="$3"
+ local opt="$4"
+ local def="$5"
+ local val
+
+ config_get val "$cfg" "$var"
+ [ -n "$val" -o -n "$def" ] && append "$env" "$opt ${val:-$def}"
+}
+
list_contains() {
local var="$1"
local str="$2"
@@ -203,6 +227,13 @@ config_list_foreach() {
done
}
+section_enabled() {
+ local enable enabled
+ config_get_bool enable "$1" 'enable' 0
+ config_get_bool enabled "$1" 'enabled' 0
+ [ $enable -gt 0 -o $enabled -gt 0 ]
+}
+
load_modules() {
[ -d /etc/modules.d ] && {
cd /etc/modules.d
--
1.7.9.5
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH 09/13] Migrate cobalt platform to common led helper functions
Signed-off-by: Michael Heimpold
---
target/linux/cobalt/base-files/etc/diag.sh | 27 ---
1 file changed, 12 insertions(+), 15 deletions(-)
diff --git a/target/linux/cobalt/base-files/etc/diag.sh
b/target/linux/cobalt/base-files/etc/diag.sh
index 070c218..6084985 100644
--- a/target/linux/cobalt/base-files/etc/diag.sh
+++ b/target/linux/cobalt/base-files/etc/diag.sh
@@ -1,20 +1,17 @@
#!/bin/sh
-# Copyright (C) 2009-2011 OpenWrt.org
+# Copyright (C) 2009-2013 OpenWrt.org
-front_led=/sys/class/leds/qube::front
+. /lib/functions/leds.sh
+
+status_led="qube::front"
set_state() {
-case "$1" in
-preinit)
-[ -d $front_led ] && {
-echo none > $front_led/trigger
-echo 255 > $front_led/brightness
-}
-;;
-done)
-[ -d $front_led ] && {
- echo 0 > $front_led/brightness
-}
-;;
-esac
+ case "$1" in
+ preinit)
+ status_led_on
+ ;;
+ done)
+ status_led_off
+ ;;
+ esac
}
--
1.7.9.5
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH 11/13] Migrate ramips platform to common led helper functions
Signed-off-by: Michael Heimpold
---
target/linux/ramips/base-files/etc/diag.sh | 28 ++--
1 file changed, 2 insertions(+), 26 deletions(-)
diff --git a/target/linux/ramips/base-files/etc/diag.sh
b/target/linux/ramips/base-files/etc/diag.sh
index eaa28e1..873a641 100755
--- a/target/linux/ramips/base-files/etc/diag.sh
+++ b/target/linux/ramips/base-files/etc/diag.sh
@@ -1,33 +1,9 @@
#!/bin/sh
-#
-# Copyright (C) 2010 OpenWrt.org
-#
-#
+# Copyright (C) 2010-2013 OpenWrt.org
+. /lib/functions/leds.sh
. /lib/ramips.sh
-status_led=""
-
-led_set_attr() {
- [ -f "/sys/class/leds/$1/$2" ] && echo "$3" > "/sys/class/leds/$1/$2"
-}
-
-status_led_set_timer() {
- led_set_attr $status_led "trigger" "timer"
- led_set_attr $status_led "delay_on" "$1"
- led_set_attr $status_led "delay_off" "$2"
-}
-
-status_led_on() {
- led_set_attr $status_led "trigger" "none"
- led_set_attr $status_led "brightness" 255
-}
-
-status_led_off() {
- led_set_attr $status_led "trigger" "none"
- led_set_attr $status_led "brightness" 0
-}
-
get_status_led() {
case $(ramips_board_name) in
3g-6200n)
--
1.7.9.5
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH 12/13] Migrate rb532 platform to common led helper functions
Signed-off-by: Michael Heimpold
---
target/linux/rb532/base-files/etc/diag.sh | 18 --
1 file changed, 8 insertions(+), 10 deletions(-)
diff --git a/target/linux/rb532/base-files/etc/diag.sh
b/target/linux/rb532/base-files/etc/diag.sh
index d8f9a88..482b8e9 100644
--- a/target/linux/rb532/base-files/etc/diag.sh
+++ b/target/linux/rb532/base-files/etc/diag.sh
@@ -1,19 +1,17 @@
#!/bin/sh
-# Copyright (C) 2007 OpenWrt.org
+# Copyright (C) 2007-2013 OpenWrt.org
-set_led() {
- local led="$1"
- local state="$2"
- [ -d "/sys/class/leds/rb500led:$led" ] && echo "$state" >
"/sys/class/leds/rb500led:$led/brightness"
-}
+. /lib/functions/leds.sh
+
+status_led="rb500led:amber"
set_state() {
case "$1" in
- preinit)
- set_led amber 1
+ preinit)
+ status_led_on
;;
- done)
- set_led amber 0
+ done)
+ status_led_off
;;
esac
}
--
1.7.9.5
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH 07/13] Migrate brcm63xx platform to common led helper functions
Signed-off-by: Michael Heimpold
---
target/linux/brcm63xx/base-files/etc/diag.sh | 51 +-
1 file changed, 2 insertions(+), 49 deletions(-)
diff --git a/target/linux/brcm63xx/base-files/etc/diag.sh
b/target/linux/brcm63xx/base-files/etc/diag.sh
index d492cd5..a03f89d 100755
--- a/target/linux/brcm63xx/base-files/etc/diag.sh
+++ b/target/linux/brcm63xx/base-files/etc/diag.sh
@@ -1,60 +1,13 @@
#!/bin/sh
-#
-# Copyright (C) 2007 OpenWrt.org
-#
-#
+# Copyright (C) 2007-2013 OpenWrt.org
+. /lib/functions/leds.sh
. /lib/brcm63xx.sh
-led_set_attr() {
- [ -f "/sys/class/leds/$1/$2" ] && echo "$3" > "/sys/class/leds/$1/$2"
-}
-
-status_led_set_timer() {
- led_set_attr $status_led "trigger" "timer"
- led_set_attr $status_led "delay_on" "$1"
- led_set_attr $status_led "delay_off" "$2"
- [ -n "$status_led2" ] && {
- led_set_attr $status_led2 "trigger" "timer"
- led_set_attr $status_led2 "delay_on" "$1"
- led_set_attr $status_led2 "delay_off" "$2"
- }
-}
-
-status_led_set_morse() {
- led_set_attr $status_led "trigger" "morse"
- led_set_attr $status_led "delay" "$1"
- led_set_attr $status_led "message" "$2"
- [ -n "$status_led2" ] && {
- led_set_attr $status_led2 "trigger" "morse"
- led_set_attr $status_led2 "delay" "$1"
- led_set_attr $status_led2 "message" "$2"
- }
-}
-
-status_led_on() {
- led_set_attr $status_led "trigger" "none"
- led_set_attr $status_led "brightness" 255
- [ -n "$status_led2" ] && {
- led_set_attr $status_led2 "trigger" "none"
- led_set_attr $status_led2 "brightness" 255
- }
-}
-
-status_led_off() {
- led_set_attr $status_led "trigger" "none"
- led_set_attr $status_led "brightness" 0
- [ -n "$status_led2" ] && {
- led_set_attr $status_led2 "trigger" "none"
- led_set_attr $status_led2 "brightness" 0
- }
-}
-
set_state() {
case "$1" in
preinit)
insmod leds-gpio
- status_led_on
status_led_set_timer 200 200
;;
failsafe)
--
1.7.9.5
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH 03/13] Migrate ar7 platform to common led helper functions
Signed-off-by: Michael Heimpold
---
target/linux/ar7/base-files/etc/diag.sh | 60 ++-
1 file changed, 27 insertions(+), 33 deletions(-)
diff --git a/target/linux/ar7/base-files/etc/diag.sh
b/target/linux/ar7/base-files/etc/diag.sh
index 25ec899..37eed6a 100644
--- a/target/linux/ar7/base-files/etc/diag.sh
+++ b/target/linux/ar7/base-files/etc/diag.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2007-2012 OpenWrt.org
+# Copyright (C) 2007-2013 OpenWrt.org
# This setup gives us 4.5 distinguishable states:
#
@@ -12,37 +12,31 @@
# (1-LED) Heartbeat:normal operation
# (2-LED) Solid GREEN: normal operation
+. /lib/functions/leds.sh
+
+get_status_led() {
+ [ -d "/sys/class/leds/status" ] && status_led="status"
+ [ -d "/sys/class/leds/power:green" ] && status_led="power:green"
+}
+
set_state() {
-case "$1" in
-preinit)
-[ -d /sys/class/leds/status ] && {
-echo timer >/sys/class/leds/status/trigger
-echo 100 >/sys/class/leds/status/delay_on
-echo 100 >/sys/class/leds/status/delay_off
-:; } || [ -d /sys/class/leds/power\:green ] && {
-echo timer
>/sys/class/leds/power\:green/trigger
-echo 100 >/sys/class/leds/power\:green/delay_on
-echo 100
>/sys/class/leds/power\:green/delay_off
-}
-;;
-failsafe)
-[ -d /sys/class/leds/status ] && {
-echo timer >/sys/class/leds/status/trigger
-echo 50 >/sys/class/leds/status/delay_on
-echo 50 >/sys/class/leds/status/delay_off
-:; } || [ -d /sys/class/leds/power\:green ] && {
-echo timer
>/sys/class/leds/power\:green/trigger
-echo 50 >/sys/class/leds/power\:green/delay_on
-echo 50 >/sys/class/leds/power\:green/delay_off
-}
-;;
-done)
-[ -d /sys/class/leds/status ] && {
-echo heartbeat >/sys/class/leds/status/trigger
-:; } || [ -d /sys/class/leds/power\:green ] && {
-echo default-on
>/sys/class/leds/power\:green/trigger
-echo none >/sys/class/leds/power\:red/trigger
-}
-;;
-esac
+ get_status_led
+
+ case "$1" in
+ preinit)
+ status_led_set_timer 100 100
+ ;;
+ failsafe)
+ status_led_set_timer 50 50
+ ;;
+ done)
+ [ "$status_led" = "status" ] && {
+ status_led_set_heartbeat
+ }
+ [ "$status_led" = "power:green" ] && {
+ status_led_set_on
+ led_off "power:red"
+ }
+ ;;
+ esac
}
--
1.7.9.5
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH 02/13] Migrate adm5120 platform to common led helper functions
Signed-off-by: Michael Heimpold
---
target/linux/adm5120/base-files/etc/diag.sh | 32 ++-
1 file changed, 2 insertions(+), 30 deletions(-)
diff --git a/target/linux/adm5120/base-files/etc/diag.sh
b/target/linux/adm5120/base-files/etc/diag.sh
index 3a66dfc..bc49260 100755
--- a/target/linux/adm5120/base-files/etc/diag.sh
+++ b/target/linux/adm5120/base-files/etc/diag.sh
@@ -1,37 +1,9 @@
#!/bin/sh
-#
-# Copyright (C) 2007 OpenWrt.org
-#
-#
+# Copyright (C) 2007-2013 OpenWrt.org
+. /lib/functions/leds.sh
. /lib/adm5120.sh
-led_set_attr() {
- [ -f "/sys/class/leds/$1/$2" ] && echo "$3" > "/sys/class/leds/$1/$2"
-}
-
-status_led_set_timer() {
- led_set_attr $status_led "trigger" "timer"
- led_set_attr $status_led "delay_on" "$1"
- led_set_attr $status_led "delay_off" "$2"
-}
-
-status_led_set_morse() {
- led_set_attr $status_led "trigger" "morse"
- led_set_attr $status_led "delay" "$1"
- led_set_attr $status_led "message" "$2"
-}
-
-status_led_on() {
- led_set_attr $status_led "trigger" "none"
- led_set_attr $status_led "brightness" 255
-}
-
-status_led_off() {
- led_set_attr $status_led "trigger" "none"
- led_set_attr $status_led "brightness" 0
-}
-
set_state() {
case "$1" in
preinit)
--
1.7.9.5
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH 04/13] Migrate ar71xx platform to common led helper functions
Signed-off-by: Michael Heimpold
---
target/linux/ar71xx/base-files/etc/diag.sh | 30 +++-
1 file changed, 3 insertions(+), 27 deletions(-)
diff --git a/target/linux/ar71xx/base-files/etc/diag.sh
b/target/linux/ar71xx/base-files/etc/diag.sh
index 4cfb49b..50ca4b1 100755
--- a/target/linux/ar71xx/base-files/etc/diag.sh
+++ b/target/linux/ar71xx/base-files/etc/diag.sh
@@ -1,33 +1,9 @@
#!/bin/sh
-#
-# Copyright (C) 2009 OpenWrt.org
-#
-#
+# Copyright (C) 2009-2013 OpenWrt.org
+. /lib/functions/leds.sh
. /lib/ar71xx.sh
-status_led=""
-
-led_set_attr() {
- [ -f "/sys/class/leds/$1/$2" ] && echo "$3" > "/sys/class/leds/$1/$2"
-}
-
-status_led_set_timer() {
- led_set_attr $status_led "trigger" "timer"
- led_set_attr $status_led "delay_on" "$1"
- led_set_attr $status_led "delay_off" "$2"
-}
-
-status_led_on() {
- led_set_attr $status_led "trigger" "none"
- led_set_attr $status_led "brightness" 255
-}
-
-status_led_off() {
- led_set_attr $status_led "trigger" "none"
- led_set_attr $status_led "brightness" 0
-}
-
get_status_led() {
case $(ar71xx_board_name) in
alfa-nx)
@@ -200,7 +176,7 @@ get_status_led() {
zcn-1523h-2 | zcn-1523h-5)
status_led="zcn-1523h:amber:init"
;;
- esac;
+ esac
}
set_state() {
--
1.7.9.5
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH 10/13] Migrate lantiq platform to common led helper functions
Signed-off-by: Michael Heimpold
---
target/linux/lantiq/base-files/etc/diag.sh | 41
1 file changed, 12 insertions(+), 29 deletions(-)
diff --git a/target/linux/lantiq/base-files/etc/diag.sh
b/target/linux/lantiq/base-files/etc/diag.sh
index d0088f5..4904f55 100644
--- a/target/linux/lantiq/base-files/etc/diag.sh
+++ b/target/linux/lantiq/base-files/etc/diag.sh
@@ -1,42 +1,25 @@
#!/bin/sh
-# Copyright (C) 2012 OpenWrt.org
+# Copyright (C) 2012-2013 OpenWrt.org
-[ -d /sys/class/leds/power/ ] || return
+. /lib/functions/leds.sh
-set_state() {
- [ -d /sys/class/leds/power1/ ] && {
-
- case "$1" in
- preinit)
- echo heartbeat >/sys/class/leds/power/trigger
- ;;
- failsafe)
- echo none >/sys/class/leds/power/trigger
- echo timer >/sys/class/leds/power1/trigger
- echo 100 >/sys/class/leds/power1/delay_on
- echo 100 >/sys/class/leds/power1/delay_off
- ;;
- done)
- echo none >/sys/class/leds/power/trigger
- echo none >/sys/class/leds/power1/trigger
- echo 1 >/sys/class/leds/power/brightness
- ;;
- esac
- return
- }
+status_led="power"
+set_state() {
case "$1" in
preinit)
- echo heartbeat >/sys/class/leds/power/trigger
+ status_led_set_heartbeat
;;
failsafe)
- echo timer >/sys/class/leds/power/trigger
- echo 100 >/sys/class/leds/power/delay_on
- echo 100 >/sys/class/leds/power/delay_off
+ [ -d /sys/class/leds/power1 ] && {
+ status_led_off
+ led_timer "power1" 100 100
+ :
+ } || status_led_set_timer 100 100
;;
done)
- echo none >/sys/class/leds/power/trigger
- echo 1 >/sys/class/leds/power/brightness
+ status_led_on
+ led_off "power1"
;;
esac
}
--
1.7.9.5
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH 08/13] Migrate cns21xx platform to common led helper functions
Signed-off-by: Michael Heimpold
---
target/linux/cns21xx/base-files/etc/diag.sh | 28 ++-
1 file changed, 2 insertions(+), 26 deletions(-)
diff --git a/target/linux/cns21xx/base-files/etc/diag.sh
b/target/linux/cns21xx/base-files/etc/diag.sh
index 3fb8352..db5cb35 100755
--- a/target/linux/cns21xx/base-files/etc/diag.sh
+++ b/target/linux/cns21xx/base-files/etc/diag.sh
@@ -1,33 +1,9 @@
#!/bin/sh
-#
-# Copyright (C) 2010 OpenWrt.org
-#
-#
+# Copyright (C) 2010-2013 OpenWrt.org
+. /lib/functions/leds.sh
. /lib/cns21xx.sh
-status_led=""
-
-led_set_attr() {
- [ -f "/sys/class/leds/$1/$2" ] && echo "$3" > "/sys/class/leds/$1/$2"
-}
-
-status_led_set_timer() {
- led_set_attr $status_led "trigger" "timer"
- led_set_attr $status_led "delay_on" "$1"
- led_set_attr $status_led "delay_off" "$2"
-}
-
-status_led_on() {
- led_set_attr $status_led "trigger" "none"
- led_set_attr $status_led "brightness" 255
-}
-
-status_led_off() {
- led_set_attr $status_led "trigger" "none"
- led_set_attr $status_led "brightness" 0
-}
-
get_status_led() {
case $(get_board_name) in
ns-k330)
--
1.7.9.5
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH 13/13] Migrate rdc to common led helper functions
Signed-off-by: Michael Heimpold
---
target/linux/x86/rdc/base-files/etc/diag.sh | 18 --
1 file changed, 8 insertions(+), 10 deletions(-)
diff --git a/target/linux/x86/rdc/base-files/etc/diag.sh
b/target/linux/x86/rdc/base-files/etc/diag.sh
index 8d5c382..03796d7 100644
--- a/target/linux/x86/rdc/base-files/etc/diag.sh
+++ b/target/linux/x86/rdc/base-files/etc/diag.sh
@@ -1,19 +1,17 @@
#!/bin/sh
-# Copyright (C) 2007 OpenWrt.org
+# Copyright (C) 2007-2013 OpenWrt.org
-set_led() {
- local led="$1"
- local state="$2"
- [ -d "/sys/class/leds/rdc321x:$led" ] && echo "$state" >
"/sys/class/leds/rdc321x:$led/brightness"
-}
+. /lib/functions/leds.sh
+
+status_led="rdc321x:dmz"
set_state() {
case "$1" in
- preinit)
- set_led dmz 1
+ preinit)
+ status_led_on
;;
- done)
- set_led dmz 0
+ done)
+ status_led_off
;;
esac
}
--
1.7.9.5
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH 06/13] Trivial: fix whitespace to match coding style of other instances
Signed-off-by: Michael Heimpold
---
target/linux/brcm47xx/base-files/etc/diag.sh | 24
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/target/linux/brcm47xx/base-files/etc/diag.sh
b/target/linux/brcm47xx/base-files/etc/diag.sh
index 3b08554..8fb3f48 100644
--- a/target/linux/brcm47xx/base-files/etc/diag.sh
+++ b/target/linux/brcm47xx/base-files/etc/diag.sh
@@ -9,20 +9,20 @@ set_led() {
set_state() {
case "$1" in
- preinit)
- set_led dmz 1
- set_led diag 1
- set_led power 0
+ preinit)
+ set_led dmz 1
+ set_led diag 1
+ set_led power 0
;;
- failsafe)
- set_led diag f
- set_led power f
- set_led dmz f
+ failsafe)
+ set_led diag f
+ set_led power f
+ set_led dmz f
;;
- done)
- set_led dmz 0
- set_led diag 0
- set_led power 1
+ done)
+ set_led dmz 0
+ set_led diag 0
+ set_led power 1
;;
esac
}
--
1.7.9.5
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH 05/13] Migrate au1000 platform to common led helper functions
Signed-off-by: Michael Heimpold
---
target/linux/au1000/base-files/etc/diag.sh | 26 +++---
1 file changed, 11 insertions(+), 15 deletions(-)
diff --git a/target/linux/au1000/base-files/etc/diag.sh
b/target/linux/au1000/base-files/etc/diag.sh
index d974615..65e3011 100644
--- a/target/linux/au1000/base-files/etc/diag.sh
+++ b/target/linux/au1000/base-files/etc/diag.sh
@@ -1,25 +1,21 @@
#!/bin/sh
-# Copyright (C) 2007 OpenWrt.org
+# Copyright (C) 2007-2013 OpenWrt.org
-set_led() {
- local led="$1"
- local state="$2"
- [ -d "/sys/class/leds/mtx1:$led" ] && echo "$state" >
"/sys/class/leds/mtx1:$led/brightness"
-}
+. /lib/functions/leds.sh
set_state() {
case "$1" in
- preinit)
- set_led green 0
- set_led red 1
+ preinit)
+ led_off "mtx1:green"
+ led_on "mtx1:red"
;;
- failsafe)
- set_led green 1
- set_led red 1
+ failsafe)
+ led_on "mtx1:green"
+ led_on "mtx1:red"
;;
- done)
- set_led green 1
- set_led red 0
+ done)
+ led_on "mtx1:green"
+ led_off "mtx1:red"
;;
esac
}
--
1.7.9.5
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH 01/13] Introduce commonly used helper functions for setting leds
Currently, most platforms define such helpers in their own diag.sh
implementation with almost identical code. By factoring out the
common ground it's possible to simplify maintainability and
homogenize the haptics over multiple platforms (so far as is
reasonably practicable, in a next step).
Signed-off-by: Michael Heimpold
---
package/base-files/files/lib/functions/leds.sh | 49
1 file changed, 49 insertions(+)
create mode 100644 package/base-files/files/lib/functions/leds.sh
diff --git a/package/base-files/files/lib/functions/leds.sh
b/package/base-files/files/lib/functions/leds.sh
new file mode 100644
index 000..e591908
--- /dev/null
+++ b/package/base-files/files/lib/functions/leds.sh
@@ -0,0 +1,49 @@
+#!/bin/sh
+# Copyright (C) 2013 OpenWrt.org
+
+led_set_attr() {
+ [ -f "/sys/class/leds/$1/$2" ] && echo "$3" > "/sys/class/leds/$1/$2"
+}
+
+led_timer() {
+ led_set_attr $1 "trigger" "timer"
+ led_set_attr $1 "delay_on" "$1"
+ led_set_attr $1 "delay_off" "$2"
+}
+
+led_on() {
+ led_set_attr $1 "trigger" "none"
+ led_set_attr $1 "brightness" 255
+}
+
+led_off() {
+ led_set_attr $1 "trigger" "none"
+ led_set_attr $1 "brightness" 0
+}
+
+status_led_set_timer() {
+ led_timer $status_led "$1" "$2"
+ [ -n "$status_led2" ] && led_timer $status_led2 "$1" "$2"
+}
+
+status_led_set_heartbeat() {
+ led_set_attr $status_led "trigger" "heartbeat"
+}
+
+status_led_on() {
+ led_on $status_led
+ [ -n "$status_led2" ] && led_on $status_led2
+}
+
+status_led_off() {
+ led_off $status_led
+ [ -n "$status_led2" ] && led_off $status_led2
+}
+
+status_led_blink_slow() {
+ led_timer $status_led 1000 1000
+}
+
+status_led_blink_fast() {
+ led_timer $status_led 100 100
+}
--
1.7.9.5
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] Minor cosmetic corrections for functions.sh - update copyright header - remove superfluous shebang left-over from changeset 34794 - unify function declaration
Signed-off-by: Michael Heimpold
---
package/base-files/files/lib/functions.sh |8 ++--
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/package/base-files/files/lib/functions.sh
b/package/base-files/files/lib/functions.sh
index a488f4d..ac188f2 100755
--- a/package/base-files/files/lib/functions.sh
+++ b/package/base-files/files/lib/functions.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2006-2011 OpenWrt.org
+# Copyright (C) 2006-2013 OpenWrt.org
# Copyright (C) 2006 Fokus Fraunhofer
@@ -406,10 +406,6 @@ pi_include() {
return 0
}
-#!/bin/sh
-# Copyright (C) 2006-2010 OpenWrt.org
-# Copyright (C) 2010 Vertical Communications
-
boot_hook_splice_start() {
export -n PI_HOOK_SPLICE=1
}
@@ -472,7 +468,7 @@ boot_run_hook() {
done
}
-jffs2_ready () {
+jffs2_ready() {
mtdpart="$(find_mtd_part rootfs_data)"
[ -z "$mtdpart" ] && return 1
magic=$(hexdump $mtdpart -n 4 -e '4/1 "%02x"')
--
1.7.9.5
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH] Improve generated ext4 images
Am Mittwoch, 29. August 2012, 07:01:43 schrieb Imre Kaloz: > NAK. Journaling is disabled on purpose, as it wears out flash based > devices faster. This is true. Actually, I use ext4 on eMMC flash device. Linux kernel modells this a block device, so this is the first mistake IMHO. What would be the better solution when I need a rw filesystem which can handle power outages smoothly? BR, mhei ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] Improve generated ext4 images
Currently none of valuable ext4 features are used when ext4 image generation is selected, most notably the journaling function is missing. This patch enables the journaling feature and optimizes the directories in the created filesystem afterwards. Signed-off-by: Michael Heimpold --- include/image.mk |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/image.mk b/include/image.mk index 1977fc8..d3cd5f1 100644 --- a/include/image.mk +++ b/include/image.mk @@ -126,9 +126,9 @@ ifneq ($(CONFIG_TARGET_ROOTFS_EXT4FS),) # generate an ext2 fs $(STAGING_DIR_HOST)/bin/genext2fs -U -b $(E2SIZE) -N $(CONFIG_TARGET_ROOTFS_MAXINODE) -d $(TARGET_DIR)/ $(KDIR)/root.ext4 # convert it to ext4 - $(STAGING_DIR_HOST)/bin/tune2fs -O extents,uninit_bg,dir_index $(KDIR)/root.ext4 + $(STAGING_DIR_HOST)/bin/tune2fs -o journal_data -O extents,uninit_bg,dir_index,has_journal $(KDIR)/root.ext4 # fix it up - $(STAGING_DIR_HOST)/bin/e2fsck -fy $(KDIR)/root.ext4 + $(STAGING_DIR_HOST)/bin/e2fsck -fyD $(KDIR)/root.ext4 $(call Image/Build,ext4) endef endif -- 1.7.9.5 ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] base-files: release an attached loop device on umounting
Signed-off-by: Michael Heimpold
---
package/base-files/files/etc/init.d/umount |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/package/base-files/files/etc/init.d/umount
b/package/base-files/files/etc/init.d/umount
index a4e477e..5a750b9 100755
--- a/package/base-files/files/etc/init.d/umount
+++ b/package/base-files/files/etc/init.d/umount
@@ -4,5 +4,5 @@
STOP=99
stop() {
sync
- umount -a -r
+ umount -a -d -r
}
--
1.7.9.5
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [packages] new package: stm32flash - tool for flashing STM32 controllers
Signed-off-by: Michael Heimpold --- utils/stm32flash/Makefile | 40 1 file changed, 40 insertions(+) create mode 100644 utils/stm32flash/Makefile diff --git a/utils/stm32flash/Makefile b/utils/stm32flash/Makefile new file mode 100644 index 000..4779def --- /dev/null +++ b/utils/stm32flash/Makefile @@ -0,0 +1,40 @@ +# +# Copyright (C) 2012 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:=stm32flash +PKG_REV:=61 +PKG_VERSION:=r$(PKG_REV) +PKG_RELEASE:=1 + +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_SOURCE_URL:=http://stm32flash.googlecode.com/svn/trunk +PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) +PKG_SOURCE_VERSION:=$(PKG_REV) +PKG_SOURCE_PROTO:=svn + +include $(INCLUDE_DIR)/package.mk + +define Package/stm32flash + SECTION:=utils + CATEGORY:=Utilities + URL:=http://code.google.com/p/stm32flash/ + TITLE:=Firmware flash tool for STM32's serial bootloader +endef + +define Package/stm32flash/description + This tool can be used to burn firmware images to STM32 ARM processors + using the built-in serial bootloader. +endef + +define Package/stm32flash/install + $(INSTALL_DIR) $(1)/usr/bin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/stm32flash $(1)/usr/bin/ +endef + +$(eval $(call BuildPackage,stm32flash)) -- 1.7.9.5 ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [GIT PULL v2] Introduce php5 pecl packages
Hi Florian,
> Your pull request basically looks okay to me, I just have a couple comments:
>
> - can you create a dedicated branch, so I know I can safely pull from
> this branch
> - the patches in your tree don't have your signed-off-by tag, can you
> add it?
thanks for your comments. So here is the next trial.
The following changes since commit 0eb18dec38afd361e7a1cb5207a06b0b21cb82de:
Merge branch 'master' of git://nbd.name/packages.git into php5 (2012-04-21
12:25:50 +0200)
are available in the git repository at:
git://github.com/mhei/openwrt-packages.git php5
Michael Heimpold (10):
[packages] php5: Remove all patched-in pecl modules, prepare for
standalone pecl modules
[packages] Introduce php5-pecl-apc package
[packages] Introduce php5-pecl-bcompiler package
[packages] Introduce php5-pecl-dio package
[packages] Introduce php5-pecl-http package
[packages] Introduce php5-pecl-libevent package
[packages] php5-pecl-apc: upgrade to 3.1.10
[packages] php5-pecl-dio: upgrade to 0.0.5
[packages] php5-pecl-http: upgrade to 1.7.4
[packages] php5-pecl-libevent: upgrade to 0.0.5
lang/php5-pecl-apc/Makefile| 33 +
lang/php5-pecl-bcompiler/Makefile | 29 +
lang/php5-pecl-dio/Makefile| 29 +
.../patches/010-additional-baudrates.patch}|4 +-
lang/php5-pecl-http/Makefile | 34 +
lang/php5-pecl-libevent/Makefile | 31 +
lang/php5/Makefile | 40 +-
lang/php5/patches/005-APC.patch|22333 ---
lang/php5/patches/010-PECL-dio.patch | 3473 -
lang/php5/patches/020-PECL-add-libevent.patch | 1758 -
lang/php5/patches/030-PECL-add-http.patch |29802 -
.../php5/patches/900-prevent_buildconf_force.patch |70582
12 files changed, 162 insertions(+), 127986 deletions(-)
create mode 100644 lang/php5-pecl-apc/Makefile
create mode 100644 lang/php5-pecl-bcompiler/Makefile
create mode 100644 lang/php5-pecl-dio/Makefile
rename lang/{php5/patches/011-PECL-dio-additional-baudrates.patch =>
php5-pecl-dio/patches/010-additional-baudrates.patch} (91%)
create mode 100644 lang/php5-pecl-http/Makefile
create mode 100644 lang/php5-pecl-libevent/Makefile
delete mode 100644 lang/php5/patches/005-APC.patch
delete mode 100644 lang/php5/patches/010-PECL-dio.patch
delete mode 100644 lang/php5/patches/020-PECL-add-libevent.patch
delete mode 100644 lang/php5/patches/030-PECL-add-http.patch
delete mode 100644 lang/php5/patches/900-prevent_buildconf_force.patch
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [RFC PATCH] avahi: do not announce a specific front page
Announcing /index.html as frontpage is right when luci or x-wrt is installed as web gui since both applications come with an /index.html which redirect afterwards. However, when using an other front page, e.g. an /index.php then the announcement is wrong and results in a 404 Not Found. So I wonder/suggest whether the default avahi service could not announce such a specific frontpage but only the generic "top level" directory. Signed-off-by: Michael Heimpold Index: libs/avahi/files/service-http === --- libs/avahi/files/service-http (revision 31314) +++ libs/avahi/files/service-http (working copy) @@ -5,6 +5,6 @@ _http._tcp 80 - path=/index.html + path=/ ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] libconfig: install pkgconfig data in staging dir
And while at it, include all symlinks for the library file in the package.
Signed-off-by: Michael Heimpold
Index: libs/libconfig/Makefile
===
--- libs/libconfig/Makefile (revision 31296)
+++ libs/libconfig/Makefile (working copy)
@@ -9,7 +9,7 @@
PKG_NAME:=libconfig
PKG_VERSION:=1.4.8
-PKG_RELEASE:=1
+PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=http://www.hyperrealm.com/libconfig
@@ -49,11 +49,13 @@
$(CP) $(PKG_INSTALL_DIR)/usr/include/libconfig.h $(1)/usr/include/
$(INSTALL_DIR) $(1)/usr/lib
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libconfig.{a,so*} $(1)/usr/lib/
+ $(INSTALL_DIR) $(1)/usr/lib/pkgconfig
+ $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* $(1)/usr/lib/pkgconfig/
endef
define Package/libconfig/install
$(INSTALL_DIR) $(1)/usr/lib
- $(CP) $(PKG_INSTALL_DIR)/usr/lib/libconfig.so.* $(1)/usr/lib/
+ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libconfig.so* $(1)/usr/lib/
endef
$(eval $(call BuildPackage,libconfig))
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] packages: update libmicrohttpd to 0.9.19
Also include all library symlinks in the package. Signed-off-by: Michael Heimpold Index: libs/libmicrohttpd/Makefile === --- libs/libmicrohttpd/Makefile (revision 31285) +++ libs/libmicrohttpd/Makefile (working copy) @@ -1,5 +1,5 @@ # -# Copyright (C) 2011 OpenWrt.org +# Copyright (C) 2011-2012 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libmicrohttpd -PKG_VERSION:=0.4.4 +PKG_VERSION:=0.9.19 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=@GNU/libmicrohttpd -PKG_MD5SUM:=bcd61ebb10286379f55c7db9c79e0465 +PKG_MD5SUM:=0f4c55ba224ce75b3b993b558e072a6b PKG_FIXUP:=libtool PKG_INSTALL:=1 @@ -47,8 +47,7 @@ define Package/libmicrohttpd/install $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libmicrohttpd.so.* $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libmicrohttpd.so* $(1)/usr/lib/ endef $(eval $(call BuildPackage,libmicrohttpd)) - ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [packages] libmodbus: install/inlcude all symlinks in package
Signed-off-by: Michael Heimpold Index: libs/libmodbus/Makefile === --- libs/libmodbus/Makefile (revision 31285) +++ libs/libmodbus/Makefile (working copy) @@ -1,6 +1,6 @@ -# -# Copyright (C) 2006-2011 OpenWrt.org # +# Copyright (C) 2006-2012 OpenWrt.org +# # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. # @@ -9,7 +9,7 @@ PKG_NAME:=libmodbus PKG_VERSION:=3.0.2 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://github.com/downloads/stephane/libmodbus/ @@ -44,7 +44,7 @@ define Package/libmodbus/install $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libmodbus.so.* $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libmodbus.so* $(1)/usr/lib/ endef $(eval $(call BuildPackage,libmodbus)) ___ 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
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
Re: [OpenWrt-Devel] New AT91 boards, calling the maintainers
Hi, I would like to act as maintainer for tqma9263. This is a little System on Module which needs a carrier board to be useful. I was involved during the development of the TQMa9263 in my company. Actually only a few modules were sold and the development of such a carrier board is currently stalled due to other projects :-( My plan is to have my own (private) first carrier board in summer running with OpenWRT. I'd be happy to stay in contact. BR, Michael ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] packages: upgrade libconfig to 1.4.8
Signed-off-by: Michael Heimpold --- Index: Makefile === --- Makefile(revision 30618) +++ Makefile(working copy) @@ -1,5 +1,5 @@ # -# Copyright (C) 2008-2011 OpenWrt.org +# Copyright (C) 2008-2012 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libconfig -PKG_VERSION:=1.4.7 +PKG_VERSION:=1.4.8 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://www.hyperrealm.com/libconfig -PKG_MD5SUM:=d57da7a91aadbfd53afedb5c1bade5f4 +PKG_MD5SUM:=36788da452e9fcfc8efb7661ef5d31ef PKG_FIXUP:=libtool PKG_INSTALL:=1 ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] packages: update libmbus to 0.7.0
Signed-off-by: Michael Heimpold Index: libs/libmbus/Makefile === --- libs/libmbus/Makefile (revision 29908) +++ libs/libmbus/Makefile (working copy) @@ -1,5 +1,5 @@ # -# Copyright (C) 2011 OpenWrt.org +# Copyright (C) 2011-2012 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libmbus -PKG_VERSION:=0.6.1 +PKG_VERSION:=0.7.0 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://www.freescada.com/public-dist/ -PKG_MD5SUM:=842d13b14ad4a88f9d1b9f321725c802 +PKG_MD5SUM:=2f1a7ba0ccd683e6708364a13310a6d1 PKG_FIXUP:=libtool PKG_INSTALL:=1 ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH 2/6] [packages] Introduce php5-pecl-apc package
Signed-off-by: Michael Heimpold --- lang/php5-pecl-apc/Makefile | 33 + 1 files changed, 33 insertions(+), 0 deletions(-) diff --git a/lang/php5-pecl-apc/Makefile b/lang/php5-pecl-apc/Makefile new file mode 100644 index 000..fc2dac1 --- /dev/null +++ b/lang/php5-pecl-apc/Makefile @@ -0,0 +1,33 @@ +# +# Copyright (C) 2012 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk + +PECL_NAME:=APC +PECL_LONGNAME:=Alternative PHP Cache + +PKG_VERSION:=3.1.9 +PKG_RELEASE:=1 +PKG_MD5SUM:=a2cf7fbf6f3a87f190d897a53260ddaa + +PKG_NAME:=php5-pecl-apc +PKG_SOURCE:=$(PECL_NAME)-$(PKG_VERSION).tgz +PKG_SOURCE_URL:=http://pecl.php.net/get/ + +PKG_BUILD_DIR:=$(BUILD_DIR)/$(PECL_NAME)-$(PKG_VERSION) +PKG_BUILD_PARALLEL:=1 + +include $(INCLUDE_DIR)/package.mk +include $(INCLUDE_DIR)/nls.mk +include ../php5/pecl.mk + +CONFIGURE_ARGS+= \ + --enable-apc=shared \ + --disable-apc-mmap \ + +$(eval $(call PECLPackage,apc,$(PECL_LONGNAME))) +$(eval $(call BuildPackage,$(PKG_NAME))) -- 1.7.5.4 ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH 4/6] [packages] Introduce php5-pecl-dio package
Signed-off-by: Michael Heimpold
---
lang/php5-pecl-dio/Makefile| 29
.../patches/010-additional-baudrates.patch | 29
2 files changed, 58 insertions(+), 0 deletions(-)
diff --git a/lang/php5-pecl-dio/Makefile b/lang/php5-pecl-dio/Makefile
new file mode 100644
index 000..ab0ff04
--- /dev/null
+++ b/lang/php5-pecl-dio/Makefile
@@ -0,0 +1,29 @@
+#
+# Copyright (C) 2012 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PECL_NAME:=dio
+PECL_LONGNAME:=Direct I/O functions
+
+PKG_VERSION:=0.0.4RC4
+PKG_RELEASE:=1
+PKG_MD5SUM:=9baedea5fdfc7b7e303de6591cdc3187
+
+PKG_NAME:=php5-pecl-$(PECL_NAME)
+PKG_SOURCE:=$(PECL_NAME)-$(PKG_VERSION).tgz
+PKG_SOURCE_URL:=http://pecl.php.net/get/
+
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PECL_NAME)-$(PKG_VERSION)
+PKG_BUILD_PARALLEL:=1
+
+include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/nls.mk
+include ../php5/pecl.mk
+
+$(eval $(call PECLPackage,$(PECL_NAME),$(PECL_LONGNAME)))
+$(eval $(call BuildPackage,$(PKG_NAME)))
diff --git a/lang/php5-pecl-dio/patches/010-additional-baudrates.patch
b/lang/php5-pecl-dio/patches/010-additional-baudrates.patch
new file mode 100644
index 000..5032e6e
--- /dev/null
+++ b/lang/php5-pecl-dio/patches/010-additional-baudrates.patch
@@ -0,0 +1,29 @@
+--- a/dio.c
b/dio.c
+@@ -442,6 +442,26 @@ PHP_FUNCTION(dio_tcsetattr)
+
+ /* assign to correct values... */
+ switch (Baud_Rate) {
++#ifdef B460800
++ case 460800:
++ BAUD = B460800;
++ break;
++#endif
++#ifdef B230400
++ case 230400:
++ BAUD = B230400;
++ break;
++#endif
++#ifdef B115200
++ case 115200:
++ BAUD = B115200;
++ break;
++#endif
++#ifdef B57600
++ case 57600:
++ BAUD = B57600;
++ break;
++#endif
+ case 38400:
+ BAUD = B38400;
+ break;
--
1.7.5.4
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH 5/6] [packages] Introduce php5-pecl-http package
Signed-off-by: Michael Heimpold --- lang/php5-pecl-http/Makefile | 34 ++ 1 files changed, 34 insertions(+), 0 deletions(-) diff --git a/lang/php5-pecl-http/Makefile b/lang/php5-pecl-http/Makefile new file mode 100644 index 000..c3a7f4b --- /dev/null +++ b/lang/php5-pecl-http/Makefile @@ -0,0 +1,34 @@ +# +# Copyright (C) 2012 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk + +PECL_NAME:=pecl_http +PECL_LONGNAME:=Extended HTTP Support + +PKG_VERSION:=1.7.1 +PKG_RELEASE:=1 +PKG_MD5SUM:=5047574da6b57741896e0463e84dbd8c + +PKG_NAME:=php5-pecl-http +PKG_SOURCE:=$(PECL_NAME)-$(PKG_VERSION).tgz +PKG_SOURCE_URL:=http://pecl.php.net/get/ + +PKG_BUILD_DIR:=$(BUILD_DIR)/$(PECL_NAME)-$(PKG_VERSION) +PKG_BUILD_PARALLEL:=1 + +include $(INCLUDE_DIR)/package.mk +include $(INCLUDE_DIR)/nls.mk +include ../php5/pecl.mk + +CONFIGURE_ARGS+= \ + --enable-http=shared \ + --without-http-shared-deps \ + --with-http-curl-requests="$(STAGING_DIR)/usr" \ + +$(eval $(call PECLPackage,http,$(PECL_LONGNAME),+libcurl +librt +php5-mod-iconv +php5-mod-session)) +$(eval $(call BuildPackage,$(PKG_NAME))) -- 1.7.5.4 ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH 6/6] [packages] Introduce php5-pecl-libevent package
Signed-off-by: Michael Heimpold --- lang/php5-pecl-libevent/Makefile | 31 +++ 1 files changed, 31 insertions(+), 0 deletions(-) diff --git a/lang/php5-pecl-libevent/Makefile b/lang/php5-pecl-libevent/Makefile new file mode 100644 index 000..2da25ec --- /dev/null +++ b/lang/php5-pecl-libevent/Makefile @@ -0,0 +1,31 @@ +# +# Copyright (C) 2012 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk + +PECL_NAME:=libevent +PECL_LONGNAME:=Libevent - event notification + +PKG_VERSION:=0.0.4 +PKG_RELEASE:=1 +PKG_MD5SUM:=ab19ae2a0ddbbf2465addae64ccee56d + +PKG_NAME:=php5-pecl-$(PECL_NAME) +PKG_SOURCE:=$(PECL_NAME)-$(PKG_VERSION).tgz +PKG_SOURCE_URL:=http://pecl.php.net/get/ + +PKG_BUILD_DIR:=$(BUILD_DIR)/$(PECL_NAME)-$(PKG_VERSION) +PKG_BUILD_PARALLEL:=1 + +include $(INCLUDE_DIR)/package.mk +include $(INCLUDE_DIR)/nls.mk +include ../php5/pecl.mk + +CONFIGURE_ARGS+= --with-libevent=shared,"$(STAGING_DIR)/usr" + +$(eval $(call PECLPackage,$(PECL_NAME),$(PECL_LONGNAME),+libevent)) +$(eval $(call BuildPackage,$(PKG_NAME))) -- 1.7.5.4 ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH 3/6] [packages] Introduce php5-pecl-bcompiler package
Signed-off-by: Michael Heimpold --- lang/php5-pecl-bcompiler/Makefile | 29 + 1 files changed, 29 insertions(+), 0 deletions(-) diff --git a/lang/php5-pecl-bcompiler/Makefile b/lang/php5-pecl-bcompiler/Makefile new file mode 100644 index 000..978c01f --- /dev/null +++ b/lang/php5-pecl-bcompiler/Makefile @@ -0,0 +1,29 @@ +# +# Copyright (C) 2012 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk + +PECL_NAME:=bcompiler +PECL_LONGNAME:=PHP bytecode Compiler + +PKG_VERSION:=1.0.2 +PKG_RELEASE:=1 +PKG_MD5SUM:=99f76a5ef536d43180b41036a6a13e43 + +PKG_NAME:=php5-pecl-$(PECL_NAME) +PKG_SOURCE:=$(PECL_NAME)-$(PKG_VERSION).tgz +PKG_SOURCE_URL:=http://pecl.php.net/get/ + +PKG_BUILD_DIR:=$(BUILD_DIR)/$(PECL_NAME)-$(PKG_VERSION) +PKG_BUILD_PARALLEL:=1 + +include $(INCLUDE_DIR)/package.mk +include $(INCLUDE_DIR)/nls.mk +include ../php5/pecl.mk + +$(eval $(call PECLPackage,$(PECL_NAME),$(PECL_LONGNAME))) +$(eval $(call BuildPackage,$(PKG_NAME))) -- 1.7.5.4 ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [GIT PULL] Introduce php5 pecl packages
Hi Florian, the following changes are available in my git repository at git://github.com/mhei/openwrt-packages.git for you to fetch. Since I don't have sufficient svn commit permissions I cannot create the php5-pecl-* packages on my own. All changes are compile and runtime tested on brcm47xx. Since this is my first pull request at all, feel free to flame :-) Regards, Michael ----- Michael Heimpold (6): [packages] php5: Remove all patched-in pecl modules, prepare for standalone pecl modules [packages] Introduce php5-pecl-apc package [packages] Introduce php5-pecl-bcompiler package [packages] Introduce php5-pecl-dio package [packages] Introduce php5-pecl-http package [packages] Introduce php5-pecl-libevent package lang/php5-pecl-apc/Makefile| 33 + lang/php5-pecl-bcompiler/Makefile | 29 + lang/php5-pecl-dio/Makefile| 29 + .../patches/010-additional-baudrates.patch | 29 + lang/php5-pecl-http/Makefile | 34 + lang/php5-pecl-libevent/Makefile | 31 + lang/php5/Makefile | 40 +- lang/php5/patches/005-APC.patch|22333 --- lang/php5/patches/010-PECL-dio.patch | 3473 - .../011-PECL-dio-additional-baudrates.patch| 29 - lang/php5/patches/020-PECL-add-libevent.patch | 1758 - lang/php5/patches/030-PECL-add-http.patch |29802 - .../php5/patches/900-prevent_buildconf_force.patch |70582 13 files changed, 336 insertions(+), 128025 deletions(-) create mode 100644 lang/php5-pecl-apc/Makefile create mode 100644 lang/php5-pecl-bcompiler/Makefile create mode 100644 lang/php5-pecl-dio/Makefile create mode 100644 lang/php5-pecl-dio/patches/010-additional-baudrates.patch create mode 100644 lang/php5-pecl-http/Makefile create mode 100644 lang/php5-pecl-libevent/Makefile delete mode 100644 lang/php5/patches/005-APC.patch delete mode 100644 lang/php5/patches/010-PECL-dio.patch delete mode 100644 lang/php5/patches/011-PECL-dio-additional-baudrates.patch delete mode 100644 lang/php5/patches/020-PECL-add-libevent.patch delete mode 100644 lang/php5/patches/030-PECL-add-http.patch delete mode 100644 lang/php5/patches/900-prevent_buildconf_force.patch -- 1.7.5.4 ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] Let's fix the OpenWrt patch acceptance problem!
Hi, > In my opinion, the main issue is not that we don't give out SVN access > fast enough, from my personal experience I can say that I got SVN access very quickly after I offered taking over maintainership for php5 package. After some months I suggested to split php into multiple packages (for pecl modules) but I did not yet get svn acccess for this. Not even a response to my requests. > it's that people consider SVN access necessary for > contributing in the first place. I don't think so. I'm fine with submitting patches to the list. To speed up my personal workflow I placed 'packages' on github so that I can send pull requests to the list (git://github.com/mhei/openwrt-packages.git) in the near future (but I'm still novice with git - learning by doing :-) And yes, please stay hard giving commit access away to keep the quality on the current high level. And yes, tell me/flame me when I commit rubbish or send patches which doesn't apply/are broken... So to summarize: for me the main trouble is not how the workflow is - I'll try to adapt myself - but I need feedback on the list as I've only little time on IRC... > willing to organize and take care of maintaining the tree and compile > testing and reviewing the incoming changes? Is there already work done/docs about setting up buildbot slaves/ cronjobs for nightly builds... ? I feel that my CPU could do something useful when I'm sleeping/at work :-) My 2 cents, mhei ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] packages: new package libsml
Signed-off-by: Michael Heimpold
---
libs/libsml/Makefile| 51 +++
libs/libsml/patches/010-no-examples-tests.patch | 13 ++
libs/libsml/patches/020-ldflags.patch | 11 +
libs/libsml/patches/030-cross-compile.patch |8
4 files changed, 83 insertions(+), 0 deletions(-)
create mode 100644 libs/libsml/Makefile
create mode 100644 libs/libsml/patches/010-no-examples-tests.patch
create mode 100644 libs/libsml/patches/020-ldflags.patch
create mode 100644 libs/libsml/patches/030-cross-compile.patch
diff --git a/libs/libsml/Makefile b/libs/libsml/Makefile
new file mode 100644
index 000..32ff60f
--- /dev/null
+++ b/libs/libsml/Makefile
@@ -0,0 +1,51 @@
+#
+# Copyright (C) 2012 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:=libsml
+PKG_VERSION:=0.1
+PKG_RELEASE:=1
+PKG_REV:=4e546fb0db0bd4c0a2c3c2f3d29ac0a0ba6651a3
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=git://github.com/dailab/libsml.git
+PKG_SOURCE_VERSION:=$(PKG_REV)
+PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
+PKG_SOURCE_PROTO:=git
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/libsml
+ SECTION:=libs
+ CATEGORY:=Libraries
+ URL:=https://github.com/dailab/libsml
+ TITLE:=Library which implements the Smart Messaging Language (SML) protocol
+ DEPENDS:=+libuuid
+endef
+
+define Package/libsml/description
+ libSML is a library which implements the Smart Messaging Language (SML)
protocol specified by
+ VDE's Forum Netztechnik/Netzbetrieb (FNN). It can be utilized to communicate
to FNN specified
+ Smart Meters or Smart Meter components (EDL/MUC).
+endef
+
+define Build/InstallDev
+ $(INSTALL_DIR) $(1)/usr/include
+ $(CP) $(PKG_BUILD_DIR)/sml/include/sml $(1)/usr/include/
+ $(INSTALL_DIR) $(1)/usr/lib
+ $(CP) $(PKG_BUILD_DIR)/sml/lib/libsml.{so*,a} $(1)/usr/lib/
+ $(INSTALL_DIR) $(1)/usr/lib/pkgconfig
+ $(CP) $(PKG_BUILD_DIR)/sml.pc $(1)/usr/lib/pkgconfig/
+endef
+
+define Package/libsml/install
+ $(INSTALL_DIR) $(1)/usr/lib
+ $(CP) $(PKG_BUILD_DIR)/sml/lib/libsml.so* $(1)/usr/lib/
+endef
+
+$(eval $(call BuildPackage,libsml))
diff --git a/libs/libsml/patches/010-no-examples-tests.patch
b/libs/libsml/patches/010-no-examples-tests.patch
new file mode 100644
index 000..bf2220c
--- /dev/null
+++ b/libs/libsml/patches/010-no-examples-tests.patch
@@ -0,0 +1,13 @@
+--- a/Makefile
b/Makefile
+@@ -1,8 +1,8 @@
+
+ all:
+ @$(MAKE) -C sml
+- @$(MAKE) -C examples
+- @$(MAKE) -C test
++# @$(MAKE) -C examples
++# @$(MAKE) -C test
+
+ .PHONY: clean
+ clean :
diff --git a/libs/libsml/patches/020-ldflags.patch
b/libs/libsml/patches/020-ldflags.patch
new file mode 100644
index 000..d6fa2e4
--- /dev/null
+++ b/libs/libsml/patches/020-ldflags.patch
@@ -0,0 +1,11 @@
+--- a/sml/Makefile
b/sml/Makefile
+@@ -54,7 +54,7 @@ libsml: $(ST_LIB) $(OBJ_LIB)
+ endif
+
+ $(DYN_LIB): $(OBJS)
+- $(LD) $(LIBS) -shared -soname $(SONAME) -o $@ $^
++ $(LD) $(LDFLAGS) $(LIBS) -shared -soname $(SONAME) -o $@ $^
+
+ $(OBJ_LIB): $(OBJS)
+ $(LD) -r -o $@ $^
diff --git a/libs/libsml/patches/030-cross-compile.patch
b/libs/libsml/patches/030-cross-compile.patch
new file mode 100644
index 000..c7dcc22
--- /dev/null
+++ b/libs/libsml/patches/030-cross-compile.patch
@@ -0,0 +1,8 @@
+--- a/sml/Makefile
b/sml/Makefile
+@@ -1,4 +1,4 @@
+-UNAME := $(shell uname)
++UNAME := Linux
+ CFLAGS += -I./include/ -fPIC -g -Wall
+
+ # Available Flags:
--
1.7.5.4
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] New package mbus
Signed-off-by: Michael Heimpold
---
libs/libmbus/Makefile | 105 +
1 files changed, 105 insertions(+), 0 deletions(-)
create mode 100644 libs/libmbus/Makefile
diff --git a/libs/libmbus/Makefile b/libs/libmbus/Makefile
new file mode 100644
index 000..45a615c
--- /dev/null
+++ b/libs/libmbus/Makefile
@@ -0,0 +1,105 @@
+#
+# Copyright (C) 2011 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:=libmbus
+PKG_VERSION:=0.6.1
+PKG_RELEASE:=1
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=http://www.freescada.com/public-dist/
+PKG_MD5SUM:=842d13b14ad4a88f9d1b9f321725c802
+
+PKG_FIXUP:=libtool
+PKG_INSTALL:=1
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/libmbus/Default
+ SECTION:=utils
+ CATEGORY:=Utilities
+ URL:=http://www.freescada.com/libmbus/
+ TITLE:=mbus-tools
+endef
+
+define Package/libmbus/Default/description
+ libmbus is an open source M-bus (Meter-Bus) library.
+ The Meter-Bus is a standard for reading out meter data from
+ electricity meters, heat meters, gas meters, etc.
+endef
+
+define Package/libmbus
+ $(call Package/libmbus/Default)
+ SECTION:=libs
+ CATEGORY:=Libraries
+ TITLE:=libmbus
+endef
+
+define Package/libmbus/description
+ $(call Package/libmbus/Default/description)
+
+ This package contains the M-bus shared library, used by other programs.
+endef
+
+define Package/mbus-serial
+ $(call Package/libmbus/Default)
+ DEPENDS+=+libmbus
+ TITLE+= (serial)
+endef
+
+define Package/mbus-serial/description
+ $(call Package/libmbus/Default/description)
+
+ This package contains command line tools for scanning the M-bus
+ and retrieving data from meters which are connected through a
+ serial (e.g. RS232) interface.
+endef
+
+define Package/mbus-tcp
+ $(call Package/libmbus/Default)
+ DEPENDS+=+libmbus
+ TITLE+= (tcp)
+endef
+
+define Package/mbus-tcp/description
+ $(call Package/libmbus/Default/description)
+
+ This package contains command line tools for scanning the M-bus
+ and retrieving data from meters which are accessible through
+ M-bus gateways via TCP.
+endef
+
+TARGET_CFLAGS += $(FPIC)
+
+define Build/InstallDev
+ $(INSTALL_DIR) $(1)/usr/include
+ $(CP) $(PKG_INSTALL_DIR)/usr/include/mbus $(1)/usr/include/
+ $(INSTALL_DIR) $(1)/usr/lib
+ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libmbus.{so*,la} $(1)/usr/lib/
+ $(INSTALL_DIR) $(1)/usr/lib/pkgconfig
+ $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libmbus.pc
$(1)/usr/lib/pkgconfig/
+endef
+
+define Package/libmbus/install
+ $(INSTALL_DIR) $(1)/usr/lib
+ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libmbus.so* $(1)/usr/lib/
+endef
+
+define Package/mbus-serial/install
+ $(INSTALL_DIR) $(1)/usr/bin
+ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/mbus-serial-* $(1)/usr/bin/
+endef
+
+define Package/mbus-tcp/install
+ $(INSTALL_DIR) $(1)/usr/bin
+ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/mbus-tcp-* $(1)/usr/bin/
+endef
+
+$(eval $(call BuildPackage,libmbus))
+$(eval $(call BuildPackage,mbus-serial))
+$(eval $(call BuildPackage,mbus-tcp))
--
1.7.5.4
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH v2] [packages] curl: upgrade to 7.23.1
First patch version doesn't apply to current trunk, so please try this one. Signed-off-by: Michael Heimpold --- libs/curl/Makefile|4 +- libs/curl/patches/100-cross-compile.patch | 119 - libs/curl/patches/510-no_sslv2.patch | 25 -- 3 files changed, 2 insertions(+), 146 deletions(-) delete mode 100644 libs/curl/patches/100-cross-compile.patch delete mode 100644 libs/curl/patches/510-no_sslv2.patch diff --git a/libs/curl/Makefile b/libs/curl/Makefile index 806192d..962836c 100644 --- a/libs/curl/Makefile +++ b/libs/curl/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=curl -PKG_VERSION:=7.21.7 +PKG_VERSION:=7.23.1 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 @@ -19,7 +19,7 @@ PKG_SOURCE_URL:=http://curl.haxx.se/download/ \ ftp://ftp.planetmirror.com/pub/curl/ \ http://www.mirrormonster.com/curl/download/ \ http://curl.mirrors.cyberservers.net/download/ -PKG_MD5SUM:=5f6d50c4d4ee38c57fe37e3cff75adbd +PKG_MD5SUM:=0296d3196b4bf82c896a869b38dbc5f2 PKG_FIXUP:=libtool PKG_BUILD_PARALLEL:=1 diff --git a/libs/curl/patches/100-cross-compile.patch b/libs/curl/patches/100-cross-compile.patch deleted file mode 100644 index 9110940..000 --- a/libs/curl/patches/100-cross-compile.patch +++ /dev/null @@ -1,119 +0,0 @@ -Index: curl-7.21.7/configure.ac -=== curl-7.21.7.orig/configure.ac -+++ curl-7.21.7/configure.ac -@@ -1522,15 +1522,6 @@ if test X"$OPT_SSL" != Xno; then - fi - - if test "$OPENSSL_ENABLED" = "1"; then --if test -n "$LIB_OPENSSL"; then -- dnl when the ssl shared libs were found in a path that the run-time -- dnl linker doesn't search through, we need to add it to LD_LIBRARY_PATH -- dnl to prevent further configure tests to fail due to this -- -- LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$LIB_OPENSSL" -- export LD_LIBRARY_PATH -- AC_MSG_NOTICE([Added $LIB_OPENSSL to LD_LIBRARY_PATH]) --fi - CURL_CHECK_OPENSSL_API - fi - -@@ -1759,17 +1750,6 @@ if test "$OPENSSL_ENABLED" != "1"; then - - if test "x$USE_GNUTLS" = "xyes"; then - AC_MSG_NOTICE([detected GnuTLS version $version]) -- --if test -n "$gtlslib"; then -- dnl when shared libs were found in a path that the run-time -- dnl linker doesn't search through, we need to add it to -- dnl LD_LIBRARY_PATH to prevent further configure tests to fail -- dnl due to this -- -- LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$gtlslib" -- export LD_LIBRARY_PATH -- AC_MSG_NOTICE([Added $gtlslib to LD_LIBRARY_PATH]) --fi - fi - - fi -@@ -1869,18 +1849,6 @@ if test "$OPENSSL_ENABLED" != "1"; then - - CURL_LIBS="$CURL_LIBS -lpolarssl" - LIBS="$LIBS -lpolarssl" -- -- if test -n "$polarssllib"; then --dnl when shared libs were found in a path that the run-time --dnl linker doesn't search through, we need to add it to --dnl LD_LIBRARY_PATH to prevent further configure tests to fail --dnl due to this -- --LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$polarssllib" --export LD_LIBRARY_PATH --AC_MSG_NOTICE([Added $polarssllib to LD_LIBRARY_PATH]) -- fi -- - fi - - fi dnl PolarSSL not disabled -@@ -1958,18 +1926,6 @@ if test "$OPENSSL_ENABLED" != "1"; then - - CURL_LIBS="$CURL_LIBS -lcyassl -lm" - LIBS="$LIBS -lcyassl -lm" -- -- if test -n "$cyassllib"; then --dnl when shared libs were found in a path that the run-time --dnl linker doesn't search through, we need to add it to --dnl LD_LIBRARY_PATH to prevent further configure tests to fail --dnl due to this -- --LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$cyassllib" --export LD_LIBRARY_PATH --AC_MSG_NOTICE([Added $cyassllib to LD_LIBRARY_PATH]) -- fi -- - fi - - fi dnl CyaSSL not disabled -@@ -2053,19 +2009,6 @@ if test "$OPENSSL_ENABLED" != "1" -a "$G - CPPFLAGS="$CLEANCPPFLAGS" -]) - -- if test "x$USE_NSS" = "xyes"; then --AC_MSG_NOTICE([detected NSS version $version]) -- --dnl when shared libs were found in a path that the run-time --dnl linker doesn't search through, we need to add it to --dnl LD_LIBRARY_PATH to prevent further configure tests to fail --dnl due to this -- --LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$nssprefix/lib$libsuff" --export LD_LIBRARY_PATH --AC_MSG_NOTICE([Added $nssprefix/lib$libsuff to LD_LIBRARY_PATH])
[OpenWrt-Devel] [PATCH] [packages] curl: upgrade to 7.23.1
Adjust patches, i.e remove patches which don't apply anymore.
Signed-off-by: Michael Heimpold
---
libs/curl/Makefile|4 +-
libs/curl/patches/100-cross_compile.patch | 87 -
libs/curl/patches/200-no_docs_tests.patch | 16 +++---
libs/curl/patches/510-no_sslv2.patch | 40 -
4 files changed, 10 insertions(+), 137 deletions(-)
delete mode 100644 libs/curl/patches/100-cross_compile.patch
delete mode 100644 libs/curl/patches/510-no_sslv2.patch
diff --git a/libs/curl/Makefile b/libs/curl/Makefile
index cef3421..55a1c86 100644
--- a/libs/curl/Makefile
+++ b/libs/curl/Makefile
@@ -8,7 +8,7 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=curl
-PKG_VERSION:=7.21.3
+PKG_VERSION:=7.23.1
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
@@ -19,7 +19,7 @@ PKG_SOURCE_URL:=http://curl.haxx.se/download/ \
ftp://ftp.planetmirror.com/pub/curl/ \
http://www.mirrormonster.com/curl/download/ \
http://curl.mirrors.cyberservers.net/download/
-PKG_MD5SUM:=5b57fee22090b5c43a6886fdd35af2ce
+PKG_MD5SUM:=0296d3196b4bf82c896a869b38dbc5f2
PKG_FIXUP:=libtool
PKG_BUILD_PARALLEL:=1
diff --git a/libs/curl/patches/100-cross_compile.patch
b/libs/curl/patches/100-cross_compile.patch
deleted file mode 100644
index 9cccf24..000
--- a/libs/curl/patches/100-cross_compile.patch
+++ /dev/null
@@ -1,87 +0,0 @@
a/configure
-+++ b/configure
-@@ -19786,17 +19786,6 @@ $as_echo "no" >&6; }
- fi
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--
-- if test "$OPENSSL_ENABLED" = "1"; then
--if test -n "$LIB_OPENSSL"; then
--
-- LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$LIB_OPENSSL"
-- export LD_LIBRARY_PATH
-- { $as_echo "$as_me:${as_lineno-$LINENO}: Added $LIB_OPENSSL to
LD_LIBRARY_PATH" >&5
--$as_echo "$as_me: Added $LIB_OPENSSL to LD_LIBRARY_PATH" >&6;}
--fi
-- fi
--
- fi
-
-
-@@ -20252,21 +20241,6 @@ else
- CPPFLAGS="$CLEANCPPFLAGS"
-
- fi
--
--
-- if test "x$USE_GNUTLS" = "xyes"; then
--{ $as_echo "$as_me:${as_lineno-$LINENO}: detected GnuTLS version
$version" >&5
--$as_echo "$as_me: detected GnuTLS version $version" >&6;}
--
--if test -n "$gtlslib"; then
--
-- LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$gtlslib"
-- export LD_LIBRARY_PATH
-- { $as_echo "$as_me:${as_lineno-$LINENO}: Added $gtlslib to
LD_LIBRARY_PATH" >&5
--$as_echo "$as_me: Added $gtlslib to LD_LIBRARY_PATH" >&6;}
--fi
-- fi
--
- fi
-
- fi
a/configure.ac
-+++ b/configure.ac
-@@ -1497,19 +1497,6 @@ if test X"$OPT_SSL" != Xno; then
- AC_MSG_RESULT([no])
- ])
- fi
--
-- if test "$OPENSSL_ENABLED" = "1"; then
--if test -n "$LIB_OPENSSL"; then
-- dnl when the ssl shared libs were found in a path that the run-time
-- dnl linker doesn't search through, we need to add it to LD_LIBRARY_PATH
-- dnl to prevent further configure tests to fail due to this
--
-- LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$LIB_OPENSSL"
-- export LD_LIBRARY_PATH
-- AC_MSG_NOTICE([Added $LIB_OPENSSL to LD_LIBRARY_PATH])
--fi
-- fi
--
- fi
-
- dnl **
-@@ -1717,22 +1704,6 @@ if test "$OPENSSL_ENABLED" != "1"; then
- LIBS="$CLEANLIBS"
- CPPFLAGS="$CLEANCPPFLAGS"
-])
--
-- if test "x$USE_GNUTLS" = "xyes"; then
--AC_MSG_NOTICE([detected GnuTLS version $version])
--
--if test -n "$gtlslib"; then
-- dnl when shared libs were found in a path that the run-time
-- dnl linker doesn't search through, we need to add it to
-- dnl LD_LIBRARY_PATH to prevent further configure tests to fail
-- dnl due to this
--
-- LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$gtlslib"
-- export LD_LIBRARY_PATH
-- AC_MSG_NOTICE([Added $gtlslib to LD_LIBRARY_PATH])
--fi
-- fi
--
- fi
-
- fi dnl GNUTLS not disabled
diff --git a/libs/curl/patches/200-no_docs_tests.patch
b/libs/curl/patches/200-no_docs_tests.patch
index 038483e..6519a09 100644
--- a/libs/curl/patches/200-no_docs_tests.patch
+++ b/libs/curl/patches/200-no_docs_tests.patch
@@ -1,22 +1,22 @@
--- a/Makefile.am
+++ b/Makefile.am
-@@ -37,7 +37,7 @@ EXTRA_DIST = CHANGES COPYING maketgz Mak
+@@ -41,7 +41,7 @@ EXTRA_DIST = CHANGES COPYING maketgz Mak
bin_SCRIPTS = curl-config
- SUBDIRS = lib src
--DIST_SUBDIRS = $(SUBDIRS) tests include packages docs
-+DIST_SUBDIRS = $(SUBDIRS) include packages
+ SUBDIRS = lib src include
+-DIST_SUBDIRS = $(SUBDIRS)
[OpenWrt-Devel] [PATCH] Provide a global section_enabled function
Since various packages implement such a function already on their own,
it seems reasonable to provide this a globally available function.
Signed-off-by: Michael Heimpold
Index: package/base-files/files/lib/functions.sh
===
--- package/base-files/files/lib/functions.sh (revision 29234)
+++ package/base-files/files/lib/functions.sh (working copy)
@@ -205,6 +205,12 @@
done
}
+section_enabled() {
+ local enabled
+ config_get_bool enabled "$1" 'enabled' 0
+ [ $enabled -gt 0 ] || return 1
+}
+
load_modules() {
[ -d /etc/modules.d ] && {
cd /etc/modules.d
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [RFC] Introducing new pecl infrastructure in OpenWRT
Hi Devs, as current PHP5 package maintainer I would like to share some thoughts with you requesting your feedback and suggestions. Currently, there are some PECl extensions for PHP which are patched into the PHP core and then build as modules. This wasn't my initial idea but the situation (e.g. APC module) when I took over maintainership. Yes, it works and I used it for several additional modules too (dio, http...). But I think we could do it better: so I would like to split such PECL extensions into their own Openwrt package. So my questions are the following: - What do you think about this? - I didn't dared to commit outside the packages/lang/php5 directory. I don't know whether it is currently technically possible for me. But I would like to prior ask you for permission to do so for creating such new pecl packages. I attach an initial version as example so that you could get a feeling, what I'm planning to do. It would be nice if you could drop me some feedback :-) Thanks, Michael --- Index: lang/php5-pecl-apc/Makefile === --- lang/php5-pecl-apc/Makefile (revision 0) +++ lang/php5-pecl-apc/Makefile (revision 0) @@ -0,0 +1,34 @@ +# +# Copyright (C) 2011 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk + +PECL_NAME:=APC +PECL_LONGNAME:=Alternative PHP Cache + +PKG_VERSION:=3.1.9 +PKG_RELEASE:=1 +PKG_MD5SUM:=a2cf7fbf6f3a87f190d897a53260ddaa + +PKG_NAME:=php5-pecl-apc +PKG_SOURCE:=$(PECL_NAME)-$(PKG_VERSION).tgz +PKG_SOURCE_URL:=http://pecl.php.net/get/ + +PKG_BUILD_DIR:=$(BUILD_DIR)/$(PECL_NAME)-$(PKG_VERSION) +PKG_BUILD_PARALLEL:=1 + +include $(INCLUDE_DIR)/package.mk +include $(INCLUDE_DIR)/nls.mk +include ../php5/pecl.mk + +CONFIGURE_ARGS+= \ + --enable-apc=shared \ + --disable-apc-mmap \ + --disable-apc-pthreadmutex \ + +$(eval $(call PECLPackage,apc,$(PECL_LONGNAME))) +$(eval $(call BuildPackage,$(PKG_NAME))) Index: lang/php5/pecl.mk === --- lang/php5/pecl.mk (revision 0) +++ lang/php5/pecl.mk (revision 0) @@ -0,0 +1,40 @@ +# +# Copyright (C) 2011 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +define Package/php5-pecl/Default + SUBMENU:=PHP + SECTION:=lang + CATEGORY:=Languages + URL:=http://pecl.php.net/ + MAINTAINER:=Michael Heimpold + DEPENDS:=php5 +endef + +define Build/Configure + ( cd $(PKG_BUILD_DIR); $(STAGING_DIR_HOST)/usr/bin/phpize ) + $(Build/Configure/Default) +endef + +define PECLPackage + + define Package/php5-pecl-$(1) +$(call Package/php5-pecl/Default) +TITLE:=$(2) + +ifneq ($(3),) + DEPENDS+=$(3) +endif + endef + + define Package/php5-pecl-$(1)/install + $(INSTALL_DIR) $$(1)/usr/lib/php + $(INSTALL_BIN) $(PKG_BUILD_DIR)/modules/$(subst -,_,$(1)).so $$(1)/usr/lib/php/ + $(INSTALL_DIR) $$(1)/etc/php5 + echo "extension=$(subst -,_,$(1)).so" > $$(1)/etc/php5/$(subst -,_,$(1)).ini + endef + +endef Index: lang/php5/Makefile === --- lang/php5/Makefile (revision 28510) +++ lang/php5/Makefile (working copy) @@ -462,6 +462,14 @@ $(INSTALL_BIN) ./files/php.init $(1)/etc/init.d/php endef +define Build/InstallDev + make -C $(PKG_BUILD_DIR) install INSTALL_ROOT=$(PKG_BUILD_DIR)/php-dev + rm $(PKG_BUILD_DIR)/php-dev/usr/bin/php + $(CP) $(PKG_BUILD_DIR)/php-dev/* $(STAGING_DIR_HOST) + sed -i -e "s#prefix='/usr'#prefix='$(STAGING_DIR_HOST)/usr'#" $(STAGING_DIR_HOST)/usr/bin/phpize + sed -i -e "s#exec_prefix=\"\`eval echo /usr\`\"#exec_prefix='$(STAGING_DIR_HOST)/usr'#" $(STAGING_DIR_HOST)/usr/bin/phpize +endef + define BuildModule define Package/php5-mod-$(1) ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] Patch: Use system zoneinfo files instead of embedded
Am Mittwoch, 12. Oktober 2011, 15:12:28 schrieb Peter Naulls: > > These are taken from the Debian PHP patches. Thanks to jow and mhei for > suggestions. I tested this with my eglibc setup/zoneinfo files. > > I think the comments in the patches describe the intent here. > > Signed-off-by: Peter Naulls Applied with minor enhancements in r28491, thanks! mhei ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] OpenWrt GPL compliance
Hi, > I can understand how it works for tagged feeds, e.g. > svn://svn.openwrt.org/openwrt/branches/packages_10.03.1 hm, I think when you are using such a branch the result is still not every time the same since changesets are still merged to such a "stable" branch. The only thing you could consider stable is really a "tag", but for packages I can't find any tag? > but I don't get how it can work for svn://svn.openwrt.org/openwrt/packages, > and this is what I'm struggling with. Doesn't that just pull the tip, and > therefore potentially break what was supposed to be a stable release? In my company we have to deal with the same problem and we're using something like this in our feeds.conf: src-svn packages svn://svn.openwrt.org/openwrt/packages@26974 This checkouts the exact revision of the SVN. Together with some higher-level makefiles we can stick our own patches to exact this revision etc. HTH, Michael ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] [packages] chrony: Upgrade to 1.26
This patch upgrades chrony to 1.26. Beside several minor
bugfixes and improvements, also several vulnerabilities
are fixed (compared to 1.23).
Signed-off-by: Michael Heimpold
---
net/chrony/Makefile |6 +++---
net/chrony/patches/001-crosscompile.patch | 18 +-
2 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/net/chrony/Makefile b/net/chrony/Makefile
index 21e5d84..7ce3ec3 100644
--- a/net/chrony/Makefile
+++ b/net/chrony/Makefile
@@ -8,13 +8,13 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=chrony
-PKG_VERSION:=1.23
-PKG_RELEASE:=3
+PKG_VERSION:=1.26
+PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:= ftp://download.tuxfamily.org/projects/chrony/ \
http://download.tuxfamily.org/chrony/
-PKG_MD5SUM:=ffce77695e55d8efda19ab0b78309c23
+PKG_MD5SUM:=ad6dd619ff1986e4ff780363c64e2246
include $(INCLUDE_DIR)/package.mk
diff --git a/net/chrony/patches/001-crosscompile.patch
b/net/chrony/patches/001-crosscompile.patch
index cdc5939..d712e06 100644
--- a/net/chrony/patches/001-crosscompile.patch
+++ b/net/chrony/patches/001-crosscompile.patch
@@ -1,8 +1,8 @@
--- a/configure
+++ b/configure
-@@ -187,6 +187,13 @@
- --prefix=* | --install_prefix=* )
- INSTALL_PREFIX=`echo $option | sed -e 's/[^=]*=//;'`
+@@ -254,6 +254,13 @@ do
+ --host-machine=* )
+ MACHINE=`echo $option | sed -e 's/^.*=//;'`
;;
+--target=* )
+ TARGET=`echo $option | sed -e 's/[^=]*=//;'`
@@ -11,15 +11,15 @@
+ VERSION=""
+ SYSTEM=${OPERATINGSYSTEM}-${MACHINE}
+;;
- --trace )
- EXTRA_DEFS="-DTRACEON"
- ;;
-@@ -242,7 +249,7 @@
+ --help | -h )
+ usage
+ exit 0
+@@ -287,7 +294,7 @@ case $SYSTEM in
;;
esac
;;
-Linux* )
+Linux* | linux* )
EXTRA_OBJECTS="sys_linux.o wrap_adjtimex.o"
- if [ $feat_rtc -eq 1 ] ; then
- EXTRA_OBJECTS+=" rtc_linux.o"
+ try_linuxcaps=1
+ try_rtc=1
--
1.7.4.1
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [packages] Fix mysql dependencies
Trying to fix some issues with php5 I discoverd that php5's mysql extension doesn't load: root@OpenWrt:/tmp# php-cli -m PHP Warning: PHP Startup: Unable to load dynamic library '/usr/lib/php/mysql.so' - File not found in Unknown on line 0 [PHP Modules] Core ctype curl date ereg gettext json openssl pcntl pcre posix Reflection session sockets SPL sqlite3 standard sysvmsg sysvsem sysvshm zlib [Zend Modules] After installing uclibcxx, the extension loads fine: root@OpenWrt:/tmp# opkg install uclibcxx Installing uclibcxx (0.2.2-3) to root... Downloading http://192.168.1.2:8081/brcm47xx/packages/uclibcxx_0.2.2-3_brcm47xx.ipk. Configuring uclibcxx. root@OpenWrt:/tmp# php-cli -m [PHP Modules] <...> mysql <...> [Zend Modules] So the mysqlclient library needs uclibcxx, not only mysql-server. But since mysql-server is depended of the mysqlclient library we can shorten its dependencies. I also cross-checked that e.g. a mysql-enabled lighttpd shows the same behaviour when uclibcxx is not installed. root@OpenWrt:/tmp/log/lighttpd# lighttpd -f /etc/lighttpd/lighttpd.conf 1970-01-01 05:07:30: (plugin.c.169) dlopen() failed for: /usr/lib/lighttpd/mod_mysql_vhost.so File not found 1970-01-01 05:07:30: (server.c.650) loading plugins finally failed Signed-off-by: Michael Heimpold --- Index: libs/mysql/Makefile === --- libs/mysql/Makefile (revision 27363) +++ libs/mysql/Makefile (working copy) @@ -9,7 +9,7 @@ PKG_NAME:=mysql PKG_VERSION:=5.1.53 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=\ @@ -29,7 +29,7 @@ define Package/libmysqlclient/Default SECTION:=libs CATEGORY:=Libraries - DEPENDS:=+zlib + DEPENDS:=+uclibcxx +zlib TITLE:=MySQL client library URL:=http://dev.mysql.com/ endef @@ -37,7 +37,7 @@ define Package/mysql-server/Default SECTION:=utils CATEGORY:=Utilities - DEPENDS:=+zlib +libmysqlclient +uclibcxx + DEPENDS:=+libmysqlclient TITLE:=MySQL Server URL:=http://dev.mysql.com/ SUBMENU:=database ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] Fix detection of standalone ldd
When standalone ldd is selected in config the binary is installed in
/usr/bin/ldd.
Signed-off-by: Michael Heimpold
---
Index: package/base-files/files/etc/profile
===
--- package/base-files/files/etc/profile(revision 27363)
+++ package/base-files/files/etc/profile(working copy)
@@ -12,4 +12,4 @@
[ -z "$KSH_VERSION" -o \! -s /etc/mkshrc ] || . /etc/mkshrc
[ -x /sbin/arp ] || arp() { cat /proc/net/arp; }
-[ -z /bin/ldd ] || ldd() { LD_TRACE_LOADED_OBJECTS=1 $*; }
+[ -x /usr/bin/ldd ] || ldd() { LD_TRACE_LOADED_OBJECTS=1 $*; }
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH v2] [RFC] Always include hostname in DHCP request
Ping? :-)
Am Samstag, 2. Juli 2011, 21:56:37 schrieb Michael Heimpold:
> I'm not sure which approach would be the better one: I'm fine with both.
> So here is the variant with second bool parameter.
>
> ---
>
> Index: package/base-files/files/lib/network/config.sh
> ===
> --- package/base-files/files/lib/network/config.sh(revision 27363)
> +++ package/base-files/files/lib/network/config.sh(working copy)
> @@ -358,11 +358,17 @@
> config_get clientid "$config" clientid
> config_get vendorid "$config" vendorid
> config_get_bool broadcast "$config" broadcast 0
> + config_get_bool send_hostname "$config" send_hostname 1
> config_get reqopts "$config" reqopts
>
> [ -z "$ipaddr" ] || \
> $DEBUG ifconfig "$iface" "$ipaddr"
> ${netmask:+netmask "$netmask"}
>
> + # send system's hostname to upstream by default if none
> is explicitly configured;
> + # but suppress sending if option 'send_hostname'
> prohibits it
> + [ -n "$hostname" ] || hostname=$(uci -q get
> system.@system[0].hostname)
> + [ "$send_hostname" = 1 ] || hostname=""
> +
> # additional request options
> local opt dhcpopts
> for opt in $reqopts; do
> ___
> openwrt-devel mailing list
> openwrt-devel@lists.openwrt.org
> https://lists.openwrt.org/mailman/listinfo/openwrt-devel
>
>
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH] Introduce syslog parameter for udhcpc
Any comments, suggestions... ?
Am Montag, 27. Juni 2011, 22:44:49 schrieb Michael Heimpold:
> This patch adds a new config option 'syslog' which will -when present-
> enable udhcpc's capability to send log message to syslog.
>
> Signed-off-by: Michael Heimpold
>
> Index: package/base-files/files/lib/network/config.sh
> ===
> --- package/base-files/files/lib/network/config.sh(revision 27292)
> +++ package/base-files/files/lib/network/config.sh(working copy)
> @@ -359,6 +359,7 @@
> config_get vendorid "$config" vendorid
> config_get_bool broadcast "$config" broadcast 0
> config_get reqopts "$config" reqopts
> + config_get_bool syslog "$config" syslog
>
> [ -z "$ipaddr" ] || \
> $DEBUG ifconfig "$iface" "$ipaddr"
> ${netmask:+netmask "$netmask"}
> @@ -378,7 +379,7 @@
> ${hostname:+-H $hostname} \
> ${clientid:+-c $clientid} \
> ${vendorid:+-V $vendorid} \
> - -b -p "$pidfile" $broadcast \
> + ${syslog:+-S} -b -p "$pidfile" $broadcast \
> ${dhcpopts}
> ;;
> none)
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH v2] [RFC] Always include hostname in DHCP request
I'm not sure which approach would be the better one: I'm fine with both.
So here is the variant with second bool parameter.
---
Index: package/base-files/files/lib/network/config.sh
===
--- package/base-files/files/lib/network/config.sh (revision 27363)
+++ package/base-files/files/lib/network/config.sh (working copy)
@@ -358,11 +358,17 @@
config_get clientid "$config" clientid
config_get vendorid "$config" vendorid
config_get_bool broadcast "$config" broadcast 0
+ config_get_bool send_hostname "$config" send_hostname 1
config_get reqopts "$config" reqopts
[ -z "$ipaddr" ] || \
$DEBUG ifconfig "$iface" "$ipaddr"
${netmask:+netmask "$netmask"}
+ # send system's hostname to upstream by default if none
is explicitly configured;
+ # but suppress sending if option 'send_hostname'
prohibits it
+ [ -n "$hostname" ] || hostname=$(uci -q get
system.@system[0].hostname)
+ [ "$send_hostname" = 1 ] || hostname=""
+
# additional request options
local opt dhcpopts
for opt in $reqopts; do
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] Upgrade loop-aes to 3.6c
This patch upgrades loop-aes to latest version 3.6c. This fixes #9614, however, I didn't test other platforms or other kernel version than 2.6.39.2. Signed-off-by: Michael Heimpold --- Index: utils/loop-aes/Makefile === --- utils/loop-aes/Makefile (revision 27363) +++ utils/loop-aes/Makefile (working copy) @@ -1,5 +1,5 @@ # -# Copyright (C) 2007 OpenWrt.org +# Copyright (C) 2007-2011 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -9,12 +9,12 @@ include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=loop-aes -PKG_VERSION:=3.4b +PKG_VERSION:=3.6c PKG_RELEASE:=1 PKG_SOURCE:=loop-AES-v$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=@SF/$(PKG_NAME) -PKG_MD5SUM:=5552e8a2572c5fa416a28493f9e0ec8f +PKG_MD5SUM:=a030eb9af42e167d11434e2475187f00 PKG_BUILD_DIR:=$(BUILD_DIR)/loop-AES-v$(PKG_VERSION) PKG_BUILD_PARALLEL:=1 ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH v2] [RFC] Always include hostname in DHCP request
Your link and the dhcp-client-identifier stuff is not related to this topic, sorry. ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATH] New package jsonpath
Just a few comments... > +# Copyright (C) 2008 OpenWrt.org My calendar claims year 2011 :-) > Index: net/wing/files/lib/network/wing.sh > ... > Index: net/wing/files/usr/bin/wing_status > ... > Index: net/wing/Makefile Seems that your patch got scrambled with additional (unrelated) modifications. I guess it would be better to resend as individual patchsets... ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] Introduce syslog parameter for udhcpc
This patch adds a new config option 'syslog' which will -when present-
enable udhcpc's capability to send log message to syslog.
Signed-off-by: Michael Heimpold
Index: package/base-files/files/lib/network/config.sh
===
--- package/base-files/files/lib/network/config.sh (revision 27292)
+++ package/base-files/files/lib/network/config.sh (working copy)
@@ -359,6 +359,7 @@
config_get vendorid "$config" vendorid
config_get_bool broadcast "$config" broadcast 0
config_get reqopts "$config" reqopts
+ config_get_bool syslog "$config" syslog
[ -z "$ipaddr" ] || \
$DEBUG ifconfig "$iface" "$ipaddr"
${netmask:+netmask "$netmask"}
@@ -378,7 +379,7 @@
${hostname:+-H $hostname} \
${clientid:+-c $clientid} \
${vendorid:+-V $vendorid} \
- -b -p "$pidfile" $broadcast \
+ ${syslog:+-S} -b -p "$pidfile" $broadcast \
${dhcpopts}
;;
none)
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH v2] [RFC] Always include hostname in DHCP request
[Resent as v2 as former patch didn't apply anymore]
Currently, the hostname is sent in a DHCP request only if configured
explicitely.
Changing this behaviour so that the hostname is sent per default has the
advantage
that e.g. a Fritz!Box (acting as DHCP server) shows the device running OpenWRT
with it's hostname in the network overview.
To prevent sending a hostname at all (and to be backwards compatible) the
configuration option can be set to "none".
Signed-off-by: Michael Heimpold
Index: package/base-files/files/lib/network/config.sh
===
--- package/base-files/files/lib/network/config.sh (revision 27292)
+++ package/base-files/files/lib/network/config.sh (working copy)
@@ -363,6 +363,11 @@
[ -z "$ipaddr" ] || \
$DEBUG ifconfig "$iface" "$ipaddr"
${netmask:+netmask "$netmask"}
+ # send system's hostname to upstream by default if not
explicitly configured;
+ # but suppress if special hostname 'none' is given
+ [ -n "$hostname" ] || hostname=$(uci -q get
system.@system[0].hostname)
+ [ "$hostname" = "none" ] && hostname=""
+
# additional request options
local opt dhcpopts
for opt in $reqopts; do
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH] AT91 Flexibity initial board support
Am Dienstag, 3. Mai 2011 09:48:20 schrieb Maxim Osipov: > > Please use a profile for this instead of a completely separate target. If > > your > > profile requires a different kernel configuration, then let profiles also > > supply > > their specific kernel configuration. > > Okay. But what the purpose of subtarget in this case? I had an > impression that profile is something like a distro in OE. And > subtarget is similar to machine. I. e. I had plans to add several > profiles with specific sets of packages for my subtarget. This was my understanding, too. And because of this, the TQMa9263 support was included as a subtarget. > In what situation I should add subtargets and profiles? It would be nice, if you could give some clarification (or a hint to a wiki page)? Thanks in advance! mhei ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] php5 compilation problem
Hi, > I use Ubiquity RouterStation Pro and svn revision #26715. > I got the following errors in the linking phase of php5 package: > ext/standard/.libs/php_crypt_r.o: In function `_crypt_extended_init_r': > php_crypt_r.c:(.text+0x5a8): undefined reference to `membar_producer' > php_crypt_r.c:(.text+0x5bc): undefined reference to `atomic_add_int' > collect2: ld returned 1 exit status are you sure, that your package feed is at this revision? I ask because this problem should be already fixed with the following changeset: https://dev.openwrt.org/changeset/25335 Best regards, Michael Heimpold ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] Problem with Ralink RT305x Ethernet/Switch Drivers (ramips_eth/ramips_esw)
Hi,
I'm currently working on support for Asus RT-G32 which is also
a Ralink Rt3052 based low-cost router.
I experience the same problems: ethernet driver loads fine but
nothing works actually. This my time is currently very limited
I didn't manage to inspect details. On my roadmap is still a
wireshark trace to work out if packets are really transmitted from
the board and so on.
However, a revert to the SVN r24328 didn't help. I tested this
yesterday evening.
Lets work together to bring this platform to a broader community :-)
Regards, Michael
Am Donnerstag, 10. März 2011 18:09:08 schrieb Layne M. Edwards:
>
> Ethernet is not working using the latest ramips_eth and ramips_esw
> drivers in trunk on my Aztech HW550-3G (Ralink rt3052). The eth0
> interface appears to be working fine, but there is no connectivity on
> the LAN or WAN (see ifconfig below). After some searching in the forums,
> I found that other rt305x boards (e.g. D-Link DIR-615) are experiencing
> a similar problem. Reverting the
> 'trunk/target/linux/ramips/files/drivers/net' directory to SVN r24328
> seems to fix the problem and the ethernet works.
>
> {{{
> root@OpenWrt:/#
> ifconfig
> br-lan Link encap:Ethernet HWaddr 00:11:22:33:44:55
> inet
> addr:192.168.1.1 Bcast:192.168.1.255 Mask:255.255.255.0
> UP BROADCAST
> RUNNING MULTICAST MTU:1500 Metric:1
> RX packets:1 errors:0 dropped:0
> overruns:0 frame:0
> TX packets:1 errors:0 dropped:0 overruns:0
> carrier:0
> collisions:0 txqueuelen:0
> RX bytes:42 (42.0 B) TX bytes:402
> (402.0 B)
>
> eth0 Link encap:Ethernet HWaddr 00:11:22:33:44:55
> UP
> BROADCAST RUNNING MULTICAST MTU:1500 Metric:1
> RX packets:1 errors:0
> dropped:0 overruns:0 frame:0
> TX packets:10 errors:0 dropped:0 overruns:0
> carrier:0
> collisions:0 txqueuelen:1000
> RX bytes:46 (46.0 B) TX
> bytes:3726 (3.6 KiB)
> Interrupt:5
>
> eth0.1 Link encap:Ethernet HWaddr
> 00:11:22:33:44:55
> UP BROADCAST RUNNING MULTICAST MTU:1500 Metric:1
> RX
> packets:1 errors:0 dropped:0 overruns:0 frame:0
> TX packets:2 errors:0
> dropped:0 overruns:0 carrier:0
> collisions:0 txqueuelen:0
> RX bytes:46
> (46.0 B) TX bytes:456 (456.0 B)
>
> eth0.2 Link encap:Ethernet HWaddr
> 00:11:22:33:44:55
> UP BROADCAST RUNNING MULTICAST MTU:1500 Metric:1
> RX
> packets:0 errors:0 dropped:0 overruns:0 frame:0
> TX packets:8 errors:0
> dropped:0 overruns:0 carrier:0
> collisions:0 txqueuelen:0
> RX bytes:0 (0.0
> B) TX bytes:3256 (3.1 KiB)
>
> lo Link encap:Local Loopback
> inet
> addr:127.0.0.1 Mask:255.0.0.0
> UP LOOPBACK RUNNING MTU:16436 Metric:1
> RX
> packets:0 errors:0 dropped:0 overruns:0 frame:0
> TX packets:0 errors:0
> dropped:0 overruns:0 carrier:0
> collisions:0 txqueuelen:0
> RX bytes:0 (0.0
> B) TX bytes:0 (0.0 B)
> }}}
>
> Also, the switch configuration (swconfig) is
> not working as expected (when using r24328). The VLANs for LAN (eth0.1)
> and WAN (eth0.2) are not configured properly by default (i.e. WAN port
> is on one of the LAN ports). Modifying the swconfig in
> '/etc/config/network' seems to have no effect. Is this a bug or has
> swconfig not been implemented yet for ramips?
>
> I haven't had time to
> review the ramips eth/esw drivers (ramips.c, ramips_esw.c) to identify
> the problem yet. I was hoping one of the ramips driver developers (John
> Crispin and/or Gabor Juhos ) could take a look at this and provide some
> insight. Thanks for your contributions to this.
>
> Respectfully,
> Layne
> Edwards
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] [resend] packages/lang/php5: Fix build when simplexml is selected
The build fails since the php module is statically disabled. This patch adds the required magic. This should also finally close #7758. Signed-off-by: Michael Heimpold --- diff --git a/lang/php5/Makefile b/lang/php5/Makefile index 8022f63..d568901 100644 --- a/lang/php5/Makefile +++ b/lang/php5/Makefile @@ -114,7 +114,6 @@ PKG_CONFIGURE_OPTS:= \ --disable-short-tags \ \ --without-gettext \ - --disable-simplexml \ --with-zlib="$(STAGING_DIR)/usr" \ --with-zlib-dir="$(STAGING_DIR)/usr" \ --with-pcre-regex="$(STAGING_DIR)/usr" \ @@ -283,6 +282,12 @@ else PKG_CONFIGURE_OPTS+= --disable-session endif +ifneq ($(CONFIG_PACKAGE_php5-mod-simplexml),) + PKG_CONFIGURE_OPTS+= --enable-simplexml=shared +else + PKG_CONFIGURE_OPTS+= --disable-simplexml +endif + ifneq ($(CONFIG_PACKAGE_php5-mod-soap),) PKG_CONFIGURE_OPTS+= --enable-soap=shared else ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] [packages] lang/php5: Fix build when simplexml is selected
The build fails since the php module is statically disabled. This patch adds the required magic. This should also finally close #7758. Signed-off-by: Michael Heimpold --- diff --git a/lang/php5/Makefile b/lang/php5/Makefile index 8022f63..d568901 100644 --- a/lang/php5/Makefile +++ b/lang/php5/Makefile @@ -114,7 +114,6 @@ PKG_CONFIGURE_OPTS:= \ --disable-short-tags \ \ --without-gettext \ - --disable-simplexml \ --with-zlib="$(STAGING_DIR)/usr" \ --with-zlib-dir="$(STAGING_DIR)/usr" \ --with-pcre-regex="$(STAGING_DIR)/usr" \ @@ -283,6 +282,12 @@ else PKG_CONFIGURE_OPTS+= --disable-session endif +ifneq ($(CONFIG_PACKAGE_php5-mod-simplexml),) + PKG_CONFIGURE_OPTS+= --enable-simplexml=shared +else + PKG_CONFIGURE_OPTS+= --disable-simplexml +endif + ifneq ($(CONFIG_PACKAGE_php5-mod-soap),) PKG_CONFIGURE_OPTS+= --enable-soap=shared else ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH 1/3] [packages] lang/php5: First steps to simplify the Makefile
Ping? :-) Am Donnerstag, 28. Oktober 2010 22:23:52 schrieb Michael Heimpold: > - Introduce /etc/php5 which is scanned for additional configuration files. > So it is possible that a installed modules is automatically enabled > without the need to modify the php.ini. > - Remove unsupported config option: --disable-ttf > - Add support for SimpleXML module, closes #7758. > - Add support for PCNTL module. > - Modularize System V stuff. > - Rename BuildPlugin to BuildModule which IMHO fits better to the > commonly used terminology of "PHP module". > > Signed-off-by: Michael Heimpold ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] [RFC] Always include hostname in DHCP request
Currently, the hostname is sent in a DHCP request only if configured
explicitely.
Changing this behaviour so that the hostname is sent per default has the
advantage
that e.g. a Fritz!Box (acting as DHCP server) shows the device running OpenWRT
with it's hostname in the network overview.
To prevent sending a hostname at all (and to be backwards compatible) the
configuration option can be set to "none".
Signed-off-by: Michael Heimpold
Index: package/base-files/files/lib/network/config.sh
===
--- package/base-files/files/lib/network/config.sh (Revision 23604)
+++ package/base-files/files/lib/network/config.sh (Arbeitskopie)
@@ -355,6 +355,8 @@
[ -z "$ipaddr" ] || \
$DEBUG ifconfig "$iface" "$ipaddr"
${netmask:+netmask "$netmask"}
+ [ -n "$hostname" ] || hostname=$(uci -q get
syst...@system[0].hostname)
+ [ "$hostname" = "none" ] && hostname=""
# don't stay running in background if dhcp is not the
main proto on the interface (e.g. when using pptp)
local dhcpopts
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH 1/3] [packages] lang/php5: First steps to simplify the Makefile
- Introduce /etc/php5 which is scanned for additional configuration files. So it is possible that a installed modules is automatically enabled without the need to modify the php.ini. - Remove unsupported config option: --disable-ttf - Add support for SimpleXML module, closes #7758. - Add support for PCNTL module. - Modularize System V stuff. - Rename BuildPlugin to BuildModule which IMHO fits better to the commonly used terminology of "PHP module". Signed-off-by: Michael Heimpold --- lang/php5/Makefile | 439 1 files changed, 99 insertions(+), 340 deletions(-) diff --git a/lang/php5/Makefile b/lang/php5/Makefile index 2c2338a..22b76c0 100644 --- a/lang/php5/Makefile +++ b/lang/php5/Makefile @@ -29,8 +29,8 @@ define Package/php5/Default endef define Package/php5/Default/description - PHP is a widely-used general-purpose scripting language that is especially - suited for Web development and can be embedded into HTML. + PHP is a widely-used general-purpose scripting language that is especially + suited for Web development and can be embedded into HTML. endef define Package/php5/config @@ -45,10 +45,6 @@ define Package/php5/config config PHP5_LIBXML bool "PHP5 LIBXML support" depends on PACKAGE_php5-cli || PACKAGE_php5-cgi - - config PHP5_SYSVIPC - bool "PHP5 Semaphore, Shared Memory and IPC support" - depends on PACKAGE_php5-cli || PACKAGE_php5-cgi endef define Package/php5 @@ -60,9 +56,9 @@ define Package/php5 endef define Package/php5/description -$(call Package/php5/Default/description) - This package contains only the PHP config file. You must actually choose - your PHP flavour (cli, cgi or fastcgi). + $(call Package/php5/Default/description) + This package contains only the PHP config file. You must actually choose + your PHP flavour (cli, cgi or fastcgi). endef define Package/php5-cli @@ -72,8 +68,8 @@ define Package/php5-cli endef define Package/php5-cli/description -$(call Package/php5/Default/description) - This package contains the CLI version of the PHP5 interpreter. + (call Package/php5/Default/description) + This package contains the CLI version of the PHP5 interpreter. endef define Package/php5-cgi @@ -83,8 +79,8 @@ define Package/php5-cgi endef define Package/php5-cgi/description -$(call Package/php5/Default/description) - This package contains the CGI version of the PHP5 interpreter. + $(call Package/php5/Default/description) + This package contains the CGI version of the PHP5 interpreter. endef define Package/php5-fastcgi @@ -94,288 +90,8 @@ define Package/php5-fastcgi endef define Package/php5-cgi/description -As FastCGI support is now a core feature the php5-fastcgi package now depends -on the php5-cgi package, containing just the startup script. -endef - -define Package/php5-mod-ctype - $(call Package/php5/Default) - DEPENDS:=php5 - TITLE:=ctype shared module -endef -define Package/php5-mod-ctype/config - depends on PACKAGE_php5-cli || PACKAGE_php5-cgi -endef - -define Package/php5-mod-curl - $(call Package/php5/Default) - DEPENDS:=php5 +libcurl - TITLE:=cURL shared module -endef -define Package/php5-mod-curl/config - depends on PACKAGE_php5-cli || PACKAGE_php5-cgi -endef - -define Package/php5-mod-fileinfo - $(call Package/php5/Default) - DEPENDS:=php5 +libmagic - TITLE:=Fileinfo shared module -endef -define Package/php5-mod-fileinfo/config - depends on PACKAGE_php5-cli || PACKAGE_php5-cgi -endef - -define Package/php5-mod-dom - $(call Package/php5/Default) - DEPENDS:=php5 +libxml2 - TITLE:=DOM shared module -endef -define Package/php5-mod-dom/config - depends on PACKAGE_php5-cli || PACKAGE_php5-cgi - depends on PHP5_LIBXML -endef - -define Package/php5-mod-exif - $(call Package/php5/Default) - DEPENDS:=php5 - TITLE:=EXIF shared module -endef -define Package/php5-mod-exif/config - depends on PACKAGE_php5-cli || PACKAGE_php5-cgi -endef - -define Package/php5-mod-ftp - $(call Package/php5/Default) - DEPENDS:=php5 - TITLE:=FTP shared module -endef -define Package/php5-mod-ftp/config - depends on PACKAGE_php5-cli || PACKAGE_php5-cgi -endef - -define Package/php5-mod-gd - $(call Package/php5/Default) - DEPENDS:=php5 +libgd - TITLE:=GD graphics shared module -endef -define Package/php5-mod-gd/config - depends on PACKAGE_php5-cli || PACKAGE_php5-cgi -endef - -define Package/php5-mod-gmp - $(call Package/php5/Default) - DEPENDS:=php5 +libgmp - TITLE:=GMP shared module -endef -define Package/php5-mod-gmp/config - depends on PACKAGE_php5-cli || PACKAGE_php5-cgi -endef - -define Package/php5-mod-hash - $(call Package/php5/Default) - DEPENDS:=php5 - TITLE:=Hash shared module -endef -define Package/php5-mod-hash/config - depends on PACKAGE_php5-cli || PACKAGE_php5-cgi -endef - -define Package/php5-mod-iconv - $(call Package/php5/Default) - DE
[OpenWrt-Devel] [PATCH 2/3] [packages] lang/php5: Upgrade to version 5.3.3
Prevent configure from detecting atomic.h. This is necessary as php otherwise uses some membar_* functions which are [currently] missing in uclibc. Signed-off-by: Michael Heimpold --- lang/php5/Makefile |8 +--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/lang/php5/Makefile b/lang/php5/Makefile index 22b76c0..be3bb3d 100644 --- a/lang/php5/Makefile +++ b/lang/php5/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=php -PKG_VERSION:=5.3.1 -PKG_RELEASE:=4 +PKG_VERSION:=5.3.3 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=http://www.php.net/distributions/ -PKG_MD5SUM:=63e97ad450f0f7259e785100b634c797 +PKG_MD5SUM:=21ceeeb232813c10283a5ca1b4c87b48 PKG_FIXUP:=libtool PKG_BUILD_PARALLEL:=1 @@ -392,6 +392,7 @@ ifneq ($(CONFIG_PACKAGE_php5-cli),) php_cv_cc_rpath="no" \ iconv_impl_name="gnu_libiconv" \ ac_cv_php_xml2_config_path="$(STAGING_DIR)/host/bin/xml2-config" \ + ac_cv_header_atomic_h="no" \ ) $(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) mv $(PKG_BUILD_DIR)/sapi/cli/php $(PKG_BUILD_DIR)/php-cli @@ -410,6 +411,7 @@ ifneq ($(CONFIG_PACKAGE_php5-cgi),) php_cv_cc_rpath="no" \ iconv_impl_name="gnu_libiconv" \ ac_cv_php_xml2_config_path="$(STAGING_DIR)/host/bin/xml2-config" \ + ac_cv_header_atomic_h="no" \ ) $(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) mv $(PKG_BUILD_DIR)/sapi/cgi/php-cgi $(PKG_BUILD_DIR)/php-cgi -- 1.5.4.3 ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH 3/3] [packages] lang/php5: Add missing dependency on libsqlite3/libpthread
The binaries are already dependent on sqlite3 and pthread, not only the corresponding php modules. This closes #7724. Signed-off-by: Michael Heimpold --- lang/php5/Makefile |3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/lang/php5/Makefile b/lang/php5/Makefile index be3bb3d..de6795a 100644 --- a/lang/php5/Makefile +++ b/lang/php5/Makefile @@ -53,6 +53,9 @@ define Package/php5 ifneq ($(CONFIG_PHP5_LIBXML),) DEPENDS+= +libxml2 endif + ifneq ($(CONFIG_PACKAGE_php5-mod-sqlite3)$(CONFIG_PACKAGE_php5-mod-pdo-sqlite),) +DEPENDS+= +libsqlite3 +libpthread + endif endef define Package/php5/description -- 1.5.4.3 ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] php5: Php's sqlite3 module needs to be explicite linked to -lpthread with uClibc.
Also add the required package dependencies. See also ticket #7237 for
reference.
A simple test case is the following php script:
It hangs and triggers the max execution time without this patch.
Signed-off-by: Michael Heimpold
---
lang/php5/Makefile | 10 +-
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/lang/php5/Makefile b/lang/php5/Makefile
index aa1067e..fd84461 100644
--- a/lang/php5/Makefile
+++ b/lang/php5/Makefile
@@ -266,7 +266,7 @@ endef
define Package/php5-mod-pdo-sqlite
$(call Package/php5/Default)
- DEPENDS:=php5-mod-pdo +libsqlite3
+ DEPENDS:=php5-mod-pdo +libsqlite3 +libpthread
TITLE:=PDO driver for SQLite (3.x)
endef
@@ -318,7 +318,7 @@ endef
define Package/php5-mod-sqlite3
$(call Package/php5/Default)
- DEPENDS:=php5 +libsqlite3
+ DEPENDS:=php5 +libsqlite3 +libpthread
TITLE:=SQLite3 shared module (3.x)
endef
define Package/php5-mod-sqlite3/config
@@ -390,7 +390,7 @@ PKG_CONFIGURE_OPTS:= \
--disable-phar
ifneq ($(SDK),)
- PKG_BUILD_DEPENDS:=libopenssl zlib libcurl libgd libgmp libopenldap
libmysqlclient libpq libsqlite2 libsqlite3 libpcre libxml2
+ PKG_BUILD_DEPENDS:=libopenssl zlib libcurl libgd libgmp libopenldap
libmysqlclient libpq libsqlite2 libpthread libsqlite3 libpcre libxml2
# force PKG_CONFIGURE_{LIBS,OPTS} below when built in the SDK
CONFIG_PACKAGE_php5-cli:=m
CONFIG_PACKAGE_php5-cgi:=m
@@ -527,7 +527,7 @@ ifneq ($(CONFIG_PACKAGE_php5-mod-pdo),)
endif
ifneq ($(CONFIG_PACKAGE_php5-mod-pdo-sqlite),)
PKG_CONFIGURE_OPTS+= --with-pdo-sqlite=shared,"$(STAGING_DIR)/usr"
-PKG_CONFIGURE_LIBS+= -lsqlite3
+PKG_CONFIGURE_LIBS+= -lsqlite3 -lpthread
else
PKG_CONFIGURE_OPTS+= --without-pdo-sqlite
endif
@@ -567,7 +567,7 @@ endif
ifneq ($(CONFIG_PACKAGE_php5-mod-sqlite3),)
PKG_CONFIGURE_OPTS+= --with-sqlite3=shared,"$(STAGING_DIR)/usr"
- PKG_CONFIGURE_LIBS+= -lsqlite3
+ PKG_CONFIGURE_LIBS+= -lsqlite3 -lpthread
else
PKG_CONFIGURE_OPTS+= --without-sqlite3
endif
--
1.5.4.3
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] Strange usb-storage behaviour
Hi, I'm trying to get OpenWRT running on a AT91 ARM926-based device with 2 usb host ports. After booting, all important drivers get loaded: ohci_hcd and usb-storage. Before powering on the system, an usb flash drive is connected to one usb port. --snip-- Press the [f] key and hit [enter] to enter failsafe mode - regular preinit - - init - Please press Enter to activate this console. SCSI subsystem initialized ohci_hcd: USB 1.1 'Open' Host Controller (OHCI) Driver at91_ohci at91_ohci: AT91 OHCI at91_ohci at91_ohci: new USB bus registered, assigned bus number 1 at91_ohci at91_ohci: irq 29, io mem 0x00a0 hub 1-0:1.0: USB hub found hub 1-0:1.0: 2 ports detected Initializing USB Mass Storage driver... usbcore: registered new interface driver usb-storage USB Mass Storage support registered. gpio-buttons driver version 0.1.2 usb 1-1: new full speed USB device using at91_ohci and address 2 hub 1-1:1.0: USB hub found hub 1-1:1.0: 1 port detected usb 1-1.1: new full speed USB device using at91_ohci and address 3 scsi0 : usb-storage 1-1.1:1.0 scsi 0:0:0:0: Direct-Access Generic USB Flash Disk 1.00 PQ: 0 ANSI: 0 CCS sd 0:0:0:0: [sda] Attached SCSI removable disk --snap-- As you can see, the device is not fully recognized: there are some lines missing about the found partitions etc. Also no partions entries show up in /proc/partitions. BUT, when I run e.g. a "dd if=/dev/sda of=/dev/null bs=512 count=1", then the device shows up correctly --snip-- sd 0:0:0:0: [sda] 128000 512-byte logical blocks: (65.5 MB/62.5 MiB) sd 0:0:0:0: [sda] Assuming drive cache: write through sd 0:0:0:0: [sda] Assuming drive cache: write through --snap-- and the "cat /proc/partitions" shows: --snip-- ... 80 64000 sda 81 56196 sda1 --snap-- I already tried several usb flash drives to eliminate the drive as causal: the behaviour is the same for all. Then I tried to unload the usb-storage module while the usb flash devices remains connected: after re-insmod-ing usb-storage the device shows up correctly. Next test was to disconnect the usb flash drive, unload usb-storage. Then insmod usb-storage and re-connect the usb flash drive to usb port: same strange behaviour as initially described. Is this normal? Do I miss anything? Help! :-) Thank you, Michael PS: kernel version 2.6.34.5, openwrt trunk r23080 ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH 4/4] packages/lang/php5: Cleanup php.ini
Cleanup php.ini by removing dropped config items. Signed-off-by: Michael Heimpold Index: lang/php5/files/php.ini === --- lang/php5/files/php.ini (Revision 19124) +++ lang/php5/files/php.ini (Arbeitskopie) @@ -200,11 +200,6 @@ ; to possible security problems, if the code is not very well thought of. register_globals = Off -; Whether or not to register the old-style input arrays, HTTP_GET_VARS -; and friends. If you're not using them, it's recommended to turn them off, -; for performance reasons. -register_long_arrays = On - ; This directive tells PHP whether to declare the argv&argc variables (that ; would contain the GET information). If you don't use these variables, you ; should turn it off for increased performance. @@ -216,9 +211,6 @@ ; Magic quotes ; -; Magic quotes for incoming GET/POST/Cookie data. -magic_quotes_gpc = On - ; Magic quotes for runtime-generated data, e.g. data from SQL, from exec(), etc. magic_quotes_runtime = Off ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH 2/4] packages/lang/php5: Remove uts domain patch
This patch removes the domain name patch for the new php version 5.3.1 as it doesn't apply anymore. Signed-off-by: Michael Heimpold Index: lang/php5/patches/002-uts_domainname.patch === --- lang/php5/patches/002-uts_domainname.patch (Revision 19124) +++ lang/php5/patches/002-uts_domainname.patch (Arbeitskopie) @@ -1,13 +0,0 @@ -Index: php-5.2.4/ext/posix/posix.c -=== php-5.2.4.orig/ext/posix/posix.c 2007-09-02 12:24:45.0 +0200 -+++ php-5.2.4/ext/posix/posix.c2007-09-02 12:24:45.0 +0200 -@@ -468,7 +468,7 @@ - add_assoc_string(return_value, "version", u.version, 1); - add_assoc_string(return_value, "machine", u.machine, 1); - #ifdef _GNU_SOURCE -- add_assoc_string(return_value, "domainname", u.domainname, 1); -+ add_assoc_string(return_value, "domainname", u.__domainname, 1); - #endif - } - /* }}} */ ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH 1/4] packages/lang/php5: Update to version 5.3.1
The following patchset upgrades the php5 package to php's 5.3 stable branch. It removes the SPL build option as this is included in php's core henceforth, likewise for pcre module. On the other hand a new option for SysV IPC is added and a package for sqlite3 is introduced. As FastCGI support is now a core feature the php5-fastcgi package now depends on the php5-cgi package, containing just a link to the binary and the startup script. The cross-compile patch is updated to fit the new version. Signed-off-by: Michael Heimpold Index: lang/php5/patches/001-configure_cross.patch === --- lang/php5/patches/001-configure_cross.patch (Revision 19124) +++ lang/php5/patches/001-configure_cross.patch (Arbeitskopie) @@ -1,8 +1,7 @@ -Index: php-5.2.4/configure -=== php-5.2.4.orig/configure 2007-09-02 12:27:37.0 +0200 -+++ php-5.2.4/configure2007-09-02 12:28:32.0 +0200 -@@ -14679,7 +14679,7 @@ +diff -Naur php-5.3.1.orig/configure php-5.3.1/configure +--- php-5.3.1.orig/configure 2009-11-18 21:11:57.0 +0100 php-5.3.1/configure2010-01-15 23:43:10.0 +0100 +@@ -14712,7 +14712,7 @@ ac_libs=$LIBS LIBS="$LIBS -ldl" if test "$cross_compiling" = yes; then @@ -10,8 +9,8 @@ + found=yes else cat > conftest.$ac_ext <&6 - echo "configure:53057: checking for 3 arg ldap_set_rebind_proc" >&5 + echo "configure:54501: checking for 3 arg ldap_set_rebind_proc" >&5 Index: lang/php5/Makefile === --- lang/php5/Makefile (Revision 19124) +++ lang/php5/Makefile (Arbeitskopie) @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=php -PKG_VERSION:=5.2.6 -PKG_RELEASE:=3 +PKG_VERSION:=5.3.1 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=http://www.php.net/distributions/ -PKG_MD5SUM:=7380ffecebd95c6edb317ef861229ebd +PKG_MD5SUM:=63e97ad450f0f7259e785100b634c797 include $(INCLUDE_DIR)/package.mk @@ -31,33 +31,22 @@ endef define Package/php5/config - choice - prompt "PHP5 SPL Options" - depends PACKAGE_php5 - default PACKAGE_php5_without_spl + config PHP5_APC + bool "PHP5 APC support" + depends PACKAGE_php5 - config PACKAGE_php5_with_spl - bool "With SPL (and pcre) static" + config PHP5_EXIF + bool "PHP5 EXIF support" + depends PACKAGE_php5 - config PACKAGE_php5_without_spl - bool "without SPL (pcre may be enabled)" - endchoice - - config PHP5_APC - bool "PHP5 APC support" - - config PHP5_EXIF - bool "PHP5 EXIF support" + config PHP5_SYSVIPC + bool "PHP5 Semaphore, Shared Memory and IPC support" + depends PACKAGE_php5 endef define Package/php5 $(call Package/php5/Default) - ifneq ($(CONFIG_PACKAGE_php5_with_spl),) - DEPENDS:=+libopenssl +zlib - CONFIG_PACKAGE_php5-mod-pcre:= - else - DEPENDS:=+libopenssl +zlib +libpcre - endif + DEPENDS:=+libopenssl +libpcre +zlib endef define Package/php5/description @@ -90,7 +79,7 @@ define Package/php5-fastcgi $(call Package/php5/Default) - DEPENDS:=php5 + DEPENDS:=php5 +php5-cgi TITLE+= (FastCGI) endef @@ -141,12 +130,6 @@ TITLE:=OpenSSL module endef -define Package/php5-mod-pcre - $(call Package/php5/Default) - DEPENDS:=php5 +libpcre - TITLE:=PCRE module -endef - define Package/php5-mod-pgsql $(call Package/php5/Default) DEPENDS:=php5 +libpq @@ -171,6 +154,12 @@ TITLE:=SQLite module endef +define Package/php5-mod-sqlite3 + $(call Package/php5/Default) + DEPENDS:=php5 +libsqlite3 + TITLE:=SQLite3 module +endef + define Package/php5-mod-pdo $(call Package/php5/Default) DEPENDS:=php5 @@ -199,7 +188,6 @@ \ --with-config-file-path=/etc \ --enable-magic-quotes \ - --enable-memory-limit \ --disable-short-tags \ \ --disable-ctype \ @@ -223,10 +211,13 @@ --disable-tokenizer \ --with-zlib="$(STAGING_DIR)/usr" \ --with-zlib-dir="$(STAGING_DIR)/usr" \ - --disable-filter + --with-pcre-regex="$(STAGING_DIR)/usr" \ + --disable-filter \ + --disable-fileinfo \ + --disable-phar ifneq ($(SDK),) - PKG_BUILD_DEPENDS:=libopenssl zlib libcurl libgd libgmp libopenldap libmysqlclient libpq libsqlite2 libexpat + PKG_BUILD_DEPENDS:=libopenssl zlib libcurl libgd libgmp libopenldap libmysqlclient libpq libsqlite2 libsqlite3 li
Re: [OpenWrt-Devel] [PATCH] Add support for Microsoft MN-700 platform with its dualcolor power LED (fixes #2575)
Hi, I'm wondering if anything with my proposed patch was wrong or could be done in a "cleaner" fashion? Feedback is welcome! Best regards, Michael Heimpold Am Samstag 31 Mai 2008 06:11:03 schrieb Michael Heimpold: > [PATCH] Add support for Microsoft MN-700 platform with its dualcolor power > LED (fixes #2575) ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org http://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] Add support for Microsoft MN-700 platform with its dualcolor power LED (fixes #2575)
The Microsoft MN-700 router (very similar to the ASUS WL-500g) is not
detected correctly by the broadcom-diag kernel module. Also it is not
possible to switch off the power LED after it was enabled. With the
included patch these two issues are solved. It also exports the LED
flash interval via /proc.
Signed-off-by: Michael Heimpold
---
Index: target/linux/brcm-2.4/profiles/MN700.mk
===
--- target/linux/brcm-2.4/profiles/MN700.mk (Revision 0)
+++ target/linux/brcm-2.4/profiles/MN700.mk (Revision 0)
@@ -0,0 +1,16 @@
+#
+# Copyright (C) 2008 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+define Profile/MN700
+ NAME:=Microsoft MN-700
+ PACKAGES:=kmod-brcm-wl wlc nas kmod-wlcompat -kmod-switch
+endef
+
+define Profile/MN700/Description
+ Package set optimized for the Microsoft MN-700
+endef
+$(eval $(call Profile,MN700))
Index: target/linux/brcm-2.4/base-files/etc/init.d/netconfig
===
--- target/linux/brcm-2.4/base-files/etc/init.d/netconfig (Revision 11305)
+++ target/linux/brcm-2.4/base-files/etc/init.d/netconfig (Arbeitskopie)
@@ -57,7 +57,7 @@
c["wan_ifname"] = ""
c["lan_ifname"] = "eth1"
}
- if (model == "ASUS WL-500g") {
+ if ((model == "ASUS WL-500g") || (model == "Microsoft MN-700"))
{
c["wan_ifname"] = "eth1"
c["lan_ifname"] = "eth0"
}
Index: target/linux/brcm-2.4/base-files/etc/diag.sh
===
--- target/linux/brcm-2.4/base-files/etc/diag.sh(Revision 11305)
+++ target/linux/brcm-2.4/base-files/etc/diag.sh(Arbeitskopie)
@@ -12,11 +12,19 @@
preinit)
set_led dmz 1
set_led diag 1
- set_led power 0
+ if [ "$(cat /proc/diag/model)" = "Microsoft MN-700" ] ;
then
+ set_led power f
+ else
+ set_led power 0
+ fi
;;
failsafe)
set_led diag f
- set_led power f
+ if [ "$(cat /proc/diag/model)" = "Microsoft MN-700" ] ;
then
+ set_led power 2
+ else
+ set_led power f
+ fi
set_led dmz f
;;
done)
Index: package/broadcom-diag/src/diag.c
===
--- package/broadcom-diag/src/diag.c(Revision 11305)
+++ package/broadcom-diag/src/diag.c(Arbeitskopie)
@@ -51,6 +51,8 @@
static int fill_event(struct event_t *);
static unsigned int gpiomask = 0;
module_param(gpiomask, int, 0644);
+static unsigned int flashtime = FLASH_TIME;
+module_param(flashtime, int, 0644);
enum {
/* Linksys */
@@ -123,6 +125,9 @@
/* Sitecom */
WL105B,
+
+ /* Microsoft */
+ MN700,
};
static void __init bcm4780_init(void) {
@@ -670,6 +675,16 @@
{ .name = "power", .gpio = 1 << 3},
},
},
+ /* Microsoft */
+ [MN700] = {
+ .name = "Microsoft MN-700",
+ .buttons= {
+ { .name = "reset", .gpio = 1 << 7 },
+ },
+ .leds = {
+ { .name = "power", .gpio = 1 << 6, .polarity =
MULTI },
+ },
+ },
};
static struct platform_t __init *platform_detect(void)
@@ -781,6 +796,9 @@
if (simple_strtoul(boardnum, NULL, 0) == 2)
return &platforms[WAP54GV1];
}
+ /* MN-700 has also hardware_version 'WL500-...', so use
boardnum and keep
before */
+ if (startswith(boardnum, "mn700"))
+ return &platforms[MN700];
if (startswith(getvar("hardware_version"), "WL500-"))
return &platforms[WL500G];
if (startswith(getvar("hardware_version"), "WL300-")) {
@@ -1004,9 +1022,10 @@
l->state = 0;
set_led_extif(l);
} else {
- if (l->polarity != INPUT) oe_mask |= l->gpio;
+
