Re: [OpenWrt-Devel] Some questions to package
Take a look at *shameless plug* the msmtp package which builds two binaries, one linking to openssl. https://dev.openwrt.org/browser/packages/mail/msmtp/Makefile Dave On Tue, Oct 27, 2009 at 6:44 PM, Ondrej Zajicek wrote: > Hello > > I would like to create an OpenWRT package for BIRD routing daemon > ( http://bird.network.cz/ ), but there is one problem with it: > > There is a configure option to specify whether it should be compiled > for IPv4 or IPv6. If you want both IPv4 and IPv6, you have to built > it (configure and make) twice (created binaries will have slightly > different names, so there is not a collision). > > What is the proper way to support such build? Obviously, it can be > easily done by creating two completely independent package > specifications, but that would lead to unnecessary duplication. > > -- > Elen sila lumenn' omentielvo > > Ondrej 'SanTiago' Zajicek (email: santi...@crfreenet.org) > OpenPGP encrypted e-mails preferred (KeyID 0x11DEADC3, wwwkeys.pgp.net) > "To err is human -- to blame it on a computer is even more so." > > -BEGIN PGP SIGNATURE- > Version: GnuPG v1.4.9 (GNU/Linux) > > iEYEARECAAYFAkrnd9sACgkQw1GB2RHercMUkACcD5OyEilRTvcow1r4bjMgZCPD > 1QQAn22gH2J5qYwM0RNmf50wSR5U4xll > =vP69 > -END PGP SIGNATURE- > > ___ > openwrt-devel mailing list > openwrt-devel@lists.openwrt.org > https://lists.openwrt.org/mailman/listinfo/openwrt-devel > > ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [package] libv4l -- A v4l and v4l2 abstraction/compatibility layer
Uhh, bump. Thanks guys, Dave On Sat, Aug 29, 2009 at 4:16 AM, Dave Cooper wrote: > As promised, here's the libv4l package which adds a generally uniform > abstraction layer for webcams, particularly buggy ones. This pairs > nicely with the earlier gspca patchset. For example, my spca561 based > webcam won't really work without a libv4l LD_PRELOAD. > > Note, shm_open() is only available in uClibc trunk, so there's a > little work-around patch. > > Thanks, > Dave > > Sorry to attach yet another patch, I've yet to find a way to stop > GMail from mangling them. > > Signed-off-by: David Cooper > ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [package] libv4l -- A v4l and v4l2 abstraction/compatibility layer
As promised, here's the libv4l package which adds a generally uniform
abstraction layer for webcams, particularly buggy ones. This pairs
nicely with the earlier gspca patchset. For example, my spca561 based
webcam won't really work without a libv4l LD_PRELOAD.
Note, shm_open() is only available in uClibc trunk, so there's a
little work-around patch.
Thanks,
Dave
Sorry to attach yet another patch, I've yet to find a way to stop
GMail from mangling them.
Signed-off-by: David Cooper
Index: packages/libs/libv4l/patches/001-no-shm_open-fix.patch
===
--- packages/libs/libv4l/patches/001-no-shm_open-fix.patch (revision 0)
+++ packages/libs/libv4l/patches/001-no-shm_open-fix.patch (revision 0)
@@ -0,0 +1,43 @@
+diff -ruN libv4l-0.6.0.orig/libv4lconvert/control/libv4lcontrol.c libv4l-0.6.0/libv4lconvert/control/libv4lcontrol.c
+--- libv4l-0.6.0.orig/libv4lconvert/control/libv4lcontrol.c 2009-07-09 04:59:01.0 -0400
libv4l-0.6.0/libv4lconvert/control/libv4lcontrol.c 2009-08-29 03:23:06.0 -0400
+@@ -265,7 +265,7 @@
+
+ struct v4lcontrol_data *v4lcontrol_create(int fd, int always_needs_conversion)
+ {
+- int shm_fd;
++ int shm_fd, fdflags;
+ int i, rc, init = 0;
+ char *s, shm_name[256];
+ struct v4l2_capability cap;
+@@ -311,19 +311,26 @@
+ return data; /* No need to create a shared memory segment */
+
+ SYS_IOCTL(fd, VIDIOC_QUERYCAP, &cap);
+- snprintf(shm_name, 256, "/%s:%s", cap.bus_info, cap.card);
++ snprintf(shm_name, 256, "/dev/shm/%s:%s", cap.bus_info, cap.card);
+
+ /* / is not allowed inside shm names */
+- for (i = 1; shm_name[i]; i++)
++ for (i = 9; shm_name[i]; i++) //start after "/dev/shm", i = 9
+ if (shm_name[i] == '/')
+ shm_name[i] = '-';
+
+ /* Open the shared memory object identified by shm_name */
+- if ((shm_fd = shm_open(shm_name, (O_CREAT | O_EXCL | O_RDWR),
++ if ((shm_fd = open(shm_name, (O_CREAT | O_EXCL | O_RDWR),
+ (S_IREAD | S_IWRITE))) >= 0)
+ init = 1;
+- else if ((shm_fd = shm_open(shm_name, O_RDWR, (S_IREAD | S_IWRITE))) < 0)
++ else if ((shm_fd = open(shm_name, O_RDWR, (S_IREAD | S_IWRITE))) < 0)
+ goto error;
++
++ /* This is all uClibc > 0.9.30 seems to do for shm_open() in librt/shm.c */
++ fdflags = fcntl(shm_fd, F_GETFD, 0);
++
++ if (fdflags >= 0) {
++fdflags = fcntl(fd, F_SETFD, fdflags | FD_CLOEXEC);
++ }
+
+ /* Set the shared memory size */
+ ftruncate(shm_fd, V4LCONTROL_SHM_SIZE);
Index: packages/libs/libv4l/Makefile
===
--- packages/libs/libv4l/Makefile (revision 0)
+++ packages/libs/libv4l/Makefile (revision 0)
@@ -0,0 +1,75 @@
+#
+# Copyright (C) 2009 David Cooper
+# Copyright (C) 2009 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:=libv4l
+PKG_VERSION:=0.6.0
+PKG_RELEASE:=1
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=http://people.atrpms.net/~hdegoede/
+PKG_MD5SUM:=db389fdf02cabd57f289f0faa37f4060
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/libv4l
+ SECTION:=libs
+ CATEGORY:=Libraries
+ TITLE:=Video 4 Linux wrapper libraries
+ URL:=http://people.atrpms.net/~hdegoede/
+ DEPENDS:=+libpthread
+endef
+
+define Package/libv4l/description
+ libv4l is a collection of libraries which adds a thin abstraction layer on
+ top of video4linux2 devices. The purpose of this (thin) layer is to make it
+ easy for application writers to support a wide variety of devices without
+ having to write separate code for different devices in the same class. libv4l
+ consists of 3 different libraries: libv4lconvert, libv4l1 and libv4l2.
+
+ libv4l1 offers the (deprecated) v4l1 API on top of v4l2 devices, independent
+ of the drivers for those devices supporting v4l1 compatibility (which many
+ v4l2 drivers do not).
+
+ libv4l2 offers the v4l2 API on top of v4l2 devices, while adding for the
+ application transparent libv4lconvert conversion where necessary.
+endef
+
+TARGET_CFLAGS += $(FPIC)
+
+define Build/Compile
+ $(MAKE) -C $(PKG_BUILD_DIR) \
+ DESTDIR="$(PKG_INSTALL_DIR)" PREFIX="/usr" \
+ $(CONFIGURE_VARS) \
+ all install
+ $(MAKE) -C $(PKG_BUILD_DIR) \
+ DESTDIR="$(PKG_INSTALL_DIR)" PREFIX="/usr" \
+ $(CONFIGURE_VARS) \
+ LINKTYPE="static" \
+ all install
+endef
+
+define Build/InstallDev
+ mkdir -p $(1)/usr/include
+ $(CP) $(PKG_INSTALL_DIR)/usr/include/libv4l{1,2,convert}.h $(1)/usr/include/
+ mkdir -p $(1)/usr/lib
+ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libv4l{1,2,convert}.{a,so*} $(1)/usr/lib/
+ mkdir -p $(1)/usr/lib/pkgconfig
+ $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libv4l{1,2,convert}.pc $(1)/usr/lib/pkgconfig/
+endef
+
+define Package/libv4l/install
+ $(INSTALL_DIR) $(1)/usr/lib
+ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libv4l{1,2,convert}.so* $(1)/usr/lib/
+ $(INSTALL_DIR) $(1)/usr/lib/lib
Re: [OpenWrt-Devel] [PATCH] Added identification of WRT610N and its button/led definitions.
Try attaching? On Fri, Aug 28, 2009 at 10:22 AM, Felix Fietkau wrote: > Tomas Kopal wrote: >> Sorry, should be better now. >> >> Tomas >> >> From cf62b42ea81b940e3e9c51db934e0bb0f4070f7c Mon Sep 17 00:00:00 2001 >> >> From: Tomas Kopal >> >> Date: Thu, 27 Aug 2009 22:06:03 +0200 >> >> Subject: [PATCH] Added identification of WRT610N and its button/led >> definitions. >> >> Signed-off-by: Tomas Kopal > Nope. it's actually worse now. > > - Felix > ___ > openwrt-devel mailing list > openwrt-devel@lists.openwrt.org > https://lists.openwrt.org/mailman/listinfo/openwrt-devel > ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH] Resend2 - Added support for identifying the BCM53115 switch found in WRT610N.
Thanks Tomas. :)
+1 for speedy inclusion.
On Fri, Aug 28, 2009 at 4:41 AM, Tomas Kopal wrote:
> Sorry for the spam, my mail client got crazy. Hope it's better this time.
>
> From db0413dfdfd0ff05b32b0e2871e5b4af3f1f0d38 Mon Sep 17 00:00:00 2001
> From: Tomas Kopal
> Date: Mon, 24 Aug 2009 22:55:59 +0200
> Subject: [PATCH] Added support for identifying the BCM53115 switch found in
> WRT610N.
>
>
> Signed-off-by: Tomas Kopal
> ---
> package/broadcom-57xx/src/bcmrobo.c | 6 --
> 1 files changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/package/broadcom-57xx/src/bcmrobo.c
> b/package/broadcom-57xx/src/bcmrobo.c
> index 7a5434b..b60db49 100644
> --- a/package/broadcom-57xx/src/bcmrobo.c
> +++ b/package/broadcom-57xx/src/bcmrobo.c
> @@ -96,6 +96,7 @@
> #define DEVID5395 0x95 /* 5395 */
> #define DEVID5397 0x97 /* 5397 */
> #define DEVID5398 0x98 /* 5398 */
> +#define DEVID53115 0x3115 /* 53115 */
> /* VLAN page registers */
> #define REG_VLAN_CTRL0 0x00 /* VLAN Control 0 register */
> @@ -891,7 +892,8 @@ bcm_robo_attach(sb_t *sbh, void *h, char *name, char
> *vars, miird_f miird, miiwr
> ASSERT((robo->devid == DEVID5325) ||
> (robo->devid == DEVID5395) ||
> (robo->devid == DEVID5397) ||
> - (robo->devid == DEVID5398));
> + (robo->devid == DEVID5398) ||
> + (robo->devid == DEVID53115));
> bcm_robo_reset(robo);
> config_attach(robo);
> @@ -1253,7 +1255,7 @@ static int handle_vlan_port_write(void *driver, char
> *buf, int nr)
> val32 = ((c->untag << 9) | /* untag enable */
> c->port); /* vlan members */
> - if (robo->devid == DEVID5395) {
> + if ((robo->devid == DEVID5395) || (robo->devid == DEVID53115)) {
> vtble = REG_VTBL_ENTRY_5395;
> vtbli = REG_VTBL_INDX_5395;
> vtbla = REG_VTBL_ACCESS_5395;
> -- 1.6.0.4
>
> ___
> openwrt-devel mailing list
> openwrt-devel@lists.openwrt.org
> https://lists.openwrt.org/mailman/listinfo/openwrt-devel
>
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [patch] gspca!
*gentle bump* Thanks again, Dave On Sat, Aug 15, 2009 at 6:51 PM, Dave Cooper wrote: > Hi all, > > Here's the first of the series of patches that I've been blabbing > about in #openwrt-devel to bring gspca webcam support to trunk. This > removes the old out-of-tree and broken gspca1 driver and adds the > in-tree one for >= 2.6.28 > > I'm also working on some userspace stuff for v4l2 like libv4l and a > simple, command-line JPEG capture tool. Libv4l is almost ready and I'm > just finishing a workaround to uClibc's lack of open_shm() support in > their stable releases -- uClibc trunk has got this. > > Thanks, > Dave Cooper > > Signed-off-by: David Cooper > ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [patch] gspca!
Hi all, Here's the first of the series of patches that I've been blabbing about in #openwrt-devel to bring gspca webcam support to trunk. This removes the old out-of-tree and broken gspca1 driver and adds the in-tree one for >= 2.6.28 I'm also working on some userspace stuff for v4l2 like libv4l and a simple, command-line JPEG capture tool. Libv4l is almost ready and I'm just finishing a workaround to uClibc's lack of open_shm() support in their stable releases -- uClibc trunk has got this. Thanks, Dave Cooper Signed-off-by: David Cooper Index: package/kernel/modules/video.mk === --- package/kernel/modules/video.mk (revision 17277) +++ package/kernel/modules/video.mk (working copy) @@ -1,5 +1,6 @@ # -# Copyright (C) 2006-2008 OpenWrt.org +# Copyright (C) 2009 David Cooper +# Copyright (C) 2006-2009 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -166,9 +167,7 @@ SUBMENU:=$(VIDEO_MENU) TITLE:=USB Video Class (UVC) support DEPENDS:=...@linux_2_6 @!LINUX_2_6_25 @!LINUX_2_6_24 @!LINUX_2_6_23 @USB_SUPPORT +kmod-usb-core +kmod-video-core - KCONFIG:= \ - CONFIG_USB_VIDEO_CLASS \ - CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y + KCONFIG:= CONFIG_USB_VIDEO_CLASS FILES:=$(LINUX_DIR)/drivers/media/video/uvc/uvcvideo.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,90,uvcvideo) endef @@ -179,3 +178,453 @@ endef $(eval $(call KernelPackage,video-uvc)) + + +define KernelPackage/video-gspca-core + SUBMENU:=$(VIDEO_MENU) + MENU:=1 + TITLE:=GSPCA webcam core support framework + DEPENDS:=...@linux_2_6 @!LINUX_2_6_21 @!LINUX_2_6_25 @!LINUX_2_6_27 @USB_SUPPORT +kmod-usb-core +kmod-video-core + KCONFIG:=CONFIG_USB_GSPCA + FILES:=$(LINUX_DIR)/drivers/media/video/gspca/gspca_main.$(LINUX_KMOD_SUFFIX) + AUTOLOAD:=$(call AutoLoad,70,gspca_main) +endef + + +define KernelPackage/video-gspca-core/description + Kernel modules for supporting GSPCA based webcam devices. Note this is just + the core of the driver, please select a submodule that supports your webcam. +endef + +$(eval $(call KernelPackage,video-gspca-core)) + +define KernelPackage/video-gspca-conex + SUBMENU:=$(VIDEO_MENU) + TITLE:=conex webcam support + DEPENDS:=kmod-video-gspca-core + KCONFIG:=CONFIG_USB_GSPCA_CONEX + FILES:=$(LINUX_DIR)/drivers/media/video/gspca/gspca_conex.$(LINUX_KMOD_SUFFIX) + AUTOLOAD:=$(call AutoLoad,75,gspca_conex) +endef + +define KernelPackage/video-gspca-conex/description + The Conexant Camera Driver (conex) kernel module. +endef + +$(eval $(call KernelPackage,video-gspca-conex)) + + +define KernelPackage/video-gspca-etoms + SUBMENU:=$(VIDEO_MENU) + TITLE:=etoms webcam support + DEPENDS:=kmod-video-gspca-core + KCONFIG:=CONFIG_USB_GSPCA_ETOMS + FILES:=$(LINUX_DIR)/drivers/media/video/gspca/gspca_etoms.$(LINUX_KMOD_SUFFIX) + AUTOLOAD:=$(call AutoLoad,75,gspca_etoms) +endef + +define KernelPackage/video-gspca-etoms/description + The Etoms USB Camera Driver (etoms) kernel module. +endef + +$(eval $(call KernelPackage,video-gspca-etoms)) + + +define KernelPackage/video-gspca-finepix + SUBMENU:=$(VIDEO_MENU) + TITLE:=finepix webcam support + DEPENDS:=kmod-video-gspca-core + KCONFIG:=CONFIG_USB_GSPCA_FINEPIX + FILES:=$(LINUX_DIR)/drivers/media/video/gspca/gspca_finepix.$(LINUX_KMOD_SUFFIX) + AUTOLOAD:=$(call AutoLoad,75,gspca_finepix) +endef + +define KernelPackage/video-gspca-finepix/description + The Fujifilm FinePix USB V4L2 driver (finepix) kernel module. +endef + +$(eval $(call KernelPackage,video-gspca-finepix)) + + +define KernelPackage/video-gspca-mars + SUBMENU:=$(VIDEO_MENU) + TITLE:=mars webcam support + DEPENDS:=kmod-video-gspca-core + KCONFIG:=CONFIG_USB_GSPCA_MARS + FILES:=$(LINUX_DIR)/drivers/media/video/gspca/gspca_mars.$(LINUX_KMOD_SUFFIX) + AUTOLOAD:=$(call AutoLoad,75,gspca_mars) +endef + +define KernelPackage/video-gspca-mars/description + The Mars USB Camera Driver (mars) kernel module. +endef + +$(eval $(call KernelPackage,video-gspca-mars)) + + +define KernelPackage/video-gspca-mr97310a + SUBMENU:=$(VIDEO_MENU) + TITLE:=mr97310a webcam support + DEPENDS:=kmod-video-gspca-core @!LINUX_2_6_28 + KCONFIG:=CONFIG_USB_GSPCA_MR97310A + FILES:=$(LINUX_DIR)/drivers/media/video/gspca/gspca_mr97310a.$(LINUX_KMOD_SUFFIX) + AUTOLOAD:=$(call AutoLoad,75,gspca_mr97310a) +endef + +define KernelPackage/video-gspca-mr97310a/description + The Mars-Semi MR97310A USB Camera Driver (mr97310a) kernel module. +endef + +$(eval $(call KernelPackage,video-gspca-mr97310a)) + + +define KernelPackage/video-gspca-ov519 + SUBMENU:=$(VIDEO_MENU) + TITLE:=ov519 webcam support + DEPENDS:=kmod-video-gspca-core + KCONFIG:=CONFIG_USB_GSPCA_OV519 + FILES:=$(LINUX_DIR)/drivers/media/video/gspca/gspca_ov519.$(LINUX_KMOD_SUFFIX) + AUTOLOAD:=$(call AutoLoad,75,gspca_ov519) +endef + +define KernelPackage/video-gspca-ov519/description +
[OpenWrt-Devel] Fwd: NEW PACKAGE -- Active Port Forwarder (apf)
Hi all, Here's a useful package for retaining network access to an OpenWrt install behind a firewall. It requires one Internet-facing server daemon running to forward a TCP connection to a connected client. If anyone finds this useful, I'll add a UCI-ification patch. Signed-off-by: David Cooper --- Index: packages/net/apf/Makefile === --- packages/net/apf/Makefile (revision 0) +++ packages/net/apf/Makefile (revision 0) @@ -0,0 +1,95 @@ +# +# Copyright (C) 2009 David Cooper +# Copyright (C) 2009 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:=apf +PKG_VERSION:=0.8.4 +PKG_RELEASE:=1 + +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=http://gray-world.net/projects/af +PKG_MD5SUM:=4411785b05ec59e955152fe4e61705b1 + +include $(INCLUDE_DIR)/package.mk + +define Package/apf/Default + SECTION:=net + CATEGORY:=Network + TITLE:=Active Port Forwarding + URL:=http://www.gray-world.net/pr_af.shtml + DEPENDS:=+libopenssl +zlib +endef + +define Package/apf/Default/description + Active port forwarder is a software tool for secure port + forwarding. It uses SSL to increase security of communication + between a server and a client. Originally, it was developed to + forward data point to point. However, the need for bypassing + firewalls in order to connect to internally located computers + influenced the further development of the project. AF is + dedicated for people, who don't have an external ip number + and want to make some services available across the net. +endef + +define Package/apf-server + $(call Package/apf/Default) + TITLE+= Server Daemon +endef + +define Package/apf-server/description +$(call Package/apf/Default/description) + This packages includes the server executable. +endef + +define Package/apf-client + $(call Package/apf/Default) + TITLE+= Client Daemon +endef + +define Package/apf-client/description +$(call Package/apf/Default/description) + This packages includes the client executabe. +endef + + +CONFIGURE_VARS += \ + LIBS="-lcrypto -lssl" \ + ac_cv_lib_pthread_pthread_create="no" \ + ac_cv_lib_dl_dlopen="no" + +define Build/Configure + (cd $(PKG_BUILD_DIR) ; \ + touch \ + configure.in \ + aclocal.m4 \ + Makefile.in \ + configure \ + ); + $(call Build/Configure/Default) +endef + +define Build/Compile + $(MAKE) -C $(PKG_BUILD_DIR) \ + CFLAGS="$(TARGET_CFLAGS)" \ + LIBS="-lcrypto -lnsl -lz -lssl" +endef + +define Package/apf-server/install + $(INSTALL_DIR) $(1)/usr/bin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/afserver $(1)/usr/bin/apf-server +endef + +define Package/apf-client/install + $(INSTALL_DIR) $(1)/usr/bin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/afclient $(1)/usr/bin/apf-client +endef + +$(eval $(call BuildPackage,apf-server)) +$(eval $(call BuildPackage,apf-client)) + ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [patch] Disable ucitrigger (for now)
Hi all, ucitrigger isn't used by anything at the moment and it pulls in the lua and liblua-uci dependencies. Recommending removal of the default packageset for now. Thanks, Dave Cooper Signed-off-by: David Cooper Index: include/target.mk === --- include/target.mk (revision 17165) +++ include/target.mk (working copy) @@ -12,7 +12,7 @@ DEVICE_TYPE?=router # Default packages - the really basic set -DEFAULT_PACKAGES:=base-files libc libgcc busybox dropbear mtd uci opkg ucitrigger +DEFAULT_PACKAGES:=base-files libc libgcc busybox dropbear mtd uci opkg # For router targets DEFAULT_PACKAGES.router:=dnsmasq iptables ppp ppp-mod-pppoe kmod-ipt-nathelper firewall DEFAULT_PACKAGES.bootloader:= ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] Annoying opkg bug since r17152
Note this happens for any package source, not just the openwrt.org one. On Fri, Aug 7, 2009 at 12:46 AM, Dave Cooper wrote: > Since the opkg source was bumped in r17152, everything works fine, but > all legal opkg operations trail with the following error message: > > Collected errors: > * ERROR: duplicate src declaration. Skipping: > src snapshots > http://downloads.openwrt.org/snapshots/trunk/brcm47xx/packages > > I've done a little bit of bug chasing, and it seems the config file > /etc/opkg/opkg.conf is parsed twice and this causes the error. It > could cause other errors as well. Not sure about a fix just yet, but > it seemed prudent to report since opkg is a somewhat important > package. :P > > Thanks, > Dave Cooper > ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] Annoying opkg bug since r17152
Since the opkg source was bumped in r17152, everything works fine, but all legal opkg operations trail with the following error message: Collected errors: * ERROR: duplicate src declaration. Skipping: src snapshots http://downloads.openwrt.org/snapshots/trunk/brcm47xx/packages I've done a little bit of bug chasing, and it seems the config file /etc/opkg/opkg.conf is parsed twice and this causes the error. It could cause other errors as well. Not sure about a fix just yet, but it seemed prudent to report since opkg is a somewhat important package. :P Thanks, Dave Cooper ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [patch] opkg Repository Switch Config Option
Hi all, Here a quick patch to abstract the opkg repository used in a build as a configuration option, with the default pointing to downloads.openwrt.org as usual. Useful for hosting different OpenWrt trees. If applied, a minor note that the repository location for future releases should be updated in packages/opkg/Makefile and not in packages/opkg/files/opkg.conf. Also, _ARCH_ is now used as the architecture instead of $S. Best, Dave Cooper Signed-off-by: David Cooper (attached as GMail loves chomping my patches) Index: package/opkg/files/opkg.conf === --- package/opkg/files/opkg.conf (revision 17153) +++ package/opkg/files/opkg.conf (working copy) @@ -1,4 +1,4 @@ -src/gz snapshots http://downloads.openwrt.org/snapshots/trunk/$S/packages +src/gz snapshots $SOURCE dest root / dest ram /tmp lists_dir ext /var/opkg-lists Index: package/opkg/Makefile === --- package/opkg/Makefile (revision 17153) +++ package/opkg/Makefile (working copy) @@ -6,10 +6,13 @@ include $(TOPDIR)/rules.mk +# Change this URL for a release, use _ARCH_ for architecture +OPKG_PACKAGE_SRC=http://downloads.openwrt.org/snapshots/trunk/_ARCH_/packages + PKG_NAME:=opkg PKG_REV:=215 PKG_VERSION:=$(PKG_REV) -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE_PROTO:=svn PKG_SOURCE_VERSION:=$(PKG_REV) @@ -69,7 +72,8 @@ $(INSTALL_DIR) $(1)/etc $(INSTALL_DIR) $(1)/etc/opkg $(INSTALL_DATA) ./files/opkg.conf $(1)/etc/opkg/ - $(SED) 's,S,$(PKGARCH),g' $(1)/etc/opkg/opkg.conf + $(SED) 's#SOURCE#$(if $(call qstrip,$(CONFIG_OPKG_CUSTOM_SRC)),$(call qstrip,$(CONFIG_OPKG_CUSTOM_SRC)),$(OPKG_PACKAGE_SRC))#g' $(1)/etc/opkg/opkg.conf + $(SED) 's#_ARCH_#$(PKGARCH)#g' $(1)/etc/opkg/opkg.conf $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/opkg-cl $(1)/bin/opkg $(INSTALL_DIR) $(1)/usr/lib $(CP) $(PKG_INSTALL_DIR)/usr/lib/libopkg.so.* $(1)/usr/lib/ Index: Config.in === --- Config.in (revision 17153) +++ Config.in (working copy) @@ -97,6 +97,16 @@ help This removes all ipkg data from the target directory before building the root fs +config OPKG_CUSTOM_SRC + string + prompt "Custom opkg package source" + default "" + help + Use this URL as a custom opkg package source. Leave blank for the + default (ie openwrt.org). Use _ARCH_ as short for the current + architecture. + Example: http://www.example.com/openwrt/_ARCH_/packages + choice prompt "Binary stripping method" default USE_STRIP if USE_GLIBC || USE_EGLIBC ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] dbus segfault fix and request to look at the -pie / -fPIC cflag
Hi all, dbus-daemon was segfaulting on trunk due to the -pie and -fPIC flag being present on AT LEAST brcm43xx (with 2.6.30.4). I'm not sure what other packages attempt to use that flag but they may or may not also be broken. It could be related to uclibc. I'll look in to it. The flag doesn't seem all that useful, so maybe it should be looked in to for possible blacklisting. More info: http://gcc.gnu.org/ml/gcc-patches/2003-06/msg00145.html (thanks to xMff) Anyway, without further adieu, here's the fix. Thanks, Dave Cooper Signed-off-by: David Cooper --- Index: packages/utils/dbus/patches/01-dbus-nopie-fix.patch === --- packages/utils/dbus/patches/01-dbus-nopie-fix.patch (revision 0) +++ packages/utils/dbus/patches/01-dbus-nopie-fix.patch (revision 0) @@ -0,0 +1,23 @@ +diff -ruN dbus-1.2.4.6permissive.orig/configure dbus-1.2.4.6permissive/configure +--- dbus-1.2.4.6permissive.orig/configure 2009-05-06 13:35:38.0 -0400 dbus-1.2.4.6permissive/configure 2009-08-05 17:53:25.0 -0400 +@@ -20927,19 +20927,6 @@ + ;; + esac + +- case " $CFLAGS " in +- *[\ \ ]-fPIE[\ \ ]*) ;; +- *) if cc_supports_flag -fPIE; then +- PIE_CFLAGS="-fPIE" +- if ld_supports_flag -z,relro; then +- PIE_LDFLAGS="-pie -Wl,-z,relro" +- else +- PIE_LDFLAGS="-pie" +- fi +- fi +- ;; +- esac +- + ### Disabled warnings, and compiler flag overrides + + # Let's just ignore unused for now Index: packages/utils/dbus/Makefile === --- packages/utils/dbus/Makefile (revision 17127) +++ packages/utils/dbus/Makefile (working copy) @@ -10,7 +10,7 @@ # Make sure to also update the dbus-x package PKG_NAME:=dbus PKG_VERSION:=1.2.4.6permissive -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://dbus.freedesktop.org/releases/dbus/ ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH] New Packages -- Scheme!
Ugh, I didn't realise there were \r and \n's in the patch. In case my
client chomped it, I've attached it.
Signed-off-by: David Cooper
On Wed, Mar 11, 2009 at 8:00 PM, Dave Cooper wrote:
> Hi All,
>
> I've packaged up a very small implementation of scheme called
> TinyScheme as well as an extension module called TSX (TinyScheme
> Extensions). I'll try to package up a bit more up in the days to come
> like a regex module and the ability to use scheme embedded in text
> files with tags or the like. I hope someone else finds this
> useful.
>
> Thanks,
> Dave
>
> ---
>
> Signed-off-by: David Cooper
>
> Index: packages/lang/tinyscheme/patches/01-dynload-path.patch
> ===
> --- packages/lang/tinyscheme/patches/01-dynload-path.patch (revision 0)
> +++ packages/lang/tinyscheme/patches/01-dynload-path.patch (revision 0)
> @@ -0,0 +1,19 @@
> +diff -ruN tinyscheme1.39.orig/dynload.c tinyscheme1.39/dynload.c
> +--- tinyscheme1.39.orig/dynload.c 2004-06-07 09:56:52.0 -0400
> tinyscheme1.39/dynload.c 2009-03-11 18:27:59.0 -0400
> +@@ -122,8 +122,13 @@
> + return(retval);
>
> + }
>
> +
>
> +-static void make_filename(const char *name, char *filename) {
>
> +- strcpy(filename,name);
>
> ++static void make_filename(const char *name, char *filename) {
> ++#ifdef ExtDir
> ++ strcpy(filename,ExtDir);
> ++ strcat(filename,name);
> ++#else
>
> ++ strcpy(filename,name);
> ++#endif
>
> + strcat(filename,SUFFIX);
>
> + }
>
> +
>
> Index: packages/lang/tinyscheme/Makefile
> ===
> --- packages/lang/tinyscheme/Makefile (revision 0)
> +++ packages/lang/tinyscheme/Makefile (revision 0)
> @@ -0,0 +1,68 @@
> +#
> +# Copyright (C) 2009 David Cooper
> +# Copyright (C) 2009 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:=tinyscheme
> +PKG_VERSION:=1.39
> +PKG_RELEASE:=1
> +
> +PKG_SOURCE:=$(PKG_NAME)$(PKG_VERSION).zip
> +PKG_SOURCE_URL:=...@sf/tinyscheme
> +PKG_MD5SUM:=55523524236ba546fdaf5f6b96a49a2b
> +
> +PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)$(PKG_VERSION)
> +
> +include $(INCLUDE_DIR)/package.mk
> +
> +define Package/tinyscheme
> + SUBMENU:=TinyScheme
> + SECTION:=lang
> + CATEGORY:=Languages
> + TITLE:=A minimal implementation of scheme
> + URL:=http://tinyscheme.sourceforge.net/
> +endef
> +
> +define Package/tinyscheme/description
> + TinyScheme is a lightweight Scheme interpreter that implements
> + as large a subset of R5RS as was possible without getting very
> + large and complicated. It is meant to be used as an embedded
> + scripting interpreter for other programs. As such, it does not
> + offer IDEs or extensive toolkits although it does sport a small
> + top-level loop, included conditionally. As an embedded interpreter,
> + it allows multiple interpreter states to coexist in the same
> + program, without any interference between them. Programmatically,
> + foreign functions in C can be added and values can be defined in
> + the Scheme environment. Being a quite small program, it is easy
> + to comprehend, get to grips with, and use.
> +endef
> +
> +define Build/Compile
> + $(MAKE) -C $(PKG_BUILD_DIR) \
> + CC="$(TARGET_CC) $(TARGET_CFLAGS)" \
> + FEATURES="-DUSE_DL=1 -DUSE_PLIST=1 \
> + -DInitFile=\"\\\"/usr/share/tinyscheme/init.scm\\\"\"
> \
> + -DExtDir=\"\\\"/usr/lib/tinyscheme/\\\"\"" \
> + SYS_LIBS="-ldl -lm" \
> + scheme
> +endef
> +
> +define Build/InstallDev
> + mkdir -p $(1)/usr/include/tinyscheme
> + $(CP) $(PKG_BUILD_DIR)/*.h $(1)/usr/include/tinyscheme
> +endef
> +
> +define Package/tinyscheme/install
> + $(INSTALL_DIR) $(1)/usr/bin
> + $(INSTALL_BIN) $(PKG_BUILD_DIR)/scheme $(1)/usr/bin
> + $(INSTALL_DIR) $(1)/usr/share/tinyscheme
> + $(INSTALL_DATA) $(PKG_BUILD_DIR)/init.scm $(1)/usr/share/tinyscheme
> +endef
> +
> +$(eval $(call BuildPackage,tinyscheme))
> +
> Index: packages/lang/tinyscheme-tsx/patches/01-cross-compile.patch
> ===
> --- packages/lang/tinyscheme-tsx/patches/01-cross-compile.patch (revision 0)
> +++ packages/lang/tinyscheme-tsx/patches/01-cross-compile.patch (revision 0)
> @@ -0,0 +1,24 @@
&
[OpenWrt-Devel] [PATCH] New Packages -- Scheme!
Hi All,
I've packaged up a very small implementation of scheme called
TinyScheme as well as an extension module called TSX (TinyScheme
Extensions). I'll try to package up a bit more up in the days to come
like a regex module and the ability to use scheme embedded in text
files with tags or the like. I hope someone else finds this
useful.
Thanks,
Dave
---
Signed-off-by: David Cooper
Index: packages/lang/tinyscheme/patches/01-dynload-path.patch
===
--- packages/lang/tinyscheme/patches/01-dynload-path.patch (revision 0)
+++ packages/lang/tinyscheme/patches/01-dynload-path.patch (revision 0)
@@ -0,0 +1,19 @@
+diff -ruN tinyscheme1.39.orig/dynload.c tinyscheme1.39/dynload.c
+--- tinyscheme1.39.orig/dynload.c 2004-06-07 09:56:52.0 -0400
tinyscheme1.39/dynload.c 2009-03-11 18:27:59.0 -0400
+@@ -122,8 +122,13 @@
+ return(retval);
+ }
+
+-static void make_filename(const char *name, char *filename) {
+- strcpy(filename,name);
++static void make_filename(const char *name, char *filename) {
++#ifdef ExtDir
++ strcpy(filename,ExtDir);
++ strcat(filename,name);
++#else
++ strcpy(filename,name);
++#endif
+ strcat(filename,SUFFIX);
+ }
+
Index: packages/lang/tinyscheme/Makefile
===
--- packages/lang/tinyscheme/Makefile (revision 0)
+++ packages/lang/tinyscheme/Makefile (revision 0)
@@ -0,0 +1,68 @@
+#
+# Copyright (C) 2009 David Cooper
+# Copyright (C) 2009 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:=tinyscheme
+PKG_VERSION:=1.39
+PKG_RELEASE:=1
+
+PKG_SOURCE:=$(PKG_NAME)$(PKG_VERSION).zip
+PKG_SOURCE_URL:=...@sf/tinyscheme
+PKG_MD5SUM:=55523524236ba546fdaf5f6b96a49a2b
+
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)$(PKG_VERSION)
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/tinyscheme
+ SUBMENU:=TinyScheme
+ SECTION:=lang
+ CATEGORY:=Languages
+ TITLE:=A minimal implementation of scheme
+ URL:=http://tinyscheme.sourceforge.net/
+endef
+
+define Package/tinyscheme/description
+ TinyScheme is a lightweight Scheme interpreter that implements
+ as large a subset of R5RS as was possible without getting very
+ large and complicated. It is meant to be used as an embedded
+ scripting interpreter for other programs. As such, it does not
+ offer IDEs or extensive toolkits although it does sport a small
+ top-level loop, included conditionally. As an embedded interpreter,
+ it allows multiple interpreter states to coexist in the same
+ program, without any interference between them. Programmatically,
+ foreign functions in C can be added and values can be defined in
+ the Scheme environment. Being a quite small program, it is easy
+ to comprehend, get to grips with, and use.
+endef
+
+define Build/Compile
+ $(MAKE) -C $(PKG_BUILD_DIR) \
+ CC="$(TARGET_CC) $(TARGET_CFLAGS)" \
+ FEATURES="-DUSE_DL=1 -DUSE_PLIST=1 \
+ -DInitFile=\"\\\"/usr/share/tinyscheme/init.scm\\\"\" \
+ -DExtDir=\"\\\"/usr/lib/tinyscheme/\\\"\"" \
+ SYS_LIBS="-ldl -lm" \
+ scheme
+endef
+
+define Build/InstallDev
+ mkdir -p $(1)/usr/include/tinyscheme
+ $(CP) $(PKG_BUILD_DIR)/*.h $(1)/usr/include/tinyscheme
+endef
+
+define Package/tinyscheme/install
+ $(INSTALL_DIR) $(1)/usr/bin
+ $(INSTALL_BIN) $(PKG_BUILD_DIR)/scheme $(1)/usr/bin
+ $(INSTALL_DIR) $(1)/usr/share/tinyscheme
+ $(INSTALL_DATA) $(PKG_BUILD_DIR)/init.scm $(1)/usr/share/tinyscheme
+endef
+
+$(eval $(call BuildPackage,tinyscheme))
+
Index: packages/lang/tinyscheme-tsx/patches/01-cross-compile.patch
===
--- packages/lang/tinyscheme-tsx/patches/01-cross-compile.patch (revision 0)
+++ packages/lang/tinyscheme-tsx/patches/01-cross-compile.patch (revision 0)
@@ -0,0 +1,24 @@
+diff -ruN tsx-1.1.orig/Makefile tsx-1.1/Makefile
+--- tsx-1.1.orig/Makefile 2002-04-09 04:37:57.0 -0400
tsx-1.1/Makefile 2009-03-11 17:54:11.0 -0400
+@@ -3,14 +3,15 @@
+ SCHEME_H_DIR=..
+ CC=gcc
+ CFLAGS=-DUSE_DL=1 -I $(SCHEME_H_DIR)
++FPIC=-fPIC
+
+ tsx.so : tsx.c tsx.h Makefile
+- $(CC) -shared -Wall -fPIC $(CFLAGS) -o tsx.so $(DEBUG) tsx.c
+- strip tsx.so
+- ls -l tsx.so
++ $(CC) -shared -Wall $(FPIC) $(CFLAGS) -o tsx.so $(DEBUG) tsx.c
++# strip tsx.so
++# ls -l tsx.so
+
+ .PHONY : clean
+ clean:
+ rm -f *.o
+ rm -f tsx.so
+- rm -f *~
+\ No newline at end of file
++ rm -f *~
Index: packages/lang/tinyscheme-tsx/Makefile
===
--- packages/lang/tinyscheme-tsx/Makefile (revision 0)
+++ packages/lang/tinyscheme-tsx/Makefile (revision 0)
@@ -0,0 +1,51 @@
+#
+#
[OpenWrt-Devel] [PATCH] wget --no-check-certificate to --check-certificate
Hi all,
Here's a little patch to change GNU wget's opt-out --no-check-certificate
argument to an opt-in one called --check-certificate. The reason for
this is that OpenWrt doesn't ship with any CA certificates. This won't
break instances where --no-check-certificate is used, it will simply
ignore them. I typically use GNU wget in my images instead of the
busybox one and I find this extremely useful.
Thanks,
Dave Cooper
---
Signed-off-by: David Cooper
Index: packages/net/wget/patches/01-disable-no-check-certificate.patch
===
--- packages/net/wget/patches/01-disable-no-check-certificate.patch
(revision 0)
+++ packages/net/wget/patches/01-disable-no-check-certificate.patch
(revision 0)
@@ -0,0 +1,38 @@
+diff -ruN wget-1.11.4.orig/src/init.c wget-1.11.4/src/init.c
+--- wget-1.11.4.orig/src/init.c 2008-04-27 00:48:23.0 -0400
wget-1.11.4/src/init.c 2009-03-08 16:42:30.0 -0400
+@@ -315,10 +315,6 @@
+ opt.dns_cache = true;
+ opt.ftp_pasv = true;
+
+-#ifdef HAVE_SSL
+- opt.check_cert = true;
+-#endif
+-
+ /* The default for file name restriction defaults to the OS type. */
+ #if defined(WINDOWS) || defined(MSDOS) || defined(__CYGWIN__)
+ opt.restrict_files_os = restrict_windows;
+diff -ruN wget-1.11.4.orig/src/main.c wget-1.11.4/src/main.c
+--- wget-1.11.4.orig/src/main.c 2008-06-29 21:22:53.0 -0400
wget-1.11.4/src/main.c 2009-03-08 16:42:55.0 -0400
+@@ -548,7 +548,7 @@
+ --secure-protocol=PR choose secure protocol, one of auto, SSLv2,\n\
+ SSLv3, and TLSv1.\n"),
+ N_("\
+- --no-check-certificate don't validate the server's certificate.\n"),
++ --check-certificate validate the server's certificate.\n"),
+ N_("\
+ --certificate=FILE client certificate file.\n"),
+ N_("\
+diff -ruN wget-1.11.4.orig/src/openssl.c wget-1.11.4/src/openssl.c
+--- wget-1.11.4.orig/src/openssl.c 2008-04-27 00:48:23.0 -0400
wget-1.11.4/src/openssl.c 2009-03-08 16:43:39.0 -0400
+@@ -580,7 +580,7 @@
+ no_cert:
+ if (opt.check_cert && !success)
+ logprintf (LOG_NOTQUIET, _("\
+-To connect to %s insecurely, use `--no-check-certificate'.\n"),
++To connect to %s insecurely, don't use `--check-certificate'.\n"),
+ escnonprint (host));
+
+ /* Allow --no-check-cert to disable certificate checking. */
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
http://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] Asus WL-330gE Support
Hi,
Here is support for the compact Asus WL-330gE. It uses that all-in-one
5354 Broadcom chip that's also in the WL-520gU, so I assume USB
support can be soldered on. I've yet to open up the device, though.
Initial flashing is done through the CFE failsafe mode like on other
Asus devices, where you boot holding the reset button, the power LED
flashes, and you tftp an image.
I'm recommending for inclusion in 8.09.
Thanks,
Dave Cooper
Signed-off-by: David Cooper
---
Index: package/broadcom-diag/src/diag.c
===
--- package/broadcom-diag/src/diag.c(revision 14622)
+++ package/broadcom-diag/src/diag.c(working copy)
@@ -68,6 +68,7 @@
WLHDD,
WL300G,
WL320GE,
+ WL330GE,
WL500G,
WL500GD,
WL500GP,
@@ -307,6 +308,15 @@
{ .name = "link", .gpio = 1 << 11, .polarity =
REVERSE },
},
},
+ [WL330GE] = {
+ .name = "ASUS WL-330gE",
+ .buttons= {
+ { .name = "reset", .gpio = 1 << 2 },
+ },
+ .leds = {
+ { .name = "power", .gpio = 1 << 0, .polarity =
REVERSE },
+ },
+ },
[WL500G] = {
.name = "ASUS WL-500g",
.buttons= {
@@ -764,6 +774,8 @@
return &platforms[WL520GC];
if (startswith(buf,"WL520GU-")) /* WL520GU-* */
return &platforms[WL520GU];
+ if (startswith(buf,"WL330GE-")) /* WL330GE-* */
+ return &platforms[WL330GE];
}
/* Based on "ModelId" */
Index: target/linux/brcm-2.4/base-files/etc/init.d/netconfig
===
--- target/linux/brcm-2.4/base-files/etc/init.d/netconfig (revision 14622)
+++ target/linux/brcm-2.4/base-files/etc/init.d/netconfig (working copy)
@@ -57,6 +57,12 @@
c["wan_ifname"] = ""
c["lan_ifname"] = "eth1"
}
+ if (model == "ASUS WL-330gE") {
+ c["wan_ifname"] = ""
+ c["lan_ifname"] = "eth0"
+ c["vlan0ports"] = ""
+ c["vlan1ports"] = ""
+ }
if (model == "ASUS WL-500g") {
c["wan_ifname"] = "eth1"
c["lan_ifname"] = "eth0"
@@ -149,12 +155,14 @@
c["vlan1ports"] = ""
}
- print " VLAN configuration "
- print "config switch eth0"
- p("vlan0", "vlan0ports")
- p("vlan1", "vlan1ports")
- print ""
- print ""
+ if (c["vlan0ports"] || c["vlan1ports"]) {
+ print " VLAN configuration "
+ print "config switch eth0"
+ p("vlan0", "vlan0ports")
+ p("vlan1", "vlan1ports")
+ print ""
+ print ""
+ }
print " Loopback configuration"
print "config interface loopback"
print " option ifname \"lo\""
@@ -173,10 +181,16 @@
print " option netmask 255.255.255.0"
print ""
print ""
- print " WAN configuration"
- print "config interface wan"
- p("ifname", "wan_ifname")
- p("macaddr", "wan_macaddr")
- print " option protodhcp"
+ if (c["wan_ifname"]) {
+ print " WAN configuration"
+ print "config interface wan"
+ p("ifname", "wan_ifname")
+ p("macaddr", "wan_macaddr")
+ print " option protodhcp"
+ } else {
+ print " WAN configuration (disabled)"
+ print "#config interface wan"
+ print "#option protodhcp"
+ }
}' > /etc/config/network
}
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
http://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH] Aircrack-ng Bump / Fix
Gmail junked my patch with whitespace, attached is the proper one. Sorry, Dave Signed-off-by: David Cooper On Thu, Feb 12, 2009 at 1:42 AM, Dave Cooper wrote: > By request from Mister_X (Thomas d'Otreppe), I bring you a version > bump of aircrack-ng that also fixes bug > http://trac.aircrack-ng.org/ticket/507 -- the patch called > 001-no_abusive_malloc.patch in OpenWrt can therefore be removed. > > Thanks, > Dave Cooper > > Signed-off-by: David Cooper > > Index: packages/net/aircrack-ng/patches/001-no_abusive_malloc.patch > === > --- packages/net/aircrack-ng/patches/001-no_abusive_malloc.patch > (revision > 14481) > +++ packages/net/aircrack-ng/patches/001-no_abusive_malloc.patch > (working copy) > @@ -1,14 +0,0 @@ > -diff -urN aircrack-ng-r1142/src/aircrack-ng.c > aircrack-ng-r1142.new/src/aircrack-ng.c > aircrack-ng-r1142/src/aircrack-ng.c2008-08-17 > 03:04:57.0 +0200 > -+++ aircrack-ng-r1142.new/src/aircrack-ng.c2008-11-09 > 23:29:20.0 +0100 > -@@ -4450,8 +4450,8 @@ > - opt.bssidmerge = NULL; > - opt.oneshot = 0; > - > -- all_ivs = malloc( (256*256*256) * sizeof(used_iv)); > -- bzero(all_ivs, (256*256*256)*sizeof(used_iv)); > -+ //all_ivs = malloc( (256*256*256) * sizeof(used_iv)); > -+ //bzero(all_ivs, (256*256*256)*sizeof(used_iv)); > - > - forceptw = 0; > - > Index: packages/net/aircrack-ng/Makefile > === > --- packages/net/aircrack-ng/Makefile (revision 14481) > +++ packages/net/aircrack-ng/Makefile (working copy) > @@ -9,7 +9,7 @@ > include $(TOPDIR)/rules.mk > > PKG_NAME:=aircrack-ng > -PKG_REV:=1142 > +PKG_REV:=1396 > PKG_VERSION:=r$(PKG_REV) > PKG_RELEASE:=1 > Index: packages/net/aircrack-ng/patches/001-no_abusive_malloc.patch === --- packages/net/aircrack-ng/patches/001-no_abusive_malloc.patch (revision 14481) +++ packages/net/aircrack-ng/patches/001-no_abusive_malloc.patch (working copy) @@ -1,14 +0,0 @@ -diff -urN aircrack-ng-r1142/src/aircrack-ng.c aircrack-ng-r1142.new/src/aircrack-ng.c aircrack-ng-r1142/src/aircrack-ng.c 2008-08-17 03:04:57.0 +0200 -+++ aircrack-ng-r1142.new/src/aircrack-ng.c 2008-11-09 23:29:20.0 +0100 -@@ -4450,8 +4450,8 @@ - opt.bssidmerge = NULL; - opt.oneshot = 0; - -- all_ivs = malloc( (256*256*256) * sizeof(used_iv)); -- bzero(all_ivs, (256*256*256)*sizeof(used_iv)); -+ //all_ivs = malloc( (256*256*256) * sizeof(used_iv)); -+ //bzero(all_ivs, (256*256*256)*sizeof(used_iv)); - - forceptw = 0; - Index: packages/net/aircrack-ng/Makefile === --- packages/net/aircrack-ng/Makefile (revision 14481) +++ packages/net/aircrack-ng/Makefile (working copy) @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=aircrack-ng -PKG_REV:=1142 +PKG_REV:=1396 PKG_VERSION:=r$(PKG_REV) PKG_RELEASE:=1 ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org http://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] Aircrack-ng Bump / Fix
By request from Mister_X (Thomas d'Otreppe), I bring you a version bump of aircrack-ng that also fixes bug http://trac.aircrack-ng.org/ticket/507 -- the patch called 001-no_abusive_malloc.patch in OpenWrt can therefore be removed. Thanks, Dave Cooper Signed-off-by: David Cooper Index: packages/net/aircrack-ng/patches/001-no_abusive_malloc.patch === --- packages/net/aircrack-ng/patches/001-no_abusive_malloc.patch (revision 14481) +++ packages/net/aircrack-ng/patches/001-no_abusive_malloc.patch (working copy) @@ -1,14 +0,0 @@ -diff -urN aircrack-ng-r1142/src/aircrack-ng.c aircrack-ng-r1142.new/src/aircrack-ng.c aircrack-ng-r1142/src/aircrack-ng.c2008-08-17 03:04:57.0 +0200 -+++ aircrack-ng-r1142.new/src/aircrack-ng.c2008-11-09 23:29:20.0 +0100 -@@ -4450,8 +4450,8 @@ - opt.bssidmerge = NULL; - opt.oneshot = 0; - -- all_ivs = malloc( (256*256*256) * sizeof(used_iv)); -- bzero(all_ivs, (256*256*256)*sizeof(used_iv)); -+ //all_ivs = malloc( (256*256*256) * sizeof(used_iv)); -+ //bzero(all_ivs, (256*256*256)*sizeof(used_iv)); - - forceptw = 0; - Index: packages/net/aircrack-ng/Makefile === --- packages/net/aircrack-ng/Makefile (revision 14481) +++ packages/net/aircrack-ng/Makefile (working copy) @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=aircrack-ng -PKG_REV:=1142 +PKG_REV:=1396 PKG_VERSION:=r$(PKG_REV) PKG_RELEASE:=1 ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org http://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] R: [PATCH] move lighttpd dependencies to the right mod
+1 for getting this committed. Thanks, Dave Cooper On 9-Feb-09, at 8:35 AM, Roberto Riggio wrote: > Please disregard the previous patch this is the right one. > > Signed-off-by: Roberto Riggio > > -- > > Index: net/lighttpd/Makefile > === > --- net/lighttpd/Makefile(revision 14458) > +++ net/lighttpd/Makefile(working copy) > @@ -30,7 +30,7 @@ > define Package/lighttpd > $(call Package/lighttpd/Default) > MENU:=1 > - DEPENDS:=+libopenssl +libpcre +libpthread +libsqlite3 +libxml2 > + DEPENDS:=+libopenssl +libpcre +libpthread > TITLE:=A flexible and lightweight web server > endef > > @@ -126,7 +126,7 @@ > > define Package/lighttpd-mod-webdav > $(call Package/lighttpd/Default) > - DEPENDS:=lighttpd > + DEPENDS:=lighttpd +libsqlite3 +libxml2 > TITLE:=WebDAV module > endef > > ___ > openwrt-devel mailing list > openwrt-devel@lists.openwrt.org > http://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org http://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH] New Package -- msmtp
Here's the revised patch, as per request that: 1. Splits the package in to msmtp and msmtp-nossl. The -nossl variant builds without TLS support and doesn't require the somewhat large libopenssl dependency. This also saves a few KB in the build; and 2.) Corrects the patch's path to packages/mail/msmtp/Makefile. Thanks, Dave Signed-off-by: David Cooper --- Index: packages/mail/msmtp/Makefile === --- packages/mail/msmtp/Makefile(revision 0) +++ packages/mail/msmtp/Makefile(revision 0) @@ -0,0 +1,108 @@ +# +# Copyright (C) 2009 David Cooper +# Copyright (C) 2009 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:=msmtp +PKG_VERSION:=1.4.17 +PKG_RELEASE:=2 + +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_SOURCE_URL:=...@sf/msmtp + +PKG_MD5SUM:=b0b74f1144812b60688f590c62a0d3dd + +include $(INCLUDE_DIR)/package.mk + +define Package/msmtp/Default + SECTION:=mail + CATEGORY:=Mail + TITLE:=Simple sendmail SMTP forwarding + URL:=http://msmtp.sourceforge.net/ +endef + +define Package/msmtp/Default/description + msmtp is an SMTP client. In the default mode, it transmits a mail to + an SMTP server (for example at a free mail provider) which does the + delivery. To use this program with your mail user agent (MUA), create + a configuration file with your mail account(s) and tell your MUA to + call msmtp instead of /usr/sbin/sendmail. +endef + +define Package/msmtp +$(call Package/msmtp/Default) + DEPENDS+= +libopenssl + TITLE+= (with SSL support) +endef + +define Package/msmtp/description +$(call Package/msmtp/Default/description) + This package is built with SSL support. +endef + +define Package/msmtp-nossl +$(call Package/msmtp/Default) + TITLE+= (without SSL support) +endef + +define Package/msmtp-nossl/description +$(call Package/msmtp/Default/description) + This package is built without SSL support. +endef + +define Build/Template + +$(STAMP_BUILT)-$(2): $(STAMP_PREPARED) + -$(MAKE) -C $(PKG_BUILD_DIR) clean + $(call Build/Configure/Default,$(3)) + $(MAKE) -C $(PKG_BUILD_DIR) + ( cd $(PKG_BUILD_DIR)/src; mv -f msmtp msmtp-$(2) ) + touch $$@ + +$(STAMP_BUILT): $(STAMP_BUILT)-$(2) + +define Package/$(1)/install + $(INSTALL_DIR) $$(1)/etc + $(INSTALL_DATA) $(PKG_BUILD_DIR)/doc/msmtprc-system.example \ + $$(1)/etc/msmtprc + $(INSTALL_DIR) $$(1)/usr/bin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/msmtp-$(2) $$(1)/usr/bin/msmtp + $(INSTALL_DIR) $$(1)/usr/sbin + ln -sf /usr/bin/msmtp $$(1)/usr/sbin/sendmail +endef + +endef + +CONFIGURE_ARGS += \ + --without-libssl32 \ + --without-libintl \ + --without-libgsasl \ + --without-libidn + +ifneq ($(SDK)$(CONFIG_PACKAGE_msmtp),) + define Build/with-ssl + $(call Build/Template,msmtp,with-ssl, \ + --with-ssl=openssl \ + --with-libssl-prefix="$(STAGING_DIR)/usr/include" \ + ) + endef +endif +$(eval $(Build/with-ssl)) + +ifneq ($(SDK)$(CONFIG_PACKAGE_msmtp-nossl),) + define Build/without-ssl + $(call Build/Template,msmtp-nossl,without-ssl, \ + --with-ssl=no \ + ) + endef +endif +$(eval $(Build/without-ssl)) + +$(eval $(call BuildPackage,msmtp)) +$(eval $(call BuildPackage,msmtp-nossl)) + ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org http://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] New Package -- msmtp
Hi all, Here's a patch for msmtp, an advanced but still lightweight sendmail replacement that forwards email upstream to an SMTP server. This software is actively developed, unlike ssmtp which is out of date and only seems to be linked on the Debian repository. I was able to easily forward email upstream using GMail/Google Apps with this package, but ran in to bugs using ssmtp. Rather than try to fix that, I packaged msmtp. Thanks, Dave Signed-off-by: David Cooper --- Index: package/msmtp/Makefile === --- package/msmtp/Makefile (revision 0) +++ package/msmtp/Makefile (revision 0) @@ -0,0 +1,57 @@ +# +# Copyright (C) 2009 David Cooper +# Copyright (C) 2009 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:=msmtp +PKG_VERSION:=1.4.17 +PKG_RELEASE:=1 + +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_SOURCE_URL:=...@sf/msmtp + +PKG_MD5SUM:=b0b74f1144812b60688f590c62a0d3dd + +include $(INCLUDE_DIR)/package.mk + +define Package/msmtp + SECTION:=mail + CATEGORY:=Mail + DEPENDS:=+libopenssl + TITLE:=Simple sendmail SMTP forwarding + URL:=http://msmtp.sourceforge.net/ +endef + +define Package/msmtp/description + msmtp is an SMTP client. In the default mode, it transmits a mail to + an SMTP server (for example at a free mail provider) which does the + delivery. To use this program with your mail user agent (MUA), create + a configuration file with your mail account(s) and tell your MUA to + call msmtp instead of /usr/sbin/sendmail. +endef + +CONFIGURE_ARGS += \ + --with-ssl=openssl \ + --without-libssl32 \ + --with-libssl-prefix=$(STAGING_DIR)/usr/include \ + --without-libintl \ + --without-libgsasl \ + --without-libidn + +define Package/msmtp/install + $(INSTALL_DIR) $(1)/etc + $(INSTALL_DATA) $(PKG_BUILD_DIR)/doc/msmtprc-system.example \ + $(1)/etc/msmtprc + $(INSTALL_DIR) $(1)/usr/bin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/msmtp $(1)/usr/bin/ + $(INSTALL_DIR) $(1)/usr/sbin + ln -sf /usr/bin/msmtp $(1)/usr/sbin/sendmail +endef + +$(eval $(call BuildPackage,msmtp)) + ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org http://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] Sox fix for 8.09 and audio woes
Okay, so this fixes Sox in 8.09 which has been very broken. This
closes ticket #4275. I've included a patch which outputs to
/dev/sound/dsp on the 2.4 kernel series.
Note the versions of libflac and libid3tag in 8.09 *won't* compile
against this version of sox, so I've excluded them.
Libflac and libid3tag should be enabled in trunk I think, but there
are wider problems with some of the audio/musc related packages and
libraries being out of date and compiled without the right features
enabled, unused dependences, etc. I'm up to the task of fixing these
packages, but I'm new at working with audio-related software and
package maintenance so I may need some help or at least someone to bug
while I'm doing all of this.
Thanks,
Dave Cooper (kupesoft)
Signed-off-by: David Cooper <[EMAIL PROTECTED]>
Index: packages/sound/sox/patches/010-dev-sound-dsp.patch
===
--- packages/sound/sox/patches/010-dev-sound-dsp.patch (revision 0)
+++ packages/sound/sox/patches/010-dev-sound-dsp.patch (revision 0)
@@ -0,0 +1,26 @@
+diff -ruN sox-14.0.1.orig/src/sox.c sox-14.0.1/src/sox.c
+--- sox-14.0.1.orig/src/sox.c 2008-01-28 17:47:19.0 -0500
sox-14.0.1/src/sox.c 2008-12-01 05:49:29.0 -0500
+@@ -62,6 +62,7 @@
+ #define TIME_FRAC 1e3
+ #endif
+
++#include
+
+ /* argv[0] options */
+
+@@ -377,7 +378,13 @@
+ if (sox_find_format("ossdsp", sox_false))
+ {
+ f->filetype = "ossdsp";
++
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
++f->filename = xstrdup("/dev/sound/dsp");
++#else
+ f->filename = xstrdup("/dev/dsp");
++#endif
++
+ return;
+ }
+ #endif
+
Index: packages/sound/sox/Makefile
===
--- packages/sound/sox/Makefile (revision 13456)
+++ packages/sound/sox/Makefile (working copy)
@@ -1,4 +1,5 @@
#
+# Copyright (C) 2008 David Cooper <[EMAIL PROTECTED]>
# Copyright (C) 2006 OpenWrt.org
#
# This is free software, licensed under the GNU General Public License v2.
@@ -10,7 +11,7 @@
PKG_NAME:=sox
PKG_VERSION:=14.0.1
-PKG_RELEASE:=1
+PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:[EMAIL PROTECTED]/sox
@@ -21,10 +22,12 @@
include $(INCLUDE_DIR)/package.mk
+# NOTE: libflac is out of date for 8.09's freeze and can't be compiled in
+
define Package/sox
SECTION:=sound
CATEGORY:=Sound
- DEPENDS:=+libflac +libid3tag +libmad +libvorbisidec +libgsm
+ DEPENDS:=+libmad +libvorbis +libvorbisidec +libgsm
TITLE:=Sox is a general purpose sound converter/player/recorder
URL:=http://sox.sourceforge.net/
endef
@@ -40,6 +43,8 @@
define Build/Configure
$(call Build/Configure/Default, \
--disable-external-gsm \
+ --without-libltdl \
+ --with-ogg \
, \
LIBS="-lnotimpl -lm" \
)
@@ -49,12 +54,15 @@
$(MAKE) -C $(PKG_BUILD_DIR) \
DESTDIR="$(PKG_INSTALL_DIR)" \
STAGING_DIR="$(STAGING_DIR)" \
- all
+ all install
endef
define Package/sox/install
$(INSTALL_DIR) $(1)/usr/bin
- $(CP) $(PKG_BUILD_DIR)/src/{play,sox} $(1)/usr/bin/
+ $(INSTALL_DIR) $(1)/usr/lib
+ $(CP) $(PKG_INSTALL_DIR)/usr/bin/{play,rec,sox} $(1)/usr/bin/
+ $(CP) $(PKG_INSTALL_DIR)/usr/lib/{libsfx.so*,libsox.so*} $(1)/usr/lib/
endef
$(eval $(call BuildPackage,sox))
+
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
http://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] Adding xterm title to /etc/profile
This one-liner adds support for various terminal emulators to take on an xterm-style title of the form '[EMAIL PROTECTED]: path'. My first patch. Looking forward to hacking with all of you. :) Signed-off-by: Dave Cooper <[EMAIL PROTECTED]> Index: package/base-files/files/etc/profile === --- package/base-files/files/etc/profile(revision 13381) +++ package/base-files/files/etc/profile(working copy) @@ -4,6 +4,7 @@ export PATH=/bin:/sbin:/usr/bin:/usr/sbin export HOME=/root export PS1='[EMAIL PROTECTED]:\w\$ ' +[ "$TERM" = xterm ] && export PS1="\[\e]0;[EMAIL PROTECTED]: \w\a\]$PS1" [ -x /bin/more ] || alias more=less [ -x /usr/bin/vim ] && alias vi=vim || alias vim=vi ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org http://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
