added my Recipes
This commit is contained in:
@@ -0,0 +1,30 @@
|
||||
From d0d5ac317dab11610a5fc91ca3e7f5ad72ce2236 Mon Sep 17 00:00:00 2001
|
||||
From: Zang Ruochen <zangrc.fnst@cn.fujitsu.com>
|
||||
Date: Tue, 29 Oct 2019 13:19:37 +0800
|
||||
Subject: [PATCH] Bug fix for pid_t not found on musl.
|
||||
|
||||
When compiling version 5.1.6 on musl, the following error occurs:
|
||||
log.h:49:8: error: unknown type name 'pid_t'
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
Signed-off-by: Zang Ruochen <zangrc.fnst@cn.fujitsu.com>
|
||||
---
|
||||
lib/defaults.c | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/lib/defaults.c b/lib/defaults.c
|
||||
index a6ea116..b3ecfa5 100644
|
||||
--- a/lib/defaults.c
|
||||
+++ b/lib/defaults.c
|
||||
@@ -21,6 +21,7 @@
|
||||
#include <string.h>
|
||||
#include <sys/utsname.h>
|
||||
#include <sys/stat.h>
|
||||
+#include <sys/types.h>
|
||||
#include <stdarg.h>
|
||||
|
||||
#include "config.h"
|
||||
--
|
||||
2.20.1
|
||||
|
||||
@@ -0,0 +1,48 @@
|
||||
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 {
|
||||
@@ -0,0 +1,115 @@
|
||||
From 9fe90ab1e333b2e2bed370ff13ba552eb54c3aaf Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Sat, 17 Jul 2021 09:56:28 -0700
|
||||
Subject: [PATCH] Define __SWORD_TYPE if undefined
|
||||
|
||||
These fixes are inspired when building autofs on musl
|
||||
|
||||
Upstream-Status: Pending
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
---
|
||||
daemon/automount.c | 20 ++++++++++++++------
|
||||
include/hash.h | 5 +++++
|
||||
lib/log.c | 6 +++++-
|
||||
3 files changed, 24 insertions(+), 7 deletions(-)
|
||||
|
||||
--- a/daemon/automount.c
|
||||
+++ b/daemon/automount.c
|
||||
@@ -1,7 +1,7 @@
|
||||
/* ----------------------------------------------------------------------- *
|
||||
*
|
||||
* automount.c - Linux automounter daemon
|
||||
- *
|
||||
+ *
|
||||
* Copyright 1997 Transmeta Corporation - All Rights Reserved
|
||||
* Copyright 1999-2000 Jeremy Fitzhardinge <jeremy@goop.org>
|
||||
* Copyright 2001-2005 Ian Kent <raven@themaw.net>
|
||||
@@ -11,7 +11,7 @@
|
||||
* the Free Software Foundation, Inc., 675 Mass Ave, Cambridge MA 02139,
|
||||
* USA; either version 2 of the License, or (at your option) any later
|
||||
* version.
|
||||
- *
|
||||
+ *
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
@@ -40,6 +40,14 @@
|
||||
#include <systemd/sd-daemon.h>
|
||||
#endif
|
||||
|
||||
+#ifndef __SWORD_TYPE
|
||||
+# if __WORDSIZE == 32 /* System word size */
|
||||
+# define __SWORD_TYPE int
|
||||
+# else /* __WORDSIZE == 64 */
|
||||
+# define __SWORD_TYPE long int
|
||||
+# endif
|
||||
+#endif
|
||||
+
|
||||
#include "automount.h"
|
||||
#if defined(LIBXML2_WORKAROUND) || defined(TIRPC_WORKAROUND)
|
||||
#include <dlfcn.h>
|
||||
@@ -282,7 +290,7 @@ int rmdir_path(struct autofs_point *ap,
|
||||
dev, buf, st.st_dev);
|
||||
return -1;
|
||||
}
|
||||
-
|
||||
+
|
||||
/*
|
||||
* Last element of path may be a symbolic link; all others
|
||||
* are directories (and the last directory element is
|
||||
@@ -455,7 +463,7 @@ int count_mounts(struct autofs_point *ap
|
||||
|
||||
counter.count = 0;
|
||||
counter.dev = dev;
|
||||
-
|
||||
+
|
||||
if (walk_tree(path, counter_fn, 1, ap, &counter) == -1)
|
||||
return -1;
|
||||
|
||||
@@ -811,7 +819,7 @@ static char *automount_path_to_fifo(unsi
|
||||
/*
|
||||
* An automount path can be made up of subdirectories. So, to
|
||||
* create the fifo name, we will just replace instances of '/' with
|
||||
- * '-'.
|
||||
+ * '-'.
|
||||
*/
|
||||
p = fifo_name + strlen(fifodir);
|
||||
while (*p != '\0') {
|
||||
@@ -1640,7 +1648,7 @@ static void return_start_status(void *ar
|
||||
sc->done = 1;
|
||||
|
||||
/*
|
||||
- * Startup condition mutex must be locked during
|
||||
+ * Startup condition mutex must be locked during
|
||||
* the startup process.
|
||||
*/
|
||||
status = pthread_cond_signal(&sc->cond);
|
||||
--- a/include/hash.h
|
||||
+++ b/include/hash.h
|
||||
@@ -5,6 +5,11 @@
|
||||
|
||||
#include <sys/types.h>
|
||||
#include <stdint.h>
|
||||
+#include <linux/stddef.h>
|
||||
+
|
||||
+#ifndef __GLIBC__
|
||||
+#include <sys/reg.h>
|
||||
+#endif
|
||||
|
||||
/*
|
||||
* The "GOLDEN_RATIO_PRIME" is used in ifs/btrfs/brtfs_inode.h and
|
||||
--- a/lib/log.c
|
||||
+++ b/lib/log.c
|
||||
@@ -38,7 +38,11 @@ static char *prepare_attempt_prefix(cons
|
||||
char buffer[ATTEMPT_ID_SIZE + 1];
|
||||
char *prefixed_msg = NULL;
|
||||
|
||||
- attempt_id = pthread_getspecific(key_thread_attempt_id);
|
||||
+ if (key_thread_attempt_id) {
|
||||
+ attempt_id = pthread_getspecific(key_thread_attempt_id);
|
||||
+ } else {
|
||||
+ attempt_id = 0;
|
||||
+ }
|
||||
if (attempt_id) {
|
||||
int len = sizeof(buffer) + 1 + strlen(msg) + 1;
|
||||
|
||||
@@ -0,0 +1,31 @@
|
||||
From d7a34bb388e33d16260b67275cdb58f9c877d324 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.6
|
||||
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 07c2051..e85d718 100644
|
||||
--- a/configure.in
|
||||
+++ b/configure.in
|
||||
@@ -12,7 +12,7 @@ define([AC_CACHE_SAVE], )dnl
|
||||
AC_INIT(.autofs-5.1.8)
|
||||
|
||||
# for pkg-config macros
|
||||
-m4_include([/usr/share/aclocal/pkg.m4])
|
||||
+m4_include([pkg.m4])
|
||||
|
||||
#
|
||||
# autofs installs by default in /usr
|
||||
@@ -0,0 +1,54 @@
|
||||
From 88f991b0ebb6fb8fcaad3d0eb8fb51a7439d053e Mon Sep 17 00:00:00 2001
|
||||
From: Fabian Groffen <grobian@gentoo.org>
|
||||
Date: Wed, 2 Feb 2022 09:27:13 +0800
|
||||
Subject: [PATCH 1/2] autofs-5.1.8 - add autofs_strerror_r() helper for musl
|
||||
|
||||
If using musl libc the XSI-compliant variant strerror_r() which returns
|
||||
an integer instead of a pointer so add a helper function to handle this
|
||||
case.
|
||||
|
||||
Signed-off-by: Fabian Groffen <grobian@gentoo.org>
|
||||
Signed-off-by: Ian Kent <raven@themaw.net>
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
---
|
||||
include/automount.h | 5 +++++
|
||||
lib/log.c | 10 ++++++++++
|
||||
2 files changed, 15 insertions(+)
|
||||
|
||||
diff --git a/include/automount.h b/include/automount.h
|
||||
index 8cd8b3a..f759e59 100644
|
||||
--- a/include/automount.h
|
||||
+++ b/include/automount.h
|
||||
@@ -51,6 +51,11 @@
|
||||
# endif
|
||||
#endif
|
||||
|
||||
+#ifndef __GLIBC__
|
||||
+# define strerror_r(N,B,S) autofs_strerror_r(N,B,S)
|
||||
+char *autofs_strerror_r(int errnum, char *buf, size_t buflen); /* GNU */
|
||||
+#endif
|
||||
+
|
||||
/* We MUST have the paths to mount(8) and umount(8) */
|
||||
#ifndef HAVE_MOUNT
|
||||
#error Failed to locate mount(8)!
|
||||
diff --git a/lib/log.c b/lib/log.c
|
||||
index 39b1e3b..b99fa39 100644
|
||||
--- a/lib/log.c
|
||||
+++ b/lib/log.c
|
||||
@@ -368,3 +368,13 @@ pid_t log_pidinfo(struct autofs_point *ap, pid_t pid, char *label) {
|
||||
|
||||
return ppid;
|
||||
}
|
||||
+
|
||||
+#ifndef __GLIBC__
|
||||
+# undef strerror_r
|
||||
+char *autofs_strerror_r(int errnum, char *buf, size_t buflen) {
|
||||
+ int s = strerror_r(errnum, buf, buflen);
|
||||
+ if (s)
|
||||
+ return NULL;
|
||||
+ return buf;
|
||||
+}
|
||||
+#endif
|
||||
--
|
||||
2.37.3
|
||||
|
||||
@@ -0,0 +1,27 @@
|
||||
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;
|
||||
@@ -0,0 +1,58 @@
|
||||
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 | 6 +++---
|
||||
modules/lookup_multi.c | 2 +-
|
||||
2 files changed, 4 insertions(+), 4 deletions(-)
|
||||
|
||||
--- a/daemon/lookup.c
|
||||
+++ b/daemon/lookup.c
|
||||
@@ -397,7 +397,7 @@ static int read_file_source_instance(str
|
||||
return NSS_STATUS_NOTFOUND;
|
||||
}
|
||||
|
||||
- if (st.st_mode & __S_IEXEC)
|
||||
+ if (st.st_mode & S_IEXEC)
|
||||
type = src_prog;
|
||||
else
|
||||
type = src_file;
|
||||
@@ -930,7 +930,7 @@ static int lookup_name_file_source_insta
|
||||
return NSS_STATUS_NOTFOUND;
|
||||
}
|
||||
|
||||
- if (st.st_mode & __S_IEXEC)
|
||||
+ if (st.st_mode & S_IEXEC)
|
||||
type = src_prog;
|
||||
else
|
||||
type = src_file;
|
||||
@@ -1077,7 +1077,7 @@ static struct map_source *lookup_get_map
|
||||
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";
|
||||
--- a/modules/lookup_multi.c
|
||||
+++ b/modules/lookup_multi.c
|
||||
@@ -247,7 +247,7 @@ static struct lookup_mod *nss_open_looku
|
||||
continue;
|
||||
}
|
||||
|
||||
- if (st.st_mode & __S_IEXEC)
|
||||
+ if (st.st_mode & S_IEXEC)
|
||||
type = src_prog;
|
||||
else
|
||||
type = src_file;
|
||||
@@ -0,0 +1,106 @@
|
||||
From 1c0b0b70a276280f431d72319109a0bbc0267970 Mon Sep 17 00:00:00 2001
|
||||
From: Fabian Groffen <grobian@gentoo.org>
|
||||
Date: Wed, 2 Feb 2022 10:15:22 +0800
|
||||
Subject: [PATCH 2/2] autofs-5.1.8 - handle innetgr() not present in musl
|
||||
|
||||
The function innetgr(3) may not be present in musl libc, add a check
|
||||
for this.
|
||||
|
||||
Originally contributed by Fabian, modified by me.
|
||||
|
||||
Upstream-Status: Backport [https://git.kernel.org/pub/scm/linux/storage/autofs/autofs.git/commit/?id=f60e40af3c038b8955325a11b7294ad38c15c9e8]
|
||||
Signed-off-by: Fabian Groffen <grobian@gentoo.org>
|
||||
Signed-off-by: Ian Kent <raven@themaw.net>
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
---
|
||||
configure | 6 ++++++
|
||||
configure.in | 2 +-
|
||||
include/config.h.in | 3 +++
|
||||
modules/parse_amd.c | 7 +++++++
|
||||
4 files changed, 17 insertions(+), 1 deletion(-)
|
||||
|
||||
--- a/configure.in
|
||||
+++ b/configure.in
|
||||
@@ -169,7 +169,7 @@ AF_CHECK_SSS_LIB(SSS_AUTOFS, libsss_auto
|
||||
AC_SUBST(HAVE_SSS_AUTOFS)
|
||||
AC_SUBST(sssldir)
|
||||
|
||||
-AC_CHECK_FUNCS(pipe2)
|
||||
+AC_CHECK_FUNCS(pipe2 innetgr)
|
||||
|
||||
#
|
||||
# Newer mounts have the -s (sloppy) option to ignore unknown options,
|
||||
--- a/include/config.h.in
|
||||
+++ b/include/config.h.in
|
||||
@@ -30,6 +30,9 @@
|
||||
/* Define to 1 if you have the `getservbyname' function. */
|
||||
#undef HAVE_GETSERVBYNAME
|
||||
|
||||
+/* Define to 1 if you have the `innetgr' function. */
|
||||
+#undef HAVE_INNETGR
|
||||
+
|
||||
/* Define to 1 if you have the <inttypes.h> header file. */
|
||||
#undef HAVE_INTTYPES_H
|
||||
|
||||
@@ -45,9 +48,6 @@
|
||||
/* Define if you have the Linux /proc filesystem. */
|
||||
#undef HAVE_LINUX_PROCFS
|
||||
|
||||
-/* Define to 1 if you have the <memory.h> header file. */
|
||||
-#undef HAVE_MEMORY_H
|
||||
-
|
||||
/* define if you have MOUNT */
|
||||
#undef HAVE_MOUNT
|
||||
|
||||
@@ -69,6 +69,9 @@
|
||||
/* Define to 1 if you have the <stdint.h> header file. */
|
||||
#undef HAVE_STDINT_H
|
||||
|
||||
+/* Define to 1 if you have the <stdio.h> header file. */
|
||||
+#undef HAVE_STDIO_H
|
||||
+
|
||||
/* Define to 1 if you have the <stdlib.h> header file. */
|
||||
#undef HAVE_STDLIB_H
|
||||
|
||||
@@ -141,7 +144,9 @@
|
||||
/* define if you have YACC */
|
||||
#undef PATH_YACC
|
||||
|
||||
-/* Define to 1 if you have the ANSI C header files. */
|
||||
+/* Define to 1 if all of the C90 standard headers exist (not just the ones
|
||||
+ required in a freestanding environment). This macro is provided for
|
||||
+ backward compatibility; new code need not use it. */
|
||||
#undef STDC_HEADERS
|
||||
|
||||
/* Define to 1 to use the libtirpc tsd usage workaround */
|
||||
--- a/modules/parse_amd.c
|
||||
+++ b/modules/parse_amd.c
|
||||
@@ -424,6 +424,7 @@ static int sel_in_network(struct autofs_
|
||||
return ret;
|
||||
}
|
||||
|
||||
+#ifdef HAVE_INNETGR
|
||||
static int sel_netgrp(struct autofs_point *ap,
|
||||
struct selector *s, struct substvar *sv)
|
||||
{
|
||||
@@ -488,6 +489,7 @@ out:
|
||||
|
||||
return ret;
|
||||
}
|
||||
+#endif
|
||||
|
||||
static int eval_selector(struct autofs_point *ap,
|
||||
struct amd_entry *this, struct substvar *sv)
|
||||
@@ -627,7 +629,12 @@ static int eval_selector(struct autofs_p
|
||||
switch (s->sel->selector) {
|
||||
case SEL_NETGRP:
|
||||
case SEL_NETGRPD:
|
||||
+#ifndef HAVE_INNETGR
|
||||
+ error(logopt, MODPREFIX
|
||||
+ "netgroups not available, function innetgr(3) not available");
|
||||
+#else
|
||||
ret = sel_netgrp(ap, s, sv);
|
||||
+#endif
|
||||
break;
|
||||
|
||||
default:
|
||||
@@ -0,0 +1,25 @@
|
||||
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>
|
||||
@@ -0,0 +1,26 @@
|
||||
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)
|
||||
@@ -0,0 +1,53 @@
|
||||
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
|
||||
@@ -0,0 +1,76 @@
|
||||
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(-)
|
||||
|
||||
--- a/lib/Makefile
|
||||
+++ b/lib/Makefile
|
||||
@@ -53,7 +53,8 @@ mount_xdr.o: mount_xdr.c
|
||||
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
|
||||
--- 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
|
||||
--- a/daemon/Makefile
|
||||
+++ b/daemon/Makefile
|
||||
@@ -16,7 +16,7 @@ YACCSRC = master_tok.c master_parse.tab.
|
||||
version := $(shell cat ../.version)
|
||||
|
||||
CFLAGS += -rdynamic $(DAEMON_CFLAGS) -D_GNU_SOURCE -I../include
|
||||
-CFLAGS += -DAUTOFS_LIB_DIR=\"$(autofslibdir)\"
|
||||
+CFLAGS += -DAUTOFS_LIB_DIR=\"$(autofslibdir)\"
|
||||
CFLAGS += -DAUTOFS_MAP_DIR=\"$(autofsmapdir)\"
|
||||
CFLAGS += -DAUTOFS_CONF_DIR=\"$(autofsconfdir)\"
|
||||
CFLAGS += -DAUTOFS_FIFO_DIR=\"$(autofsfifodir)\"
|
||||
@@ -44,7 +44,8 @@ automount: $(OBJS) $(AUTOFS_LIB)
|
||||
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
|
||||
@@ -57,5 +58,3 @@ clean:
|
||||
install: all
|
||||
install -d -m 755 $(INSTALLROOT)$(sbindir)
|
||||
install -c automount -m 755 $(INSTALLROOT)$(sbindir)
|
||||
-
|
||||
-
|
||||
@@ -0,0 +1,47 @@
|
||||
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 */
|
||||
@@ -0,0 +1,26 @@
|
||||
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
|
||||
@@ -0,0 +1,30 @@
|
||||
Avoid conflicts between sys/mount.h and linux/mount.h
|
||||
|
||||
linux/fs.h includes linux/mount.h and this include file is unused so
|
||||
do not include it and avoid conflict too with glibc 2.36+ see [1]
|
||||
|
||||
[1] https://sourceware.org/glibc/wiki/Release/2.36#Usage_of_.3Clinux.2Fmount.h.3E_and_.3Csys.2Fmount.h.3E
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
--- a/modules/parse_amd.c
|
||||
+++ b/modules/parse_amd.c
|
||||
@@ -27,7 +27,6 @@
|
||||
#include <sys/utsname.h>
|
||||
#include <netinet/in.h>
|
||||
#include <sys/mount.h>
|
||||
-#include <linux/fs.h>
|
||||
|
||||
#define MODULE_PARSE
|
||||
#include "automount.h"
|
||||
--- a/modules/parse_sun.c
|
||||
+++ b/modules/parse_sun.c
|
||||
@@ -30,7 +30,6 @@
|
||||
#include <sys/utsname.h>
|
||||
#include <netinet/in.h>
|
||||
#include <sys/mount.h>
|
||||
-#include <linux/fs.h>
|
||||
|
||||
#define MODULE_PARSE
|
||||
#include "automount.h"
|
||||
@@ -0,0 +1,29 @@
|
||||
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!
|
||||
|
||||
@@ -0,0 +1,37 @@
|
||||
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
|
||||
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 76ecb40..493b9f1 100644
|
||||
--- a/configure.in
|
||||
+++ b/configure.in
|
||||
@@ -238,7 +238,7 @@ AC_SUBST(LIBCLOCK_GETTIME)
|
||||
|
||||
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
|
||||
|
||||
@@ -0,0 +1,118 @@
|
||||
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"
|
||||
@@ -0,0 +1,36 @@
|
||||
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
|
||||
|
||||
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(-)
|
||||
|
||||
--- a/configure.in
|
||||
+++ b/configure.in
|
||||
@@ -215,7 +215,14 @@ PKG_CHECK_MODULES([XML], [libxml-2.0], [
|
||||
AC_DEFINE(LIBXML2_WORKAROUND, 1, [Use libxml2 tsd usage workaround])
|
||||
], [HAVE_LIBXML=0])
|
||||
|
||||
-AF_CHECK_KRB5()
|
||||
+PKG_CHECK_MODULES(KRB5, [krb5], [
|
||||
+ HAVE_KRB5=1
|
||||
+ SAVE_CFLAGS=$CFLAGS
|
||||
+ SAVE_LIBS=$LIBS
|
||||
+ CFLAGS="$CFLAGS $KRB5_FLAGS"
|
||||
+ LIBS="$LIBS $KRB5_LIBS"
|
||||
+ AC_CHECK_FUNCS([krb5_principal_get_realm])
|
||||
+], [HAVE_KRB5=0])
|
||||
|
||||
AC_SEARCH_LIBS([versionsort],[])
|
||||
if test "$ac_cv_search_versionsort" = "no"; then
|
||||
@@ -0,0 +1,100 @@
|
||||
SUMMARY = "Kernel based automounter for linux"
|
||||
SECTION = "utils"
|
||||
LICENSE = "GPL-2.0-only"
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=ee9324a6f564bb2376b63878ac396798"
|
||||
|
||||
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://no-bash.patch \
|
||||
file://cross.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://pkgconfig-libnsl.patch \
|
||||
file://0001-modules-lookup_multi.c-Replace-__S_IEXEC-with-S_IEXE.patch \
|
||||
file://0001-Do-not-hardcode-path-for-pkg.m4.patch \
|
||||
file://0001-Bug-fix-for-pid_t-not-found-on-musl.patch \
|
||||
file://0001-Define-__SWORD_TYPE-if-undefined.patch \
|
||||
file://mount_conflict.patch \
|
||||
file://0001-autofs-5.1.8-add-autofs_strerror_r-helper-for-musl.patch \
|
||||
file://0002-autofs-5.1.8-handle-innetgr-not-present-in-musl.patch \
|
||||
"
|
||||
SRC_URI[sha256sum] = "0bd401c56f0eb1ca6251344c3a3d70bface3eccf9c67117cd184422c4cace30c"
|
||||
|
||||
UPSTREAM_CHECK_URI = "${KERNELORG_MIRROR}/linux/daemons/autofs/v5/"
|
||||
|
||||
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-confdir=${sysconfdir}/default \
|
||||
--with-fifodir=/run \
|
||||
--with-flagdir=/run \
|
||||
--with-sasl=no --with-libtirpc \
|
||||
--with-mapdir=${sysconfdir} \
|
||||
--with-path=${STAGING_BINDIR_NATIVE} \
|
||||
--with-fifodir=${localstatedir}/run \
|
||||
--with-flagdir=${localstatedir}/run \
|
||||
"
|
||||
CACHED_CONFIGUREVARS = "ac_cv_path_RANLIB=${RANLIB} \
|
||||
ac_cv_path_RPCGEN=rpcgen \
|
||||
initdir=${INIT_D_DIR} \
|
||||
piddir=/run \
|
||||
"
|
||||
|
||||
do_configure:prepend () {
|
||||
if [ ! -e ${S}/acinclude.m4 ]; then
|
||||
cp ${S}/aclocal.m4 ${S}/acinclude.m4
|
||||
fi
|
||||
cp ${STAGING_DATADIR_NATIVE}/aclocal/pkg.m4 .
|
||||
}
|
||||
|
||||
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
|
||||
if [ -d ${D}${localstatedir}/run ]; then
|
||||
rmdir ${D}${localstatedir}/run
|
||||
fi
|
||||
# On hybrid systemd/sysvinit builds, we need to install the sysvinit script by hand.
|
||||
if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then
|
||||
install -d -m 755 ${D}${INIT_D_DIR}
|
||||
install -m 755 ${S}/samples/rc.autofs ${D}${INIT_D_DIR}/autofs
|
||||
fi
|
||||
}
|
||||
SECURITY_CFLAGS = "${SECURITY_NO_PIE_CFLAGS}"
|
||||
|
||||
# all the libraries are unversioned, so don't pack it on PN-dev
|
||||
SOLIBS = ".so"
|
||||
FILES_SOLIBSDEV = ""
|
||||
# Some symlinks are created in plugins dir e.g.
|
||||
# mount_nfs4.so -> mount_nfs.so
|
||||
INSANE_SKIP:${PN} = "dev-so"
|
||||
|
||||
RPROVIDES:${PN} += "${PN}-systemd"
|
||||
RREPLACES:${PN} += "${PN}-systemd"
|
||||
RCONFLICTS:${PN} += "${PN}-systemd"
|
||||
SYSTEMD_SERVICE:${PN} = "autofs.service"
|
||||
Reference in New Issue
Block a user