Skip to contentSkip to conversation

xserver_xorg-server: Fix race condition when installing man pages

PATCH New Bernd Kuhls 3 participants 3 messages Jun 12, 2014 – Jun 14, 2014

lore
Share & tools
lore

Bernd Kuhls

author
#0 lore raw

PATCH v3 1/1 xserver_xorg-server: Fix race condition when installing man pages

Reproduced the bug using BR2_JLEVEL=16

Fixes race condition by disabling parallel make in man/

http://autobuild.buildroot.net/results/11e/11ece737078ca8da2fee4249432148675b4e630e/
http://autobuild.buildroot.net/results/a95/a952932b832ee3296d6c225c7a9df408ca3eef9f/

Signed-off-by Bernd Kuhls <[email protected]>

---
v3: To autoreconf host-xfont_font-util is needed
v2: Patch man/Makefile.am to disable parallel make instead of removing man/
from SUBDIRS in Makefile.am

 .../xserver_xorg-server-400-fix-man.patch           |   19 +++++++++++++++++++
 .../xserver_xorg-server/xserver_xorg-server.mk      |    2 ++
 2 files changed, 21 insertions(+)
 create mode 100644 package/x11r7/xserver_xorg-server/xserver_xorg-server-400-fix-man.patch
package/x11r7/xserver_xorg-server/xserver_xorg-server-400-fix-man.patch new file +19 -0
new file mode 100644
index 0000000..bde5ed6
@@ -0,0 +1,19 @@
+Fix race condition when installing man page
+
+Fixes
+http://autobuild.buildroot.net/results/11e/11ece737078ca8da2fee4249432148675b4e630e/
+http://autobuild.buildroot.net/results/a95/a952932b832ee3296d6c225c7a9df408ca3eef9f/
+
+Patch sent upstream: https://bugs.freedesktop.org/show_bug.cgi?id=79396
+
+Signed-off-by: Bernd Kuhls <[email protected]>
+
+diff -uNr xorg-server-1.15.1.org/man/Makefile.am xorg-server-1.15.1/man/Makefile.am
+--- xorg-server-1.15.1.org/man/Makefile.am	2014-03-22 06:37:53.000000000 +0100
++++ xorg-server-1.15.1/man/Makefile.am	2014-05-29 09:27:48.808356591 +0200
+@@ -4,3 +4,5 @@
+ 
+ include $(top_srcdir)/manpages.am
+ appman_PRE = Xserver.man
++
++.NOTPARALLEL:
package/x11r7/xserver_xorg-server/xserver_xorg-server.mk +2 -0
index cae3ba0..050dee6 100644
@@ -9,6 +9,7 @@ XSERVER_XORG_SERVER_SOURCE = xorg-server-$(XSERVER_XORG_SERVER_VERSION).tar.bz2
 XSERVER_XORG_SERVER_SITE = http://xorg.freedesktop.org/releases/individual/xserver
 XSERVER_XORG_SERVER_LICENSE = MIT
 XSERVER_XORG_SERVER_LICENSE_FILES = COPYING
+XSERVER_XORG_SERVER_AUTORECONF = YES
 XSERVER_XORG_SERVER_INSTALL_STAGING = YES
 XSERVER_XORG_SERVER_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) install install-data
 XSERVER_XORG_SERVER_DEPENDENCIES = 	\

@@ -53,6 +54,7 @@ XSERVER_XORG_SERVER_DEPENDENCIES = 	\
 	xkeyboard-config		\
 	pixman 				\
 	mcookie 			\
+	host-xfont_font-util		\
 	host-pkgconf
 
 XSERVER_XORG_SERVER_CONF_OPT = --disable-config-hal \
Signature · 1 line
1.7.10.4
#1 lore raw

PATCH v3 1/1 xserver_xorg-server: Fix race condition when installing man pages

Bernd, All,

On 2014-06-12 10:09 +0200, Bernd Kuhls spake thusly:

Quoted 8 lines

Reproduced the bug using BR2_JLEVEL=16

Fixes race condition by disabling parallel make in man/

