diff options
author | Dave Cobbley <david.j.cobbley@linux.intel.com> | 2018-08-14 10:05:37 -0700 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-08-22 21:26:31 -0400 |
commit | eb8dc40360f0cfef56fb6947cc817a547d6d9bc6 (patch) | |
tree | de291a73dc37168da6370e2cf16c347d1eba9df8 /meta-openembedded/meta-oe/recipes-graphics/openbox/files | |
parent | 9c3cf826d853102535ead04cebc2d6023eff3032 (diff) | |
download | talos-openbmc-eb8dc40360f0cfef56fb6947cc817a547d6d9bc6.tar.gz talos-openbmc-eb8dc40360f0cfef56fb6947cc817a547d6d9bc6.zip |
[Subtree] Removing import-layers directory
As part of the move to subtrees, need to bring all the import layers
content to the top level.
Change-Id: I4a163d10898cbc6e11c27f776f60e1a470049d8f
Signed-off-by: Dave Cobbley <david.j.cobbley@linux.intel.com>
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-graphics/openbox/files')
-rw-r--r-- | meta-openembedded/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-openembedded/meta-oe/recipes-graphics/openbox/files/0001-Makefile.am-avoid-race-when-creating-autostart-direc.patch b/meta-openembedded/meta-oe/recipes-graphics/openbox/files/0001-Makefile.am-avoid-race-when-creating-autostart-direc.patch new file mode 100644 index 000000000..2762e1c21 --- /dev/null +++ b/meta-openembedded/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 + |