[OpenWrt-Devel] [patch] Vim configuration
Fixes to vimrc file to avoid some errors.
Signed-off-by: Michael Geddes
---
Index: files/vimrc.full
===
--- files/vimrc.full(revision 11372)
+++ files/vimrc.full(working copy)
@@ -1,15 +1,15 @@
-set showcmd" Show (partial) command in status line.
-set showmatch " Show matching brackets.
-set ignorecase " Do case insensitive matching
-set incsearch " Incremental search
-set autowrite " Automatically save before commands like :next
-and :make
-set nocompatible" Use Vim defaults instead of 100% vi compatibility
+" vim: sts=2 sw=2 et
+set showcmd " Show (partial) command in status line.
+set showmatch " Show matching brackets.
+set ignorecase" Do case insensitive matching
+set incsearch " Incremental search
+set autowrite " Automatically save before commands like :next and :make
+set nocompatible " Use Vim defaults instead of 100% vi compatibility
set backspace=indent,eol,start " more powerful backspacing
-set autoindent " always set autoindenting on
-set linebreak " Don't wrap words by default
-set textwidth=0 " Don't wrap lines by default
-set ruler " show the cursor position all the time
+set autoindent" always set autoindenting on
+set linebreak " Don't wrap words by default
+set textwidth=0 " Don't wrap lines by default
+set ruler " show the cursor position all the time
if has('syntax') && &term =~ "xterm"
if has("terminfo")
set t_Co=8
@@ -20,4 +20,7 @@
set t_Sf=[3%dm
set t_Sb=[4%dm
endif
- syn on
+ if filereadable(expand('$VIMRUNTIME/syntax/synload.vim'))
+syn on
+ fi
+endif
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
http://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] 1/4 Add tonezone support for Asterisk 1.4
This was originally submitted by somebody else - and has been tidied up a bit - the original doesn't seem to have been aplied yet. Required for meetme support in asterisk. Signed-off-by: Michael Geddes --- Index: zaptel-1.4.x/patches/200-Makefile-pwd.patch === --- zaptel-1.4.x/patches/200-Makefile-pwd.patch (revision 0) +++ zaptel-1.4.x/patches/200-Makefile-pwd.patch (revision 0) @@ -0,0 +1,10 @@ +--- zaptel-1.4.6.org/Makefile 2007-09-20 20:42:35.0 +0200 zaptel-1.4.6/Makefile 2007-11-10 18:07:07.0 +0100 +@@ -10,6 +10,7 @@ + ifeq ($(MAKELEVEL),0) + PWD:=$(shell pwd) + endif ++PWD:=`pwd` + + ARCH:=$(shell uname -m | sed -e s/i.86/i386/) + Index: zaptel-1.4.x/patches/300-zaptel-base.patch === --- zaptel-1.4.x/patches/300-zaptel-base.patch (revision 0) +++ zaptel-1.4.x/patches/300-zaptel-base.patch (revision 0) @@ -0,0 +1,23 @@ +diff -Nru zaptel-1.4.9.2.org/kernel/zaptel-base.c zaptel-1.4.9.2/kernel/zaptel-base.c +--- zaptel-1.4.9.2.org/kernel/zaptel-base.c2008-02-28 20:00:47.0 +0100 zaptel-1.4.9.2/kernel/zaptel-base.c2008-03-06 10:02:20.0 +0100 +@@ -7346,6 +7346,7 @@ + #endif /* CONFIG_ZAP_UDEV */ + + #ifdef CONFIG_DEVFS_FS ++ umode_t mode = S_IFCHR|S_IRUGO|S_IWUGO; + dev->devfs_handle = devfs_register(zaptel_devfs_dir, dev->name, DEVFS_FL_DEFAULT, ZT_MAJOR, dev->minor, mode, &zt_fops, NULL); + #endif /* CONFIG_DEVFS_FS */ + +diff -Nru zaptel-1.4.9.2.org/kernel/zaptel.h zaptel-1.4.9.2/kernel/zaptel.h +--- zaptel-1.4.9.2.org/kernel/zaptel.h 2008-02-05 00:00:48.0 +0100 zaptel-1.4.9.2/kernel/zaptel.h 2008-03-06 10:00:41.0 +0100 +@@ -1203,7 +1203,7 @@ + const char *name; + __u8 minor; + #ifdef CONFIG_DEVFS_FS +- static devfs_handle_t devfs_handle; ++ devfs_handle_t devfs_handle; + #endif + }; + Index: zaptel-1.4.x/Makefile === --- zaptel-1.4.x/Makefile (revision 0) +++ zaptel-1.4.x/Makefile (revision 0) @@ -0,0 +1,115 @@ +# +# Copyright (C) 2006 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# +# $Id: Makefile 5624 2006-11-23 00:29:07Z nbd $ + +include $(TOPDIR)/rules.mk +include $(INCLUDE_DIR)/kernel.mk + +PKG_NAME:=zaptel +PKG_VERSION:=1.4.9.2 +PKG_RELEASE:=1 + +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=http://ftp.digium.com/pub/zaptel/releases/ +PKG_MD5SUM:=f6af404cc0244b93a2fc88b237f374bd + +include $(INCLUDE_DIR)/package.mk + +define Package/zaptel14/Default + TITLE:=Zaptel + URL:=http://ftp.digium.com/pub/zaptel/releases +endef + +define KernelPackage/zaptel14 + SUBMENU:=Other modules + $(call Package/zaptel14/Default) + TITLE+= (kernel module) + VERSION:=$(LINUX_VERSION)-$(PKG_VERSION)-$(BOARD)-$(PKG_RELEASE) + FILES:=$(PKG_BUILD_DIR)/kernel/zaptel.$(LINUX_KMOD_SUFFIX) \ + $(PKG_BUILD_DIR)/kernel/ztdummy.$(LINUX_KMOD_SUFFIX) + AUTOLOAD:=$(call AutoLoad,70,zaptel ztdummy) +endef +define KernelPackage/zaptel14/description + This package contains the Zaptel core module and ztdummy driver. +endef + +define Package/zaptel14-libtonezone + $(call Package/zaptel14/Default) + SECTION:=libs + CATEGORY:=Libraries + TITLE+= libtonezone (library) +endef + +define Build/Compile/zaptel14 + $(MAKE) -C $(PKG_BUILD_DIR) \ + DESTDIR="$(PKG_INSTALL_DIR)" \ + ARCH="$(LINUX_KARCH)" \ + CC=$(KERNEL_CC) \ + LD=$(TARGET_CROSS)ld \ + HOSTCC=$(HOSTCC) \ + KVERS=$(LINUX_VERSION) \ + KSRC=$(LINUX_DIR) \ + KFLAGS_PPC="-G 0 -mno-abicalls -fno-pic -pipe -finline-limit=10 -mabi=32 $(TARGET_CFLAGS) -mlong-calls -fno-common -nostdinc -iwithprefix include" \ + TOPDIR_MODULES="zaptel ztdummy" \ + SUBDIR_MODULES="" \ + modules zttest +endef + +define Build/Compile/zaptel14-libtonezone + $(MAKE) -C $(PKG_BUILD_DIR) \ + DESTDIR="$(PKG_INSTALL_DIR)" \ + CC=$(TARGET_CC) \ + LD=$(TARGET_CROSS)ld \ + AR=$(TARGET_CROSS)ar \ + KSRC=$(LINUX_DIR) \ + HOSTCC=$(HOSTCC) \ + install-libs install-include +endef + +define Build/Compile + $(call Build/Compile/zaptel14) + $(call Build/Compile/zaptel14-libtonezone) +endef + +define Build/InstallDev + mkdir -p $(STAGING_DIR)/usr/include/zaptel/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/zaptel/zaptel.h $(STAGING_DIR)/usr/include/zaptel/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/zaptel/tonezone.h $(STAGING_DIR)/usr/include/zaptel/ + mkdir -p $(STAGING_DIR)/usr/lib/ + $(CP) $(PKG_IN
[OpenWrt-Devel] [PATCH] 2/4 Add speexdsp package to speex
speexdsp just needs to be made into a package for use in the latest asterisk.
Was already being built.
Signed-off-by: Michael Geddes
---
Index: Makefile
===
--- Makefile(revision 11372)
+++ Makefile(working copy)
@@ -29,6 +29,13 @@
URL:=http://www.speex.org/
endef
+define Package/libspeexdsp
+ SECTION:=libs
+ CATEGORY:=Libraries
+ TITLE:=Open source speech compression codec library output to DSP
+ URL:=http://www.speex.org/
+endef
+
define Package/libspeex/description
Open source patent-free speech compression codec library.
Speex is an Open Source/Free Software patent-free audio compression
@@ -41,6 +48,18 @@
This package contains the shared codec library, needed by other
programs.
endef
+define Package/libspeex/description
+ Open source patent-free speech compression codec library.
+ Speex is an Open Source/Free Software patent-free audio compression
+ format designed for speech. The Speex Project aims to lower the
+ barrier of entry for voice applications by providing a free
+ alternative to expensive proprietary speech codecs. Moreover, Speex
+ is well-adapted to Internet applications and provides useful features
+ that are not present in most other codecs.
+
+ This package contains the shared dsp library, needed by other programs.
+endef
+
TARGET_LDFLAGS:=$(TARGET_LDFLAGS) -lnotimpl
define Build/Configure
@@ -66,8 +85,10 @@
$(CP) $(PKG_INSTALL_DIR)/usr/include/speex $(1)/usr/include/
mkdir -p $(1)/usr/lib
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libspeex.{a,so*} $(1)/usr/lib/
+ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libspeexdsp.{a,so*} $(1)/usr/lib/
mkdir -p $(1)/usr/lib/pkgconfig
$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/speex.pc
$(1)/usr/lib/pkgconfig/
+ $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/speexdsp.pc
$(1)/usr/lib/pkgconfig/
endef
define Package/libspeex/install
@@ -75,4 +96,11 @@
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libspeex.so.* $(1)/usr/lib/
endef
+define Package/libspeexdsp/install
+ $(INSTALL_DIR) $(1)/usr/lib
+ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libspeexdsp.so.* $(1)/usr/lib/
+endef
+
$(eval $(call BuildPackage,libspeex))
+$(eval $(call BuildPackage,libspeexdsp))
+
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
http://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] 3/4 Latest Asterisk 1.4.21
Update to asterisk 1.4.21 (yes there's a 1.4.21.1 but I haven't tested it)
Package 'rawplayer' for asterisk.
Requires the tonezone patch for app-meetme
Disabled ilbc which required a separate (non-free) package.
Signed-off-by: Michael Geddes
---
Index: patches/026-gsm-mips.patch
===
--- patches/026-gsm-mips.patch (revision 11372)
+++ patches/026-gsm-mips.patch (working copy)
@@ -1,30 +0,0 @@
-diff -Nru asterisk-1.4.5.org/codecs/gsm/Makefile
asterisk-1.4.5/codecs/gsm/Makefile
asterisk-1.4.5.org/codecs/gsm/Makefile 2007-02-17 01:31:42.0
+0100
-+++ asterisk-1.4.5/codecs/gsm/Makefile 2007-06-22 09:13:13.0 +0200
-@@ -38,7 +38,7 @@
- # probably require gcc.
-
- ifeq (, $(findstring $(OSARCH) , Darwin SunOS ))
--ifeq (, $(findstring $(PROC) , x86_64 amd64 ultrasparc sparc64 arm armv5b
armeb ppc powerpc ppc64 ia64 s390 bfin mipsel ))
-+ifeq (, $(findstring $(PROC) , x86_64 amd64 ultrasparc sparc64 arm armv5b
armeb ppc powerpc ppc64 ia64 s390 bfin mipsel mips ))
- ifeq (, $(findstring $(shell uname -m) , ppc ppc64 alpha armv4l s390 ))
- OPTIMIZE+=-march=$(PROC)
- endif
-@@ -209,7 +209,7 @@
- # XXX should merge with GSM_OBJECTS
- ifeq ($(OSARCH),linux-gnu)
- ifeq (,$(findstring $(shell uname -m) , x86_64 amd64 ppc ppc64 alpha armv4l
sparc64 parisc s390 ))
--ifeq (,$(findstring $(PROC) , arm armv5b armeb powerpc ia64 s390 bfin mipsel
))
-+ifeq (,$(findstring $(PROC) , arm armv5b armeb powerpc ia64 s390 bfin mipsel
mips ))
- GSM_SOURCES+= $(SRC)/k6opt.s
- endif
- endif
-@@ -261,7 +261,7 @@
-
- ifeq ($(OSARCH),linux-gnu)
- ifeq (,$(findstring $(shell uname -m) , x86_64 amd64 ppc ppc64 alpha armv4l
sparc64 parisc ))
--ifeq (,$(findstring $(PROC) , arm armv5b armeb powerpc ia64 bfin mipsel ))
-+ifeq (,$(findstring $(PROC) , arm armv5b armeb powerpc ia64 bfin mipsel mips
))
- GSM_OBJECTS+= $(SRC)/k6opt.o
- endif
- endif
Index: patches/017-Makefile-no_march.patch
===
--- patches/017-Makefile-no_march.patch (revision 11372)
+++ patches/017-Makefile-no_march.patch (working copy)
@@ -1,7 +1,7 @@
-diff -Nru asterisk-1.4.5.org/Makefile asterisk-1.4.5/Makefile
asterisk-1.4.5.org/Makefile2007-05-24 21:05:08.0 +0200
-+++ asterisk-1.4.5/Makefile2007-06-22 09:10:18.0 +0200
-@@ -200,7 +200,7 @@
+diff -Nru asterisk-1.4.18.org/Makefile asterisk-1.4.18/Makefile
+--- asterisk-1.4.18.org/Makefile 2008-01-29 18:21:33.0 +0100
asterisk-1.4.19.1/Makefile 2008-03-02 19:39:23.0 +0100
+@@ -215,7 +215,7 @@
endif
ifneq ($(PROC),ultrasparc)
Index: patches/023-autoconf-chan_h323.patch
===
--- patches/023-autoconf-chan_h323.patch(revision 11372)
+++ patches/023-autoconf-chan_h323.patch(working copy)
@@ -1,7 +1,7 @@
-diff -ruN asterisk-1.4.9-old/acinclude.m4 asterisk-1.4.9-new/acinclude.m4
asterisk-1.4.9-old/acinclude.m42007-09-04 17:20:27.0 +0200
-+++ asterisk-1.4.9-new/acinclude.m42007-09-04 17:17:04.0 +0200
-@@ -496,6 +496,7 @@
+diff -Nru asterisk-1.4.18.org/acinclude.m4 asterisk-1.4.18/acinclude.m4
+--- asterisk-1.4.18.org/acinclude.m4 2007-07-25 19:14:14.0 +0200
asterisk-1.4.19.1/acinclude.m4 2008-03-02 19:40:27.0 +0100
+@@ -508,6 +508,7 @@
;;
esac
AC_MSG_RESULT(${OPENH323_BUILD})
@@ -9,10 +9,10 @@
AC_SUBST([OPENH323_SUFFIX])
AC_SUBST([OPENH323_BUILD])
-diff -ruN asterisk-1.4.9-old/configure.ac asterisk-1.4.9-new/configure.ac
asterisk-1.4.9-old/configure.ac2007-09-04 17:20:27.0 +0200
-+++ asterisk-1.4.9-new/configure.ac2007-09-04 17:22:08.0 +0200
-@@ -807,7 +807,7 @@
+diff -Nru asterisk-1.4.18.org/configure.ac asterisk-1.4.18/configure.ac
+--- asterisk-1.4.18.org/configure.ac 2008-01-16 02:13:27.0 +0100
asterisk-1.4.19.1/configure.ac 2008-03-02 19:40:27.0 +0100
+@@ -835,7 +835,7 @@
if test "${HAS_PWLIB:-unset}" != "unset"; then
AST_CHECK_OPENH323_PLATFORM()
Index: patches/013-chan_iax2-tmp_path.patch
===
--- patches/013-chan_iax2-tmp_path.patch(revision 11372)
+++ patches/013-chan_iax2-tmp_path.patch(working copy)
@@ -1,7 +1,7 @@
-diff -Nru asterisk-1.4.5.org/channels/chan_iax2.c
asterisk-1.4.5/channels/chan_iax2.c
asterisk-1.4.5.org/channels/chan_iax2.c2007-06-14 23:50:40.0
+0200
-+++ asterisk-1.4.5/channels/chan_iax2.c2007-06-22 09:03:01.0
+0200
-@@ -1376,7 +1376,7 @@
+diff -Nru asterisk-1.4.18.org/channels/chan_iax2.c
asterisk-1.4.18/channels/chan_iax2.c
+--- asterisk-1.4.18.org/channels/chan_iax2.c 2008-01-31 20:52:49.0
+0100
asterisk-1.4.19.1/channels/
[OpenWrt-Devel] [PATCH] 4/4 Asterisk Utilities 1.4.7
Update to 1.4.7
Requires a patch to pthread call.
Signed-off-by: Michael Geddes
---
Index: asterisk-addons-1.4.x/patches/031-pthread_param.patch
===
--- asterisk-addons-1.4.x/patches/031-pthread_param.patch (revision 0)
+++ asterisk-addons-1.4.x/patches/031-pthread_param.patch (revision 0)
@@ -0,0 +1,19 @@
+*** asterisk-addons-1.4.7/channels/ooh323c/src/ooCmdChannel.c.orig
2008-06-27 18:12:50.0 +0800
+--- asterisk-addons-1.4.7/channels/ooh323c/src/ooCmdChannel.c 2008-06-27
18:12:11.0 +0800
+***
+*** 37,43
+ if ((ret = pipe(thePipe)) == -1) {
+return OO_FAILED;
+ }
+!pthread_mutex_init(&gCmdChanLock);
+
+ gH323ep.cmdSock = dup(thePipe[0]);
+ close(thePipe[0]);
+--- 37,43
+ if ((ret = pipe(thePipe)) == -1) {
+return OO_FAILED;
+ }
+!pthread_mutex_init(&gCmdChanLock, NULL);
+
+ gH323ep.cmdSock = dup(thePipe[0]);
+ close(thePipe[0]);
Index: asterisk-addons-1.4.x/patches/021-cross_configure.patch
===
--- asterisk-addons-1.4.x/patches/021-cross_configure.patch (revision 11372)
+++ asterisk-addons-1.4.x/patches/021-cross_configure.patch (working copy)
@@ -1,12 +1,12 @@
-diff -ruN asterisk-addons-1.4.2-old/menuselect/Makefile
asterisk-addons-1.4.2-new/menuselect/Makefile
asterisk-addons-1.4.2-old/menuselect/Makefile 2007-06-06
00:01:45.0 +0200
-+++ asterisk-addons-1.4.2-new/menuselect/Makefile 2007-09-19
18:00:27.0 +0200
-@@ -42,7 +42,7 @@
- @$(MAKE) menuselect
+diff -Nru asterisk-addons-1.4.5.org/menuselect/Makefile
asterisk-addons-1.4.5/menuselect/Makefile
+--- asterisk-addons-1.4.5.org/menuselect/Makefile 2007-11-21
01:17:33.0 +0100
asterisk-addons-1.4.5/menuselect/Makefile 2007-12-20 22:47:17.0
+0100
+@@ -51,7 +51,7 @@
+ $(OBJS) menuselect_gtk.o menuselect_curses.o menuselect_stub.o: autoconfig.h
menuselect.h
- autoconfig.h:
-- @./configure $(CONFIGURE_SILENT) CC= LD= AR=
-+ @./configure $(CONFIGURE_SILENT) CC= LD= AR= LDFLAGS=
+ makeopts autoconfig.h: autoconfig.h.in makeopts.in
+- @./configure $(CONFIGURE_SILENT) CC= LD= AR= CFLAGS=
++ @./configure $(CONFIGURE_SILENT) CC= LD= AR= CFLAGS= LDFLAGS=
- _gmenuselect: autoconfig.h
- @$(MAKE) gmenuselect
+ menuselect gmenuselect: mxml/libmxml.a
+
Index: asterisk-addons-1.4.x/patches/011-chan_mobile.patch
===
--- asterisk-addons-1.4.x/patches/011-chan_mobile.patch (revision 11372)
+++ asterisk-addons-1.4.x/patches/011-chan_mobile.patch (working copy)
@@ -1,398 +1,13 @@
-diff -Nru asterisk-addons-1.4.2/build_tools/menuselect-deps.in
asterisk-addons-svn/build_tools/menuselect-deps.in
asterisk-addons-1.4.2/build_tools/menuselect-deps.in 2007-05-14
18:22:44.0 +0200
-+++ asterisk-addons-svn/build_tools/menuselect-deps.in 2007-06-04
19:10:59.0 +0200
+diff -Nru asterisk-addons-1.4.6.org/build_tools/menuselect-deps.in
asterisk-addons-1.4.6/build_tools/menuselect-deps.in
+--- asterisk-addons-1.4.6.org/build_tools/menuselect-deps.in 2007-05-14
18:22:44.0 +0200
asterisk-addons-1.4.6/build_tools/menuselect-deps.in 2008-03-06
08:38:14.0 +0100
@@ -1,2 +1,3 @@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
-diff -Nru asterisk-addons-1.4.2/configs/mobile.conf.sample
asterisk-addons-svn/configs/mobile.conf.sample
asterisk-addons-1.4.2/configs/mobile.conf.sample 1970-01-01
01:00:00.0 +0100
-+++ asterisk-addons-svn/configs/mobile.conf.sample 2007-06-04
19:11:00.0 +0200
-@@ -0,0 +1,30 @@
-+;
-+; mobile.conf
-+;
-+
-+[general]
-+interval=60 ; Number of seconds between trying to connect to
devices.
-+
-+; The following is a list of the devices we deal with.
-+; Every device listed below will be available for calls in and out of
Asterisk.
-+; Discovered devices not in this list are not available.
-+; Use the CLI command 'mobile search' to discover devices.
-+; Use the CLI command 'mobile show devices' to see device status.
-+;
-+; To place out through a cell phone use Dial(Mobile/[device]/NNN.) in
your dialplan.
-+; To call a headset use Dial(Mobile/[device]).
-+
-+;[dave]
-+;address=00:12:56:90:6E:00
-+;port=4
-+;context=incoming-mobile
-+
-+;[blackberry]
-+;address=00:0F:86:0E:AE:42
-+;port=2
-+;context=incoming-mobile
-+
-+;[headset]
-+;address=00:0B:9E:11:74:A5
-+;port=1
-+;type=headset
-diff -Nru asterisk-addons-1.4.2/configure.ac asterisk-addons-svn/configure.ac
asterisk-addons-1.4.2/configure.ac 2007-05-14 18:22:44.0 +0200
-+++ asterisk-addons-svn/configure.ac 2007-06-04 19:11:00.0 +0200
-@@ -17,7 +17,7 @@
- AC_CONFIG_SRCDIR([res_config_mysql.c])
-
- AC_COPYRIGHT("Asterisk-addons")
--AC_REVISION($Revision: 382 $)
-+A
[OpenWrt-Devel] [PATCH] Iksemel depends fix
Signed-off-by: Michael Geddes Index: Makefile === --- Makefile(revision 11372) +++ Makefile(working copy) @@ -25,7 +25,7 @@ CATEGORY:=Libraries TITLE:=Iksemel Jabber Library URL:=http://code.google.com/p/iksemel/ - DEPENDS:= +libgnutls + DEPENDS:= +libgnutls +libtasn1 endef CONFIGURE_ARGS += \ ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org http://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] Apache with modules 1/3 libapr
I have previously submitted patches to allow both static and module versions of
apache. These patches supersede the previous one.
This set starts off with patches to libapr to support Apache with modules
rather than static. With modules, it is more versatile, and more
compact for a required feature set.
Much of this work was borrowed from optware.
Signed-off-by: Michael Geddes
---
Index: Makefile
===
--- Makefile(revision 11372)
+++ Makefile(working copy)
@@ -29,9 +29,7 @@
endef
CONFIGURE_ARGS += \
- --with-devrandom=/dev/urandom \
- --disable-dso \
- --enable-ipv6
+ --with-devrandom=/dev/urandom
CONFIGURE_VARS += \
ac_cv_file__dev_zero=yes \
@@ -39,36 +37,53 @@
apr_cv_mutex_robust_shared=no \
apr_cv_tcp_nodelay_with_cork=yes \
ac_cv_sizeof_ssize_t=4 \
- LDFLAGS="LDFLAGS -lpthread" \
+ LDFLAGS="LDFLAGS -lpthread"
-define Build/Compile
+ifneq ($(CONFIG_PACKAGE_libapr),)
+define Build/Compile/libapr
+ echo configuring APR Dynamic
+ $(call Build/Configure/Default, \
+ --disable-static \
+ --enable-layout=GNU \
+ --enable-lfs \
+ --enable-ipv6 \
+ )
+ echo Building APR Dynamic
$(MAKE) -C $(PKG_BUILD_DIR) DESTDIR="$(PKG_INSTALL_DIR)" all install
endef
+endif
+define Build/Compile
+ $(call Build/Compile/libapr)
+endef
+
+define Build/Configure
+ echo NOT configuring APR
+endef
+
define Build/InstallDev
- $(INSTALL_DIR) $(1)/usr/bin $(1)/usr/include/apr-1 $(1)/usr/lib
$(1)/usr/lib/pkgconfig $(1)/usr/share/build-1
- $(CP) $(PKG_INSTALL_DIR)/usr/bin/apr-1-config \
- $(1)/usr/bin/
- $(CP) $(PKG_INSTALL_DIR)/usr/include/apr-1/* \
- $(1)/usr/include/apr-1/
- $(CP) $(PKG_INSTALL_DIR)/usr/lib/libapr-1.{la,a,so*} \
- $(1)/usr/lib/
- $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/apr-1.pc \
- $(1)/usr/lib/pkgconfig/
- $(CP) $(PKG_INSTALL_DIR)/usr/share/build-1/* \
- $(1)/usr/share/build-1/
- $(SED)
's,^datadir=\"/usr/share\",datadir=\"$(STAGING_DIR)/usr/share\",g'
$(1)/usr/bin/apr-1-config
- $(SED)
's,^installbuilddir=\"/usr/share/build-1\",installbuilddir=\"$(STAGING_DIR)/usr/share/build-1\",g'
$(1)/usr/bin/apr-1-config
- $(SED)
's,^libdir=\"{exec_prefix}/lib,libdir=\"$(STAGING_DIR)/usr/lib,g'
$(1)/usr/bin/apr-1-config
- $(SED)
's,^includedir=\"{prefix}/include/,includedir=\"$(STAGING_DIR)/usr/include/,g'
$(1)/usr/bin/apr-1-config
- $(SED) 's,-Llibdir,,g' $(1)/usr/bin/apr-1-config
- $(SED) 's,-Rlibdir,,g' $(1)/usr/bin/apr-1-config
+ $(INSTALL_DIR) $(1)/usr/bin $(1)/usr/include/apr-1 $(1)/usr/lib
$(1)/usr/lib/pkgconfig $(1)/usr/share/build-1 $(1)/usr/include/apache2
+ $(CP) $(PKG_INSTALL_DIR)/usr/bin/apr-1-config*$(1)/usr/bin || true
+ $(CP) $(PKG_INSTALL_DIR)/usr/include/apr-1/*
$(1)/usr/include/apr-1 || true
+ $(CP) $(PKG_INSTALL_DIR)/usr/include/apache2/*
$(1)/usr/include/apache2 || true
+ $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{apr-1,apr}.{la,a,so*}
$(1)/usr/lib || true
+ $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/apr-1.pc
$(1)/usr/lib/pkgconfig || true
+ $(CP) $(PKG_INSTALL_DIR)/usr/share/build-1/*
$(1)/usr/share/build-1 || true
+ for i in $(1)/usr/bin/apr-1-config* ; do \
+ $(SED)
's,^datadir=\"/usr/share\",datadir=\"$(STAGING_DIR)/usr/share\",g' i; \
+ $(SED)
's,^installbuilddir=\"/usr/share/build-1\",installbuilddir=\"$(STAGING_DIR)/usr/share/build-1\",g'
i ; \
+ $(SED)
's,^libdir=\"{exec_prefix}/lib,libdir=\"$(STAGING_DIR)/usr/lib,g' i ; \
+ $(SED)
's,^includedir=\"{prefix}/include/,includedir=\"$(STAGING_DIR)/usr/include/,g'
i ; \
+ $(SED) 's,-Llibdir,,g' i ; \
+ $(SED) 's,-Rlibdir,,g' i ; \
+ done
$(SED) 's,/usr/share/build-1,$(STAGING_DIR)/usr/share/build-1,g'
$(1)/usr/share/build-1/apr_rules.mk
endef
define Package/libapr/install
$(INSTALL_DIR) $(1)/usr/lib
- $(CP) $(PKG_INSTALL_DIR)/usr/lib/libapr-1.so.* $(1)/usr/lib/
+ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libapr.so.* $(1)/usr/lib/
endef
$(eval $(call BuildPackage,libapr))
+
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
http://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] Apache with modules 2/3 - libapr utils
Patches to libapr-util to support apache with modules.
Signed-off-by: Michael Geddes
---
Index: Makefile
===
--- Makefile(revision 11372)
+++ Makefile(working copy)
@@ -42,18 +42,21 @@
APR_BUILD_DIR="$(STAGING_DIR)/usr/share/build-1" \
define Build/Compile
- $(MAKE) -C $(PKG_BUILD_DIR)
APRUTIL_LIBS="-lsqlite3 -L$(STAGING_DIR)/usr/lib -lexpat -liconv -lapr-1 -luuid
-lm -lcrypt"
all
+ $(MAKE) -C $(PKG_BUILD_DIR)
APRUTIL_LIBS="-lsqlite3 -L$(STAGING_DIR)/usr/lib -lexpat -liconv -lapr -luuid
-lm -lcrypt"
all
$(MAKE) -C $(PKG_BUILD_DIR) DESTDIR="$(PKG_INSTALL_DIR)" install
endef
define Build/InstallDev
$(INSTALL_DIR) $(1)/usr/bin $(1)/usr/include/apr-1/ $(1)/usr/lib
$(1)/usr/lib/pkgconfig/
$(CP) $(PKG_INSTALL_DIR)/usr/bin/apu-1-config \
- $(1)/usr/bin/
+ $(1)/usr/bin
$(CP) $(PKG_INSTALL_DIR)/usr/include/apr-1/* \
$(1)/usr/include/apr-1/
- $(CP) $(PKG_INSTALL_DIR)/usr/lib/libaprutil-1.{la,a,so*} \
+ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libaprutil-1.{la,so*} \
$(1)/usr/lib/
+ [ ! -e $(PKG_INSTALL_DIR)/usr/lib/libaprutil-1.a ] \
+ || $(CP) $(PKG_INSTALL_DIR)/usr/lib/libaprutil-1.a \
+ $(1)/usr/lib/
$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/apr-util-1.pc \
$(1)/usr/lib/pkgconfig/
$(SED) 's, -e \"s -Iprefix/lib g\",,g' $(1)/usr/bin/apu-1-config
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
http://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] Apache with modules 3/3 Apache - include as separate modules
Index: patches/005-apxs_optware.patch
===
--- patches/005-apxs_optware.patch (revision 0)
+++ patches/005-apxs_optware.patch (revision 0)
@@ -0,0 +1,46 @@
+--- httpd-2.2.4.orig/support/apxs.in 2005-02-04 12:21:18.0 -0800
httpd-2.2.4/support/apxs.in2005-02-20 09:53:13.861402759 -0800
+@@ -199,18 +199,19 @@
+ ($httpd = $0) =~ s:support/apxs$::;
+ }
+
+-unless (-x "$httpd") {
+- error("$httpd not found or not executable");
+- exit 1;
+-}
+-
+-unless (grep /mod_so/, `. $envvars && $httpd -l`) {
+-error("Sorry, no shared object support for Apache");
+-error("available under your platform. Make sure");
+-error("the Apache module mod_so is compiled into");
+-error("your server binary `$httpd'.");
+-exit 1;
+-}
++### these checks will not work when cross-compiling into a staging area!
++#unless (-x "$httpd") {
++# error("$httpd not found or not executable");
++# exit 1;
++#}
++#
++#unless (grep /mod_so/, `. $envvars && $httpd -l`) {
++#error("Sorry, no shared object support for Apache");
++#error("available under your platform. Make sure");
++#error("the Apache module mod_so is compiled into");
++#error("your server binary `$httpd'.");
++#exit 1;
++#}
+
+ sub get_config_vars{
+ my ($file, $rh_config) = @_;
+@@ -528,9 +529,10 @@
+
+ # activate module via LoadModule/AddModule directive
+ if ($opt_a or $opt_A) {
++ ### when staging, this should be non-fatal
+ if (not -f "$CFG_SYSCONFDIR/$CFG_TARGET.conf") {
+ error("Config file $CFG_SYSCONFDIR/$CFG_TARGET.conf not found");
+-exit(1);
++exit(0);
+ }
+
+ open(FP, "<$CFG_SYSCONFDIR/$CFG_TARGET.conf") || die;
Index: Makefile
===
--- Makefile(revision 11801)
+++ Makefile(working copy)
@@ -45,9 +45,279 @@
define Package/apache-server
$(call Package/apache/Default)
TITLE:=The Apache Web Server and some tools
- DEPENDS:=apache
+ DEPENDS:=+libapr +libaprutil +zlib +libexpat +libpcre +libopenssl
+libsqlite3
endef
+define Package/apache-mod_actions
+ $(call Package/apache/Default)
+ Title:= Module for apache server - mod_actions
+ DEPENDS:=+apache-server
+endef
+
+define Package/apache-mod_alias
+ $(call Package/apache/Default)
+ Title:= Module for apache server - mod_alias
+ DEPENDS:=+apache-server
+endef
+
+define Package/apache-mod_asis
+ $(call Package/apache/Default)
+ Title:= Module for apache server - mod_asis
+ DEPENDS:=+apache-server
+endef
+
+define Package/apache-mod_auth_basic
+ $(call Package/apache/Default)
+ Title:= Module for apache server - mod_auth_basic
+ DEPENDS:=+apache-server
+endef
+
+define Package/apache-mod_auth_digest
+ $(call Package/apache/Default)
+ Title:= Module for apache server - mod_auth_digest
+ DEPENDS:=+apache-server
+endef
+
+define Package/apache-mod_authn
+ $(call Package/apache/Default)
+ Title:= Module for apache server - mod_authn
+ DEPENDS:=+apache-server
+endef
+
+define Package/apache-mod_authn_db
+ $(call Package/apache/Default)
+ Title:= Module for apache server - mod_authn_db
+ DEPENDS:=+apache-server
+endef
+
+define Package/apache-mod_authz
+ $(call Package/apache/Default)
+ Title:= Module for apache server - mod_authz
+ DEPENDS:=+apache-server
+endef
+
+define Package/apache-mod_authz_dbm
+ $(call Package/apache/Default)
+ Title:= Module for apache server - mod_authz_dbm
+ DEPENDS:=+apache-server
+endef
+
+define Package/apache-mod_autoindex
+ $(call Package/apache/Default)
+ Title:= Module for apache server - mod_autoindex
+ DEPENDS:=+apache-server
+endef
+
+define Package/apache-mod_cache
+ $(call Package/apache/Default)
+ Title:= Module for apache server - mod_cache
+ DEPENDS:=+apache-server
+endef
+
+define Package/apache-mod_cern_meta
+ $(call Package/apache/Default)
+ Title:= Module for apache server - mod_cern_meta
+ DEPENDS:=+apache-server
+endef
+
+define Package/apache-mod_cgi
+ $(call Package/apache/Default)
+ Title:= Module for apache server - mod_cgi
+ DEPENDS:=+apache-server
+endef
+
+define Package/apache-mod_dav_fs
+ $(call Package/apache/Default)
+ Title:= Module for apache server - mod_dav_fs
+ DEPENDS:=+apache-server
+endef
+
+define Package/apache-mod_dbd
+ $(call Package/apache/Default)
+ Title:= Module for apache server - mod_dbd
+ DEPENDS:=+apache-server
+endef
+
+define Package/apache-mod_deflate
+ $(call Package/apache/Default)
+ Title:= Module for apache server - mod_deflate
+ DEPENDS:=+apache-server
+endef
+
+define Package/apache-mod_dir
+ $(call Package/apache/Default)
+ Title:= Module for apache server - mod_dir
+ DEPENDS:=+apache-server
+endef
+
+define Package/apache-mod_dumpio
+ $(call Package/apache/Default)
+ Title:= Module for apache server - mod_dumpio
+ DEPENDS:=+apache-server
+endef
+
+define Package/apache-mod_en
[OpenWrt-Devel] Bunch of patches!
Please, let me know ASAP if there are any problems with the bunch of patches I have sent. I've been hoarding these for a while.. but they are diff'd against the latest svn. I think I've got all the patch modifications... though I might have diff'd from the wrong directory. I can easily recreate or clarify any that are confusing. //.ichael G. ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org http://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] add apache module package for php5
Add apache module for php5
Signed-off-by: Michael Geddes
---
Index: Makefile
===
--- Makefile(revision 11801)
+++ Makefile(working copy)
@@ -16,6 +16,13 @@
PKG_SOURCE_URL:=http://www.php.net/distributions/
PKG_MD5SUM:=7380ffecebd95c6edb317ef861229ebd
+CONFIGURE_VARS += \
+ pthreads_working=yes\
+ LDFLAGS="LDFLAGS -lpthread" \
+ ac_cv_pthreads_lib=pthread
+
+# ac_cv_pthreads_cflags=-lpthread
+
include $(INCLUDE_DIR)/package.mk
define Package/php5/Default
@@ -75,6 +82,18 @@
This package contains the FastCGI version of the PHP5 interpreter.
endef
+define Package/php5-apache
+ $(call Package/php5/Default)
+ DEPENDS:=php5 +apache-server +libpthread
+ TITLE+= (Apache)
+endef
+
+define Package/php5-apache/description
+$(call Package/php5/Default/description)
+ This package contains the Apache module version of the PHP5 interpreter.
+endef
+
+
define Package/php5-mod-curl
$(call Package/php5/Default)
DEPENDS:=php5 +libcurl
@@ -215,6 +234,7 @@
CONFIG_PACKAGE_php5-cli:=m
CONFIG_PACKAGE_php5-cgi:=m
CONFIG_PACKAGE_php5-fastcgi:=m
+ CONFIG_PACKAGE_php5-apache:=m
CONFIG_PACKAGE_php5-mod-curl:=m
CONFIG_PACKAGE_php5-mod-gd:=m
CONFIG_PACKAGE_php5-mod-gmp:=m
@@ -295,6 +315,10 @@
else
PKG_CONFIGURE_OPTS+= --disable-apc
endif
+ifneq ($(CONFIG_PACKAGE_php5-apache),)
+ PKG_BUILD_DEPENDS+= apache-server
+ PKG_CONFIGURE_LIBS+= -lpthread
+endif
define Build/Configure
endef
@@ -314,7 +338,8 @@
php_cv_cc_rpath="no" \
)
$(MAKE) -C $(PKG_BUILD_DIR)
- mv $(PKG_BUILD_DIR)/sapi/cli/php $(PKG_BUILD_DIR)/php-cli
+ mv $(PKG_BUILD_DIR)/sapi/cli/php \
+ $(PKG_BUILD_DIR)/php-cli
endef
endif
@@ -333,7 +358,8 @@
php_cv_cc_rpath="no" \
)
$(MAKE) -C $(PKG_BUILD_DIR)
- mv $(PKG_BUILD_DIR)/sapi/cgi/php-cgi $(PKG_BUILD_DIR)/php-cgi
+ mv $(PKG_BUILD_DIR)/sapi/cgi/php-cgi \
+ $(PKG_BUILD_DIR)/php-cgi
endef
endif
@@ -354,14 +380,41 @@
php_cv_cc_rpath="no" \
)
$(MAKE) -C $(PKG_BUILD_DIR)
- mv $(PKG_BUILD_DIR)/sapi/cgi/php-cgi $(PKG_BUILD_DIR)/php-fcgi
+ mv $(PKG_BUILD_DIR)/sapi/cgi/php-cgi \
+ $(PKG_BUILD_DIR)/php-fcgi
endef
endif
+
+ifneq ($(CONFIG_PACKAGE_php5-apache),)
+ define Build/Compile/php5-apache
+ -$(MAKE) -C $(PKG_BUILD_DIR) clean
+ cd $(PKG_BUILD_DIR) &&
${SED} 's/APACHE_VERSION=`.*`/APACHE_VERSION=244/' configure \
+ && ${SED} 's/pthreads_working=no/pthreads_working=yes/'
configure
+ $(call Build/Configure/Default, \
+ $(PKG_CONFIGURE_OPTS) \
+ --enable-cli \
+ --enable-cgi \
+ --disable-fastcgi \
+ --disable-force-cgi-redirect \
+ --enable-discard-path \
+ --with-apxs2=$(STAGING_DIR)/usr/sbin/apxs \
+ , \
+ LIBS="$(PKG_CONFIGURE_LIBS)" \
+ php_cv_cc_rpath="no" \
+ )
+ $(MAKE) -C $(PKG_BUILD_DIR)
+ mkdir -p $(PKG_BUILD_DIR)/apache_module/
+ $(CP) $(PKG_BUILD_DIR)/libs/libphp5.* \
+ $(PKG_BUILD_DIR)/apache_module/
+ endef
+endif
+
define Build/Compile
$(call Build/Compile/php5-cli)
$(call Build/Compile/php5-cgi)
$(call Build/Compile/php5-fastcgi)
+ $(call Build/Compile/php5-apache)
endef
define Package/php5/conffiles
@@ -375,26 +428,37 @@
define Package/php5-cli/install
$(INSTALL_DIR) $(1)/usr/bin
- $(CP) $(PKG_BUILD_DIR)/php-cli $(1)/usr/bin/php-cli
+ $(CP) $(PKG_BUILD_DIR)/php-cli \
+ $(1)/usr/bin/php-cli
endef
define Package/php5-cgi/install
$(INSTALL_DIR) $(1)/usr/bin
- $(CP) $(PKG_BUILD_DIR)/php-cgi $(1)/usr/bin/php-cgi
+ $(CP) $(PKG_BUILD_DIR)/php-cgi \
+ $(1)/usr/bin/php-cgi
endef
define Package/php5-fastcgi/install
$(INSTALL_DIR) $(1)/usr/bin
- $(CP) $(PKG_BUILD_DIR)/php-fcgi $(1)/usr/bin/php-fcgi
+ $(CP) $(PKG_BUILD_DIR)/php-fcgi \
+ $(1)/usr/bin/php-fcgi
$(INSTALL_DIR) $(1)/etc/init.d
- $(INSTALL_BIN) ./files/php.init $(1)/etc/init.d/php
+ $(INSTALL_BIN) ./files/php.init \
+ $(1)/etc/init.d/php
endef
+define Package/php5-apache/install
+ $(INSTALL_DIR) $(1)/usr/lib
+ $(CP) $(PKG_BUILD_DIR)/apache_module/* \
+ $(1)/usr/lib
+endef
+
define BuildPlugin
define Package/$(1)/install
[ -z "$(2)" ] || $(INSTALL_DIR) $$(1)/usr/lib/php
for m in $(2); do \
- $(INSTALL_BIN) $(PKG_BUILD_DIR)/modules/{m}.so
$$(1)/usr/lib/php/ ; \
+ $(INSTALL_BIN) $(PKG_BUILD_DIR)/modules/{m}.so \
+ $$(1)/usr/lib/php/ ; \
done
endef
@@ -405,6 +469,7 @@
$(eval $(call
Re: [OpenWrt-Devel] AC_SYS_LARGEFILES on netatalk 2.0.3
Antonio Carrillo wrote: > Hello. > > I've tried to tweak the ac_cv_*, but I can't make them to work. > Finally I've put some code in the Makefile for netatalk (the makefile that > makes the openwrt package) that, after the configure step, appends to the > config.h the lines needed to compile it with large file support. > For me, this works perfectly. > Now... where should I publish this package so it can be tested for somebody > else if interested? You could post it as patch to this list as described in https://dev.openwrt.org/wiki/SubmittingPatches - Felix ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org http://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] trying to get a usb storage mounted on root
On Sat, 2008-07-12 at 01:13 -0400, Stefan Monnier wrote: > > Of course: you have 8MB of flash, so there's plenty of space for a jffs > partition. In my case, there's around 128KB of flash left (of the 2MB). Wow. I didn't know the 700 had so little flash. > For starters, I don't need dropbear in /rom (neither do I need vi in > there. Yeah, I guess once you have worked out all of booting and mounting kinks and you are resigned to always mounting a root fs from a USB device, your /rom is nothing more than a working kernel+initrd (effectively) so why have dropbrear and vim on them, indeed. > The boot doesn't fail if jffs is missing. Ahhh. Good news then. > Actually, it's in the case > where jffs is absent that it makes no difference: if jffs exists (as in > your case), the order does make a difference, since the jffs files may > be necessary to mount to USB disk. Exactly. Which is why I rearranged them as I did. In my scenario, for your use case, the jffs is kind of like a modifiable initrd. In my use case, it makes a one single image bootable on both USB storage based rootfs systems and more traditional jffs rootfs systems. > Yes, Debian (stable) on a 32MB (RAM) mipsel is really borderline (at > least, that was my experience when I used it on my wrtsl54gs). There's a Debian mipsel howto here http://wpkg.org/Running_Debian_on_ASUS_WL-500G_deluxe that claims to boot in under 10MB of RAM. I wonder how much difference their use of glibc vs. uClibc would make. > With the 64MB of RAM of a WL-700gE, it's a good bit better. 64MB. Nice. For an app. server (I'm thinking Asterisk box for instance). For an actual router, 32MB seems like quite enough. > Debian comes precompiled for many architectures, x86 and mipsel > among them. So, no need to build the packages yourself. Yeah, I did find the mipsel port. Unfortunately it uses glibc rather than uClibc. > Please do, Done. Did you get a chance to look at it or try it out? b. signature.asc Description: This is a digitally signed message part ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org http://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] subversion checkout in openwrt
Hi, I am having some issues downloading from SVN, namely: My Makefile has this: = PKG_BRANCH:= PKG_SOURCE_URL:=http://localhost/svnroot/server/trunk PKG_REV:=35 PKG_NAME:=server PKG_VERSION:=r$(PKG_REV) PKG_RELEASE:=1 PKG_SOURCE_PROTO:=svn PKG_SOURCE_VERSION:=$(PKG_REV) PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) PKG_SOURCE:=$(PKG_SOURCE_SUBDIR).tar.gz PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_SOURCE_SUBDIR) PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install = But this fails somehow: = mkdir -p /home/steven/openwrt/dl --17:53:58-- http://mirror2.openwrt.org/sources/server-r35.tar.gz => `-' Resolving mirror2.openwrt.org... 88.198.39.176 Connecting to mirror2.openwrt.org|88.198.39.176|:80... connected. HTTP request sent, awaiting response... 404 Not Found 17:53:58 ERROR 404: Not Found. Download failed. --17:53:58-- http://downloads.openwrt.org/sources/server-r35.tar.gz => `-' Resolving downloads.openwrt.org... 195.56.146.238 Connecting to downloads.openwrt.org|195.56.146.238|:80... connected. HTTP request sent, awaiting response... 404 Not Found 17:53:58 ERROR 404: Not Found. Download failed. No more mirrors to try - giving up. Checking out files from the svn repository... svn: REPORT request failed on '/svnroot/server/!svn/vcc/default' svn: Can't find a temporary directory: Error string not specified yet = First part is the downloading from openwrt... I told explicit with "PKG_SOURCE_PROTO:=svn" (at least i thought I did) that it should use svn? But still it seems to be willing to fetch the sources from openwrt... How can I disable this behaviour? The second part is svn - not that it gives an error, i know what that is... But it's doing a checkout of the sources? And afterwards it's removing all .svn files/folders. Wouldn't it be more prudent to do an "export" instead of a "checkout"? Greetings, Steven ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org http://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] Patches to fix AVR32 and lk 2.6.25+ stuff
Please check https://dev.openwrt.org/cgi-bin/trac.fcgi/ticket/3755 for a fix for kmod-ebtables package not being built on 2.6.25+ kernels. Please check https://dev.openwrt.org/cgi-bin/trac.fcgi/ticket/3756 for a fix for a build error with kmod-i2c-core package on AVR32 2.6 kernels. This might apply to other archs as well. Regards, Bas. (yes, this e-mail address works) ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org http://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [patch] Vim configuration
On 07/13/2008 02:11 AM, Michael Geddes wrote: > Fixes to vimrc file to avoid some errors. > > Signed-off-by: Michael Geddes > --- > Index: files/vimrc.full > === > --- files/vimrc.full (revision 11372) > +++ files/vimrc.full (working copy) > @@ -1,15 +1,15 @@ > -set showcmd" Show (partial) command in status line. > -set showmatch " Show matching brackets. > -set ignorecase " Do case insensitive matching > -set incsearch " Incremental search > -set autowrite " Automatically save before commands like :next > -and :make > -set nocompatible" Use Vim defaults instead of 100% vi compatibility > +" vim: sts=2 sw=2 et > +set showcmd " Show (partial) command in status line. > +set showmatch " Show matching brackets. > +set ignorecase" Do case insensitive matching > +set incsearch " Incremental search > +set autowrite " Automatically save before commands like :next and :make > +set nocompatible " Use Vim defaults instead of 100% vi compatibility > set backspace=indent,eol,start " more powerful backspacing > -set autoindent " always set autoindenting on > -set linebreak " Don't wrap words by default > -set textwidth=0 " Don't wrap lines by default > -set ruler " show the cursor position all the time > +set autoindent" always set autoindenting on > +set linebreak " Don't wrap words by default > +set textwidth=0 " Don't wrap lines by default > +set ruler " show the cursor position all the time Seems like more that just error fixes. How much does this increase the size of the binary? -Geoff ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org http://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] trying to get a usb storage mounted on root
>> Of course: you have 8MB of flash, so there's plenty of space for a jffs >> partition. In my case, there's around 128KB of flash left (of the 2MB). > Wow. I didn't know the 700 had so little flash. Since it has an IDE drive, that's actually quite enough: it only needs to be able to hold the kernel, mount the drive, and run /sbin/init. >> Yes, Debian (stable) on a 32MB (RAM) mipsel is really borderline (at >> least, that was my experience when I used it on my wrtsl54gs). > There's a Debian mipsel howto here > http://wpkg.org/Running_Debian_on_ASUS_WL-500G_deluxe that claims to > boot in under 10MB of RAM. I wonder how much difference their use of > glibc vs. uClibc would make. The problem is that "apt-get install " is very slow and swaps pretty bad (tho it depends on how many packages and files you have installed, so if you're careful, it's bearable, but it's clearly borderline). > Done. Did you get a chance to look at it or try it out? I briefly looked at it. I'm not sure why you bother building the device nodes since hotplug2 does it for us. The other thing is that the device name /dev/hde seems pretty specific to the WL-700gE, and so is the list of modules you load in mount_ide. One more thing: you may want to try uhci-hcd in case the USB drive is using USB1 and your machine has a UHCI controller (rather than OHCI). Furthermore, if one of the modules fails to load, you probably should skip the 10s wait. Also, the IDE case doesn't actually need this 10s wait, in my experience. I won't have a chance to try it soon, since my wl-700ge has "entered production" (i.e. replaced my previous combination of wrtsl54gs+disk+hub). Stefan ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org http://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [patch] Vim configuration
On Mon, 14 Jul 2008 08:47:17 am Geoff Levand wrote: > On 07/13/2008 02:11 AM, Michael Geddes wrote: > > Fixes to vimrc file to avoid some errors. > > > > +set showcmd " Show (partial) command in status line. > > +set showmatch " Show matching brackets. > > +set ignorecase" Do case insensitive matching > > +set incsearch " Incremental search > > +set autowrite " Automatically save before commands like :next and > > :make +set nocompatible " Use Vim defaults instead of 100% vi > > compatibility set backspace=indent,eol,start " more powerful backspacing > > -set autoindent " always set autoindenting on > > -set linebreak " Don't wrap words by default > > -set textwidth=0 " Don't wrap lines by default > > -set ruler " show the cursor position all the time > > +set autoindent" always set autoindenting on > > +set linebreak " Don't wrap words by default > > +set textwidth=0 " Don't wrap lines by default > > +set ruler " show the cursor position all the time > > Seems like more that just error fixes. How much does this increase > the size of the binary? > Actually reduces the file size I think. Most of the changes are just removing whitespace. (including deleting a misplaced CR). Note the + and - are balanced. There's an endif I had to put in, and a conditional in case the syntax files haven't been installed (it's a separate package). It's also only for 'full vim' so space is not a _huge_ concern. If you are worried about space - I can reduce all the comments. //.ichael G. ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org http://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
