* [Buildroot] [PATCH v3 1/1] xserver_xorg-server: Fix race condition when installing man pages
@ 2014-06-12 8:09 Bernd Kuhls
2014-06-14 17:19 ` Yann E. MORIN
2014-06-14 17:25 ` Thomas Petazzoni
0 siblings, 2 replies; 3+ messages in thread
From: Bernd Kuhls @ 2014-06-12 8:09 UTC (permalink / raw)
To: buildroot
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 <bernd.kuhls@t-online.de>
---
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
diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server-400-fix-man.patch b/package/x11r7/xserver_xorg-server/xserver_xorg-server-400-fix-man.patch
new file mode 100644
index 0000000..bde5ed6
--- /dev/null
+++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server-400-fix-man.patch
@@ -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 <bernd.kuhls@t-online.de>
+
+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:
diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
index cae3ba0..050dee6 100644
--- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
+++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
@@ -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 \
--
1.7.10.4
^ permalink raw reply related [flat|nested] 3+ messages in thread* [Buildroot] [PATCH v3 1/1] xserver_xorg-server: Fix race condition when installing man pages
2014-06-12 8:09 [Buildroot] [PATCH v3 1/1] xserver_xorg-server: Fix race condition when installing man pages Bernd Kuhls
@ 2014-06-14 17:19 ` Yann E. MORIN
2014-06-14 17:25 ` Thomas Petazzoni
1 sibling, 0 replies; 3+ messages in thread
From: Yann E. MORIN @ 2014-06-14 17:19 UTC (permalink / raw)
To: buildroot
Bernd, All,
On 2014-06-12 10:09 +0200, Bernd Kuhls spake thusly:
> 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 <bernd.kuhls@t-online.de>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Regards,
Yann E. MORIN.
> ---
> 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
>
> diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server-400-fix-man.patch b/package/x11r7/xserver_xorg-server/xserver_xorg-server-400-fix-man.patch
> new file mode 100644
> index 0000000..bde5ed6
> --- /dev/null
> +++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server-400-fix-man.patch
> @@ -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 <bernd.kuhls@t-online.de>
> +
> +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:
> diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
> index cae3ba0..050dee6 100644
> --- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
> +++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
> @@ -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 \
> --
> 1.7.10.4
>
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
--
.-----------------.--------------------.------------------.--------------------.
| 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. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 3+ messages in thread
* [Buildroot] [PATCH v3 1/1] xserver_xorg-server: Fix race condition when installing man pages
2014-06-12 8:09 [Buildroot] [PATCH v3 1/1] xserver_xorg-server: Fix race condition when installing man pages Bernd Kuhls
2014-06-14 17:19 ` Yann E. MORIN
@ 2014-06-14 17:25 ` Thomas Petazzoni
1 sibling, 0 replies; 3+ messages in thread
From: Thomas Petazzoni @ 2014-06-14 17:25 UTC (permalink / raw)
To: buildroot
Dear Bernd Kuhls,
On Thu, 12 Jun 2014 10:09:45 +0200, Bernd Kuhls wrote:
> 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 <bernd.kuhls@t-online.de>
> ---
> 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
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2014-06-14 17:25 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-06-12 8:09 [Buildroot] [PATCH v3 1/1] xserver_xorg-server: Fix race condition when installing man pages Bernd Kuhls
2014-06-14 17:19 ` Yann E. MORIN
2014-06-14 17:25 ` Thomas Petazzoni
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox