Re: [OpenWrt-Devel] [PATCH] pcre: update to 8.20
Le Thu, 3 Nov 2011 07:11:38 +0100,
Nico n...@openwrt.org a écrit :
Hi Raphael,
Thanks for the update, but...
- don't update PKG_SOURCE_URL, the latest version is still available
on SF
Sorry for that, but the archive has been uploaded only 15h ago on SF.
It had been on ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/
since October 21.
So the new URL seems to be the primary one, that's why I changed to it
in the patch. Why do you prefer SF?
- if you want libpcrecpp to get built only if Advanced configuration
options (for developers) menuconfig option is set, just add a
dependency on @DEVEL to libpcrecpp
That's not what I want. I wanted to fix the error when doing:
$ make package/pcre/compile V=99 DEVELOPER=1
Am I wrong?
Please tell me if I should resubmit a patch :)
Thanks!
-Raphaël
--
-{Nico}
2011/11/2 Raphaël HUCK r...@cksum.org:
Hi all,
this patch:
* updates pcre to 8.20
* updates PKG_SOURCE_URL
* fixes building libpcrecpp when DEVELOPER=1
Thanks,
-Raphaël
___
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 mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] libpng: update to 1.2.46
Hi all, this patch updates libpng to 1.2.46. From the changelog: *Fixed uninitialized memory read in png_format_buffer() (Bug report by Frank Busse, related to CVE-2004-0421). * Pass instead of '\0' to png_default_error() in png_err(). This mistake was introduced in libpng-1.2.20beta01. * Check for up-location !PNG_AFTER_IDAT when writing unknown chunks before IDAT. * Ported bugfix in pngrtran.c from 1.5.3: when expanding a paletted image, always expand to RGBA if transparency is present. * Check for integer overflow in png_set_rgb_to_gray(). Thanks! -Raphaël --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2006 OpenWrt.org +# Copyright (C) 2006-2011 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -8,15 +8,15 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libpng -PKG_VERSION:=1.2.44 +PKG_VERSION:=1.2.46 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=@SF/libpng -PKG_MD5SUM:=e3ac7879d62ad166a6f0c7441390d12b +PKG_MD5SUM:=e8b43dc78ef95b3949af7f961d76874b -PKG_FIXUP:=libtool PKG_INSTALL:=1 +PKG_FIXUP:=libtool PKG_BUILD_PARALLEL:=1 include $(INCLUDE_DIR)/host-build.mk @@ -34,7 +34,7 @@ TARGET_CFLAGS += $(FPIC) CONFIGURE_ARGS += \ --enable-shared \ - --enable-static \ + --enable-static define Build/InstallDev $(INSTALL_DIR) $(1)/usr/bin ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] bison: update to 2.5
Hi all, this patch updates bison to 2.5. Thanks! -Raphaël --- a/Makefile +++ b/Makefile @@ -1,18 +1,18 @@ -# -# Copyright (C) 2008 OpenWrt.org +# +# Copyright (C) 2006-2011 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. # + include $(TOPDIR)/rules.mk PKG_NAME:=bison -PKG_VERSION:=2.4.3 +PKG_VERSION:=2.5 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_SOURCE_URL:=@GNU/$(PKG_NAME) -PKG_MD5SUM:=c1d3ea81bc370dbd43b6f0b2cd21287e -PKG_CAT:=bzcat +PKG_SOURCE_URL:=@GNU/bison +PKG_MD5SUM:=9dba20116b13fc61a0846b0058fbe004 include $(INCLUDE_DIR)/host-build.mk ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] pcre: update to 8.20
Hi all, this patch: * updates pcre to 8.20 * updates PKG_SOURCE_URL * fixes building libpcrecpp when DEVELOPER=1 Thanks, -Raphaël --- a/Makefile +++ b/Makefile @@ -8,16 +8,15 @@ include $(TOPDIR)/rules.mk PKG_NAME:=pcre -PKG_VERSION:=8.11 -PKG_RELEASE:=2 +PKG_VERSION:=8.20 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_SOURCE_URL:=@SF/pcre -PKG_MD5SUM:=ef907b8792ec7f90f0dcd773848f0b3b - -PKG_FIXUP:=autoreconf +PKG_SOURCE_URL:=ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/ +PKG_MD5SUM:=a1931c70e1273e3450d5036fe273d25c PKG_INSTALL:=1 +PKG_FIXUP:=autoreconf include $(INCLUDE_DIR)/package.mk @@ -43,12 +42,12 @@ TARGET_CFLAGS += $(FPIC) CONFIGURE_ARGS += \ --enable-utf8 \ - --enable-unicode-properties \ + --enable-unicode-properties -ifneq ($(CONFIG_PACKAGE_libpcrecpp),) - CONFIGURE_ARGS+= --enable-cpp +ifneq ($(DEVELOPER)$(CONFIG_PACKAGE_libpcrecpp),) + CONFIGURE_ARGS += --enable-cpp else - CONFIGURE_ARGS+= --disable-cpp + CONFIGURE_ARGS += --disable-cpp endif MAKE_FLAGS += \ @@ -69,7 +68,6 @@ define Build/InstallDev $(INSTALL_DIR) $(1)/usr/lib/pkgconfig $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libpcre*.pc $(1)/usr/lib/pkgconfig/ - endef define Package/libpcre/install ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH] ipkg-make-index: replace awk calls with stat and cut (from coreutils)
Le Thu, 27 Oct 2011 17:03:05 +0200,
Florian Fainelli flor...@openwrt.org a écrit :
On Thursday 27 October 2011 16:45:11 Raphaël HUCK wrote:
Hi all,
this patch replaces awk calls with stat and cut, which are both
included in coreutils.
Have you verified this works on BDS platforms, as well as MacOSX?
No, as I don't have a BSD or MacOS X system to test on.
And you're right to point this out, as stat -c %s doesn't work on
BSD, though cut -d' ' -f1 seems to be fine.
I've been looking intensively through Linux, BSD, and MacOS X man
pages, and I've come to the conclusion that the best portable way to
get the size of a file is:
$ wc -c $FILE
I've updated my patch, it now uses wc (which is also in coreutils) and
doesn't need cut anymore.
Thanks!
-Raphaël
--- scripts/ipkg-make-index.sh.orig 2011-10-27 16:08:33.149886769 +0200
+++ scripts/ipkg-make-index.sh 2011-10-28 11:13:42.483519744 +0200
@@ -1,24 +1,25 @@
#!/bin/sh
set -e
-pkg_dir=$1
+pkg_dir=$1
-if [ -z $pkg_dir ] || [ ! -d $pkg_dir ]; then
+if [ -z ${pkg_dir} ] || [ ! -d ${pkg_dir} ]; then
echo Usage: ipkg-make-index package_directory 2
exit 1
fi
-which md5sum /dev/null 21 || alias md5sum=md5
+which md5sum /dev/null 21 || alias md5sum=md5
-for pkg in `find $pkg_dir -name '*.ipk' | sort`; do
- echo Generating index for package $pkg 2
- file_size=$(ls -l $pkg | awk '{print $5}')
- md5sum=$(md5sum $pkg | awk '{print $1}')
+for pkg in $(find ${pkg_dir} -name '*.ipk' | sort); do
+ echo Generating index for package ${pkg} 2
+ file_size=$(wc -c ${pkg})
+ md5sum=$(md5sum ${pkg} 2 /dev/null)
+ md5sum=${sum%% *}
# Take pains to make variable value sed-safe
- sed_safe_pkg=`echo $pkg | sed -e 's/^\.\///g' -e 's/\\//\\//g'`
- tar -xzOf $pkg ./control.tar.gz | tar xzOf - ./control | sed -e s/^Description:/Filename: $sed_safe_pkg\\
-Size: $file_size\\
-MD5Sum: $md5sum\\
+ sed_safe_pkg=$(echo ${pkg} | sed -e 's/^\.\///g' -e 's/\\//\\//g')
+ tar -xzOf ${pkg} ./control.tar.gz | tar xzOf - ./control | sed -e s/^Description:/Filename: ${sed_safe_pkg}\\
+Size: ${file_size}\\
+MD5Sum: ${md5sum}\\
Description:/
echo
done
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] ipkg-make-index: replace awk calls with stat and cut (from coreutils)
Hi all,
this patch replaces awk calls with stat and cut, which are both
included in coreutils.
Thanks,
-Raphaël
--- scripts/ipkg-make-index.sh.orig 2011-10-27 16:08:33.149886769 +0200
+++ scripts/ipkg-make-index.sh 2011-10-27 16:13:25.593893720 +0200
@@ -12,8 +12,8 @@ which md5sum /dev/null 21 || alias md
for pkg in `find $pkg_dir -name '*.ipk' | sort`; do
echo Generating index for package $pkg 2
- file_size=$(ls -l $pkg | awk '{print $5}')
- md5sum=$(md5sum $pkg | awk '{print $1}')
+ file_size=$(stat -c %s $pkg)
+ md5sum=$(md5sum $pkg | cut -d' ' -f1)
# Take pains to make variable value sed-safe
sed_safe_pkg=`echo $pkg | sed -e 's/^\.\///g' -e 's/\\//\\//g'`
tar -xzOf $pkg ./control.tar.gz | tar xzOf - ./control | sed -e s/^Description:/Filename: $sed_safe_pkg\\
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] listener: new package
Hi all,
this patch adds a new package: listener.
http://www.vanheusden.com/listener/
This program listens for sound. If it detects any, it starts recording
automatically and also automatically stops when things become silent
again.
Thanks,
-Raphaël
diff -pruN -x .svn sound.orig/listener/Makefile sound/listener/Makefile
--- sound.orig/listener/Makefile 1970-01-01 01:00:00.0 +0100
+++ sound/listener/Makefile 2011-10-13 11:31:32.628743849 +0200
@@ -0,0 +1,42 @@
+#
+# Copyright (C) 2006-2011 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=listener
+PKG_VERSION:=1.7.2
+PKG_RELEASE:=1
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tgz
+PKG_SOURCE_URL:=http://www.vanheusden.com/listener/
+PKG_MD5SUM:=8ad9c24c45c7d28aed606304a2bf80bf
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/listener
+ SECTION:=sound
+ CATEGORY:=Sound
+ DEPENDS:=+libncurses +libsndfile
+ TITLE:=Listener automatically records when sound is detected
+ URL:=http://www.vanheusden.com/listener/
+endef
+
+define Package/listener/description
+ This program listens for sound. If it detects any, it starts recording
+ automatically and also automatically stops when things become silent
+ again.
+endef
+
+define Package/listener/install
+ $(INSTALL_DIR) $(1)/usr/bin
+ $(CP) $(PKG_BUILD_DIR)/{listener,listenersoundpipe,setlistener} $(1)/usr/bin/
+
+ $(INSTALL_DIR) $(1)/etc
+ $(CP) $(PKG_BUILD_DIR)/listener.conf $(1)/etc/
+endef
+
+$(eval $(call BuildPackage,listener))
diff -pruN -x .svn sound.orig/listener/patches/100-makefile.patch sound/listener/patches/100-makefile.patch
--- sound.orig/listener/patches/100-makefile.patch 1970-01-01 01:00:00.0 +0100
+++ sound/listener/patches/100-makefile.patch 2011-10-13 11:31:32.628743849 +0200
@@ -0,0 +1,28 @@
+--- a/Makefile
b/Makefile
+@@ -2,7 +2,7 @@ VERSION=1.7.2
+
+ INSTALL_PREFIX=/usr/local
+
+-CFLAGS+=-g -O2 -Wall -DVERSION=\$(VERSION)\
++CFLAGS+=-DVERSION=\$(VERSION)\
+
+ OBJSsl=sl.o snd_dev.o error.o utils.o
+ OBJSli=listener.o snd_dev.o error.o utils.o lib.o
+@@ -11,13 +11,13 @@ OBJSsp=snd_dev.o lsp.o error.o utils.o
+ all: setlistener listener listenersoundpipe
+
+ setlistener: $(OBJSsl)
+- $(CC) -g -Wall -W $(OBJSsl) -ldl -lncurses -o setlistener
++ $(CC) $(CFLAGS) $(OBJSsl) $(LDFLAGS) -ldl -lncurses -o setlistener
+
+ listener: $(OBJSli)
+- $(CC) -g -Wall -W $(OBJSli) -ldl -lm -lsndfile -o listener -DCONFIGFILE=$(INSTALL_PREFIX)/etc/listener.conf
++ $(CC) $(CFLAGS) $(OBJSli) $(LDFLAGS) -ldl -lm -lsndfile -o listener -DCONFIGFILE=$(INSTALL_PREFIX)/etc/listener.conf
+
+ listenersoundpipe: $(OBJSsp)
+- $(CC) -g -Wall -W $(OBJSsp) -o listenersoundpipe
++ $(CC) $(CFLAGS) $(OBJSsp) -o listenersoundpipe
+
+ install: setlistener listener listenersoundpipe
+ cp setlistener $(INSTALL_PREFIX)/bin
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] hiawatha: update to 7.7
Hi all, this patch updates hiawatha to 7.7. Changelog: * First parameter of Alias can now contain subdirectories. * Improved stability for connections with SSL client authentication. * Bugfix: BanOnFlooding was broken. Thanks! -Raphaël diff -pruN -x .svn packages/net/hiawatha.orig/Makefile packages/net/hiawatha/Makefile --- packages/net/hiawatha.orig/Makefile 2011-10-13 18:09:17.077311023 +0200 +++ packages/net/hiawatha/Makefile 2011-10-13 18:04:51.505304710 +0200 @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=hiawatha -PKG_VERSION:=7.6 +PKG_VERSION:=7.7 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://www.hiawatha-webserver.org/files/ -PKG_MD5SUM:=45e7c3229a94d19abb5d92daa36c61d9 +PKG_MD5SUM:=7195c829c86f1ed37d314daa4e06d06b PKG_INSTALL:=1 @@ -35,6 +35,7 @@ endef CONFIGURE_ARGS+= \ --disable-cache \ + --disable-ipv6 \ --disable-monitor \ --disable-ssl \ --disable-xslt ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] src-git: pull broken in scripts/feeds
why is the following comment present in scripts/feeds [1]? # src-git: pull broken Does it mean that it's not possible to update feeds using the src-git method? [1] https://dev.openwrt.org/browser/trunk/scripts/feeds#L138 I've been waiting for new commits to appear in git://nbd.name/packages.git and tried this: $ cat feeds.conf src-git packages git://nbd.name/packages.git $ ./scripts/feeds update -a Updating feed 'packages' from 'git://nbd.name/packages.git' ... remote: Counting objects: 17, done. remote: Compressing objects: 100% (10/10), done. remote: Total 10 (delta 6), reused 0 (delta 0) Unpacking objects: 100% (10/10), done. From git://nbd.name/packages faa1877..84d3342 master - origin/master Updating faa1877..84d3342 Fast-forward net/babel/Makefile |4 ++-- utils/boxbackup/Makefile |4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) Create index file './feeds/packages.index' Collecting package info: done What does this comment (# src-git: pull broken) mean? Thanks, -Raphael ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] src-git: pull broken in scripts/feeds
Hi all, why is the following comment present in scripts/feeds [1]? # src-git: pull broken Does it mean that it's not possible to update feeds using the src-git method? Thanks! -Raphael [1] https://dev.openwrt.org/browser/trunk/scripts/feeds#L138 ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] dnsmasq: update to 2.58
Hi, this patch updates dnsmasq to 2.58. The long list of changes is here: http://www.thekelleys.org.uk/dnsmasq/CHANGELOG Regards, -Raphaeldiff -pruN dnsmasq.orig/Makefile dnsmasq/Makefile --- dnsmasq.orig/Makefile 2011-09-07 15:36:03.205389307 +0200 +++ dnsmasq/Makefile 2011-09-07 18:18:03.888911553 +0200 @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=dnsmasq -PKG_VERSION:=2.57 -PKG_RELEASE:=2 +PKG_VERSION:=2.58 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://thekelleys.org.uk/dnsmasq -PKG_MD5SUM:=d10faeb409717eae94718d7716ca63a4 +PKG_MD5SUM:=14c5c81debb324adc261db971730f4c6 include $(INCLUDE_DIR)/package.mk @@ -25,7 +25,7 @@ define Package/dnsmasq endef define Package/dnsmasq/description - It is intended to provide coupled DNS and DHCP service to a LAN. + It is intended to provide coupled DNS and DHCP service to a LAN. endef define Package/dnsmasq/conffiles @@ -39,7 +39,8 @@ define Build/Compile $(MAKE) -C $(PKG_BUILD_DIR) \ $(TARGET_CONFIGURE_OPTS) \ CFLAGS=$(TARGET_CFLAGS) \ - BINDIR=/usr/sbin MANDIR=/usr/man \ + BINDIR=/usr/sbin \ + MANDIR=/usr/man \ AWK=awk \ LDFLAGS=-Wl,--gc-sections \ all ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] hiawatha: update to 7.6
Hi, this patch updates hiawatha to 7.6. Changelog since 7.3: PreventSQLi option rewritten. OldBrowser option added to URL toolkit. Improved mimetype configuration. Do-not-track HTTP header support. Password file entries can now be created with Wigwam. Small bugfixes and improvements. Bugfix: sent one byte too few for Range -XX. Bugfix: possible crash when using PreventSQLi. Bugfix: integer overflow in fetch_request() which could lead to a server crash. Connections per IP added to RequestLimitMask. NoExtensionAs made a per-host setting. Small bugfixes and improvements. Bugfix: usage of HideProxy caused Hiawatha to refuse new connections after ConnectionsTotal connections. Bugfix: memory leak in XSLT module. Regards, -Raphael--- hiawatha.orig/Makefile 2011-09-07 17:46:00.277006095 +0200 +++ hiawatha/Makefile 2011-09-08 15:19:27.106118848 +0200 @@ -1,5 +1,5 @@ # -# Copyright (C) 2006-2010 OpenWrt.org +# Copyright (C) 2006-2011 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=hiawatha -PKG_VERSION:=7.3 +PKG_VERSION:=7.6 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://www.hiawatha-webserver.org/files/ -PKG_MD5SUM:=52fd6bf798c07298e12ff69b882f3d76 +PKG_MD5SUM:=45e7c3229a94d19abb5d92daa36c61d9 PKG_INSTALL:=1 @@ -30,7 +30,7 @@ define Package/hiawatha endef define Package/hiawatha/description -Hiawatha is an open source webserver with a focus on security. + Hiawatha is an open source webserver with a focus on security. endef CONFIGURE_ARGS+= \ ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] Valgrind for MIPS
Hi all, I've just stumbled upon a patch adding MIPS support to Valgrind. It is applicable for MIPS32r2 instruction set, and supports both little-endian and big-endian cores. It can be applied to the revision 11845 (version 3.7.0.SVN) from the main Valgrind trunk. However, as the Valgrind package in OpenWrt (https://dev.openwrt.org/browser/packages/utils/valgrind/Makefile) uses version 3.3.1, how is it possible to package Valgrind/MIPS for OpenWrt without conflicting with the existing package? For those who are interested in this patch, see https://bugs.kde.org/show_bug.cgi?id=270777#c12 Thanks, -Raphael ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH] Add support for a noname router from DX
This patch adds full support for this router: http://www.dealextreme.com/p/portable-wireless-n-3g-router-cdma2000-evdo-td-scdma-hspa-wcdma-45639 This is a resubmit of my previous patch against current trunk. I have adjusted mtd partitioning so that built-in dwc_otgusb would fit in and cleaned up some unneeded stuff. Patch attached. The patch looks good. However 'Unbranded-3G' is not a descriptive name, and the router has a model number: WS-WR512N1. See the label on the back of the device: http://www.dealextreme.com/photogallery.dx/sku.45639~seQ.2 Please replace the 'unbranded' stuff with something according to the model number, and resubmit the patch. It appears to be a Winstars WS-WN512N1 (http://www.win-star.com/eshop/goods.php?id=120). This is good news, a 3G router for 30€ :) Thanks! -Raphaël ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH] Add support for a noname router from DX
The patch looks good. However 'Unbranded-3G' is not a descriptive name, and the router has a model number: WS-WR512N1. See the label on the back of the device: http://www.dealextreme.com/photogallery.dx/sku.45639~seQ.2 Please replace the 'unbranded' stuff with something according to the model number, and resubmit the patch. It appears to be a Winstars WS-WN512N1 (http://www.win-star.com/eshop/goods.php?id=120). Although it looks like WS-WR512N1, there are major differences from the one I got (Now that I looked at the link). Might be a WS-WR512N1 clone? On my box the leds are at the side and there are more of them 2 uncontrolled (power, lan) 5 wired via gpio, 1 through the wireless chip (assoc). No leds under the black line. Ok so the label on the back is misleading :) The picture of the front (http://www1.dealextreme.com/productimages/sku_45639_1.jpg) looks more like the Sin Hon SH-WR512NU (http://www.alibaba.com/product-gs/369696693/Network_3G_Router.html). It is also sold under those names: * i-tec WPOINT-3G (http://www.i-tec-europe.eu/?t=3v=66) * Technaxx TXX3106 (http://www.technaxx.de/webproducts/Router-3G_Mobile_WiFi-N/Router-3G_Mobile_WiFi-N_en.html) -Raphaël ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] yaddns: update to 1.0-rc3
Hi, this patch updates yaddns to 1.0-rc3. Changes are: * add support for Sitelutions service * remove -Werror which broke compilation on some services * use HTTP/1.0 instead of HTTP/1.1 to avoid chunked encoding Regards, -Raphaël ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH] yaddns: update to 1.0-rc3
Even better with the patch attached :)
Hi,
this patch updates yaddns to 1.0-rc3. Changes are:
* add support for Sitelutions service
* remove -Werror which broke compilation on some services
* use HTTP/1.0 instead of HTTP/1.1 to avoid chunked encoding
Regards,
-Raphaël
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
--- yaddns.orig/Makefile
+++ yaddns/Makefile
@@ -8,15 +8,12 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=yaddns
-PKG_VERSION:=1.0-rc2
-PKG_REV:=1
+PKG_VERSION:=1.0-rc3
PKG_RELEASE:=1
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=svn://patatrac.info/yaddns/tags/yaddns-1.0-rc2
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=$(PKG_REV)
-PKG_SOURCE_PROTO:=svn
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=http://download.gna.org/yaddns/
+PKG_MD5SUM:=83a4e5610ec8fa0166c57b9a25f0b069
PKG_INSTALL:=1
@@ -38,13 +35,6 @@ define Package/yaddns/conffiles
/etc/config/ddns
endef
-define Build/Configure
- (cd $(PKG_BUILD_DIR); rm -rf config.{cache,status} ; \
- $(SED) '/^AM_CFLAGS/ s/-Werror//' src/Makefile.am; \
- ./autogen.sh);
- $(call Build/Configure/Default, )
-endef
-
define Package/yaddns/install
$(INSTALL_DIR) $(1)/usr/bin
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/yaddns $(1)/usr/bin/
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] yaddns: update to 0.1.2
Hi, this patch updates yaddns to 0.1.2. From the changelog: * fix signals handling * improve portability with autotools Thanks, -Raphaël diff -pruN net/yaddns.orig/Makefile net/yaddns/Makefile --- net/yaddns.orig/Makefile 2010-10-27 11:12:25.0 +0200 +++ net/yaddns/Makefile 2010-10-27 11:15:18.0 +0200 @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=yaddns -PKG_VERSION:=0.1.1 +PKG_VERSION:=0.1.2 PKG_RELEASE:=1 -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=...@sf/yaddns -PKG_MD5SUM:=2708d3e47a486b1872ef9c5537cd2f0d +PKG_MD5SUM:=b76aad36ca3341814d5f0c17d6420e8a PKG_INSTALL:=1 @@ -22,7 +22,7 @@ include $(INCLUDE_DIR)/package.mk define Package/yaddns SECTION:=net CATEGORY:=Network - DEPENDS:=...@broken + DEPENDS:= TITLE:=Yet Another DDNS client URL:=http://patatrac.info/yaddns endef ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] libupnp: update to 1.6.8
Hi, this patch updates libupnp to 1.6.8. There are lots of fixes since 1.6.6, and 3 concerning embedded devices: - fix segfault when there is no services on embedded devices - customize the stack size of the threads used by pupnp - fix several memory leaks And a security issue: - fix denial-of-service Thanks, -Raphaël diff -pruN libupnp.orig/Makefile libupnp/Makefile --- libupnp.orig/Makefile 2010-10-27 11:28:31.0 +0200 +++ libupnp/Makefile 2010-10-27 11:47:08.0 +0200 @@ -1,4 +1,4 @@ -# +# # Copyright (C) 2006-2010 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libupnp -PKG_VERSION:=1.6.6 -PKG_RELEASE:=2 +PKG_VERSION:=1.6.8 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=...@sf/pupnp -PKG_MD5SUM:=8918dcf7428cd119d0c8275765ff2833 +PKG_MD5SUM:=7e162895b9d0f9efcccd07973012cdff PKG_FIXUP:=libtool PKG_INSTALL:=1 ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] bcm63xx spi patches
Hello, I've started to rework bcm63xx spi patches and make them work for a similar board, I've yet to confirm they are ok for neufbox4. Some issues are remaining (chip select, prepend bytes ...), please feel free to give me your opinion about them. I hope next week I can correct theses issues. Kind regards, Tanguy Bouzéloc. Hi Tanguy and thanks for these patches! Maybe one day we'll have a completely free bcm63xx platform :) I'm looking forward to comments on your patches, and your fixes next week. Have a nice day, -Raphaël ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] heyu: update to 2.9.1
Hi, this patch updates heyu to 2.9.1 Regards, -Raphaël diff -pruN utils.orig/heyu/Makefile utils/heyu/Makefile --- utils.orig/heyu/Makefile 2010-09-13 18:13:51.0 +0200 +++ utils/heyu/Makefile 2010-09-13 18:10:46.0 +0200 @@ -1,5 +1,5 @@ # -# Copyright (C) 2006 OpenWrt.org +# Copyright (C) 2006-2010 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=heyu -PKG_VERSION:=2.9.0 +PKG_VERSION:=2.9.1 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tgz PKG_SOURCE_URL:=http://heyu.tanj.com/download/ -PKG_MD5SUM:=e0d0788ce1049647023ed096a3007552 +PKG_MD5SUM:=89d20d7f45109e7add5f0a141eac04eb include $(INCLUDE_DIR)/package.mk @@ -47,9 +47,10 @@ define Build/Compile ) endef -define Package/heyu/install +define Package/heyu/install $(INSTALL_DIR) $(1)/usr/bin $(INSTALL_BIN) $(PKG_BUILD_DIR)/heyu $(1)/usr/bin/ + $(INSTALL_DIR) $(1)/etc/$(PKG_NAME) $(INSTALL_DATA) ./files/x10.conf $(1)/etc/$(PKG_NAME)/x10.conf endef ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] LibreWRT introduction patch
Le Mon, 26 Jul 2010 07:10:25 -0700, Jason Self ja...@librewrt.org a écrit : ralph.hem...@lantiq.com wrote: ... I would appreciate this solution. This makes it much more easy for us to create free SDK's. By default the Package License should be GPL. Only non GPL packages will add the additional License information to their feeds Makefiles ? Just to be clear, the GPL is not the only free software license. There are many, some of which have been reviewed at [1]. Some packages even include code under different licenses: e2fsprogs-1.40.11.tar.gz - GPL v2 - LGPL v2 for lib/ext2fs lib/e2p - BSD style for lib/uuid - MIT style for lib/et lib/ss ppp-2.4.4.tar.gz - 'chat' utility is public domain - pppd, pppstats pppdump are BSD style - some plugins under GPL Just because something doesn't use the GPL, it doesn't automatically follow that it's not free software. That's decided on whether the user has four specific freedoms [2]. I wonder if it would be better to instead include something that indicates whether it is (or is not) free software. [1] http://www.gnu.org/licenses/license-list.html [2] http://www.gnu.org/philosophy/free-sw.html And why not use a non-free repository like Debian does? -Raphaël ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] patchwork for openwrt
Le Fri, 07 May 2010 12:24:29 +0200, j...@phrozen.org a écrit : Hi, http://patchwork.cyranjo.org John Hi John, this is great! But why not http://patchwork.openwrt.org? Also a problem with patchwork is that it exposes email adresses to anyone with simple mailto: links in clear. Cheers, -Raphael ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] sigscheme: new package in lang section
Hi,
this patch adds a new package in the lang section:
http://code.google.com/p/sigscheme/
SigScheme is a R5RS Scheme interpreter for embedded use. It features
small footprint (64KB in library form on the 'small' configuration)
like SIOD and TinyScheme, low memory consumption (2-words per cons
cell), multibyte characters handling (UTF-8, EUCs and Shift_JIS) and
more.
-Raphaeldiff -pruN lang.orig//sigscheme/Makefile lang/sigscheme/Makefile
--- lang.orig//sigscheme/Makefile 1970-01-01 01:00:00.0 +0100
+++ lang/sigscheme/Makefile 2010-05-07 11:55:44.0 +0200
@@ -0,0 +1,48 @@
+#
+# Copyright (C) 2006-2010 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=sigscheme
+PKG_VERSION:=0.8.3
+PKG_RELEASE:=1
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
+PKG_SOURCE_URL:=http://sigscheme.googlecode.com/files/
+PKG_MD5SUM:=f25b0acbb854651b375b42f17ad20f39
+
+PKG_FIXUP:=libtool
+PKG_INSTALL:=1
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/sigscheme
+ SECTION:=lang
+ CATEGORY:=Languages
+ TITLE:=SigScheme
+ URL:=http://code.google.com/p/sigscheme/
+endef
+
+define Package/sigscheme/description
+SigScheme is a R5RS Scheme interpreter for embedded use. It features small
+footprint (64KB in library form on the 'small' configuration) like SIOD and
+TinyScheme, low memory consumption (2-words per cons cell), multibyte characters
+handling (UTF-8, EUCs and Shift_JIS) and more.
+endef
+
+define Package/sigscheme/install
+ $(INSTALL_DIR) $(1)/usr/lib
+ $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{gcroots,sscm}.so.* $(1)/usr/lib
+
+ $(INSTALL_DIR) $(1)/usr/share
+ $(CP) $(PKG_INSTALL_DIR)/usr/share/sigscheme/ $(1)/usr/lib
+
+ $(INSTALL_DIR) $(1)/usr/bin
+ $(CP) $(PKG_INSTALL_DIR)/usr/bin/sscm $(1)/usr/bin
+endef
+
+$(eval $(call BuildPackage,sigscheme))
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] patchwork for openwrt
Le Thu, 6 May 2010 12:19:34 +0200, Bernhard Loos bernhardl...@googlemail.com a écrit : Hello Is there any chance we could set up a patchwork server like the one the kernel has? I'm not sure, how much work this will be, but there are a significant number of patches send to openwrt-devel, which are more or less silently ignored, which is not very nice to the authors and probably even worse for the openwrt project itself. Having an easy way to list patches and thier status could help with that. I totally agree with you Bernhard. The code for patchwork is available here: http://ozlabs.org/~jk/projects/patchwork/ It is built on the django web framework, which is Python-based, as Trac. Several serious projects are using it: https://patchwork.kernel.org http://patchwork.linux-mips.org http://patchwork.openembedded.org http://patchwork.coreboot.org -Raphael ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [bcm63xx] fix reset_buttons register
Le Thu, 29 Apr 2010 14:23:48 +0200, Miguel GAIO miguel.g...@efixo.com a écrit : Hi This is an update of previous patch. First patch fix gpio buttons device register. Second patch change reset button KEY code from BTN_0 to KEY_RESTART. Last patch add WPS button for NB4 devices. 0001-bcm63xx-fix-gpio_button-device-register.patch 0002-bcm63xx-fix-gpio-button-key-code.-Match-button-hotpl.patch 0003-bcm63xx-Add-WPS-button-for-nb4-devices.patch kind Regards, Miguel Applied in r21252, r21253 and r21254. Thanks Miguel! -Raphael ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [bcm6358] fix enet1 mii clk
Le Wed, 28 Apr 2010 11:39:34 +0200, Miguel GAIO miguel.g...@efixo.com a écrit : Hi, The attached patch fixup the setup of MII clock for case enet1 is linked to external switch for 6358 soc base boards. Warning! Despite, this improves stability on NB4 and 96358VW boards, it must be confirmed on other boards. Kind Regards, Miguel Applied in r21231. Thanks Miguel! -Raphael ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [bcm63xx] Add support for neufbox4 boards (French ISP boards)
Le Tue, 27 Apr 2010 15:35:51 +0200, Florian Fainelli flor...@openwrt.org a écrit : Hi Miguel, On Tuesday 27 April 2010 15:22:23 Miguel GAIO wrote: On Tue, 2010-04-27 at 11:36 +0200, Florian Fainelli wrote: Hi Miguel, On Tuesday 27 April 2010 11:10:11 Miguel GAIO wrote: Hi, The two following patches add preliminary support for neufbox4 boards. Boards are 6358 SoC base. It's support all boards releases from different OEM. The first patch add support for 74HC164 chip. A 8 pins GPIO output expander. use to control leds. Second one add support for all supported boardIDs: - NB4-SER-R0 - NB4-SER-R1 - NB4-SER-R2 - NB4-FXC-R1 - NB4-FXC-R2 All boards provide unique BoardID 96358VW that conflits with real 96358VW devices. The patch add Board ID fixup to get correct BoardID. I think a callback to fixup the board id might be better in the long term. Some other designs got inspired from a reference design but have different LEDs mapping for instance. Right now, this is fine with me, but that will need to evolve to support different matching schemes. Ok, I updated nb4 patch. add neufbox4_nvram_fixup() callback. I increase leds count to 9. This is fine. I use the BoardID to register 74HC164 platform device. Maybe, it can be done other ways. The board structure might also hold a pointer to an array of struct platform_device to register additionnal platform devices. I agree, it's provide more flexible interface. Do you want to push that upstream too? Ok, see new patches set. I also fix a typo on nxp74hc164 patch Thank you for your contribution. -- Florian Thanks you for your review This version is fine. Raphaël, can you merge it? Thank you. -- Florian Applied in r21191, r21192 and r21193! Thanks Miguel and Florian :) -Raphael ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [bcm63xx] WDT driver, dump registers, call trace before reboot
Le Tue, 27 Apr 2010 17:22:04 +0200, Miguel GAIO miguel.g...@efixo.com a écrit : Hi, The attached path extends bcm63xx_wdt driver. It registers TIMER_WDT callback. Callback calls die(), that dump current context. This can be usefull for debug purpose. Kind Regards, Miguel Applied in r21199. Thanks Miguel! -Raphael ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] Suggestions to ease maintenance of OpenWrt based firmware
Having discussed it several times with Florian, I would be great to gather ideas and suggestions from other people, and more particularly from those who work on a firmware based on OpenWrt. I believe there are several companies already doing this, and more that are thinking on doing so. The more we ease the work for them, the more they will use OpenWrt, and the more they will contribute. Sounds nice uh? :) -Raphaël Hi, I've been thinking lately on what could be done in OpenWrt to ease the maintenance of a firmware based on it. It is quite easy to integrate third-party applications by putting them into packages and using the feeds, so they stay out of the trunk and don't have to be worried about. Then you have the base system and the packages: 1. you'd like to stay synchronized with the OpenWrt repository 2. you'd like to contribute your fixes and enhancements to OpenWrt In order to be able to do this easily, you want to minimize the differences between the files and the merging you have to do. New files are easy to handle, while differences between files are not. For patches, it is not a problem, you can just add a patch that fixes your specific problem, you'll just have one more file in your repository than in openwrt repository. However, for configuration files, init files and Makefiles this is more problematic. There is a lot of manual merging to do, and it's more difficult to contribute a patch to OpenWrt. For example: packages/admin/syslog-ng/files/syslog-ng.conf packages/libs/lzo/Makefile packages/net/lighttpd/files/lighttpd.init For init and conf files, it could install .init.default and .conf.default files if corresponding .init and .conf files are not present. As for packages, the main issue comes from static and shared libraries. Sometimes, you don't want the shared libraries to be installed. That's why it would be great to introduce an InstallShared rule. What do you think? Regards, -Raphaël ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH] Fix package/Makefile
Le Sat, 20 Mar 2010 12:20:50 +0100, Florian Fainelli flor...@openwrt.org a écrit : Hi Raphaël, Le vendredi 5 mars 2010 17:37:15, Raphaël HUCK a écrit : Hi, this patch fixes package/Makefile. You add /usr/lib/ebtables, should not you also add /usr/lib/iptables? Hi Florian, yes it's a good idea to add /usr/lib/iptables too :) -Raphael ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] Add yaddns package
Hi, this patch adds a package for yaddns: http://sourceforge.net/projects/yaddns/ Yaddns is a small ddns client with multiple ddns server supports (dyndns, ...) and a high flexibility. Yaddns is particularly appropriate for embedded systems. -Raphaeldiff -pruN net.orig/yaddns/Makefile net/yaddns/Makefile --- net.orig/yaddns/Makefile 1970-01-01 01:00:00.0 +0100 +++ net/yaddns/Makefile 2010-03-22 16:35:14.0 +0100 @@ -0,0 +1,40 @@ +# +# Copyright (C) 2006-2010 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk + +PKG_NAME:=yaddns +PKG_VERSION:=0.1.1 +PKG_RELEASE:=1 + +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_SOURCE_URL:=...@sf/yaddns +PKG_MD5SUM:=2708d3e47a486b1872ef9c5537cd2f0d + +PKG_INSTALL:=1 + +include $(INCLUDE_DIR)/package.mk + +define Package/yaddns + SECTION:=net + CATEGORY:=Network + DEPENDS:= + TITLE:=Yet Another DDNS client + URL:=http://patatrac.info/yaddns +endef + +define Package/yaddns/description +Yaddns is a small ddns client with multiple ddns server supports (dyndns, ...) +and a high flexibility. Yaddns is particularly appropriate for embedded systems. +endef + +define Package/yaddns/install + $(INSTALL_DIR) $(1)/usr/bin + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/yaddns $(1)/usr/bin/ +endef + +$(eval $(call BuildPackage,yaddns)) ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] Suggestions to ease maintenance of OpenWrt based firmware
Hi, I've been thinking lately on what could be done in OpenWrt to ease the maintenance of a firmware based on it. It is quite easy to integrate third-party applications by putting them into packages and using the feeds, so they stay out of the trunk and don't have to be worried about. Then you have the base system and the packages: 1. you'd like to stay synchronized with the OpenWrt repository 2. you'd like to contribute your fixes and enhancements to OpenWrt In order to be able to do this easily, you want to minimize the differences between the files and the merging you have to do. New files are easy to handle, while differences between files are not. For patches, it is not a problem, you can just add a patch that fixes your specific problem, you'll just have one more file in your repository than in openwrt repository. However, for configuration files, init files and Makefiles this is more problematic. There is a lot of manual merging to do, and it's more difficult to contribute a patch to OpenWrt. For example: packages/admin/syslog-ng/files/syslog-ng.conf packages/libs/lzo/Makefile packages/net/lighttpd/files/lighttpd.init For init and conf files, it could install .init.default and .conf.default files if corresponding .init and .conf files are not present. As for packages, the main issue comes from static and shared libraries. Sometimes, you don't want the shared libraries to be installed. That's why it would be great to introduce an InstallShared rule. What do you think? Regards, -Raphaël ___ 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] faifa:
Hi,
this patch cleans the package Makefile a little and adds 3 patches to:
- fix Makefile.in
- link faifa against the static library
- a fix for 64 bits devices
-Raphaël
diff '--exclude=.svn' -pruN net/faifa.orig/Makefile net/faifa/Makefile
--- net/faifa.orig/Makefile 2010-03-19 11:35:42.0 +0100
+++ net/faifa/Makefile 2010-03-19 15:56:48.0 +0100
@@ -1,5 +1,5 @@
#
-# Copyright (C) 2009 OpenWrt.org
+# Copyright (C) 2006-2010 OpenWrt.org
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
@@ -8,7 +8,7 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=faifa
-PKG_REV:=50
+PKG_REV:=53
PKG_VERSION:=r$(PKG_REV)
PKG_RELEASE:=1
@@ -18,42 +18,41 @@ PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VER
PKG_SOURCE_VERSION:=$(PKG_REV)
PKG_SOURCE_PROTO:=svn
-include $(INCLUDE_DIR)/package.mk
+PKG_INSTALL:=1
-TARGET_CFLAGS += $(FPIC)
+include $(INCLUDE_DIR)/package.mk
define Package/faifa
SECTION:=net
CATEGORY:=Network
DEPENDS:=+libpthread +libopenssl +libpcap
TITLE:=configure HomePlug 1.0/AV PLC devices
- URL:=http://open-plc.org
+ URL:=http://open-plc.org/
endef
define Package/faifa/description
- Faifa can configure any Intellon-based Power Line Communication
- device using Intellon INT5000 and INT6000 series chips
- (6000 and 6300 chips). It supports all Intellon-specific management
- and control frames as well as standard management frames.
+Faifa can configure any Intellon-based Power Line Communication device using
+Intellon INT5000 and INT6000 series chips (6000 and 6300 chips). It supports all
+Intellon-specific management and control frames as well as standard management
+frames.
endef
+TARGET_CFLAGS += $(FPIC)
+
+MAKE_FLAGS += \
+ OS=LINUX \
+ SVN_REV=$(PKG_REV) \
+ CFLAGS=$(TARGET_CFLAGS) $(TARGET_CPPFLAGS) \
+ LDFLAGS=$(TARGET_LDFLAGS)
+
define Build/Configure
(cd $(PKG_BUILD_DIR); ./autogen.sh)
$(call Build/Configure/Default)
endef
-define Build/Compile
- $(MAKE) -C $(PKG_BUILD_DIR) \
- $(TARGET_CONFIGURE_OPTS) \
- CFLAGS=$(TARGET_CFLAGS) -DSVN_REV=$(PKG_REV) $(TARGET_CPPFLAGS) \
- LDFLAGS=$(TARGET_LDFLAGS) \
- DESTDIR=$(PKG_INSTALL_DIR) \
- faifa
-endef
-
define Package/faifa/install
- $(INSTALL_DIR) $(1)/usr/sbin
- $(CP) $(PKG_BUILD_DIR)/faifa $(1)/usr/sbin/
+ $(INSTALL_DIR) $(1)/usr/bin
+ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/faifa $(1)/usr/bin/
endef
$(eval $(call BuildPackage,faifa))
diff '--exclude=.svn' -pruN net/faifa.orig/patches/100-makefile_misc_fixes.patch net/faifa/patches/100-makefile_misc_fixes.patch
--- net/faifa.orig/patches/100-makefile_misc_fixes.patch 1970-01-01 01:00:00.0 +0100
+++ net/faifa/patches/100-makefile_misc_fixes.patch 2010-03-19 15:49:52.0 +0100
@@ -0,0 +1,79 @@
+--- a/Makefile.in
b/Makefile.in
+@@ -12,6 +12,7 @@
+ #
+
+ CC = @CC@
++STRIP = @STRIP@
+ CFLAGS = @CFLAGS@
+ INSTALL = @INSTALL@
+ LIBS = @LIBS@
+@@ -24,9 +25,9 @@ libdir = @libdir@
+ datarootdir = @datarootdir@
+ includedir = @includedir@
+
+-OS=$(shell uname -s | tr a-z A-Z)
++OS?=$(shell uname -s | tr a-z A-Z)
+ APP:=faifa
+-SVN_REV?=$(shell LC_ALL=C svn info | grep Revision | awk '{ print $$2}')
++SVN_REV?=$(shell LC_ALL=C svn info | awk '/Revision/ { print $$2 }')
+
+ # Object files for the library
+ LIB_OBJS:=faifa.o frame.o crypto.o
+@@ -72,39 +73,37 @@ clean:
+ $(MANFIL)
+
+ autoclean:
+- -rm configure config.log config.status Makefile
++ -rm -f configure config.log config.status Makefile
+
+ distclean: clean autoclean
+
+ install: installman strip
+- $(INSTALL) -d $(DESTDIR)/$(bindir)
+- $(INSTALL) -m0755 $(APP) $(DESTDIR)/$(bindir)
+- $(INSTALL) -d $(DESTDIR)/$(libdir)
+- $(INSTALL) -m0644 $(LIB_SONAME) $(DESTDIR)/$(libdir)
+- $(INSTALL) -d $(DESTDIR)/$(includedir)/faifa
+- cp $(HEADERS) $(DESTDIR)/$(includedir)/faifa
++ $(INSTALL) -d $(DESTDIR)$(bindir)
++ $(INSTALL) -m0755 $(APP) $(DESTDIR)$(bindir)
++ $(INSTALL) -d $(DESTDIR)$(libdir)
++ $(INSTALL) -m0644 $(LIB_SONAME) $(DESTDIR)$(libdir)
++ $(INSTALL) -d $(DESTDIR)$(includedir)/faifa
++ cp $(HEADERS) $(DESTDIR)$(includedir)/faifa
+
+ strip:
+- strip $(APP)
+- strip $(LIB_SONAME)
++ $(STRIP) $(APP)
++ $(STRIP) $(LIB_SONAME)
+
+ man:
+- -rm $(MANFIL)
+- cp $(APP).$(MANTYP) $(APP).$(MANTYP).orig
+- gzip -9v $(APP).$(MANTYP)
+- mv $(APP).$(MANTYP).orig $(APP).$(MANTYP)
++ -rm -f $(MANFIL)
++ gzip -c -q -9v $(APP).$(MANTYP) $(MANFIL)
+
+ installman: man
+- $(INSTALL) -d $(DESTDIR)/$(man8dir)
+- $(INSTALL) -m0644 $(MANFIL) $(DESTDIR)/$(man8dir)
++ $(INSTALL) -d $(DESTDIR)$(man8dir)
++ $(INSTALL) -m0644 $(MANFIL) $(DESTDIR)$(man8dir)
+
+ uninstallman:
+- -rm $(DESTDIR)/$(man8dir)/$(MANFIL)
++ -rm -f $(DESTDIR)$(man8dir)/$(MANFIL)
+
+ uninstall: uninstallman
+- -rm $(DESTDIR)/$(bindir)/$(APP)
+- -rm $(DESTDIR)/$(libdir)/$(LIB_SONAME)
+- -rm -r $(DESTDIR)/$(includedir)/faifa
++ -rm -f $(DESTDIR)$(bindir)/$(APP)
++ -rm -f $(DESTDIR)$(libdir)/$(LIB_SONAME)
++ -rm -f $(DESTDIR)$(includedir)/faifa
+
+
[OpenWrt-Devel] [PATCH] Add dmalloc package
Hi,
this patch adds the dmalloc package, which is a library useful for
memory-leak tracking, fence-post write detection, file/line number
reporting, and general logging of statistics.
-Raphaël
diff -pruN devel.orig/dmalloc/Makefile devel/dmalloc/Makefile
--- devel.orig/dmalloc/Makefile 1970-01-01 01:00:00.0 +0100
+++ devel/dmalloc/Makefile 2010-03-19 16:43:52.0 +0100
@@ -0,0 +1,77 @@
+#
+# Copyright (C) 2006-2010 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=dmalloc
+PKG_VERSION:=5.5.2
+PKG_RELEASE:=1
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tgz
+PKG_SOURCE_URL:=http://dmalloc.com/releases/
+PKG_MD5SUM:=f92e5606c23a8092f3d5694e8d1c932e
+
+PKG_FIXUP:=libtool
+PKG_INSTALL:=1
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/dmalloc/Default
+ SECTION:=devel
+ CATEGORY:=Development
+ TITLE:=Dmalloc
+ URL:=http://www.dmalloc.com/
+endef
+
+define Package/libdmalloc
+ $(call Package/dmalloc/Default)
+ TITLE+= (library)
+endef
+
+define Package/dmalloc-utils
+ $(call Package/dmalloc/Default)
+ DEPENDS:=+libdmalloc
+ TITLE+= (utilities)
+endef
+
+define Package/dmalloc/description
+The debug memory allocation or dmalloc library has been designed as a drop in
+replacement for the system's malloc, realloc, calloc, free and other memory
+management routines while providing powerful debugging facilities configurable
+at runtime. These facilities include such things as memory-leak tracking,
+fence-post write detection, file/line number reporting, and general logging of
+statistics.
+endef
+
+CONFIGURE_ARGS += \
+ --disable-cxx \
+ --with-pagesize=12
+
+TARGET_CFLAGS += $(FPIC)
+
+MAKE_INSTALL_FLAGS += installsl
+
+define Build/InstallDev
+ $(INSTALL_DIR) $(1)/usr/include/
+ $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/include/dmalloc.h $(1)/usr/include/
+
+ $(INSTALL_DIR) $(1)/usr/lib
+ $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libdmalloc.{a,so*} $(1)/usr/lib/
+endef
+
+define Package/libdmalloc/install
+ $(INSTALL_DIR) $(1)/usr/lib
+ $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libdmalloc.so* $(1)/usr/lib/
+endef
+
+define Package/dmalloc-utils/install
+ $(INSTALL_DIR) $(1)/usr/bin
+ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/dmalloc $(1)/usr/bin/
+endef
+
+$(eval $(call BuildPackage,libdmalloc))
+$(eval $(call BuildPackage,dmalloc-utils))
diff -pruN devel.orig/dmalloc/patches/100-configure_pagesize.patch devel/dmalloc/patches/100-configure_pagesize.patch
--- devel.orig/dmalloc/patches/100-configure_pagesize.patch 1970-01-01 01:00:00.0 +0100
+++ devel/dmalloc/patches/100-configure_pagesize.patch 2010-03-19 16:43:51.0 +0100
@@ -0,0 +1,44 @@
+--- a/configure
b/configure
+@@ -857,6 +857,11 @@ Optional Features:
+--enable-threadsbuild in thread support (disabled by default)
+--enable-shlib build shared libraries (disabled by default)
+
++Optional Packages:
++ --with-PACKAGE[=ARG]use PACKAGE [ARG=yes]
++ --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
++ --with-pagesize=nbits log base 2 of machine page size
++
+ Some influential environment variables:
+ CC C compiler command
+ CFLAGS C compiler flags
+@@ -5307,6 +5312,14 @@ done
+ echo $as_me:$LINENO: checking basic-block size 5
+ echo $ECHO_N checking basic-block size... $ECHO_C 6
+ ac_cv_page_size=0
++
++# Check whether --with-pagesize or --without-pagesize was given.
++if test ${with_pagesize+set} = set; then
++ withval=$with_pagesize
++ case $withval in ?|1?) ac_cv_page_size=$withval; esac
++else
++ : # default to probing, set above
++fi;
+ if test $ac_cv_page_size = 0; then
+if test $cross_compiling = yes; then
+ { { echo $as_me:$LINENO: error: cannot run test program while cross compiling
+--- a/configure.ac
b/configure.ac
+@@ -349,6 +349,12 @@ AC_MSG_RESULT([$ac_cv_use_mmap])
+ AC_CHECK_FUNCS(getpagesize)
+ AC_MSG_CHECKING([basic-block size])
+ ac_cv_page_size=0
++AC_ARG_WITH(pagesize,
++[ AC_HELP_STRING([--with-pagesize=nbits],
++ [log base 2 of machine page size] ) ],
++[ case $withval in ?|1?) ac_cv_page_size=$withval; esac ],
++[ : # default to probing, set above ],
++)
+ if test $ac_cv_page_size = 0; then
+AC_RUN_IFELSE([main() { if (getpagesize()=2048) exit(0); else exit(1); }],
+ [ ac_cv_page_size=11 ] )
diff -pruN devel.orig/dmalloc/patches/110-configure_cxx.patch devel/dmalloc/patches/110-configure_cxx.patch
--- devel.orig/dmalloc/patches/110-configure_cxx.patch 1970-01-01 01:00:00.0 +0100
+++ devel/dmalloc/patches/110-configure_cxx.patch 2010-03-19 16:43:51.0 +0100
@@ -0,0 +1,38 @@
+--- a/configure.ac
b/configure.ac
+@@ -56,10 +56,11 @@ AC_PROG_CC
+ AC_PROG_CXX
+
+ # see if we actually have a CXX program
+-if test $ac_cv_prog_CXX = -o ! -x $ac_cv_prog_CXX; then
+-AC_MSG_WARN(could not find C++ compiler $ac_cv_prog_CXX)
+-enable_cxx=no
+-fi
++#
[OpenWrt-Devel] [PATCH] lzo: fix parallel build
Hi,
this patch fixes lzo parallel build and uses PKG_INSTALL:=1.
-Raphaël
diff '--exclude=.svn' -pruN libs/lzo.orig/Makefile libs/lzo/Makefile
--- libs/lzo.orig/Makefile 2010-03-19 16:58:57.0 +0100
+++ libs/lzo/Makefile 2010-03-19 16:58:40.0 +0100
@@ -9,13 +9,14 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=lzo
PKG_VERSION:=2.03
-PKG_RELEASE:=2
+PKG_RELEASE:=3
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=http://www.oberhumer.com/opensource/lzo/download/
PKG_MD5SUM:=0c3d078c2e8ea5a88971089a2f02a726
PKG_FIXUP:=libtool
+PKG_INSTALL:=1
include $(INCLUDE_DIR)/package.mk
@@ -27,9 +28,8 @@ define Package/liblzo
endef
define Package/liblzo/description
- LZO is a data compression library which is suitable for data
- de-/compression in real-time.
- This means it favours speed over compression ratio.
+LZO is a data compression library which is suitable for data de-/compression in
+real-time. This means it favours speed over compression ratio.
endef
define Build/Configure
@@ -41,23 +41,19 @@ endef
TARGET_CFLAGS += $(FPIC)
-define Build/Compile
- $(MAKE) -C $(PKG_BUILD_DIR) \
- CFLAGS_O=$(TARGET_CFLAGS) \
- DESTDIR=$(PKG_INSTALL_DIR) \
- all install
-endef
+MAKE_FLAGS += CFLAGS_O=$(TARGET_CFLAGS)
define Build/InstallDev
$(INSTALL_DIR) $(1)/usr/include
$(CP) $(PKG_INSTALL_DIR)/usr/include/lzo $(1)/usr/include/
+
$(INSTALL_DIR) $(1)/usr/lib
$(CP) $(PKG_INSTALL_DIR)/usr/lib/liblzo2.{a,so*} $(1)/usr/lib/
endef
define Package/liblzo/install
$(INSTALL_DIR) $(1)/usr/lib
- $(CP) $(PKG_INSTALL_DIR)/usr/lib/liblzo2.so.* $(1)/usr/lib/
+ $(CP) $(PKG_INSTALL_DIR)/usr/lib/liblzo2.so* $(1)/usr/lib/
endef
$(eval $(call BuildPackage,liblzo))
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] openssl: fix parallel build
Hi,
this patch fixes openssl parallel build.
-Raphaeldiff -pruN openssl.orig/Makefile openssl/Makefile
--- openssl.orig/Makefile 2010-03-05 17:39:17.0 +0100
+++ openssl/Makefile 2010-03-05 17:42:29.0 +0100
@@ -1,5 +1,5 @@
#
-# Copyright (C) 2006-2009 OpenWrt.org
+# Copyright (C) 2006-2010 OpenWrt.org
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=openssl
PKG_VERSION:=0.9.8m
-PKG_RELEASE:=1
+PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=http://www.openssl.org/source/ \
@@ -18,8 +18,8 @@ PKG_SOURCE_URL:=http://www.openssl.org/s
ftp://ftp.sunet.se/pub/security/tools/net/openssl/source/
PKG_MD5SUM:=898bf125370926d5f692a2201124f8ec
-PKG_BUILD_DEPENDS := ocf-crypto-headers
-PKG_CONFIG_DEPENDS := CONFIG_OPENSSL_ENGINE
+PKG_BUILD_DEPENDS:=ocf-crypto-headers
+PKG_CONFIG_DEPENDS:=CONFIG_OPENSSL_ENGINE
include $(INCLUDE_DIR)/package.mk
@@ -33,10 +33,10 @@ source $(SOURCE)/Config.in
endef
define Package/openssl/Default/description
- The OpenSSL Project is a collaborative effort to develop a robust,
- commercial-grade, full-featured, and Open Source toolkit implementing the
- Secure Sockets Layer (SSL v2/v3) and Transport Layer Security (TLS v1)
- protocols as well as a full-strength general purpose cryptography library.
+The OpenSSL Project is a collaborative effort to develop a robust,
+commercial-grade, full-featured, and Open Source toolkit implementing the Secure
+Sockets Layer (SSL v2/v3) and Transport Layer Security (TLS v1) protocols as well
+as a full-strength general purpose cryptography library.
endef
define Package/libopenssl
@@ -50,8 +50,7 @@ endef
define Package/libopenssl/description
$(call Package/openssl/Default/description)
- This package contains the OpenSSL shared libraries, needed by other
- programs.
+This package contains the OpenSSL shared libraries, needed by other programs.
endef
define Package/openssl-util
@@ -68,7 +67,7 @@ endef
define Package/openssl-util/description
$(call Package/openssl/Default/description)
- This package contains the OpenSSL command-line utility.
+This package contains the OpenSSL command-line utility.
endef
@@ -108,13 +107,20 @@ define Build/Compile
OPENWRT_OPTIMIZATION_FLAGS=$(TARGET_CFLAGS) \
$(OPENSSL_MAKEFLAGS) \
depend
+ $(_SINGLE)$(MAKE) -C $(PKG_BUILD_DIR) \
+ CC=$(TARGET_CC) \
+ AR=$(TARGET_CROSS)ar r \
+ RANLIB=$(TARGET_CROSS)ranlib \
+ OPENWRT_OPTIMIZATION_FLAGS=$(TARGET_CFLAGS) \
+ $(OPENSSL_MAKEFLAGS) \
+ all
$(MAKE) -C $(PKG_BUILD_DIR) \
CC=$(TARGET_CC) \
AR=$(TARGET_CROSS)ar r \
RANLIB=$(TARGET_CROSS)ranlib \
OPENWRT_OPTIMIZATION_FLAGS=$(TARGET_CFLAGS) \
$(OPENSSL_MAKEFLAGS) \
- all build-shared
+ build-shared
# Work around openssl build bug to link libssl.so with libcrypto.so.
-rm $(PKG_BUILD_DIR)/libssl.so.*.*.*
$(MAKE) -C $(PKG_BUILD_DIR) \
@@ -129,11 +135,11 @@ define Build/Compile
endef
define Build/InstallDev
- mkdir -p $(1)/usr/include
+ $(INSTALL_DIR) $(1)/usr/include
$(CP) $(PKG_INSTALL_DIR)/usr/include/openssl $(1)/usr/include/
- mkdir -p $(1)/usr/lib/
+ $(INSTALL_DIR) $(1)/usr/lib/
$(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{crypto,ssl}.{a,so*} $(1)/usr/lib/
- mkdir -p $(1)/usr/lib/pkgconfig
+ $(INSTALL_DIR) $(1)/usr/lib/pkgconfig
$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/{openssl,libcrypto,libssl}.pc $(1)/usr/lib/pkgconfig/
$(SED) 's#$(TARGET_LDFLAGS)##g' $(1)/usr/lib/pkgconfig/{openssl,libcrypto,libssl}.pc
endef
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] fuse: fix parallel build
Hi,
this patch fixes fuse parallel build.
-Raphaeldiff -pruN fuse.orig//Makefile fuse/Makefile
--- fuse.orig//Makefile 2010-03-08 17:55:29.0 +0100
+++ fuse/Makefile 2010-03-08 17:54:43.0 +0100
@@ -1,5 +1,5 @@
-#
-# Copyright (C) 2006-2009 OpenWrt.org
+#
+# Copyright (C) 2006-2010 OpenWrt.org
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
@@ -10,12 +10,14 @@ include $(INCLUDE_DIR)/kernel.mk
PKG_NAME:=fuse
PKG_VERSION:=2.7.4
-PKG_RELEASE:=2
+PKG_RELEASE:=3
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=...@sf/$(PKG_NAME)
PKG_MD5SUM:=4879f06570d2225667534c37fea04213
+PKG_INSTALL:=1
+
include $(INCLUDE_DIR)/package.mk
define Package/fuse/Default
@@ -24,7 +26,7 @@ define Package/fuse/Default
endef
define Package/fuse/Default/description
- FUSE (Filesystem in UserSpacE)
+FUSE (Filesystem in UserSpacE)
endef
define Package/fuse-utils
@@ -54,7 +56,7 @@ endef
define KernelPackage/fuse/description
$(call Package/fuse/Default/description)
- This package contains the FUSE kernel module.
+This package contains the FUSE kernel module.
endef
define Package/libfuse
@@ -68,7 +70,7 @@ endef
define Package/libfuse/description
$(call Package/fuse/Default/description)
- This package contains the FUSE shared library, needed by other programs.
+This package contains the FUSE shared library, needed by other programs.
endef
CONFIGURE_VARS += \
@@ -83,11 +85,11 @@ CONFIGURE_ARGS += \
--disable-example \
--disable-auto-modprobe \
--with-kernel=$(LINUX_DIR) \
- --disable-mtab
+ --disable-mtab
-# Since kernel 2.6.14 the fuse module is officially part of the kernel.
+# Since kernel 2.6.14 the fuse module is officially part of the kernel.
# Generally it is better to use the kernel's module. Because it is patched
-# against the DCACHE BUG on arm architectures (currently brcm-2.4, brcm-47xx)
+# against the DCACHE BUG on arm architectures (currently brcm-2.4, brcm-47xx)
# and from fuse 2.8.0 on it will be removed from the fuse package anyway.
#
CONFIGURE_ARGS += --disable-kernel-module
@@ -103,22 +105,17 @@ define Build/Configure
$(call Build/Configure/Default)
endef
-define Build/Compile
- $(MAKE) -C $(PKG_BUILD_DIR) \
- ARCH=$(LINUX_KARCH) \
- CROSS_COMPILE=$(TARGET_CROSS) \
- DESTDIR=$(PKG_INSTALL_DIR) \
- AM_CFLAGS=$(TARGET_CFLAGS) -DDISABLE_COMPAT=1 \
- EXTRA_DIST= \
- all install
-endef
+MAKE_ARGS += ARCH=$(LINUX_KARCH) \
+ CROSS_COMPILE=$(TARGET_CROSS) \
+ AM_CFLAGS=$(TARGET_CFLAGS) -DDISABLE_COMPAT=1 \
+ EXTRA_DIST=
define Build/InstallDev
- mkdir -p $(1)/usr/include
+ $(INSTALL_DIR) $(1)/usr/include
$(CP) $(PKG_INSTALL_DIR)/usr/include/fuse{,.h} $(1)/usr/include/
- mkdir -p $(1)/usr/lib
+ $(INSTALL_DIR) $(1)/usr/lib
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libfuse.{a,so*} $(1)/usr/lib/
- mkdir -p $(1)/usr/lib/pkgconfig
+ $(INSTALL_DIR) $(1)/usr/lib/pkgconfig
$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/fuse.pc $(1)/usr/lib/pkgconfig/
$(SED) 's,-I{includedir}/fuse,,g' $(1)/usr/lib/pkgconfig/fuse.pc
$(SED) 's,-L{libdir},,g' $(1)/usr/lib/pkgconfig/fuse.pc
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] add LN definition to rules.mk
Hi, there are quite a lot of package using ln -sf in their Makefile, so this patch adds LN:=ln -sf to rules.mk -Raphaeldiff -pruN trunk.orig/rules.mk trunk/rules.mk --- trunk.orig/rules.mk 2010-03-05 16:55:32.0 +0100 +++ trunk/rules.mk 2010-03-05 16:56:11.0 +0100 @@ -1,5 +1,5 @@ # -# Copyright (C) 2006-2009 OpenWrt.org +# Copyright (C) 2006-2010 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -142,6 +142,7 @@ TARGET_CXX:=$(if $(CONFIG_INSTALL_LIBSTD PATCH:=$(SCRIPT_DIR)/patch-kernel.sh SED:=$(STAGING_DIR_HOST)/bin/sed -i -e CP:=cp -fpR +LN:=ln -sf INSTALL_BIN:=install -m0755 INSTALL_DIR:=install -d -m0755 ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] Fix uboot-envtools
Hi,
this patch fixes uboot-envtools so that it is no longer broken.
-Raphaeldiff -pruN uboot-envtools.orig/Makefile uboot-envtools/Makefile
--- uboot-envtools.orig/Makefile 2010-03-05 16:51:22.0 +0100
+++ uboot-envtools/Makefile 2010-03-05 16:59:45.0 +0100
@@ -1,5 +1,5 @@
-#
-# Copyright (C) 2009 OpenWrt.org
+#
+# Copyright (C) 2006-2010 OpenWrt.org
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=uboot-envtools
PKG_VERSION:=20081215
-PKG_RELEASE:=1
+PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).orig.tar.gz
PKG_SOURCE_URL:=http://ftp.de.debian.org/debian/pool/main/u/uboot-envtools/
@@ -19,8 +19,8 @@ include $(INCLUDE_DIR)/package.mk
define Package/uboot-envtools
SECTION:=utils
CATEGORY:=Utilities
- DEPENDS:=...@broken
TITLE:=read/modify the environment for the bootloader U-Boot
+ DEPENDS:=+zlib
endef
define Package/uboot-envtools/description
@@ -29,7 +29,7 @@ endef
define Package/uboot-envtools/install
$(INSTALL_DIR) $(1)/usr/sbin
$(INSTALL_BIN) $(PKG_BUILD_DIR)/fw_printenv $(1)/usr/sbin/
- ln -s fw_printenv $(1)/usr/sbin/fw_setenv
+ ln -sf fw_printenv $(1)/usr/sbin/fw_setenv
endef
$(eval $(call BuildPackage,uboot-envtools))
diff -pruN uboot-envtools.orig/patches/001-crc32_func_signature.patch uboot-envtools/patches/001-crc32_func_signature.patch
--- uboot-envtools.orig/patches/001-crc32_func_signature.patch 2010-03-05 16:51:22.0 +0100
+++ uboot-envtools/patches/001-crc32_func_signature.patch 2010-02-19 16:18:05.0 +0100
@@ -1,13 +1,125 @@
-Index: uboot-envtools-20080520/crc32.c
-===
uboot-envtools-20080520.orig/crc32.c 2008-08-03 16:02:43.0 +0200
-+++ uboot-envtools-20080520/crc32.c 2008-08-03 16:03:25.0 +0200
-@@ -154,7 +154,7 @@
+--- a/crc32.c
b/crc32.c
+@@ -8,11 +8,7 @@
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+-#ifndef USE_HOSTCC /* Shut down ANSI does not permit... warnings */
+-#include common.h
+-#else
+ #include stdint.h
+-#endif
+
+ #if defined(CONFIG_HW_WATCHDOG) || defined(CONFIG_WATCHDOG)
+ #include watchdog.h
+@@ -136,7 +132,7 @@ local const uint32_t crc_table[256] = {
+
+ #if 0
+ /* =
+- * This function can be used by asm versions of crc32()
++ * This function can be used by asm versions of uboot_crc32()
+ */
+ const uint32_t * ZEXPORT get_crc_table()
+ {
+@@ -154,7 +150,7 @@ const uint32_t * ZEXPORT get_crc_table()
#define DO8(buf) DO4(buf); DO4(buf);
/* = */
-uint32_t ZEXPORT crc32 (uint32_t crc, const Bytef *buf, uInt len)
-+uLong ZEXPORT crc32 (uLong crc, const Bytef *buf, uInt len)
++uint32_t ZEXPORT uboot_crc32 (uint32_t crc, const Bytef *buf, uInt len)
{
#ifdef DYNAMIC_CRC_TABLE
if (crc_table_empty)
+@@ -217,12 +213,12 @@ uint32_t ZEXPORT crc32_wd (uint32_t crc,
+ chunk = end - curr;
+ if (chunk chunk_sz)
+ chunk = chunk_sz;
+- crc = crc32 (crc, curr, chunk);
++ crc = uboot_crc32 (crc, curr, chunk);
+ curr += chunk;
+ WATCHDOG_RESET ();
+ }
+ #else
+- crc = crc32 (crc, buf, len);
++ crc = uboot_crc32 (crc, buf, len);
+ #endif
+
+ return crc;
+--- a/fw_env.c
b/fw_env.c
+@@ -216,9 +216,9 @@ static int parse_config (void);
+ #if defined(CONFIG_FILE)
+ static int get_config (char *);
+ #endif
+-static inline ulong getenvsize (void)
++static inline uint32_t getenvsize (void)
+ {
+- ulong rc = CONFIG_ENV_SIZE - sizeof (long);
++ uint32_t rc = CONFIG_ENV_SIZE - sizeof (uint32_t);
+
+ if (HaveRedundEnv)
+ rc -= sizeof (char);
+@@ -437,7 +437,7 @@ int fw_setenv (int argc, char *argv[])
+ /*
+ * Update CRC
+ */
+- *environment.crc = crc32 (0, (uint8_t *) environment.data, ENV_SIZE);
++ *environment.crc = uboot_crc32 (0, (uint8_t *) environment.data, ENV_SIZE);
+
+ /* write environment back to flash */
+ if (flash_io (O_RDWR)) {
+@@ -627,7 +627,7 @@ static int flash_write_buf (int dev, int
+ data = malloc (erase_len);
+ if (!data) {
+ fprintf (stderr,
+- Cannot malloc %u bytes: %s\n,
++ Cannot malloc %zu bytes: %s\n,
+ erase_len, strerror (errno));
+ return -1;
+ }
+@@ -883,11 +883,11 @@ static char *envmatch (char * s1, char *
+ static int env_init (void)
+ {
+ int crc0, crc0_ok;
+- char flag0;
++ unsigned char flag0;
+ void *addr0;
+
+ int crc1, crc1_ok;
+- char flag1;
++ unsigned char flag1;
+ void *addr1;
+
+ struct env_image_single *single;
+@@ -923,7 +923,7 @@ static int env_init (void)
+ if (flash_io (O_RDONLY))
+ return -1;
+
+- crc0 = crc32 (0, (uint8_t *) environment.data, ENV_SIZE);
++ crc0 = uboot_crc32 (0, (uint8_t *) environment.data, ENV_SIZE);
+ crc0_ok = (crc0 == *environment.crc);
+ if (!HaveRedundEnv) {
+ if
[OpenWrt-Devel] [PATCH] Fix package/Makefile
Hi, this patch fixes package/Makefile. -Raphaeldiff -pruN package.orig/Makefile package/Makefile --- package.orig/Makefile 2010-03-05 17:32:59.0 +0100 +++ package/Makefile 2010-03-05 17:33:46.0 +0100 @@ -1,5 +1,5 @@ # -# Copyright (C) 2006-2008 OpenWrt.org +# Copyright (C) 2006-2010 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -23,6 +23,7 @@ endif $(curdir)/install:=$(curdir)/install-cleanup $(curdir)/cleanup: $(TMP_DIR)/.build + - find $(STAGING_DIR_ROOT) -type d | $(XARGS) chmod 0755 rm -rf $(TARGET_DIR) $(STAGING_DIR_ROOT) ifdef CONFIG_USE_MKLIBS @@ -42,8 +43,9 @@ ifdef CONFIG_USE_MKLIBS --sysroot $(STAGING_DIR_ROOT) \ -L /lib \ -L /usr/lib \ + -L /usr/lib/ebtables \ --ldlib $(patsubst $(STAGING_DIR_ROOT)/%,/%,$(firstword $(wildcard \ - $(foreach name,ld-uClibc.so.* ld-linux.so.*, \ + $(foreach name,ld-uClibc.so.* ld-linux.so.* ld-*.so, \ $(STAGING_DIR_ROOT)/lib/$(name) \ \ --target $(REAL_GNU_TARGET_NAME) \ ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] Fix Build/Install/Default definition
Hi all, the current Build/Install/Default definition is as follows (https://dev.openwrt.org/browser/trunk/include/package-defaults.mk#L121): define Build/Install/Default $(MAKE_VARS) \ $(MAKE) -C $(PKG_BUILD_DIR)/$(MAKE_PATH) \ $(MAKE_INSTALL_FLAGS) \ $(1) install; endef It is only called in trunk/include/package.mk (https://dev.openwrt.org/browser/trunk/include/package.mk#L199): Build/Install=$(if $(PKG_INSTALL),$(call Build/Install/Default,)) without a parameter. Otherwise, the only package calling this is 'check': packages/libs/check/Makefile (line 47) also without a parameter. The attached patch replaces '$(1) install' by '$(if $(1), $(1), install)' in the definition, in order to be able to specify an install rule, which is not always called 'install' (example: trunk/package/ncurses/Makefile has rules called 'install.libs' and 'install.data'). Then it's possible to do this in ncurses Makefile: define Build/Install $(call Build/Install/Default, install.libs install.data) endef This patch does not affect anything else, as if no parameter is given, it will use 'install' as before. -Raphaeldiff -pruN trunk.orig/include/package-defaults.mk trunk/include/package-defaults.mk --- trunk.orig/include/package-defaults.mk 2010-03-04 15:43:17.0 +0100 +++ trunk/include/package-defaults.mk 2010-03-04 15:44:11.0 +0100 @@ -122,7 +122,7 @@ define Build/Install/Default $(MAKE_VARS) \ $(MAKE) -C $(PKG_BUILD_DIR)/$(MAKE_PATH) \ $(MAKE_INSTALL_FLAGS) \ - $(1) install; + $(if $(1), $(1), install); endef define Build/Dist/Default ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] libpcap: use PKG_INSTALL, new patch to disable man pages
Hi,
this patch uses PKG_INSTALL:=1 and simplifies the Makefile,
separates the menuconfig options in a separates Config.in file,
adds a new patch to disable man pages (there was an error with QUILT=1
without this patch, as ln was used without -f),
renames patches to be more explicit (and 1xx for Makefile patches and
2xx for source patches)
-Raphaeldiff -pruN libpcap.orig/Config.in libpcap/Config.in
--- libpcap.orig/Config.in 1970-01-01 01:00:00.0 +0100
+++ libpcap/Config.in 2010-03-04 17:37:18.0 +0100
@@ -0,0 +1,12 @@
+config PCAP_HAS_USB
+ bool Include USB support
+ depends PACKAGE_libpcap
+ depends PACKAGE_kmod-usb-core
+ default n
+
+config PCAP_HAS_BT
+ bool Include bluetooth support
+ depends PACKAGE_libpcap
+ depends PACKAGE_kmod-bluetooth
+ depends BROKEN
+ default n
diff -pruN libpcap.orig/Makefile libpcap/Makefile
--- libpcap.orig/Makefile 2010-03-04 17:22:31.0 +0100
+++ libpcap/Makefile 2010-03-04 18:40:55.0 +0100
@@ -1,5 +1,5 @@
-#
-# Copyright (C) 2006 OpenWrt.org
+#
+# Copyright (C) 2006-2010 OpenWrt.org
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
@@ -9,12 +9,14 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=libpcap
PKG_VERSION:=1.0.0
-PKG_RELEASE:=1
+PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=http://www.tcpdump.org/release/
PKG_MD5SUM:=9ad1358c5dec48456405eac197a46d3d
+PKG_INSTALL:=1
+
include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/kernel.mk
@@ -26,28 +28,17 @@ define Package/libpcap
endef
define Package/libpcap/description
- This package contains a system-independent library for user-level network
- packet capture.
+This package contains a system-independent library for user-level network packet
+capture.
endef
define Package/libpcap/config
- config PCAP_HAS_USB
- bool Include USB support
- depends PACKAGE_libpcap
- depends PACKAGE_kmod-usb-core
- default n
-
- config PCAP_HAS_BT
- bool Include bluetooth support
- depends PACKAGE_libpcap
- depends PACKAGE_kmod-bluetooth
- depends BROKEN
- default n
-
+source $(SOURCE)/Config.in
endef
TARGET_CFLAGS += \
- -ffunction-sections -fdata-sections
+ -ffunction-sections \
+ -fdata-sections
CONFIGURE_VARS += \
ac_cv_linux_vers=$(LINUX_VERSION)
@@ -62,31 +53,28 @@ CONFIGURE_ARGS += \
--without-septel \
--without-dag
-define Build/Compile
- rm -rf $(PKG_INSTALL_DIR)
+MAKE_FLAGS += \
+ CCOPT=$(TARGET_CFLAGS) -I$(BUILD_DIR)/linux/include
+
+define Build/Configure
+ $(call Build/Configure/Default)
$(if $(CONFIG_PCAP_HAS_USB),,$(SED) '/^#define PCAP_SUPPORT_USB/D' $(PKG_BUILD_DIR)/config.h)
$(if $(CONFIG_PCAP_HAS_USB),,$(SED) 's/pcap-usb-linux.c *//' $(PKG_BUILD_DIR)/Makefile)
$(if $(CONFIG_PCAP_HAS_BT),,$(SED) '/^#define PCAP_SUPPORT_BT/D' $(PKG_BUILD_DIR)/config.h)
$(if $(CONFIG_PCAP_HAS_BT),,$(SED) 's/pcap-bt-linux.c *//' $(PKG_BUILD_DIR)/Makefile)
- $(MAKE) -C $(PKG_BUILD_DIR) \
- CCOPT=$(TARGET_CFLAGS) -I$(BUILD_DIR)/linux/include \
- DESTDIR=$(PKG_INSTALL_DIR) \
- all install
endef
define Build/InstallDev
- mkdir -p $(1)/usr/include $(1)/usr/lib
- $(CP) \
- $(PKG_INSTALL_DIR)/usr/include/pcap* \
- $(1)/usr/include/
- $(CP) \
- $(PKG_INSTALL_DIR)/usr/lib/libpcap.{a,so*} \
- $(1)/usr/lib/
+ $(INSTALL_DIR) $(1)/usr/include
+ $(CP) $(PKG_INSTALL_DIR)/usr/include/pcap* $(1)/usr/include/
+
+ $(INSTALL_DIR) $(1)/usr/lib
+ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libpcap.{a,so*} $(1)/usr/lib/
endef
define Package/libpcap/install
$(INSTALL_DIR) $(1)/usr/lib
- $(CP) $(PKG_INSTALL_DIR)/usr/lib/libpcap.so.* $(1)/usr/lib/
+ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libpcap.so* $(1)/usr/lib/
endef
$(eval $(call BuildPackage,libpcap))
diff -pruN libpcap.orig/patches/101-debian_fix_any_intf.patch libpcap/patches/101-debian_fix_any_intf.patch
--- libpcap.orig/patches/101-debian_fix_any_intf.patch 2010-03-04 17:22:31.0 +0100
+++ libpcap/patches/101-debian_fix_any_intf.patch 1970-01-01 01:00:00.0 +0100
@@ -1,149 +0,0 @@
a/pcap-linux.c
-+++ b/pcap-linux.c
-@@ -297,6 +297,12 @@ pcap_create(const char *device, char *eb
- {
- pcap_t *handle;
-
-+ /*
-+ * A null device name is equivalent to the any device.
-+ */
-+ if (device == NULL)
-+ device = any;
-+
- #ifdef HAVE_DAG_API
- if (strstr(device, dag)) {
- return dag_create(device, ebuf);
-@@ -338,10 +344,9 @@ pcap_can_set_rfmon_linux(pcap_t *p)
- struct iwreq ireq;
- #endif
-
-- if (p-opt.source == NULL) {
-+ if (strcmp(p-opt.source, any) == 0) {
- /*
-- * This is equivalent to the any device, and we don't
-- * support monitor mode on it.
-+ * Monitor mode makes no sense on the any device.
- */
- return 0;
- }
-@@ -518,12 +523,11 @@ pcap_activate_linux(pcap_t *handle)
- handle-stats_op = pcap_stats_linux;
-
- /*
-- * NULL and any are special devices which give us the hint to
-- * monitor all devices.
-+ * The any device is a special device which causes us not
-+ * to bind
[OpenWrt-Devel] [PATCH] Add wide-dhcpv6 package
Hi,
this patch adds wide-dhcpv6 package.
-Raphael
diff -pruN ipv6.orig/wide-dhcpv6/files/dhcp6c.config ipv6/wide-dhcpv6/files/dhcp6c.config
--- ipv6.orig/wide-dhcpv6/files/dhcp6c.config 1970-01-01 01:00:00.0 +0100
+++ ipv6/wide-dhcpv6/files/dhcp6c.config 2010-02-22 11:59:15.0 +0100
@@ -0,0 +1,25 @@
+# The followings are a sample configuration for requiring the stateless
+# DHCPv6 service.
+# interface eth0 {
+# information-only;
+#};
+
+
+# The followings are a sample configuration to be delegated an IPv6 prefix
+# from an upstream service provider. With this configuration dhcp6c will
+# send solicit messages containing an IA_PD option, with an IAID 0, on to
+# an upstream PPP link, ppp0. After receiving some prefixes from a server,
+# dhcp6c will then configure derived IPv6 prefixes with the SLA ID 1 on a
+# local ethernet interface, ne0. Note that the IAID for the id-assoc
+# statement is 0 according to the default.
+
+interface ppp1 {
+send ia-pd 0;
+};
+
+id-assoc pd {
+prefix-interface lan0 {
+sla-id 1;
+sla-len 8;
+};
+};
diff -pruN ipv6.orig/wide-dhcpv6/Makefile ipv6/wide-dhcpv6/Makefile
--- ipv6.orig/wide-dhcpv6/Makefile 1970-01-01 01:00:00.0 +0100
+++ ipv6/wide-dhcpv6/Makefile 2010-02-22 11:59:15.0 +0100
@@ -0,0 +1,65 @@
+#
+# Copyright (C) 2006-2010 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=wide-dhcpv6
+PKG_VERSION:=20080615
+PKG_RELEASE:=1
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=...@sf/$(PKG_NAME)
+PKG_MD5SUM:=1011e165850fe40d3e332dad2bfd30b3
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/wide-dhcpv6/Default
+ SECTION:=ipv6
+ CATEGORY:=IPv6
+ TITLE:=IPv6 DHCPv6 implementaion for BSD and Linux
+ URL:=http://wide-dhcpv6.sourceforge.net/
+endef
+
+define Package/wide-dhcpv6/description
+WIDE-DHCPv6 is an open-source implementation of Dynamic Host Configuration
+Protocol for IPv6 (DHCPv6) originally developed by the KAME project. The
+implementation mainly conforms to the following standards: RFC3315,3319,3633,
+3646,4075,4272,etc.
+endef
+
+define Package/wide-dhcpv6-client
+ $(call Package/wide-dhcpv6/Default)
+ TITLE+= client
+endef
+
+define Package/wide-dhcpv6-server
+ $(call Package/wide-dhcpv6/Default)
+ TITLE+= server
+endef
+
+define Package/wide-dhcpv6-relay
+ $(call Package/wide-dhcpv6/Default)
+ TITLE+= relay
+endef
+
+define Package/wide-dhcpv6-ctl
+ $(call Package/wide-dhcpv6/Default)
+ TITLE+= ctl
+endef
+
+define Package/wide-dhcpv6-client/install
+ $(INSTALL_DIR) $(1)/sbin
+ $(INSTALL_BIN) $(PKG_BUILD_DIR)/dhcp6c $(1)/sbin
+
+ $(INSTALL_DIR) $(1)/etc
+ $(INSTALL_DATA) ./files/dhcp6c.config $(1)/etc/dhcp6c.conf
+endef
+
+$(eval $(call BuildPackage,wide-dhcpv6-client))
+$(eval $(call BuildPackage,wide-dhcpv6-server))
+$(eval $(call BuildPackage,wide-dhcpv6-relay))
+$(eval $(call BuildPackage,wide-dhcpv6-ctl))
diff -pruN ipv6.orig/wide-dhcpv6/patches/000-cftoken-noyywrap.patch ipv6/wide-dhcpv6/patches/000-cftoken-noyywrap.patch
--- ipv6.orig/wide-dhcpv6/patches/000-cftoken-noyywrap.patch 1970-01-01 01:00:00.0 +0100
+++ ipv6/wide-dhcpv6/patches/000-cftoken-noyywrap.patch 2010-02-22 11:59:15.0 +0100
@@ -0,0 +1,9 @@
+--- a/cftoken.l 2007-03-21 10:52:55.0 +0100
b/cftoken.l 2009-06-12 15:40:03.0 +0200
+@@ -1,5 +1,6 @@
+ /* $KAME: cftoken.l,v 1.35 2005/01/12 06:06:11 suz Exp $ */
+
++%option noyywrap
+ %{
+ /*
+ * Copyright (C) 2002 WIDE Project.
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] add gesftpserver package
Hi, this patch adds geftpserver package. This server is taken from http://www.greenend.org.uk/rjk/sftpserver/index.html It will need the patch to add bzr support to include/download.mk I've submitted yesterday: https://lists.openwrt.org/pipermail/openwrt-devel/2010-February/005973.html (a similar patch I hadn't seen previously can also be found here: https://dev.openwrt.org/ticket/6370) -Raphaeldiff -pruN net.orig//gesftpserver/Makefile net/gesftpserver/Makefile --- net.orig//gesftpserver/Makefile 1970-01-01 01:00:00.0 +0100 +++ net/gesftpserver/Makefile 2010-02-19 15:57:34.914700140 +0100 @@ -0,0 +1,56 @@ +# +# Copyright (C) 2006-2010 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk + +PKG_NAME:=sftpserver +PKG_REV:=228 +PKG_VERSION:=r$(PKG_REV) +PKG_RELEASE:=1 + +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=http://www.greenend.org.uk/rjk/bzr/sftpserver.dev +PKG_SOURCE_PROTO:=bzr +PKG_SOURCE_SUBDIR:=$(PKG_NAME) +PKG_SOURCE_VERSION:=$(PKG_REV) + +PKG_INSTALL:=1 + +TAR_OPTIONS:=--transform='s,$(PKG_NAME),$(PKG_NAME)-$(PKG_VERSION),' -xvf - + +include $(INCLUDE_DIR)/package.mk + +define Package/gesftpserver + SECTION:=net + CATEGORY:=Network + DEPENDS:=+libpthread +libiconv + TITLE:=SFTP server + URL:=http://www.greenend.org.uk/rjk/sftpserver/ +endef + +define Package/gesftpserver/description +This is an experimental free SFTP server. It is currently still under development +(so don't trust it with critical data). It should be possible to use it as a +drop-in replacement for the widely-used OpenSSH SFTP server. It does not include +an SSH server, but rather runs as a subsystem of one. +endef + +CONFIGURE_CMD:=./prepare + +TARGET_CFLAGS+= \ + -I$(STAGING_DIR)/usr/lib/libiconv/include/ + +TARGET_LDFLAGS+= \ + -L$(STAGING_DIR)/usr/lib/libiconv/lib \ + -lpthread + +define Package/gesftpserver/install + $(INSTALL_DIR) $(1)/usr/bin + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/gesftpserver $(1)/usr/bin/ +endef + +$(eval $(call BuildPackage,gesftpserver)) ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] strace: fix build error #6702
Hi, this patch fixes a build error described in ticket #6702. -Raphaeldiff -pruN utils/strace.orig//Makefile utils/strace/Makefile --- utils/strace.orig//Makefile 2010-02-19 17:30:33.0 +0100 +++ utils/strace/Makefile 2010-02-19 17:36:44.0 +0100 @@ -40,12 +40,17 @@ A useful diagnostic, instructional, and system calls a program makes while it is running. endef +# needed when compiling against Linux 2.4 CONFIGURE_VARS += \ ac_cv_header_linux_netlink_h=yes +# needed when compiling with an external toolchain TARGET_CFLAGS += \ -I$(LINUX_DIR)/include +MAKE_FLAGS := \ + CCOPT=$(TARGET_CFLAGS) + define Package/strace/install $(INSTALL_DIR) $(1)/usr/bin $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/strace $(1)/usr/bin/ ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] add upx package and libucl
Hi,
these patches add upx and libucl packages.
From http://upx.sourceforge.net/
UPX is a free, portable, extendable, high-performance executable packer
for several different executable formats. It achieves an excellent
compression ratio and offers very fast decompression. Your executables
suffer no memory overhead or other drawbacks for most of the formats
supported, because of in-place decompression.
-Raphael
diff -pruN libs.orig//ucl/Makefile libs/ucl/Makefile
--- libs.orig//ucl/Makefile 1970-01-01 01:00:00.0 +0100
+++ libs/ucl/Makefile 2010-02-18 15:22:38.666408901 +0100
@@ -0,0 +1,57 @@
+#
+# Copyright (C) 2006-2010 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=ucl
+PKG_VERSION:=1.03
+PKG_RELEASE:=1
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=http://www.oberhumer.com/opensource/ucl/download/
+PKG_MD5SUM:=852bd691d8abc75b52053465846fba34
+
+PKG_FIXUP:=libtool
+PKG_INSTALL:=1
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/libucl
+ SECTION:=libs
+ CATEGORY:=Libraries
+ DEPENDS:=
+ TITLE:=The Ultimate Packer for eXecutables
+ URL:=http://upx.sourceforge.net/
+endef
+
+define Package/libucl/description
+UCL is a portable lossless data compression library written in ANSI C. UCL
+implements a number of compression algorithms that achieve an excellent
+compression ratio while allowing *very* fast decompression. Decompression
+requires no additional memory.
+endef
+
+CONFIGURE_ARGS += \
+ --enable-static \
+ --enable-shared \
+ --disable-asm
+
+define Build/InstallDev
+ $(INSTALL_DIR) $(1)/usr/include/ucl
+ $(CP) $(PKG_INSTALL_DIR)/usr/include/ucl/ucl{,conf}.h $(1)/usr/include/ucl/
+
+ $(INSTALL_DIR) $(1)/usr/lib
+ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libucl.{a,so*} $(1)/usr/lib/
+endef
+
+define Package/libucl/install
+ $(INSTALL_DIR) $(1)/usr/lib
+ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libucl.so* $(1)/usr/lib/
+endef
+
+$(eval $(call BuildPackage,libucl))
+
diff -pruN utils.orig//upx/Makefile utils/upx/Makefile
--- utils.orig//upx/Makefile 1970-01-01 01:00:00.0 +0100
+++ utils/upx/Makefile 2010-02-18 15:23:45.515160485 +0100
@@ -0,0 +1,53 @@
+#
+# Copyright (C) 2006-2010 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=upx
+PKG_VERSION:=3.04
+PKG_RELEASE:=1
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-src.tar.bz2
+PKG_SOURCE_URL:=http://upx.sourceforge.net/download/
+PKG_MD5SUM:=68d662b1f831335460f9bfdbf632c6ce
+
+TAR_OPTIONS+=--transform='s,$(PKG_NAME)-$(PKG_VERSION)-src,$(PKG_NAME)-$(PKG_VERSION),'
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/upx
+ SECTION:=utils
+ CATEGORY:=Utilities
+ DEPENDS:=+libucl
+ TITLE:=The Ultimate Packer for eXecutables
+ URL:=http://upx.sourceforge.net/
+endef
+
+define Package/upx/description
+UPX is a free, portable, extendable, high-performance executable packer for
+several different executable formats. It achieves an excellent compression ratio
+and offers very fast decompression. Your executables suffer no memory overhead
+or other drawbacks for most of the formats supported, because of in-place
+decompression.
+endef
+
+MAKE_VARS += \
+ UPX_UCLDIR=$(STAGING_DIR)/usr/include/ucl \
+ exeext=
+
+define Build/Compile
+ $(call Build/Compile/Default, \
+ all \
+ )
+endef
+
+define Package/upx/install
+ $(INSTALL_DIR) $(1)/usr/bin
+ $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/upx $(1)/usr/bin/
+endef
+
+$(eval $(call BuildPackage,upx))
diff -pruN utils.orig//upx/patches/100-disable_doc.patch utils/upx/patches/100-disable_doc.patch
--- utils.orig//upx/patches/100-disable_doc.patch 1970-01-01 01:00:00.0 +0100
+++ utils/upx/patches/100-disable_doc.patch 2010-02-18 15:23:45.515160485 +0100
@@ -0,0 +1,12 @@
+diff -pruN upx-3.04.orig//Makefile upx-3.04/Makefile
+--- upx-3.04.orig//Makefile 2010-02-18 15:07:46.894410571 +0100
upx-3.04/Makefile 2010-02-18 15:08:32.758657685 +0100
+@@ -35,7 +35,7 @@ ifeq ($(BUILD_STUB),1)
+ $(MAKE) -C src/stub $@
+ endif
+ $(MAKE) -C src $@
+- $(MAKE) -C doc $@
++# $(MAKE) -C doc $@
+
+
+ ifneq ($(wildcard .hg/.),)
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] add bzr support to include/download.mk and fix whitespace
Hi, this patch adds support for bzr in include/download.mk, and fixes whitespace. -Raphael--- include/download.mk.orig 2010-02-18 18:27:26.090680177 +0100 +++ include/download.mk 2010-02-18 18:14:32.187190084 +0100 @@ -1,5 +1,5 @@ -# -# Copyright (C) 2007 OpenWrt.org +# +# Copyright (C) 2006-2010 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -8,7 +8,7 @@ DOWNLOAD_RDEP=$(STAMP_PREPARED) $(HOST_STAMP_PREPARED) # Try to guess the download method from the URL -define dl_method +define dl_method $(strip \ $(if $(2),$(2), \ $(if $(filter @GNOME/% @GNU/% @KERNEL/% @SF/% ftp://% http://% file://%,$(1)),default, \ @@ -16,9 +16,9 @@ $(strip \ $(if $(filter svn://%,$(1)),svn, \ $(if $(filter cvs://%,$(1)),cvs, \ $(if $(filter hg://%,$(1)),hg, \ - unknown \ - ) \ - ) \ + unknown \ +) \ + ) \ ) \ ) \ ) \ @@ -26,7 +26,7 @@ $(strip \ ) endef -# code for creating tarballs from cvs/svn/git/hg checkouts - useful for mirror support +# code for creating tarballs from cvs/svn/git/bzr/hg checkouts - useful for mirror support dl_pack/bz2=$(TAR) cfj $(1) $(2) dl_pack/gz=$(TAR) cfz $(1) $(2) dl_pack/unknown=echo ERROR: Unknown pack format for file $(1); false @@ -49,19 +49,18 @@ endef define DownloadMethod/cvs $(call wrap_mirror, \ echo Checking out files from the cvs repository...; \ -mkdir -p $(TMP_DIR)/dl \ -cd $(TMP_DIR)/dl \ -rm -rf $(SUBDIR) \ -[ \! -d $(SUBDIR) ] \ -cvs -d $(URL) co $(VERSION) $(SUBDIR) \ -find $(SUBDIR) -name CVS | xargs rm -rf \ -echo Packing checkout... \ -$(call dl_pack,$(TMP_DIR)/dl/$(FILE),$(SUBDIR)) \ -mv $(TMP_DIR)/dl/$(FILE) $(DL_DIR)/; \ -) + mkdir -p $(TMP_DIR)/dl \ + cd $(TMP_DIR)/dl \ + rm -rf $(SUBDIR) \ + [ \! -d $(SUBDIR) ] \ + cvs -d $(URL) co $(VERSION) $(SUBDIR) \ + find $(SUBDIR) -name CVS | xargs rm -rf \ + echo Packing checkout... \ + $(call dl_pack,$(TMP_DIR)/dl/$(FILE),$(SUBDIR)) \ + mv $(TMP_DIR)/dl/$(FILE) $(DL_DIR)/; \ + ) endef - define DownloadMethod/svn $(call wrap_mirror, \ echo Checking out files from the svn repository...; \ @@ -93,6 +92,21 @@ define DownloadMethod/git ) endef +define DownloadMethod/bzr + $(call wrap_mirror, \ + echo Checking out files from the bzr repository...; \ + mkdir -p $(TMP_DIR)/dl \ + cd $(TMP_DIR)/dl \ + rm -rf $(SUBDIR) \ + [ \! -d $(SUBDIR) ] \ + bzr co --lightweight -r$(VERSION) $(URL) $(SUBDIR) \ + find $(SUBDIR) -name .bzr | xargs rm -rf \ + echo Packing checkout... \ + $(call dl_pack,$(TMP_DIR)/dl/$(FILE),$(SUBDIR)) \ + mv $(TMP_DIR)/dl/$(FILE) $(DL_DIR)/; \ + ) +endef + define DownloadMethod/hg $(call wrap_mirror, \ echo Checking out files from the hg repository...; \ @@ -111,6 +125,7 @@ endef Validate/cvs=VERSION SUBDIR Validate/svn=VERSION SUBDIR Validate/git=VERSION SUBDIR +Validate/bzr=VERSION SUBDIR Validate/hg=VERSION SUBDIR define Download/Defaults ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH] strace: clean up Makefile and mips64 support for 4.5.16
Le Tue, 16 Feb 2010 18:12:41 +0100, Jo-Philipp Wich x...@subsignal.org a écrit : -CONFIGURE_VARS += \ - ac_cv_header_linux_netlink_h=yes This was required to build on brcm-2.4, did you test your changes there? I haven't removed it, just moved down after the package description :) +CONFIGURE_VARS += \ + ac_cv_header_linux_netlink_h=yes -Raphael ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] sudo: update to 1.7.2p3
Hi, this patch updates sudo to the latest stable version: 1.7.2p3 (thanks for http://pastehtml.com/view/5tfitwd.html) -Raphaeldiff -pruN sudo.orig//Makefile sudo/Makefile --- sudo.orig//Makefile 2010-02-17 12:06:19.414414545 +0100 +++ sudo/Makefile 2010-02-17 12:10:47.210658474 +0100 @@ -1,5 +1,5 @@ # -# Copyright (C) 2009 OpenWrt.org +# Copyright (C) 2006-2010 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -7,43 +7,43 @@ include $(TOPDIR)/rules.mk PKG_NAME:=sudo -PKG_VERSION:=1.7.2p2 +PKG_VERSION:=1.7.2p3 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://www.sudo.ws/sudo/dist/ -PKG_MD5SUM:=2a19cf1ab4afc94fe19d0d0899d4cd45 +PKG_MD5SUM:=b4bb9a0ae896958b71e48ef91967cdcb PKG_INSTALL:=1 include $(INCLUDE_DIR)/package.mk define Package/sudo - SECTION:= admin + SECTION:=admin CATEGORY:=Administration - TITLE:=delegate authority to run commands + TITLE:=Delegate authority to run commands URL:=http://www.sudo.ws/ endef define Package/sudo/description - Sudo (su do) allows a system administrator to delegate authority to give - certain users (or groups of users) the ability to run some (or all) commands - as root or another user while providing an audit trail of the commands and - their arguments. +Sudo (su do) allows a system administrator to delegate authority to give +certain users (or groups of users) the ability to run some (or all) commands as +root or another user while providing an audit trail of the commands and their +arguments. +endef + +define Package/sudo/conffiles +/etc/sudoers endef CONFIGURE_ARGS+= \ --without-pam \ --disable-pam-session \ - --with-editor=/bin/vi \ + --with-editor=/bin/vi CONFIGURE_VARS+= \ sudo_cv_uid_t_len=10 \ - sudo_cv_func_unsetenv_void=no \ - -define Package/sudo/conffiles -/etc/sudoers -endef + sudo_cv_func_unsetenv_void=no define Package/sudo/install $(INSTALL_DIR) $(1)/usr/bin ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH] libupnp: fix parallel build and cleanup Makefile
Le Mon, 15 Feb 2010 19:17:55 +0100,
bud.d...@suisse.org a écrit :
On 15.02.2010 17:58, Raphaël HUCK wrote:
+MAKE_ARGS += CCOPT=$(TARGET_CFLAGS)
define Build/Compile/libupnp-sample
$(MAKE) -C $(PKG_BUILD_DIR) \
- CCOPT=$(TARGET_CFLAGS) \
DESTDIR=$(PKG_INSTALL_DIR) \
check
+ $(MAKE) -C $(PKG_BUILD_DIR)/upnp/sample \
+ upnp_tv_device upnp_tv_ctrlpt
endef
MAKE_ARGS is ignored, remember?
Yes you're right. I meant to put MAKE_FLAGS instead.
Either CCOPT is not needed or you have
to use MAKE_FLAGS .. But you have a Compile definition. Hence you have
to add it manually to the make parameters. But you deleted the
parameter with your patch.
I guess the parameter is used during compiling and not with install.
$ grep -rn CCOPT libupnp-1.6.6
libupnp-1.6.6/build-aux/config.guess:634: (CCOPTS=
$CC_FOR_BUILD -o $dummy $dummy.c 2/dev/null) HP_ARCH=`$dummy`
libupnp-1.6.6/build-aux/config.guess:651: if echo __LP64__ |
(CCOPTS= $CC_FOR_BUILD -E - 2/dev/null) |
I don't know why CCOPT was added to the Makefile 3 years ago, and if
CCOPTS was meant instead
(https://dev.openwrt.org/changeset/6057/packages/libs/libupnp/Makefile).
I grepped libupnp 1.3.1 and found the same results.
So I guess we can safely remove it.
check include/package-defaults.mk .. it really clears up things.
That's what I'm doing actually, don't know where I got MAKE_ARGS
from... :)
The attached patch fixes all this, and I also added PKG_FIXUP:=libtool,
and Build/InstallDev now also installs *.la files.
Thanks for pointing this out!
-Raphael
--- /data/workspace/openwrt/packages/libs/libupnp/Makefile 2010-02-16 11:54:24.0 +0100
+++ /home/rhk/workspace/neufbox/packages/libs/libupnp/Makefile 2010-02-16 15:42:31.482669067 +0100
@@ -1,5 +1,5 @@
#
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2010 OpenWrt.org
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
@@ -9,12 +9,15 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=libupnp
PKG_VERSION:=1.6.6
-PKG_RELEASE:=1
+PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=...@sf/pupnp
PKG_MD5SUM:=8918dcf7428cd119d0c8275765ff2833
+PKG_FIXUP:=libtool
+PKG_INSTALL:=1
+
include $(INCLUDE_DIR)/package.mk
define Package/libupnp/Default
@@ -31,11 +34,10 @@ define Package/libupnp
endef
define Package/libupnp/description
-The portable SDK for UPnP Devices (libupnp) provides developers with an
- API and open source code for building control points, devices, and
- bridges that are compliant with Version 1.0 of the Universal Plug and
- Play Device Architecture Specification and support several operating
- systems like Linux, *BSD, Solaris and others.
+The portable SDK for UPnP Devices (libupnp) provides developers with an API and
+open source code for building control points, devices, and bridges that are
+compliant with Version 1.0 of the Universal Plug and Play Device Architecture
+Specification.
endef
define Package/libupnp-sample
@@ -45,8 +47,7 @@ define Package/libupnp-sample
endef
define Package/libupnp-sample/description
- TVcontrolpoint tvdevice sample applications
- run inside /etc/upnp-tvdevice/
+TVcontrolpoint tvdevice sample applications run inside /etc/upnp-tvdevice/
endef
define Build/Configure
@@ -58,26 +59,20 @@ endef
TARGET_CFLAGS += $(FPIC)
-define Build/Compile
- $(MAKE) -C $(PKG_BUILD_DIR) \
- CCOPT=$(TARGET_CFLAGS) \
- DESTDIR=$(PKG_INSTALL_DIR) \
- all install
- $(MAKE) -C $(PKG_BUILD_DIR)/upnp/sample/ upnp_tv_device upnp_tv_ctrlpt
-endef
-
define Build/Compile/libupnp-sample
$(MAKE) -C $(PKG_BUILD_DIR) \
- CCOPT=$(TARGET_CFLAGS) \
DESTDIR=$(PKG_INSTALL_DIR) \
check
+ $(MAKE) -C $(PKG_BUILD_DIR)/upnp/sample \
+ DESTDIR=$(PKG_INSTALL_DIR) \
+ upnp_tv_device upnp_tv_ctrlpt
endef
define Build/InstallDev
$(INSTALL_DIR) $(1)/usr/include
$(CP) $(PKG_INSTALL_DIR)/usr/include/upnp $(1)/usr/include/
$(INSTALL_DIR) $(1)/usr/lib
- $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{ixml,threadutil,upnp}.{a,so*} $(1)/usr/lib/
+ $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{ixml,threadutil,upnp}.{a,so*,la} $(1)/usr/lib/
$(INSTALL_DIR) $(1)/usr/lib/pkgconfig
$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libupnp.pc $(1)/usr/lib/pkgconfig/
endef
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] libupnp: fix parallel build and cleanup Makefile
Hi, this patch fixes libupnp parallel build and cleans the Makefile a little. -Raphaeldiff -pruN libupnp.orig//Makefile libupnp/Makefile --- libupnp.orig//Makefile 2010-02-15 17:57:21.0 +0100 +++ libupnp/Makefile 2010-02-15 17:54:59.0 +0100 @@ -1,5 +1,5 @@ # -# Copyright (C) 2006 OpenWrt.org +# Copyright (C) 2006-2010 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -9,12 +9,14 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libupnp PKG_VERSION:=1.6.6 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=...@sf/pupnp PKG_MD5SUM:=8918dcf7428cd119d0c8275765ff2833 +PKG_INSTALL:=1 + include $(INCLUDE_DIR)/package.mk define Package/libupnp/Default @@ -31,11 +33,10 @@ define Package/libupnp endef define Package/libupnp/description -The portable SDK for UPnP Devices (libupnp) provides developers with an - API and open source code for building control points, devices, and - bridges that are compliant with Version 1.0 of the Universal Plug and - Play Device Architecture Specification and support several operating - systems like Linux, *BSD, Solaris and others. +The portable SDK for UPnP Devices (libupnp) provides developers with an API and +open source code for building control points, devices, and bridges that are +compliant with Version 1.0 of the Universal Plug and Play Device Architecture +Specification. endef define Package/libupnp-sample @@ -45,8 +46,7 @@ define Package/libupnp-sample endef define Package/libupnp-sample/description - TVcontrolpoint tvdevice sample applications - run inside /etc/upnp-tvdevice/ +TVcontrolpoint tvdevice sample applications run inside /etc/upnp-tvdevice/ endef define Build/Configure @@ -57,20 +57,14 @@ define Build/Configure endef TARGET_CFLAGS += $(FPIC) - -define Build/Compile - $(MAKE) -C $(PKG_BUILD_DIR) \ - CCOPT=$(TARGET_CFLAGS) \ - DESTDIR=$(PKG_INSTALL_DIR) \ - all install - $(MAKE) -C $(PKG_BUILD_DIR)/upnp/sample/ upnp_tv_device upnp_tv_ctrlpt -endef +MAKE_ARGS += CCOPT=$(TARGET_CFLAGS) define Build/Compile/libupnp-sample $(MAKE) -C $(PKG_BUILD_DIR) \ - CCOPT=$(TARGET_CFLAGS) \ DESTDIR=$(PKG_INSTALL_DIR) \ check + $(MAKE) -C $(PKG_BUILD_DIR)/upnp/sample \ + upnp_tv_device upnp_tv_ctrlpt endef define Build/InstallDev ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH] New package powertop 1.11
Hi all,
this patch adds powertop:
http://www.lesswatts.org/projects/powertop/
Computer programs can make your computer use more power. PowerTOP is a
Linux tool that helps you find those programs that are misbehaving
while your computer is idle. The application that misbehaved the most
was the Linux kernel. However, as of version 2.6.21, the Linux kernel
went tickless, and no longer has a fixed 1000Hz timer tick. The result
(in theory) is huge power savings because the CPU stays in low power
mode for longer periods during system idle.
-Raphael
PS: this closes https://dev.openwrt.org/ticket/6570
Please use the attached patch instead.
Thanks.
-Raphaeldiff -pruN utils.orig/powertop/Makefile utils/powertop/Makefile
--- utils.orig/powertop/Makefile 1970-01-01 01:00:00.0 +0100
+++ utils/powertop/Makefile 2010-02-12 16:30:05.718664063 +0100
@@ -0,0 +1,42 @@
+#
+# Copyright (C) 2006-2010 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=powertop
+PKG_VERSION:=1.11
+PKG_RELEASE:=1
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=http://www.lesswatts.org/projects/powertop/download/
+PKG_MD5SUM:=3498f5983c683c3a57dce7379a722082
+
+PKG_INSTALL:=1
+PKG_FIXUP:=libtool
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/powertop
+ SECTION:=utils
+ CATEGORY:=Utilities
+ TITLE:=PowerTOP
+ DEPENDS:=+libncurses +libgcc
+ KCONFIG:=CONFIG_DEBUG_KERNEL=y CONFIG_TIMER_STATS=y
+ URL:=http://www.lesswatts.org
+endef
+
+define Package/powertop/description
+PowerTOP is a Linux tool that helps you find those programs that are misbehaving
+while your computer is idle.
+endef
+
+define Package/powertop/install
+ $(CP) $(PKG_INSTALL_DIR)/* $(1)
+endef
+
+$(eval $(call BuildPackage,powertop))
+
diff -pruN utils.orig/powertop/patches/100-no-wide-ncurses.patch utils/powertop/patches/100-no-wide-ncurses.patch
--- utils.orig/powertop/patches/100-no-wide-ncurses.patch 1970-01-01 01:00:00.0 +0100
+++ utils/powertop/patches/100-no-wide-ncurses.patch 2010-02-12 16:26:03.770424453 +0100
@@ -0,0 +1,11 @@
+--- a/Makefile
b/Makefile
+@@ -20,7 +20,7 @@ OBJS = powertop.o config.o process.o mis
+
+
+ powertop: $(OBJS) Makefile powertop.h
+- $(CC) ${CFLAGS} $(OBJS) -lncursesw -o powertop
++ $(CC) ${LDFLAGS} $(OBJS) -lncurses -o powertop
+ @(cd po/ $(MAKE))
+
+ powertop.1.gz: powertop.1
diff -pruN utils.orig/powertop/patches/200-no-gettext.patch utils/powertop/patches/200-no-gettext.patch
--- utils.orig/powertop/patches/200-no-gettext.patch 1970-01-01 01:00:00.0 +0100
+++ utils/powertop/patches/200-no-gettext.patch 2010-02-12 16:26:03.774429530 +0100
@@ -0,0 +1,48 @@
+--- a/powertop.c
b/powertop.c
+@@ -30,7 +30,9 @@
+ #include stdint.h
+ #include sys/types.h
+ #include dirent.h
++#ifdef ENABLE_GETTEXT
+ #include libintl.h
++#endif
+ #include ctype.h
+ #include assert.h
+ #include locale.h
+@@ -783,9 +785,11 @@ int main(int argc, char **argv)
+ uint64_t cur_usage[8], cur_duration[8];
+ double wakeups_per_second = 0;
+
++#ifdef ENABLE_GETTEXT
+ setlocale (LC_ALL, );
+ bindtextdomain (powertop, /usr/share/locale);
+ textdomain (powertop);
++#endif
+
+ while (1) {
+ static struct option opts[] = {
+--- a/powertop.h
b/powertop.h
+@@ -26,7 +26,9 @@
+ #ifndef __INCLUDE_GUARD_POWERTOP_H_
+ #define __INCLUDE_GUARD_POWERTOP_H_
+
++#ifdef ENABLE_GETTEXT
+ #include libintl.h
++#endif
+
+ struct line {
+ char *string;
+@@ -86,7 +88,11 @@ extern suggestion_func *suggestion_activ
+ _x _y ? _x : _y; })
+
+
++#ifdef ENABLE_GETTEXT
+ #define _(STRING)gettext(STRING)
++#else
++#define _(STRING)STRING
++#endif
+
+
+ #define PT_COLOR_DEFAULT1
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH] New package powertop 1.11
Le Fri, 12 Feb 2010 16:33:31 +0100, Benjamin Henrion b...@udev.org a écrit : 2010/2/8 Raphaël HUCK r...@cksum.org: Hi all, this patch adds powertop: http://www.lesswatts.org/projects/powertop/ Computer programs can make your computer use more power. PowerTOP is a Linux tool that helps you find those programs that are misbehaving while your computer is idle. The application that misbehaved the most was the Linux kernel. However, as of version 2.6.21, the Linux kernel went tickless, and no longer has a fixed 1000Hz timer tick. The result (in theory) is huge power savings because the CPU stays in low power mode for longer periods during system idle. Does it work on other hardware then Intel chips? It does on a BCM6358 (MIPS32). -Raphael ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] ethtool: fix parallel build
Hi, this patch fixes ethtool parallel build. -Raphaeldiff -pruN ethtool.orig/Makefile ethtool/Makefile --- ethtool.orig/Makefile 2010-02-12 17:29:09.0 +0100 +++ ethtool/Makefile 2010-02-12 17:31:25.0 +0100 @@ -1,5 +1,5 @@ # -# Copyright (C) 2006 OpenWrt.org +# Copyright (C) 2006-2010 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -9,12 +9,14 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ethtool PKG_VERSION:=6 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=...@sf/gkernel PKG_MD5SUM:=3b721ec27f17ebf320ba8c505cf66d9c +PKG_INSTALL:=1 + include $(INCLUDE_DIR)/package.mk define Package/ethtool @@ -25,15 +27,7 @@ define Package/ethtool endef define Package/ethtool/description - ethtool is used for querying settings of an ethernet device and changing them. -endef - -# uses GNU configure - -define Build/Compile - $(MAKE) -C $(PKG_BUILD_DIR) \ - DESTDIR=$(PKG_INSTALL_DIR) \ - all install +ethtool is used for querying settings of an ethernet device and changing them. endef define Package/ethtool/install ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] syslog-ng: fix parallel build
Hi all, this patch fixes parallel build for syslog-ng package. -Raphaeldiff -pruN syslog-ng.orig/Makefile syslog-ng/Makefile --- syslog-ng.orig/Makefile 2010-02-08 17:03:19.350660971 +0100 +++ syslog-ng/Makefile 2010-02-08 17:03:51.022918775 +0100 @@ -1,5 +1,5 @@ # -# Copyright (C) 2006-2009 OpenWrt.org +# Copyright (C) 2006-2010 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=syslog-ng PKG_VERSION:=1.6.12 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_MD5SUM:=a3cbfdb6e1e5beea181a7349749719f3 PKG_SOURCE_URL:= \ @@ -17,6 +17,8 @@ PKG_SOURCE_URL:= \ http://www.balabit.com/downloads/files/syslog-ng/stable/src PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_INSTALL:=1 + include $(INCLUDE_DIR)/package.mk define Package/syslog-ng @@ -49,10 +51,6 @@ define Build/Configure ) endef -define Build/Compile - $(call Build/Compile/Default,DESTDIR=$(PKG_INSTALL_DIR) all install) -endef - define Package/syslog-ng/install $(INSTALL_DIR) $(1)/usr/sbin $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/syslog-ng $(1)/usr/sbin/ ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] New package powertop 1.11
Hi all,
this patch adds powertop:
http://www.lesswatts.org/projects/powertop/
Computer programs can make your computer use more power. PowerTOP is a
Linux tool that helps you find those programs that are misbehaving
while your computer is idle. The application that misbehaved the most
was the Linux kernel. However, as of version 2.6.21, the Linux kernel
went tickless, and no longer has a fixed 1000Hz timer tick. The result
(in theory) is huge power savings because the CPU stays in low power
mode for longer periods during system idle.
-Raphael
PS: this closes https://dev.openwrt.org/ticket/6570diff -pruN utils.orig/powertop/Makefile utils/powertop/Makefile
--- utils.orig/powertop/Makefile 1970-01-01 01:00:00.0 +0100
+++ utils/powertop/Makefile 2010-01-27 17:17:22.920970066 +0100
@@ -0,0 +1,39 @@
+#
+# Copyright (C) 2006-2010 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=powertop
+PKG_VERSION:=1.11
+PKG_RELEASE:=1
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=http://www.lesswatts.org/projects/powertop/download/
+PKG_MD5SUM:=3498f5983c683c3a57dce7379a722082
+
+PKG_INSTALL:=1
+PKG_FIXUP:=libtool
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/powertop
+ SECTION:=utils
+ CATEGORY:=Utilities
+ TITLE:=PowerTOP
+ DEPENDS:=+libncurses
+ KCONFIG:=CONFIG_DEBUG_KERNEL=y CONFIG_TIMER_STATS=y
+ URL:=http://www.lesswatts.org/
+endef
+
+define Package/powertop/description
+ PowerTOP is a Linux tool that helps you find those programs that are misbehaving while your computer is idle.
+endef
+
+define Package/powertop/install
+ $(CP) $(PKG_INSTALL_DIR)/* $(1)
+endef
+
+$(eval $(call BuildPackage,powertop))
diff -pruN utils.orig/powertop/patches/100-no-wide-ncurses.patch utils/powertop/patches/100-no-wide-ncurses.patch
--- utils.orig/powertop/patches/100-no-wide-ncurses.patch 1970-01-01 01:00:00.0 +0100
+++ utils/powertop/patches/100-no-wide-ncurses.patch 2010-01-27 17:15:20.001469193 +0100
@@ -0,0 +1,12 @@
+diff -pruN powertop-1.11.orig/Makefile powertop-1.11/Makefile
+--- powertop-1.11.orig/Makefile 2010-01-25 18:15:58.136730412 +0100
powertop-1.11/Makefile 2010-01-25 18:17:52.114555881 +0100
+@@ -20,7 +20,7 @@ OBJS = powertop.o config.o process.o mis
+
+
+ powertop: $(OBJS) Makefile powertop.h
+- $(CC) ${CFLAGS} $(OBJS) -lncursesw -o powertop
++ $(CC) ${LDFLAGS} $(OBJS) -lncurses -o powertop
+ @(cd po/ $(MAKE))
+
+ powertop.1.gz: powertop.1
diff -pruN utils.orig/powertop/patches/200-no-gettext.patch utils/powertop/patches/200-no-gettext.patch
--- utils.orig/powertop/patches/200-no-gettext.patch 1970-01-01 01:00:00.0 +0100
+++ utils/powertop/patches/200-no-gettext.patch 2010-01-27 17:13:50.645223581 +0100
@@ -0,0 +1,50 @@
+diff -pruN powertop-1.11.orig/powertop.c powertop-1.11/powertop.c
+--- powertop-1.11.orig/powertop.c 2010-01-25 18:15:58.136730412 +0100
powertop-1.11/powertop.c 2010-01-25 18:26:00.752868032 +0100
+@@ -30,7 +30,9 @@
+ #include stdint.h
+ #include sys/types.h
+ #include dirent.h
++#ifdef ENABLE_GETTEXT
+ #include libintl.h
++#endif
+ #include ctype.h
+ #include assert.h
+ #include locale.h
+@@ -783,9 +785,11 @@ int main(int argc, char **argv)
+ uint64_t cur_usage[8], cur_duration[8];
+ double wakeups_per_second = 0;
+
++#ifdef ENABLE_GETTEXT
+ setlocale (LC_ALL, );
+ bindtextdomain (powertop, /usr/share/locale);
+ textdomain (powertop);
++#endif
+
+ while (1) {
+ static struct option opts[] = {
+diff -pruN powertop-1.11.orig/powertop.h powertop-1.11/powertop.h
+--- powertop-1.11.orig/powertop.h 2010-01-25 18:15:58.136730412 +0100
powertop-1.11/powertop.h 2010-01-25 18:24:03.928723362 +0100
+@@ -26,7 +26,9 @@
+ #ifndef __INCLUDE_GUARD_POWERTOP_H_
+ #define __INCLUDE_GUARD_POWERTOP_H_
+
++#ifdef ENABLE_GETTEXT
+ #include libintl.h
++#endif
+
+ struct line {
+ char *string;
+@@ -86,7 +88,11 @@ extern suggestion_func *suggestion_activ
+ _x _y ? _x : _y; })
+
+
++#ifdef ENABLE_GETTEXT
+ #define _(STRING)gettext(STRING)
++#else
++#define _(STRING)STRING
++#endif
+
+
+ #define PT_COLOR_DEFAULT1
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] Fix tcpdump parallel build
Hi again, this patch fixes tcpdump parallel build. -Raphaeldiff -pruN tcpdump.orig/Makefile tcpdump/Makefile --- tcpdump.orig/Makefile 2010-02-08 17:24:06.778911003 +0100 +++ tcpdump/Makefile 2010-02-08 17:24:35.694573060 +0100 @@ -1,5 +1,5 @@ # -# Copyright (C) 2007-2009 OpenWrt.org +# Copyright (C) 2007-2010 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=tcpdump PKG_VERSION:=4.0.0 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://www.tcpdump.org/release/ \ @@ -20,6 +20,8 @@ PKG_MD5SUM:=b22ca72890df2301d922c9f2d178 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION) +PKG_INSTALL:=1 + include $(INCLUDE_DIR)/package.mk define Package/tcpdump/default @@ -48,22 +50,15 @@ CONFIGURE_VARS += \ HOSTCC=$(HOSTCC) \ td_cv_buggygetaddrinfo=no +MAKE_FLAGS := \ + CCOPT=$(TARGET_CFLAGS) INCLS=-I. $(TARGET_CPPFLAGS) + ifeq ($(BUILD_VARIANT),mini) TARGET_CFLAGS += -DTCPDUMP_MINI CONFIGURE_ARGS += --disable-smb - MAKE_FLAGS := TCPDUMP_MINI=1 -else - MAKE_FLAGS := + MAKE_FLAGS += TCPDUMP_MINI=1 endif -define Build/Compile - $(MAKE) -C $(PKG_BUILD_DIR) \ - CCOPT=$(TARGET_CFLAGS) INCLS=-I. $(TARGET_CPPFLAGS) \ - DESTDIR=$(PKG_INSTALL_DIR) \ - $(MAKE_FLAGS) \ - all install -endef - define Package/tcpdump/install $(INSTALL_DIR) $(1)/usr/sbin $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/tcpdump $(1)/usr/sbin/ ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH] Fix parallel build of lzo package
Le Thu, 28 Jan 2010 19:52:00 +0100, Felix Fietkau n...@openwrt.org a écrit : On 2010-01-28 5:35 PM, Raphaël HUCK wrote: Hi all, Several packages cannot be built in parallel. This patch fixes this for the lzo package. I don't really see the connection between your changes (which do look correct) and parallel building. Could you please explain that a bit? In order to build faster (on a octocore for example :) ) it is possible to enable parallel building of packages (which is not the case by default) by changing the follonwing line in include/package.mk: override MAKEFLAGS= to override MAKEFLAGS=$(MAKE_JOBS) Then the following make command in lzo package: $(MAKE) -C $(PKG_BUILD_DIR) \ CFLAGS_O=$(TARGET_CFLAGS) \ DESTDIR=$(PKG_INSTALL_DIR) \ all install will build the all and install rules in parallel, which will fail. So in order to fix this you can either do: $(MAKE) -C $(PKG_BUILD_DIR) \ CFLAGS_O=$(TARGET_CFLAGS) \ DESTDIR=$(PKG_INSTALL_DIR) \ all $(MAKE) -C $(PKG_BUILD_DIR) \ CFLAGS_O=$(TARGET_CFLAGS) \ DESTDIR=$(PKG_INSTALL_DIR) \ install or (as in the patch): PKG_INSTALL:=1 MAKE_ARGS += CFLAGS_O=$(TARGET_CFLAGS) as default rules in OpenWrt will serialize all and install rules. Other patches to fix parallel building can be found here: * Update ntfs-3g to 2010.1.16 and fix parallel build https://dev.openwrt.org/ticket/6577 * Fix libol package parallel build https://dev.openwrt.org/ticket/6588 * Fix clearsilver parallel build, don't install static libraries https://dev.openwrt.org/ticket/6592 * Fix libinklevel parallel build https://dev.openwrt.org/ticket/6593 Thanks, -Raphaël signature.asc Description: PGP signature ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] MAKE_ARGS not working?
Hi Raphael, in connection to this patch I doublechecked and modified my latest ntfs-3g update (we obviously had the same idea ;) and found this Hey Bud, are you referring to this ticket? https://dev.openwrt.org/ticket/6577 MAKE_ARGS += CFLAGS_O=$(TARGET_CFLAGS) is obviously ignored. To have it in the make call one can do it the broadcom-wl package way MAKE := $(MAKE) ARCH=$(LINUX_KARCH) CROSS_COMPILE=$(TARGET_CROSS) or as lots of other packages do define Build/Compile $(MAKE) $(MAKE_VARS) endef As MAKE_VARS on the other hand is automagically added, this seems to be a bug. Yeah in fact the right way to do it is MAKE_FLAGS: MAKE_FLAGS += CFLAGS_O=$(TARGET_CFLAGS) Where did you find the PKG_INSTALL switch? In quite a lot of packages: $ grep -rn --exclude-dir=.svn ^[[:space:]]*PKG_INSTALL[[:space:]]*:*= packages/ | wc -l 155 Other packages' Makefiles is my most reliable source of information :) -Raphaël ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] Fix parallel build of lzo package
Hi all, Several packages cannot be built in parallel. This patch fixes this for the lzo package. -Raphaël diff -pruN lzo.orig/Makefile lzo/Makefile --- lzo.orig/Makefile 2010-01-28 15:01:09.317221843 +0100 +++ lzo/Makefile 2010-01-28 17:13:59.981473228 +0100 @@ -1,5 +1,5 @@ # -# Copyright (C) 2006 OpenWrt.org +# Copyright (C) 2006-2010 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -9,12 +9,14 @@ include $(TOPDIR)/rules.mk PKG_NAME:=lzo PKG_VERSION:=2.03 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://www.oberhumer.com/opensource/lzo/download/ PKG_MD5SUM:=0c3d078c2e8ea5a88971089a2f02a726 +PKG_INSTALL:=1 + include $(INCLUDE_DIR)/package.mk define Package/liblzo @@ -25,9 +27,8 @@ define Package/liblzo endef define Package/liblzo/description - LZO is a data compression library which is suitable for data - de-/compression in real-time. - This means it favours speed over compression ratio. +LZO is a data compression library which is suitable for data de-/compression in +real-time. This means it favours speed over compression ratio. endef define Build/Configure @@ -39,12 +40,7 @@ endef TARGET_CFLAGS += $(FPIC) -define Build/Compile - $(MAKE) -C $(PKG_BUILD_DIR) \ - CFLAGS_O=$(TARGET_CFLAGS) \ - DESTDIR=$(PKG_INSTALL_DIR) \ - all install -endef +MAKE_ARGS += CFLAGS_O=$(TARGET_CFLAGS) define Build/InstallDev $(INSTALL_DIR) $(1)/usr/include signature.asc Description: PGP signature ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] Suggestions to ease maintenance of OpenWrt based firmware
Hi Florian and everyone, Le Thu, 28 May 2009 12:01:07 +0200, Raphaël HUCK raphael.h...@efixo.com a écrit : Le Wed, 27 May 2009 14:21:24 +0200, Florian Fainelli flor...@openwrt.org a écrit : Salut Raphaël, Le Wednesday 27 May 2009 11:40:08 Raphaël HUCK, vous avez écrit : As for packages, the main issue comes from static and shared libraries. Sometimes, you don't want the shared libraries to be installed. That's why it would be great to introduce an InstallShared rule. Yes, this sounds like a good idea though it would require to change almost all packages to split out the part of their Define Package/foo/install to separate the shared libraries installation. What about taking the other way and by default let everything like this but add a Build options configuration option which removes the shared libraries from the packages ? Why not do it this way then: - don't change any of the current packages and don't change their behavior either - when a package is changed and shared libraries installation is separated in InstallShared, call InstallShared right after install by default, so the behavior is still the same - provide a way to disable shared libraries installation on a per-package basis What do you think? Or why not do like debian, ie having a regular version and -dev version, and sometimes -dbg version of the library? -Raphaël signature.asc Description: PGP signature ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] Suggestions to ease maintenance of OpenWrt based firmware
Hi, I've been thinking lately on what could be done in OpenWrt to ease the maintenance of a firmware based on it. It is quite easy to integrate third-party applications by putting them into packages and using the feeds, so they stay out of the trunk and don't have to be worried about. Then you have the base system and the packages: 1. you'd like to stay synchronized with the OpenWrt repository 2. you'd like to contribute your fixes and enhancements to OpenWrt In order to be able to do this easily, you want to minimize the differences between the files and the merging you have to do. New files are easy to handle, while differences between files are not. For patches, it is not a problem, you can just add a patch that fixes your specific problem, you'll just have one more file in your repository than in openwrt repository. However, for configuration files, init files and Makefiles this is more problematic. There is a lot of manual merging to do, and it's more difficult to contribute a patch to OpenWrt. For example: packages/admin/syslog-ng/files/syslog-ng.conf packages/libs/lzo/Makefile packages/net/lighttpd/files/lighttpd.init For init and conf files, it could install .init.default and .conf.default files if corresponding .init and .conf files are not present. As for packages, the main issue comes from static and shared libraries. Sometimes, you don't want the shared libraries to be installed. That's why it would be great to introduce an InstallShared rule. What do you think? Regards, --Raphaël HUCK signature.asc Description: PGP signature ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
