diff options
author | Dave Cobbley <david.j.cobbley@linux.intel.com> | 2018-08-14 20:05:37 +0300 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-08-23 04:26:31 +0300 |
commit | eb8dc40360f0cfef56fb6947cc817a547d6d9bc6 (patch) | |
tree | de291a73dc37168da6370e2cf16c347d1eba9df8 /meta-openembedded/meta-oe/recipes-graphics/openbox | |
parent | 9c3cf826d853102535ead04cebc2d6023eff3032 (diff) | |
download | openbmc-eb8dc40360f0cfef56fb6947cc817a547d6d9bc6.tar.xz |
[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')
2 files changed, 110 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 + diff --git a/meta-openembedded/meta-oe/recipes-graphics/openbox/openbox_3.6.1.bb b/meta-openembedded/meta-oe/recipes-graphics/openbox/openbox_3.6.1.bb new file mode 100644 index 000000000..c35a0c723 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-graphics/openbox/openbox_3.6.1.bb @@ -0,0 +1,56 @@ +SUMMARY = "openbox Window Manager" +SECTION = "x11/wm" +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 \ + file://0001-Makefile.am-avoid-race-when-creating-autostart-direc.patch \ +" + +SRC_URI[md5sum] = "b72794996c6a3ad94634727b95f9d204" +SRC_URI[sha256sum] = "8b4ac0760018c77c0044fab06a4f0c510ba87eae934d9983b10878483bde7ef7" + +inherit autotools gettext update-alternatives pkgconfig distro_features_check +# depends on virtual/libx11 +REQUIRED_DISTRO_FEATURES = "x11" + +ALTERNATIVE_${PN}-core = "x-window-manager x-session-manager" +ALTERNATIVE_TARGET[x-window-manager] = "${bindir}/openbox" +ALTERNATIVE_PRIORITY[x-window-manager] = "10" +ALTERNATIVE_TARGET[x-session-manager] = "${bindir}/openbox-session" +ALTERNATIVE_PRIORITY[x-session-manager] = "100" + +PACKAGECONFIG ??= "" +PACKAGECONFIG[imlib2] = "--enable-imlib2,--disable-imlib2,imlib2" +PACKAGECONFIG[startup-notification] = "--enable-startup-notification,--disable-startup-notification,startup-notification" +PACKAGECONFIG[xrandr] = "--enable-xrandr,--disable-xrandr,libxrandr" +PACKAGECONFIG[xinerama] = "--enable-xinerama,--disable-xinerama,libxinerama" +PACKAGECONFIG[xcursor] = "--enable-xcursor,--disable-xcursor,libxcursor" + +PACKAGES =+ "${PN}-core ${PN}-lxde ${PN}-gnome ${PN}-config" + +PACKAGES_DYNAMIC += "^${PN}-theme-.*" + +python populate_packages_prepend() { + theme_dir = d.expand('${datadir}/themes/') + theme_name = d.expand('${PN}-theme-%s') + do_split_packages(d, theme_dir, '(.*)', theme_name, '${PN} theme for %s', extra_depends='', allow_dirs=True) +} + +RDEPENDS_${PN} += "${PN}-core ${PN}-config ${PN}-theme-clearlooks" +FILES_${PN}-core = "${bindir}/openbox ${bindir}/openbox-session ${libdir}/*${SOLIBS}" + +FILES_${PN}-lxde += "${datadir}/lxde/ \ + ${datadir}/lxpanel \ + ${datadir}/xsessions \ + ${datadir}/icons" + +FILES_${PN}-gnome += " \ + ${bindir}/openbox-gnome-session \ + ${datadir}/gnome \ + ${datadir}/gnome-session \ +" + +FILES_${PN}-config += "${sysconfdir}" |