From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from dan.rpsys.net ([93.97.175.187]) by linuxtogo.org with esmtp (Exim 4.72) (envelope-from ) id 1RDgRx-0001AX-D2 for openembedded-core@lists.openembedded.org; Tue, 11 Oct 2011 19:49:09 +0200 Received: from localhost (dan.rpsys.net [127.0.0.1]) by dan.rpsys.net (8.14.2/8.14.2/Debian-2build1) with ESMTP id p9BHo39W001262 for ; Tue, 11 Oct 2011 18:50:04 +0100 X-Virus-Scanned: Debian amavisd-new at dan.rpsys.net Received: from dan.rpsys.net ([127.0.0.1]) by localhost (dan.rpsys.net [127.0.0.1]) (amavisd-new, port 10024) with LMTP id 1Sv7G-8KG51m for ; Tue, 11 Oct 2011 18:50:03 +0100 (BST) Received: from [192.168.1.66] (tim [93.97.173.237]) (authenticated bits=0) by dan.rpsys.net (8.14.2/8.14.2/Debian-2build1) with ESMTP id p9BHnwK9001257 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NOT) for ; Tue, 11 Oct 2011 18:50:00 +0100 From: Richard Purdie To: Patches and discussions about the oe-core layer Date: Tue, 11 Oct 2011 18:43:17 +0100 In-Reply-To: References: <1318251309.23801.28.camel@ted> X-Mailer: Evolution 3.1.91- Message-ID: <1318355005.23801.112.camel@ted> Mime-Version: 1.0 Subject: Re: shared-mime-info: Fix a parallel make race X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.11 Precedence: list Reply-To: Patches and discussions about the oe-core layer List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 11 Oct 2011 17:49:09 -0000 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 7bit On Mon, 2011-10-10 at 15:28 +0200, Koen Kooi wrote: > Op 10 okt. 2011, om 14:54 heeft Richard Purdie het volgende geschreven: > > > > > > > Signed-off-by: Richard Purdie > > --- > > diff --git a/meta/recipes-support/shared-mime-info/shared-mime-info/parallelmake.patch b/meta/recipes-support/shared-mime-info/shared-mime-info/parallelmake.patch > > new file mode 100644 > > index 0000000..9e86a71 > > --- a/dev/null > > +++ b/meta/recipes-support/shared-mime-info/shared-mime-info/parallelmake.patch > > @@ -0,0 +1,32 @@ > > +The Makefile used by shared-mime-info is one big race with the SUBDIRS > > +option and the dependency specifically calling make all combining to > > +create multiple make instances all of which may try and build targets > > +like update-mime-database. > > + > > +This patch removes those options meaning make can correctly identify > > +dependencies and stop itself racing itself. > > + > > +RP 10/10/2011 > > + > > +Upstream-status: Pending > > + > > +Index: shared-mime-info-0.91/Makefile.am > > +=================================================================== > > +--- shared-mime-info-0.91.orig/Makefile.am 2011-10-10 21:47:19.834173921 +0100 > > ++++ shared-mime-info-0.91/Makefile.am 2011-10-10 21:45:57.000000000 +0100 > > +@@ -1,5 +1,3 @@ > > +-SUBDIRS=. po > > +- > > + INCLUDES = $(ALL_CFLAGS) > > + > > + packagesdir = $(datadir)/mime/packages > > +@@ -70,8 +68,7 @@ > > + > > + all: check create-pot > > + > > +-create-pot: > > +- $(MAKE) -C po shared-mime-info.pot > > ++create-pot: po > > + > > + check: create-pot freedesktop.org.xml update-mime-database check-translations > > + if test -e $(top_builddir)/freedesktop.org.xml; then \ > > diff --git a/meta/recipes-support/shared-mime-info/shared-mime-info_0.91.bb b/meta/recipes-support/shared-mime-info/shared-mime-info_0.91.bb > > index 76d2756..ac2dde1 100644 > > --- a/meta/recipes-support/shared-mime-info/shared-mime-info_0.91.bb > > +++ b/meta/recipes-support/shared-mime-info/shared-mime-info_0.91.bb > > @@ -4,3 +4,4 @@ PR = "r0" > > SRC_URI[md5sum] = "982a211560ba4c47dc791ccff34e8fbc" > > SRC_URI[sha256sum] = "98cfebe1d809afb24934e634373821e2a1dfa86fc6462cab230589a1c80988bd" > > > > +SRC_URI =+ "file://parallelmake.patch" > > Missing PR bump Merged to master, with a PR bump. Cheers, Richard