| Message ID | ZNWRuw83P+HDmpjP@waldemar-brodkorb.de |
|---|---|
| State | Accepted |
| Headers | show |
| Series | package/uclibc: add upstream patch to fix missing f_owner_ex | expand |
Waldemar, All, On 2023-08-11 03:41 +0200, Waldemar Brodkorb spake thusly: > This was previously only defined for aarch64, define the missing > stuff for all architectures. > This is required for the zeek package. > > Fixes: > - http://autobuild.buildroot.net/results/f32/f32777b27c6b4f5a41c255df53502164d21b0fd4 > > Signed-off-by: Waldemar Brodkorb <wbx@openadk.org> Applied to master, thanks. Regards, Yann E. MORIN. > --- > ...are-f_owner_ex-for-all-architectures.patch | 85 +++++++++++++++++++ > 1 file changed, 85 insertions(+) > create mode 100644 package/uclibc/0002-fcntl.h-declare-f_owner_ex-for-all-architectures.patch > > diff --git a/package/uclibc/0002-fcntl.h-declare-f_owner_ex-for-all-architectures.patch b/package/uclibc/0002-fcntl.h-declare-f_owner_ex-for-all-architectures.patch > new file mode 100644 > index 0000000000..da0135a5e3 > --- /dev/null > +++ b/package/uclibc/0002-fcntl.h-declare-f_owner_ex-for-all-architectures.patch > @@ -0,0 +1,85 @@ > +From 98576ab8de710507419b016fbcfc82ed7c57f9c3 Mon Sep 17 00:00:00 2001 > +From: Waldemar Brodkorb <wbx@openadk.org> > +Date: Wed, 9 Aug 2023 10:31:28 +0200 > +Subject: [PATCH] fcntl.h: declare f_owner_ex for all architectures > + > +Signed-off-by: Waldemar Brodkorb <wbx@openadk.org> > +Upstream: https://cgit.uclibc-ng.org/cgi/cgit/uclibc-ng.git/commit/?id=98576ab8de710507419b016fbcfc82ed7c57f9c3 > +--- > + include/fcntl.h | 20 ++++++++++++++++++++ > + libc/sysdeps/linux/aarch64/bits/fcntl.h | 21 --------------------- > + 2 files changed, 20 insertions(+), 21 deletions(-) > + > +diff --git a/include/fcntl.h b/include/fcntl.h > +index 136f64d70..ce15ceaf6 100644 > +--- a/include/fcntl.h > ++++ b/include/fcntl.h > +@@ -296,6 +296,26 @@ int name_to_handle_at(int dirfd, const char *pathname, > + int open_by_handle_at(int mount_fd, struct file_handle *handle, int flags); > + #endif > + > ++#ifdef __USE_GNU > ++# define F_SETOWN_EX 15 /* Get owner (thread receiving SIGIO). */ > ++# define F_GETOWN_EX 16 /* Set owner (thread receiving SIGIO). */ > ++/* Owner types. */ > ++enum __pid_type > ++ { > ++ F_OWNER_TID = 0, /* Kernel thread. */ > ++ F_OWNER_PID, /* Process. */ > ++ F_OWNER_PGRP, /* Process group. */ > ++ F_OWNER_GID = F_OWNER_PGRP /* Alternative, obsolete name. */ > ++ }; > ++ > ++/* Structure to use with F_GETOWN_EX and F_SETOWN_EX. */ > ++struct f_owner_ex > ++ { > ++ enum __pid_type type; /* Owner type of ID. */ > ++ __pid_t pid; /* ID of owner. */ > ++ }; > ++#endif > ++ > + __END_DECLS > + > + #endif /* fcntl.h */ > +diff --git a/libc/sysdeps/linux/aarch64/bits/fcntl.h b/libc/sysdeps/linux/aarch64/bits/fcntl.h > +index c143ba9c9..dbe929351 100644 > +--- a/libc/sysdeps/linux/aarch64/bits/fcntl.h > ++++ b/libc/sysdeps/linux/aarch64/bits/fcntl.h > +@@ -94,8 +94,6 @@ > + #ifdef __USE_GNU > + # define F_SETSIG 10 /* Set number of signal to be sent. */ > + # define F_GETSIG 11 /* Get number of signal to be sent. */ > +-# define F_SETOWN_EX 15 /* Get owner (thread receiving SIGIO). */ > +-# define F_GETOWN_EX 16 /* Set owner (thread receiving SIGIO). */ > + #endif > + > + > +@@ -170,25 +168,6 @@ struct flock64 > + }; > + #endif > + > +- > +-#ifdef __USE_GNU > +-/* Owner types. */ > +-enum __pid_type > +- { > +- F_OWNER_TID = 0, /* Kernel thread. */ > +- F_OWNER_PID, /* Process. */ > +- F_OWNER_PGRP, /* Process group. */ > +- F_OWNER_GID = F_OWNER_PGRP /* Alternative, obsolete name. */ > +- }; > +- > +-/* Structure to use with F_GETOWN_EX and F_SETOWN_EX. */ > +-struct f_owner_ex > +- { > +- enum __pid_type type; /* Owner type of ID. */ > +- __pid_t pid; /* ID of owner. */ > +- }; > +-#endif > +- > + /* Define some more compatibility macros to be backward compatible with > + BSD systems which did not managed to hide these kernel macros. */ > + #ifdef __USE_BSD > +-- > +2.30.2 > + > -- > 2.39.2 > > _______________________________________________ > buildroot mailing list > buildroot@buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot
>>>>> "Waldemar" == Waldemar Brodkorb <wbx@openadk.org> writes: > This was previously only defined for aarch64, define the missing > stuff for all architectures. > This is required for the zeek package. > Fixes: > - http://autobuild.buildroot.net/results/f32/f32777b27c6b4f5a41c255df53502164d21b0fd4 > Signed-off-by: Waldemar Brodkorb <wbx@openadk.org> Committed to 2023.02.x and 2023.05.x, thanks.
diff --git a/package/uclibc/0002-fcntl.h-declare-f_owner_ex-for-all-architectures.patch b/package/uclibc/0002-fcntl.h-declare-f_owner_ex-for-all-architectures.patch new file mode 100644 index 0000000000..da0135a5e3 --- /dev/null +++ b/package/uclibc/0002-fcntl.h-declare-f_owner_ex-for-all-architectures.patch @@ -0,0 +1,85 @@ +From 98576ab8de710507419b016fbcfc82ed7c57f9c3 Mon Sep 17 00:00:00 2001 +From: Waldemar Brodkorb <wbx@openadk.org> +Date: Wed, 9 Aug 2023 10:31:28 +0200 +Subject: [PATCH] fcntl.h: declare f_owner_ex for all architectures + +Signed-off-by: Waldemar Brodkorb <wbx@openadk.org> +Upstream: https://cgit.uclibc-ng.org/cgi/cgit/uclibc-ng.git/commit/?id=98576ab8de710507419b016fbcfc82ed7c57f9c3 +--- + include/fcntl.h | 20 ++++++++++++++++++++ + libc/sysdeps/linux/aarch64/bits/fcntl.h | 21 --------------------- + 2 files changed, 20 insertions(+), 21 deletions(-) + +diff --git a/include/fcntl.h b/include/fcntl.h +index 136f64d70..ce15ceaf6 100644 +--- a/include/fcntl.h ++++ b/include/fcntl.h +@@ -296,6 +296,26 @@ int name_to_handle_at(int dirfd, const char *pathname, + int open_by_handle_at(int mount_fd, struct file_handle *handle, int flags); + #endif + ++#ifdef __USE_GNU ++# define F_SETOWN_EX 15 /* Get owner (thread receiving SIGIO). */ ++# define F_GETOWN_EX 16 /* Set owner (thread receiving SIGIO). */ ++/* Owner types. */ ++enum __pid_type ++ { ++ F_OWNER_TID = 0, /* Kernel thread. */ ++ F_OWNER_PID, /* Process. */ ++ F_OWNER_PGRP, /* Process group. */ ++ F_OWNER_GID = F_OWNER_PGRP /* Alternative, obsolete name. */ ++ }; ++ ++/* Structure to use with F_GETOWN_EX and F_SETOWN_EX. */ ++struct f_owner_ex ++ { ++ enum __pid_type type; /* Owner type of ID. */ ++ __pid_t pid; /* ID of owner. */ ++ }; ++#endif ++ + __END_DECLS + + #endif /* fcntl.h */ +diff --git a/libc/sysdeps/linux/aarch64/bits/fcntl.h b/libc/sysdeps/linux/aarch64/bits/fcntl.h +index c143ba9c9..dbe929351 100644 +--- a/libc/sysdeps/linux/aarch64/bits/fcntl.h ++++ b/libc/sysdeps/linux/aarch64/bits/fcntl.h +@@ -94,8 +94,6 @@ + #ifdef __USE_GNU + # define F_SETSIG 10 /* Set number of signal to be sent. */ + # define F_GETSIG 11 /* Get number of signal to be sent. */ +-# define F_SETOWN_EX 15 /* Get owner (thread receiving SIGIO). */ +-# define F_GETOWN_EX 16 /* Set owner (thread receiving SIGIO). */ + #endif + + +@@ -170,25 +168,6 @@ struct flock64 + }; + #endif + +- +-#ifdef __USE_GNU +-/* Owner types. */ +-enum __pid_type +- { +- F_OWNER_TID = 0, /* Kernel thread. */ +- F_OWNER_PID, /* Process. */ +- F_OWNER_PGRP, /* Process group. */ +- F_OWNER_GID = F_OWNER_PGRP /* Alternative, obsolete name. */ +- }; +- +-/* Structure to use with F_GETOWN_EX and F_SETOWN_EX. */ +-struct f_owner_ex +- { +- enum __pid_type type; /* Owner type of ID. */ +- __pid_t pid; /* ID of owner. */ +- }; +-#endif +- + /* Define some more compatibility macros to be backward compatible with + BSD systems which did not managed to hide these kernel macros. */ + #ifdef __USE_BSD +-- +2.30.2 +
This was previously only defined for aarch64, define the missing stuff for all architectures. This is required for the zeek package. Fixes: - http://autobuild.buildroot.net/results/f32/f32777b27c6b4f5a41c255df53502164d21b0fd4 Signed-off-by: Waldemar Brodkorb <wbx@openadk.org> --- ...are-f_owner_ex-for-all-architectures.patch | 85 +++++++++++++++++++ 1 file changed, 85 insertions(+) create mode 100644 package/uclibc/0002-fcntl.h-declare-f_owner_ex-for-all-architectures.patch