Re: [Minios-devel] [UNIKRAFT/MUSL PATCH V2 1/5] Add patch to update mount.h to avoid conflicts with vfscore

[Simon Kuenzer <simon.kuenzer@xxxxxxxxx>]

Hi Gaulthier,

do you think we could fix this with vfscore instead? We would keep the 
require patches to musl smaller which simplifies updates to newer musl 
versions.
Thanks,

Simon

On 03.03.20 11:23, gaulthier.gain@xxxxxxxxx wrote:
> From: gaulthier gain <gaulthier.gain@xxxxxxxxx>
>
> This patch updates "mount.h" in order to avoid ioctl redefinition
> error with vfscore. Basically, the musl "mount.h" file includes
> <sys/ioctl.h> only if _VFSCORE_SYS_MOUNT_H_ was not defined.
>
> Signed-off-by: gaulthier gain <gaulthier.gain@xxxxxxxxx>
> ---
>   patches/0008-Fix-sys_ioctl_h-conflicts.patch | 27 ++++++++++++++++++++
>   1 file changed, 27 insertions(+)
>   create mode 100644 patches/0008-Fix-sys_ioctl_h-conflicts.patch
>
> diff --git a/patches/0008-Fix-sys_ioctl_h-conflicts.patch 
> b/patches/0008-Fix-sys_ioctl_h-conflicts.patch
> new file mode 100644
> index 0000000..953b8ad
> --- /dev/null
> +++ b/patches/0008-Fix-sys_ioctl_h-conflicts.patch
> @@ -0,0 +1,27 @@
> +From 2aa8ddeb0deb165b28f9e70b14da69b7bf9b938d Mon Sep 17 00:00:00 2001
> +From: gaulthier gain <gaulthier.gain@xxxxxxxxx>
> +Date: Mon, 24 Feb 2020 21:01:40 +0000
> +Subject: [PATCH] Remove <sys/ioctl> from musl internal
> +
> +Signed-off-by: Gaulthier Gain <gaulthier.gain@xxxxxxxxx>
> +---
> + include/sys/mount.h | 2 ++
> + 1 file changed, 2 insertions(+)
> +
> +diff --git a/include/sys/mount.h b/include/sys/mount.h
> +index 57a89c0..6516a51 100644
> +--- a/include/sys/mount.h
> ++++ b/include/sys/mount.h
> +@@ -5,7 +5,9 @@
> + extern "C" {
> + #endif
> +
> ++#ifndef _VFSCORE_SYS_MOUNT_H_
> + #include <sys/ioctl.h>
> ++#endif
> +
> + #define BLKROSET   _IO(0x12, 93)
> + #define BLKROGET   _IO(0x12, 94)
> +--
> +2.17.1
> +