changeset 489:3d07351828ea

Merge with Michel Vale ports fixes
author Aleksandr Rybalko <ray@ddteam.net>
date Fri, 02 Nov 2012 15:46:06 +0200
parents 263e93d36656 (diff) 404f54d7ada7 (current diff)
children d76e5bad5ed1
files
diffstat 15 files changed, 329 insertions(+), 91 deletions(-) [+]
line wrap: on
line diff
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/boards/Buffalo/WZR-HP-AG300H/README	Fri Nov 02 15:46:06 2012 +0200
@@ -0,0 +1,8 @@
+
+
+mtdparts=ar7100-nor0:
+256k(uboot),	0xbf000000 - 0xbf040000
+64k(Config),	0xbf040000 - 0xbf050000
+1024k(vmlinux),	0xbf050000 - 0xbf150000
+5184k(rootfs),	0xbf150000 - 0xbf660000
+64k(caldata)	0xbf7f0000 - 0xbf800000
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/boards/Buffalo/WZR-HP-AG300H/board.hints	Fri Nov 02 15:46:06 2012 +0200
@@ -0,0 +1,104 @@
+hint.arge.0.media=1000
+hint.arge.0.fduplex=1
+hint.arge.1.media=1000
+hint.arge.1.fduplex=1
+
+# No probe at all
+hint.miibus.0.phymask="0x00000000"
+hint.miibus.1.phymask="0x00000000"
+
+hint.floatphy.0.at="miibus0"
+hint.floatphy.0.phyno=0
+hint.floatphy.0.flags=0x00000000
+hint.floatphy.0.speed=1000
+
+hint.floatphy.1.at="miibus1"
+hint.floatphy.1.phyno=0
+hint.floatphy.1.flags=0x00000000
+hint.floatphy.1.speed=1000
+
+# compatible value, device with 4M/8M/16M of flash, may found it on same
+# location, because flash just aliased to upper segments
+hint.ath.0.eepromdata=0x1fff1000
+
+# ath0 - slot 17
+hint.pcib.0.bus.0.17.0.ath_fixup_addr=0x1f051000
+hint.pcib.0.bus.0.17.0.ath_fixup_size=4096
+# ath1 - slot 18
+hint.pcib.0.bus.0.18.0.ath_fixup_addr=0x1f055000
+hint.pcib.0.bus.0.18.0.ath_fixup_size=4096
+# .. and now, telling each ath(4) NIC where to find the firmware
+# image.
+hint.ath.0.eeprom_firmware="pcib.0.bus.0.17.0.eeprom_firmware"
+hint.ath.1.eeprom_firmware="pcib.0.bus.0.18.0.eeprom_firmware"
+
+# 0	LED	WPS
+hint.gpioled.0.at="gpiobus0"
+hint.gpioled.0.name="wps"
+hint.gpioled.0.pins=0x0001
+hint.gpioled.0.flags="0x0102"
+
+# 1	LED	STATUS Yellow
+hint.gpioled.1.at="gpiobus0"
+hint.gpioled.1.name="status"
+hint.gpioled.1.pins=0x0002
+hint.gpioled.1.flags="0x0102"
+
+# 11	LED	USB
+hint.gpioled.2.at="gpiobus0"
+hint.gpioled.2.name="usb"
+hint.gpioled.2.pins=0x0800
+hint.gpioled.2.flags="0x0102"
+
+# ? 	BUTTON	RESET
+#hint.gpioreset.0.at="gpiobus0"
+#hint.gpioreset.0.pins="0x0400"
+#hint.gpioreset.0.name="reset"
+#hint.gpioreset.0.flags="0x04a1"
+
+# 12 	BUTTON	WPS
+hint.gpiobutton.0.at="gpiobus0"
+hint.gpiobutton.0.pins="0x1000"
+hint.gpiobutton.0.name="wps"
+hint.gpiobutton.0.flags="0x04a1"
+
+hint.mx25l.0.at="spibus0"
+hint.mx25l.0.cs=0
+
+hint.map.0.at="flash/spi0"
+hint.map.0.start=0x00000000
+hint.map.0.end=0x00040000
+hint.map.0.name="bootloader"
+hint.map.0.readonly=1
+
+hint.map.1.at="flash/spi0"
+hint.map.1.start=0x00040000
+hint.map.1.end=0x00050000
+hint.map.1.name="bootloader-env"
+hint.map.1.readonly=1
+
+hint.map.2.at="flash/spi0"
+hint.map.2.start=0x00050000
+hint.map.2.end=0x00060000
+hint.map.2.name="art"
+hint.map.2.readonly=1
+
+hint.map.3.at="flash/spi0"
+hint.map.3.start=0x00060000
+hint.map.3.end=0x007c0000
+hint.map.3.name="upgrade"
+
+hint.map.4.at="flash/spi0"
+hint.map.4.start=0x00060000
+hint.map.4.end="search:0x00100000:0x10000:.!/bin/sh"
+hint.map.4.name="kernel"
+
+hint.map.5.at="flash/spi0"
+hint.map.5.start="search:0x00100000:0x10000:.!/bin/sh"
+hint.map.5.end=0x007c0000
+hint.map.5.name="rootfs"
+
+hint.map.6.start=0x007c0000
+hint.map.6.end=0x007f0000
+hint.map.6.name="config"
+#hint.map.6.readonly=1
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/boards/Buffalo/WZR-HP-AG300H/board.mk	Fri Nov 02 15:46:06 2012 +0200
@@ -0,0 +1,104 @@
+###################################################
+#
+# Board used hardware/chip`s
+#
+###################################################
+
+SOC_VENDOR=Atheros
+SOC_CHIP=AR7161
+BOARD_FLASH_SIZE=32M
+
+###################################################
+#
+# Vars for kernel config
+#
+###################################################
+
+# ident
+KERNCONF_IDENT=${TARGET_VENDOR}_${TARGET_DEVICE}
+
+# Board have 128M of RAM
+KERNCONF_OPTIONS+=	AR71XX_REALMEM=128*1024*1024
+
+KERNCONF_OPTIONS+=	ROOTDEVNAME=\\\"cd9660:/dev/map/rootfs.uncompress\\\"
+KERNCONF_DEVICES+=	geom_map
+
+# Include usb and SoC usb controller drivers
+WITH_USB=yes
+WITH_IPSEC=yes
+WITH_WIRELESS=yes
+# Builded modules
+KERNCONF_MODULES_OVERRIDE+=	usb/uplcom usb/u3g usb/umodem usb/umass \
+    usb/ucom cam zlib
+
+# Additional utilities
+WORLD_SUBDIRS_ZROUTER+=target/sbin/upgrade
+
+KERNCONF_OPTIONS+=	DDB
+KERNCONF_OPTIONS+=	KDB
+KERNCONF_OPTIONS+=	ALT_BREAK_TO_DEBUGGER
+KERNCONF_OPTIONS+=	BREAK_TO_DEBUGGER
+
+KERNCONF_DEVICES+=	switch
+#KERNCONF_DEVICES+=	switch_rtl8366
+
+.if !defined(WITHOUT_WIRELESS)
+KERNCONF_MODULES_OVERRIDE+=	wlan_xauth wlan_wep wlan_tkip wlan_acl \
+    wlan_amrr wlan_ccmp wlan_rssadapt
+KERNCONF_OPTIONS+=	IEEE80211_DEBUG
+KERNCONF_OPTIONS+=	IEEE80211_SUPPORT_MESH
+KERNCONF_OPTIONS+=	IEEE80211_SUPPORT_TDMA
+KERNCONF_DEVICES+=	wlan
+KERNCONF_DEVICES+=	wlan_amrr
+KERNCONF_DEVICES+=	wlan_wep
+KERNCONF_DEVICES+=	wlan_ccmp
+KERNCONF_DEVICES+=	wlan_tkip
+
+KERNCONF_OPTIONS+=	AR71XX_ATH_EEPROM
+KERNCONF_OPTIONS+=	ATH_EEPROM_FIRMWARE
+KERNCONF_DEVICES+=	firmware
+
+KERNCONF_OPTIONS+=	AH_DEBUG
+KERNCONF_OPTIONS+=	ATH_DEBUG
+KERNCONF_OPTIONS+=	ATH_DIAGAPI
+KERNCONF_OPTIONS+=	ATH_ENABLE_11N
+KERNCONF_OPTIONS+=	AH_SUPPORT_AR5416
+#KERNCONF_OPTIONS+=	AH_SUPPORT_AR9130
+KERNCONF_OPTIONS+=	AH_RXCFG_SDMAMW_4BYTES
+# interrupt mitigation not possible on AR9130
+# option		AH_AR5416_INTERRUPT_MITIGATION
+KERNCONF_DEVICES+=	ath
+KERNCONF_DEVICES+=	ath_hal
+KERNCONF_DEVICES+=	ath_pci
+KERNCONF_DEVICES+=	ath_rate_sample
+.endif
+
+###################################################
+#
+#       Limits
+#
+###################################################
+
+# Image must not be biggest than GEOM_MAP_P2 (upgrade part.)
+FIRMWARE_IMAGE_SIZE_MAX=0x00760000
+
+###################################################
+#
+#       Firmware Image Options
+#
+###################################################
+
+TARGET_PROFILES+=SMALL_ mpd ssh ipfw lua_web_ui dhcp mroute ntpdate dnsmasq \
+    racoon openvpn ppp hostap ath nfs_client
+
+KERNEL_COMPRESSION=oldlzma
+KERNEL_COMPRESSION_TYPE=oldlzma
+UBOOT_KERNEL_COMPRESSION_TYPE=lzma
+
+MKULZMA_BLOCKSIZE=65536
+
+PACKING_KERNEL_IMAGE?=kernel.kbin.oldlzma.uboot.sync
+PACKING_ROOTFS_IMAGE?=rootfs_clean.iso.ulzma
+
+IMAGE_SUFFIX=zimage
+NEW_IMAGE_TYPE=zimage
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/boards/Buffalo/WZR-HP-AG300H/files/etc/rc.d/ADAPTATION	Fri Nov 02 15:46:06 2012 +0200
@@ -0,0 +1,73 @@
+#!/bin/sh
+
+# PROVIDE: ADAPTATION
+
+. /etc/rc.subr
+. /etc/network.subr
+
+name="ADAPTATION"
+start_cmd="adapt_start"
+start_precmd="adapt_prestart"
+start_postcmd="adapt_poststart"
+stop_cmd="adapt_stop"
+
+adapt_prestart()
+{
+#	switchctl /dev/switch0 set vlan 0 vid 1
+#	switchctl /dev/switch0 set vlan 0 add 0 u
+#	switchctl /dev/switch0 set vlan 0 add 1 u
+#	switchctl /dev/switch0 set vlan 0 add 2 u
+#	switchctl /dev/switch0 set vlan 0 add 3 u
+#	switchctl /dev/switch0 set vlan 0 del 4
+#	switchctl /dev/switch0 set vlan 0 add 5 t
+#	switchctl /dev/switch0 set vlan 0 add 6 t
+#
+#	switchctl /dev/switch0 set vlan 1 vid 2
+#	switchctl /dev/switch0 set vlan 1 del 0
+#	switchctl /dev/switch0 set vlan 1 del 1
+#	switchctl /dev/switch0 set vlan 1 del 2
+#	switchctl /dev/switch0 set vlan 1 del 3
+#	switchctl /dev/switch0 set vlan 1 add 4 u
+#	switchctl /dev/switch0 set vlan 1 add 5 t
+#	switchctl /dev/switch0 set vlan 1 add 6 t
+#
+#	switchctl /dev/switch0 set port 0 pvid 1 flags Untag
+#	switchctl /dev/switch0 set port 1 pvid 1 flags Untag
+#	switchctl /dev/switch0 set port 2 pvid 1 flags Untag
+#	switchctl /dev/switch0 set port 3 pvid 1 flags Untag
+#	switchctl /dev/switch0 set port 4 pvid 2 flags Untag
+#
+#	switchctl /dev/switch0 set port 5 pvid 1 flags Tag
+#	switchctl /dev/switch0 set port 6 pvid 1 flags Tag
+
+	gpioctl -f /dev/gpioc0 -c 10 IN II PU INT
+
+	# Import MAC addresses with known names
+#	kenv LAN_MAC_ADDR=`kenv ethaddr`
+#	kenv WAN_MAC_ADDR=`kenv wanmac`
+
+	ifconfig arge0 name lan0
+	ifconfig arge1 name wan0
+
+	ifconfig lan0 ether `kenv LAN_MAC_ADDR`
+	ifconfig wan0 ether `kenv WAN_MAC_ADDR`
+
+	hostname `kenv HostName`
+
+}
+
+adapt_start()
+{
+}
+
+adapt_poststart()
+{
+}
+
+adapt_stop()
+{
+}
+
+load_rc_config $name
+
+run_rc_command $*
\ No newline at end of file
--- a/boards/D-Link/DIR-620/board.hints	Fri Nov 02 13:17:20 2012 +0200
+++ b/boards/D-Link/DIR-620/board.hints	Fri Nov 02 15:46:06 2012 +0200
@@ -23,6 +23,10 @@
 hint.rt2860.0.maddr=0x10180000
 hint.rt2860.0.msize=0x40000
 hint.rt2860.0.irq=4
