Skip to contentSkip to conversation

uclibc: backport upstream patch adding fcntl definitions on OpenRISC

PATCH New Thomas Petazzoni 1 participant 2 messages Apr 20, 2018 – Apr 21, 2018

lore
Share & tools
lore

Thomas Petazzoni

author
#0 lore raw

PATCH 1/1 uclibc: backport upstream patch adding fcntl definitions on OpenRISC

A number of fcntl.h definitions were missing on OpenRISC in uClibc-ng, causing build failures such as:

gfile.c: In function 'splice_stream_with_progress':
gfile.c:3017:35: error: 'F_SETPIPE_SZ' undeclared (first use in this function)
buffer_size = fcntl (buffer[1], F_SETPIPE_SZ, 1024 * 1024);

This comit backports a patch that was merged in upstream uClibc-ng, which addresses this problem.

Fixes:

http://autobuild.buildroot.net/results/182ebbba6c7466b07e965e5120d919cbcf5e9da6/

Signed-off-by Thomas Petazzoni <[email protected]>
---
 ...dd-F_-DUPFD_CLOEXEC-SETPIPE_SZ-GETPIPE_SZ.patch | 36 ++++++++++++++++++++++
 1 file changed, 36 insertions(+)
 create mode 100644 package/uclibc/0002-or1k-add-F_-DUPFD_CLOEXEC-SETPIPE_SZ-GETPIPE_SZ.patch
package/uclibc/0002-or1k-add-F_-DUPFD_CLOEXEC-SETPIPE_SZ-GETPIPE_SZ.patch new file +36 -0
new file mode 100644
index 0000000000..b81c5921b9
@@ -0,0 +1,36 @@
+From f42d18f06084b6db90c104fb5404a91602e9b904 Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni <[email protected]>
+Date: Thu, 12 Apr 2018 23:24:59 +0200
+Subject: [PATCH] or1k: add F_{DUPFD_CLOEXEC, SETPIPE_SZ, GETPIPE_SZ}
+
+Those definitions exist on all other architectures, but were not
+present in or1k specific headers when or1k support was merged.
+
+On the kernel side, their support is completely architecture
+independent, so we just need those definitions to make those fcntl()
+calls available on or1k.
+
+Signed-off-by: Thomas Petazzoni <[email protected]>
+Upstream-status: https://cgit.uclibc-ng.org/cgi/cgit/uclibc-ng.git/commit/?id=f42d18f06084b6db90c104fb5404a91602e9b904
+---
+ libc/sysdeps/linux/or1k/bits/fcntl.h | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/libc/sysdeps/linux/or1k/bits/fcntl.h b/libc/sysdeps/linux/or1k/bits/fcntl.h
+index bd6a8c511..a82ede424 100644
+--- a/libc/sysdeps/linux/or1k/bits/fcntl.h
++++ b/libc/sysdeps/linux/or1k/bits/fcntl.h
+@@ -102,6 +102,10 @@
+ # define F_SETLEASE	1024	/* Set a lease.	 */
+ # define F_GETLEASE	1025	/* Enquire what lease is active.  */
+ # define F_NOTIFY	1026	/* Request notfications on a directory.	 */
++# define F_DUPFD_CLOEXEC 1030	/* Duplicate file descriptor with
++				   close-on-exit set on new fd.  */
++# define F_SETPIPE_SZ	1031    /* Set pipe page size array.  */
++# define F_GETPIPE_SZ	1032    /* Get pipe page size array.  */
+ #endif
+ 
+ /* For F_[GET|SET]FL.  */
+-- 
+2.14.3
+
Signature · 1 line
2.14.3
author Applied
#1 lore raw

PATCH 1/1 uclibc: backport upstream patch adding fcntl definitions on OpenRISC

Hello,

Quoted 12 lines · Thomas Petazzoni

A number of fcntl.h definitions were missing on OpenRISC in uClibc-ng, causing build failures such as:

gfile.c: In function 'splice_stream_with_progress':
gfile.c:3017:35: error: 'F_SETPIPE_SZ' undeclared (first use in this function)
buffer_size = fcntl (buffer[1], F_SETPIPE_SZ, 1024 * 1024);

This comit backports a patch that was merged in upstream uClibc-ng, which addresses this problem.

Fixes:

Quoted 7 lines

http://autobuild.buildroot.net/results/182ebbba6c7466b07e965e5120d919cbcf5e9da6/

Signed-off-by Thomas Petazzoni <[email protected]>
---
 ...dd-F_-DUPFD_CLOEXEC-SETPIPE_SZ-GETPIPE_SZ.patch | 36 ++++++++++++++++++++++
 1 file changed, 36 insertions(+)
 create mode 100644 package/uclibc/0002-or1k-add-F_-DUPFD_CLOEXEC-SETPIPE_SZ-GETPIPE_SZ.patch

Applied to master, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
https://bootlin.com