diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2016-01-07 22:03:22 +0100 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2016-01-14 11:30:16 +0100 |
commit | 5ec0bd998e6fe4d7bf5f7ca30c431447adf5e8b5 (patch) | |
tree | 0ca6b35a5deb2d9d03d58c4735ba171fd3a60555 /meta-gnome/recipes-gnome/gnome-desktop | |
parent | f74faae1642bfae131c60db84eb91e75aa9bd2ce (diff) | |
download | meta-openembedded-5ec0bd998e6fe4d7bf5f7ca30c431447adf5e8b5.tar.gz |
gnome-desktop: don't try to copy omf.make
* omf.make was removed from gnome-common in:
https://git.gnome.org/browse/gnome-common/commit/?id=a912a74ba7999fe3ed49b07bab86685a5d117f82
which is included in gnome-common-3.18, so this was broken since:
commit f459f890cb7c0e11d92b80f0d5a65117428cc87f
Author: Jussi Kukkonen <jussi.kukkonen@intel.com>
Date: Thu Nov 26 13:46:48 2015 +0200
gnome-common: Upgrade 3.14.0 -> 3.18.0
but hopefully we don't need omf.make with --disable-desktop-docs in EXTRA_OECONF
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-gnome/recipes-gnome/gnome-desktop')
-rw-r--r-- | meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop_2.32.1.bb | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop_2.32.1.bb b/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop_2.32.1.bb index 62563963c..4fedbe605 100644 --- a/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop_2.32.1.bb +++ b/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop_2.32.1.bb | |||
@@ -17,7 +17,6 @@ DEPENDS += "gconf libxrandr virtual/libx11 gtk+ glib-2.0 gnome-doc-utils startup | |||
17 | EXTRA_OECONF = "--disable-scrollkeeper --disable-desktop-docs" | 17 | EXTRA_OECONF = "--disable-scrollkeeper --disable-desktop-docs" |
18 | 18 | ||
19 | do_configure_prepend () { | 19 | do_configure_prepend () { |
20 | cp ${STAGING_DATADIR_NATIVE}/gnome-common/data/omf.make ${S} | ||
21 | sed -i -e s:^#!@PYTHON@:#!${bindir}/python: ${S}/gnome-about/gnome-about.in | 20 | sed -i -e s:^#!@PYTHON@:#!${bindir}/python: ${S}/gnome-about/gnome-about.in |
22 | } | 21 | } |
23 | 22 | ||