+hint.ral.0.at="nexus0"
+hint.ral.0.maddr=0x10180000
+hint.ral.0.msize=0x40000
+hint.ral.0.irq=4
 
 # uart0
 #hint.uart.0.at="obio0"
--- a/ports/www/zhttpd/distinfo	Fri Nov 02 13:17:20 2012 +0200
+++ b/ports/www/zhttpd/distinfo	Fri Nov 02 15:46:06 2012 +0200
@@ -1,3 +1,2 @@
-MD5 (zhttpd-release-11.tgz) = 67ade21161d38db9e98fe1b5abc41f8d
-SHA256 (zhttpd-release-11.tgz) = 9f2bdaf3945286e39a5b8434b5214d8d709e8d89acc79ee89593787abe849bd8
-SIZE (zhttpd-release-11.tgz) = 26204
+SHA256 (zhttpd-release-11.tgz) = ac8150424cd62b88e8e6dd02ecccce3b36f649b16b991eaa146d966c12910435
+SIZE (zhttpd-release-11.tgz) = 26198
--- a/profiles/SMALL_/files/etc/crontab	Fri Nov 02 13:17:20 2012 +0200
+++ b/profiles/SMALL_/files/etc/crontab	Fri Nov 02 15:46:06 2012 +0200
@@ -1,9 +1,6 @@
 SHELL=/bin/sh
 PATH=/etc:/bin:/sbin:/usr/bin:/usr/sbin
