CaROS/meta-openembedded
3
1
Fork 0
mirror of git://git.openembedded.org/meta-openembedded synced 2026-01-01 13:58:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

openbox: fix sporadic race on compile

Browse Source 
| make: creating data/xsession/openbox-gnome-session
| make: creating data/xsession/openbox-session
| make: creating data/xsession/openbox-kde-session
| make: creating data/autostart/openbox-autostart
| make: creating doc/openbox.1
| make: creating data/autostart/autostart
| make: creating doc/openbox-session.1
| make: creating doc/openbox-gnome-session.1
| make: creating doc/openbox-kde-session.1
| make: creating doc/obxprop.1
| mkdir: cannot create directory './data/autostart': File exists
| Makefile:4329: recipe for target 'data/autostart/autostart' failed

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
Andreas Müller 2015-10-08 08:23:03 +02:00 committed by Martin Jansa
parent dafdc09cf5
commit 91cfb371ad
2 changed files with 58 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
meta-oe/recipes-graphics/openbox/files/0001-Makefile.am-avoid-race-when-creating-autostart-direc.patch Normal file
View File

@ -0,0 +1,54 @@
From 6bbde84a2197c97e49d9e64118a979728209e436 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
Date: Wed, 23 Sep 2015 23:21:42 +0200
Subject: [PATCH] Makefile.am: avoid race when creating autostart directories
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
fixes:
| make: creating data/xsession/openbox-gnome-session
| make: creating data/xsession/openbox-session
| make: creating data/xsession/openbox-kde-session
| make: creating data/autostart/openbox-autostart
| make: creating doc/openbox.1
| make: creating data/autostart/autostart
| make: creating doc/openbox-session.1
| make: creating doc/openbox-gnome-session.1
| make: creating doc/openbox-kde-session.1
| make: creating doc/obxprop.1
| mkdir: cannot create directory './data/autostart': File exists
| Makefile:4329: recipe for target 'data/autostart/autostart' failed
Upstream-Status: Pending
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
Makefile.am | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index f25bf8e..306e77d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -505,14 +505,12 @@ edit = $(SED) \
data/autostart/autostart: $(top_srcdir)/data/autostart/autostart.in Makefile
@echo make: creating $@
- @test -d $(shell dirname $(top_builddir)/$@) || \
- mkdir $(shell dirname $(top_builddir)/$@)
+ mkdir -p $(shell dirname $(top_builddir)/$@)
@$(edit) $< >$(top_builddir)/$@
data/autostart/openbox-autostart: $(top_srcdir)/data/autostart/openbox-autostart.in Makefile
@echo make: creating $@
- @test -d $(shell dirname $(top_builddir)/$@) || \
- mkdir $(shell dirname $(top_builddir)/$@)
+ mkdir -p $(shell dirname $(top_builddir)/$@)
@$(edit) $< >$(top_builddir)/$@
%.desktop: %.desktop.in Makefile
--
2.1.0

5
meta-oe/recipes-graphics/openbox/openbox_3.6.1.bb
View File

@ -4,7 +4,10 @@ DEPENDS = "glib-2.0 pango libxml2 virtual/libx11 libcroco librsvg gdk-pixbuf"
LICENSE = "GPLv2+"
LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
SRC_URI = "http://icculus.org/openbox/releases/openbox-${PV}.tar.gz"
SRC_URI = " \
http://icculus.org/openbox/releases/openbox-${PV}.tar.gz \
file://0001-Makefile.am-avoid-race-when-creating-autostart-direc.patch \
"
SRC_URI[md5sum] = "b72794996c6a3ad94634727b95f9d204"
SRC_URI[sha256sum] = "8b4ac0760018c77c0044fab06a4f0c510ba87eae934d9983b10878483bde7ef7"