Merge branch 'org.openembedded.dev' of git@git.openembedded.org:openembedded into org.openembedded.dev

36 files changed, 485 insertions, 38 deletions

diff --git a/recipes/binutils/binutils-2.14.90.0.7/binutils-2.14.90.0.7-fix-broken-configure.patch b/recipes/binutils/binutils-2.14.90.0.7/binutils-2.14.90.0.7-fix-broken-configure.patch
new file mode 100644
index 0000000000..30d4bcdf78
--- /dev/null
+++ b/recipes/binutils/binutils-2.14.90.0.7/binutils-2.14.90.0.7-fix-broken-configure.patch
@@ -0,0 +1,78 @@
+--- binutils-2.14.90.0.7/configure.in-orig	2009-03-30 13:12:57.000000000 +0200
++++ binutils-2.14.90.0.7/configure.in	2009-03-30 13:13:36.000000000 +0200
+@@ -1795,21 +1795,21 @@
+ # at the end of the argument list.
+ # These will be expanded by make, so quote '$'.
+ cat <<\EOF_SED > conftestsed
+-s/ --no[[^ ]]* / /
+-s/ --c[[a-z-]]*[[= ]][[^ ]]* / /
+-s/ --sr[[a-z-]]*[[= ]][[^ ]]* / /
+-s/ --ho[[a-z-]]*[[= ]][[^ ]]* / /
+-s/ --bu[[a-z-]]*[[= ]][[^ ]]* / /
+-s/ --t[[a-z-]]*[[= ]][[^ ]]* / /
+-s/ --program-[[pst]][[a-z-]]*[[= ]][[^ ]]* / /
+-s/ -cache-file[[= ]][[^ ]]* / /
+-s/ -srcdir[[= ]][[^ ]]* / /
+-s/ -host[[= ]][[^ ]]* / /
+-s/ -build[[= ]][[^ ]]* / /
+-s/ -target[[= ]][[^ ]]* / /
+-s/ -program-prefix[[= ]][[^ ]]* / /
+-s/ -program-suffix[[= ]][[^ ]]* / /
+-s/ -program-transform-name[[= ]][[^ ]]* / /
++s/ --no[[^ ]]* / /g
++s/ --c[[a-z-]]*[[= ]][[^ ]]* / /g
++s/ --sr[[a-z-]]*[[= ]][[^ ]]* / /g
++s/ --ho[[a-z-]]*[[= ]][[^ ]]* / /g
++s/ --bu[[a-z-]]*[[= ]][[^ ]]* / /g
++s/ --t[[a-z-]]*[[= ]][[^ ]]* / /g
++s/ --program-[[pst]][[a-z-]]*[[= ]][[^ ]]* / /g
++s/ -cache-file[[= ]][[^ ]]* / /g
++s/ -srcdir[[= ]][[^ ]]* / /g
++s/ -host[[= ]][[^ ]]* / /g
++s/ -build[[= ]][[^ ]]* / /g
++s/ -target[[= ]][[^ ]]* / /g
++s/ -program-prefix[[= ]][[^ ]]* / /g
++s/ -program-suffix[[= ]][[^ ]]* / /g
++s/ -program-transform-name[[= ]][[^ ]]* / /g
+ s/ [[^' -][^ ]*] / /
+ s/^ *//;s/ *$//
+ s,\$,$$,g
+--- binutils-2.14.90.0.7/configure-orig	2009-03-30 13:12:51.000000000 +0200
++++ binutils-2.14.90.0.7/configure	2009-03-30 13:13:25.000000000 +0200
+@@ -2556,21 +2556,21 @@
+ # at the end of the argument list.
+ # These will be expanded by make, so quote '$'.
+ cat <<\EOF_SED > conftestsed
+-s/ --no[^ ]* / /
+-s/ --c[a-z-]*[= ][^ ]* / /
+-s/ --sr[a-z-]*[= ][^ ]* / /
+-s/ --ho[a-z-]*[= ][^ ]* / /
+-s/ --bu[a-z-]*[= ][^ ]* / /
+-s/ --t[a-z-]*[= ][^ ]* / /
+-s/ --program-[pst][a-z-]*[= ][^ ]* / /
+-s/ -cache-file[= ][^ ]* / /
+-s/ -srcdir[= ][^ ]* / /
+-s/ -host[= ][^ ]* / /
+-s/ -build[= ][^ ]* / /
+-s/ -target[= ][^ ]* / /
+-s/ -program-prefix[= ][^ ]* / /
+-s/ -program-suffix[= ][^ ]* / /
+-s/ -program-transform-name[= ][^ ]* / /
++s/ --no[^ ]* / /g
++s/ --c[a-z-]*[= ][^ ]* / /g
++s/ --sr[a-z-]*[= ][^ ]* / /g
++s/ --ho[a-z-]*[= ][^ ]* / /g
++s/ --bu[a-z-]*[= ][^ ]* / /g
++s/ --t[a-z-]*[= ][^ ]* / /g
++s/ --program-[pst][a-z-]*[= ][^ ]* / /g
++s/ -cache-file[= ][^ ]* / /g
++s/ -srcdir[= ][^ ]* / /g
++s/ -host[= ][^ ]* / /g
++s/ -build[= ][^ ]* / /g
++s/ -target[= ][^ ]* / /g
++s/ -program-prefix[= ][^ ]* / /g
++s/ -program-suffix[= ][^ ]* / /g
++s/ -program-transform-name[= ][^ ]* / /g
+ s/ [^' -][^ ]* / /
+ s/^ *//;s/ *$//
+ s,\$,$$,g
diff --git a/recipes/binutils/binutils_2.14.90.0.7.bb b/recipes/binutils/binutils_2.14.90.0.7.bb
index b47c8e51b1..3447c4fea8 100644
--- a/recipes/binutils/binutils_2.14.90.0.7.bb
+++ b/recipes/binutils/binutils_2.14.90.0.7.bb
@@ -48,7 +48,8 @@ SRC_URI = \
      file://binutils-uclibc-210-cflags.patch;patch=1 \
      file://binutils-100_cflags_for_build.patch;patch=1 \
      file://plt32trunc.patch;patch=1 \
-     file://600-arm-textrel.patch;patch=1"
+     file://600-arm-textrel.patch;patch=1 \
+     file://binutils-2.14.90.0.7-fix-broken-configure.patch;patch=1"
 
 S = "${WORKDIR}/binutils-${PV}"
 B = "${S}/build.${HOST_SYS}.${TARGET_SYS}"
diff --git a/recipes/elvis/elvis_2.2.0.bb b/recipes/elvis/elvis_2.2.0.bb
index c0f92627bf..f038c6b110 100644
--- a/recipes/elvis/elvis_2.2.0.bb
+++ b/recipes/elvis/elvis_2.2.0.bb
@@ -4,8 +4,7 @@ PRIORITY = "optional"
 LICENSE = "Perl Clarified Artistic License"
 DEPENDS = "ncurses"
 
-#SRC_URI = "ftp://ftp.cs.pdx.edu/pub/elvis/elvis-2.2_0.tar.gz"
-SRC_URI = "http://www.fh-wedel.de/pub/elvis/elvis-2.2_0.tar.gz"
+SRC_URI = "ftp://ftp.cs.pdx.edu/pub/elvis/elvis-2.2_0.tar.gz"
 S = "${WORKDIR}/elvis-2.2_0"
 
 CFLAGS_prepend = " -I. -Iosunix -L${STAGING_LIBDIR} "
diff --git a/recipes/gcc/gcc-configure-common.inc b/recipes/gcc/gcc-configure-common.inc
index ee5784afc3..9363585de1 100644
--- a/recipes/gcc/gcc-configure-common.inc
+++ b/recipes/gcc/gcc-configure-common.inc
@@ -89,4 +89,7 @@ do_configure () {
 	echo "#define STANDARD_INCLUDE_DIR \"${layout_includedir}\"" >> ${S}/gcc/defaults.h
 
 	oe_runconf
+
+	# make sure that no @LDFLAG@ is left in the generated Makefile
+  	sed -i "s/@LDFLAGS@//g" ${B}/Makefile
 }
diff --git a/recipes/glibc/glibc-2.3.2/allow-gcc.patch b/recipes/glibc/glibc-2.3.2/allow-gcc.patch
new file mode 100644
index 0000000000..1e38f0ef14
--- /dev/null
+++ b/recipes/glibc/glibc-2.3.2/allow-gcc.patch
@@ -0,0 +1,70 @@
+--- glibc-2.3.2/configure-orig	2009-03-26 15:46:33.000000000 +0100
++++ glibc-2.3.2/configure	2009-03-26 15:49:15.000000000 +0100
+@@ -3850,67 +3850,6 @@
+ 
+ # These programs are version sensitive.
+ 
+-for ac_prog in ${ac_tool_prefix}gcc ${ac_tool_prefix}cc
+-do
+-  # Extract the first word of "$ac_prog", so it can be a program name with args.
+-set dummy $ac_prog; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+-if test "${ac_cv_prog_CC+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  if test -n "$CC"; then
+-  ac_cv_prog_CC="$CC" # Let the user override the test.
+-else
+-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+-  IFS=$as_save_IFS
+-  test -z "$as_dir" && as_dir=.
+-  for ac_exec_ext in '' $ac_executable_extensions; do
+-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+-    ac_cv_prog_CC="$ac_prog"
+-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+-    break 2
+-  fi
+-done
+-done
+-
+-fi
+-fi
+-CC=$ac_cv_prog_CC
+-if test -n "$CC"; then
+-  echo "$as_me:$LINENO: result: $CC" >&5
+-echo "${ECHO_T}$CC" >&6
+-else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
+-fi
+-
+-  test -n "$CC" && break
+-done
+-
+-if test -z "$CC"; then
+-  ac_verc_fail=yes
+-else
+-  # Found it, now check the version.
+-  echo "$as_me:$LINENO: checking version of $CC" >&5
+-echo $ECHO_N "checking version of $CC... $ECHO_C" >&6
+-  ac_prog_version=`$CC -v 2>&1 | sed -n 's/^.*version \([egcygnustpi-]*[0-9.]*\).*$/\1/p'`
+-  case $ac_prog_version in
+-    '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
+-    3.[2-9]*)
+-       ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
+-    *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
+-
+-  esac
+-  echo "$as_me:$LINENO: result: $ac_prog_version" >&5
+-echo "${ECHO_T}$ac_prog_version" >&6
+-fi
+-if test $ac_verc_fail = yes; then
+-  critic_missing="$critic_missing gcc"
+-fi
+-
+ for ac_prog in gnumake gmake make
+ do
+   # Extract the first word of "$ac_prog", so it can be a program name with args.
diff --git a/recipes/glibc/glibc-2.3.2/mips-abio32.patch b/recipes/glibc/glibc-2.3.2/mips-abio32.patch
new file mode 100644
index 0000000000..49c46f9113
--- /dev/null
+++ b/recipes/glibc/glibc-2.3.2/mips-abio32.patch
@@ -0,0 +1,12 @@
+--- glibc-2.3.3-r16/sysdeps/mips/sgidefs.h-orig	2009-02-27 16:05:55.000000000 +0100
++++ glibc-2.3.3-r16/sysdeps/mips/sgidefs.h	2009-02-27 16:06:26.000000000 +0100
+@@ -43,4 +43,9 @@
+ #define _MIPS_SIM_NABI32	2
+ #define _MIPS_SIM_ABI64		3
+ 
++/* compatibility stuff needed e.g. by gdb */
++#ifndef _ABIO32
++# define _ABIO32	_MIPS_SIM_ABI32
++#endif
++
+ #endif /* sgidefs.h */
diff --git a/recipes/glibc/glibc-2.3.3/allow-gcc.patch b/recipes/glibc/glibc-2.3.3/allow-gcc.patch
new file mode 100644
index 0000000000..1e38f0ef14
--- /dev/null
+++ b/recipes/glibc/glibc-2.3.3/allow-gcc.patch
@@ -0,0 +1,70 @@
+--- glibc-2.3.2/configure-orig	2009-03-26 15:46:33.000000000 +0100
++++ glibc-2.3.2/configure	2009-03-26 15:49:15.000000000 +0100
+@@ -3850,67 +3850,6 @@
+ 
+ # These programs are version sensitive.
+ 
+-for ac_prog in ${ac_tool_prefix}gcc ${ac_tool_prefix}cc
+-do
+-  # Extract the first word of "$ac_prog", so it can be a program name with args.
+-set dummy $ac_prog; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+-if test "${ac_cv_prog_CC+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  if test -n "$CC"; then
+-  ac_cv_prog_CC="$CC" # Let the user override the test.
+-else
+-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+-  IFS=$as_save_IFS
+-  test -z "$as_dir" && as_dir=.
+-  for ac_exec_ext in '' $ac_executable_extensions; do
+-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+-    ac_cv_prog_CC="$ac_prog"
+-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+-    break 2
+-  fi
+-done
+-done
+-
+-fi
+-fi
+-CC=$ac_cv_prog_CC
+-if test -n "$CC"; then
+-  echo "$as_me:$LINENO: result: $CC" >&5
+-echo "${ECHO_T}$CC" >&6
+-else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
+-fi
+-
+-  test -n "$CC" && break
+-done
+-
+-if test -z "$CC"; then
+-  ac_verc_fail=yes
+-else
+-  # Found it, now check the version.
+-  echo "$as_me:$LINENO: checking version of $CC" >&5
+-echo $ECHO_N "checking version of $CC... $ECHO_C" >&6
+-  ac_prog_version=`$CC -v 2>&1 | sed -n 's/^.*version \([egcygnustpi-]*[0-9.]*\).*$/\1/p'`
+-  case $ac_prog_version in
+-    '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
+-    3.[2-9]*)
+-       ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
+-    *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
+-
+-  esac
+-  echo "$as_me:$LINENO: result: $ac_prog_version" >&5
+-echo "${ECHO_T}$ac_prog_version" >&6
+-fi
+-if test $ac_verc_fail = yes; then
+-  critic_missing="$critic_missing gcc"
+-fi
+-
+ for ac_prog in gnumake gmake make
+ do
+   # Extract the first word of "$ac_prog", so it can be a program name with args.
diff --git a/recipes/glibc/glibc-2.3.3/etc/ld.so.conf b/recipes/glibc/glibc-2.3.3/etc/ld.so.conf
new file mode 100644
index 0000000000..dfa65edb85
--- /dev/null
+++ b/recipes/glibc/glibc-2.3.3/etc/ld.so.conf
@@ -0,0 +1,2 @@
+/usr/local/lib
+/usr/X11R6/lib
diff --git a/recipes/glibc/glibc-2.3.3/mips-abio32.patch b/recipes/glibc/glibc-2.3.3/mips-abio32.patch
new file mode 100644
index 0000000000..49c46f9113
--- /dev/null
+++ b/recipes/glibc/glibc-2.3.3/mips-abio32.patch
@@ -0,0 +1,12 @@
+--- glibc-2.3.3-r16/sysdeps/mips/sgidefs.h-orig	2009-02-27 16:05:55.000000000 +0100
++++ glibc-2.3.3-r16/sysdeps/mips/sgidefs.h	2009-02-27 16:06:26.000000000 +0100
+@@ -43,4 +43,9 @@
+ #define _MIPS_SIM_NABI32	2
+ #define _MIPS_SIM_ABI64		3
+ 
++/* compatibility stuff needed e.g. by gdb */
++#ifndef _ABIO32
++# define _ABIO32	_MIPS_SIM_ABI32
++#endif
++
+ #endif /* sgidefs.h */
diff --git a/recipes/glibc/glibc_2.3.2.bb b/recipes/glibc/glibc_2.3.2.bb
index 2d2663f56b..0ed7d3e723 100644
--- a/recipes/glibc/glibc_2.3.2.bb
+++ b/recipes/glibc/glibc_2.3.2.bb
@@ -104,6 +104,11 @@ SRC_URI = "ftp://ftp.gnu.org/gnu/glibc/glibc-${PV}.tar.gz \
 	   file://etc/ld.so.conf \
  	   file://generate-supported.mk"
 
+SRC_URI_append_mtx-1 = " file://mips-abio32.patch;patch=1 \
+                         file://allow-gcc.patch;patch=1 "
+SRC_URI_append_mtx-2 = " file://mips-abio32.patch;patch=1 \
+                         file://allow-gcc.patch;patch=1 "
+
 S = "${WORKDIR}/glibc-${PV}"
 B = "${WORKDIR}/build-${TARGET_SYS}"
 
diff --git a/recipes/glibc/glibc_2.3.3.bb b/recipes/glibc/glibc_2.3.3.bb
index 05a8581957..dada4bb2fb 100644
--- a/recipes/glibc/glibc_2.3.3.bb
+++ b/recipes/glibc/glibc_2.3.3.bb
@@ -49,6 +49,11 @@ SRC_URI = "ftp://ftp.gnu.org/gnu/glibc/glibc-${PV}.tar.gz \
 	   file://etc/ld.so.conf \
  	   file://generate-supported.mk"
 
+SRC_URI_append_mtx-1 = " file://mips-abio32.patch;patch=1 \
+                         file://allow-gcc.patch;patch=1 "
+SRC_URI_append_mtx-2 = " file://mips-abio32.patch;patch=1 \
+                         file://allow-gcc.patch;patch=1 "
+
 S = "${WORKDIR}/glibc-${PV}"
 B = "${WORKDIR}/build-${TARGET_SYS}"
 
diff --git a/recipes/gnutls/gnutls.inc b/recipes/gnutls/gnutls.inc
index e438423c9c..004161a9f6 100644
--- a/recipes/gnutls/gnutls.inc
+++ b/recipes/gnutls/gnutls.inc
@@ -1,6 +1,6 @@
 DESCRIPTION = "GNU Transport Layer Security Library"
 HOMEPAGE = "http://www.gnu.org/software/gnutls/"
-DEPENDS = "zlib libgcrypt lzo"
+DEPENDS = "zlib libgcrypt lzo guile-native"
 LICENSE = "LGPL"
 
 SRC_URI = "ftp://ftp.gnutls.org/pub/gnutls/gnutls-${PV}.tar.bz2"
diff --git a/recipes/hostap/files/hostap-no-bsd.patch b/recipes/hostap/files/hostap-no-bsd.patch
new file mode 100644
index 0000000000..c40d98c959
--- /dev/null
+++ b/recipes/hostap/files/hostap-no-bsd.patch
@@ -0,0 +1,19 @@
+--- hostapd-0.4.4/driver_madwifi.c-orig	2008-04-16 15:11:49.000000000 +0200
++++ hostapd-0.4.4/driver_madwifi.c	2008-04-16 15:10:38.000000000 +0200
+@@ -26,14 +26,14 @@
+ #include <net80211/ieee80211.h>
+ #ifdef WME_NUM_AC
+ /* Assume this is built against BSD branch of madwifi driver. */
+-#define MADWIFI_BSD
++/*#define MADWIFI_BSD*/
++#include <linux/wireless.h>
+ #include <net80211/_ieee80211.h>
+ #endif /* WME_NUM_AC */
+ #include <net80211/ieee80211_crypto.h>
+ #include <net80211/ieee80211_ioctl.h>
+ 
+ #include <net/if_arp.h>
+-#include <linux/wireless.h>
+ 
+ #include <netinet/in.h>
+ #include <netpacket/packet.h>
diff --git a/recipes/hostap/hostap-daemon_0.4.4.bb b/recipes/hostap/hostap-daemon_0.4.4.bb
index bece7d1450..83a5386f3a 100644
--- a/recipes/hostap/hostap-daemon_0.4.4.bb
+++ b/recipes/hostap/hostap-daemon_0.4.4.bb
@@ -1,3 +1,7 @@
 require hostap-daemon.inc
 
+SRC_URI_append_nylon = "\
+	file://hostap-no-bsd.patch;patch=1"
+
+
 PR = "r2"
diff --git a/recipes/hostap/hostap-daemon_0.5.10.bb b/recipes/hostap/hostap-daemon_0.5.10.bb
index 3fc1d8dc11..ea493017fe 100644
--- a/recipes/hostap/hostap-daemon_0.5.10.bb
+++ b/recipes/hostap/hostap-daemon_0.5.10.bb
@@ -5,6 +5,10 @@ PRIORITY = "optional"
 LICENSE = "GPL"
 DEPENDS = "openssl ${@base_contains("COMBINED_FEATURES", "pci", "madwifi-ng", "",d)}"
 PR = "r1"
+DEPENDS_append_mtx-1 = " madwifi-modules"
+DEPENDS_append_mtx-2 = " madwifi-modules"
+CPPFLAGS_append_mtx-1 = " -I${STAGING_INCDIR}/madwifi/"
+CPPFLAGS_append_mtx-2 = " -I${STAGING_INCDIR}/madwifi/"
 
 #we introduce MY_ARCH to get 'armv5te' as arch instead of the misleading 'arm' on armv5te builds
 MY_ARCH := "${PACKAGE_ARCH}"
diff --git a/recipes/initscripts/initscripts-1.0/bootmisc.sh b/recipes/initscripts/initscripts-1.0/bootmisc.sh
index dde1209be5..d19477be87 100755
--- a/recipes/initscripts/initscripts-1.0/bootmisc.sh
+++ b/recipes/initscripts/initscripts-1.0/bootmisc.sh
@@ -66,7 +66,7 @@ fi
 # Set the system clock from hardware clock
 # If the timestamp is 1 day or more recent than the current time,
 # use the timestamp instead.
-/etc/init.d/hwclock.sh start
+test -x /etc/init.d/hwclock.sh && /etc/init.d/hwclock.sh start
 if test -e /etc/timestamp
 then
 	SYSTEMDATE=`date "+%Y%m%d"`
diff --git a/recipes/libusb/libusb-compat-0.1.0/gcc-3-compatibility.patch b/recipes/libusb/libusb-compat-0.1.0/gcc-3-compatibility.patch
new file mode 100644
index 0000000000..f07b5383bf
--- /dev/null
+++ b/recipes/libusb/libusb-compat-0.1.0/gcc-3-compatibility.patch
@@ -0,0 +1,22 @@
+--- libusb-compat-0.1.0/configure.ac-orig	2009-02-26 15:30:51.000000000 +0100
++++ libusb-compat-0.1.0/configure.ac	2009-02-26 15:31:04.000000000 +0100
+@@ -55,7 +55,7 @@
+ CFLAGS="$saved_cflags"
+ 
+ AC_DEFINE([API_EXPORTED], [__attribute__((visibility("default")))], [Default visibility])
+-AM_CFLAGS="-std=gnu99 $inline_cflags -Wall -Wundef -Wunused -Wstrict-prototypes -Werror-implicit-function-declaration -Wno-pointer-sign -Wshadow"
++AM_CFLAGS="-std=gnu99 $inline_cflags -Wall -Wundef -Wunused -Wstrict-prototypes -Werror-implicit-function-declaration -Wshadow"
+ AC_SUBST(AM_CFLAGS)
+ 
+ AC_CONFIG_FILES([libusb.pc] [libusb-config] [Makefile] [libusb/Makefile] [examples/Makefile])
+--- libusb-compat-0.1.0/libusb/Makefile.am-orig	2009-02-26 15:33:30.000000000 +0100
++++ libusb-compat-0.1.0/libusb/Makefile.am	2009-02-26 15:33:40.000000000 +0100
+@@ -2,7 +2,7 @@
+ lib_LTLIBRARIES = libusb.la
+ 
+ libusb_la_SOURCES = core.c usbi.h
+-libusb_la_CFLAGS = -fvisibility=hidden $(AM_CFLAGS) $(LIBUSB_1_0_CFLAGS)
++libusb_la_CFLAGS = $(AM_CFLAGS) $(LIBUSB_1_0_CFLAGS)
+ libusb_la_LIBADD = $(LIBUSB_1_0_LIBS)
+ libusb_la_LDFLAGS = -version-info $(LT_MAJOR):$(LT_REVISION):$(LT_AGE) \
+ 	-release 0.1
diff --git a/recipes/libusb/libusb-compat_0.1.0.bb b/recipes/libusb/libusb-compat_0.1.0.bb
index 887765133a..48694403e5 100644
--- a/recipes/libusb/libusb-compat_0.1.0.bb
+++ b/recipes/libusb/libusb-compat_0.1.0.bb
@@ -11,7 +11,8 @@ DEPENDS = "libusb1"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/libusb/libusb-compat-${PV}.tar.bz2 \
           "
-
+SRC_URI_append_nylon = " file://gcc-3-compatibility.patch;patch=1 \
+"
 inherit autotools pkgconfig binconfig lib_package
 
 PARALLEL_MAKE = ""
diff --git a/recipes/libusb/libusb1-1.0.0/gcc-3-compatibility.patch b/recipes/libusb/libusb1-1.0.0/gcc-3-compatibility.patch
new file mode 100644
index 0000000000..d1bc6803d8
--- /dev/null
+++ b/recipes/libusb/libusb1-1.0.0/gcc-3-compatibility.patch
@@ -0,0 +1,22 @@
+--- libusb-1.0.0/configure.ac-orig	2009-02-26 13:18:31.000000000 +0100
++++ libusb-1.0.0/configure.ac	2009-02-26 13:18:43.000000000 +0100
+@@ -62,7 +62,7 @@
+ CFLAGS="$saved_cflags"
+ 
+ AC_DEFINE([API_EXPORTED], [__attribute__((visibility("default")))], [Default visibility])
+-AM_CFLAGS="-std=gnu99 $inline_cflags -Wall -Wundef -Wunused -Wstrict-prototypes -Werror-implicit-function-declaration -Wno-pointer-sign -Wshadow"
++AM_CFLAGS="-std=gnu99 $inline_cflags -Wall -Wundef -Wunused -Wstrict-prototypes -Werror-implicit-function-declaration -Wshadow"
+ AC_SUBST(AM_CFLAGS)
+ 
+ AC_CONFIG_FILES([libusb-1.0.pc] [Makefile] [libusb/Makefile] [examples/Makefile] [doc/Makefile] [doc/doxygen.cfg])
+--- libusb-1.0.0/libusb/Makefile.am-orig	2009-02-26 13:18:11.000000000 +0100
++++ libusb-1.0.0/libusb/Makefile.am	2009-02-26 13:18:23.000000000 +0100
+@@ -8,7 +8,7 @@
+ OS_SRC = $(LINUX_USBFS_SRC)
+ endif
+ 
+-libusb_1_0_la_CFLAGS = -fvisibility=hidden $(AM_CFLAGS) -pthread
++libusb_1_0_la_CFLAGS = $(AM_CFLAGS) -pthread
+ libusb_1_0_la_SOURCES = libusbi.h core.c descriptor.c io.c sync.c $(OS_SRC)
+ libusb_1_0_la_LIBADD = -lrt
+ 
diff --git a/recipes/libusb/libusb1-1.0.1/gcc-3-compatibility.patch b/recipes/libusb/libusb1-1.0.1/gcc-3-compatibility.patch
new file mode 100644
index 0000000000..98c3674bca
--- /dev/null
+++ b/recipes/libusb/libusb1-1.0.1/gcc-3-compatibility.patch
@@ -0,0 +1,33 @@
+--- libusb-1.0.1/libusb/Makefile.am-orig	2009-05-19 22:41:07.000000000 +0200
++++ libusb-1.0.1/libusb/Makefile.am	2009-05-19 22:41:27.000000000 +0200
+@@ -14,7 +14,7 @@
+ AM_CFLAGS_EXT = -no-cpp-precomp
+ endif
+ 
+-libusb_1_0_la_CFLAGS = -fvisibility=hidden $(AM_CFLAGS) -pthread
++libusb_1_0_la_CFLAGS = $(AM_CFLAGS) -pthread
+ libusb_1_0_la_SOURCES = libusbi.h core.c descriptor.c io.c sync.c $(OS_SRC)
+ 
+ hdrdir = $(includedir)/libusb-1.0
+--- libusb-1.0.1/libusb/Makefile.in-orig	2009-05-19 22:41:13.000000000 +0200
++++ libusb-1.0.1/libusb/Makefile.in	2009-05-19 22:41:42.000000000 +0200
+@@ -210,7 +210,7 @@
+ @OS_DARWIN_TRUE@OS_SRC = $(DARWIN_USB_SRC)
+ @OS_LINUX_TRUE@OS_SRC = $(LINUX_USBFS_SRC)
+ @OS_DARWIN_TRUE@AM_CFLAGS_EXT = -no-cpp-precomp
+-libusb_1_0_la_CFLAGS = -fvisibility=hidden $(AM_CFLAGS) -pthread
++libusb_1_0_la_CFLAGS = $(AM_CFLAGS) -pthread
+ libusb_1_0_la_SOURCES = libusbi.h core.c descriptor.c io.c sync.c $(OS_SRC)
+ hdrdir = $(includedir)/libusb-1.0
+ hdr_HEADERS = libusb.h
+--- libusb-1.0.1/configure.ac-orig	2009-05-19 22:44:06.000000000 +0200
++++ libusb-1.0.1/configure.ac	2009-05-19 22:44:16.000000000 +0200
+@@ -72,7 +72,7 @@
+ CFLAGS="$saved_cflags"
+ 
+ AC_DEFINE([API_EXPORTED], [__attribute__((visibility("default")))], [Default visibility])
+-AM_CFLAGS="-std=gnu99 $inline_cflags -Wall -Wundef -Wunused -Wstrict-prototypes -Werror-implicit-function-declaration -Wno-pointer-sign -Wshadow"
++AM_CFLAGS="-std=gnu99 $inline_cflags -Wall -Wundef -Wunused -Wstrict-prototypes -Werror-implicit-function-declaration -Wshadow"
+ 
+ AC_SUBST(AM_CFLAGS)
+ AC_SUBST(AM_LDFLAGS)
diff --git a/recipes/libusb/libusb1_1.0.0.bb b/recipes/libusb/libusb1_1.0.0.bb
index 8450a7c946..978d819a6f 100644
--- a/recipes/libusb/libusb1_1.0.0.bb
+++ b/recipes/libusb/libusb1_1.0.0.bb
@@ -9,6 +9,8 @@ PR = "r0"
 SRC_URI = "\
   ${SOURCEFORGE_MIRROR}/libusb/libusb-${PV}.tar.bz2 \
 "
+SRC_URI_append_nylon = " file://gcc-3-compatibility.patch;patch=1 \
+"
 S = "${WORKDIR}/libusb-${PV}"
 
 inherit autotools pkgconfig binconfig lib_package
diff --git a/recipes/libusb/libusb1_1.0.1.bb b/recipes/libusb/libusb1_1.0.1.bb
index 1af46bcf98..3856812965 100644
--- a/recipes/libusb/libusb1_1.0.1.bb
+++ b/recipes/libusb/libusb1_1.0.1.bb
@@ -8,6 +8,8 @@ LICENSE = "LGPL"
 SRC_URI = "\
   ${SOURCEFORGE_MIRROR}/libusb/libusb-${PV}.tar.bz2 \
 "
+SRC_URI_append_nylon = " file://gcc-3-compatibility.patch;patch=1 \
+"
 S = "${WORKDIR}/libusb-${PV}"
 
 inherit autotools_stage binconfig lib_package
diff --git a/recipes/linux-hotplug/linux-hotplug-20040920/hotplug-binary-path.patch b/recipes/linux-hotplug/linux-hotplug-20040920/hotplug-binary-path.patch
new file mode 100644
index 0000000000..c68a0099fa
--- /dev/null
+++ b/recipes/linux-hotplug/linux-hotplug-20040920/hotplug-binary-path.patch
@@ -0,0 +1,20 @@
+--- hotplug-2004_09_20/etc/hotplug/pci.rc-orig	2009-04-07 21:00:18.000000000 +0200
++++ hotplug-2004_09_20/etc/hotplug/pci.rc	2009-04-07 21:00:43.000000000 +0200
+@@ -38,7 +38,7 @@
+ 		sub_vendor_id=`cat $PCI_DEVICE/subsystem_vendor`
+ 		sub_device_id=`cat $PCI_DEVICE/subsystem_device`
+ 		PCI_SUBSYS_ID="${sub_vendor_id#0x}:${sub_device_id#0x}"
+-		/sbin/hotplug pci
++		/usr/sbin/hotplug pci
+ 	    done
+ 	fi
+     else
+@@ -53,7 +53,7 @@
+ 	for BUS in `cd /proc/bus/pci;find * -type d -print`; do
+ 	    for SLOT_FUNC in `cd /proc/bus/pci/$BUS; echo *`; do
+ 		PCI_SLOT=$BUS:$SLOT_FUNC
+-		/sbin/hotplug pci
++		/usr/sbin/hotplug pci
+ 	    done
+ 	done
+     fi
diff --git a/recipes/linux-hotplug/linux-hotplug_20040920.bb b/recipes/linux-hotplug/linux-hotplug_20040920.bb
index 6209504c20..5cab3b81d8 100644
--- a/recipes/linux-hotplug/linux-hotplug_20040920.bb
+++ b/recipes/linux-hotplug/linux-hotplug_20040920.bb
@@ -27,7 +27,8 @@ SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/kernel/hotplug/hotplug-2004_09_20
 	file://sysconfig-usb \
 	file://isapnp-exit.diff;patch=1 \
 	file://usb-storage \
-	file://soc.agent"
+	file://soc.agent \
+	file://hotplug-binary-path.patch;patch=1"
 
 SRC_URI_append_openzaurus = " file://quiet-pci.patch;patch=1"
 
diff --git a/recipes/linux-libc-headers/linux-libc-headers_2.6.18+2.6.19-rc1.bb b/recipes/linux-libc-headers/linux-libc-headers_2.6.18+2.6.19-rc1.bb
index 73e9b07d7f..3a6de1c72e 100644
--- a/recipes/linux-libc-headers/linux-libc-headers_2.6.18+2.6.19-rc1.bb
+++ b/recipes/linux-libc-headers/linux-libc-headers_2.6.18+2.6.19-rc1.bb
@@ -49,9 +49,12 @@ do_stage () {
 }
 
 do_stage_append_nylon () {
-	cp -pPR include/asm-${ARCH}/* ${STAGING_INCDIR}/asm/
-	cp -pPR include/asm-${ARCH}/* ${CROSS_DIR}/${TARGET_SYS}/include/asm/
-	cp -pPR include/linux/* ${STAGING_INCDIR}/linux/
-	cp -pPR include/linux/* ${CROSS_DIR}/${TARGET_SYS}/include/linux/
+	install -d ${STAGING_INCDIR}/asm/
+	cp -vpPR include/asm-${ARCH}/* ${STAGING_INCDIR}/asm/
+	install -d ${CROSS_DIR}/${TARGET_SYS}/include/asm/
+	cp -vpPR include/asm-${ARCH}/* ${CROSS_DIR}/${TARGET_SYS}/include/asm/
+	cp -vpPR include/linux/* ${STAGING_INCDIR}/linux/
+	install -d ${CROSS_DIR}/${TARGET_SYS}/include/linux/
+	cp -vpPR include/linux/* ${CROSS_DIR}/${TARGET_SYS}/include/linux/
 }
 
diff --git a/recipes/linux-libc-headers/linux-libc-headers_2.6.18.bb b/recipes/linux-libc-headers/linux-libc-headers_2.6.18.bb
index d71b68a930..60d621b1dc 100644
--- a/recipes/linux-libc-headers/linux-libc-headers_2.6.18.bb
+++ b/recipes/linux-libc-headers/linux-libc-headers_2.6.18.bb
@@ -69,9 +69,12 @@ do_stage () {
 }
 
 do_stage_append_nylon () {
-	cp -pPR include/asm-${ARCH}/* ${STAGING_INCDIR}/asm/
-	cp -pPR include/asm-${ARCH}/* ${CROSS_DIR}/${TARGET_SYS}/include/asm/
-	cp -pPR include/linux/* ${STAGING_INCDIR}/linux/
-	cp -pPR include/linux/* ${CROSS_DIR}/${TARGET_SYS}/include/linux/
+	install -d ${STAGING_INCDIR}/asm/
+	cp -vpPR include/asm-${ARCH}/* ${STAGING_INCDIR}/asm/
+	install -d ${CROSS_DIR}/${TARGET_SYS}/include/asm/
+	cp -vpPR include/asm-${ARCH}/* ${CROSS_DIR}/${TARGET_SYS}/include/asm/
+	cp -vpPR include/linux/* ${STAGING_INCDIR}/linux/
+	install -d ${CROSS_DIR}/${TARGET_SYS}/include/linux/
+	cp -vpPR include/linux/* ${CROSS_DIR}/${TARGET_SYS}/include/linux/
 }
 
diff --git a/recipes/logrotate-script/logrotate-script_cvs.bb b/recipes/logrotate-script/logrotate-script_cvs.bb
index a46b265e2f..2c6fd909b8 100644
--- a/recipes/logrotate-script/logrotate-script_cvs.bb
+++ b/recipes/logrotate-script/logrotate-script_cvs.bb
@@ -4,7 +4,7 @@ SECTION = "admin"
 PRIORITY = "optional"
 LICENSE = "GPL"
 
-SRC_URI = "http://meshcube.org/download/logrotate_${SRCDATE}.tgz"
+SRC_URI = "http://download.berlin.freifunk.net/meshcube.org/nylon/stable/sources/logrotate_${SRCDATE}.tgz"
 S = "${WORKDIR}/${PN}"
 
 do_install() {
diff --git a/recipes/meta/nylon-feed.inc b/recipes/meta/nylon-feed.inc
index f20bcec824..15f0b20881 100644
--- a/recipes/meta/nylon-feed.inc
+++ b/recipes/meta/nylon-feed.inc
@@ -56,7 +56,6 @@ tcl \
 tcpdump \
 tinc \
 tzdata \
-usbutils \
 vtun \
 wireless-tools \
 wpa-supplicant \
diff --git a/recipes/mobilemesh/mobilemesh_1.2.bb b/recipes/mobilemesh/mobilemesh_1.2.bb
index df8f2f98bb..4fdf2aba3b 100644
--- a/recipes/mobilemesh/mobilemesh_1.2.bb
+++ b/recipes/mobilemesh/mobilemesh_1.2.bb
@@ -3,7 +3,7 @@ DESCRIPTION = "MobileMesh mobile ad-hoc routing protocol"
 HOMEPAGE = "http://www.mitre.org/work/tech_transfer/mobilemesh/"
 LICENSE = "GPL"
 DEPENDS = "openssl"
-SRC_URI = "http://meshcube.org/download/mobilemesh_1.2.tgz"
+SRC_URI = "http://download.berlin.freifunk.net/meshcube.org/nylon/stable/sources/mobilemesh_1.2.tgz"
 PR = "r1"
 
 S = "${WORKDIR}/mobilemesh"
@@ -34,4 +34,7 @@ do_install() {
 	install ${S}/mobilemesh.init ${D}${sysconfdir}/init.d/mobilemesh
 }
 
+FILES_${PN}-dbg += "${sysconfdir}/mobilemesh/mmtodot.debug ${sysconfdir}/mobilemesh/mmborder.debug \
+	${sysconfdir}/mobilemesh/mmrp.debug ${sysconfdir}/mobilemesh/mmdiscover.debug"
 CONFFILES_${PN}_nylon = "${sysconfdir}/mobilemesh/mmrp.conf ${sysconfdir}/mobilemesh/mmdiscover.conf"
+
diff --git a/recipes/netbase/netbase/mtx-1/interfaces b/recipes/netbase/netbase/mtx-1/interfaces
index a7c6da5752..ae50a5cec3 100644
--- a/recipes/netbase/netbase/mtx-1/interfaces
+++ b/recipes/netbase/netbase/mtx-1/interfaces
@@ -1,24 +1,34 @@
 # /etc/network/interfaces -- configuration file for ifup(8), ifdown(8)
  
-# The loopback interface
+# the loopback interface
 auto lo
 iface lo inet loopback
 
-# Ethernet
+# ethernet
 auto eth0
 iface eth0 inet dhcp
+	alias conf 192.168.0.250
 
-# wlan interface 1 for clients
-auto wlan0
+# auto is not needed for the wlan interfaces
+# - hotplug will ifup the interfaces automatically
+
+# first wlan interface for clients
 iface wlan0 inet static
 	address 10.0.0.1
 	netmask 255.0.0.0
 	wireless_mode master
 	wireless_essid cube-ap
 	wireless_channel 1
-	
-# wlan interface 2 for mesh
-auto wlan1
+
+iface ath0 inet static
+	address 10.0.0.1
+	netmask 255.0.0.0
+	wireless_standard g
+	wireless_mode master
+	wireless_essid cube-ap
+	wireless_channel 1
+
+# second wlan interface for mesh
 iface wlan1 inet static
 	address 172.16.0.1
 	netmask 255.240.0.0
@@ -27,3 +37,12 @@ iface wlan1 inet static
 	wireless_essid cube-mesh
 	wireless_channel 11
 	wireless_rts 250
+
+iface ath1 inet static
+	address 172.16.0.1
+	netmask 255.240.0.0
+	broadcast 172.31.255.255
+	wireless_mode ad-hoc
+	wireless_essid cube-mesh
+	wireless_channel 11
+	wireless_rts 250
diff --git a/recipes/netbase/netbase/mtx-2/interfaces b/recipes/netbase/netbase/mtx-2/interfaces
index a7c6da5752..ae50a5cec3 100644
--- a/recipes/netbase/netbase/mtx-2/interfaces
+++ b/recipes/netbase/netbase/mtx-2/interfaces
@@ -1,24 +1,34 @@
 # /etc/network/interfaces -- configuration file for ifup(8), ifdown(8)
  
-# The loopback interface
+# the loopback interface
 auto lo
 iface lo inet loopback
 
-# Ethernet
+# ethernet
 auto eth0
 iface eth0 inet dhcp
+	alias conf 192.168.0.250
 
-# wlan interface 1 for clients
-auto wlan0
+# auto is not needed for the wlan interfaces
+# - hotplug will ifup the interfaces automatically
+
+# first wlan interface for clients
 iface wlan0 inet static
 	address 10.0.0.1
 	netmask 255.0.0.0
 	wireless_mode master
 	wireless_essid cube-ap
 	wireless_channel 1
-	
-# wlan interface 2 for mesh
-auto wlan1
+
+iface ath0 inet static
+	address 10.0.0.1
+	netmask 255.0.0.0
+	wireless_standard g
+	wireless_mode master
+	wireless_essid cube-ap
+	wireless_channel 1
+
+# second wlan interface for mesh
 iface wlan1 inet static
 	address 172.16.0.1
 	netmask 255.240.0.0
@@ -27,3 +37,12 @@ iface wlan1 inet static
 	wireless_essid cube-mesh
 	wireless_channel 11
 	wireless_rts 250
+
+iface ath1 inet static
+	address 172.16.0.1
+	netmask 255.240.0.0
+	broadcast 172.31.255.255
+	wireless_mode ad-hoc
+	wireless_essid cube-mesh
+	wireless_channel 11
+	wireless_rts 250
diff --git a/recipes/openswan/openswan_2.2.0.bb b/recipes/openswan/openswan_2.2.0.bb
index b1c5271b13..bcf5a28756 100644
--- a/recipes/openswan/openswan_2.2.0.bb
+++ b/recipes/openswan/openswan_2.2.0.bb
@@ -5,7 +5,7 @@ HOMEPAGE = "http://www.openswan.org"
 LICENSE = "GPLv2"
 DEPENDS = "gmp flex-native"
 RRECOMMENDS = "kernel-module-ipsec"
-RDEPENDS_nylon = "perl"
+RDEPENDS_append_nylon = "perl"
 PR = "r5"
 
 SRC_URI = "http://www.openswan.org/download/old/openswan-${PV}.tar.gz \
diff --git a/recipes/openswan/openswan_2.4.7.bb b/recipes/openswan/openswan_2.4.7.bb
index 353e0eacdd..28e599b282 100644
--- a/recipes/openswan/openswan_2.4.7.bb
+++ b/recipes/openswan/openswan_2.4.7.bb
@@ -5,7 +5,7 @@ HOMEPAGE = "http://www.openswan.org"
 LICENSE = "GPLv2"
 DEPENDS = "gmp flex-native"
 RRECOMMENDS = "kernel-module-ipsec"
-RDEPENDS_nylon = "perl"
+RDEPENDS_append_nylon = "perl"
 PR = "r0"
 
 SRC_URI = "http://www.openswan.org/download/openswan-${PV}.tar.gz \
diff --git a/recipes/perl/perl-native_5.8.8.bb b/recipes/perl/perl-native_5.8.8.bb
index e3d73845fc..57e9e1c394 100644
--- a/recipes/perl/perl-native_5.8.8.bb
+++ b/recipes/perl/perl-native_5.8.8.bb
@@ -85,5 +85,11 @@ do_stage_append() {
             install $i ${STAGING_LIBDIR_NATIVE}/perl/${PV}/CORE
         done
 }
+do_stage_append_nylon() {
+        # get rid of definitions not supported by the gcc version we use for nylon...
+        for i in ${STAGING_LIBDIR_NATIVE}/perl/${PV}/Config_heavy.pl ${STAGING_DIR_HOST}/perl/config.sh; do
+                perl -pi -e 's/-Wdeclaration-after-statement //g' ${i}
+        done
+}
 
 PARALLEL_MAKE = ""
diff --git a/recipes/rrdtool/rrdtool_1.0.49.bb b/recipes/rrdtool/rrdtool_1.0.49.bb
index 11968ea609..f4216487df 100644
--- a/recipes/rrdtool/rrdtool_1.0.49.bb
+++ b/recipes/rrdtool/rrdtool_1.0.49.bb
@@ -5,13 +5,17 @@ LICENSE = "GPLv2"
 DEPENDS = "libpng zlib"
 DEPENDS_rddtool-perl = "perl-module-lib perl-module-dynaloader"
 PR = "r2"
-SRC_URI = "http://oss.oetiker.ch/rrdtool/pub/rrdtool-1.0.x/rdtool-${PV}.tar.gz \
+SRC_URI = "http://oss.oetiker.ch/rrdtool/pub/rrdtool-1.0.x/rrdtool-${PV}.tar.gz \
 	file://perl-make-options.diff;patch=1;pnum=0"
 
 inherit autotools
 
 EXTRA_OECONF = "--enable-shared --enable-local-libpng --enable-local-zlib --program-prefix=''"
 
+do_configure_append_nylon() {
+  perl -pi -e 's/-Wdeclaration-after-statement //g' ${S}/perl-shared/Makefile
+}
+
 do_install_append() {
 	install -d ${D}${docdir}/rrdtool/
 	mv ${D}/usr/html ${D}${docdir}/rrdtool/
@@ -24,4 +28,5 @@ do_stage () {
 	autotools_stage_all
 }
 
-FILES_${PN} += "${libdir}/perl"
+FILES_${PN} += "${libdir}/perl/auto/RRDs/RRDs.bs ${libdir}/perl/auto/RRDs/RRDs.so ${libdir}/perl/RRDs.pm ${libdir}/perl/RRDp.pm"
+
diff --git a/recipes/wlan-ng/wlan-ng-utils.inc b/recipes/wlan-ng/wlan-ng-utils.inc
index 3dd25d9d7f..736e12b942 100644
--- a/recipes/wlan-ng/wlan-ng-utils.inc
+++ b/recipes/wlan-ng/wlan-ng-utils.inc
@@ -10,11 +10,11 @@ DEPENDS = "virtual/kernel"
 SRC_URI = "file://only-the-utils.patch;patch=1 \
 	file://wlan-ng.modutils \
 	file://wlan.agent \
-	file://usbctl \
 	file://resume \
 	file://pre-up \
 	file://post-down \
 	file://config.in"
+SRC_URI_append_arm = " file://usbctl"
 
 # yeah, it's kind of backwards, but otherwise the config step will fail
 inherit module
@@ -59,11 +59,14 @@ do_install() {
 	install -m 0755 ${WORKDIR}/post-down ${D}${sysconfdir}/network/if-post-down.d/wlan-ng
 	install -d ${D}${sysconfdir}/apm/resume.d
 	install -m 0755 ${WORKDIR}/resume ${D}${sysconfdir}/apm/resume.d/wlan-ng
-	install -m 0755 ${WORKDIR}/usbctl ${D}${base_sbindir}/usbctl
 	install -d ${D}${mandir}/man1
 	install -m 0644 ${S}/man/*.1 ${D}${mandir}/man1/
 	rm -rf ${D}/usr/local/man
 }
 
+do_install_append_arm() {
+	install -m 0755 ${WORKDIR}/usbctl ${D}${base_sbindir}/usbctl
+}
+
 FILES_${PN}-dbg += "/sbin/.debug"
 FILES_${PN} = "/etc /sbin"