-*/5	*	*	*	*	root	/usr/libexec/atrun
-*/11	*	*	*	*	operator /usr/libexec/save-entropy
 */6	*	*	*	*	root	newsyslog
-1	3	*	*	*	root	periodic daily
-15	4	*	*	6	root	periodic weekly
-30	5	1	*	*	root	periodic monthly
-1,31	0-5	*	*	*	root	adjkerntz -a
+#1	3	*	*	*	root	periodic daily
+#15	4	*	*	6	root	periodic weekly
+#30	5	1	*	*	root	periodic monthly
--- a/profiles/SMALL_/profile.mk	Fri Nov 02 13:17:20 2012 +0200
+++ b/profiles/SMALL_/profile.mk	Fri Nov 02 15:46:06 2012 +0200
@@ -125,6 +125,7 @@
 passwd \
 sed \
 sockstat \
+sort \
 tail \
 tar \
 tee \
@@ -135,9 +136,6 @@
 wc \
 xargs
 
-WORLD_SUBDIRS_GNU_USR_BIN+= \
-sort
-
 WORLD_SUBDIRS_GNU_LIB+= \
 csu \
 libgcc \
--- a/profiles/lua_web_ui/files/etc/rc.d/UPGRADE_MODE	Fri Nov 02 13:17:20 2012 +0200
+++ b/profiles/lua_web_ui/files/etc/rc.d/UPGRADE_MODE	Fri Nov 02 15:46:06 2012 +0200
@@ -39,6 +39,7 @@
 -H YWRtaW46YWRtaW4= -M \"Secure Area\" \
 -f /dev/%s -d /dev/map/upgrade\n" ${MD_DEV} >> /etc/inetd.conf
 			inetd -wW;
+			/usr/libexec/telnetd -4 -debug 23 &
 			sh
 		fi
 	fi
--- a/profiles/lua_web_ui/files/etc/www/collector.lua	Fri Nov 02 13:17:20 2012 +0200
+++ b/profiles/lua_web_ui/files/etc/www/collector.lua	Fri Nov 02 15:46:06 2012 +0200
@@ -13,36 +13,18 @@
 serverhost = serverhost or "127.0.0.1";
 serverport = serverport or "80";
 
+-- read_file, tdump, xmldump, exec_output
+dofile('lib/utils.lua');
+
+-- urlEncode/urlDecode
+dofile("lib/urlXxcode.lua");
+
 -- Globals
 r = {};		-- Runtime varibles structure
 rquery = {};
 queue = {};
 local internet_led = nil;
 
---
--- Utility function:  URL encoding function
---
-function urlEncode(str)
-    if (str) then
-        str = string.gsub (str, "\n", "\r\n")
-        str = string.gsub (str, "([^%w ])",
-            function (c) return string.format ("%%%02X", string.byte(c)) end)
-        str = string.gsub (str, " ", "+")
-    end
-    return str
-end
-
-
---
--- Utility function:  URL decode function
---
-function urlDecode(str)
-    str = string.gsub (str, "+", " ")
-    str = string.gsub (str, "%%(%x%x)", function(h) return string.char(tonumber(h,16)) end)
-    str = string.gsub (str, "\r\n", "\n")
-    return str
-end
-
 -- convert name1=value1&name2=val+ue%2F2
 -- to table {"name1"="value1", "name2"="val ue/2"}
 function parse_query(query)
--- a/profiles/lua_web_ui/files/etc/www/devd.lua	Fri Nov 02 13:17:20 2012 +0200
+++ b/profiles/lua_web_ui/files/etc/www/devd.lua	Fri Nov 02 15:46:06 2012 +0200
@@ -10,9 +10,6 @@
 serverhost = serverhost or "127.0.0.1";
 serverport = serverport or "80";
 
--- redirect print to /dev/console
--- dofile("lib/print_to_console.lua");
-
 -- redirect print to syslog
 dofile("lib/lsyslog.lua");
 syslog_init("devd.lua");
--- a/profiles/lua_web_ui/files/etc/www/httpd.lua	Fri Nov 02 13:17:20 2012 +0200
+++ b/profiles/lua_web_ui/files/etc/www/httpd.lua	Fri Nov 02 15:46:06 2012 +0200
@@ -55,9 +55,6 @@
 -- HOSTAPD helper
 --dofile("lib/hostapd.lua");
 
--- redirect print to /dev/console
--- dofile("lib/print_to_console.lua");
-
 -- redirect print to syslog
 dofile("lib/lsyslog.lua");
 syslog_init("httpd.lua");
--- a/profiles/lua_web_ui/files/etc/www/lib/print_to_console.lua	Fri Nov 02 13:17:20 2012 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +0,0 @@
-print_native = print;
-cons = io.open("/dev/console", "w");
-
--- XXX We need to find a way how to close it on signal
--- cons:close();
-
--- Write to stdout and console at the same time
-function console(...)
-	ret = 0;
-	out = string.gsub(string.format(...), "\n", "\r\n");
-	if cons then
-		ret = cons:write(out);
-	end
-	-- check if native print moved
-	if print_native then
-		print_native(out);
-	else
-		print(out);
-	end
-	return ret;
-end
-
-function progress(...)
-	console(...);
-end
-
-print = function (...)
-	-- "string.format" need raw string of "print" as a single string
-	console(table.concat(arg, "\t"):gsub("%%","%%%%") .. "\n");
-end
--- a/share/mk/zrouter.ports.mk	Fri Nov 02 13:17:20 2012 +0200
+++ b/share/mk/zrouter.ports.mk	Fri Nov 02 15:46:06 2012 +0200
@@ -2,8 +2,8 @@
 
 # that may used for any platform
 # we need only say cross-build to configure
-PORTS_CONFIGURE_TARGET=--build=i386-portbld-freebsd8.2 --host=mipsel-portbld-freebsd8.2
-
+TARGET_ARCH=mips
+CFLAGS="-std=c99 -I${WORLDDESTDIR}/include"
 
 _TARGET_DEFS = \
 	TARGET_VENDOR=${TARGET_VENDOR} \
@@ -14,14 +14,11 @@
 
 
 _TARGET_CROSS_DEFS = \
-	PATH=${FREEBSD_BUILD_ENV_PATH}:/usr/local/bin:/usr/local/sbin \
-	PREFIX=${WORLDDESTDIR} \
-	LOCALBASE=${WORLDDESTDIR} \
-	CC="${CC} -L${WORLDDESTDIR}/lib -L${WORLDDESTDIR}/usr/lib" \
+	PATH=/usr/mips-freebsd/usr/bin:${PATH} \
 	PKG_CONFIG_PATH=${WORLDDESTDIR}/libdata/pkgconfig/ \
 	DISTDIR=${ZROUTER_OBJ}/distfiles/ \
-	GNU_CONFIGURE_PREFIX=${WORLDDESTDIR} \
-	GLOBAL_CONFIGURE_ARGS="${PORTS_CONFIGURE_TARGET}" \
+	PKG_DBDIR=${WORLDDESTDIR}/libdata/var/db/pkg \
+	TARGET_ARCH=mips \
 	NO_INSTALL_MANPAGES=yes \
 	WITHOUT_CHECK=yes \
 	NO_PKG_REGISTER=yes \
@@ -30,13 +27,13 @@
 	BINOWN=ray \
 	BINGRP=wheel \
 	NOPORTEXAMPLES=yes \
-	INSTALL_AS_USER=yes \
-	INSTALL="sh ${FREEBSD_SRC_TREE}/tools/install.sh" \
+	INSTALL=${ZROUTER_ROOT}/tools/install.sh \
 	ac_cv_func_malloc_0_nonnull=yes \
 	ac_cv_func_realloc_0_nonnull=yes \
-	AUTOTOOLS_LOCALBASE=/usr/local
-
-#	LDADD="-L${WORLDDESTDIR}/lib"
+	AUTOTOOLS_LOCALBASE=/usr/local \
+	LIBDIR+=${WORLDDESTDIR}/lib \
+	LDADD+="-L${WORLDDESTDIR}/lib" \
+	CXXFLAGS="-I${WORLDDESTDIR}/include -I${WORLDDESTDIR}/include/json"
 #	LIBTOOL=/usr/local/bin/libtool \
 #	-ELIBTOOL
 
@@ -48,6 +45,7 @@
 	@echo "----> Start building ports dependencies ..."
 .for dir in ${WORLD_SUBDIRS_PORTS}
 	@echo "Start ${dir} port building..."
+	mkdir -p ${WORLDDESTDIR}/libdata/var/db/pkg
 	cd ${ZROUTER_ROOT} ;${MAKE} ${_TARGET_DEFS} PORT_BUILD_DEPEND_CROSS=${dir} port-build-depend-cross
 .endfor
 	@echo "----> Ports dependencies build done ..."
@@ -101,8 +99,8 @@
 	    if [ $${PORT_STATUS} -lt 50 ] ; then \
 		    echo "$${PORT_STATUS}% of files matched, do install" ; \
 		    rm -f ${ZROUTER_OBJ}/ports/${dir}/.install* ; \
