autofs: upgrade 5.1.5 -> 5.1.6

-When compiling version 5.1.6 on musl, the following error occurs:
| In file included from defaults.c:32:
| ../include/log.h:49:8: error: unknown type name 'pid_t'
-Add autofs/0001-Bug-fix-for-pid_t-not-found-on-musl.patch to fix it.

-Refresh the following patch:
 autofs/0001-Do-not-hardcode-path-for-pkg.m4.patch

Signed-off-by: Zang Ruochen <zangrc.fnst@cn.fujitsu.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Zang Ruochen 2019-10-29 13:49:28 +08:00 committed by Khem Raj
parent 131a90049e
commit 796fd089f2
3 changed files with 35 additions and 4 deletions

View File

@ -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

View File

@ -9,7 +9,7 @@ Upstream-Status: Pending
Signed-off-by: Khem Raj <raj.khem@gmail.com>
update patch to version 5.1.5
update patch to version 5.1.6
Signed-off-by: Changqing Li <changqing.li@windriver.com>
---
configure.in | 2 +-
@ -20,7 +20,7 @@ index 493b9f1..268d06b 100644
--- a/configure.in
+++ b/configure.in
@@ -12,7 +12,7 @@ define([AC_CACHE_SAVE], )dnl
AC_INIT(.autofs-5.1.5)
AC_INIT(.autofs-5.1.6)
# for pkg-config macros
-m4_include([/usr/share/aclocal/pkg.m4])

View File

@ -25,11 +25,12 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/daemons/autofs/v5/autofs-${PV}.tar.gz \
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 \
"
SRC_URI[md5sum] = "03b13168ec7bd66a6f2d5f6fea705eee"
SRC_URI[sha256sum] = "86a8e56ea9d72bb53ff8cdfeefb5cafe983592c6b0178fb99c4a731e59879181"
SRC_URI[md5sum] = "e6800e0afd6009ecdff148088c564050"
SRC_URI[sha256sum] = "82094cad44f4e5c4f93eff2789cd66b57d7ab3fa646b7722d97608571001e694"
UPSTREAM_CHECK_URI = "${KERNELORG_MIRROR}/linux/daemons/autofs/v5/"