autofs: Fix build with glibc 2.36

Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Khem Raj 2022-08-06 22:30:39 -07:00
parent 8d7a59a813
commit 0b031b5704
2 changed files with 31 additions and 0 deletions

View File

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

View File

@ -26,6 +26,7 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/daemons/autofs/v5/autofs-${PV}.tar.gz \
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 \
"
SRC_URI[sha256sum] = "0bd401c56f0eb1ca6251344c3a3d70bface3eccf9c67117cd184422c4cace30c"