[OpenWrt-Devel] RE: My changes to OpenWRT
Hi, stargr...@stargrave.org wrote: > - User Michael Geddes on 2011-10-30 12:29:57 wrote: > >I've now pushed all my changes to OpenWRT up to GitHub that I've accumulated > >over a few years. > >[skip] > >* Some tentative changes for 64bit pc - abandoned, but the imputus for pushing > >up the changes. > That item is very interesting. I just tried to built-up 64bit OpenWRT > from your branch. Unfortunately unsuccessfully. Can you please describe > how 64bit x86 target can be built up? What options have I choose in > "make menuconfig"? I checked 64bit subtarget, Kontron target profile and > it fails to compile uClibc. I tried to use "glibc" instead, but it fails > to compile during "./configure" stage. I will very appreciate your help! The x86 build of Kontron compiles.. as I said, the 64bit endeavour was abandoned. A couple of years ago it compiled, but didn't really work. The reason it's still there is because I thought it might be useful for somebody to continue what I started, and because it was requested on #openwrt :) glibc is probably your better option, but again, I don't really know, and don't really feel like compiling it now- I've got too many other projects that need work. > -- > Happy hacking, Sergey Matveev . > Use plain text e-mail, please ..: Ah. Sorry about that. Btw, you'll need to CC me if you want a quicker reply, I don't receive mails anymore from the mailing list. (deliberately) //.ichael G ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] My changes to OpenWRT
I've now pushed all my changes to OpenWRT up to GitHub that I've accumulated over a few years. I've only moved to fetching from git this year - and I've managed to make mostly sane commits from all the changes I'd built up in the svn tree. I won't guarantee that the commits are all perfect or anything - but some of them may be useful to some people! The branch 'master' is the same as on nbd.org in both cases. My changes are in the mrg/changes branch. https://github.com/frogonwheels/openwrt https://github.com/frogonwheels/openwrt-packages Useful titbits: * support for Kontron boards - required various settings to add more support for various things (scsi drivers by default for eg). * Apache using modules * php5 module for apache (not retested) * Improved support for glibc on x86 * Some tentative changes for 64bit pc - abandoned, but the imputus for pushing up the changes. * Asterisk 1.6 with uci config (old I know, but it's what I use) * Support dovecot with SIEVE and MANAGESIEVE * fschk for ext2/3/4 * Use Native 64bit Grub on x86 target * Inotify support Some of the changes are personal hacking changes - but I just wanted to get it up and out there. //.ichael G. ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [RFC][PATCH] Allow for PPPoE over LAN
The other scenario that I suspect your script solves is where your DSL modem has a configuration interface. I've worked around this issue, and added an IP address to the PPPoE port in order to access it. //.ichael On Mon, 15 Mar 2010 11:01:03 pm Janusz Krzysztofik wrote: > With current openwrt base-files provided network configuration scripts, DSL > modem for PPPoE WAN must be connected to a separate Ethernet port (WAN > port). While this is probably the most intuitive, most common way of > connecting a router to a DSL modem, I can't see why it couldn't be > possible to connect it over the same Ethernet segment that my LAN is > running on. > > This patch slightly modifies two configuration scripts, allowing for PPPoE > WAN over LAN port (eth0.0, br-lan, etc.) setup working correctly for me. > > Created and tested against openwrt svn revision 20230. > > Signed-off-by: Janusz Krzysztofik > --- > > NB, applying this patch should allow for closing ticket #6796. > > Thanks, > Janusz > ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] libgcc on x86_64 compile problems
Good luck with Openwrt on x86 64. I tried and ended up giving up - however I did get it booting, and I still have a bunch of patches for it if you're interested in taking them over. //.ichael On Fri, 26 Feb 2010 01:51:27 am Robert Wuttke wrote: > Hi, > > I'm trying to build OpenWrt for the UML-target on x86_64. While this works > fine on x86, on x86_64 machines I get the following error: > > > mkdir -p > /home/flash64/meshbed/src/openwrt-build/2010-02-25_16-09/build_dir/linux-um > l/base-files/ipkg-uml/libgcc/CONTROL echo "Package: libgcc" > > /home/flash64/meshbed/src/openwrt-build/2010-02-25_16-09/build_dir/linux-um > l/base-files/ipkg-uml/libgcc/CONTROL/control echo "Version: 4.1.2-39" >> > /home/flash64/meshbed/src/openwrt-build/2010-02-25_16-09/build_dir/linux-um > l/base-files/ipkg-uml/libgcc/CONTROL/control ( DEPENDS=''; for depend in ; > do DEPENDS=${DEPENDS:+$DEPENDS, > }${depend##+}; done; echo "Depends: $DEPENDS"; echo "Provides: "; echo > "Source: package/base-files"; echo "Section: libs"; echo "Priority: > optional"; echo "Maintainer: OpenWrt Developers Team > "; echo "Architecture: uml"; echo > "Installed-Size: 1"; echo -n "Description: "; getvar > V_Package_libgcc_description | sed -e 's,^[[:space:]]*, ,g'; ) >> > /home/flash64/meshbed/src/openwrt-build/2010-02-25_16-09/build_dir/linux-um > l/base-files/ipkg-uml/libgcc/CONTROL/control chmod 644 > /home/flash64/meshbed/src/openwrt-build/2010-02-25_16-09/build_dir/linux-um > l/base-files/ipkg-uml/libgcc/CONTROL/control (cd > /home/flash64/meshbed/src/openwrt-build/2010-02-25_16-09/build_dir/linux-um > l/base-files/ipkg-uml/libgcc/CONTROL; var2file "V_Package_libgcc_conffiles" > conffiles; var2file > "V_Package_libgcc_preinst" preinst; var2file "V_Package_libgcc_postinst" > postinst; var2file "V_Package_libgcc_prerm" prerm; var2file > "V_Package_libgcc_postrm" postrm; ) > install -d -m0755 > /home/flash64/meshbed/src/openwrt-build/2010-02-25_16-09/build_dir/linux-um > l/base-files/ipkg-uml/libgcc/lib cp -fpR > /home/flash64/meshbed/src/openwrt-build/2010-02-25_16-09/staging_dir/toolch > ain-x86_64_gcc-4.1.2_uClibc-0.9.30.1/lib64/libgcc_s.so.* > /home/flash64/meshbed/src/openwrt-build/2010-02-25_16-09/build_dir/linux-u > ml/base-files/ipkg-uml/libgcc/lib/ cp: cannot stat > `/home/flash64/meshbed/src/openwrt-build/2010-02-25_16-09/staging_dir/toolc > hain-x86_64_gcc-4.1.2_uClibc-0.9.30.1/lib64/libgcc_s.so.*': No such file or > directory > make[3]: *** > [/home/flash64/meshbed/src/openwrt-build/2010-02-25_16-09/bin/uml/packages/ > libgcc_4.1.2-39_uml.ipk] Error 1 > make[3]: Leaving directory > `/home/flash64/meshbed/src/openwrt-build/2010-02-25_16-09/package/base-file > s' > > > It fails while trying to copy the libgcc_so.so.* from the lib64-directory. > A "ls [...]/staging_dir/toolchain-x86_64_gcc-4.1.2_uClibc-0.9.30.1/" shows > that there is no directory named "lib64", but "lib" - including all needed > files: > > "ls [...]/staging_dir/toolchain-x86_64_gcc-4.1.2_uClibc-0.9.30.1/lib/" > ld64-uClibc-0.9.30.1.so libc.so.0 libgcc_s.so.1 > libnsl.so.0 libresolv.so.0 libutil-0.9.30.1.so > ld64-uClibc.so.0 libdl-0.9.30.1.so libm-0.9.30.1.so > libpthread-0.9.30.1.so librt-0.9.30.1.so libutil.so.0 > libcrypt-0.9.30.1.so libdl.so.0 libm.so.0 > libpthread.so.0 librt.so.0 > libcrypt.so.0libgcc_s.solibnsl-0.9.30.1.so > libresolv-0.9.30.1.so libuClibc-0.9.30.1.so > > > regards, > > Robert Wuttke > ___ > 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] ath9k in openwrt
I use Ath9k drivers. I have the option to show unstable stuff for other reasons, so it _could_ be in there. The drivers work pretty well.. .though not entirely stable. Every few days I have to run a script that will ifdown wlan, rmmod the modules, insert the modules back and ifup wlan... and every now and again, the server reboots itself, I believe because of ath9k drivers.. and even rarer, I get a crashed kernel on occasions. hth Michael G. On Mon, 8 Feb 2010 12:45:44 pm Iwan Budi Kusnanto wrote: > Hi All, > > From http://linuxwireless.org/en/users/Drivers/ath9k > "OpenWrt became the first distribution to pick up ath9k and contribute > to it". > But i can't see any ath9k option when doing 'make menuconfig'. Is this > because ath9k still considered unstable ? > > Best Regards, > Iwan Budi Kusnanto > ___ > 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
[OpenWrt-Devel] [Patch] Switch to dynamic-linked apache with module packages
Move apache (and apr) to a module-based distribution. Has a smaller minimum footprint and allows more versatility. Signed-off-by: Michael Geddes --- Index: net/apache/patches/005-apxs_optware.patch === --- net/apache/patches/005-apxs_optware.patch (revision 0) +++ net/apache/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: net/apache/Makefile === --- net/apache/Makefile (revision 17117) +++ net/apache/Makefile (working copy) @@ -1,15 +1,16 @@ # -# Copyright (C) 2007-2009 OpenWrt.org +# Copyright (C) 2007-2008 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. # +# $Id: Makefile 12758 2008-09-28 09:20:20Z nbd $ include $(TOPDIR)/rules.mk PKG_NAME:=apache PKG_VERSION:=2.2.9 -PKG_RELEASE:=2 +PKG_RELEASE:=1 PKG_SOURCE_NAME:=httpd PKG_SOURCE:=$(PKG_SOURCE_NAME)-$(PKG_VERSION).tar.bz2 @@ -29,34 +30,546 @@ URL:=http://httpd.apache.org/ endef -define Package/apache/Default/description - The Apache Web Server is a powerful and flexible HTTP/1.1 compliant - web server. Originally designed as a replacement for the NCSA HTTP - Server, it has grown to be the most popular web server on the Internet. -endef - define Package/apache -$(call Package/apache/Default) + $(call Package/apache/Default) + MENU=1 DEPENDS:=+libapr +libaprutil +zlib +libexpat +libpcre +libopenssl +libsqlite3 endef define Package/apache/description -$(call Package/apache/Default/description) - . - This package contains the Apache web server and utility programs. - . - Take care that you don't include apache at the moment into your image - please select it only as module because busybox will override - /usr/sbin/httpd. It'll be solved soon. If you need to include this - package in the image anyway, remove httpd from busybox - (Base system --> Configuration --> Networking Utilities --> httpd). - Also you should take care for the initscripts, apache's httpd isn't - compatible with the one from busybox, so if you want to use apache - for running your webif, you'll need to change the parameters in the - scripts and configure the rest in /etc/httpd.conf. + The Apache Web Server is a powerful and flexible HTTP/1.1 compliant + web server. Originally designed as a replacement for the NCSA HTTP + Server, it has grown to be the most popular web server on the Internet. endef -define Package/apache/conffiles +define Package/apache-server + $(call Package/apache/Default) + TITLE:=The Apache Web Server and some tools + 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 -
[OpenWrt-Devel] [Patch] Add threadsafe MySQL client Library
Add a libmysqlclient_r target (threadsafe client); required for module-based apache. Signed-off-by: Michael Geddes --8<-- Index: libs/mysql/Makefile === --- libs/mysql/Makefile (revision 17079) +++ libs/mysql/Makefile (working copy) @@ -4,6 +4,7 @@ # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. # +# $Id: Makefile 12228 2008-08-06 22:43:15Z nbd $ include $(TOPDIR)/rules.mk @@ -31,6 +32,14 @@ URL:=http://dev.mysql.com/ endef +define Package/libmysqlclient_r + SECTION:=libs + CATEGORY:=Libraries + DEPENDS:=+zlib + TITLE:=MySQL client library threadsafe + URL:=http://dev.mysql.com/ +endef + define Build/Configure (cd $(PKG_BUILD_DIR); touch \ configure.in \ @@ -42,6 +51,7 @@ $(call Build/Configure/Default, \ --enable-shared \ --enable-static \ + --enable-thread-safe-client \ --disable-assembler \ --with-pthread \ --without-raid \ @@ -85,6 +95,10 @@ DESTDIR="$(PKG_INSTALL_DIR)" \ all install $(MAKE) -C "$(PKG_BUILD_DIR)" \ + SUBDIRS="libmysql_r" \ + DESTDIR="$(PKG_INSTALL_DIR)" \ + all install + $(MAKE) -C "$(PKG_BUILD_DIR)" \ SUBDIRS="scripts" \ DESTDIR="$(PKG_INSTALL_DIR)" \ bin_SCRIPTS="mysql_config" \ @@ -106,5 +120,10 @@ $(INSTALL_DIR) $(1)/usr/lib $(CP) $(PKG_INSTALL_DIR)/usr/lib/mysql/libmysqlclient.so.* $(1)/usr/lib/ endef +define Package/libmysqlclient_r/install + $(INSTALL_DIR) $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/lib/mysql/libmysqlclient_r.so.* $(1)/usr/lib/ +endef $(eval $(call BuildPackage,libmysqlclient)) +$(eval $(call BuildPackage,libmysqlclient_r)) ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] How to compile all packages and skip compilation errors
This is the script that I use to do a build. It works nicely when packages break for mundane reasons. First it does a normal make, then reads that output and makes all the packages that failed, putting the errors into a logfile. Of course it's not perfect, but it works for me, and it means I can leave the script running overnight. //.ichael 8<--- if [ "$1" != "-f" ] ; then IGNORE_ERRORS=1 make 2>&1| tee errors.txt rm build_*.txt fi for i in $(grep "failed to build" errors.txt | sed 's/^.*ERROR:[[:space:]]*\([^[:space:]].*\) failed to build.*$/\1/' ) ; do if [ "$i" != "" ] ; then echo Compiling: ${i} make ${i}-compile V=99 > build_${i##*/}.txt 2>&1 || echo ${i} : Build failed, see build_${i##*/}.txt fi done On Tue, 9 Jun 2009 05:45:35 pm ZioPRoTo (Saverio Proto) wrote: > > is there an easy way to compile everything, where compilation errors do > > not stop the compilation process? > > As manually removing a problem package and manually restarting is > > wasting a lot of time. > > All compilation errors should be stored in a log so that they can be > > checked afterwards. > > I know that if you call: > > make IGNORE_ERRORS=m > > all packages marked to compile as modules will not stop the compiling > process in case of errors. > > I have no idea if there are some logs somewhere ... > > Saverio > ___ > 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] Only have 0 available blocks on filesystem /
On Tuesday 17 February 2009 18:22:38 Kövesdi György wrote: > Hi, > > I have Asus wl500gp, and wanted to upgrade: > /# opkg upgrade > and got the following message: > * Only have 0 available blocks on filesystem / ... > ... > > the 'df' output is: > > Filesystem Size Used Avail Use% Mounted on > rootfs 1.4M 1.4M 0 100% / > /dev/root 1.4M 1.4M 0 100% /rom > tmpfs 15M 840K 14M 6% /tmp > tmpfs 512K 0 512K 0% /dev > /dev/mtdblock3 5.7M 1.2M 4.5M 21% /jffs > mini_fo:/jffs 1.4M 1.4M 0 100% / ^^^ This is your problem. /jffs contains all the stuff you have added to your FS.. so have a look in here at what's taking up all the room. It's a standard 'union' type filesystem - where you have a mounted drive which is readonly (this is often a compressed filesystem or a ROM filesystem), and you 'overlay' another mount point, which contains all the files that you modify. In this case jffs2 -which is a filesystem designed for flash memory. > /dev/sda2 3.7G 1021M 2.5G 29% /mnt/usbdrive > > I don't really understand the filesystem structure used on OpenWrt. AFAIK, > the root filesystem always shows 0 available blocks, however, e.g. 1Mb > sized files can be created in directories /, /lib, /bin, etc., using the > 4.5M free space from /jffs. Why opkg cannot do it? > > Thanx in advance > K. Gy.wrt-devel //.ichael ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org http://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] lirc not compiling
Use linux/semaphore.h instead of asm/semaphore.h (which doesn't exist) to get lirc package compiling. Signed off by: Michael Geddes --- Index: packages/utils/lirc/patches/110-lirc_dev.patch === --- packages/utils/lirc/patches/110-lirc_dev.patch (revision 0) +++ packages/utils/lirc/patches/110-lirc_dev.patch (revision 0) @@ -0,0 +1,11 @@ +--- a/drivers/lirc_dev/lirc_dev.orig b/drivers/lirc_dev/lirc_dev.c +@@ -49,7 +49,7 @@ + #include + #include + #endif +-#include ++#include + #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 0) + #include + #endif ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org http://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH] alsa-lib: configuration files missing
Michael Conrad wrote: > Hi, > > it took me some time to figure out, that the alsa subsystem is broken due > missing configuration files in /usr/share/alsa. I have no idea, how this > should work for others. If the problem can be solved otherwise, please > let me know. > > Test system was ASUS WL-500gP with . > > Greetings > > Micha > Does sox work for you now Micha? I've had to disable alsa on my sox compile so that I can use it without core-dumping. (500gP as well) //.ichael ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org http://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] Zoneinfo package
Zoneinfo - Timezone metadata. Signed-off-by: Michael Geddes -- Index: packages/libs/zoneinfo/Makefile === --- packages/libs/zoneinfo/Makefile (revision 0) +++ packages/libs/zoneinfo/Makefile (revision 0) @@ -0,0 +1,256 @@ +# +# Copyright (C) 2007-2008 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# +# $Id:$ +# +# Author: Michael Geddes + +include $(TOPDIR)/rules.mk + +PKG_NAME:=zoneinfo +PKG_VERSION:=2008e +PKG_RELEASE:=1 + +PKG_SOURCE:=tzdata$(PKG_VERSION).tar.gz +PKG_SOURCE_CODE:=tzcode${PKG_VERSION}.tar.gz +PKG_SOURCE_URL:=http://source.icu-project.org/repos/icu/data/trunk/tzdata/mirror/ +PKG_MD5SUM:=3b4578110a3d193ed9a00d61f27aba28 + +include $(INCLUDE_DIR)/package.mk + +define Download/tzcode + FILE=$(PKG_SOURCE_CODE) + URL=$(PKG_SOURCE_URL) + MD5SUM=12ec2d85324ddcba39db1471a03f486b +endef + +$(eval $(call Download,tzcode)) + +define Package/zoneinfo/default + SUBMENU:=Zones (ZoneInfo) + TITLE:=Zone Information + SECTION:=net + CATEGORY:=Network +endef + +define Package/zoneinfo-core +$(call Package/zoneinfo/Default) + TITLE:=Zone Information (core) +endef + +define Package/zoneinfo-simple +$(call Package/zoneinfo/Default) + TITLE:=Zone Information (simple) +endef + +define Package/zoneinfo-Africa +$(call Package/zoneinfo/Default) + TITLE:=Zone Information (Africa) +endef + +define Package/zoneinfo-NorthAmerica +$(call Package/zoneinfo/Default) + TITLE:=Zone Information (NorthAmerica) +endef + +define Package/zoneinfo-SouthAmerica +$(call Package/zoneinfo/Default) + TITLE:=Zone Information (SouthAmerica) +endef + +define Package/zoneinfo-Poles +$(call Package/zoneinfo/Default) + TITLE:=Zone Information (Arctic, Antarctic) +endef + +define Package/zoneinfo-Asia +$(call Package/zoneinfo/Default) + TITLE:=Zone Information (Asia) +endef + +define Package/zoneinfo-Atlantic +$(call Package/zoneinfo/Default) + TITLE:=Zone Information (Atlantic) +endef + +define Package/zoneinfo-Australia-NZ +$(call Package/zoneinfo/Default) + TITLE:=Zone Information (Australia-NZ) +endef + +define Package/zoneinfo-Pacific +$(call Package/zoneinfo/Default) + TITLE:=Zone Information (Pacific) +endef + +define Package/zoneinfo-Europe +$(call Package/zoneinfo/Default) + TITLE:=Zone Information (Europe) +endef + +define Package/zoneinfo-India +$(call Package/zoneinfo/Default) + TITLE:=Zone Information (India) +endef + +define Package/zoneinfo-MiddleEast +$(call Package/zoneinfo/Default) + TITLE:=Zone Information (MiddleEast) +endef + +define Build/Prepare + (cd $(PKG_BUILD_DIR) && tar -xzf $(DL_DIR)/$(PKG_SOURCE_CODE) && tar -xzf $(DL_DIR)/$(PKG_SOURCE)) +endef + +define Build/Compile + CFLAGS="$(HOST_CFLAGS)" \ + $(MAKE) -C $(PKG_BUILD_DIR) -f Makefile \ + $(HOST_CONFIGURE_OPTS) \ + CC="$(HOSTCC)" \ + LD="\(CC)" \ + CPPFLAGS="$(HOST_CPPFLAGS)" \ + LDFLAGS="$(HOST_LDFLAGS)" \ + TOPDIR="$(PKG_INSTALL_DIR)" \ + TZDIR="$(PKG_INSTALL_DIR)/zoneinfo" \ + install +endef + + +define Package/zoneinfo-core/install + $(INSTALL_DIR) $(1)/usr/share/zoneinfo + for i in \ + CET CST6CDT EET EST EST5EDT GB-Eire Eire \ + GBGMT GMT+0 GMT-0 GMT0 Greenwich \ + HST MET MST MST7MDT NZNZ-CHAT \ + PRC PST8PDT ROC ROK UCT UTC \ + Universal W-SU WET Zulu Etc/* ; do \ + $(CP) $(PKG_INSTALL_DIR)/zoneinfo/i \ + $(1)/usr/share/zoneinfo ; \ + done +endef + +define Package/zoneinfo-simple/install + $(INSTALL_DIR) $(1)/usr/share/zoneinfo + for i in Pacific/Honolulu \ + America/Anchorage America/Los_Angeles America/Denver \ + America/Chicago America/New_YorkAmerica/Caracas \ + America/Sao_Paulo Europe/London Europe/Paris \ + Africa/CairoEurope/Moscow Asia/Dubai \ + Asia/KarachiAsia/Dhaka Asia/Bankok \ + Asia/Hong_Kong Asia/Tokyo Australia/Darwin \ + Australia/Adelaide Australia/Brisbane Australia/Sydney \ + Australia/Perth Pacific/Noumea ; do \ + $(CP) $(PKG_INSTALL_DIR)/zoneinfo/i \ + $(1)/usr/share/zoneinfo ; \ + done +endef + +define Package/zoneinfo-Africa/install + $(INSTALL_DIR) $(1)/usr/share/zoneinfo/Africa + $(CP) $(PKG_INSTALL_DIR)/zoneinfo/Africa/* \ + $(1)/usr/share/zoneinfo/Africa +endef + +define Package/zoneinfo-NorthAmerica/install + $(INSTALL_DIR) $(1)/usr/share/zoneinfo + for i in US America Canada Mexico Cuba Jamaica Navajo ;
[OpenWrt-Devel] [PATCH] Dynamic Apache - 3/3 apache (resubmit - against current)
The patches to apache itself. Including all the modules as separate packages. This is the previous patch with recent tidy-ups to apache/Makefile included. Patch also at: http://pastebin.com/m1ac93408 seeing as Kmail always breaks them. Signed-off-by: Michael Geddes --- Index: packages/net/apache/patches/005-apxs_optware.patch === --- packages/net/apache/patches/005-apxs_optware.patch (revision 0) +++ packages/net/apache/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: packages/net/apache/Makefile === --- packages/net/apache/Makefile(revision 12613) +++ packages/net/apache/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/apach
Re: [OpenWrt-Devel] Generate configs for asterisk from uci
On Fri, 29 Aug 2008 03:33:34 pm RB wrote: > > > I'm only just starting to work with Asterisk, but integrating its > configuration into UCI will be a great start in that direction. Looks > nice! Well let me know how you go. I've got some changes/ bugfixes / tweaks. I have added musiconhold support (TIP: match the format for your music on hold to a single choice for stream encoding). Also hardware/reboot section. Allowing you to use url or program to cause your ATA to reboot and re-register with asterisk. Remember that 'extensions' is a generated dialplan context that contains all the extensions set up in your 'sip' and 'iax' sections. Check out the 'selfmailbox' option on sip/iax. This, combined with the 'mailbox' option, will allow you to dial your extension to get at your voicemail. Also for 'siptarget' (and 'iax' target) config sections, the 'alwaysinternational' setting has an interesting affect on the generated dialplan - check it out. /etc/init.d/asteriskuci script: http://pastebin.ca/1190086 /etc/init.d/asterisk: http://pastebin.ca/1190092 /etc/config/asteriskhttp://pastebin.ca/1190081 It is now working enough for me to use it for my home phone. If you replace your /etc/init.d/asterisk you just need to set ENABLE_ASTERISK=uci in your /etc/defaults/asterisk file to switch to UCI asterisk. ---8
[OpenWrt-Devel] Generate configs for asterisk from uci
Here's the script: http://pastebin.com/m40fe6226 the call setup_asterisk /opt can have /opt removed (I install asterisk on a usb drive mounted on /opt). Here's a sample /etc/config/asterisk http://pastebin.com/m2ca6e554 I've introduced some new concepts to make setting up domestic installations easy. Putting #include support for dialplans will make it easier to add complex dialplans. This is meant to support multiple external service providers - and the ability to choose which one to use. I've added dialzones on top of dialplans - which represents outgoing matches. I plan to do matching on incoming caller as well. Look at how changing 'alwaysinternational' to 'yes' affects the dialplan. This is for service providers that always require international format. When it is 'no' I've put a translation from international +61 format to a local number. Any comments? Feature requests? I'm not sure all features are demonstrated in the config - but most are. //. ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org http://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] PHP5 module for asterisk (resubmit)
This is the PHP5 module for asterisk patch- diffed from packages/ directory. Signed-off-by: Michael Geddes -- Index: packages/lang/php5/Makefile === --- packages/lang/php5/Makefile (revision 11801) +++ packages/lang/php5/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 @@ -107,7 +126,7 @@ define Package/php5-mod-mysql $(call Package/php5/Default) - DEPENDS:=php5 +libmysqlclient + DEPENDS:=php5 +libmysqlclient_r TITLE:=MySQL module endef @@ -210,11 +229,12 @@ --disable-filter 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_r libpq libsqlite2 libexpat # force PKG_CONFIGURE_{LIBS,OPTS} below when built in the SDK 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 -
[OpenWrt-Devel] [Patch] 2/2 PHP5 mysql module
Added a missing Paremeter in the patch set for php5 php5 now compiles Signed-off-by: Michael Geddes -- Index: packages/lang/php5/patches/005-APC.patch === --- packages/lang/php5/patches/005-APC.patch(revision 11372) +++ packages/lang/php5/patches/005-APC.patch(working copy) @@ -14159,7 +14159,7 @@ +apc_request_init(TSRMLS_C); + +#if HAVE_SIGACTION -+apc_set_signals(); ++apc_set_signals(TSRMLS_C); +#endif +} +return SUCCESS; ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org http://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [Patch] 1/2 Compile threadsafe mysql library for php5
The libmysqlclient_r library is required to get the php5 mysql module building. I do not use mysql so this has not been tested for funtionality... but it gets the build going. Signed-off-by: Michael Geddes -- Index: packages/libs/mysql/Makefile === --- packages/libs/mysql/Makefile(revision 11372) +++ packages/libs/mysql/Makefile(working copy) @@ -35,6 +35,14 @@ URL:=http://dev.mysql.com/ endef +define Package/libmysqlclient_r + SECTION:=libs + CATEGORY:=Libraries + DEPENDS:=+zlib + TITLE:=MySQL client library threadsafe + URL:=http://dev.mysql.com/ +endef + define Build/Configure (cd $(PKG_BUILD_DIR); touch \ configure.in \ @@ -46,6 +54,7 @@ $(call Build/Configure/Default, \ --enable-shared \ --enable-static \ + --enable-thread-safe-client \ --disable-assembler \ --with-pthread \ --without-raid \ @@ -87,6 +96,10 @@ DESTDIR="$(PKG_INSTALL_DIR)" \ all install $(MAKE) -C "$(PKG_BUILD_DIR)" \ + SUBDIRS="libmysql_r" \ + DESTDIR="$(PKG_INSTALL_DIR)" \ + all install + $(MAKE) -C "$(PKG_BUILD_DIR)" \ SUBDIRS="scripts" \ DESTDIR="$(PKG_INSTALL_DIR)" \ bin_SCRIPTS="mysql_config" \ @@ -108,5 +121,10 @@ $(INSTALL_DIR) $(1)/usr/lib $(CP) $(PKG_INSTALL_DIR)/usr/lib/mysql/libmysqlclient.so.* $(1)/usr/lib/ endef +define Package/libmysqlclient_r/install + $(INSTALL_DIR) $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/lib/mysql/libmysqlclient_r.so.* $(1)/usr/lib/ +endef $(eval $(call BuildPackage,libmysqlclient)) +$(eval $(call BuildPackage,libmysqlclient_r)) ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org http://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] Asterisk update - 4/4 Asterisk Utilities 1.4.7 (resubmit)
Update to 1.4.7 Requires a patch to pthread call. -- Index: packages/net/asterisk-addons-1.4.x/patches/031-pthread_param.patch === --- packages/net/asterisk-addons-1.4.x/patches/031-pthread_param.patch (revision 0) +++ packages/net/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: packages/net/asterisk-addons-1.4.x/patches/021-cross_configure.patch === --- packages/net/asterisk-addons-1.4.x/patches/021-cross_configure.patch (revision 11372) +++ packages/net/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: packages/net/asterisk-addons-1.4.x/patches/011-chan_mobile.patch === --- packages/net/asterisk-addons-1.4.x/patches/011-chan_mobile.patch (revision 11372) +++ packages/net/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(
[OpenWrt-Devel] [PATCH] Asterisk update - 3/4 Asterisk 1.4.21 (resubmit)
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: packages/net/asterisk-1.4.x/patches/026-gsm-mips.patch === --- packages/net/asterisk-1.4.x/patches/026-gsm-mips.patch (revision 11372) +++ packages/net/asterisk-1.4.x/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: packages/net/asterisk-1.4.x/patches/017-Makefile-no_march.patch === --- packages/net/asterisk-1.4.x/patches/017-Makefile-no_march.patch (revision 11372) +++ packages/net/asterisk-1.4.x/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: packages/net/asterisk-1.4.x/patches/023-autoconf-chan_h323.patch === --- packages/net/asterisk-1.4.x/patches/023-autoconf-chan_h323.patch (revision 11372) +++ packages/net/asterisk-1.4.x/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: packages/net/asterisk-1.4.x/patches/013-chan_iax2-tmp_path.patch === --- packages/net/asterisk-1.4.x/patches/013-chan_iax2-tmp_path.patch (revision 11372) +++ packages/net/asterisk-1.4.x/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
[OpenWrt-Devel] [PATCH] Asterisk update - 2/4 Add zaptel library (resubmit)
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: packages/libs/zaptel-1.4.x/patches/200-Makefile-pwd.patch === --- packages/libs/zaptel-1.4.x/patches/200-Makefile-pwd.patch (revision 0) +++ packages/libs/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: packages/libs/zaptel-1.4.x/patches/300-zaptel-base.patch === --- packages/libs/zaptel-1.4.x/patches/300-zaptel-base.patch(revision 0) +++ packages/libs/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: packages/libs/zaptel-1.4.x/Makefile === --- packages/libs/zaptel-1.4.x/Makefile (revision 0) +++ packages/libs/zaptel-1.4.x/Makefile (revision 0) @@ -0,0 +1,116 @@ +# +# 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-util + $(call Package/zaptel14/Default) + SECTION:=utils + CATEGORY:=Utilities + TITLE+= utils + DEPENDS := +kmod-zaptel14 +endef + +define Package/zaptel14-util/description + This package contains the zttest program +endef + +define Package/zaptel14-libtonezone + $(call Package/zaptel14/Default) + SECTION:=libs + CATEGORY:=Libraries + TITLE+= libtonezone (library) + DEPENDS := +kmod-zaptel14 +endef + +define Package/zaptel14-libtonezone/description + This package contains the libraries for accessing zaptel/dummy drivers. +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)
[OpenWrt-Devel] [PATCH] Asterisk update - 1/4 Add speexdsp library (resubmit)
The speexdsp library is required by the latest asterisk Signed-off-by: Michael Geddes --- Index: packages/libs/speex/Makefile === --- packages/libs/speex/Makefile(revision 11372) +++ packages/libs/speex/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/libspeexdsp/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 @@ -62,12 +81,14 @@ endef define Build/InstallDev - mkdir -p $(1)/usr/include + $(INSTALL_DIR) $(1)/usr/include $(CP) $(PKG_INSTALL_DIR)/usr/include/speex $(1)/usr/include/ - mkdir -p $(1)/usr/lib + $(INSTALL_DIR) $(1)/usr/lib $(CP) $(PKG_INSTALL_DIR)/usr/lib/libspeex.{a,so*} $(1)/usr/lib/ - mkdir -p $(1)/usr/lib/pkgconfig + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libspeexdsp.{a,so*} $(1)/usr/lib/ + $(INSTALL_DIR) $(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] Dynamic Apache - 3/3 a pache (resubmit)
The patches to apache itself. Including all the modules as separate packages. Signed-off-by: Michael Geddes --- Index: packages/net/apache/patches/005-apxs_optware.patch === --- packages/net/apache/patches/005-apxs_optware.patch (revision 0) +++ packages/net/apache/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: packages/net/apache/Makefile === --- packages/net/apache/Makefile(revision 11801) +++ packages/net/apache/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)
[OpenWrt-Devel] [PATCH] Dynamic Apache - 2/3 l ibapr-util (resubmit)
Patches to libapr-util to support apache with modules. Signed-off-by: Michael Geddes --- Index: packages/libs/apr-util/Makefile === --- packages/libs/apr-util/Makefile (revision 11372) +++ packages/libs/apr-util/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] Dynamic Apache - 1/3 libapr (resubmit)
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: packages/libs/apr/Makefile === --- packages/libs/apr/Makefile (revision 11372) +++ packages/libs/apr/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
Re: [OpenWrt-Devel] never ending story of patches not being applied
On Fri, 25 Jul 2008 03:38:40 pm [EMAIL PROTECTED] wrote: > I personally find it difficult to keep track of which patches on the > mailing list have been applied and which have not. Absolutely, unless emailed patches are going to a single person who delegates, this isn't a workable solution. > > Trac is much more usefull here. i certainly cannot remember why patch > series started to pop up on the ML and not in trac. > > Trac is full of bugs, which we do want and need to apply. We owe this > to the users and contributors of owrt. We need to change something - both the openwrt developers and active contributors are a valuable resource, often with many other demands on their time. There are so many positives about this project, and I personally would like to see it continue and thrive. > So here is my 10 point plan of how we could change this. Yay for a plan.. I agree with all points. > > 1.) Create a proper user manual Both for openwrt and buildroot-ng. > > 6.) less flaming please. as said before, we all work really hard and > some times it just takes time. I for example do about 55+ hours a week > before even looking at owrt. I hope my response didn't sound like a flame. Possibly it did. Sorry if so. I'm going to get back to resubmitting my patches after Andy's comments. There needs to be exactly this kind of dialog between the dev's and the contributors. Keep contributors on their toes.. but just keep the feedback coming :) //.ichael G. ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org http://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] Work-In-Progress Day
On Thu, 24 Jul 2008 09:50:02 pm Brian J. Murrell wrote: > On Thu, 2008-07-24 at 12:49 +0200, Gregers Petersen wrote: > > WIP-Day will again emerge on saturday at UTC 12:00 on #openwrt-devel, > > and spread its life across the following 24 hours. > > Maybe I misunderstand the purpose of this event, but in case I don't, > will any effort will be spent during this event to land the many patches > that have been posted here and not landed? > > As a contributor who is not bothering to post patches anymore (I am sure > I'm not the only one) I think it would be a really good show of > appreciation for contributor effort. If indeed such efforts are > appreciated. I would really like to see a first buildroot-ng kamikaze version come out. I am quite happy using trunk - but am getting slightly sick of saying 'you might just have to build your own trunk' on #openwrt, knowing how much improvement there is in trunk compared to the last release. I certainly second the idea that WIP day focus on - in order of preference: 1) Applying patches that have come in - or at the very least responding to the contributor with a) request for the patch to be fixed up b) request for information on what is fixed c) a reason for postponing the patch d) a reason for declining the patch 2) Getting packages to build that currently won't then 3) Bug-fixes Certainly, there may be a lot of bugs out there, but giving outside contributors some idea that they are valuable should be a high priority, since the more valuable they feel, the more inclined they will be to post their bugs, and the more valuable they will, in fact, be in helping with point 3). //.ichael G. ___ 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
[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 \
[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] Apache with modules 3/3 Apache - include as separate modules
/ipkg-server/usr/lib/mod_userdir.so $(1)/usr/share/apache2/ +endef + +define Package/apache-mod_usertrack/install + $(INSTALL_DIR) $(1)/usr/share/apache2/ + $(CP) $(PKG_BUILD_DIR)/ipkg-server/usr/lib/mod_usertrack.so $(1)/usr/share/apache2/ +endef + +define Package/apache-mod_version/install + $(INSTALL_DIR) $(1)/usr/share/apache2/ + $(CP) $(PKG_BUILD_DIR)/ipkg-server/usr/lib/mod_version.so $(1)/usr/share/apache2/ +endef + +define Package/apache-mod_vhost_alias/install + $(INSTALL_DIR) $(1)/usr/share/apache2/ + $(CP) $(PKG_BUILD_DIR)/ipkg-server/usr/lib/mod_vhost_alias.so $(1)/usr/share/apache2/ +endef + define Package/apache-server/postrm rm -rf /usr/sbin/httpd ln -s /bin/busybox /usr/sbin/httpd @@ -161,9 +942,59 @@ define Package/apache-icons/install $(INSTALL_DIR) $(1)/usr/share - $(CP) $(PKG_INSTALL_DIR)/usr/share/icons $(1)/usr/share/ + # $(CP) $(PKG_INSTALL_DIR)/usr/share/icons $(1)/usr/share/ + if [ -d $(PKG_BUILD_DIR)/ipkg-server/ ] ; \ + then $(CP) $(PKG_BUILD_DIR)/ipkg-server/usr/share/icons $(1)/usr/share/ ; \ + else $(CP) $(PKG_BUILD_DIR)/ipkg-server/usr/share/icons $(1)/usr/share/ ; \ + fi endef $(eval $(call BuildPackage,apache)) $(eval $(call BuildPackage,apache-server)) $(eval $(call BuildPackage,apache-icons)) +$(eval $(call BuildPackage,apache-mod_actions)) +$(eval $(call BuildPackage,apache-mod_alias)) +$(eval $(call BuildPackage,apache-mod_asis)) +$(eval $(call BuildPackage,apache-mod_auth_basic)) +$(eval $(call BuildPackage,apache-mod_auth_digest)) +$(eval $(call BuildPackage,apache-mod_authn)) +$(eval $(call BuildPackage,apache-mod_authn_db)) +$(eval $(call BuildPackage,apache-mod_authz)) +$(eval $(call BuildPackage,apache-mod_authz_dbm)) +$(eval $(call BuildPackage,apache-mod_autoindex)) +$(eval $(call BuildPackage,apache-mod_cache)) +$(eval $(call BuildPackage,apache-mod_cern_meta)) +$(eval $(call BuildPackage,apache-mod_cgi)) +$(eval $(call BuildPackage,apache-mod_dav_fs)) +$(eval $(call BuildPackage,apache-mod_dbd)) +$(eval $(call BuildPackage,apache-mod_deflate)) +$(eval $(call BuildPackage,apache-mod_dir)) +$(eval $(call BuildPackage,apache-mod_dumpio)) +$(eval $(call BuildPackage,apache-mod_env)) +$(eval $(call BuildPackage,apache-mod_expires)) +$(eval $(call BuildPackage,apache-mod_ext_filter)) +$(eval $(call BuildPackage,apache-mod_file_cache)) +$(eval $(call BuildPackage,apache-mod_filter)) +$(eval $(call BuildPackage,apache-mod_headers)) +$(eval $(call BuildPackage,apache-mod_ident)) +$(eval $(call BuildPackage,apache-mod_imagemap)) +$(eval $(call BuildPackage,apache-mod_include)) +$(eval $(call BuildPackage,apache-mod_info)) +$(eval $(call BuildPackage,apache-mod_log)) +$(eval $(call BuildPackage,apache-mod_mem_cache)) +$(eval $(call BuildPackage,apache-mod_mime_magic)) +$(eval $(call BuildPackage,apache-mod_negotiation)) +$(eval $(call BuildPackage,apache-mod_proxy)) +$(eval $(call BuildPackage,apache-mod_proxy_balancer)) +$(eval $(call BuildPackage,apache-mod_proxy_ajp)) +$(eval $(call BuildPackage,apache-mod_rewrite)) +$(eval $(call BuildPackage,apache-mod_setenvif)) +$(eval $(call BuildPackage,apache-mod_speling)) +$(eval $(call BuildPackage,apache-mod_ssl)) +$(eval $(call BuildPackage,apache-mod_status)) +$(eval $(call BuildPackage,apache-mod_unique_id)) +$(eval $(call BuildPackage,apache-mod_userdir)) +$(eval $(call BuildPackage,apache-mod_usertrack)) +$(eval $(call BuildPackage,apache-mod_version)) +$(eval $(call BuildPackage,apache-mod_vhost_alias)) + The patches to apache itself. Including all the modules as separate packages. Signed-off-by: Michael Geddes --- ___ 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 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] 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] 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-addo
[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.
[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] 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_
[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
Re: [OpenWrt-Devel] Problems building glib
> > ); > > endef > > -8<- > > The build is done in 2 passes, it first builds glib for the host to have > a 'glib-genmarshal' utility working on the host system, and then it > builds glib for the target, telling configure to use the > 'glib-genmarshal' that was just built before. > > -- > Nico > AH. So I wonder if it's the host or the target that fails the test compile? //.ichael ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org http://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] Problems building glib
I'm getting this - it's stopping my build, and I'm not really sure how to procede! 8<-- Making all in tests make[8]: Entering directory `/Debian/home/michaelg/OpenWRT/build/trunk/build_dir/mipsel/glib-2.15.4/gio/tests' /bin/bash ../../libtool --tag=CC --mode=link mipsel-linux-uclibc-gcc -Os -pipe -mips32 -mtune=mips32 -funit-at-a-time -fhonour-copts -Wall -L/Debian/home/michaelg/OpenWRT/build/trunk/staging_dir/toolchain-mipsel_gcc3.4.6/lib -L/Debian/home/michaelg/OpenWRT/build/trunk/staging_dir/mipsel/usr/lib -L/Debian/home/michaelg/OpenWRT/build/trunk/staging_dir/mipsel/lib -L/Debian/home/michaelg/OpenWRT/build/trunk/staging_dir/toolchain-mipsel_gcc3.4.6/lib -L/Debian/home/michaelg/OpenWRT/build/trunk/staging_dir/mipsel/usr/lib/libiconv/lib -L/Debian/home/michaelg/OpenWRT/build/trunk/staging_dir/mipsel/usr/lib/libintl/lib -o memory-input-stream memory-input-stream.o ../../glib/libglib-2.0.la ../../gobject/libgobject-2.0.la ../../gio/libgio-2.0.la -lintl mipsel-linux-uclibc-gcc -Os -pipe -mips32 -mtune=mips32 -funit-at-a-time -fhonour-copts -Wall -o .libs/memory-input-stream memory-input-stream.o -L/Debian/home/michaelg/OpenWRT/build/trunk/staging_dir/toolchain-mipsel_gcc3.4.6/lib -L/Debian/home/michaelg/OpenWRT/build/trunk/staging_dir/mipsel/usr/lib -L/Debian/home/michaelg/OpenWRT/build/trunk/staging_dir/mipsel/lib -L/Debian/home/michaelg/OpenWRT/build/trunk/staging_dir/mipsel/usr/lib/libiconv/lib -L/Debian/home/michaelg/OpenWRT/build/trunk/staging_dir/mipsel/usr/lib/libintl/lib ../../glib/.libs/libglib-2.0.so ../../gobject/.libs/libgobject-2.0.so ../../gio/.libs/libgio-2.0.so /Debian/home/michaelg/OpenWRT/build/trunk/build_dir/mipsel/glib-2.15.4/gobject/.libs/libgobject-2.0.so /Debian/home/michaelg/OpenWRT/build/trunk/build_dir/mipsel/glib-2.15.4/gmodule/.libs/libgmodule-2.0.so -ldl /Debian/home/michaelg/OpenWRT/build/trunk/build_dir/mipsel/glib-2.15.4/glib/.libs/libglib-2.0.so -liconv -lintl ../../gio/.libs/libgio-2.0.so: undefined reference to `inotify_init' ../../gio/.libs/libgio-2.0.so: undefined reference to `inotify_rm_watch' ../../gio/.libs/libgio-2.0.so: undefined reference to `inotify_add_watch' -8<- There is a patch that modifies Makefile.in to remove the test/ directory - this patch is being applied (checked Makefile.in). There's some weirdness in the Makefile I just don't understand (snippet below). What on earth is this trying to achieve!? Doing a "make install clean" in the 'Configure' target seems a rather strange thing to be doing. I might just see if I can not compile this. //.ichael G --8<--- define Build/Configure mkdir -p $(PKG_BUILD_DIR)/build/$(GNU_HOST_NAME) ( cd $(PKG_BUILD_DIR); CONFIG_SITE= \ ./configure \ --target=$(GNU_HOST_NAME) \ --host=$(GNU_HOST_NAME) \ --build=$(GNU_HOST_NAME) \ --prefix=$(PKG_BUILD_DIR)/build/$(GNU_HOST_NAME) \ --disable-shared \ --enable-static \ --enable-debug=no \ ); $(MAKE) -C $(PKG_BUILD_DIR) install clean $(call Build/Configure/Default, \ --enable-shared \ --enable-static \ --enable-debug=no \ , \ CPPFLAGS="CPPFLAGS -I$(STAGING_DIR)/usr/lib/libiconv/include" \ CPPFLAGS="CPPFLAGS -I$(STAGING_DIR)/usr/lib/libintl/include" \ LDFLAGS="LDFLAGS -L$(STAGING_DIR)/usr/lib/libiconv/lib" \ LDFLAGS="LDFLAGS -L$(STAGING_DIR)/usr/lib/libintl/lib" \ glib_cv_stack_grows=no \ glib_cv_uscore=no \ ac_cv_path_GLIB_GENMARSHAL=$(PKG_BUILD_DIR)/build/$(GNU_HOST_NAME)/bin/glib-genmarshal \ ); endef -8<- ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org http://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH] dbus-compile-fix
On Thu, 22 May 2008 05:30:04 pm Johannes 'fish' Ziemke wrote: > Hello robert.buranyi, > > you wrote: > > Fix for the include/lib directories in the dbus build process. Remove > > dbus-x11 from default configuration. > > I don't think it wanted to have X11 completly disabled. It just was > enabled in r11087. > Which broke my build - because that puts -I /usr/include (rather than the stagin_dir) on compiler flags in the build process and it stops compilation. //.ichael G. ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org http://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH] package-vim: fix broken Makefile
On Wed, 21 May 2008 05:53:00 pm Patrick Scharrenberg wrote: > - corrected inclusion of Package/vim/Default > - removed unused Package/vim-full/conffiles and Package/vim/conffiles > - removed unused/broken Package/vim-full/postinst and Package/vim/postinst > which tried to modify files on the build-host!! > > Signed-off-by: Patrick Scharrenberg <[EMAIL PROTECTED]> > --- Thanks for that Patrick - sincere appologies... I realy should have fixed it up myself. I promise I'll take more care of my next patch. Didn't I use the conffiles? Strange. //.ichael ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org http://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [patch] Add vim-full vim-runtime vim-doc targets
APpologies for the bug in the post-inst scripts. I've also discovered that the post-inst scripts don't work if you want to include this in the image (like I have). You might want to remove the post-inst scripts. There's a lot of pain for little gain. About the docs - If you've got the space vim is always better with its documentation. However I decided that I would split the docs out so that you could choose to install or not to install. //.ichael G ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org http://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel