mirror of
git://git.openembedded.org/meta-openembedded
synced 2026-01-01 13:58:06 +00:00
autofs: upgrade to 5.1.5
Signed-off-by: Changqing Li <changqing.li@windriver.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Changqing Li
Khem Raj
parent
97055da2c6
commit
35249c87b5
|
|
@ -1,21 +1,26 @@
|
|||
From 6d24365f0828185fd1bb4d199209ca07eb95c41d Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Fri, 24 Aug 2018 06:24:36 +0000
|
||||
Subject: [PATCH] Do not hardcode path for pkg.m4
|
||||
From a27217a5437da313d251b4a765bf7cb60ffaa62d Mon Sep 17 00:00:00 2001
|
||||
From: Changqing Li <changqing.li@windriver.com>
|
||||
Date: Tue, 27 Nov 2018 15:27:47 +0800
|
||||
Subject: [PATCH] From 6d24365f0828185fd1bb4d199209ca07eb95c41d Mon Sep 17
|
||||
00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Fri, 24 Aug 2018
|
||||
06:24:36 +0000 Subject: [PATCH] Do not hardcode path for pkg.m4
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
|
||||
update patch to version 5.1.5
|
||||
Signed-off-by: Changqing Li <changqing.li@windriver.com>
|
||||
---
|
||||
configure.in | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/configure.in b/configure.in
|
||||
index 50aed15..f81767c 100644
|
||||
index 493b9f1..268d06b 100644
|
||||
--- a/configure.in
|
||||
+++ b/configure.in
|
||||
@@ -12,7 +12,7 @@ define([AC_CACHE_SAVE], )dnl
|
||||
AC_INIT(.autofs-5.1.4)
|
||||
AC_INIT(.autofs-5.1.5)
|
||||
|
||||
# for pkg-config macros
|
||||
-m4_include([/usr/share/aclocal/pkg.m4])
|
||||
|
|
@ -24,5 +29,5 @@ index 50aed15..f81767c 100644
|
|||
#
|
||||
# autofs installs by default in /usr
|
||||
--
|
||||
1.9.1
|
||||
2.7.4
|
||||
|
||||
|
|
|
|||
|
|
@ -1,22 +1,26 @@
|
|||
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
|
||||
From 096e33743158e0e8c04d60d01cc66e2945d79777 Mon Sep 17 00:00:00 2001
|
||||
From: Changqing Li <changqing.li@windriver.com>
|
||||
Date: Tue, 27 Nov 2018 16:52:35 +0800
|
||||
Subject: [PATCH] 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>
|
||||
|
||||
update patch to version 5.1.5
|
||||
Signed-off-by: Changqing Li <changqing.li@windriver.com>
|
||||
---
|
||||
daemon/lookup.c | 4 ++--
|
||||
daemon/lookup.c | 6 +++---
|
||||
modules/lookup_multi.c | 2 +-
|
||||
2 files changed, 3 insertions(+), 3 deletions(-)
|
||||
2 files changed, 4 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/daemon/lookup.c b/daemon/lookup.c
|
||||
index 201ccbb..d821db8 100644
|
||||
index 18df935..d35d484 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
|
||||
@@ -382,7 +382,7 @@ static int read_file_source_instance(struct autofs_point *ap, struct map_source
|
||||
if (!S_ISREG(st.st_mode))
|
||||
return NSS_STATUS_NOTFOUND;
|
||||
|
||||
|
|
@ -25,7 +29,7 @@ index 201ccbb..d821db8 100644
|
|||
type = src_prog;
|
||||
else
|
||||
type = src_file;
|
||||
@@ -856,7 +856,7 @@ static int lookup_name_file_source_instance(struct autofs_point *ap, struct map_
|
||||
@@ -942,7 +942,7 @@ static int lookup_name_file_source_instance(struct autofs_point *ap, struct map_
|
||||
if (!S_ISREG(st.st_mode))
|
||||
return NSS_STATUS_NOTFOUND;
|
||||
|
||||
|
|
@ -34,8 +38,17 @@ index 201ccbb..d821db8 100644
|
|||
type = src_prog;
|
||||
else
|
||||
type = src_file;
|
||||
@@ -1118,7 +1118,7 @@ static struct map_source *lookup_get_map_source(struct master_mapent *entry)
|
||||
if (!S_ISREG(st.st_mode))
|
||||
return NULL;
|
||||
|
||||
- if (st.st_mode & __S_IEXEC)
|
||||
+ if (st.st_mode & S_IEXEC)
|
||||
type = "program";
|
||||
else
|
||||
type = "file";
|
||||
diff --git a/modules/lookup_multi.c b/modules/lookup_multi.c
|
||||
index fadd2ea..3ecda6d 100644
|
||||
index bb9f88c..cf109de 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
|
||||
|
|
@ -47,3 +60,6 @@ index fadd2ea..3ecda6d 100644
|
|||
type = src_prog;
|
||||
else
|
||||
type = src_file;
|
||||
--
|
||||
2.7.4
|
||||
|
||||
|
|
|
|||
|
|
@ -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... */
|
||||
|
||||
|
|
@ -1,7 +1,9 @@
|
|||
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
|
||||
From 602f9ca83c2bdbf511bcb178fcb4b9fc54da955f Mon Sep 17 00:00:00 2001
|
||||
From: Changqing Li <changqing.li@windriver.com>
|
||||
Date: Tue, 27 Nov 2018 15:20:46 +0800
|
||||
Subject: [PATCH] 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
|
||||
|
|
@ -9,20 +11,27 @@ by glibc itself.
|
|||
|
||||
-Khem
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
update patch to version 5.1.5
|
||||
Signed-off-by: Changqing Li <changqing.li@windriver.com>
|
||||
---
|
||||
configure.in | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/configure.in b/configure.in
|
||||
index 9cf73b8..1016c71 100644
|
||||
index 76ecb40..493b9f1 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)
|
||||
@@ -238,7 +238,7 @@ AC_SUBST(LIBCLOCK_GETTIME)
|
||||
|
||||
AC_CHECK_LIB(resolv, res_query, LIBRESOLV="-lresolv")
|
||||
PKG_CHECK_MODULES([NSL],[libnsl],,
|
||||
[
|
||||
-AC_CHECK_LIB(nsl, yp_match, NSL_LIBS="-lnsl")
|
||||
+PKG_CHECK_MODULES([NSL], [libnsl], [], [AC_CHECK_LIB([nsl],[yp_match],[LIBNSL="-lnsl"],[LIBNSL=""])])
|
||||
AC_SUBST(NSL_LIBS)
|
||||
NSL_CFLAGS=""
|
||||
])
|
||||
--
|
||||
2.7.4
|
||||
|
||||
|
|
|
|||
|
|
@ -1,22 +1,27 @@
|
|||
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
|
||||
From dd90a690f95569b999b8ac9ab57e834b3421dcbb Mon Sep 17 00:00:00 2001
|
||||
From: Changqing Li <changqing.li@windriver.com>
|
||||
Date: Tue, 27 Nov 2018 15:19:07 +0800
|
||||
Subject: [PATCH] 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
|
||||
Upstream-Status: Pending
|
||||
|
||||
Signed-off-by: Roy Li <rongqing.li@windriver.com>
|
||||
|
||||
update patch to 5.1.5
|
||||
Signed-off-by: Changqing Li <changqing.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
|
||||
index f5fbb35..76ecb40 100644
|
||||
--- a/configure.in
|
||||
+++ b/configure.in
|
||||
@@ -162,8 +162,20 @@ if test x$enable_sloppy_mount = xyes; then
|
||||
fi
|
||||
@@ -211,8 +211,20 @@ fi
|
||||
AC_SUBST(ENABLE_FEDFS)
|
||||
|
||||
# LDAP SASL auth needs libxml and Kerberos
|
||||
-AF_CHECK_LIBXML()
|
||||
|
|
@ -38,3 +43,6 @@ index b226236..9cf73b8 100644
|
|||
|
||||
AC_SEARCH_LIBS([versionsort],[])
|
||||
if test "$ac_cv_search_versionsort" = "no"; then
|
||||
--
|
||||
2.7.4
|
||||
|
||||
|
|
|
|||
|
|
@ -13,7 +13,6 @@ 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://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 \
|
||||
|
|
@ -27,8 +26,10 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/daemons/autofs/v5/autofs-${PV}.tar.gz \
|
|||
file://0001-modules-lookup_multi.c-Replace-__S_IEXEC-with-S_IEXE.patch \
|
||||
file://0001-Do-not-hardcode-path-for-pkg.m4.patch \
|
||||
"
|
||||
SRC_URI[md5sum] = "17bc9d371cf39d99f400ebadfc2289bb"
|
||||
SRC_URI[sha256sum] = "8d1c9964c8286ccb08262ad47c60bb6343492902def5399fd36d79a0ccb0e718"
|
||||
|
||||
|
||||
SRC_URI[md5sum] = "03b13168ec7bd66a6f2d5f6fea705eee"
|
||||
SRC_URI[sha256sum] = "86a8e56ea9d72bb53ff8cdfeefb5cafe983592c6b0178fb99c4a731e59879181"
|
||||
|
||||
UPSTREAM_CHECK_URI = "${KERNELORG_MIRROR}/linux/daemons/autofs/v5/"
|
||||
|
||||
|
|
@ -62,6 +63,9 @@ do_configure_prepend () {
|
|||
}
|
||||
|
||||
do_install_append () {
|
||||
# samples have been removed from SUBDIRS from 5.1.5, need to install separately
|
||||
oe_runmake 'DESTDIR=${D}' install_samples
|
||||
|
||||
if [ -d ${D}/run ]; then
|
||||
rmdir ${D}/run
|
||||
fi
|
||||
Loading…
Reference in New Issue
Block a user