diff options
| author | Andreas Müller <schnitzeltony@googlemail.com> | 2012-11-06 11:37:46 +0100 |
|---|---|---|
| committer | Koen Kooi <koen@dominion.thruhere.net> | 2012-11-13 12:58:08 +0100 |
| commit | ced83f75a1c1920d044839e346117139a9c73b15 (patch) | |
| tree | 3d6ab29f53e5f317c746a3054bec24a36708f27c | |
| parent | e01b143e69ef4ea2f2a49bc40a4034a066e2035d (diff) | |
| download | meta-openembedded-ced83f75a1c1920d044839e346117139a9c73b15.tar.gz | |
gnome-desktop: copy omf.make from ${STAGING_DATADIR_NATIVE} instead ${STAGING_DATADIR}
* omf.make is installed by gnome-common
* oe-core gnomebase.bbclass adds gnome-common-native to DEPENDS
* error message was:
| DEBUG: Executing shell function do_configure
| cp: cannot stat `/home/andreas/tmp/oe-core-eglibc/sysroots/overo/usr/share/gnome-common/data/omf.make': No such file or directory
| -rw-r--r-- | meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop_2.32.1.bb | 4 |
1 files changed, 2 insertions, 2 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 44e017142..612e88fd3 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 | |||
| @@ -4,7 +4,7 @@ LICENSE = "GPLv2 & LGPLv2" | |||
| 4 | LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ | 4 | LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ |
| 5 | file://COPYING.LIB;md5=5f30f0716dfdd0d91eb439ebec522ec2" | 5 | file://COPYING.LIB;md5=5f30f0716dfdd0d91eb439ebec522ec2" |
| 6 | 6 | ||
| 7 | PR = "r5" | 7 | PR = "r6" |
| 8 | 8 | ||
| 9 | inherit gnome pkgconfig | 9 | inherit gnome pkgconfig |
| 10 | 10 | ||
| @@ -16,7 +16,7 @@ DEPENDS += "gconf libxrandr virtual/libx11 gtk+ glib-2.0 gnome-doc-utils" | |||
| 16 | EXTRA_OECONF = "--disable-scrollkeeper --disable-desktop-docs" | 16 | EXTRA_OECONF = "--disable-scrollkeeper --disable-desktop-docs" |
| 17 | 17 | ||
| 18 | do_configure_prepend () { | 18 | do_configure_prepend () { |
| 19 | cp ${STAGING_DATADIR}/gnome-common/data/omf.make ${S} | 19 | cp ${STAGING_DATADIR_NATIVE}/gnome-common/data/omf.make ${S} |
| 20 | 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 |
| 21 | } | 21 | } |
| 22 | 22 | ||