-		    echo cd ${dir} ; echo ${MAKE} ${_TARGET_CROSS_DEFS} WRKDIR=${ZROUTER_OBJ}/ports/${dir} install ; \
-		    cd ${dir} ; PATH=${FREEBSD_BUILD_ENV_PATH} ${MAKE} ${_TARGET_CROSS_DEFS} WRKDIR=${ZROUTER_OBJ}/ports/${dir} install || \
+		    echo cd ${dir} ; echo ${MAKE} ${_TARGET_CROSS_DEFS} WRKDIR=${ZROUTER_OBJ}/ports/${dir} install CHROOTED=no DESTDIR=${WORLDDESTDIR} PREFIX=/; \
+		    cd ${dir} ; PATH=${FREEBSD_BUILD_ENV_PATH} ${MAKE} ${_TARGET_CROSS_DEFS} WRKDIR=${ZROUTER_OBJ}/ports/${dir} install CHROOTED=no DESTDIR=${WORLDDESTDIR} PREFIX=/ || \
 			    ( ${MAKE} WRKDIR=${ZROUTER_OBJ}/ports/${dir} clean && \
 			    echo ${MAKE} WRKDIR=${ZROUTER_OBJ}/ports/${dir} configure && \
 			    ${MAKE} WRKDIR=${ZROUTER_OBJ}/ports/${dir} configure && \
@@ -111,7 +109,7 @@
 			    mv `${MAKE} WRKDIR=${ZROUTER_OBJ}/ports/${dir} -VCONFIGURE_COOKIE` `${MAKE} ${_TARGET_CROSS_DEFS} WRKDIR=${ZROUTER_OBJ}/ports/${dir} -VCONFIGURE_COOKIE` && \
 			    echo ${MAKE} ${_TARGET_CROSS_DEFS} WRKDIR=${ZROUTER_OBJ}/ports/${dir} all && \
 			    ${MAKE} ${_TARGET_CROSS_DEFS} WRKDIR=${ZROUTER_OBJ}/ports/${dir} all && \
-			    echo ${MAKE} ${_TARGET_CROSS_DEFS} WRKDIR=${ZROUTER_OBJ}/ports/${dir} install && \
+			    echo ${MAKE} ${_TARGET_CROSS_DEFS} WRKDIR=${ZROUTER_OBJ}/ports/${dir} install CHROOTED=no DESTDIR=${WORLDDESTDIR} PREFIX=/ && \
 			    ${MAKE} ${_TARGET_CROSS_DEFS} WRKDIR=${ZROUTER_OBJ}/ports/${dir} install ) ; \
 	    fi
 .endfor
--- a/socs/Atheros/AR7242/soc.mk	Fri Nov 02 13:17:20 2012 +0200
+++ b/socs/Atheros/AR7242/soc.mk	Fri Nov 02 15:46:06 2012 +0200
@@ -26,18 +26,24 @@
 KERNCONF_OPTIONS+=		NO_FFS_SNAPSHOT
 KERNCONF_OPTIONS+=		SCSI_NO_SENSE_STRINGS
 KERNCONF_OPTIONS+=		SCSI_NO_OP_STRINGS
+#KERNCONF_OPTIONS+=		MUTEX_NOINLINE
+KERNCONF_MAKEOPTIONS+=		"INLINE_LIMIT=768"
+KERNCONF_OPTIONS+=		RWLOCK_NOINLINE
+KERNCONF_OPTIONS+=		SX_NOINLINE
+KERNCONF_OPTIONS+=		NO_SWAPPING
 
 # Debug definitions
 #KERNCONF_OPTIONS+=		DDB
 #KERNCONF_OPTIONS+=		KDB
-#KERNCONF_OPTIONS+=		PREEMPTION
+
+KERNCONF_OPTIONS+= 	SCHED_ULE
+#KERNCONF_OPTIONS+= 	SCHED_4BSD
+KERNCONF_OPTIONS+=	PREEMPTION
 
 # Board definitions
 KERNCONF_OPTIONS+=	INET
 KERNCONF_OPTIONS+= 	IPSTEALTH
 KERNCONF_OPTIONS+= 	CD9660
-#KERNCONF_OPTIONS+= 	SCHED_ULE
-KERNCONF_OPTIONS+= 	SCHED_4BSD
 KERNCONF_OPTIONS+= 	PSEUDOFS
 KERNCONF_OPTIONS+=	IPFIREWALL_DEFAULT_TO_ACCEPT
 #KERNCONF_OPTIONS+= 	ZERO_COPY_SOCKETS