Merge from bittboy/buildroot@db180c0

package/autofs/0001-include-linux-nfs.h-directly-in-rpc_sub.patch

@@ -0,0 +1,32 @@
+From 44bdce8c6ed9b30c1643e5981172a4f9025f013c Mon Sep 17 00:00:00 2001
+From: Andreas Oberritter <obi@opendreambox.org>
+Date: Wed, 13 Mar 2013 16:17:08 +0100
+Subject: [PATCH] autofs-5.0.7: include linux/nfs.h directly in rpc_subs.h
+
+Fixes compile error with uclibc. Glibc's nfs/nfs.h contains
+nothing but "#include linux/nfs.h". rpc_subs.h already includes
+other linux/nfs*.h files directly.
+
+Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Upstream-Status: Pending
+---
+ include/rpc_subs.h |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/include/rpc_subs.h b/include/rpc_subs.h
+index b6d59f9..a2d9648 100644
+--- a/include/rpc_subs.h
++++ b/include/rpc_subs.h
+@@ -18,7 +18,7 @@
+ 
+ #include <rpc/rpc.h>
+ #include <rpc/pmap_prot.h>
+-#include <nfs/nfs.h>
++#include <linux/nfs.h>
+ #include <linux/nfs2.h>
+ #include <linux/nfs3.h>
+ 
+-- 
+1.7.10.4
+

package/autofs/Config.in

@@ -0,0 +1,22 @@
+config BR2_PACKAGE_AUTOFS
+	bool "autofs"
+	depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL
+	depends on BR2_USE_MMU
+	depends on !BR2_STATIC_LIBS # dlfcn
+	depends on !BR2_TOOLCHAIN_USES_MUSL # nsswitch
+	select BR2_PACKAGE_LIBTIRPC if !BR2_TOOLCHAIN_HAS_NATIVE_RPC
+	help
+	  Autofs controls the operation of the automount daemons. The
+	  automount daemons automatically mount filesystems when they
+	  are used and unmount them after a period of inactivity based
+	  on a set of pre-configured maps defined by default in
+	  /etc/auto.master. The kernel automounter implements SunOS
+	  style automounter under Linux and requires a kernel version
+	  of at least 2.6.17 and the autofs4 kernel module.
+
+	  http://www.linuxfromscratch.org/blfs/view/svn/general/autofs.html
+
+comment "autofs needs a glibc or uClibc toolchain w/ NPTL and dynamic library"
+	depends on BR2_USE_MMU
+	depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS \
+		|| BR2_TOOLCHAIN_USES_MUSL

package/autofs/autofs.hash

@@ -0,0 +1,2 @@
+# From https://www.kernel.org/pub/linux/daemons/autofs/v5/sha256sums.asc
+sha256 8fce30ee51ffd528fe1a4e8374ef57f43367e1f123030e175fb1b1cf15bc1722  autofs-5.1.4.tar.xz

package/autofs/autofs.mk

@@ -0,0 +1,48 @@
+################################################################################
+#
+# autofs
+#
+################################################################################
+
+AUTOFS_VERSION = 5.1.4
+AUTOFS_SOURCE = autofs-$(AUTOFS_VERSION).tar.xz
+AUTOFS_SITE = $(BR2_KERNEL_MIRROR)/linux/daemons/autofs/v5
+AUTOFS_LICENSE = GPL-2.0+
+AUTOFS_LICENSE_FILES = COPYING COPYRIGHT
+AUTOFS_DEPENDENCIES = host-flex host-bison host-pkgconf host-nfs-utils
+
+# autofs looks on the build machine for the path of modprobe, mount,
+# umount and fsck programs so tell it explicitly where they will be
+# located on the target.
+AUTOFS_CONF_ENV = \
+	ac_cv_path_E2FSCK=/usr/sbin/fsck.ext2 \
+	ac_cv_path_E3FSCK=/usr/sbin/fsck.ext3 \
+	ac_cv_path_E4FSCK=/usr/sbin/fsck.ext4 \
+	ac_cv_path_KRB5_CONFIG=no \
+	ac_cv_path_MODPROBE=/sbin/modprobe \
+	ac_cv_path_MOUNT=/bin/mount \
+	ac_cv_path_MOUNT_NFS=/usr/sbin/mount.nfs \
+	ac_cv_path_UMOUNT=/bin/umount \
+	ac_cv_linux_procfs=yes
+
+# instead of looking in the PATH like any reasonable package, autofs
+# configure looks only in an hardcoded search path for host tools,
+# which we have to override with --with-path.
+AUTOFS_CONF_OPTS = \
+	--disable-mount-locking \
+	--enable-ignore-busy \
+	--without-openldap \
+	--without-sasl \
+	--with-path="$(BR_PATH)" \
+	--with-hesiod=no
+
+AUTOFS_MAKE_ENV = DONTSTRIP=1
+
+ifeq ($(BR2_PACKAGE_LIBTIRPC),y)
+AUTOFS_CONF_OPTS += --with-libtirpc
+AUTOFS_DEPENDENCIES += libtirpc
+else
+AUTOFS_CONF_OPTS += --without-libtirpc
+endif
+
+$(eval $(autotools-package))