Re: [OpenWrt-Devel] [PATCH] [packages] libupnp: Fix samples install and simplify Makefile
Hi Nico,
Thanks for point out. Let me try this again..
- John
On Tue, Nov 22, 2011 at 6:22 AM, Nico wrote:
> Hi John,
>
> On Mon, Nov 21, 2011 at 11:12 AM, John Lee wrote:
>> The original Makefile installed libtool wrapper scripts instead of the
>> real binaries. Increase PKG_RELEASE to trigger rebuild.
>>
>> Signed-off-by: John Lee
>> ---
>> libs/libupnp/Makefile | 34 +++---
>> 1 files changed, 3 insertions(+), 31 deletions(-)
>>
>> diff --git a/libs/libupnp/Makefile b/libs/libupnp/Makefile
>> index 83bdb5e..904540d 100644
>> --- a/libs/libupnp/Makefile
>> +++ b/libs/libupnp/Makefile
>> @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
>>
>> PKG_NAME:=libupnp
>> PKG_VERSION:=1.6.12
>> -PKG_RELEASE:=1
>> +PKG_RELEASE:=2
>>
>> PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
>> PKG_SOURCE_URL:=@SF/pupnp
>> @@ -50,33 +50,6 @@ define Package/libupnp-sample/description
>> TVcontrolpoint & tvdevice sample applications run inside /etc/upnp-tvdevice/
>> endef
>>
>> -define Build/Configure
>> - $(call Build/Configure/Default, \
>> - --enable-shared \
>> - --enable-static \
>> - );
>> -endef
>> -
>> -TARGET_CFLAGS += $(FPIC)
>> -
>> -define Build/Compile/libupnp-sample
>> - $(MAKE) -C $(PKG_BUILD_DIR) \
>> - 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*,la} $(1)/usr/lib/
>> - $(INSTALL_DIR) $(1)/usr/lib/pkgconfig
>> - $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libupnp.pc
>> $(1)/usr/lib/pkgconfig/
>> -endef
>> -
>> define Package/libupnp/install
>> $(INSTALL_DIR) $(1)/usr/lib
>> $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{ixml,threadutil,upnp}.so.*
>> $(1)/usr/lib/
>> @@ -84,10 +57,9 @@ endef
>>
>> define Package/libupnp-sample/install
>> $(INSTALL_DIR) $(1)/usr/bin
>> - $(INSTALL_BIN) $(PKG_BUILD_DIR)/upnp/sample/tv_device $(1)/usr/bin
>> - $(INSTALL_BIN) $(PKG_BUILD_DIR)/upnp/sample/tv_ctrlpt $(1)/usr/bin
>> + $(INSTALL_BIN) $(PKG_BUILD_DIR)/upnp/sample/.libs/* $(1)/usr/bin
>> $(INSTALL_DIR) $(1)/etc/upnp-tvdevice/web
>> - $(CP) $(PKG_BUILD_DIR)/upnp/sample/web/* $(1)/etc/upnp-tvdevice
>> + $(INSTALL_DATA) $(PKG_BUILD_DIR)/upnp/sample/web/*
>> $(1)/etc/upnp-tvdevice
>> endef
>>
>> $(eval $(call BuildPackage,libupnp))
>> --
>> 1.7.4.1
>
> Humm, that might be too much cleaning actually. Why are you removing
> Build/InstallDev ? AFAIK, libupnp is still used by others packages...
>
> --
> -{Nico}
> ___
> 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 v2] [packages] libupnp: Fix samples install and simplify Makefile
The original Makefile installed libtool wrapper scripts instead of the real binaries. Increase PKG_RELEASE to trigger rebuild. Signed-off-by: John Lee diff --git a/libs/libupnp/Makefile b/libs/libupnp/Makefile index 83bdb5e..5b1bb62 100644 --- a/libs/libupnp/Makefile +++ b/libs/libupnp/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libupnp PKG_VERSION:=1.6.12 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=@SF/pupnp @@ -50,24 +50,6 @@ define Package/libupnp-sample/description TVcontrolpoint & tvdevice sample applications run inside /etc/upnp-tvdevice/ endef -define Build/Configure - $(call Build/Configure/Default, \ - --enable-shared \ - --enable-static \ - ); -endef - -TARGET_CFLAGS += $(FPIC) - -define Build/Compile/libupnp-sample - $(MAKE) -C $(PKG_BUILD_DIR) \ - 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/ @@ -84,10 +66,9 @@ endef define Package/libupnp-sample/install $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_BIN) $(PKG_BUILD_DIR)/upnp/sample/tv_device $(1)/usr/bin - $(INSTALL_BIN) $(PKG_BUILD_DIR)/upnp/sample/tv_ctrlpt $(1)/usr/bin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/upnp/sample/.libs/* $(1)/usr/bin $(INSTALL_DIR) $(1)/etc/upnp-tvdevice/web - $(CP) $(PKG_BUILD_DIR)/upnp/sample/web/* $(1)/etc/upnp-tvdevice + $(INSTALL_DATA) $(PKG_BUILD_DIR)/upnp/sample/web/* $(1)/etc/upnp-tvdevice endef $(eval $(call BuildPackage,libupnp)) -- 1.7.4.1 ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH] Proper Ubiquiti AirRouter Hardware, Support
Confirming that the patch seems to work - ports correct, all lights work correctly. -- Bill Moffitt Ayrstone Productivity http://www.ayrstone.com ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH] [packages] libupnp: Fix samples install and simplify Makefile
Hi John,
On Mon, Nov 21, 2011 at 11:12 AM, John Lee wrote:
> The original Makefile installed libtool wrapper scripts instead of the
> real binaries. Increase PKG_RELEASE to trigger rebuild.
>
> Signed-off-by: John Lee
> ---
> libs/libupnp/Makefile | 34 +++---
> 1 files changed, 3 insertions(+), 31 deletions(-)
>
> diff --git a/libs/libupnp/Makefile b/libs/libupnp/Makefile
> index 83bdb5e..904540d 100644
> --- a/libs/libupnp/Makefile
> +++ b/libs/libupnp/Makefile
> @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
>
> PKG_NAME:=libupnp
> PKG_VERSION:=1.6.12
> -PKG_RELEASE:=1
> +PKG_RELEASE:=2
>
> PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
> PKG_SOURCE_URL:=@SF/pupnp
> @@ -50,33 +50,6 @@ define Package/libupnp-sample/description
> TVcontrolpoint & tvdevice sample applications run inside /etc/upnp-tvdevice/
> endef
>
> -define Build/Configure
> - $(call Build/Configure/Default, \
> - --enable-shared \
> - --enable-static \
> - );
> -endef
> -
> -TARGET_CFLAGS += $(FPIC)
> -
> -define Build/Compile/libupnp-sample
> - $(MAKE) -C $(PKG_BUILD_DIR) \
> - 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*,la}
> $(1)/usr/lib/
> - $(INSTALL_DIR) $(1)/usr/lib/pkgconfig
> - $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libupnp.pc
> $(1)/usr/lib/pkgconfig/
> -endef
> -
> define Package/libupnp/install
> $(INSTALL_DIR) $(1)/usr/lib
> $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{ixml,threadutil,upnp}.so.*
> $(1)/usr/lib/
> @@ -84,10 +57,9 @@ endef
>
> define Package/libupnp-sample/install
> $(INSTALL_DIR) $(1)/usr/bin
> - $(INSTALL_BIN) $(PKG_BUILD_DIR)/upnp/sample/tv_device $(1)/usr/bin
> - $(INSTALL_BIN) $(PKG_BUILD_DIR)/upnp/sample/tv_ctrlpt $(1)/usr/bin
> + $(INSTALL_BIN) $(PKG_BUILD_DIR)/upnp/sample/.libs/* $(1)/usr/bin
> $(INSTALL_DIR) $(1)/etc/upnp-tvdevice/web
> - $(CP) $(PKG_BUILD_DIR)/upnp/sample/web/* $(1)/etc/upnp-tvdevice
> + $(INSTALL_DATA) $(PKG_BUILD_DIR)/upnp/sample/web/*
> $(1)/etc/upnp-tvdevice
> endef
>
> $(eval $(call BuildPackage,libupnp))
> --
> 1.7.4.1
Humm, that might be too much cleaning actually. Why are you removing
Build/InstallDev ? AFAIK, libupnp is still used by others packages...
--
-{Nico}
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] Nanostation external antenna on ath5k
Hi, Can anyone advise how to switch to the external antenna on a Nanostation 2 when using the ath5k selected as standard wireless driver in trunk? The old option antenna external in the wireless config file which was available in Madwifi is no longer supported in ath5k. The sysctl and gpios to command as given in the wiki do not work anymore either. Any advice welcome. ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] [packages] autossh: Support dropbear client specific flags
Signed-off-by: John Lee --- net/autossh/patches/001-dropbear-support.patch | 13 + 1 files changed, 13 insertions(+), 0 deletions(-) create mode 100644 net/autossh/patches/001-dropbear-support.patch diff --git a/net/autossh/patches/001-dropbear-support.patch b/net/autossh/patches/001-dropbear-support.patch new file mode 100644 index 000..d3d0abd --- /dev/null +++ b/net/autossh/patches/001-dropbear-support.patch @@ -0,0 +1,13 @@ +Index: autossh-1.4b/autossh.c +=== +--- autossh-1.4b.orig/autossh.c2011-11-21 23:03:15.894637912 +0800 autossh-1.4b/autossh.c 2011-11-21 23:05:35.484637996 +0800 +@@ -104,7 +104,7 @@ + + #define NO_RD_SOCK-2 /* magic flag for echo: no read socket */ + +-#define OPTION_STRING "M:V1246ab:c:e:fgi:kl:m:no:p:qstvw:xACD:F:I:L:NO:PR:S:TXY" ++#define OPTION_STRING "M:V1246ab:c:e:fgi:kl:m:no:p:qstvw:xyAB:CD:F:I:J:K:L:NO:PR:S:TW:XY" + + int logtype = L_SYSLOG;/* default log to syslog */ + int loglevel = LOG_INFO;/* default loglevel */ -- 1.7.4.1 ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] Fix avahi build problems
This patch updates the avahi Makefile to correct a number of errors. In particular it handles the choice of D-BUS- or non-D-BUS-enabled packages more consistently. Packages that don't require D-BUS support are compiled with D-BUS support disabled by default, keeping the build as small as possible. Support for D-BUS can be selected if desired. Selecting packages that require D-BUS support -- avahi-utils or libavahi-client -- will automatically cause all packages to be built with D-BUS support and will add the D-BUS package to the build. Note that after this update, the D-BUS package will be needed as part of the compilation environment, so it will be downloaded and compiled, but it will not be added to the build unless the user has enabled D-BUS support or has selected avahi-utils or the avahi-client library, both of which need it. Tested on trunk r29283. Signed-off-by Mike Brady Index: Makefile === --- Makefile (revision 29283) +++ Makefile (working copy) @@ -7,40 +7,50 @@ include $(TOPDIR)/rules.mk +ifeq ($(BUILD_VARIANT),dbus) +PKG_BUILD_DIR=$(BUILD_DIR)/$(PKG_NAME)-dbus/$(PKG_NAME)-$(PKG_VERSION) +else +PKG_BUILD_DIR=$(BUILD_DIR)/$(PKG_NAME)-nodbus/$(PKG_NAME)-$(PKG_VERSION) +endif + + PKG_NAME:=avahi PKG_VERSION:=0.6.30 -PKG_RELEASE:=2 +PKG_RELEASE:=3 + PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://avahi.org/download/ PKG_MD5SUM:=e4db89a2a403ff4c47d66ac66fad1f43 -PKG_BUILD_DIR=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION) +PKG_BUILD_DEPENDS:=libexpat libdaemon libgdbm intltool/host libpthread dbus -PKG_BUILD_DEPENDS:=libexpat libdaemon libgdbm intltool/host libpthread - PKG_FIXUP:=autoreconf PKG_REMOVE_FILES:=autogen.sh PKG_INSTALL:=1 PKG_BUILD_PARALLEL:=1 + + include $(INCLUDE_DIR)/package.mk define Package/avahi/Default SECTION:=net CATEGORY:=Network - TITLE:=mDNS/DNS-SD + TITLE:=An mDNS/DNS-SD implementation URL:=http://www.avahi.org/ endef define Package/avahi/Default/description - An mDNS/DNS-SD (aka RendezVous/Bonjour/ZeroConf) implementation (library). - Avahi is a system which facilitates service discovery on a local network -- - this means that you can plug your laptop or computer into a network and - instantly be able to view other people who you can chat with, find printers - to print to or find files being shared. This kind of technology is already - found in MacOS X (branded 'Rendezvous', 'Bonjour' and sometimes 'ZeroConf') + Avahi is an mDNS/DNS-SD (aka RendezVous/Bonjour/ZeroConf) + implementation (library). It facilitates + service discovery on a local network -- this means that + you can plug your laptop or computer into a network and + instantly be able to view other people who you can chat with, + find printers to print to or find files being shared. + This kind of technology is already found in MacOS X + (branded 'Rendezvous', 'Bonjour' and sometimes 'ZeroConf') and is very convenient. endef @@ -50,51 +60,27 @@ CATEGORY:=Libraries DEPENDS:=+libdaemon +libpthread +libgdbm TITLE+= (library) - VARIANT:=nodbus endef -define Package/libavahi-dbus - $(call Package/avahi/Default) - SECTION:=libs - CATEGORY:=Libraries - DEPENDS:=+libdaemon +libpthread +libgdbm +dbus - TITLE+= (library) (dbus) - VARIANT:=dbus -endef - define Package/libavahi/description $(call Package/avahi/Default/description) . - This package contains the mDNS/DNS-SD shared libraries, used by other programs. - Specifically, it provides libavahi-core and libavahi-common libraries. - This version is compiled without D-Bus support, i.e. the --disable-dbus - compilation flag is set. + The libavahi package contains the mDNS/DNS-SD shared libraries, + used by other programs. Specifically, it provides + libavahi-core and libavahi-common libraries. + By default, it is compiled without D-Bus support, + i.e. the --disable-dbus compilation flag is set. + To enable D-Bus support, select the package + libavahi-dbus-support. endef -define Package/libavahi-dbus/description -$(call Package/avahi/Default/description) - . - This package contains the mDNS/DNS-SD shared libraries, used by other programs. - Specifically, it provides libavahi-core and libavahi-common libraries. - This version is compiled with D-Bus support -endef - define Package/avahi-autoipd $(call Package/avahi/Default) SUBMENU:=IP Addresses and Names DEPENDS:=+libdaemon - TITLE:=IPv4LL address conf daemon - VARIANT:=nodbus + TITLE:=IPv4LL network address configuration daemon endef -define Package/avahi-autoipd-dbus - $(call Package/avahi/Default) - SUBMENU:=IP Addresses and Names - DEPENDS:=+libdaemon - TITLE:=IPv4LL address conf daemon (dbus) - VARIANT:=dbus -endef - define Package/avahi-autoipd/description $(call Package/avahi/Default/description) . @@ -103,114 +89,80 @@ from the link-local 169.254.0.0/16 range without the need for a cent
[OpenWrt-Devel] [PATCH] Proper Ubiquiti AirRouter Hardware Support
Sorry for the HTML mail, trying to send as plain text
Added Proper Hardware Support for Ubiquity AirRouter.
No more MAC address duplication.
Fixed issues from: http://patchwork.midlink.org/patch/1284/
-WAN and LAN Port inverted *fixed*
-LEDs not correct *fixed, 1 user LED 'globe' working, no more inverted
operation*
Signed-off-by: Gergely Barta
---
Index: target/linux/ar71xx/files/arch/mips/ar71xx/machtype.h
===
--- target/linux/ar71xx/files/arch/mips/ar71xx/machtype.h (revision 29273)
+++ target/linux/ar71xx/files/arch/mips/ar71xx/machtype.h (working copy)
@@ -58,6 +58,7 @@
AR71XX_MACH_TL_WR841N_V1, /* TP-LINK TL-WR841N v1 */
AR71XX_MACH_TL_WR941ND, /* TP-LINK TL-WR941ND */
AR71XX_MACH_UBNT_BULLET_M, /* Ubiquiti Bullet M */
+ AR71XX_MACH_UBNT_AIRROUTER, /* Ubiquiti AirRouter */
AR71XX_MACH_UBNT_LSSR71, /* Ubiquiti LS-SR71 */
AR71XX_MACH_UBNT_LSX, /* Ubiquiti LSX */
AR71XX_MACH_UBNT_NANO_M, /* Ubiquiti NanoStation M */
Index: target/linux/ar71xx/files/arch/mips/ar71xx/mach-ubnt.c
===
--- target/linux/ar71xx/files/arch/mips/ar71xx/mach-ubnt.c (revision 29273)
+++ target/linux/ar71xx/files/arch/mips/ar71xx/mach-ubnt.c (working copy)
@@ -283,6 +283,39 @@
MIPS_MACHINE(AR71XX_MACH_UBNT_NANO_M, "UBNT-NM", "Ubiquiti Nanostation M",
ubnt_nano_m_setup);
+/* Ubiquity AirRouter */
+static struct gpio_led ubnt_airrouter_leds_gpio[] __initdata = {
+{
+.name= "ubnt:globe",
+.gpio= 0,
+.active_low= 1,
+}
+};
+
+static void __init ubnt_airrouter_setup(void)
+{
+u8 *mac1 = (u8 *) KSEG1ADDR(0x1fff);
+u8 *ee = (u8 *) KSEG1ADDR(0x1fff1000);
+
+ar71xx_add_device_m25p80(NULL);
+ar71xx_add_device_mdio(0, ~UBNT_M_WAN_PHYMASK);
+
+ar71xx_init_mac(ar71xx_eth0_data.mac_addr, mac1, 0);
+ubnt_init_secondary_mac(mac1);
+
+ar71xx_add_device_eth(0);
+ar71xx_add_device_eth(1);
+ar71xx_add_device_usb();
+
+ap91_pci_init(ee, NULL);
+ar71xx_add_device_leds_gpio(-1, ARRAY_SIZE(ubnt_airrouter_leds_gpio),
+ubnt_airrouter_leds_gpio);
+
+}
+
+MIPS_MACHINE(AR71XX_MACH_UBNT_AIRROUTER, "UBNT-AR", "Ubiquiti AirRouter",
+ ubnt_airrouter_setup);
+
static struct gpio_led ubnt_unifi_leds_gpio[] __initdata = {
{
.name = "ubnt:orange:dome",
Index: target/linux/ar71xx/image/Makefile
===
--- target/linux/ar71xx/image/Makefile (revision 29273)
+++ target/linux/ar71xx/image/Makefile (working copy)
@@ -563,6 +563,11 @@
$(call
Image/Build/Template/$(fs_64k)/$(1),UBNTXM,ubnt-nano-m,$(ubntnanom_cmdline),XM,UBNTXM,ar7240)
endef
+ubntairrouter_cmdline=board=UBNT-AR console=ttyS0,115200
+define Image/Build/Profile/UBNTAIRROUTER
+$(call
Image/Build/Template/$(fs_64k)/$(1),UBNTXM,ubnt-airrouter,$(ubntairrouter_cmdline),XM,UBNTXM,ar7240)
+endef
+
ubntunifi_cmdline=board=UBNT-XM console=ttyS0,115200
define Image/Build/Profile/UBNTUNIFI
$(call
Image/Build/Template/$(fs_64k)/$(1),UBNTXM,ubnt-unifi,$(ubntunifi_cmdline),XM,UBNTXM,ar7240)
@@ -575,6 +580,7 @@
$(call Image/Build/Profile/UBNTBULLETM,$(1))
$(call Image/Build/Profile/UBNTROCKETM,$(1))
$(call Image/Build/Profile/UBNTNANOM,$(1))
+ $(call Image/Build/Profile/UBNTAIRROUTER,$(1))
$(call Image/Build/Profile/UBNTUNIFI,$(1))
endef
Index: target/linux/ar71xx/base-files/lib/ar71xx.sh
===
--- target/linux/ar71xx/base-files/lib/ar71xx.sh(revision 29273)
+++ target/linux/ar71xx/base-files/lib/ar71xx.sh(working copy)
@@ -115,6 +115,9 @@
*"RouterStation Pro")
name="routerstation-pro"
;;
+ *"AirRouter")
+ name="airrouter"
+ ;;
*TEW-632BRP)
name="tew-632brp"
;;
Index: target/linux/ar71xx/base-files/etc/defconfig/airrouter/network
===
--- target/linux/ar71xx/base-files/etc/defconfig/airrouter/network
(revision 0)
+++ target/linux/ar71xx/base-files/etc/defconfig/airrouter/network
(revision 0)
@@ -0,0 +1,18 @@
+
+config 'interface' 'loopback'
+ option 'ifname' 'lo'
+ option 'proto' 'static'
+ option 'ipaddr' '127.0.0.1'
+ option 'netmask' '255.0.0.0'
+
+config 'interface' 'lan'
+ option 'type' 'bridge'
+ option 'proto' 'static'
+ option 'ipaddr' '192.168.1.1'
+ option 'netmask' '255.255.255.0'
+ option 'ifname' 'eth1'
+
+config 'interface' 'wan'
+ option 'proto' 'dhcp'
+ option 'ifname' 'eth0'
+
___
openwrt-devel mailing list
[OpenWrt-Devel] [PATCH] Proper Ubiquiti AirRouter Hardware Support
Added Proper Hardware Support for Ubiquity AirRouter.
No more MAC address duplication.
Fixed issues from: http://patchwork.midlink.org/patch/1284/
-WAN and LAN Port inverted *fixed*
-LEDs not correct *fixed, 1 user LED 'globe' working, no more inverted
operation*
Signed-off-by: Gergely Barta
---
Index: target/linux/ar71xx/files/arch/mips/ar71xx/machtype.h
===
--- target/linux/ar71xx/files/arch/mips/ar71xx/machtype.h (revision
29273)
+++ target/linux/ar71xx/files/arch/mips/ar71xx/machtype.h (working
copy)
@@ -58,6 +58,7 @@
AR71XX_MACH_TL_WR841N_V1, /* TP-LINK TL-WR841N v1 */
AR71XX_MACH_TL_WR941ND, /* TP-LINK TL-WR941ND */
AR71XX_MACH_UBNT_BULLET_M, /* Ubiquiti Bullet M */
+ AR71XX_MACH_UBNT_AIRROUTER, /* Ubiquiti AirRouter */
AR71XX_MACH_UBNT_LSSR71, /* Ubiquiti LS-SR71 */
AR71XX_MACH_UBNT_LSX, /* Ubiquiti LSX */
AR71XX_MACH_UBNT_NANO_M, /* Ubiquiti NanoStation M */
Index: target/linux/ar71xx/files/arch/mips/ar71xx/mach-ubnt.c
===
--- target/linux/ar71xx/files/arch/mips/ar71xx/mach-ubnt.c (revision
29273)
+++ target/linux/ar71xx/files/arch/mips/ar71xx/mach-ubnt.c (working
copy)
@@ -283,6 +283,39 @@
MIPS_MACHINE(AR71XX_MACH_UBNT_NANO_M, "UBNT-NM", "Ubiquiti Nanostation M",
ubnt_nano_m_setup);
+/* Ubiquity AirRouter */
+static struct gpio_led ubnt_airrouter_leds_gpio[] __initdata = { {
+.name= "ubnt:globe",
+.gpio= 0,
+.active_low= 1,
+}
+};
+
+static void __init ubnt_airrouter_setup(void) {
+u8 *mac1 = (u8 *) KSEG1ADDR(0x1fff);
+u8 *ee = (u8 *) KSEG1ADDR(0x1fff1000);
+
+ar71xx_add_device_m25p80(NULL);
+ar71xx_add_device_mdio(0, ~UBNT_M_WAN_PHYMASK);
+
+ar71xx_init_mac(ar71xx_eth0_data.mac_addr, mac1, 0);
+ubnt_init_secondary_mac(mac1);
+
+ar71xx_add_device_eth(0);
+ar71xx_add_device_eth(1);
+ar71xx_add_device_usb();
+
+ap91_pci_init(ee, NULL);
+ar71xx_add_device_leds_gpio(-1, ARRAY_SIZE(ubnt_airrouter_leds_gpio),
+ubnt_airrouter_leds_gpio);
+
+}
+
+MIPS_MACHINE(AR71XX_MACH_UBNT_AIRROUTER, "UBNT-AR", "Ubiquiti AirRouter",
+ ubnt_airrouter_setup);
+
static struct gpio_led ubnt_unifi_leds_gpio[] __initdata = {
{
.name = "ubnt:orange:dome",
Index: target/linux/ar71xx/image/Makefile
===
--- target/linux/ar71xx/image/Makefile (revision 29273)
+++ target/linux/ar71xx/image/Makefile (working copy)
@@ -563,6 +563,11 @@
$(call
Image/Build/Template/$(fs_64k)/$(1),UBNTXM,ubnt-nano-m,$(ubntnanom_cmdline),
XM,UBNTXM,ar7240)
endef
+ubntairrouter_cmdline=board=UBNT-AR console=ttyS0,115200 define
+Image/Build/Profile/UBNTAIRROUTER
+$(call
Image/Build/Template/$(fs_64k)/$(1),UBNTXM,ubnt-airrouter,$(ubntairrouter_cm
dline),XM,UBNTXM,ar7240)
+endef
+
ubntunifi_cmdline=board=UBNT-XM console=ttyS0,115200 define
Image/Build/Profile/UBNTUNIFI
$(call
Image/Build/Template/$(fs_64k)/$(1),UBNTXM,ubnt-unifi,$(ubntunifi_cmdline),X
M,UBNTXM,ar7240)
@@ -575,6 +580,7 @@
$(call Image/Build/Profile/UBNTBULLETM,$(1))
$(call Image/Build/Profile/UBNTROCKETM,$(1))
$(call Image/Build/Profile/UBNTNANOM,$(1))
+ $(call Image/Build/Profile/UBNTAIRROUTER,$(1))
$(call Image/Build/Profile/UBNTUNIFI,$(1))
endef
Index: target/linux/ar71xx/base-files/lib/ar71xx.sh
===
--- target/linux/ar71xx/base-files/lib/ar71xx.sh (revision 29273)
+++ target/linux/ar71xx/base-files/lib/ar71xx.sh (working copy)
@@ -115,6 +115,9 @@
*"RouterStation Pro")
name="routerstation-pro"
;;
+ *"AirRouter")
+ name="airrouter"
+ ;;
*TEW-632BRP)
name="tew-632brp"
;;
Index: target/linux/ar71xx/base-files/etc/defconfig/airrouter/network
===
--- target/linux/ar71xx/base-files/etc/defconfig/airrouter/network
(revision 0)
+++ target/linux/ar71xx/base-files/etc/defconfig/airrouter/network
(revision 0)
@@ -0,0 +1,18 @@
+
+config 'interface' 'loopback'
+ option 'ifname' 'lo'
+ option 'proto' 'static'
+ option 'ipaddr' '127.0.0.1'
+ option 'netmask' '255.0.0.0'
+
+config 'interface' 'lan'
+ option 'type' 'bridge'
+ option 'proto' 'static'
+ option 'ipaddr' '192.168.1.1'
+ option 'netmask' '255.255.255.0'
+ option 'ifname' 'eth1'
+
+config 'interface' 'wan'
+ option 'proto' 'dhcp'
+ option 'ifname' 'eth0'
+
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] [packages] libupnp: Fix samples install and simplify Makefile
The original Makefile installed libtool wrapper scripts instead of the
real binaries. Increase PKG_RELEASE to trigger rebuild.
Signed-off-by: John Lee
---
libs/libupnp/Makefile | 34 +++---
1 files changed, 3 insertions(+), 31 deletions(-)
diff --git a/libs/libupnp/Makefile b/libs/libupnp/Makefile
index 83bdb5e..904540d 100644
--- a/libs/libupnp/Makefile
+++ b/libs/libupnp/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=libupnp
PKG_VERSION:=1.6.12
-PKG_RELEASE:=1
+PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=@SF/pupnp
@@ -50,33 +50,6 @@ define Package/libupnp-sample/description
TVcontrolpoint & tvdevice sample applications run inside /etc/upnp-tvdevice/
endef
-define Build/Configure
- $(call Build/Configure/Default, \
- --enable-shared \
- --enable-static \
- );
-endef
-
-TARGET_CFLAGS += $(FPIC)
-
-define Build/Compile/libupnp-sample
- $(MAKE) -C $(PKG_BUILD_DIR) \
- 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*,la}
$(1)/usr/lib/
- $(INSTALL_DIR) $(1)/usr/lib/pkgconfig
- $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libupnp.pc
$(1)/usr/lib/pkgconfig/
-endef
-
define Package/libupnp/install
$(INSTALL_DIR) $(1)/usr/lib
$(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{ixml,threadutil,upnp}.so.*
$(1)/usr/lib/
@@ -84,10 +57,9 @@ endef
define Package/libupnp-sample/install
$(INSTALL_DIR) $(1)/usr/bin
- $(INSTALL_BIN) $(PKG_BUILD_DIR)/upnp/sample/tv_device $(1)/usr/bin
- $(INSTALL_BIN) $(PKG_BUILD_DIR)/upnp/sample/tv_ctrlpt $(1)/usr/bin
+ $(INSTALL_BIN) $(PKG_BUILD_DIR)/upnp/sample/.libs/* $(1)/usr/bin
$(INSTALL_DIR) $(1)/etc/upnp-tvdevice/web
- $(CP) $(PKG_BUILD_DIR)/upnp/sample/web/* $(1)/etc/upnp-tvdevice
+ $(INSTALL_DATA) $(PKG_BUILD_DIR)/upnp/sample/web/*
$(1)/etc/upnp-tvdevice
endef
$(eval $(call BuildPackage,libupnp))
--
1.7.4.1
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] yaddns: update to 1.1
Hi, The patch attached to the mail updates yaddns to 1.1 stable version. Changes compared to 1.0 are: * autotools refactoring * fix blocked state in request if connect() or recv() failed. Add timeout feature which abort pending request (connect(), send(), recv()) after XX seconds. * add new ./configure options: * --enable-debug * --enable-log-debug * --enable-log-color * fix segfault case if user remove account cfg and SIGHUP yaddns when doing update procedure for the removed account. * fix buffer overread in base64_encode function * implement unit tests * add -L, --use-syslog option Regards, Anthony. Index: Makefile === --- Makefile (révision 29241) +++ Makefile (copie de travail) @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=yaddns -PKG_VERSION:=1.1-rc2 +PKG_VERSION:=1.1 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://download.gna.org/yaddns/ -PKG_MD5SUM:=919a25bd66abf926e049f3afea619e19 +PKG_MD5SUM:=d8b6ed9bed61dabaa17188d831e352d1 PKG_INSTALL:=1 ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
