[Subtree] Removing import-layers directory

As part of the move to subtrees, need to bring all the import layers
content to the top level.

Change-Id: I4a163d10898cbc6e11c27f776f60e1a470049d8f
Signed-off-by: Dave Cobbley <david.j.cobbley@linux.intel.com>
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>

18 files changed, 0 insertions, 849 deletions

diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/0001-Define-__SWORD_TYPE-and-_PATH_NSSWITCH_CONF.patch b/import-layers/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/0001-Define-__SWORD_TYPE-and-_PATH_NSSWITCH_CONF.patch
deleted file mode 100644
index 87159718b..000000000
--- a/import-layers/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/0001-Define-__SWORD_TYPE-and-_PATH_NSSWITCH_CONF.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 987c8f4a718cdd6b764592ba7510090a59623959 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Fri, 31 Mar 2017 19:10:57 -0700
-Subject: [PATCH] Define __SWORD_TYPE and _PATH_NSSWITCH_CONF
-
-if they are not defined as is in musl then define
-them here
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-
----
- include/automount.h | 8 ++++++++
- include/nsswitch.h  | 3 +++
- 2 files changed, 11 insertions(+)
-
-diff --git a/include/automount.h b/include/automount.h
-index cc336ad..8bdcf12 100644
---- a/include/automount.h
-+++ b/include/automount.h
-@@ -42,6 +42,14 @@
- 
- #define ENABLE_CORES	1
- 
-+#ifndef __SWORD_TYPE
-+# if __WORDSIZE == 32  /* System word size */
-+#  define __SWORD_TYPE int
-+# else /* __WORDSIZE == 64 */
-+#  define __SWORD_TYPE long int
-+# endif
-+#endif
-+
- /* We MUST have the paths to mount(8) and umount(8) */
- #ifndef HAVE_MOUNT
- #error Failed to locate mount(8)!
-diff --git a/include/nsswitch.h b/include/nsswitch.h
-index d3e4027..7a0c38f 100644
---- a/include/nsswitch.h
-+++ b/include/nsswitch.h
-@@ -24,6 +24,9 @@
- #include <netdb.h>
- #include "list.h"
- 
-+#ifndef _PATH_NSSWITCH_CONF
-+#define _PATH_NSSWITCH_CONF     "/etc/nsswitch.conf"
-+#endif
- #define NSSWITCH_FILE _PATH_NSSWITCH_CONF
- 
- enum nsswitch_status {
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/0001-modules-lookup_multi.c-Replace-__S_IEXEC-with-S_IEXE.patch b/import-layers/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/0001-modules-lookup_multi.c-Replace-__S_IEXEC-with-S_IEXE.patch
deleted file mode 100644
index 32293dd09..000000000
--- a/import-layers/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/0001-modules-lookup_multi.c-Replace-__S_IEXEC-with-S_IEXE.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 745e355ac8b595a27e1fcca75bf01d3e244f4a5f Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Thu, 7 Sep 2017 22:22:31 -0700
-Subject: [PATCH] modules/lookup_multi.c: Replace __S_IEXEC with S_IEXEC
-
-__S_IEXEC is internal to libc and may not be available on
-all libc e.g. musl
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-
----
- modules/lookup_multi.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/modules/lookup_multi.c b/modules/lookup_multi.c
-index 3ecda6d..cf109de 100644
---- a/modules/lookup_multi.c
-+++ b/modules/lookup_multi.c
-@@ -452,7 +452,7 @@ int lookup_reinit(const char *my_mapfmt,
- 					continue;
- 				}
- 
--				if (st.st_mode & __S_IEXEC)
-+				if (st.st_mode & S_IEXEC)
- 					type = src_prog;
- 				else
- 					type = src_file;
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/0002-Replace-__S_IEXEC-with-S_IEXEC.patch b/import-layers/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/0002-Replace-__S_IEXEC-with-S_IEXEC.patch
deleted file mode 100644
index 469027aac..000000000
--- a/import-layers/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/0002-Replace-__S_IEXEC-with-S_IEXEC.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 557ca399f4b3a397f20bb147ec6dc4ab9732dd1e Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Fri, 31 Mar 2017 19:12:10 -0700
-Subject: [PATCH] Replace __S_IEXEC with S_IEXEC
-
-S_IEXEC is portable
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-
----
- daemon/lookup.c        | 4 ++--
- modules/lookup_multi.c | 2 +-
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/daemon/lookup.c b/daemon/lookup.c
-index 201ccbb..d821db8 100644
---- a/daemon/lookup.c
-+++ b/daemon/lookup.c
-@@ -366,7 +366,7 @@ static int read_file_source_instance(struct autofs_point *ap, struct map_source
- 	if (!S_ISREG(st.st_mode))
- 		return NSS_STATUS_NOTFOUND;
- 
--	if (st.st_mode & __S_IEXEC)
-+	if (st.st_mode & S_IEXEC)
- 		type = src_prog;
- 	else
- 		type = src_file;
-@@ -856,7 +856,7 @@ static int lookup_name_file_source_instance(struct autofs_point *ap, struct map_
- 	if (!S_ISREG(st.st_mode))
- 		return NSS_STATUS_NOTFOUND;
- 
--	if (st.st_mode & __S_IEXEC)
-+	if (st.st_mode & S_IEXEC)
- 		type = src_prog;
- 	else
- 		type = src_file;
-diff --git a/modules/lookup_multi.c b/modules/lookup_multi.c
-index fadd2ea..3ecda6d 100644
---- a/modules/lookup_multi.c
-+++ b/modules/lookup_multi.c
-@@ -247,7 +247,7 @@ static struct lookup_mod *nss_open_lookup(const char *format, int argc, const ch
- 				continue;
- 			}
- 
--			if (st.st_mode & __S_IEXEC)
-+			if (st.st_mode & S_IEXEC)
- 				type = src_prog;
- 			else
- 				type = src_file;
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/add-the-needed-stdarg.h.patch b/import-layers/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/add-the-needed-stdarg.h.patch
deleted file mode 100644
index 816a409cd..000000000
--- a/import-layers/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/add-the-needed-stdarg.h.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From df5d45b2d7ad7e7b5f0542a816d08b0409a529a1 Mon Sep 17 00:00:00 2001
-From: Roy Li <rongqing.li@windriver.com>
-Date: Tue, 19 Aug 2014 11:31:35 +0800
-Subject: [PATCH] [PATCH] add the needed stdarg.h
-
-Upstream-status: Pending
-
-Signed-off-by: Roy Li <rongqing.li@windriver.com>
-
----
- lib/defaults.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/lib/defaults.c b/lib/defaults.c
-index 0e48a78..667f35d 100644
---- a/lib/defaults.c
-+++ b/lib/defaults.c
-@@ -16,6 +16,7 @@
- 
- #include <stdlib.h>
- #include <stdio.h>
-+#include <stdarg.h>
- #include <ctype.h>
- #include <string.h>
- #include <sys/utsname.h>
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/autofs-5.0.7-do-not-check-for-modprobe.patch b/import-layers/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/autofs-5.0.7-do-not-check-for-modprobe.patch
deleted file mode 100644
index 1d5c3e1ee..000000000
--- a/import-layers/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/autofs-5.0.7-do-not-check-for-modprobe.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-From 2cbc576ea1fbd1cbf4579d64b30e41d762084e7f Mon Sep 17 00:00:00 2001
-From: "yanjun.zhu" <yanjun.zhu@windriver.com>
-Date: Tue, 15 Jan 2013 12:45:44 +0800
-Subject: [PATCH] autofs: do not check for modprobe
-
-Description: Loading autofs module is #ifdef'ed in the source, so
- there is no need to check for /proc (which is only used
- to load module) or modprobe.  Both modprobe and /proc
- are always in the fixed location so there's no need to
- check for these to start with.
-
-Upstream-Status: Backport [1]
-[1] http://www.spinics.net/lists/autofs/msg00139.html
-
----
- configure.in        |  6 ------
- daemon/module.c     |  3 +++
- include/automount.h | 11 +++--------
- 3 files changed, 6 insertions(+), 14 deletions(-)
-
-diff --git a/configure.in b/configure.in
-index 44a1c8b..b226236 100644
---- a/configure.in
-+++ b/configure.in
-@@ -34,11 +34,6 @@ AC_MSG_CHECKING([for binaries in])
- AC_MSG_RESULT([$searchpath])
- 
- #
--# Make sure we have "/proc"
--#
--AF_LINUX_PROCFS()
--
--#
- # Location of init.d directory?
- #
- AF_INIT_D()
-@@ -142,7 +137,6 @@ AF_PATH_INCLUDE(UMOUNT, umount, /bin/umount, $searchpath)
- AF_PATH_INCLUDE(E2FSCK, fsck.ext2 e2fsck, , $searchpath)
- AF_PATH_INCLUDE(E3FSCK, fsck.ext3 e3fsck, , $searchpath)
- AF_PATH_INCLUDE(E4FSCK, fsck.ext4 e4fsck, , $searchpath)
--AF_PATH_INCLUDE(MODPROBE, modprobe, , $searchpath)
- 
- AF_CHECK_PROG(LEX, flex lex, , $searchpath)
- AF_CHECK_PROG(YACC, bison, , $searchpath)
-diff --git a/daemon/module.c b/daemon/module.c
-index bed8f7a..e41a98e 100644
---- a/daemon/module.c
-+++ b/daemon/module.c
-@@ -19,6 +19,8 @@
- #include "automount.h"
- #include "nsswitch.h"
- 
-+#if 0
-+/* see comment in daemon/automount.c around load_autofs4_module() call */
- int load_autofs4_module(void)
- {
- 	FILE *fp;
-@@ -53,6 +55,7 @@ int load_autofs4_module(void)
- 
- 	return 1;
- }
-+#endif
- 
- int open_lookup(const char *name, const char *err_prefix, const char *mapfmt,
- 		int argc, const char *const *argv, struct lookup_mod **lookup)
-diff --git a/include/automount.h b/include/automount.h
-index c0f5fbf..cc336ad 100644
---- a/include/automount.h
-+++ b/include/automount.h
-@@ -51,16 +51,11 @@
- #error Failed to locate umount(8)!
- #endif
- 
--#ifndef HAVE_MODPROBE
--#error Failed to locate modprobe(8)!
--#endif
--
--#ifndef HAVE_LINUX_PROCFS
--#error Failed to verify existence of procfs filesystem!
--#endif
--
-+#if 0
-+/* see comment in daemon/automount.c around load_autofs4_module() call */
- #define FS_MODULE_NAME  "autofs4"
- int load_autofs4_module(void);
-+#endif
- 
- /* The -s (sloppy) option to mount is good, if we have it... */
- 
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/autofs-5.0.7-fix-lib-deps.patch b/import-layers/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/autofs-5.0.7-fix-lib-deps.patch
deleted file mode 100644
index 8e06db6e4..000000000
--- a/import-layers/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/autofs-5.0.7-fix-lib-deps.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 080626108c9ab70e2489752ef2a14006d0564b0c Mon Sep 17 00:00:00 2001
-From: Joe MacDonald <joe.macdonald@windriver.com>
-Date: Tue, 18 Jun 2013 10:05:21 -0400
-Subject: [PATCH] Fix the dependency issue
-
-Upstream-Status: Pending
-
-autofs's lib sources have a dependency on a number of files that are
-generated by rpcgen during buildtime
-
-Signed-off-by: Roy.Li <rongqing.li@windriver.com>
-Signed-off-by: Joe MacDonald <joe.macdonald@windriver.com>
-
----
- lib/Makefile | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/lib/Makefile b/lib/Makefile
-index 518b483..4798a4b 100644
---- a/lib/Makefile
-+++ b/lib/Makefile
-@@ -81,3 +81,4 @@ install: all
- clean:
- 	rm -f $(LIB) $(RPCS) $(OBJS) $(YACCSRC) *.output *~
- 
-+$(OBJS): $(RPCS)
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/autofs-5.0.7-include-linux-nfs.h-directly-in-rpc_sub.patch b/import-layers/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/autofs-5.0.7-include-linux-nfs.h-directly-in-rpc_sub.patch
deleted file mode 100644
index 9b0942ebf..000000000
--- a/import-layers/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/autofs-5.0.7-include-linux-nfs.h-directly-in-rpc_sub.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 2256b8aa98cff15ddf2a8d36496e6c9125927901 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
-
-Upstream-Status: Pending
-
-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>
-
----
- 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 e744e89..83db47e 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>
- 
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/autofs-5.1.2-libtirpc-as-need.patch b/import-layers/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/autofs-5.1.2-libtirpc-as-need.patch
deleted file mode 100644
index 18ce19385..000000000
--- a/import-layers/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/autofs-5.1.2-libtirpc-as-need.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From b31decac4acb194b020c621d2d11019f636a45e0 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Mon, 24 Apr 2017 20:41:25 -0700
-Subject: [PATCH] autofs: Upgrade to 5.1.2 release
-
-Make configure compatible with -Wl,--as-needed following
-https://wiki.gentoo.org/wiki/Project:Quality_Assurance/As-needed#Failure_in_..2Fconfigure
-
-2016-07-05 Martin von Gagern
-
----
- aclocal.m4 | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/aclocal.m4 b/aclocal.m4
-index 0e4a624..2e620cd 100644
---- a/aclocal.m4
-+++ b/aclocal.m4
-@@ -415,9 +415,9 @@ AC_DEFUN([AF_CHECK_LIBTIRPC],
- [
- # save current flags
- af_check_libtirpc_save_cflags="$CFLAGS"
--af_check_libtirpc_save_ldflags="$LDFLAGS"
-+af_check_libtirpc_save_libs="$LIBS"
- CFLAGS="$CFLAGS -I=/usr/include/tirpc"
--LDFLAGS="$LDFLAGS -ltirpc"
-+LIBS="$LIBS -ltirpc"
- 
- AC_TRY_LINK(
-     [ #include <rpc/rpc.h> ],
-@@ -440,7 +440,7 @@ AC_CHECK_FUNCS([getrpcbyname getservbyname])
- 
- # restore flags
- CFLAGS="$af_check_libtirpc_save_cflags"
--LDFLAGS="$af_check_libtirpc_save_ldflags"
-+LIBS="$af_check_libtirpc_save_libs"
- ])
- 
- AC_DEFUN([AF_WITH_LIBTIRPC],
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/cross.patch b/import-layers/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/cross.patch
deleted file mode 100644
index b25c43f74..000000000
--- a/import-layers/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/cross.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From b9b44cd82caceeb638cc6a862b5bb90b93ad6c6a Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Sat, 5 Jan 2013 19:53:10 -0800
-
----
- aclocal.m4   | 2 ++
- configure.in | 8 ++++++--
- 2 files changed, 8 insertions(+), 2 deletions(-)
-
-diff --git a/aclocal.m4 b/aclocal.m4
-index 2115204..2a9a802 100644
---- a/aclocal.m4
-+++ b/aclocal.m4
-@@ -7,6 +7,8 @@ dnl --------------------------------------------------------------------------
- AC_DEFUN(AF_PATH_INCLUDE,
- [AC_PATH_PROGS($1,$2,$3,$4)
- if test -n "$$1"; then
-+  AH_TEMPLATE([HAVE_$1], [Have $2])
-+  AH_TEMPLATE([PATH_$1], [Have $2])
-   AC_DEFINE(HAVE_$1,1,[define if you have $1])
-   AC_DEFINE_UNQUOTED(PATH_$1, "$$1", [define if you have $1])
-   HAVE_$1=1
-diff --git a/configure.in b/configure.in
-index 25d7c4e..44a1c8b 100644
---- a/configure.in
-+++ b/configure.in
-@@ -324,13 +324,15 @@ AC_PROG_CC
- cat > pietest.c <<EOF
- int main(void) { return 0; }
- EOF
-+AF_tmp_ldflags="$LDFLAGS"
-+AF_tmp_cflags="$CFLAGS"
- CFLAGS=-fPIE
- LDFLAGS=-pie
- DAEMON_CFLAGS=
- DAEMON_LDFLAGS=
- AC_MSG_CHECKING([whether gcc -fPIE works])
--AC_RUN_IFELSE([AC_LANG_PROGRAM([[]], [[int main(void) {return 0;}]])],
--	      [gcc_supports_pie=yes], [gcc_supports_pie=no], [gcc_supports_pie=no])
-+AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[int main(void) {return 0;}]])],
-+	       [gcc_supports_pie=yes], [gcc_supports_pie=no], [gcc_supports_pie=no])
- AC_MSG_RESULT([$gcc_supports_pie])
- if test $gcc_supports_pie = yes ; then
- 	DAEMON_CFLAGS="-fPIE"
-@@ -339,6 +341,8 @@ fi
- rm -f pietest.c
- AC_SUBST(DAEMON_CFLAGS)
- AC_SUBST(DAEMON_LDFLAGS)
-+CFLAGS="${AF_tmp_cflags}"
-+LDFLAGS="${AF_tmp_ldflags}"
- 
- #
- # Enable ability to access value in external env variable
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/fix-the-YACC-rule-to-fix-a-building-failure.patch b/import-layers/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/fix-the-YACC-rule-to-fix-a-building-failure.patch
deleted file mode 100644
index 21a97c8f5..000000000
--- a/import-layers/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/fix-the-YACC-rule-to-fix-a-building-failure.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From 971d48a00ef82880c34e89778bf430a01360ebd5 Mon Sep 17 00:00:00 2001
-From: Roy Li <rongqing.li@windriver.com>
-Date: Mon, 18 May 2015 16:28:36 +0800
-Subject: [PATCH] [PATCH] fix the YACC rule to fix a building failure
-
-Upstream-Statu: Pending
-
-The original rule will create the header file twice, one is that the header
-file as the object file is created, other time is when create the C source file.
-since YACC always has "-d" parameter.
-
-This lead to a race when compile amd_tok.o, the header file maybe rewritten.
-  |----------------------
-  |amd_tok.l:359:10: error: 'RBRACKET' undeclared (first use in this function)
-  |  ")" { return RBRACKET; }
-  |          ^
-  |../Makefile.rules:64: recipe for target 'amd_tok.o' failed
-  |----------------------
-Signed-off-by: Roy Li <rongqing.li@windriver.com>
-
----
- lib/Makefile     | 6 ++++--
- modules/Makefile | 3 ++-
- 2 files changed, 6 insertions(+), 3 deletions(-)
-
-diff --git a/lib/Makefile b/lib/Makefile
-index 4798a4b..c40cf86 100644
---- a/lib/Makefile
-+++ b/lib/Makefile
-@@ -57,7 +57,8 @@ mount_xdr.o: mount_xdr.c
- master_tok.c: master_tok.l
- 	$(LEX) -o$@ -Pmaster_ $?
- 
--master_parse.tab.c master_parse.tab.h: master_parse.y
-+master_parse.tab.h: master_parse.tab.c
-+master_parse.tab.c: master_parse.y
- 	$(YACC) -v -d -p master_ -b master_parse $?
- 
- master_tok.o: master_tok.c master_parse.tab.h
-@@ -67,7 +68,8 @@ master_parse.tab.o: master_parse.tab.c master_parse.tab.h
- nss_tok.c: nss_tok.l
- 	$(LEX) -o$@ -Pnss_ $?
- 
--nss_parse.tab.c nss_parse.tab.h: nss_parse.y
-+nss_parse.tab.h: nss_parse.tab.c
-+nss_parse.tab.c: nss_parse.y
- 	$(YACC) -v -d -p nss_ -b nss_parse $?
- 
- nss_tok.o: nss_tok.c nss_parse.tab.h
-diff --git a/modules/Makefile b/modules/Makefile
-index d9ab06c..abc7698 100644
---- a/modules/Makefile
-+++ b/modules/Makefile
-@@ -103,7 +103,8 @@ amd_tok.c: amd_tok.l
- 
- amd_tok.o: amd_tok.c amd_parse.tab.h
- 
--amd_parse.tab.c amd_parse.tab.h: amd_parse.y
-+amd_parse.tab.h: amd_parse.tab.c
-+amd_parse.tab.c: amd_parse.y
- 	$(YACC) -v -d -p amd_ -b amd_parse $?
- 
- amd_parse.tab.o: amd_parse.tab.c amd_parse.tab.h
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/fix_disable_ldap.patch b/import-layers/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/fix_disable_ldap.patch
deleted file mode 100644
index 414325974..000000000
--- a/import-layers/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/fix_disable_ldap.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From c500d9906f163bf716c872d37403b9de02ef0a86 Mon Sep 17 00:00:00 2001
-From: Amy Fong <amy.fong@windriver.com>
-Date: Fri, 18 Jan 2013 12:13:32 -0500
-Subject: [PATCH] autofs: fails to compile with openldap disabled
-
-As of 5.0.6, it appears that changes were introduced so that
-if you compile with openldap disabled and openldap headers are not
-available, then autofs fails to build.
-
-Upstream-Status: Pending
-
-Signed-off-by: Amy Fong <amy.fong@windriver.com>
---
- lookup_ldap.h |    4 ++++
- 1 file changed, 4 insertions(+)
-
----
- include/lookup_ldap.h | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/include/lookup_ldap.h b/include/lookup_ldap.h
-index 3a7aba7..bfdb0b3 100644
---- a/include/lookup_ldap.h
-+++ b/include/lookup_ldap.h
-@@ -1,7 +1,9 @@
- #ifndef LOOKUP_LDAP_H
- #define LOOKUP_LDAP_H
- 
-+#ifdef WITH_LDAP
- #include <ldap.h>
-+#endif
- 
- #ifdef WITH_SASL
- #include <openssl/ssl.h>
-@@ -117,10 +119,12 @@ struct lookup_context {
- 
- #define LDAP_AUTH_USESIMPLE	0x0008
- 
-+#ifdef WITH_LDAP
- /* lookup_ldap.c */
- LDAP *init_ldap_connection(unsigned logopt, const char *uri, struct lookup_context *ctxt);
- int unbind_ldap_connection(unsigned logopt, struct ldap_conn *conn, struct lookup_context *ctxt);
- int authtype_requires_creds(const char *authtype);
-+#endif
- 
- #ifdef WITH_SASL
- /* cyrus-sasl.c */
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/force-STRIP-to-emtpy.patch b/import-layers/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/force-STRIP-to-emtpy.patch
deleted file mode 100644
index 21396dd6f..000000000
--- a/import-layers/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/force-STRIP-to-emtpy.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 3cbee00fe5725b87abdae80cfa2ee735e4513ca6 Mon Sep 17 00:00:00 2001
-From: Roy Li <rongqing.li@windriver.com>
-Date: Tue, 19 Aug 2014 11:31:35 +0800
-Subject: [PATCH] [PATCH] force STRIP to emtpy
-
-otherwise the generate file will be stripped
-
-Signed-off-by: Roy Li <rongqing.li@windriver.com>
-
----
- Makefile.rules | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Makefile.rules b/Makefile.rules
-index 709dd04..b1f7e50 100644
---- a/Makefile.rules
-+++ b/Makefile.rules
-@@ -31,7 +31,7 @@ LDFLAGS   ?= -s
- endif
- 
- ifdef DONTSTRIP
--STRIP     ?= :
-+STRIP     = :
- else
- STRIP     ?= strip --strip-debug
- endif
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/libtirpc.patch b/import-layers/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/libtirpc.patch
deleted file mode 100644
index 0a2d502b8..000000000
--- a/import-layers/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/libtirpc.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From cb6a4f61adb027f2366318f2c08c8264ebf39218 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Sat, 5 Jan 2013 19:53:10 -0800
-
----
- Makefile.rules | 2 +-
- aclocal.m4     | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/Makefile.rules b/Makefile.rules
-index 6fa3e02..709dd04 100644
---- a/Makefile.rules
-+++ b/Makefile.rules
-@@ -46,7 +46,7 @@ CFLAGS += -D_REENTRANT -D_FILE_OFFSET_BITS=64
- LIBS += -lpthread
- 
- ifdef TIRPCLIB
--CFLAGS += -I/usr/include/tirpc
-+CFLAGS += -I=/usr/include/tirpc
- LIBS += $(TIRPCLIB)
- endif
- 
-diff --git a/aclocal.m4 b/aclocal.m4
-index 2a9a802..0e4a624 100644
---- a/aclocal.m4
-+++ b/aclocal.m4
-@@ -416,7 +416,7 @@ AC_DEFUN([AF_CHECK_LIBTIRPC],
- # save current flags
- af_check_libtirpc_save_cflags="$CFLAGS"
- af_check_libtirpc_save_ldflags="$LDFLAGS"
--CFLAGS="$CFLAGS -I/usr/include/tirpc"
-+CFLAGS="$CFLAGS -I=/usr/include/tirpc"
- LDFLAGS="$LDFLAGS -ltirpc"
- 
- AC_TRY_LINK(
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/no-bash.patch b/import-layers/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/no-bash.patch
deleted file mode 100644
index c46c0e5ad..000000000
--- a/import-layers/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/no-bash.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From a3007d7ea930823926611081bb873ddd771325cb Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Sat, 5 Jan 2013 19:53:10 -0800
-
----
- samples/auto.net | 2 +-
- samples/auto.smb | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/samples/auto.net b/samples/auto.net
-index 0384f61..61215f6 100755
---- a/samples/auto.net
-+++ b/samples/auto.net
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/bin/sh
- 
- # This file must be executable to work! chmod 755!
- 
-diff --git a/samples/auto.smb b/samples/auto.smb
-index 6af5d85..d296b81 100755
---- a/samples/auto.smb
-+++ b/samples/auto.smb
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/bin/sh
- 
- # This file must be executable to work! chmod 755!
- 
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/pkgconfig-libnsl.patch b/import-layers/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/pkgconfig-libnsl.patch
deleted file mode 100644
index 1c7b11997..000000000
--- a/import-layers/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/pkgconfig-libnsl.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From e3ae56cf0bb4063c31295f45d04e3c504f4b6cc7 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Mon, 24 Apr 2017 20:41:25 -0700
-Subject: [PATCH] autofs: Upgrade to 5.1.2 release
-
-Use pkg-config first to look for external libnsl which is now
-split out from glibc, if it does not exist then see if its provided
-by glibc itself.
-
--Khem
-
----
- configure.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.in b/configure.in
-index 9cf73b8..1016c71 100644
---- a/configure.in
-+++ b/configure.in
-@@ -186,7 +186,7 @@ fi
- #
- # glibc/libc 6 new libraries
- #
--AC_CHECK_LIB(nsl, yp_match, LIBNSL="-lnsl")
-+PKG_CHECK_MODULES([NSL], [libnsl], [], [AC_CHECK_LIB([nsl],[yp_match],[LIBNSL="-lnsl"],[LIBNSL=""])])
- AC_SUBST(LIBNSL)
- 
- AC_CHECK_LIB(resolv, res_query, LIBRESOLV="-lresolv")
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/remove-bashism.patch b/import-layers/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/remove-bashism.patch
deleted file mode 100644
index 4183069bb..000000000
--- a/import-layers/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/remove-bashism.patch
+++ /dev/null
@@ -1,118 +0,0 @@
-From cfacbb917f87b903b50132a5025f86b0cc522e9c Mon Sep 17 00:00:00 2001
-From: Robert Yang <liezhi.yang@windriver.com>
-Date: Sat, 13 Sep 2014 20:19:28 -0700
-Subject: [PATCH] autofs.init.in: remove bashism
-
-It can work without the bashism.
-
-Upstream-Status: Pending
-
-Signed-off-by: Mike Looijmans <mike.looijmans@topic.nl>
-Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
-
----
- redhat/autofs.init.in | 12 ++++++------
- samples/rc.autofs.in  | 10 +++++-----
- 2 files changed, 11 insertions(+), 11 deletions(-)
-
-diff --git a/redhat/autofs.init.in b/redhat/autofs.init.in
-index 9d008ff..4f1c0d8 100644
---- a/redhat/autofs.init.in
-+++ b/redhat/autofs.init.in
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/bin/sh
- #
- # rc file for automount using a Sun-style "master map".
- #
-@@ -42,7 +42,7 @@ if [ -r $confdir/autofs ]; then
- 	. $confdir/autofs
- fi
- 
--function start() {
-+start() {
- 	# Make sure autofs4 module is loaded
- 	if ! grep -q autofs /proc/filesystems
- 	then
-@@ -102,7 +102,7 @@ function start() {
- 	return $RETVAL
- }
- 
--function stop() {
-+stop() {
- 	echo -n $"Stopping $prog: "
- 	count=0
- 	while [ -n "`pidof $prog`" -a $count -lt 15 ] ; do
-@@ -125,7 +125,7 @@ function stop() {
- 	return $RETVAL
- }
- 
--function restart() {
-+restart() {
- 	status autofs > /dev/null 2>&1
- 	if [ $? -eq 0 ]; then
- 		stop
-@@ -143,7 +143,7 @@ function restart() {
- 	start
- }
- 
--function reload() {
-+reload() {
- 	if [ ! -f /var/lock/subsys/autofs ]; then
- 		echo $"$prog not running"
- 		RETVAL=1
-@@ -161,7 +161,7 @@ function reload() {
- 	return $RETVAL
- }
- 
--function usage_message() {
-+usage_message() {
- 	echo $"Usage: $0 {start|forcestart|stop|status|restart|force-reload|forcerestart|reload|condrestart|try-restart|usage}"
- }
- 
-diff --git a/samples/rc.autofs.in b/samples/rc.autofs.in
-index 487669f..e96cde1 100644
---- a/samples/rc.autofs.in
-+++ b/samples/rc.autofs.in
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/bin/sh
- #
- # rc file for automount using a Sun-style "master map".
- #
-@@ -36,7 +36,7 @@ if [ -r $confdir/autofs ]; then
- 	. $confdir/autofs
- fi
- 
--function start() {
-+start() {
- 	echo -n "Starting $prog: "
- 
- 	# Make sure autofs4 module is loaded
-@@ -85,7 +85,7 @@ function start() {
- 	return $RETVAL
- }
- 
--function stop() {
-+stop() {
- 	echo -n $"Stopping $prog: "
- 	count=0
- 	while [ -n "`pidof $prog`" -a $count -lt 15 ] ; do
-@@ -102,7 +102,7 @@ function stop() {
- 	return $RETVAL
- }
- 
--function restart() {
-+restart() {
- 	stop
- 	while [ -n "`pidof $prog`" ] ; do
- 		sleep 5
-@@ -110,7 +110,7 @@ function restart() {
- 	start
- }
- 
--function reload() {
-+reload() {
- 	pid=`pidof $prog`
- 	if [ -z $pid ]; then
- 		echo $"$prog not running"
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/using-pkg-config-to-detect-libxml-2.0-and-krb5.patch b/import-layers/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/using-pkg-config-to-detect-libxml-2.0-and-krb5.patch
deleted file mode 100644
index 3d0c6bd71..000000000
--- a/import-layers/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/using-pkg-config-to-detect-libxml-2.0-and-krb5.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From dabcbdae38038a8e4ad2c4286112381c407c5ce7 Mon Sep 17 00:00:00 2001
-From: Roy Li <rongqing.li@windriver.com>
-Date: Tue, 19 Aug 2014 11:31:35 +0800
-Subject: [PATCH] using pkg-config to detect libxml-2.0 and krb5
-
-Upstream-status: Pending
-
-Signed-off-by: Roy Li <rongqing.li@windriver.com>
-
----
- configure.in | 16 ++++++++++++++--
- 1 file changed, 14 insertions(+), 2 deletions(-)
-
-diff --git a/configure.in b/configure.in
-index b226236..9cf73b8 100644
---- a/configure.in
-+++ b/configure.in
-@@ -162,8 +162,20 @@ if test x$enable_sloppy_mount = xyes; then
- fi
- 
- # LDAP SASL auth needs libxml and Kerberos
--AF_CHECK_LIBXML()
--AF_CHECK_KRB5()
-+PKG_CHECK_MODULES(XML, [libxml-2.0],HAVE_LIBXML=1,HAVE_LIBXML=0)
-+AC_SUBST([HAVE_LIBXML])
-+XML_FLAGS=$XML_CFLAGS
-+
-+PKG_CHECK_MODULES(KRB5, [krb5],HAVE_KRB5=1,HAVE_KRB5=0)
-+AC_SUBST([HAVE_KRB5])
-+if test "x$HAVE_KRB5" = "x1"; then
-+  SAVE_CFLAGS=$CFLAGS
-+  SAVE_LIBS=$LIBS
-+  CFLAGS="$CFLAGS $KRB5_FLAGS"
-+  LIBS="$LIBS $KRB5_LIBS"
-+
-+  AC_CHECK_FUNCS([krb5_principal_get_realm])
-+fi
- 
- AC_SEARCH_LIBS([versionsort],[])
- if test "$ac_cv_search_versionsort" = "no"; then
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs_5.1.2.bb b/import-layers/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs_5.1.2.bb
deleted file mode 100644
index 68c64fdb0..000000000
--- a/import-layers/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs_5.1.2.bb
+++ /dev/null
@@ -1,77 +0,0 @@
-SUMMARY = "Kernel based automounter for linux"
-SECTION = "utils"
-LICENSE = "GPL-2.0"
-LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3"
-
-DEPENDS += "libtirpc flex-native bison-native e2fsprogs openssl libxml2 util-linux cyrus-sasl libnsl2"
-
-CFLAGS += "-I${STAGING_INCDIR}/tirpc"
-
-inherit autotools-brokensep systemd update-rc.d pkgconfig
-
-SRC_URI = "${KERNELORG_MIRROR}/linux/daemons/autofs/v5/autofs-${PV}.tar.gz \
-           file://autofs-5.0.7-include-linux-nfs.h-directly-in-rpc_sub.patch \
-           file://no-bash.patch \
-           file://cross.patch \
-           file://libtirpc.patch \
-           file://autofs-5.0.7-do-not-check-for-modprobe.patch \
-           file://fix_disable_ldap.patch \
-           file://autofs-5.0.7-fix-lib-deps.patch \
-           file://add-the-needed-stdarg.h.patch \
-           file://using-pkg-config-to-detect-libxml-2.0-and-krb5.patch \
-           file://force-STRIP-to-emtpy.patch \
-           file://remove-bashism.patch \
-           file://fix-the-YACC-rule-to-fix-a-building-failure.patch \
-           file://0001-Define-__SWORD_TYPE-and-_PATH_NSSWITCH_CONF.patch \
-           file://0002-Replace-__S_IEXEC-with-S_IEXEC.patch \
-           file://autofs-5.1.2-libtirpc-as-need.patch \
-           file://pkgconfig-libnsl.patch \
-           file://0001-modules-lookup_multi.c-Replace-__S_IEXEC-with-S_IEXE.patch \
-           "
-SRC_URI[md5sum] = "28cf88f99eff553a8500659ba5d45a76"
-SRC_URI[sha256sum] = "0d57e4138c2ec8058ca92164d035546f68ce4af93acb893369993d67c7056a10"
-
-INITSCRIPT_NAME = "autofs"
-INITSCRIPT_PARAMS = "defaults"
-
-# FIXME: modules/Makefile has crappy rules that don't obey LDFLAGS
-#CFLAGS += "${LDFLAGS}"
-
-PACKAGECONFIG[systemd] = "--with-systemd=${systemd_unitdir}/system,--without-systemd,systemd"
-
-PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}"
-
-EXTRA_OEMAKE = "DONTSTRIP=1"
-EXTRA_OECONF += "--disable-mount-locking \
-                --enable-ignore-busy --with-openldap=no \
-                --with-sasl=no --with-libtirpc \
-                --with-path=${STAGING_BINDIR_NATIVE} \
-"
-CACHED_CONFIGUREVARS = "ac_cv_path_RANLIB=${RANLIB} \
-                        ac_cv_path_RPCGEN=rpcgen \
-"
-
-do_configure_prepend () {
-    sed -e "s:filagdir:flagdir:" -i ${S}/configure.in
-    if [ ! -e ${S}/acinclude.m4 ]; then
-        cp ${S}/aclocal.m4 ${S}/acinclude.m4
-    fi
-}
-
-do_install_append () {
-    if [ -d ${D}/run ]; then
-        rmdir ${D}/run
-    fi
-    if [ -d ${D}${localstatedir}/run ]; then
-        rmdir ${D}${localstatedir}/run
-    fi
-}
-SECURITY_CFLAGS = "${SECURITY_NO_PIE_CFLAGS}"
-
-INSANE_SKIP_${PN} = "dev-so"
-
-RPROVIDES_${PN} += "${PN}-systemd"
-RREPLACES_${PN} += "${PN}-systemd"
-RCONFLICTS_${PN} += "${PN}-systemd"
-SYSTEMD_SERVICE_${PN} = "autofs.service"
-