[oe-commits] Andreas Müller : gnome-desktop: copy omf. make from ${STAGING_DATADIR_NATIVE} instead ${STAGING_DATADIR}

[git at git.openembedded.org]

Module: meta-openembedded.git
Branch: master
Commit: ced83f75a1c1920d044839e346117139a9c73b15
URL:    http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=ced83f75a1c1920d044839e346117139a9c73b15

Author: Andreas Müller <schnitzeltony at googlemail.com>
Date:   Tue Nov  6 11:37:46 2012 +0100

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

---

 .../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 44e0171..612e88f 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"
 LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
                     file://COPYING.LIB;md5=5f30f0716dfdd0d91eb439ebec522ec2"
 
-PR = "r5"
+PR = "r6"
 
 inherit gnome pkgconfig
 
@@ -16,7 +16,7 @@ DEPENDS += "gconf libxrandr virtual/libx11 gtk+ glib-2.0 gnome-doc-utils"
 EXTRA_OECONF = "--disable-scrollkeeper --disable-desktop-docs"
 
 do_configure_prepend () {
-	cp ${STAGING_DATADIR}/gnome-common/data/omf.make ${S}
+	cp ${STAGING_DATADIR_NATIVE}/gnome-common/data/omf.make ${S}
 	sed -i -e s:^#!@PYTHON@:#!${bindir}/python: ${S}/gnome-about/gnome-about.in
 }