diff options
author | Robert Yang <liezhi.yang@windriver.com> | 2012-03-27 15:01:42 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-03-27 13:26:37 +0100 |
commit | c3c5e8933a0833f31f976aa69ee8d013fc0136ad (patch) | |
tree | a67deea0984fd1cbc9e789e84e2e06f21f131d9e /meta/recipes-sato/pimlico/contacts.inc | |
parent | 21a314e030477c4f82264b18553d4ded832cff62 (diff) | |
download | poky-c3c5e8933a0833f31f976aa69ee8d013fc0136ad.tar.gz |
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 <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-sato/pimlico/contacts.inc')
-rw-r--r-- | meta/recipes-sato/pimlico/contacts.inc | 4 |
1 files changed, 3 insertions, 1 deletions
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 \ | |||
27 | ${datadir}/icons/hicolor" | 27 | ${datadir}/icons/hicolor" |
28 | 28 | ||
29 | SRC_URI = "file://stock_contact.png \ | 29 | SRC_URI = "file://stock_contact.png \ |
30 | file://stock_person.png" | 30 | file://stock_person.png \ |
31 | file://contacts-conditionally-install-schema.patch \ | ||
32 | " | ||
31 | 33 | ||
32 | SRC_URI_append_poky = " file://contacts-owl-window-menu.patch;apply=yes " | 34 | SRC_URI_append_poky = " file://contacts-owl-window-menu.patch;apply=yes " |