mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-31 12:49:46 +00:00
Code Issues Projects Releases Wiki Activity

contacts.inc: conditionally install shema

Browse Source 
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>
This commit is contained in:
Robert Yang
2012-03-27 15:01:42 +08:00
committed by Richard Purdie
parent 21a314e030
commit c3c5e8933a
2 changed files with 40 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/recipes-sato/pimlico/contacts.inc
+3 -1
View File
@@ -27,6 +27,8 @@ FILES_${PN} += "${datadir}/pixmaps/stock_contact.png \
${datadir}/icons/hicolor" ${datadir}/icons/hicolor"
SRC_URI = "file://stock_contact.png \ 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 " SRC_URI_append_poky = " file://contacts-owl-window-menu.patch;apply=yes "
meta/recipes-sato/pimlico/contacts/contacts-conditionally-install-schema.patch
+37
View File
@@ -0,0 +1,37 @@
Install schema should respect to GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
If GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL is set, the schema should not
be installed.
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Upstream-Status: Pending
---
data/Makefile.am | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/data/Makefile.am b/data/Makefile.am
index f790823..b6fd643 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -14,13 +14,14 @@ dist_man1_MANS = contacts.1
if HAVE_GCONF
install-data-local:
- GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) \
+ if [ "$(GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL)" != "1" ]; then \
+ GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) \
$(GCONFTOOL) --makefile-install-rule $(schema_DATA) || \
(echo ;\
echo "*****************************************************"; \
echo "Installation of schemas failed, install them manually"; \
- echo "*****************************************************";)
- @true
+ echo "*****************************************************";); \
+ fi
endif
CLEANFILES = $(desktop_DATA)
--
1.7.7.6