From c0c69224bb40176bc41e862781c97d4edadbb80b Mon Sep 17 00:00:00 2001 From: Ronan Le Martret Date: Wed, 1 Oct 2014 15:36:57 +0200 Subject: [PATCH] meta-tizen: fix Modello-Installer Change-Id: I64b07206904ac39b4eedfc9369806d97747548fd (From meta-tizen rev: c6dc6e069c7df7b3397bac768a20a135008c3dd8) Signed-off-by: Ronan Le Martret Signed-off-by: Patrick Ohly --- .../Modello-Installer/Modello-Installer-extraconf.inc | 2 +- .../evolution-data-server-extraconf.inc | 12 +++++++++++- .../gobject-introspection-extraconf.inc | 4 +++- meta-tizen/recipes-tizen/xmlsec1/xmlsec1-extraconf.inc | 3 ++- 4 files changed, 17 insertions(+), 4 deletions(-) diff --git a/meta-tizen/recipes-tizen/Modello-Installer/Modello-Installer-extraconf.inc b/meta-tizen/recipes-tizen/Modello-Installer/Modello-Installer-extraconf.inc index 2512679..982f816 100644 --- a/meta-tizen/recipes-tizen/Modello-Installer/Modello-Installer-extraconf.inc +++ b/meta-tizen/recipes-tizen/Modello-Installer/Modello-Installer-extraconf.inc @@ -1,7 +1,7 @@ SRC_URI += "file://modello-installer-postinst.sh" SRC_URI += "file://modello-installer-postinst.service" -RDEPENDS_Modello_Installer-xwalk_remove = "Modello_Phone" +RDEPENDS_Modello_Installer-xwalk_remove = "Modello-Phone" systemd_unitdir = "/usr/lib/systemd" RDEPENDS_${PN}-wrt_remove = "wrt-installer" diff --git a/meta-tizen/recipes-tizen/evolution-data-server/evolution-data-server-extraconf.inc b/meta-tizen/recipes-tizen/evolution-data-server/evolution-data-server-extraconf.inc index f6fc131..f968335 100644 --- a/meta-tizen/recipes-tizen/evolution-data-server/evolution-data-server-extraconf.inc +++ b/meta-tizen/recipes-tizen/evolution-data-server/evolution-data-server-extraconf.inc @@ -1,4 +1,14 @@ -inherit autotools gtk-doc pkgconfig gettext +inherit autotools +inherit gtk-doc +inherit pkgconfig +inherit gettext + +export HOST_SYS +export BUILD_SYS +export STAGING_LIBDIR +export STAGING_INCDIR + +DEPENDS += "gobject-introspection" # -ldb needs this on some platforms LDFLAGS += "-lpthread" diff --git a/meta-tizen/recipes-tizen/gobject-introspection/gobject-introspection-extraconf.inc b/meta-tizen/recipes-tizen/gobject-introspection/gobject-introspection-extraconf.inc index 20d815c..4410ef7 100644 --- a/meta-tizen/recipes-tizen/gobject-introspection/gobject-introspection-extraconf.inc +++ b/meta-tizen/recipes-tizen/gobject-introspection/gobject-introspection-extraconf.inc @@ -30,4 +30,6 @@ do_install() { -} \ No newline at end of file +} + +FILES_${PN}-dbg += "/usr/lib/gobject-introspection/giscanner/.debug" \ No newline at end of file diff --git a/meta-tizen/recipes-tizen/xmlsec1/xmlsec1-extraconf.inc b/meta-tizen/recipes-tizen/xmlsec1/xmlsec1-extraconf.inc index 5c58cfa..55c755a 100644 --- a/meta-tizen/recipes-tizen/xmlsec1/xmlsec1-extraconf.inc +++ b/meta-tizen/recipes-tizen/xmlsec1/xmlsec1-extraconf.inc @@ -1 +1,2 @@ -INSANE_SKIP_xmlsec1-dev-static = "staticdev" \ No newline at end of file +INSANE_SKIP_xmlsec1-dev-static = "staticdev" +xmlsec1-dev_files += "${prefix}/lib/lib*.so*" \ No newline at end of file -- 2.7.4