From 034a6ecc13d97be66a8932ce7efda6aab3529389 Mon Sep 17 00:00:00 2001 From: Ronan Le Martret Date: Tue, 16 Sep 2014 09:41:47 +0200 Subject: [PATCH] Add new modification Change-Id: Ic321761f863327f0bc8b4dfad0a7bfe14fa7f83d Signed-off-by: Ronan Le Martret Conflicts: recipes-image/config-tizen-profiles/config-tizen-ivi.bb recipes-image/images/tizen-ivi-core-image.bb --- .../config-tizen-profiles/config-tizen-ivi.bb | 4 +++- recipes-image/images/tizen-ivi-core-image-dev.bb | 1 + recipes-image/images/tizen-ivi-core-image.bb | 2 ++ .../Modello-Installer-extraconf.inc | 3 +++ .../evolution-data-server-extraconf.inc | 10 ++++++++ recipes-tizen/gcr/gcr-extraconf.inc | 5 +++- recipes-tizen/phoned/phoned-extraconf.inc | 28 ++++++++++++++++++++++ recipes-tizen/vala/vala-extraconf.inc | 19 +++++++++++++++ 8 files changed, 70 insertions(+), 2 deletions(-) create mode 100644 recipes-tizen/vala/vala-extraconf.inc diff --git a/recipes-image/config-tizen-profiles/config-tizen-ivi.bb b/recipes-image/config-tizen-profiles/config-tizen-ivi.bb index e9fc025..fc7bfe2 100644 --- a/recipes-image/config-tizen-profiles/config-tizen-ivi.bb +++ b/recipes-image/config-tizen-profiles/config-tizen-ivi.bb @@ -5,10 +5,12 @@ SRC_URI = "" inherit allarch useradd + ALLOW_EMPTY_${PN} = "1" + USERADD_PACKAGES = "${PN}" -GROUPADD_PARAM_${PN} = "-g 100 users; -g 5000 app" +GROUPADD_PARAM_${PN} = "-g 100 users; -g 5000 app; -g 192 weston-launch; -g 54 lock; -g 190 systemd-journal " USERADD_PARAM_${PN} += " -u 5000 -d /home/app -m -g users -G users,weston-launch -r -s /bin/sh app " diff --git a/recipes-image/images/tizen-ivi-core-image-dev.bb b/recipes-image/images/tizen-ivi-core-image-dev.bb index 46924fd..a787300 100644 --- a/recipes-image/images/tizen-ivi-core-image-dev.bb +++ b/recipes-image/images/tizen-ivi-core-image-dev.bb @@ -17,3 +17,4 @@ CORE_IMAGE_EXTRA_INSTALL += "sudo" CORE_IMAGE_EXTRA_INSTALL += "connman-client" CORE_IMAGE_EXTRA_INSTALL += "git" CORE_IMAGE_EXTRA_INSTALL += "python-json" +CORE_IMAGE_EXTRA_INSTALL += "dlogutil" diff --git a/recipes-image/images/tizen-ivi-core-image.bb b/recipes-image/images/tizen-ivi-core-image.bb index b6dc243..1889f31 100644 --- a/recipes-image/images/tizen-ivi-core-image.bb +++ b/recipes-image/images/tizen-ivi-core-image.bb @@ -12,6 +12,7 @@ IMAGECONFIG = "config-tizen-ivi" # Modello packages CORE_IMAGE_EXTRA_INSTALL += "packagegroup-tizen-ivi-modello" + CORE_IMAGE_EXTRA_INSTALL += "automotive-message-broker" CORE_IMAGE_EXTRA_INSTALL += "efl-theme-tizen-hd" CORE_IMAGE_EXTRA_INSTALL += "festival" @@ -28,6 +29,7 @@ CORE_IMAGE_EXTRA_INSTALL += "weston-ivi-config" # BTY-36 #CORE_IMAGE_EXTRA_INSTALL += "rygel" + CORE_IMAGE_EXTRA_INSTALL += "sphinxbase" CORE_IMAGE_EXTRA_INSTALL += "udev-rules-ivi" CORE_IMAGE_EXTRA_INSTALL += "genivi-shell" diff --git a/recipes-tizen/Modello-Installer/Modello-Installer-extraconf.inc b/recipes-tizen/Modello-Installer/Modello-Installer-extraconf.inc index e69de29..34d5441 100644 --- a/recipes-tizen/Modello-Installer/Modello-Installer-extraconf.inc +++ b/recipes-tizen/Modello-Installer/Modello-Installer-extraconf.inc @@ -0,0 +1,3 @@ +RDEPENDS_Modello_Installer-xwalk_remove = "Modello_Phone" + +ALLOW_EMPTY_Modello_Installer-xwalk = "1" \ No newline at end of file diff --git a/recipes-tizen/evolution-data-server/evolution-data-server-extraconf.inc b/recipes-tizen/evolution-data-server/evolution-data-server-extraconf.inc index e69de29..f6fc131 100644 --- a/recipes-tizen/evolution-data-server/evolution-data-server-extraconf.inc +++ b/recipes-tizen/evolution-data-server/evolution-data-server-extraconf.inc @@ -0,0 +1,10 @@ +inherit autotools gtk-doc pkgconfig gettext + +# -ldb needs this on some platforms +LDFLAGS += "-lpthread" + +# Parallel make shows many issues with this source code. +# Current problems seem to be duplicate execution of the calander/backends +# directories by make resulting in truncated/corrupt .la files +#PARALLEL_MAKE = "" + diff --git a/recipes-tizen/gcr/gcr-extraconf.inc b/recipes-tizen/gcr/gcr-extraconf.inc index 1e4164c..703a3cc 100644 --- a/recipes-tizen/gcr/gcr-extraconf.inc +++ b/recipes-tizen/gcr/gcr-extraconf.inc @@ -1 +1,4 @@ -inherit gtk-doc \ No newline at end of file +inherit gtk-doc + +export STAGING_DIR + diff --git a/recipes-tizen/phoned/phoned-extraconf.inc b/recipes-tizen/phoned/phoned-extraconf.inc index e69de29..fca3d89 100644 --- a/recipes-tizen/phoned/phoned-extraconf.inc +++ b/recipes-tizen/phoned/phoned-extraconf.inc @@ -0,0 +1,28 @@ +do_compile() { + cd ${S} + LANG=C + export LANG + unset DISPLAY + LD_AS_NEEDED=1; export LD_AS_NEEDED ; + + + + export LDFLAGS+=" -Wl,--rpath="${prefix}/lib/wrt-plugins" -Wl,--as-needed " + + cmake \ + -DCMAKE_VERBOSE_MAKEFILE=ON \ + -DCMAKE_INSTALL_PREFIX:PATH=${prefix} \ + -DCMAKE_INSTALL_LIBDIR:PATH=${prefix}/lib \ + -DINCLUDE_INSTALL_DIR:PATH=${prefix}/include \ + -DLIB_INSTALL_DIR:PATH=${prefix}/lib \ + -DSYSCONF_INSTALL_DIR:PATH=${sysconfdir} \ + -DSHARE_INSTALL_PREFIX:PATH=${prefix}/share \ + -DCMAKE_SKIP_RPATH:BOOL=ON \ + -DBUILD_SHARED_LIBS:BOOL=ON \ + ${EXTRA_OECMAKE} . -DCMAKE_INSTALL_PREFIX=${prefix} -DENABLE_TIME_TRACER="OFF" + + make -j16 VERBOSE=1 + + + +} \ No newline at end of file diff --git a/recipes-tizen/vala/vala-extraconf.inc b/recipes-tizen/vala/vala-extraconf.inc new file mode 100644 index 0000000..a311d59 --- /dev/null +++ b/recipes-tizen/vala/vala-extraconf.inc @@ -0,0 +1,19 @@ +#EXTRA_OECONF = " --with-pic --disable-vapigen" +SRC_URI += " file://0001-git-version-gen-don-t-append-dirty-if-we-re-not-in-g.patch" +SRC_URI += " file://Fix-time-stamp.patch" + +do_install_append() { + rm -r ${D}${prefix}/share/devhelp +} + +vala_files += "${prefix}/bin/vala" +vala_files += "${prefix}/bin/valac" +vala_files += "${prefix}/bin/vala-gen-introspect" +vala_files += "${prefix}/bin/vapicheck" +vala_files += "${prefix}/bin/vapigen" +vala_files += "${mandir}/man1/valac.1*" +vala_files += "${mandir}/man1/vala-gen-introspect.1*" +vala_files += "${mandir}/man1/vapigen.1*" + +FILES_${PN}-dbg += "${prefix}/lib/vala-0.24/.debug" +vala_files += "${prefix}/share/pkgconfig/vapigen.pc" -- 2.7.4