[Lsb-messages] /var/www/bzr/lsb/devel/build_env r1961: update O_SYNC/O_RSYNC to match upstream (bug 3542)

Mats Wichmann mats at linuxfoundation.org
Fri May 18 11:07:48 UTC 2012


------------------------------------------------------------
revno: 1961
committer: Mats Wichmann <mats at linuxfoundation.org>
branch nick: build_env
timestamp: Fri 2012-05-18 05:07:48 -0600
message:
  update O_SYNC/O_RSYNC to match upstream (bug 3542)
modified:
  headers/All/5.0/fcntl.h.defs
  headers/fcntl.h
  package/Makefile
-------------- next part --------------
=== modified file 'headers/All/5.0/fcntl.h.defs'
--- a/headers/All/5.0/fcntl.h.defs	2009-11-03 20:41:16 +0000
+++ b/headers/All/5.0/fcntl.h.defs	2012-05-18 11:07:48 +0000
@@ -7,7 +7,6 @@
 #define O_TRUNC	01000
 #define O_DSYNC	010000
 #define O_RSYNC	010000
-#define O_SYNC	010000
 #define O_RDWR	02
 #define O_EXCL	0200
 #define O_APPEND	02000
@@ -15,10 +14,12 @@
 #define O_NOCTTY	0400
 #define O_NDELAY	04000
 #define O_NONBLOCK	04000
+#define O_SYNC	04010000
 #define FD_CLOEXEC	1
 #define POSIX_FADV_RANDOM	1
 #define POSIX_FADV_SEQUENTIAL	2
 #define POSIX_FADV_WILLNEED	3
+#define O_RSYNC	O_SYNC
 
 struct flock {
     short l_type;

=== modified file 'headers/fcntl.h'
--- a/headers/fcntl.h	2012-04-09 22:25:23 +0000
+++ b/headers/fcntl.h	2012-05-18 11:07:48 +0000
@@ -16,7 +16,6 @@
 #define O_WRONLY	01
 #define O_CREAT	0100
 #define O_TRUNC	01000
-#define O_SYNC	010000
 #define O_RDWR	02
 #define O_EXCL	0200
 #define O_APPEND	02000
@@ -25,6 +24,10 @@
 #define O_NDELAY	04000
 #define O_NONBLOCK	04000
 #define FD_CLOEXEC	1
+#if __LSB_VERSION__ < 50
+#define O_SYNC	010000
+#endif				/* __LSB_VERSION__ < 5.0 */
+
 #endif				/* __LSB_VERSION__ >= 1.1 */
 
 #if __LSB_VERSION__ >= 32
@@ -142,6 +145,11 @@
 #endif
 #endif				/* __LSB_VERSION__ >= 4.0 */
 
+#if __LSB_VERSION__ >= 50
+#define O_SYNC	04010000
+#define O_RSYNC	O_SYNC
+#endif				/* __LSB_VERSION__ >= 5.0 */
+
 
 
 #if __LSB_VERSION__ >= 12

=== modified file 'package/Makefile'
--- a/package/Makefile	2012-05-18 10:55:41 +0000
+++ b/package/Makefile	2012-05-18 11:07:48 +0000
@@ -46,7 +46,7 @@
 
 # We define this here instead of directly in the spec file as
 # we need to be able to work out what the produced rpm files will be called
-RPM_PACKAGE_RELEASE=2
+RPM_PACKAGE_RELEASE=3
 
 # Initialize LIB64 to proper value for 64-bit architectures
 export LIB64:=$(shell case `uname -m` in (ppc64 | s390x | x86_64) echo 64 ;; esac)



More information about the lsb-messages mailing list