http://autobuild.buildroot.net/results/11e/11ece737078ca8da2fee4249432148675b4e630e/
http://autobuild.buildroot.net/results/a95/a952932b832ee3296d6c225c7a9df408ca3eef9f/

Signed-off-by Bernd Kuhls <[email protected]>
Reviewed-by "Yann E. MORIN" <[email protected]>

Regards,
Yann E. MORIN.

Quoted 62 lines

---
v3: To autoreconf host-xfont_font-util is needed
v2: Patch man/Makefile.am to disable parallel make instead of removing man/
from SUBDIRS in Makefile.am

 .../xserver_xorg-server-400-fix-man.patch           |   19 +++++++++++++++++++
 .../xserver_xorg-server/xserver_xorg-server.mk      |    2 ++
 2 files changed, 21 insertions(+)
 create mode 100644 package/x11r7/xserver_xorg-server/xserver_xorg-server-400-fix-man.patch
package/x11r7/xserver_xorg-server/xserver_xorg-server-400-fix-man.patch new file +19 -0
new file mode 100644
index 0000000..bde5ed6
@@ -0,0 +1,19 @@
+Fix race condition when installing man page
+
+Fixes
+http://autobuild.buildroot.net/results/11e/11ece737078ca8da2fee4249432148675b4e630e/
+http://autobuild.buildroot.net/results/a95/a952932b832ee3296d6c225c7a9df408ca3eef9f/
+
+Patch sent upstream: https://bugs.freedesktop.org/show_bug.cgi?id=79396
+
+Signed-off-by: Bernd Kuhls <[email protected]>
+
+diff -uNr xorg-server-1.15.1.org/man/Makefile.am xorg-server-1.15.1/man/Makefile.am
+--- xorg-server-1.15.1.org/man/Makefile.am	2014-03-22 06:37:53.000000000 +0100
++++ xorg-server-1.15.1/man/Makefile.am	2014-05-29 09:27:48.808356591 +0200
+@@ -4,3 +4,5 @@
+ 
+ include $(top_srcdir)/manpages.am
+ appman_PRE = Xserver.man
++
++.NOTPARALLEL:
package/x11r7/xserver_xorg-server/xserver_xorg-server.mk +2 -0
index cae3ba0..050dee6 100644
@@ -9,6 +9,7 @@ XSERVER_XORG_SERVER_SOURCE = xorg-server-$(XSERVER_XORG_SERVER_VERSION).tar.bz2
 XSERVER_XORG_SERVER_SITE = http://xorg.freedesktop.org/releases/individual/xserver
 XSERVER_XORG_SERVER_LICENSE = MIT
 XSERVER_XORG_SERVER_LICENSE_FILES = COPYING
+XSERVER_XORG_SERVER_AUTORECONF = YES
 XSERVER_XORG_SERVER_INSTALL_STAGING = YES
 XSERVER_XORG_SERVER_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) install install-data
 XSERVER_XORG_SERVER_DEPENDENCIES = 	\

@@ -53,6 +54,7 @@ XSERVER_XORG_SERVER_DEPENDENCIES = 	\
 	xkeyboard-config		\
 	pixman 				\
 	mcookie 			\
+	host-xfont_font-util		\
 	host-pkgconf
 
 XSERVER_XORG_SERVER_CONF_OPT = --disable-config-hal \
Signature · 6 lines
1.7.10.4

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
Applied
#2 lore raw

PATCH v3 1/1 xserver_xorg-server: Fix race condition when installing man pages

In reply to Bernd Kuhls

Dear Bernd Kuhls,

Quoted 4 lines · Bernd Kuhls

Reproduced the bug using BR2_JLEVEL=16

Fixes race condition by disabling parallel make in man/

Quoted 8 lines

http://autobuild.buildroot.net/results/11e/11ece737078ca8da2fee4249432148675b4e630e/
http://autobuild.buildroot.net/results/a95/a952932b832ee3296d6c225c7a9df408ca3eef9f/

Signed-off-by Bernd Kuhls <[email protected]>

---
v3: To autoreconf host-xfont_font-util is needed
v2: Patch man/Makefile.am to disable parallel make instead of removing man/
from SUBDIRS in Makefile.am

Applied, thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com