diff options
| author |   Andreas Müller <schnitzeltony@googlemail.com> | 2015-10-08 08:23:03 +0200 |
|---|---|---|
| committer |   Martin Jansa <Martin.Jansa@gmail.com> | 2015-10-13 12:28:17 +0200 |
| commit | 91cfb371adaeb0f581fa87cd6e8165d264f1e0bc (patch) | |
| tree | 8ccae70c36139837aa2e4023528ba9b464a19684 /meta-oe/recipes-graphics/openbox/files | |
| parent | dafdc09cf56d602a011d27433a8012b1e2028d20 (diff) | |
| download | meta-openembedded-contrib-91cfb371adaeb0f581fa87cd6e8165d264f1e0bc.tar.gz | |
openbox: fix sporadic race on compile
| 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>
Diffstat (limited to 'meta-oe/recipes-graphics/openbox/files')
| -rw-r--r-- | meta-oe/recipes-graphics/openbox/files/0001-Makefile.am-avoid-race-when-creating-autostart-direc.patch | 54 |
1 files changed, 54 insertions, 0 deletions
diff --git a/meta-oe/recipes-graphics/openbox/files/0001-Makefile.am-avoid-race-when-creating-autostart-direc.patch b/meta-oe/recipes-graphics/openbox/files/0001-Makefile.am-avoid-race-when-creating-autostart-direc.patch new file mode 100644 index 0000000000..2762e1c214 --- /dev/null +++ b/meta-oe/recipes-graphics/openbox/files/0001-Makefile.am-avoid-race-when-creating-autostart-direc.patch @@ -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 + |