From 796fd089f2c7ee1756219f9cd2fd02823aa6d9ab Mon Sep 17 00:00:00 2001 From: Zang Ruochen Date: Tue, 29 Oct 2019 13:49:28 +0800 Subject: [PATCH] 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 Signed-off-by: Khem Raj --- ...-Bug-fix-for-pid_t-not-found-on-musl.patch | 30 +++++++++++++++++++ ...0001-Do-not-hardcode-path-for-pkg.m4.patch | 4 +-- .../{autofs_5.1.5.bb => autofs_5.1.6.bb} | 5 ++-- 3 files changed, 35 insertions(+), 4 deletions(-) create mode 100644 meta-networking/recipes-daemons/autofs/autofs/0001-Bug-fix-for-pid_t-not-found-on-musl.patch rename meta-networking/recipes-daemons/autofs/{autofs_5.1.5.bb => autofs_5.1.6.bb} (93%) diff --git a/meta-networking/recipes-daemons/autofs/autofs/0001-Bug-fix-for-pid_t-not-found-on-musl.patch b/meta-networking/recipes-daemons/autofs/autofs/0001-Bug-fix-for-pid_t-not-found-on-musl.patch new file mode 100644 index 0000000000..2a583466e3 --- /dev/null +++ b/meta-networking/recipes-daemons/autofs/autofs/0001-Bug-fix-for-pid_t-not-found-on-musl.patch @@ -0,0 +1,30 @@ +From d0d5ac317dab11610a5fc91ca3e7f5ad72ce2236 Mon Sep 17 00:00:00 2001 +From: Zang Ruochen +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 +--- + 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 + #include + #include ++#include + #include + + #include "config.h" +-- +2.20.1 + diff --git a/meta-networking/recipes-daemons/autofs/autofs/0001-Do-not-hardcode-path-for-pkg.m4.patch b/meta-networking/recipes-daemons/autofs/autofs/0001-Do-not-hardcode-path-for-pkg.m4.patch index 410827b338..b991acad38 100644 --- a/meta-networking/recipes-daemons/autofs/autofs/0001-Do-not-hardcode-path-for-pkg.m4.patch +++ b/meta-networking/recipes-daemons/autofs/autofs/0001-Do-not-hardcode-path-for-pkg.m4.patch @@ -9,7 +9,7 @@ Upstream-Status: Pending Signed-off-by: Khem Raj -update patch to version 5.1.5 +update patch to version 5.1.6 Signed-off-by: Changqing Li --- 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]) diff --git a/meta-networking/recipes-daemons/autofs/autofs_5.1.5.bb b/meta-networking/recipes-daemons/autofs/autofs_5.1.6.bb similarity index 93% rename from meta-networking/recipes-daemons/autofs/autofs_5.1.5.bb rename to meta-networking/recipes-daemons/autofs/autofs_5.1.6.bb index 9e43549e83..aeadc9d5dd 100644 --- a/meta-networking/recipes-daemons/autofs/autofs_5.1.5.bb +++ b/meta-networking/recipes-daemons/autofs/autofs_5.1.6.bb @@ -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/"