From 4fc07a089bb77b37a7cc8527f15dff91d0613c5d Mon Sep 17 00:00:00 2001 From: Dragos Iulian Argint Date: Sat, 7 May 2022 12:05:35 +0300 Subject: [PATCH] Remove patch for 'ioctl' This patch was introduced to modify the prototype of the `ioctl()` function when it was exported directly from vfscore. Now, since we want to keep the wrapper in musl, we leave the function prototype unchanged. The patch is no longer needed. Signed-off-by: Dragos Iulian Argint Reviewed-by: Sergiu Moga Reviewed-by: Simon Kuenzer Approved-by: Simon Kuenzer Tested-by: Unikraft CI GitHub-Closes: #5 --- .../0008-Use-compatible-ioctl-prototype.patch | 30 ------------------- 1 file changed, 30 deletions(-) delete mode 100644 patches/0008-Use-compatible-ioctl-prototype.patch diff --git a/patches/0008-Use-compatible-ioctl-prototype.patch b/patches/0008-Use-compatible-ioctl-prototype.patch deleted file mode 100644 index 85cd3b0..0000000 --- a/patches/0008-Use-compatible-ioctl-prototype.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 150959f0fd0b04919fb1384abb8998fd8e2c1ca4 Mon Sep 17 00:00:00 2001 -From: Alexander Jung -Date: Tue, 30 Jun 2020 19:45:36 +0200 -Subject: [PATCH] Use compatible ioctl prototype - -This patch updates the `ioctl` prototype with a more precise definition -which is also compliant with vfscore. - -Signed-off-by: Alexander Jung ---- - include/sys/ioctl.h | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/include/sys/ioctl.h b/include/sys/ioctl.h -index d0415b3..9929002 100644 ---- a/include/sys/ioctl.h -+++ b/include/sys/ioctl.h -@@ -6,7 +6,8 @@ extern "C" { - - #include - --int ioctl (int, int, ...); -+// int ioctl (int, int, ...); -+int ioctl(int fd, unsigned long int request, ...); - - #ifdef __cplusplus - } --- -2.20.1 - -- 2.39.5