From c3c5e8933a0833f31f976aa69ee8d013fc0136ad Mon Sep 17 00:00:00 2001 From: Robert Yang Date: Tue, 27 Mar 2012 15:01:42 +0800 Subject: contacts.inc: conditionally install shema Install schema should respect to GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL, If GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL is set, the schema should not be installed, but it always installed shema before, this was incorrect and it would cause host contamination since it would read $HOME/gconf/.gconf. [YOCTO #2178] (From OE-Core rev: 674fa286d882ff94830cbf748e3f5abc63a5575a) Signed-off-by: Robert Yang Signed-off-by: Richard Purdie --- meta/recipes-sato/pimlico/contacts.inc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'meta/recipes-sato/pimlico/contacts.inc') diff --git a/meta/recipes-sato/pimlico/contacts.inc b/meta/recipes-sato/pimlico/contacts.inc index 52c65ec128..e3921d86cd 100644 --- a/meta/recipes-sato/pimlico/contacts.inc +++ b/meta/recipes-sato/pimlico/contacts.inc @@ -27,6 +27,8 @@ FILES_${PN} += "${datadir}/pixmaps/stock_contact.png \ ${datadir}/icons/hicolor" SRC_URI = "file://stock_contact.png \ - file://stock_person.png" + file://stock_person.png \ + file://contacts-conditionally-install-schema.patch \ + " SRC_URI_append_poky = " file://contacts-owl-window-menu.patch;apply=yes " -- cgit v1.2.3-54-g00ecf