From patchwork Sat Jul 5 14:12:26 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bernd Kuhls X-Patchwork-Id: 367314 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from hemlock.osuosl.org (hemlock.osuosl.org [140.211.166.133]) by ozlabs.org (Postfix) with ESMTP id 062FD14012A for ; Sun, 6 Jul 2014 00:12:51 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 18E458A520; Sat, 5 Jul 2014 14:12:51 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id KL1ISjLssq6H; Sat, 5 Jul 2014 14:12:49 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id EDFEE8A14A; Sat, 5 Jul 2014 14:12:48 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 5DBE61BF98D for ; Sat, 5 Jul 2014 14:12:47 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 58A838C250 for ; Sat, 5 Jul 2014 14:12:47 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id u4b6dkto4AaV for ; Sat, 5 Jul 2014 14:12:44 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mailout04.t-online.de (mailout04.t-online.de [194.25.134.18]) by whitealder.osuosl.org (Postfix) with ESMTPS id 93AAC8C17B for ; Sat, 5 Jul 2014 14:12:44 +0000 (UTC) Received: from fwd00.aul.t-online.de (fwd00.aul.t-online.de [172.20.26.147]) by mailout04.t-online.de (Postfix) with SMTP id 0E1D334688A for ; Sat, 5 Jul 2014 16:12:42 +0200 (CEST) Received: from fli4l.lan.fli4l (ZGqXoOZrohktUymaoNAiUyUkX8T836E1X94bMh-naqSB+jeh-nYJ2rqUXTSQ0IXZc1@[79.247.156.214]) by fwd00.t-online.de with esmtp id 1X3Qhc-0TJuKG0; Sat, 5 Jul 2014 16:12:32 +0200 Received: from fli4lbuild64.lan.fli4l ([192.168.1.51]:52551) by fli4l.lan.fli4l with esmtpsa (TLSv1.2:DHE-RSA-AES256-GCM-SHA384:256) (Exim 4.80.1) (envelope-from ) id 1X3Qhb-0000N1-Nt; Sat, 05 Jul 2014 16:12:32 +0200 From: Bernd Kuhls To: buildroot@buildroot.org Date: Sat, 5 Jul 2014 16:12:26 +0200 Message-Id: <1404569546-12346-1-git-send-email-bernd.kuhls@t-online.de> X-Mailer: git-send-email 1.7.10.4 X-ID: ZGqXoOZrohktUymaoNAiUyUkX8T836E1X94bMh-naqSB+jeh-nYJ2rqUXTSQ0IXZc1 X-TOI-MSGID: e41ff36a-8289-4c54-8924-5c042331416f Cc: Bernd Kuhls Subject: [Buildroot] [PATCH 1/1] xserver_xorg-server: Fix race condition when installing man pages, 2nd try X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.14 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: buildroot-bounces@busybox.net Should fix the still present bug: http://autobuild.buildroot.net/results/045/04514bc9a8d1aad8ddd7af4f0fd8c16edd2e89a9/ http://autobuild.buildroot.net/results/1f2/1f25f744771fbb5124dca4563d79ea92cbfd72a3/ This patch reverts my previous attempt to fix this hard-to-catch race condition http://git.buildroot.net/buildroot/commit/package/x11r7/xserver_xorg-server?id=e244eb12dfc50bb56167d5fdaef3aac52b0ff6a3 and removes make target install-data from _INSTALL_STAGING_OPT, which was introduced in 2008: http://git.buildroot.net/buildroot/commit/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk?id=d4e56ff4dc8a0528550eb8503956bdcddb2fe516 Comparing the content of STAGING_DIR with and without "make install-data" showed no difference so I assume that is it no longer necessary to explicitly call this make target as the normal install target takes care of everything. The race condition occurs because "make install" and "make install-data" both install usr/share/man/man1/Xserver.1 Signed-off-by: Bernd Kuhls --- .../xserver_xorg-server-400-fix-man.patch | 19 ------------------- .../xserver_xorg-server/xserver_xorg-server.mk | 3 --- 2 files changed, 22 deletions(-) delete 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 deleted file mode 100644 index bde5ed6..0000000 --- a/package/x11r7/xserver_xorg-server/xserver_xorg-server-400-fix-man.patch +++ /dev/null @@ -1,19 +0,0 @@ -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 - -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 2471c71..779c46d 100644 --- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk +++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk @@ -9,9 +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 = \ xutil_util-macros \ xlib_libXfont \ @@ -54,7 +52,6 @@ XSERVER_XORG_SERVER_DEPENDENCIES = \ xkeyboard-config \ pixman \ mcookie \ - host-xfont_font-util \ host-pkgconf XSERVER_XORG_SERVER_CONF_OPT = --disable-config-hal \