Merge branch 'master' of git+ssh://openadk.org/git/openadk

53 files changed, 4388 insertions, 9237 deletions

diff --git a/mk/modules.mk b/mk/modules.mk
index ca1bf178c..5722d9800 100644
--- a/mk/modules.mk
+++ b/mk/modules.mk
@@ -1204,7 +1204,7 @@ $(eval $(call KMOD_template,SND_BCM2835,snd-bcm2835,\
 #,65))
 
 $(eval $(call KMOD_template,USB_VIDEO_CLASS,usb-video-class,\
-	$(MODULES_DIR)/kernel/drivers/media/video/uvc/uvcvideo \
+	$(MODULES_DIR)/kernel/drivers/media/usb/uvc/uvcvideo \
 ,70))
 
 $(eval $(call KMOD_template,USB_GSPCA,usb-gspca,\
diff --git a/mk/vars.mk b/mk/vars.mk
index e22a46beb..5c291f604 100644
--- a/mk/vars.mk
+++ b/mk/vars.mk
@@ -99,7 +99,7 @@ TARGET_LD:=		${TARGET_COMPILER_PREFIX}ld
 
 TARGET_CPPFLAGS:=	
 TARGET_CFLAGS:=		$(TARGET_CFLAGS_ARCH) -fwrapv -fno-ident -fhonour-copts $(ADK_TARGET_ABI_CFLAGS)
-TARGET_CFLAGS_LIBC:=	$(TARGET_CFLAGS_ARCH) -fwrapv -fno-ident -fhonour-copts $(TARGET_OPTIMIZATION) -fPIC
+TARGET_CFLAGS_LIBC:=	$(TARGET_CFLAGS_ARCH) -fwrapv -fno-ident -fhonour-copts $(TARGET_OPTIMIZATION)
 TARGET_CXXFLAGS:=	$(TARGET_CFLAGS_ARCH) -fwrapv -fno-ident
 TARGET_LDFLAGS:=	-L$(STAGING_TARGET_DIR)/lib -L$(STAGING_TARGET_DIR)/usr/lib \
 			-Wl,-O2 -Wl,-rpath -Wl,/usr/lib \
@@ -167,7 +167,8 @@ TARGET_CONFIGURE_OPTS=	PATH='${TARGET_PATH}' \
 			CC='$(TARGET_CC)' \
 			GCC='$(TARGET_CC)' \
 			CXX='$(TARGET_CXX)' \
-			CROSS='$(TARGET_CROSS)'
+			CROSS='$(TARGET_CROSS)' \
+			ARCH=${ARCH}
 
 HOST_CONFIGURE_OPTS=	CC_FOR_BUILD='${CC_FOR_BUILD}' \
 			CPPFLAGS_FOR_BUILD='${CPPFLAGS_FOR_BUILD}' \
diff --git a/package/MesaLib/Makefile b/package/MesaLib/Makefile
index d62773bd3..008c4eb4f 100644
--- a/package/MesaLib/Makefile
+++ b/package/MesaLib/Makefile
@@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		MesaLib
 PKG_VERSION:=		8.0.5
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		cda5d101f43b8784fa60bdeaca4056f2
 PKG_DESCR:=		MESA library
 PKG_SECTION:=		libs
diff --git a/package/MesaLib/patches/patch-src_gallium_auxiliary_util_u_debug_symbol_c b/package/MesaLib/patches/patch-src_gallium_auxiliary_util_u_debug_symbol_c
new file mode 100644
index 000000000..f1d92ca8c
--- /dev/null
+++ b/package/MesaLib/patches/patch-src_gallium_auxiliary_util_u_debug_symbol_c
@@ -0,0 +1,26 @@
+--- Mesa-8.0.5.orig/src/gallium/auxiliary/util/u_debug_symbol.c	2012-10-24 21:03:59.000000000 +0200
++++ Mesa-8.0.5/src/gallium/auxiliary/util/u_debug_symbol.c	2013-09-25 17:45:12.000000000 +0200
+@@ -151,23 +151,6 @@ debug_symbol_name_dbghelp(const void *ad
+ }
+ #endif
+ 
+-#ifdef __GLIBC__
+-#include <execinfo.h>
+-
+-/* This can only provide dynamic symbols, or binary offsets into a file.
+- *
+- * To fix this, post-process the output with tools/addr2line.sh
+- */
+-static INLINE void
+-debug_symbol_name_glibc(const void *addr, char* buf, unsigned size)
+-{
+-   char** syms = backtrace_symbols((void**)&addr, 1);
+-   strncpy(buf, syms[0], size);
+-   buf[size - 1] = 0;
+-   free(syms);
+-}
+-#endif
+-
+ void
+ debug_symbol_name(const void *addr, char* buf, unsigned size)
+ {
diff --git a/package/MesaLib/patches/patch-src_glsl_strtod_c b/package/MesaLib/patches/patch-src_glsl_strtod_c
new file mode 100644
index 000000000..ce6514dbb
--- /dev/null
+++ b/package/MesaLib/patches/patch-src_glsl_strtod_c
@@ -0,0 +1,32 @@
+--- Mesa-8.0.5.orig/src/glsl/strtod.c	2012-10-24 21:03:59.000000000 +0200
++++ Mesa-8.0.5/src/glsl/strtod.c	2013-09-25 17:34:06.000000000 +0200
+@@ -25,14 +25,6 @@
+ 
+ 
+ #include <stdlib.h>
+-
+-#ifdef _GNU_SOURCE
+-#include <locale.h>
+-#ifdef __APPLE__
+-#include <xlocale.h>
+-#endif
+-#endif
+-
+ #include "strtod.h"
+ 
+ 
+@@ -44,14 +36,5 @@
+ double
+ glsl_strtod(const char *s, char **end)
+ {
+-#if defined(_GNU_SOURCE) && !defined(__CYGWIN__) && !defined(__FreeBSD__) && \
+-   !defined(__HAIKU__)
+-   static locale_t loc = NULL;
+-   if (!loc) {
+-      loc = newlocale(LC_CTYPE_MASK, "C", NULL);
+-   }
+-   return strtod_l(s, end, loc);
+-#else
+    return strtod(s, end);
+-#endif
+ }
diff --git a/package/MesaLib/patches/patch-src_mesa_main_imports_c b/package/MesaLib/patches/patch-src_mesa_main_imports_c
new file mode 100644
index 000000000..10cbca86a
--- /dev/null
+++ b/package/MesaLib/patches/patch-src_mesa_main_imports_c
@@ -0,0 +1,33 @@
+--- Mesa-8.0.5.orig/src/mesa/main/imports.c	2012-10-24 21:03:59.000000000 +0200
++++ Mesa-8.0.5/src/mesa/main/imports.c	2013-09-25 17:41:11.000000000 +0200
+@@ -49,14 +49,6 @@
+ #include "mtypes.h"
+ #include "version.h"
+ 
+-#ifdef _GNU_SOURCE
+-#include <locale.h>
+-#ifdef __APPLE__
+-#include <xlocale.h>
+-#endif
+-#endif
+-
+-
+ #define MAXSTRING 4000  /* for vsnprintf() */
+ 
+ #ifdef WIN32
+@@ -766,14 +758,7 @@ _mesa_strdup( const char *s )
+ float
+ _mesa_strtof( const char *s, char **end )
+ {
+-#if defined(_GNU_SOURCE) && !defined(__CYGWIN__) && !defined(__FreeBSD__) && \
+-   !defined(ANDROID) && !defined(__HAIKU__)
+-   static locale_t loc = NULL;
+-   if (!loc) {
+-      loc = newlocale(LC_CTYPE_MASK, "C", NULL);
+-   }
+-   return strtof_l(s, end, loc);
+-#elif defined(_ISOC99_SOURCE) || (defined(_XOPEN_SOURCE) && _XOPEN_SOURCE >= 600)
++#if defined(_ISOC99_SOURCE) || (defined(_XOPEN_SOURCE) && _XOPEN_SOURCE >= 600)
+    return strtof(s, end);
+ #else
+    return (float)strtod(s, end);
diff --git a/package/boost/Makefile b/package/boost/Makefile
index 168b20070..271b2937c 100644
--- a/package/boost/Makefile
+++ b/package/boost/Makefile
@@ -15,7 +15,7 @@ PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=boost/}
 DISTFILES:=		boost_1_54_0.tar.gz
 WRKDIST=		${WRKDIR}/${PKG_NAME}_1_54_0
 
-PKG_ARCH_DEPENDS:=	!mips
+PKG_LIBC_DEPENDS:=	eglibc glibc musl
 
 PKG_SUBPKGS:=		BOOST BOOST_DEV
 PKGSD_BOOST_DEV:=	boost header files
diff --git a/package/fltk/Makefile b/package/fltk/Makefile
index 8ac5c3c21..de5cb6459 100644
--- a/package/fltk/Makefile
+++ b/package/fltk/Makefile
@@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		fltk
 PKG_VERSION:=		1.3.2
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		9f7e707d4fb7a5a76f0f9b73ff70623d
 PKG_DESCR:=		fast light toolkit
 PKG_SECTION:=		libs
@@ -25,7 +25,7 @@ include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,LIBFLTK,libfltk,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-LIBRARIES:=-nodefaultlibs -luClibc++ -lgcc -lm -lc
+LIBRARIES:=-nodefaultlibs -luClibc++ -lgcc -lgcc_s -lm -lc
 ifeq ($(ADK_TOOLCHAIN_GCC_USE_SSP),y)
 LIBRARIES+=-lssp -lssp_nonshared
 endif
diff --git a/package/jamvm/Makefile b/package/jamvm/Makefile
index aeb37e177..da0b141af 100644
--- a/package/jamvm/Makefile
+++ b/package/jamvm/Makefile
@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		jamvm
 PKG_VERSION:=		1.5.4
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		7654e9657691f5f09c4f481ed4686176
 PKG_DESCR:=		A Java Virtual Machine (JVM) implementation
 PKG_SECTION:=		lang
@@ -14,7 +14,7 @@ PKG_BUILDDEP:=		libffi zlib
 PKG_URL:=		http://jamvm.sourceforge.net
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=jamvm/}
 
-PKG_ARCH_DEPENDS:=	!cris !mips !avr32
+PKG_ARCH_DEPENDS:=	!cris !avr32
 
 include ${TOPDIR}/mk/package.mk
 
@@ -24,6 +24,12 @@ BUILD_STYLE:=		manual
 INSTALL_STYLE:=		manual
 
 CONFIGURE_ARGS+=	--enable-ffi
+ifeq ($(ARCH),mips)
+CONFIGURE_ARGS+=	--disable-tls
+endif
+ifeq ($(ARCH),arm)
+CONFIGURE_ARGS+=	--disable-tls
+endif
 
 do-build:
 	${INSTALL_DIR} ${WRKINST}/usr/bin
diff --git a/package/libnl/Makefile b/package/libnl/Makefile
index fc40fd2ac..68b45bf0c 100644
--- a/package/libnl/Makefile
+++ b/package/libnl/Makefile
@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		libnl
 PKG_VERSION:=		3.2.22
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		2e1c889494d274aca24ce5f6a748e66e
 PKG_DESCR:=		Netlink library
 PKG_SECTION:=		libs
diff --git a/package/libnl/patches/patch-lib_addr_c b/package/libnl/patches/patch-lib_addr_c
new file mode 100644
index 000000000..7e1622bc4
--- /dev/null
+++ b/package/libnl/patches/patch-lib_addr_c
@@ -0,0 +1,16 @@
+--- libnl-3.2.22.orig/lib/addr.c	2013-04-05 10:35:44.000000000 +0200
++++ libnl-3.2.22/lib/addr.c	2013-09-26 11:13:50.000000000 +0200
+@@ -33,6 +33,13 @@
+ #include <netlink/addr.h>
+ #include <linux/socket.h>
+ 
++#ifndef PF_RDS
++#define PF_RDS		21
++#endif
++#ifndef AF_RDS
++#define AF_RDS		PF_RDS
++#endif
++
+ /* All this DECnet stuff is stolen from iproute2, thanks to whoever wrote
+  * this, probably Alexey. */
+ static inline uint16_t dn_ntohs(uint16_t addr)
diff --git a/package/libxml2/Makefile b/package/libxml2/Makefile
index 2ecd71dd5..602d2d551 100644
--- a/package/libxml2/Makefile
+++ b/package/libxml2/Makefile
@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		libxml2
 PKG_VERSION:=		2.9.1
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		9c0cfef285d5c4a5c80d00904ddab380
 PKG_DESCR:=		XML C parser and toolkit
 PKG_SECTION:=		libs
@@ -63,6 +63,9 @@ CONFIGURE_ARGS+=	--without-c14n \
 			--with-xptr \
 			--with-zlib
 
+pre-configure:
+	${INSTALL_DIR} ${STAGING_DIR}/usr/lib/site-packages
+
 libxml2-install:
 	${INSTALL_DIR} ${IDIR_LIBXML2}/usr/lib
 	${CP} ${WRKINST}/usr/lib/libxml2.so* ${IDIR_LIBXML2}/usr/lib
diff --git a/package/libxml2/patches/patch-configure b/package/libxml2/patches/patch-configure
index 13406bc62..2f9b3b5bf 100644
--- a/package/libxml2/patches/patch-configure
+++ b/package/libxml2/patches/patch-configure
@@ -1,5 +1,5 @@
 --- libxml2-2.9.1.orig/configure	2013-04-19 09:36:11.000000000 +0200
-+++ libxml2-2.9.1/configure	2013-09-04 15:16:48.000000000 +0200
++++ libxml2-2.9.1/configure	2013-09-25 13:59:27.000000000 +0200
 @@ -14010,17 +14010,17 @@ case ${host} in
  esac
  
@@ -22,6 +22,15 @@
      else
          if test -x "$with_python/python.exe"
          then
+@@ -14122,7 +14122,7 @@ fi
+ 	else
+ 	    if test -d $with_python/lib/site-packages
+ 	    then
+-		PYTHON_SITE_PACKAGES=$with_python/lib/site-packages
++		PYTHON_SITE_PACKAGES=/usr/lib/python$PYTHON_VERSION/site-packages
+ 	    else
+ 		PYTHON_SITE_PACKAGES=`$PYTHON -c "from distutils import sysconfig; print(sysconfig.get_python_lib())"`
+ 	    fi
 @@ -14148,7 +14148,7 @@ else
      PYTHON_SUBDIR=
  fi
diff --git a/package/mesa-demos/Makefile b/package/mesa-demos/Makefile
index 65506f4e7..a0ab20771 100644
--- a/package/mesa-demos/Makefile
+++ b/package/mesa-demos/Makefile
@@ -5,12 +5,12 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		mesa-demos
 PKG_VERSION:=		8.1.0
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		4049d98dd4131212e2842b770f1b0fa5
 PKG_DESCR:=		MESA demo apps
 PKG_SECTION:=		misc
 PKG_DEPENDS:=		mesalib
-PKG_BUILDDEP:=		MesaLib
+PKG_BUILDDEP:=		MesaLib libglew
 PKG_SITES:=		ftp://ftp.freedesktop.org/pub/mesa/demos/${PKG_VERSION}/
 
 PKG_SUBPKGS:=		GLXINFO
diff --git a/package/openafs/Makefile b/package/openafs/Makefile
new file mode 100644
index 000000000..37b37980d
--- /dev/null
+++ b/package/openafs/Makefile
@@ -0,0 +1,49 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=		openafs
+PKG_VERSION:=		1.6.5
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		e33e0b031760d4f90815d40b8ab3c540
+PKG_DESCR:=		AFS implementation
+PKG_SECTION:=		net/fs
+PKG_URL:=		http://openafs.org
+PKG_SITES:=		http://www.openafs.org/dl/openafs/${PKG_VERSION}/
+
+PKG_CFLINE_OPENAFS+=	select ADK_KERNEL_KEYS
+
+DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}-src.tar.bz2
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,OPENAFS,openafs,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+
+XAKE_FLAGS+=		GCC_HONOUR_COPTS=s
+CONFIGURE_ENV+=		ac_cv_path_PATH_CPP=$(TARGET_CROSS)cpp
+CONFIGURE_ARGS:=	--with-afs-sysname=$(ARCH)_linux26 \
+			--with-linux-kernel-headers=${LINUX_DIR} \
+			--disable-strip-binaries \
+			--disable-linux-syscall-probing
+
+openafs-install:
+	$(INSTALL_DIR) $(IDIR_OPENAFS)/usr/bin
+	$(INSTALL_DIR) $(IDIR_OPENAFS)/usr/lib
+	$(INSTALL_DIR) $(IDIR_OPENAFS)/usr/sbin
+	$(INSTALL_DIR) $(IDIR_OPENAFS)/usr/libexec/openafs
+	$(INSTALL_BIN) $(WRKINST)/usr/bin/* \
+		$(IDIR_OPENAFS)/usr/bin
+	$(INSTALL_BIN) $(WRKINST)/usr/sbin/* \
+		$(IDIR_OPENAFS)/usr/sbin
+	$(INSTALL_BIN) $(WRKINST)/usr/libexec/openafs/* \
+		$(IDIR_OPENAFS)/usr/libexec/openafs
+	$(CP) $(WRKINST)/usr/lib/*.so* \
+		$(IDIR_OPENAFS)/usr/lib
+	${INSTALL_DIR} ${IDIR_OPENAFS}/etc/modules.d/
+	echo "libafs" > ${IDIR_OPENAFS}/etc/modules.d/90-libafs
+	${INSTALL_DIR} ${IDIR_OPENAFS}/lib/modules/${KERNEL_VERSION}
+	$(CP) $(WRKINST)/usr/lib/openafs/libafs-${KERNEL_VERSION}.ko \
+		$(IDIR_OPENAFS)/lib/modules/${KERNEL_VERSION}/libafs.ko
+
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/openafs/patches/patch-configure b/package/openafs/patches/patch-configure
new file mode 100644
index 000000000..72205410d
--- /dev/null
+++ b/package/openafs/patches/patch-configure
@@ -0,0 +1,1183 @@
+--- openafs-1.6.5.orig/configure	2013-07-18 07:31:08.000000000 +0200
++++ openafs-1.6.5/configure	2013-09-23 21:55:38.235187280 +0200
+@@ -7258,7 +7258,7 @@ void conftest(void)
+ MODULE_LICENSE("http://www.openafs.org/dl/license10.html");
+ _ACEOF
+     echo make -C $LINUX_KERNEL_BUILD M=$SRCDIR_PARENT/conftest.dir modules KBUILD_VERBOSE=1 >&5 &&
+-    make -C $LINUX_KERNEL_BUILD M=$SRCDIR_PARENT/conftest.dir modules KBUILD_VERBOSE=1 >&5 2>conftest.err &&
++    make -C $LINUX_KERNEL_BUILD M=$SRCDIR_PARENT/conftest.dir ARCH=$ARCH CROSS_COMPILE=$CROSS modules KBUILD_VERBOSE=1 >&5 2>conftest.err &&
+     ! grep -i "WARNING: .* undefined!$" conftest.err >/dev/null 2>&1
+     then ac_cv_linux_is_uml=yes
+     else
+@@ -7590,8 +7590,8 @@ void conftest(void)
+ 
+ MODULE_LICENSE("http://www.openafs.org/dl/license10.html");
+ _ACEOF
+-    echo make -C $LINUX_KERNEL_BUILD M=$SRCDIR_PARENT/conftest.dir modules KBUILD_VERBOSE=1 >&5 &&
+-    make -C $LINUX_KERNEL_BUILD M=$SRCDIR_PARENT/conftest.dir modules KBUILD_VERBOSE=1 >&5 2>conftest.err &&
++    echo make -C $LINUX_KERNEL_BUILD ARCH=$ARCH CROSS_COMPILE=$CROSS M=$SRCDIR_PARENT/conftest.dir modules KBUILD_VERBOSE=1 >&5 &&
++    make -C $LINUX_KERNEL_BUILD ARCH=$ARCH CROSS_COMPILE=$CROSS CROSS_COMPILE=$CROSS M=$SRCDIR_PARENT/conftest.dir modules KBUILD_VERBOSE=1 >&5 2>conftest.err &&
+     ! grep -i "WARNING: .* undefined!$" conftest.err >/dev/null 2>&1
+     then ac_linux_kbuild_requires_extra_cflags=no
+     else
+@@ -7664,7 +7664,7 @@ void conftest(void)
+ MODULE_LICENSE("http://www.openafs.org/dl/license10.html");
+ _ACEOF
+     echo make -C $LINUX_KERNEL_BUILD M=$SRCDIR_PARENT/conftest.dir modules KBUILD_VERBOSE=1 >&5 &&
+-    make -C $LINUX_KERNEL_BUILD M=$SRCDIR_PARENT/conftest.dir modules KBUILD_VERBOSE=1 >&5 2>conftest.err &&
++    make -C $LINUX_KERNEL_BUILD ARCH=$ARCH CROSS_COMPILE=$CROSS M=$SRCDIR_PARENT/conftest.dir modules KBUILD_VERBOSE=1 >&5 2>conftest.err &&
+     ! grep -i "WARNING: .* undefined!$" conftest.err >/dev/null 2>&1
+     then :
+     else
+@@ -7750,7 +7750,7 @@ return;
+ MODULE_LICENSE("http://www.openafs.org/dl/license10.html");
+ _ACEOF
+     echo make -C $LINUX_KERNEL_BUILD M=$SRCDIR_PARENT/conftest.dir modules KBUILD_VERBOSE=1 >&5 &&
+-    make -C $LINUX_KERNEL_BUILD M=$SRCDIR_PARENT/conftest.dir modules KBUILD_VERBOSE=1 >&5 2>conftest.err &&
++    make -C $LINUX_KERNEL_BUILD ARCH=$ARCH CROSS_COMPILE=$CROSS M=$SRCDIR_PARENT/conftest.dir modules KBUILD_VERBOSE=1 >&5 2>conftest.err &&
+     ! grep -i "WARNING: .* undefined!$" conftest.err >/dev/null 2>&1
+     then ac_cv_linux_header_config_h=yes
+     else
+@@ -7834,7 +7834,7 @@ return;
+ MODULE_LICENSE("http://www.openafs.org/dl/license10.html");
+ _ACEOF
+     echo make -C $LINUX_KERNEL_BUILD M=$SRCDIR_PARENT/conftest.dir modules KBUILD_VERBOSE=1 >&5 &&
+-    make -C $LINUX_KERNEL_BUILD M=$SRCDIR_PARENT/conftest.dir modules KBUILD_VERBOSE=1 >&5 2>conftest.err &&
++    make -C $LINUX_KERNEL_BUILD ARCH=$ARCH CROSS_COMPILE=$CROSS M=$SRCDIR_PARENT/conftest.dir modules KBUILD_VERBOSE=1 >&5 2>conftest.err &&
+     ! grep -i "WARNING: .* undefined!$" conftest.err >/dev/null 2>&1
+     then ac_cv_linux_header_completion_h=yes
+     else
+@@ -7918,7 +7918,7 @@ return;
+ MODULE_LICENSE("http://www.openafs.org/dl/license10.html");
+ _ACEOF
+     echo make -C $LINUX_KERNEL_BUILD M=$SRCDIR_PARENT/conftest.dir modules KBUILD_VERBOSE=1 >&5 &&
+-    make -C $LINUX_KERNEL_BUILD M=$SRCDIR_PARENT/conftest.dir modules KBUILD_VERBOSE=1 >&5 2>conftest.err &&
++    make -C $LINUX_KERNEL_BUILD ARCH=$ARCH CROSS_COMPILE=$CROSS M=$SRCDIR_PARENT/conftest.dir modules KBUILD_VERBOSE=1 >&5 2>conftest.err &&
+     ! grep -i "WARNING: .* undefined!$" conftest.err >/dev/null 2>&1
+     then ac_cv_linux_header_exportfs_h=yes
+     else
+@@ -8002,7 +8002,7 @@ return;
+ MODULE_LICENSE("http://www.openafs.org/dl/license10.html");
+ _ACEOF
+     echo make -C $LINUX_KERNEL_BUILD M=$SRCDIR_PARENT/conftest.dir modules KBUILD_VERBOSE=1 >&5 &&
+-    make -C $LINUX_KERNEL_BUILD M=$SRCDIR_PARENT/conftest.dir modules KBUILD_VERBOSE=1 >&5 2>conftest.err &&
++    make -C $LINUX_KERNEL_BUILD ARCH=$ARCH CROSS_COMPILE=$CROSS M=$SRCDIR_PARENT/conftest.dir modules KBUILD_VERBOSE=1 >&5 2>conftest.err &&
+     ! grep -i "WARNING: .* undefined!$" conftest.err >/dev/null 2>&1
+     then ac_cv_linux_header_freezer_h=yes
+     else
+@@ -8086,7 +8086,7 @@ return;
+ MODULE_LICENSE("http://www.openafs.org/dl/license10.html");
+ _ACEOF
+     echo make -C $LINUX_KERNEL_BUILD M=$SRCDIR_PARENT/conftest.dir modules KBUILD_VERBOSE=1 >&5 &&
+-    make -C $LINUX_KERNEL_BUILD M=$SRCDIR_PARENT/conftest.dir modules KBUILD_VERBOSE=1 >&5 2>conftest.err &&
++    make -C $LINUX_KERNEL_BUILD ARCH=$ARCH CROSS_COMPILE=$CROSS M=$SRCDIR_PARENT/conftest.dir modules KBUILD_VERBOSE=1 >&5 2>conftest.err &&
+     ! grep -i "WARNING: .* undefined!$" conftest.err >/dev/null 2>&1
+     then ac_cv_linux_header_key_type_h=yes
+     else
+@@ -8170,7 +8170,7 @@ return;
+ MODULE_LICENSE("http://www.openafs.org/dl/license10.html");
+ _ACEOF
+     echo make -C $LINUX_KERNEL_BUILD M=$SRCDIR_PARENT/conftest.dir modules KBUILD_VERBOSE=1 >&5 &&
+-    make -C $LINUX_KERNEL_BUILD M=$SRCDIR_PARENT/conftest.dir modules KBUILD_VERBOSE=1 >&5 2>conftest.err &&
++    make -C $LINUX_KERNEL_BUILD ARCH=$ARCH CROSS_COMPILE=$CROSS M=$SRCDIR_PARENT/conftest.dir modules KBUILD_VERBOSE=1 >&5 2>conftest.err &&
+     ! grep -i "WARNING: .* undefined!$" conftest.err >/dev/null 2>&1
+     then ac_cv_linux_header_semaphore_h=yes
+     else
+@@ -8254,7 +8254,7 @@ return;
+ MODULE_LICENSE("http://www.openafs.org/dl/license10.html");
+ _ACEOF
+     echo make -C $LINUX_KERNEL_BUILD M=$SRCDIR_PARENT/conftest.dir modules KBUILD_VERBOSE=1 >&5 &&
+-    make -C $LINUX_KERNEL_BUILD M=$SRCDIR_PARENT/conftest.dir modules KBUILD_VERBOSE=1 >&5 2>conftest.err &&
++    make -C $LINUX_KERNEL_BUILD ARCH=$ARCH CROSS_COMPILE=$CROSS M=$SRCDIR_PARENT/conftest.dir modules KBUILD_VERBOSE=1 >&5 2>conftest.err &&
+     ! grep -i "WARNING: .* undefined!$" conftest.err >/dev/null 2>&1
+     then ac_cv_linux_header_seq_file_h=yes
+     else
+@@ -8339,7 +8339,7 @@ struct vfs_path _test;
+ MODULE_LICENSE("http://www.openafs.org/dl/license10.html");
+ _ACEOF
+     echo make -C $LINUX_KERNEL_BUILD M=$SRCDIR_PARENT/conftest.dir modules KBUILD_VERBOSE=1 >&5 &&
+-    make -C $LINUX_KERNEL_BUILD M=$SRCDIR_PARENT/conftest.dir modules KBUILD_VERBOSE=1 >&5 2>conftest.err &&
++    make -C $LINUX_KERNEL_BUILD ARCH=$ARCH CROSS_COMPILE=$CROSS M=$SRCDIR_PARENT/conftest.dir modules KBUILD_VERBOSE=1 >&5 2>conftest.err &&
+     ! grep -i "WARNING: .* undefined!$" conftest.err >/dev/null 2>&1
+     then ac_cv_linux_type_struct_vfs_path_exists=yes
+     else
+@@ -8424,7 +8424,7 @@ struct address_space_operations _test; p
+ MODULE_LICENSE("http://www.openafs.org/dl/license10.html");
+ _ACEOF
+     echo make -C $LINUX_KERNEL_BUILD M=$SRCDIR_PARENT/conftest.dir modules KBUILD_VERBOSE=1 >&5 &&
+-    make -C $LINUX_KERNEL_BUILD M=$SRCDIR_PARENT/conftest.dir modules KBUILD_VERBOSE=1 >&5 2>conftest.err &&
++    make -C $LINUX_KERNEL_BUILD ARCH=$ARCH CROSS_COMPILE=$CROSS M=$SRCDIR_PARENT/conftest.dir modules KBUILD_VERBOSE=1 >&5 2>conftest.err &&
+     ! grep -i "WARNING: .* undefined!$" conftest.err >/dev/null 2>&1
+     then ac_cv_linux_struct_address_space_operations_has_write_begin=yes
+     else
+@@ -8509,7 +8509,7 @@ struct backing_dev_info _test; printk("%
+ MODULE_LICENSE("http://www.openafs.org/dl/license10.html");
+ _ACEOF
+     echo make -C $LINUX_KERNEL_BUILD M=$SRCDIR_PARENT/conftest.dir modules KBUILD_VERBOSE=1 >&5 &&
+-    make -C $LINUX_KERNEL_BUILD M=$SRCDIR_PARENT/conftest.dir modules KBUILD_VERBOSE=1 >&5 2>conftest.err &&
++    make -C $LINUX_KERNEL_BUILD ARCH=$ARCH CROSS_COMPILE=$CROSS M=$SRCDIR_PARENT/conftest.dir modules KBUILD_VERBOSE=1 >&5 2>conftest.err &&
+     ! grep -i "WARNING: .* undefined!$" conftest.err >/dev/null 2>&1
+     then ac_cv_linux_struct_backing_dev_info_has_name=yes
+     else
+@@ -8594,7 +8594,7 @@ struct cred _test; printk("%x\n", &_test
+ MODULE_LICENSE("http://www.openafs.org/dl/license10.html");
+ _ACEOF
+     echo make -C $LINUX_KERNEL_BUILD M=$SRCDIR_PARENT/conftest.dir modules KBUILD_VERBOSE=1 >&5 &&
+-    make -C $LINUX_KERNEL_BUILD M=$SRCDIR_PARENT/conftest.dir modules KBUILD_VERBOSE=1 >&5 2>conftest.err &&
++    make -C $LINUX_KERNEL_BUILD ARCH=$ARCH CROSS_COMPILE=$CROSS M=$SRCDIR_PARENT/conftest.dir modules KBUILD_VERBOSE=1 >&5 2>conftest.err &&
+     ! grep -i "WARNING: .* undefined!$" conftest.err >/dev/null 2>&1
+     then ac_cv_linux_struct_cred_has_session_keyring=yes</