diff options
Diffstat (limited to 'import-layers/meta-openembedded/meta-networking/recipes-daemons/autofs')
17 files changed, 719 insertions, 0 deletions
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/0001-systemd-allow-with-systemd-to-take-a-path-arg.patch b/import-layers/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/0001-systemd-allow-with-systemd-to-take-a-path-arg.patch new file mode 100644 index 000000000..742f25de1 --- /dev/null +++ b/import-layers/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/0001-systemd-allow-with-systemd-to-take-a-path-arg.patch @@ -0,0 +1,47 @@ +From 40971911d653bf53de295d7462c643e4073916b9 Mon Sep 17 00:00:00 2001 +From: Joe MacDonald <joe@deserted.net> +Date: Fri, 1 Nov 2013 12:47:18 -0400 +Subject: [PATCH] systemd: allow --with-systemd to take a path arg + +If building for a cross-compile environment with systemd it is convenient +to be able to specify a systemd path for the target that may not be the +same as that on the host. + +Upstream-status: Submitted [http://www.spinics.net/lists/autofs/msg00740.html] + +Signed-off-by: Joe MacDonald <joe@deserted.net> +--- + aclocal.m4 | 10 ++++++++-- + 1 file changed, 8 insertions(+), 2 deletions(-) + +diff --git a/aclocal.m4 b/aclocal.m4 +index 3e6f223..105e3e9 100644 +--- a/aclocal.m4 ++++ b/aclocal.m4 +@@ -229,8 +229,10 @@ dnl Check the location of the systemd unit files directory + dnl -------------------------------------------------------------------------- + AC_DEFUN([AF_WITH_SYSTEMD], + [AC_ARG_WITH(systemd, +-[ --with-systemd install systemd unit file if systemd unit directory +- is found on system], ++[ --with-systemd@<:@=systemddir@:>@ install systemd unit file. If 'yes' ++ probe the system for unit directory. ++ If a path is specified, assume that ++ is a valid install path.], + [if test "$withval" = yes; then + if test -z "$systemddir"; then + AC_MSG_CHECKING([location of the systemd unit files directory]) +@@ -247,6 +249,10 @@ AC_DEFUN([AF_WITH_SYSTEMD], + else + AC_MSG_RESULT(not found) + fi ++else ++ if test "$withval" != no; then ++ systemddir=$withval ++ fi + fi]) + ]) + +-- +1.7.10.4 + diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/Makefile.rules-cross.patch b/import-layers/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/Makefile.rules-cross.patch new file mode 100644 index 000000000..7dc7096c2 --- /dev/null +++ b/import-layers/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/Makefile.rules-cross.patch @@ -0,0 +1,23 @@ +Index: autofs-5.0.7/Makefile.rules +=================================================================== +--- autofs-5.0.7.orig/Makefile.rules 2012-07-24 23:05:26.000000000 -0700 ++++ autofs-5.0.7/Makefile.rules 2012-10-26 09:23:40.270204270 -0700 +@@ -34,14 +34,14 @@ + else + CFLAGS ?= -O2 -Wall + LDFLAGS = -s +-STRIP = strip --strip-debug ++STRIP = ${TARGET_PREFIX}strip --strip-debug + endif + endif + +-CC = gcc +-CXX = g++ ++CC ?= ${TARGET_PREFIX}gcc ++CXX ?= ${TARGET_PREFIX}g++ + CXXFLAGS = $(CFLAGS) +-LD = ld ++LD ?= ${TARGET_PREFIX}ld + SOLDFLAGS = -shared + + CFLAGS += -D_REENTRANT -D_FILE_OFFSET_BITS=64 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 new file mode 100644 index 000000000..fdb906b22 --- /dev/null +++ b/import-layers/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/add-the-needed-stdarg.h.patch @@ -0,0 +1,24 @@ +[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 2b03ea2..5728e67 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> +-- +1.7.10.4 + 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 new file mode 100644 index 000000000..af5be6a83 --- /dev/null +++ b/import-layers/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/autofs-5.0.7-do-not-check-for-modprobe.patch @@ -0,0 +1,75 @@ +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 + +diff -urpN a/configure.in b/configure.in +--- a/configure.in 2013-01-15 11:30:22.000000000 +0800 ++++ b/configure.in 2013-01-15 11:31:45.000000000 +0800 +@@ -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/umo + 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 -urpN a/daemon/module.c b/daemon/module.c +--- a/daemon/module.c 2013-01-15 11:30:49.000000000 +0800 ++++ b/daemon/module.c 2013-01-15 11:32:00.000000000 +0800 +@@ -18,6 +18,8 @@ + #include <stdlib.h> + #include "automount.h" + ++#if 0 ++/* see comment in daemon/automount.c around load_autofs4_module() call */ + int load_autofs4_module(void) + { + FILE *fp; +@@ -52,6 +54,7 @@ int load_autofs4_module(void) + + return 1; + } ++#endif + + struct lookup_mod *open_lookup(const char *name, const char *err_prefix, + const char *mapfmt, int argc, const char *const *argv) +diff -urpN a/include/automount.h b/include/automount.h +--- a/include/automount.h 2013-01-15 11:31:10.000000000 +0800 ++++ b/include/automount.h 2013-01-15 11:32:06.000000000 +0800 +@@ -50,16 +50,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 new file mode 100644 index 000000000..09fea495d --- /dev/null +++ b/import-layers/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/autofs-5.0.7-fix-lib-deps.patch @@ -0,0 +1,28 @@ +From 54a9bd28a307dd74df044d779ca85adcf36aa202 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 5418009..bff4e1d 100644 +--- a/lib/Makefile ++++ b/lib/Makefile +@@ -75,3 +75,4 @@ install: all + clean: + rm -f $(LIB) $(RPCS) $(OBJS) $(YACCSRC) *.output *~ + ++$(OBJS): $(RPCS) +-- +1.7.10.4 + 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 new file mode 100644 index 000000000..3a878980a --- /dev/null +++ b/import-layers/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/autofs-5.0.7-include-linux-nfs.h-directly-in-rpc_sub.patch @@ -0,0 +1,32 @@ +Upstream-Status: Pending + +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> +--- + 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 + diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/autofs-additional-distros.patch b/import-layers/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/autofs-additional-distros.patch new file mode 100644 index 000000000..6a35843ce --- /dev/null +++ b/import-layers/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/autofs-additional-distros.patch @@ -0,0 +1,12 @@ +--- autofs-4.1.4/samples/rc.autofs.in~ 2005-04-11 06:30:54.000000000 -0500 ++++ autofs-4.1.4/samples/rc.autofs.in 2007-04-07 13:18:44.000000000 -0500 +@@ -43,6 +43,9 @@ + system=debian + elif [ -f /etc/redhat-release ]; then + system=redhat ++elif [ -f /etc/issue ] && grep -q "^SlugOS\|Yocto" /etc/issue ; then ++ # SlugOS and Yocto behave like Debian, at least for autofs purposes. ++ system=debian + else + echo "$0: Unknown system, please port and contact autofs@linux.kernel.org" 1>&2 + exit 1 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 new file mode 100644 index 000000000..8f1af625f --- /dev/null +++ b/import-layers/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/cross.patch @@ -0,0 +1,44 @@ +Index: autofs-5.0.7/aclocal.m4 +=================================================================== +--- autofs-5.0.7.orig/aclocal.m4 2012-10-28 04:45:07.000000000 -0700 ++++ autofs-5.0.7/aclocal.m4 2012-10-28 10:47:53.263996910 -0700 +@@ -7,6 +7,8 @@ + 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 +Index: autofs-5.0.7/configure.in +=================================================================== +--- autofs-5.0.7.orig/configure.in 2012-10-28 04:45:06.000000000 -0700 ++++ autofs-5.0.7/configure.in 2012-10-28 10:50:07.580000628 -0700 +@@ -301,13 +301,15 @@ + 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" +@@ -316,6 +318,8 @@ + 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 new file mode 100644 index 000000000..9b641838f --- /dev/null +++ b/import-layers/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/fix-the-YACC-rule-to-fix-a-building-failure.patch @@ -0,0 +1,62 @@ +[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 237b70b..71415d0 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 +-- +1.9.1 + 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 new file mode 100644 index 000000000..31c8510a6 --- /dev/null +++ b/import-layers/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/fix_disable_ldap.patch @@ -0,0 +1,42 @@ +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(+) + +--- 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> +@@ -109,10 +111,12 @@ + + #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, LDAP *ldap, 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 new file mode 100644 index 000000000..634005bd2 --- /dev/null +++ b/import-layers/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/force-STRIP-to-emtpy.patch @@ -0,0 +1,25 @@ +[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 710a2c9..e4334db 100644 +--- a/Makefile.rules ++++ b/Makefile.rules +@@ -31,7 +31,7 @@ LDFLAGS ?= -s + endif + + ifdef DONTSTRIP +-STRIP ?= : ++STRIP = : + else + STRIP ?= strip --strip-debug + endif +-- +1.7.10.4 + diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/libtirpc-name-clash-backout.patch b/import-layers/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/libtirpc-name-clash-backout.patch new file mode 100644 index 000000000..e93021d56 --- /dev/null +++ b/import-layers/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/libtirpc-name-clash-backout.patch @@ -0,0 +1,28 @@ +--- + lib/rpc_subs.c | 10 ---------- + 1 file changed, 10 deletions(-) + +diff --git a/lib/rpc_subs.c b/lib/rpc_subs.c +index 5d6ead0..c7177f2 100644 +--- a/lib/rpc_subs.c ++++ b/lib/rpc_subs.c +@@ -34,16 +34,6 @@ + #include <poll.h> + + #ifdef WITH_LIBTIRPC +-#undef auth_destroy +-#define auth_destroy(auth) \ +- do { \ +- int refs; \ +- if ((refs = auth_put((auth))) == 0) \ +- ((*((auth)->ah_ops->ah_destroy))(auth));\ +- } while (0) +-#endif +- +-#ifdef WITH_LIBTIRPC + const rpcprog_t rpcb_prog = RPCBPROG; + const rpcvers_t rpcb_version = RPCBVERS; + #else +-- +1.7.10.4 + 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 new file mode 100644 index 000000000..d68944b45 --- /dev/null +++ b/import-layers/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/libtirpc.patch @@ -0,0 +1,26 @@ +Index: autofs-5.0.7/aclocal.m4 +=================================================================== +--- autofs-5.0.7.orig/aclocal.m4 2012-10-28 13:17:45.504237027 -0700 ++++ autofs-5.0.7/aclocal.m4 2012-10-28 13:20:50.108242739 -0700 +@@ -403,7 +403,7 @@ + # 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( +Index: autofs-5.0.7/Makefile.rules +=================================================================== +--- autofs-5.0.7.orig/Makefile.rules 2012-10-28 13:17:45.308237022 -0700 ++++ autofs-5.0.7/Makefile.rules 2012-10-28 13:21:25.720242803 -0700 +@@ -48,7 +48,7 @@ + LIBS += -lpthread + + ifdef TIRPCLIB +-CFLAGS += -I/usr/include/tirpc ++CFLAGS += -I=/usr/include/tirpc + LIBS += $(TIRPCLIB) + endif + 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 new file mode 100644 index 000000000..cf0363527 --- /dev/null +++ b/import-layers/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/no-bash.patch @@ -0,0 +1,20 @@ +Index: autofs-5.0.7/samples/auto.net +=================================================================== +--- autofs-5.0.7.orig/samples/auto.net 2012-07-24 23:05:26.000000000 -0700 ++++ autofs-5.0.7/samples/auto.net 2012-10-28 10:44:25.035991715 -0700 +@@ -1,4 +1,4 @@ +-#!/bin/bash ++#!/bin/sh + + # This file must be executable to work! chmod 755! + +Index: autofs-5.0.7/samples/auto.smb +=================================================================== +--- autofs-5.0.7.orig/samples/auto.smb 2012-07-24 23:05:26.000000000 -0700 ++++ autofs-5.0.7/samples/auto.smb 2012-10-28 10:44:25.035991715 -0700 +@@ -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/remove-bashism.patch b/import-layers/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/remove-bashism.patch new file mode 100644 index 000000000..282d6f0ad --- /dev/null +++ b/import-layers/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/remove-bashism.patch @@ -0,0 +1,120 @@ +From 79034f969bbd12215d65b4337dfd38a13d02d4ef 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" +-- +1.7.9.5 + 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 new file mode 100644 index 000000000..93b76bd66 --- /dev/null +++ b/import-layers/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/using-pkg-config-to-detect-libxml-2.0-and-krb5.patch @@ -0,0 +1,39 @@ +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 ++++++++++++++-- + 2 files changed, 14 insertions(+), 2 deletions(-) + +diff --git a/configure.in b/configure.in +index 392d122..a3028aa 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 +-- +1.7.10.4 + diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs_5.1.1.bb b/import-layers/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs_5.1.1.bb new file mode 100644 index 000000000..0f4c2478e --- /dev/null +++ b/import-layers/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs_5.1.1.bb @@ -0,0 +1,72 @@ +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" + +inherit autotools-brokensep systemd + +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://libtirpc-name-clash-backout.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 \ +" + +SRC_URI[md5sum] = "e143df66b614b8cdb1ff533735f8e12d" +SRC_URI[sha256sum] = "795419383b120d15699ab3b89ea0f3d029f6fb28405a83982d305c4b7b61130f" + +inherit update-rc.d pkgconfig + +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 ?= "${@base_contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}" + +EXTRA_OEMAKE = "DONTSTRIP=1" +EXTRA_OECONF += "--disable-mount-locking \ + --enable-ignore-busy --with-openldap=no \ + --with-sasl=no --with-libtirpc=yes \ + --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 configure.in + if [ ! -e acinclude.m4 ]; then + cp aclocal.m4 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 +} + +INSANE_SKIP_${PN} = "dev-so" + +RPROVIDES_${PN} += "${PN}-systemd" +RREPLACES_${PN} += "${PN}-systemd" +RCONFLICTS_${PN} += "${PN}-systemd" +SYSTEMD_SERVICE_${PN} = "autofs.service" |
