contacts: fix build error and schema installation
cover contacts: fix build error and schema installation
The following changes since commit d3e0beed9eef53018158c9f999cd20b44629aa61:
guile: Deal with hardcoded path issues (2012-03-27 00:29:00 +0100)
are available in the git repository at:
git://git.pokylinux.org/poky-contrib robert/contacts
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=robert/contacts
Robert Yang (2):
contacts 0.9: failed to build
contacts.inc: conditionally install shema
meta/recipes-sato/pimlico/contacts.inc | 4 ++- .../contacts-conditionally-install-schema.patch | 37 ++++++++++++++++++++ meta/recipes-sato/pimlico/contacts_0.9.bb | 15 +++++++- 3 files changed, 54 insertions(+), 2 deletions(-) create mode 100644 meta/recipes-sato/pimlico/contacts/contacts-conditionally-install-schema.patch
PATCH 1/2 contacts 0.9: failed to build
contacts_0.9.bb failed to build since lacks of:
* SRC_URI[md5sum] or SRC_URI[sha256sum]
* LIC_FILES_CHKSUM
And an indent error in Makefile.am.
Fix these problems at the moment, maybe we should remove this old version recipe since there is a contacts_git.bb
[YOCTO #2178]
--- meta/recipes-sato/pimlico/contacts_0.9.bb | 15 ++++++++++++++- 1 files changed, 14 insertions(+), 1 deletions(-)
meta/recipes-sato/pimlico/contacts_0.9.bb +14 -1
@@ -1,5 +1,18 @@ require contacts.inc -PR = "r4" +PR = "r5" SRC_URI =+ "http://pimlico-project.org/sources/${BPN}/${BPN}-${PV}.tar.gz" + +SRC_URI[md5sum] = "aab5affbf93d6fa7b978b323a8d44de0" +SRC_URI[sha256sum] = "9cacec98f8123993033aaa255f3f4c04c86a1be65e487dd21f0aaa54384a6f6d" + +LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ + file://src/contacts-main.h;endline=18;md5=0371af46fbc72e33575e0072dca5fb19 \ + file://src/contacts-dbus.c;endline=18;md5=e4da9ac1a0539fafc7df431010904fd5 \ + file://src/contacts-gtk.c;endline=21;md5=1c2e3f55b215635eff4ba76f7696f8ee" + +do_configure_prepend () { + # It used 8 spaces to instead of a tab, but it doesn't work for us + sed -i 's/^ $(MAKE) dist distdir=/\t$(MAKE) dist distdir/' Makefile.am +}
Signature · 1 line
1.7.1
PATCH 2/2 contacts.inc: conditionally install shema
In reply to Robert YangInstall 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]
--- meta/recipes-sato/pimlico/contacts.inc | 4 ++- .../contacts-conditionally-install-schema.patch | 37 ++++++++++++++++++++ 2 files changed, 40 insertions(+), 1 deletions(-) create mode 100644 meta/recipes-sato/pimlico/contacts/contacts-conditionally-install-schema.patch
meta/recipes-sato/pimlico/contacts.inc +3 -1
@@ -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 "
meta/recipes-sato/pimlico/contacts/contacts-conditionally-install-schema.patch new file +37 -0
@@ -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 <[email protected]> + +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 +
Signature · 1 line
1.7.1
Saul Wold
AppliedQuoted 16 lines · Robert Yang
The following changes since commit
d3e0beed9eef53018158c9f999cd20b44629aa61:guile: Deal with hardcoded path issues (2012-03-27 00:29:00 +0100)
are available in the git repository at:
git://git.pokylinux.org/poky-contribrobert/contacts
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=robert/contactsRobert Yang (2):
contacts 0.9: failed to build
contacts.inc: conditionally install shemameta/recipes-sato/pimlico/contacts.inc | 4 ++- .../contacts-conditionally-install-schema.patch | 37 ++++++++++++++++++++ meta/recipes-sato/pimlico/contacts_0.9.bb | 15 +++++++- 3 files changed, 54 insertions(+), 2 deletions(-)
Quoted 8 lines
create mode 100644
meta/recipes-sato/pimlico/contacts/contacts-conditionally-install-schema.patch_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Merged into OE-Core
Thanks
Sau!