* [PATCH 0/2] contacts: fix build error and schema installation
@ 2012-03-27 7:01 Robert Yang
2012-03-27 7:01 ` [PATCH 1/2] contacts 0.9: failed to build Robert Yang
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Robert Yang @ 2012-03-27 7:01 UTC (permalink / raw)
To: openembedded-core
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
^ permalink raw reply [flat|nested] 4+ messages in thread* [PATCH 1/2] contacts 0.9: failed to build 2012-03-27 7:01 [PATCH 0/2] contacts: fix build error and schema installation Robert Yang @ 2012-03-27 7:01 ` Robert Yang 2012-03-27 7:01 ` [PATCH 2/2] contacts.inc: conditionally install shema Robert Yang 2012-04-03 22:30 ` [PATCH 0/2] contacts: fix build error and schema installation Saul Wold 2 siblings, 0 replies; 4+ messages in thread From: Robert Yang @ 2012-03-27 7:01 UTC (permalink / raw) To: openembedded-core 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] Signed-off-by: Robert Yang <liezhi.yang@windriver.com> --- meta/recipes-sato/pimlico/contacts_0.9.bb | 15 ++++++++++++++- 1 files changed, 14 insertions(+), 1 deletions(-) diff --git a/meta/recipes-sato/pimlico/contacts_0.9.bb b/meta/recipes-sato/pimlico/contacts_0.9.bb index 84fd941..2b638bf 100644 --- a/meta/recipes-sato/pimlico/contacts_0.9.bb +++ b/meta/recipes-sato/pimlico/contacts_0.9.bb @@ -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 +} -- 1.7.1 ^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH 2/2] contacts.inc: conditionally install shema 2012-03-27 7:01 [PATCH 0/2] contacts: fix build error and schema installation Robert Yang 2012-03-27 7:01 ` [PATCH 1/2] contacts 0.9: failed to build Robert Yang @ 2012-03-27 7:01 ` Robert Yang 2012-04-03 22:30 ` [PATCH 0/2] contacts: fix build error and schema installation Saul Wold 2 siblings, 0 replies; 4+ messages in thread From: Robert Yang @ 2012-03-27 7:01 UTC (permalink / raw) To: openembedded-core 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] Signed-off-by: Robert Yang <liezhi.yang@windriver.com> --- 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 diff --git a/meta/recipes-sato/pimlico/contacts.inc b/meta/recipes-sato/pimlico/contacts.inc index 52c65ec..e3921d8 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 " diff --git a/meta/recipes-sato/pimlico/contacts/contacts-conditionally-install-schema.patch b/meta/recipes-sato/pimlico/contacts/contacts-conditionally-install-schema.patch new file mode 100644 index 0000000..2ab7882 --- /dev/null +++ b/meta/recipes-sato/pimlico/contacts/contacts-conditionally-install-schema.patch @@ -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 + -- 1.7.1 ^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH 0/2] contacts: fix build error and schema installation 2012-03-27 7:01 [PATCH 0/2] contacts: fix build error and schema installation Robert Yang 2012-03-27 7:01 ` [PATCH 1/2] contacts 0.9: failed to build Robert Yang 2012-03-27 7:01 ` [PATCH 2/2] contacts.inc: conditionally install shema Robert Yang @ 2012-04-03 22:30 ` Saul Wold 2 siblings, 0 replies; 4+ messages in thread From: Saul Wold @ 2012-04-03 22:30 UTC (permalink / raw) To: Patches and discussions about the oe-core layer On 03/27/2012 12:01 AM, Robert Yang wrote: > 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 > > > _______________________________________________ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core > Merged into OE-Core Thanks Sau! ^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2012-04-03 22:40 UTC | newest] Thread overview: 4+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2012-03-27 7:01 [PATCH 0/2] contacts: fix build error and schema installation Robert Yang 2012-03-27 7:01 ` [PATCH 1/2] contacts 0.9: failed to build Robert Yang 2012-03-27 7:01 ` [PATCH 2/2] contacts.inc: conditionally install shema Robert Yang 2012-04-03 22:30 ` [PATCH 0/2] contacts: fix build error and schema installation Saul Wold
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox