From c297aa9f441b41d9c05db93c5d5f832a39ec20d2 Mon Sep 17 00:00:00 2001 From: Ronan Le Martret Date: Fri, 10 Oct 2014 10:49:23 +0200 Subject: [PATCH] meta-tizen: update recipes Change-Id: Ic4353a626591678d7c14b04aca1185eb3ca43eea (From meta-tizen rev: 6affa852b21052c2f1d7e07633ab5b91bc87d7ce) Signed-off-by: Patrick Ohly --- .../recipes-image/images/tizen-ivi-core-image.bb | 3 +- .../recipes-image/images/tizen-ivi-ico-image.bb | 1 + .../Modello-AMBSimulator_git.bb | 2 +- .../Modello-Appmanager/Modello-Appmanager_git.bb | 2 +- .../Modello-Common/Modello-Common_git.bb | 2 +- .../Modello-Dashboard/Modello-Dashboard_git.bb | 2 +- .../Modello-Homescreen/Modello-Homescreen.inc | 19 +++--- .../Modello-Homescreen/Modello-Homescreen_git.bb | 2 +- .../recipes-tizen/Modello-Hvac/Modello-Hvac_git.bb | 2 +- .../Modello-Installer/Modello-Installer.inc | 12 ++-- .../Modello-Installer/Modello-Installer_git.bb | 2 +- .../Modello-Multimediaplayer_git.bb | 2 +- .../recipes-tizen/Modello-Nav/Modello-Nav_git.bb | 2 +- .../Modello-Phone/Modello-Phone_git.bb | 2 +- .../recipes-tizen/Modello-SDL/Modello-SDL_git.bb | 2 +- .../recipes-tizen/alsa-scenario/alsa-scenario.inc | 16 +++-- .../audio-session-manager.inc | 3 +- .../capi-content-media-content.inc | 4 +- meta-tizen/recipes-tizen/crosswalk/crosswalk.inc | 3 + .../recipes-tizen/crosswalk/crosswalk_git.bb | 2 +- .../recipes-tizen/desktop-skin/desktop-skin_git.bb | 2 +- .../ecryptfs-utils/ecryptfs-utils.inc | 18 ++--- meta-tizen/recipes-tizen/edbus/edbus.inc | 16 ++--- .../ico-uxf-homescreen-sample-apps.inc | 78 +++++++++------------- .../ico-uxf-homescreen-sample-apps_git.bb | 2 +- .../ico-uxf-homescreen-extraconf.inc | 7 +- .../ico-uxf-homescreen/ico-uxf-homescreen.inc | 25 ++++--- .../ico-uxf-homescreen/ico-uxf-homescreen_git.bb | 2 +- meta-tizen/recipes-tizen/lemolo/lemolo.inc | 3 +- .../recipes-tizen/message-port/message-port.inc | 20 +++--- .../recipes-tizen/message-port/message-port_git.bb | 2 +- .../recipes-tizen/meta-common/meta-common_git.bb | 2 +- .../recipes-tizen/meta-generic/meta-generic.inc | 10 +++ .../recipes-tizen/meta-generic/meta-generic_git.bb | 2 +- meta-tizen/recipes-tizen/phoned/phoned.inc | 14 ++-- meta-tizen/recipes-tizen/phoned/phoned_git.bb | 2 +- 36 files changed, 151 insertions(+), 139 deletions(-) diff --git a/meta-tizen/recipes-image/images/tizen-ivi-core-image.bb b/meta-tizen/recipes-image/images/tizen-ivi-core-image.bb index b8e9498..1c44fbb 100644 --- a/meta-tizen/recipes-image/images/tizen-ivi-core-image.bb +++ b/meta-tizen/recipes-image/images/tizen-ivi-core-image.bb @@ -7,6 +7,7 @@ LICENSE = "MIT" DESCRIPTION = "A Tizen IVI image based on Tizen common ." WESTONSTARTUP = "weston-ivi" +WESTONINI = "weston-ivi-config" IMAGECONFIG = "config-tizen-ivi" CORE_IMAGE_EXTRA_INSTALL += "automotive-message-broker" @@ -19,7 +20,7 @@ CORE_IMAGE_EXTRA_INSTALL += "libwebsockets" CORE_IMAGE_EXTRA_INSTALL += "murphy" CORE_IMAGE_EXTRA_INSTALL += "node-startup-controller" CORE_IMAGE_EXTRA_INSTALL += "pulseaudio-module-murphy-ivi" -CORE_IMAGE_EXTRA_INSTALL += "weston-ivi-config" +CORE_IMAGE_EXTRA_INSTALL += "${WESTONINI}" # TMP Remove rygel # BTY-36 diff --git a/meta-tizen/recipes-image/images/tizen-ivi-ico-image.bb b/meta-tizen/recipes-image/images/tizen-ivi-ico-image.bb index 890ffac..9c3871c 100644 --- a/meta-tizen/recipes-image/images/tizen-ivi-ico-image.bb +++ b/meta-tizen/recipes-image/images/tizen-ivi-ico-image.bb @@ -6,6 +6,7 @@ LICENSE = "MIT" DESCRIPTION = "A Tizen IVI image based on Tizen ivi with ico ." +WESTONINI = "ico-uxf-weston-plugin" # Modello packages CORE_IMAGE_EXTRA_INSTALL += "packagegroup-tizen-ivi-ico" diff --git a/meta-tizen/recipes-tizen/Modello-AMBSimulator/Modello-AMBSimulator_git.bb b/meta-tizen/recipes-tizen/Modello-AMBSimulator/Modello-AMBSimulator_git.bb index ed7fbce..8ec9057 100644 --- a/meta-tizen/recipes-tizen/Modello-AMBSimulator/Modello-AMBSimulator_git.bb +++ b/meta-tizen/recipes-tizen/Modello-AMBSimulator/Modello-AMBSimulator_git.bb @@ -4,7 +4,7 @@ PRIORITY = "10" LIC_FILES_CHKSUM ??= "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" -SRC_URI += "git://review.tizen.org/profile/ivi/Modello_AMBSimulator;tag=2dcf460258cc453a7bf48edce0e2b07c98cfab1a;nobranch=1" +SRC_URI += "git://review.tizen.org/profile/ivi/Modello_AMBSimulator;tag=d0b0056443ee26c66651340b5b2740b9cc2ef445;nobranch=1" BBCLASSEXTEND += " native " diff --git a/meta-tizen/recipes-tizen/Modello-Appmanager/Modello-Appmanager_git.bb b/meta-tizen/recipes-tizen/Modello-Appmanager/Modello-Appmanager_git.bb index e55b154..39f7716 100644 --- a/meta-tizen/recipes-tizen/Modello-Appmanager/Modello-Appmanager_git.bb +++ b/meta-tizen/recipes-tizen/Modello-Appmanager/Modello-Appmanager_git.bb @@ -4,7 +4,7 @@ PRIORITY = "10" LIC_FILES_CHKSUM ??= "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" -SRC_URI += "git://review.tizen.org/profile/ivi/Modello_Appmanager;tag=b80350058653481a61d323a91a5949241a16b3f8;nobranch=1" +SRC_URI += "git://review.tizen.org/profile/ivi/Modello_Appmanager;tag=818e2cf0f050389ea713be2f0beb2e15f3ea7642;nobranch=1" BBCLASSEXTEND += " native " diff --git a/meta-tizen/recipes-tizen/Modello-Common/Modello-Common_git.bb b/meta-tizen/recipes-tizen/Modello-Common/Modello-Common_git.bb index 80cf09d..4daa42e 100644 --- a/meta-tizen/recipes-tizen/Modello-Common/Modello-Common_git.bb +++ b/meta-tizen/recipes-tizen/Modello-Common/Modello-Common_git.bb @@ -4,7 +4,7 @@ PRIORITY = "10" LIC_FILES_CHKSUM ??= "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" -SRC_URI += "git://review.tizen.org/profile/ivi/Modello_Common;tag=041ba94b7af96af4959ce53782191aad45a5e3d0;nobranch=1" +SRC_URI += "git://review.tizen.org/profile/ivi/Modello_Common;tag=6ead735106c47c9e8282c942ee9aedccd063e940;nobranch=1" BBCLASSEXTEND += " native " diff --git a/meta-tizen/recipes-tizen/Modello-Dashboard/Modello-Dashboard_git.bb b/meta-tizen/recipes-tizen/Modello-Dashboard/Modello-Dashboard_git.bb index a65505e..b41742a 100644 --- a/meta-tizen/recipes-tizen/Modello-Dashboard/Modello-Dashboard_git.bb +++ b/meta-tizen/recipes-tizen/Modello-Dashboard/Modello-Dashboard_git.bb @@ -4,7 +4,7 @@ PRIORITY = "10" LIC_FILES_CHKSUM ??= "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" -SRC_URI += "git://review.tizen.org/profile/ivi/Modello_Dashboard;tag=435b13c1586568254cc8d67ceaebe933b264b27a;nobranch=1" +SRC_URI += "git://review.tizen.org/profile/ivi/Modello_Dashboard;tag=220efc256c672c1ff9c2d60c5da61249f3130b10;nobranch=1" BBCLASSEXTEND += " native " diff --git a/meta-tizen/recipes-tizen/Modello-Homescreen/Modello-Homescreen.inc b/meta-tizen/recipes-tizen/Modello-Homescreen/Modello-Homescreen.inc index 73dd136..259b3a1 100644 --- a/meta-tizen/recipes-tizen/Modello-Homescreen/Modello-Homescreen.inc +++ b/meta-tizen/recipes-tizen/Modello-Homescreen/Modello-Homescreen.inc @@ -22,6 +22,7 @@ RDEPENDS_${PN} += "Modello-Common" DEPENDS = "" #DEPENDS of Modello-Homescreen +DEPENDS += "tizen-platform-config" DEPENDS += "zip" do_prep() { @@ -46,7 +47,7 @@ do_compile() { unset DISPLAY LD_AS_NEEDED=1; export LD_AS_NEEDED ; - oe_runmake wgtPkg + #empty @@ -61,15 +62,11 @@ do_install() { rm -rf ${D} mkdir -p ${D} - - oe_runmake \ - DESTDIR=${D} \ - INSTALL_ROOT=${D} \ - BINDIR=${prefix}/bin \ - install - rm -f ${D}${infodir}/dir - find ${D} -regex ".*\.la$" | xargs rm -f -- - find ${D} -regex ".*\.a$" | xargs rm -f -- + mkdir -p ${D}/opt/usr/apps/.preinstallWidgets + mkdir -p ${D}${prefix}/share/Modello/Common/icons + zip -r ${D}/opt/usr/apps/.preinstallWidgets/Modello-Homescreen.wgt config.xml manifest.json css Homescreen_icon.png index.html js + install -m 0644 Homescreen_icon.png ${D}${prefix}/share/Modello/Common/icons + mkdir -p ${D}${prefix}/bin mkdir -p ${D}${systemd_unitdir}/user/weston.target.wants/ install -m 755 systemd/modello_launcher.sh ${D}${prefix}/bin @@ -85,7 +82,7 @@ PACKAGES += " Modello-Homescreen " Modello-Homescreen_files = "" Modello-Homescreen_files += "/opt/usr/apps/.preinstallWidgets/Modello-Homescreen.wgt" -Modello-Homescreen_files += "/opt/usr/apps/_common/icons/Homescreen_icon.png" +Modello-Homescreen_files += "${prefix}/share/Modello/Common/icons/Homescreen_icon.png" Modello-Homescreen_files += "${systemd_unitdir}/user/Modello_Homescreen.service" Modello-Homescreen_files += "${systemd_unitdir}/user/Modello_Homescreen-launchpad-ready.path" Modello-Homescreen_files += "${prefix}/bin/modello_launcher.sh" diff --git a/meta-tizen/recipes-tizen/Modello-Homescreen/Modello-Homescreen_git.bb b/meta-tizen/recipes-tizen/Modello-Homescreen/Modello-Homescreen_git.bb index c156644..6de32bc 100644 --- a/meta-tizen/recipes-tizen/Modello-Homescreen/Modello-Homescreen_git.bb +++ b/meta-tizen/recipes-tizen/Modello-Homescreen/Modello-Homescreen_git.bb @@ -4,7 +4,7 @@ PRIORITY = "10" LIC_FILES_CHKSUM ??= "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" -SRC_URI += "git://review.tizen.org/profile/ivi/Modello_Homescreen;tag=56c5aece6343a5fe5ad53af4aa39ce681c48f15e;nobranch=1" +SRC_URI += "git://review.tizen.org/profile/ivi/Modello_Homescreen;tag=ad970d14f427417ed186f2de6aacdb29fda844d2;nobranch=1" BBCLASSEXTEND += " native " diff --git a/meta-tizen/recipes-tizen/Modello-Hvac/Modello-Hvac_git.bb b/meta-tizen/recipes-tizen/Modello-Hvac/Modello-Hvac_git.bb index bfb6d95..29d1dbd 100644 --- a/meta-tizen/recipes-tizen/Modello-Hvac/Modello-Hvac_git.bb +++ b/meta-tizen/recipes-tizen/Modello-Hvac/Modello-Hvac_git.bb @@ -4,7 +4,7 @@ PRIORITY = "10" LIC_FILES_CHKSUM ??= "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" -SRC_URI += "git://review.tizen.org/profile/ivi/Modello_Hvac;tag=867feb1d8942c184fe47a622a62a699ea529068d;nobranch=1" +SRC_URI += "git://review.tizen.org/profile/ivi/Modello_Hvac;tag=25355b75ba877b485ef874267d56bb1248f00b53;nobranch=1" BBCLASSEXTEND += " native " diff --git a/meta-tizen/recipes-tizen/Modello-Installer/Modello-Installer.inc b/meta-tizen/recipes-tizen/Modello-Installer/Modello-Installer.inc index 233dc93..e862a63 100644 --- a/meta-tizen/recipes-tizen/Modello-Installer/Modello-Installer.inc +++ b/meta-tizen/recipes-tizen/Modello-Installer/Modello-Installer.inc @@ -120,9 +120,9 @@ pkg_postinst_${PN}() { export DBUS_SESSION_BUS_ADDRESS="unix:path=/run/user/5000/dbus/user_bus_socket" for list in $(find $TZ_SYS_APP_PREINSTALL -name "Modello*") do - #XWalk requires you not be root to install files - echo "Installing $list" - su app -c "xwalkctl -i $list" + #XWalk requires you not be root to install files + echo "Installing $list" + su app -c "pkgcmd -q -i -t wgt -p $list" done for list2 in $(ls -d $TZ_SYS_HOME/app/.config/xwalk-service/applications/*/) do @@ -140,10 +140,10 @@ pkg_postrm_${PN}() { source ${sysconfdir}/tizen-platform.conf export DBUS_SESSION_BUS_ADDRESS="unix:path=/run/user/5000/dbus/user_bus_socket" - for list3 in $(su app -c "xwalkctl" | grep Modello | cut -c 1-32) + for list3 in $(su app -c "xwalkctl" | grep Modello | cut -c 1-10) do - echo "Uninstalling $list3" - su app -c "xwalkctl -u $list3" + echo "Uninstalling $list3" + su app -c "pkgcmd -q -u -n $list3" done } diff --git a/meta-tizen/recipes-tizen/Modello-Installer/Modello-Installer_git.bb b/meta-tizen/recipes-tizen/Modello-Installer/Modello-Installer_git.bb index 9214955..d4c3558 100644 --- a/meta-tizen/recipes-tizen/Modello-Installer/Modello-Installer_git.bb +++ b/meta-tizen/recipes-tizen/Modello-Installer/Modello-Installer_git.bb @@ -4,7 +4,7 @@ PRIORITY = "10" LIC_FILES_CHKSUM ??= "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" -SRC_URI += "git://review.tizen.org/profile/ivi/Modello_Installer;tag=2082bbebe3e4641c3d7e2520e2055c40033ffaac;nobranch=1" +SRC_URI += "git://review.tizen.org/profile/ivi/Modello_Installer;tag=968a4e677273dec4b01b096c3902774d7a2c1de5;nobranch=1" BBCLASSEXTEND += " native " diff --git a/meta-tizen/recipes-tizen/Modello-Multimediaplayer/Modello-Multimediaplayer_git.bb b/meta-tizen/recipes-tizen/Modello-Multimediaplayer/Modello-Multimediaplayer_git.bb index 731c384..772ff00 100644 --- a/meta-tizen/recipes-tizen/Modello-Multimediaplayer/Modello-Multimediaplayer_git.bb +++ b/meta-tizen/recipes-tizen/Modello-Multimediaplayer/Modello-Multimediaplayer_git.bb @@ -4,7 +4,7 @@ PRIORITY = "10" LIC_FILES_CHKSUM ??= "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" -SRC_URI += "git://review.tizen.org/profile/ivi/Modello_Multimediaplayer;tag=7fd9425e8806a4015b722776a0de30b47fab901d;nobranch=1" +SRC_URI += "git://review.tizen.org/profile/ivi/Modello_Multimediaplayer;tag=d99987ed6c067e188fa3ac715683efe90dbc1581;nobranch=1" BBCLASSEXTEND += " native " diff --git a/meta-tizen/recipes-tizen/Modello-Nav/Modello-Nav_git.bb b/meta-tizen/recipes-tizen/Modello-Nav/Modello-Nav_git.bb index 8b4fb89..d86229a 100644 --- a/meta-tizen/recipes-tizen/Modello-Nav/Modello-Nav_git.bb +++ b/meta-tizen/recipes-tizen/Modello-Nav/Modello-Nav_git.bb @@ -4,7 +4,7 @@ PRIORITY = "10" LIC_FILES_CHKSUM ??= "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" -SRC_URI += "git://review.tizen.org/profile/ivi/Modello_Nav;tag=d76a933011dc0c1af9a89a8b0fceba2924ee7840;nobranch=1" +SRC_URI += "git://review.tizen.org/profile/ivi/Modello_Nav;tag=b298c42f097800ca3bcc52fd94bc689f15a7b575;nobranch=1" BBCLASSEXTEND += " native " diff --git a/meta-tizen/recipes-tizen/Modello-Phone/Modello-Phone_git.bb b/meta-tizen/recipes-tizen/Modello-Phone/Modello-Phone_git.bb index 0bf8e4f..c01b538 100644 --- a/meta-tizen/recipes-tizen/Modello-Phone/Modello-Phone_git.bb +++ b/meta-tizen/recipes-tizen/Modello-Phone/Modello-Phone_git.bb @@ -4,7 +4,7 @@ PRIORITY = "10" LIC_FILES_CHKSUM ??= "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" -SRC_URI += "git://review.tizen.org/profile/ivi/Modello_Phone;tag=7713f7d4798edb44f29a1d3ed4675b35a11b3a7d;nobranch=1" +SRC_URI += "git://review.tizen.org/profile/ivi/Modello_Phone;tag=f3644d280d7ce72dadb4e79515c21923bfa03779;nobranch=1" BBCLASSEXTEND += " native " diff --git a/meta-tizen/recipes-tizen/Modello-SDL/Modello-SDL_git.bb b/meta-tizen/recipes-tizen/Modello-SDL/Modello-SDL_git.bb index 279338a..6cf8575 100644 --- a/meta-tizen/recipes-tizen/Modello-SDL/Modello-SDL_git.bb +++ b/meta-tizen/recipes-tizen/Modello-SDL/Modello-SDL_git.bb @@ -4,7 +4,7 @@ PRIORITY = "10" LIC_FILES_CHKSUM ??= "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" -SRC_URI += "git://review.tizen.org/profile/ivi/Modello_SDL;tag=17ec89ac37010ab281e9e2a0147b8aa5b5d1d0b3;nobranch=1" +SRC_URI += "git://review.tizen.org/profile/ivi/Modello_SDL;tag=d03890cc6ce2dca421e1bb8c4746ee5269c0c2dd;nobranch=1" BBCLASSEXTEND += " native " diff --git a/meta-tizen/recipes-tizen/alsa-scenario/alsa-scenario.inc b/meta-tizen/recipes-tizen/alsa-scenario/alsa-scenario.inc index ca16910..66b65f3 100644 --- a/meta-tizen/recipes-tizen/alsa-scenario/alsa-scenario.inc +++ b/meta-tizen/recipes-tizen/alsa-scenario/alsa-scenario.inc @@ -1,7 +1,7 @@ DESCRIPTION = "ALSA Scenario pkg" HOMEPAGE = "http://nohomepage.org" -SECTION = "Multimedia/Audio" -LICENSE = "LGPLv2+" +SECTION = "Multimedia/Audio FW" +LICENSE = "LGPL-2.0+" SRC_URI = "" @@ -23,10 +23,14 @@ RDEPENDS = "" #RDEPENDS of alsa-scenario-dev (${PN}-dev) RDEPENDS_${PN}-dev += "alsa-scenario" +#RDEPENDS of alsa-scenario (${PN}) +RDEPENDS_${PN} += "eglibc" + DEPENDS = "" #DEPENDS of alsa-scenario DEPENDS += "alsa-lib" +inherit pkgconfig do_prep() { cd ${S} @@ -51,11 +55,11 @@ do_compile() { unset DISPLAY LD_AS_NEEDED=1; export LD_AS_NEEDED ; - cp -f /usr/share/libtool/config/config.guess ${WORKDIR}/alsa-scenario-0.2.1/ - cp -f /usr/share/libtool/config/config.sub ${WORKDIR}/alsa-scenario-0.2.1/ + cp -f ${prefix}/share/libtool/config/config.guess ${WORKDIR}/alsa-scenario-0.2.1/ + cp -f ${prefix}/share/libtool/config/config.sub ${WORKDIR}/alsa-scenario-0.2.1/ autotools_do_configure - make -j16 + oe_runmake -j16 @@ -71,6 +75,7 @@ do_install() { rm -rf ${D} mkdir -p ${D} + rm -rf ${D} oe_runmake \ DESTDIR=${D} \ @@ -82,6 +87,7 @@ do_install() { find ${D} -regex ".*\.a$" | xargs rm -f -- + } pkg_postinst_${PN}() { diff --git a/meta-tizen/recipes-tizen/audio-session-manager/audio-session-manager.inc b/meta-tizen/recipes-tizen/audio-session-manager/audio-session-manager.inc index a4fcfb2..516716c 100644 --- a/meta-tizen/recipes-tizen/audio-session-manager/audio-session-manager.inc +++ b/meta-tizen/recipes-tizen/audio-session-manager/audio-session-manager.inc @@ -39,9 +39,10 @@ DEPENDS = "" #DEPENDS of audio-session-manager DEPENDS += "avsystem" DEPENDS += "libmm-common" -DEPENDS += "security-server" +inherit pkgconfig DEPENDS += "glib-2.0" DEPENDS += "system-server" +DEPENDS += "security-server" DEPENDS += "vconf" do_prep() { diff --git a/meta-tizen/recipes-tizen/capi-content-media-content/capi-content-media-content.inc b/meta-tizen/recipes-tizen/capi-content-media-content/capi-content-media-content.inc index 649cfda..6249aca 100644 --- a/meta-tizen/recipes-tizen/capi-content-media-content/capi-content-media-content.inc +++ b/meta-tizen/recipes-tizen/capi-content-media-content/capi-content-media-content.inc @@ -56,7 +56,7 @@ do_compile() { unset DISPLAY LD_AS_NEEDED=1; export LD_AS_NEEDED ; - MAJORVER=`echo 0.2.58 | awk 'BEGIN {FS="."}{print $1}'` + MAJORVER=`echo 0.2.59 | awk 'BEGIN {FS="."}{print $1}'` cmake \ -DCMAKE_VERBOSE_MAKEFILE=ON \ @@ -69,7 +69,7 @@ do_compile() { -DCMAKE_SKIP_RPATH:BOOL=ON \ -DBUILD_SHARED_LIBS:BOOL=ON \ -DCMAKE_TOOLCHAIN_FILE=${WORKDIR}/toolchain.cmake \ - ${EXTRA_OECMAKE} . -DFULLVER=0.2.58 -DMAJORVER=${MAJORVER} + ${EXTRA_OECMAKE} . -DFULLVER=0.2.59 -DMAJORVER=${MAJORVER} oe_runmake -j16 diff --git a/meta-tizen/recipes-tizen/crosswalk/crosswalk.inc b/meta-tizen/recipes-tizen/crosswalk/crosswalk.inc index 64a8945..22d3b6c 100644 --- a/meta-tizen/recipes-tizen/crosswalk/crosswalk.inc +++ b/meta-tizen/recipes-tizen/crosswalk/crosswalk.inc @@ -235,10 +235,13 @@ pkg_postinst_${PN}() { pkg_prerm_${PN}() { #!/bin/sh -e + if [ $1 -eq 0 ] ; then + # don't remove if we are upgrade the rpm package [ -L /etc/package-manager/backendlib/libxpk.so ] && rm /etc/package-manager/backendlib/libxpk.so [ -L /etc/package-manager/backendlib/libwgt.so ] && rm /etc/package-manager/backendlib/libwgt.so [ -L /etc/package-manager/backend/xpk ] && rm /etc/package-manager/backend/xpk [ -L /etc/package-manager/backend/wgt ] && rm /etc/package-manager/backend/wgt + fi } diff --git a/meta-tizen/recipes-tizen/crosswalk/crosswalk_git.bb b/meta-tizen/recipes-tizen/crosswalk/crosswalk_git.bb index e1a9237..32f5f39 100644 --- a/meta-tizen/recipes-tizen/crosswalk/crosswalk_git.bb +++ b/meta-tizen/recipes-tizen/crosswalk/crosswalk_git.bb @@ -4,7 +4,7 @@ PRIORITY = "10" LIC_FILES_CHKSUM ??= "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" -SRC_URI += "git://review.tizen.org/platform/framework/web/crosswalk;tag=893693a3709897c9b72d899582bb7ebe29702aa9;nobranch=1" +SRC_URI += "git://review.tizen.org/platform/framework/web/crosswalk;tag=fb4cda9072d69cdaac80f04fbb01e22cc881a384;nobranch=1" BBCLASSEXTEND += " native " diff --git a/meta-tizen/recipes-tizen/desktop-skin/desktop-skin_git.bb b/meta-tizen/recipes-tizen/desktop-skin/desktop-skin_git.bb index 629836e..4d925f4 100644 --- a/meta-tizen/recipes-tizen/desktop-skin/desktop-skin_git.bb +++ b/meta-tizen/recipes-tizen/desktop-skin/desktop-skin_git.bb @@ -4,7 +4,7 @@ PRIORITY = "10" LIC_FILES_CHKSUM ??= "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" -SRC_URI += "git://review.tizen.org/profile/common/desktop-skin;tag=be6c8a8d18bb533dcbe4f5c25cd2c1fd1248a940;nobranch=1" +SRC_URI += "git://review.tizen.org/profile/common/desktop-skin;tag=0d87f0e3b4a28909829308ce42a20a4b5934cc7e;nobranch=1" BBCLASSEXTEND += " native " diff --git a/meta-tizen/recipes-tizen/ecryptfs-utils/ecryptfs-utils.inc b/meta-tizen/recipes-tizen/ecryptfs-utils/ecryptfs-utils.inc index a6fc2ad..3e792e9 100644 --- a/meta-tizen/recipes-tizen/ecryptfs-utils/ecryptfs-utils.inc +++ b/meta-tizen/recipes-tizen/ecryptfs-utils/ecryptfs-utils.inc @@ -1,4 +1,4 @@ -DESCRIPTION = "ECryptfs utilities" +DESCRIPTION = "Userspace Utilities for ecryptfs" HOMEPAGE = "http://nohomepage.org" SECTION = "System/Libraries" LICENSE = "GPL-2.0+" @@ -49,6 +49,7 @@ DEPENDS_append_class-target = " intltool-native" inherit pythonnative DEPENDS_append_class-native = " fdupes-native" DEPENDS_append_class-target = " fdupes-native" +inherit pkgconfig DEPENDS += "glib-2.0" DEPENDS += "nss" DEPENDS += "libpam" @@ -128,8 +129,8 @@ pkg_postrm_libecryptfs() { PACKAGES = "${PN}-dbg ${PN}-doc ${PN}-locale" PACKAGES += " libecryptfs " -PACKAGES += " libecryptfs-python " PACKAGES += " ecryptfs-utils " +PACKAGES += " libecryptfs-python " PACKAGES += " libecryptfs-dev " libecryptfs_files = "" @@ -137,10 +138,6 @@ libecryptfs_files += "${prefix}/lib/libecryptfs.so.*" libecryptfs_files += "${prefix}/lib/ecryptfs/*" MANIFESTFILES_libecryptfs = "ecryptfs-utils.manifest" -libecryptfs-python_files = "" -libecryptfs-python_files += "/usr/lib/python2.7/site-packages/ecryptfs-utils/*" -libecryptfs-python_files += "/usr/lib64/python2.7/site-packages/ecryptfs-utils/*" - ecryptfs-utils_files = "" ecryptfs-utils_files += "AUTHORS NEWS" ecryptfs-utils_files += "${prefix}/bin/ecryptfs*" @@ -154,19 +151,24 @@ ecryptfs-utils_files += "${prefix}/share/doc/ecryptfs-utils/*" ecryptfs-utils_files += "${prefix}/share/ecryptfs-utils/*" MANIFESTFILES_${PN} = "ecryptfs-utils.manifest" +libecryptfs-python_files = "" +libecryptfs-python_files += "/usr/lib/python2.7/site-packages/ecryptfs-utils/*" +MANIFESTFILES_libecryptfs-python = "ecryptfs-utils.manifest" + libecryptfs-dev_files = "" libecryptfs-dev_files += "${prefix}/include/ecryptfs.h" libecryptfs-dev_files += "${prefix}/lib/libecryptfs.so" libecryptfs-dev_files += "${prefix}/lib/pkgconfig/libecryptfs.pc" +MANIFESTFILES_libecryptfs-dev = "ecryptfs-utils.manifest" FILES_libecryptfs = "${libecryptfs_files}" -FILES_libecryptfs-python = "${libecryptfs-python_files}" FILES_${PN} = "${ecryptfs-utils_files}" +FILES_libecryptfs-python = "${libecryptfs-python_files}" FILES_libecryptfs-dev = "${libecryptfs-dev_files}" PKG_libecryptfs= "libecryptfs" -PKG_libecryptfs-python= "libecryptfs-python" PKG_ecryptfs-utils= "ecryptfs-utils" +PKG_libecryptfs-python= "libecryptfs-python" PKG_libecryptfs-dev= "libecryptfs-dev" require ecryptfs-utils-extraconf.inc diff --git a/meta-tizen/recipes-tizen/edbus/edbus.inc b/meta-tizen/recipes-tizen/edbus/edbus.inc index 74d7fbc..544d259 100644 --- a/meta-tizen/recipes-tizen/edbus/edbus.inc +++ b/meta-tizen/recipes-tizen/edbus/edbus.inc @@ -1,7 +1,7 @@ DESCRIPTION = "EFL Wrapper for DBus" HOMEPAGE = "http://www.enlightenment.org/" -SECTION = "Graphics/EFL" -LICENSE = "BSD 2-clause" +SECTION = "Graphics & UI Framework/EFL" +LICENSE = "BSD-2-Clause" SRC_URI = "" @@ -29,6 +29,7 @@ DEPENDS = "" DEPENDS += "evas" DEPENDS += "ecore" DEPENDS += "dbus" +inherit pkgconfig DEPENDS += "eina" do_prep() { @@ -55,7 +56,7 @@ do_compile() { autotools_do_configure - make -j16 + oe_runmake -j16 @@ -82,9 +83,6 @@ do_install() { find ${D} -regex ".*\.a$" | xargs rm -f -- - - - } pkg_postinst_${PN}() { @@ -108,14 +106,14 @@ edbus-dev_files += "${prefix}/include/e_dbus-1/*.h" edbus-dev_files += "${prefix}/lib/*.so" edbus-dev_files += "${prefix}/lib/pkgconfig/*.pc" edbus-dev_files += "${prefix}/include/e_dbus-1/connman0_7x/E_Connman.h" -edbus-dev_files += "/usr/bin/e-notify-send" +edbus-dev_files += "${prefix}/bin/e-notify-send" MANIFESTFILES_${PN}-dev = "edbus.manifest" edbus_files = "" edbus_files += "${prefix}/bin/e_dbus_*" -edbus_files += "/usr/bin/e-notify-send" +edbus_files += "${prefix}/bin/e-notify-send" edbus_files += "${prefix}/lib/libe*.so.*" -edbus_files += "/usr/share/e_dbus/logo.png" +edbus_files += "${prefix}/share/e_dbus/logo.png" MANIFESTFILES_${PN} = "edbus.manifest" FILES_${PN}-dev = "${edbus-dev_files}" diff --git a/meta-tizen/recipes-tizen/ico-uxf-homescreen-sample-apps/ico-uxf-homescreen-sample-apps.inc b/meta-tizen/recipes-tizen/ico-uxf-homescreen-sample-apps/ico-uxf-homescreen-sample-apps.inc index 28ad9c2..51e337b 100644 --- a/meta-tizen/recipes-tizen/ico-uxf-homescreen-sample-apps/ico-uxf-homescreen-sample-apps.inc +++ b/meta-tizen/recipes-tizen/ico-uxf-homescreen-sample-apps/ico-uxf-homescreen-sample-apps.inc @@ -40,7 +40,7 @@ DEPENDS += "edje" DEPENDS += "ico-uxf-utilities" DEPENDS += "edbus" DEPENDS += "evas" -DEPENDS += "dbus" +DEPENDS += "tizen-platform-config" DEPENDS += "pulseaudio" DEPENDS += "capi-appfw-application" DEPENDS += "aul" @@ -49,11 +49,13 @@ DEPENDS += "glib-2.0" DEPENDS += "eina" DEPENDS += "elementary" DEPENDS += "ecore" +DEPENDS += "dbus" do_prep() { cd ${S} chmod -Rf a+rX,u+w,g-w,o-w ${S} #setup -q -n ico-uxf-homescreen-sample-apps-0.9.8 + cp ${S}/packaging/ico-uxf-homescreen-sample-apps.manifest . } @@ -104,25 +106,19 @@ do_install() { mkdir -p ${D}${prefix}/share/packages/ mkdir -p ${D}${prefix}/share/icons/default/small - # configurations(ico-app-soundsample) - - mkdir -p ${D}/usr/apps/org.tizen.ico.app-soundsample/bin/ - mkdir -p ${D}/usr/apps/org.tizen.ico.app-soundsample/sounds/ - mkdir -p ${D}/usr/apps/org.tizen.ico.app-soundsample/res/icons/default/small/ - mkdir -p ${D}/usr/apps/org.tizen.ico.app-soundsample/res/images/ - install -m 0644 ico-app-soundsample/soundsample_config.txt ${D}/usr/apps/org.tizen.ico.app-soundsample/res/ - install -m 0644 ico-app-soundsample/sound_bg.png ${D}/usr/apps/org.tizen.ico.app-soundsample/res/images/ + mkdir -p ${D}${prefix}/apps/org.tizen.ico.app-soundsample/bin/ + mkdir -p ${D}${prefix}/apps/org.tizen.ico.app-soundsample/sounds/ + mkdir -p ${D}${prefix}/apps/org.tizen.ico.app-soundsample/res/images/ + install -m 0644 ico-app-soundsample/soundsample_config.txt ${D}${prefix}/apps/org.tizen.ico.app-soundsample/res/ + install -m 0644 ico-app-soundsample/sound_bg.png ${D}${prefix}/apps/org.tizen.ico.app-soundsample/res/images/ install -m 0644 ico-app-soundsample/org.tizen.ico.app-soundsample.png ${D}${prefix}/share/icons/default/small/ - install -m 0644 ico-app-soundsample/musicbox.wav ${D}/usr/apps/org.tizen.ico.app-soundsample/sounds/ + install -m 0644 ico-app-soundsample/musicbox.wav ${D}${prefix}/apps/org.tizen.ico.app-soundsample/sounds/ install -m 0644 ico-app-soundsample/org.tizen.ico.app-soundsample.xml ${D}${prefix}/share/packages/ - # configurations(ico-app-vicsample) - - mkdir -p ${D}/usr/apps/org.tizen.ico.app-vicsample/bin/ - mkdir -p ${D}/usr/apps/org.tizen.ico.app-vicsample/res/icons/default/small/ - mkdir -p ${D}/usr/apps/org.tizen.ico.app-vicsample/res/images/ - install -m 0644 ico-app-vicsample/vicsample_config.txt ${D}/usr/apps/org.tizen.ico.app-vicsample/res/ - install -m 0644 ico-app-vicsample/vicinfo_bg.png ${D}/usr/apps/org.tizen.ico.app-vicsample/res/images/ + mkdir -p ${D}${prefix}/apps/org.tizen.ico.app-vicsample/bin/ + mkdir -p ${D}${prefix}/apps/org.tizen.ico.app-vicsample/res/images/ + install -m 0644 ico-app-vicsample/vicsample_config.txt ${D}${prefix}/apps/org.tizen.ico.app-vicsample/res/ + install -m 0644 ico-app-vicsample/vicinfo_bg.png ${D}${prefix}/apps/org.tizen.ico.app-vicsample/res/images/ install -m 0644 ico-app-vicsample/org.tizen.ico.app-vicsample.png ${D}${prefix}/share/icons/default/small/ install -m 0644 ico-app-vicsample/org.tizen.ico.app-vicsample.xml ${D}${prefix}/share/packages/ @@ -144,8 +140,6 @@ do_install() { install -m 0644 ico-app-miscellaneous/navigator.png ${D}${prefix}/share/icons/default/small/ - - } pkg_postinst_${PN}() { @@ -156,35 +150,25 @@ pkg_postinst_${PN}() { # Create a symbolic link to it instead. ln -sf $D${prefix}/share/weston/terminal.png $D${prefix}/share/icons/default/small/ # Update the app database. - $D${prefix}/bin/pkginfo --imd /usr/share/packages/org.tizen.ico.app-soundsample.xml - $D${prefix}/bin/pkginfo --imd /usr/share/packages/org.tizen.ico.app-vicsample.xml - $D${prefix}/bin/pkginfo --imd /usr/share/packages/browser.xml - $D${prefix}/bin/pkginfo --imd /usr/share/packages/terminal.xml - $D${prefix}/bin/pkginfo --imd /usr/share/packages/navigator.xml - -} - -pkg_prerm_${PN}() { - #!/bin/sh -e - - # Update the app database. - $D${prefix}/bin/pkginfo --rmd /usr/share/packages/org.tizen.ico.app-soundsample.xml - $D${prefix}/bin/pkginfo --rmd /usr/share/packages/org.tizen.ico.app-vicsample.xml - $D${prefix}/bin/pkginfo --rmd /usr/share/packages/browser.xml - $D${prefix}/bin/pkginfo --rmd /usr/share/packages/terminal.xml - $D${prefix}/bin/pkginfo --rmd /usr/share/packages/navigator.xml + pkg_initdb + ail_initdb } pkg_postrm_${PN}() { #!/bin/sh -e + if [ "$1" = "0" ]; then [ "x$D" == "x" ] && ldconfig - rm -f /usr/share/applications/org.tizen.ico.app-soundsample.desktop - rm -f /usr/share/applications/org.tizen.ico.app-vicsample.desktop - rm -f /usr/share/applications/browser.desktop - rm -f /usr/share/applications/terminal.desktop + rm -f $D${prefix}/share/applications/org.tizen.ico.app-soundsample.desktop + rm -f $D${prefix}/share/applications/org.tizen.ico.app-vicsample.desktop + rm -f $D${prefix}/share/applications/browser.desktop + rm -f $D${prefix}/share/applications/terminal.desktop rm -f $D${prefix}/share/icons/default/small/terminal.png + # Update the app database. + pkg_initdb + ail_initdb + fi } @@ -192,15 +176,15 @@ PACKAGES = "${PN}-dbg ${PN}-doc ${PN}-locale" PACKAGES += " ico-uxf-homescreen-sample-apps " ico-uxf-homescreen-sample-apps_files = "" -ico-uxf-homescreen-sample-apps_files += "/usr/apps/org.tizen.ico.app-soundsample/bin/ico-app-soundsample" -ico-uxf-homescreen-sample-apps_files += "/usr/apps/org.tizen.ico.app-soundsample/res/soundsample_config.txt" -ico-uxf-homescreen-sample-apps_files += "/usr/apps/org.tizen.ico.app-soundsample/res/images/sound_bg.png" -ico-uxf-homescreen-sample-apps_files += "/usr/apps/org.tizen.ico.app-soundsample/sounds/musicbox.wav" +ico-uxf-homescreen-sample-apps_files += "${prefix}/apps/org.tizen.ico.app-soundsample/bin/ico-app-soundsample" +ico-uxf-homescreen-sample-apps_files += "${prefix}/apps/org.tizen.ico.app-soundsample/res/soundsample_config.txt" +ico-uxf-homescreen-sample-apps_files += "${prefix}/apps/org.tizen.ico.app-soundsample/res/images/sound_bg.png" +ico-uxf-homescreen-sample-apps_files += "${prefix}/apps/org.tizen.ico.app-soundsample/sounds/musicbox.wav" ico-uxf-homescreen-sample-apps_files += "${prefix}/share/icons/default/small/org.tizen.ico.app-soundsample.png" ico-uxf-homescreen-sample-apps_files += "${prefix}/share/packages/org.tizen.ico.app-soundsample.xml" -ico-uxf-homescreen-sample-apps_files += "/usr/apps/org.tizen.ico.app-vicsample/bin/ico-app-vicsample" -ico-uxf-homescreen-sample-apps_files += "/usr/apps/org.tizen.ico.app-vicsample/res/vicsample_config.txt" -ico-uxf-homescreen-sample-apps_files += "/usr/apps/org.tizen.ico.app-vicsample/res/images/vicinfo_bg.png" +ico-uxf-homescreen-sample-apps_files += "${prefix}/apps/org.tizen.ico.app-vicsample/bin/ico-app-vicsample" +ico-uxf-homescreen-sample-apps_files += "${prefix}/apps/org.tizen.ico.app-vicsample/res/vicsample_config.txt" +ico-uxf-homescreen-sample-apps_files += "${prefix}/apps/org.tizen.ico.app-vicsample/res/images/vicinfo_bg.png" ico-uxf-homescreen-sample-apps_files += "${prefix}/share/icons/default/small/org.tizen.ico.app-vicsample.png" ico-uxf-homescreen-sample-apps_files += "${prefix}/share/packages/org.tizen.ico.app-vicsample.xml" ico-uxf-homescreen-sample-apps_files += "${prefix}/bin/browser" diff --git a/meta-tizen/recipes-tizen/ico-uxf-homescreen-sample-apps/ico-uxf-homescreen-sample-apps_git.bb b/meta-tizen/recipes-tizen/ico-uxf-homescreen-sample-apps/ico-uxf-homescreen-sample-apps_git.bb index d3fd859..81745dd 100644 --- a/meta-tizen/recipes-tizen/ico-uxf-homescreen-sample-apps/ico-uxf-homescreen-sample-apps_git.bb +++ b/meta-tizen/recipes-tizen/ico-uxf-homescreen-sample-apps/ico-uxf-homescreen-sample-apps_git.bb @@ -4,7 +4,7 @@ PRIORITY = "10" LIC_FILES_CHKSUM ??= "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" -SRC_URI += "git://review.tizen.org/profile/ivi/ico-uxf-homescreen-sample-apps;tag=802c0ef8cf9277d7d658e341425cb9d91f3bed34;nobranch=1" +SRC_URI += "git://review.tizen.org/profile/ivi/ico-uxf-homescreen-sample-apps;tag=c0f2aa22c0ec073520791ad13728f3d2c328b608;nobranch=1" BBCLASSEXTEND += " native " diff --git a/meta-tizen/recipes-tizen/ico-uxf-homescreen/ico-uxf-homescreen-extraconf.inc b/meta-tizen/recipes-tizen/ico-uxf-homescreen/ico-uxf-homescreen-extraconf.inc index e2f501c..372c2a8 100644 --- a/meta-tizen/recipes-tizen/ico-uxf-homescreen/ico-uxf-homescreen-extraconf.inc +++ b/meta-tizen/recipes-tizen/ico-uxf-homescreen/ico-uxf-homescreen-extraconf.inc @@ -1,7 +1,8 @@ do_prep() { - - cd ${S} - chmod -Rf a+rX,u+w,g-w,o-w ${S} + cd ${S} + chmod -Rf a+rX,u+w,g-w,o-w ${S} + #setup -q -n ico-uxf-homescreen-0.9.22 + cp ${S}/packaging/ico-uxf-homescreen.manifest . } do_compile_prepend() { diff --git a/meta-tizen/recipes-tizen/ico-uxf-homescreen/ico-uxf-homescreen.inc b/meta-tizen/recipes-tizen/ico-uxf-homescreen/ico-uxf-homescreen.inc index a1032af..6e30ecc 100644 --- a/meta-tizen/recipes-tizen/ico-uxf-homescreen/ico-uxf-homescreen.inc +++ b/meta-tizen/recipes-tizen/ico-uxf-homescreen/ico-uxf-homescreen.inc @@ -80,11 +80,14 @@ DEPENDS += "ecore" DEPENDS += "mesa" DEPENDS += "dbus" DEPENDS += "ail" +DEPENDS_append_class-native = " fdupes-native" +DEPENDS_append_class-target = " fdupes-native" do_prep() { cd ${S} chmod -Rf a+rX,u+w,g-w,o-w ${S} #setup -q -n ico-uxf-homescreen-0.9.22 + cp ${S}/packaging/ico-uxf-homescreen.manifest . mkdir -p weston cp -av ${prefix}/share/genivi-shell/protocol/*.xml weston/ @@ -153,6 +156,8 @@ do_install() { cp tool/notification/ico_send_notification ${D}${prefix}/bin cp tool/notification/ico_send_notification2 ${D}${prefix}/bin + #fdupes ${D} + } @@ -161,8 +166,8 @@ pkg_postinst_${PN}() { [ "x$D" == "x" ] && ldconfig # Update the app database. - $D${prefix}/bin/pkg_initdb - $D${prefix}/bin/ail_initdb + pkg_initdb + ail_initdb } @@ -174,8 +179,8 @@ pkg_postrm_${PN}() { rm -f $D${prefix}/share/applications/org.tizen.ico.statusbar.desktop rm -f $D${prefix}/share/applications/org.tizen.ico.onscreen.desktop rm -f $D${prefix}/share/applications/org.tizen.ico.system-controller.desktop - $D${prefix}/bin/pkg_initdb - $D${prefix}/bin/ail_initdb + pkg_initdb + ail_initdb } @@ -208,11 +213,11 @@ ico-uxf-homescreen-system-controller-dev_files += "${prefix}/include/ico-state-m MANIFESTFILES_${PN}-system-controller-dev = "ico-uxf-homescreen.manifest" ico-uxf-homescreen-system-controller_files = "" -ico-uxf-homescreen-system-controller_files += "/usr/share/packages/org.tizen.ico.system-controller.xml" -ico-uxf-homescreen-system-controller_files += "/usr/lib/systemd/user/ico-uxf-wait-launchpad-ready.path" -ico-uxf-homescreen-system-controller_files += "/usr/lib/systemd/user/weston.target.wants/ico-uxf-wait-launchpad-ready.path" -ico-uxf-homescreen-system-controller_files += "/usr/lib/systemd/user/ico-system-controller.service" -ico-uxf-homescreen-system-controller_files += "/usr/apps/org.tizen.ico.system-controller/bin" +ico-uxf-homescreen-system-controller_files += "${prefix}/share/packages/org.tizen.ico.system-controller.xml" +ico-uxf-homescreen-system-controller_files += "${systemd_unitdir}/user/ico-uxf-wait-launchpad-ready.path" +ico-uxf-homescreen-system-controller_files += "${systemd_unitdir}/user/weston.target.wants/ico-uxf-wait-launchpad-ready.path" +ico-uxf-homescreen-system-controller_files += "${systemd_unitdir}/user/ico-system-controller.service" +ico-uxf-homescreen-system-controller_files += "${prefix}/apps/org.tizen.ico.system-controller/bin" ico-uxf-homescreen-system-controller_files += "/home/app/ico/defaultApps.info" ico-uxf-homescreen-system-controller_files += "/home/app/ico" MANIFESTFILES_${PN}-system-controller = "ico-uxf-homescreen.manifest" @@ -235,7 +240,7 @@ ico-uxf-homescreen_files += "${prefix}/bin/ico_send_notification2" ico-uxf-homescreen_files += "${prefix}/share/icons/default/small/org.tizen.ico.homescreen.png" ico-uxf-homescreen_files += "${prefix}/share/icons/default/small/org.tizen.ico.statusbar.png" ico-uxf-homescreen_files += "${prefix}/share/icons/default/small/org.tizen.ico.onscreen.png" -ico-uxf-homescreen_files += "/usr/apps/org.tizen.ico.system-controller/res/config" +ico-uxf-homescreen_files += "${prefix}/apps/org.tizen.ico.system-controller/res/config" MANIFESTFILES_${PN} = "ico-uxf-homescreen.manifest" FILES_${PN}-system-controller-dev = "${ico-uxf-homescreen-system-controller-dev_files}" diff --git a/meta-tizen/recipes-tizen/ico-uxf-homescreen/ico-uxf-homescreen_git.bb b/meta-tizen/recipes-tizen/ico-uxf-homescreen/ico-uxf-homescreen_git.bb index 7c9f060..40dc5b3 100644 --- a/meta-tizen/recipes-tizen/ico-uxf-homescreen/ico-uxf-homescreen_git.bb +++ b/meta-tizen/recipes-tizen/ico-uxf-homescreen/ico-uxf-homescreen_git.bb @@ -4,7 +4,7 @@ PRIORITY = "10" LIC_FILES_CHKSUM ??= "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" -SRC_URI += "git://review.tizen.org/profile/ivi/ico-uxf-homescreen;tag=2fb4e86306ae1b45ae0129ffff63096161627838;nobranch=1" +SRC_URI += "git://review.tizen.org/profile/ivi/ico-uxf-homescreen;tag=74dc27c5bac25a80ad7374515fd043f4ae4bd12f;nobranch=1" BBCLASSEXTEND += " native " diff --git a/meta-tizen/recipes-tizen/lemolo/lemolo.inc b/meta-tizen/recipes-tizen/lemolo/lemolo.inc index 4c0d984..5643e99 100644 --- a/meta-tizen/recipes-tizen/lemolo/lemolo.inc +++ b/meta-tizen/recipes-tizen/lemolo/lemolo.inc @@ -26,6 +26,7 @@ DEPENDS = "" #Replace "DEPENDS" on gettext by "inherit gettext" inherit gettext DEPENDS += "pulseaudio" +inherit pkgconfig DEPENDS += "ofono" DEPENDS += "capi-system-power" DEPENDS += "evas" @@ -66,7 +67,7 @@ do_compile() { autotools_do_configure - make -j16 + oe_runmake -j16 diff --git a/meta-tizen/recipes-tizen/message-port/message-port.inc b/meta-tizen/recipes-tizen/message-port/message-port.inc index 80eebb1..19f3732 100644 --- a/meta-tizen/recipes-tizen/message-port/message-port.inc +++ b/meta-tizen/recipes-tizen/message-port/message-port.inc @@ -101,8 +101,8 @@ do_install() { find ${D} -regex ".*\.la$" | xargs rm -f -- find ${D} -regex ".*\.a$" | xargs rm -f -- - mkdir -p ${RPM_BUILD_ROOT}/lib/systemd/system - cp messageportd.service $RPM_BUILD_ROOT/lib/systemd/system + mkdir -p ${D}${systemd_unitdir}/system + cp messageportd.service ${D}${systemd_unitdir}/system @@ -111,30 +111,30 @@ do_install() { pkg_postinst_libmessage-port() { #!/bin/sh -e - [ "x$D" == "x" ] && ldconfig + ldconfig } pkg_postinst_${PN}() { #!/bin/sh -e - getent group messageport >/dev/null || $D${prefix}/sbin/groupadd -r -o messageport - getent passwd messageport >/dev/null || $D${prefix}/sbin/useradd -r -g messageport -s /bin/false -d /run/messageport -c "Message Port daemon" messageport - /bin/systemctl enable messageportd.service + getent group messageport >/dev/null || groupadd -r -o messageport + getent passwd messageport >/dev/null || useradd -r -g messageport -s /bin/false -d /run/messageport -c "Message Port daemon" messageport + systemctl enable messageportd.service } pkg_postrm_${PN}() { #!/bin/sh -e - /bin/systemctl disable messageportd.service + systemctl disable messageportd.service } pkg_postrm_libmessage-port() { #!/bin/sh -e - [ "x$D" == "x" ] && ldconfig + ldconfig # daemon: message-port } @@ -146,7 +146,7 @@ PACKAGES += " message-port-tests " PACKAGES += " message-port " libmessage-port_files = "" -libmessage-port_files += "AUTHORS COPYING.LIB README" +libmessage-port_files += "AUTHORS COPYING.LIB" libmessage-port_files += "${prefix}/lib/libmessage-port.so*" MANIFESTFILES_lib${PN} = "message-port.manifest" @@ -162,7 +162,7 @@ MANIFESTFILES_${PN}-tests = "message-port.manifest" message-port_files = "" message-port_files += "${prefix}/bin/messageportd" -message-port_files += "/lib/systemd/system/messageportd.service" +message-port_files += "${systemd_unitdir}/system/messageportd.service" FILES_lib${PN} = "${libmessage-port_files}" FILES_lib${PN}-dev = "${libmessage-port-dev_files}" diff --git a/meta-tizen/recipes-tizen/message-port/message-port_git.bb b/meta-tizen/recipes-tizen/message-port/message-port_git.bb index 53b3595..7dd2a1d 100644 --- a/meta-tizen/recipes-tizen/message-port/message-port_git.bb +++ b/meta-tizen/recipes-tizen/message-port/message-port_git.bb @@ -4,7 +4,7 @@ PRIORITY = "10" LIC_FILES_CHKSUM ??= "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" -SRC_URI += "git://review.tizen.org/platform/core/appfw/message-port-dbus;tag=a32937b52205b0878b9f20f01ed2cee73c2cd53a;nobranch=1" +SRC_URI += "git://review.tizen.org/platform/core/appfw/message-port-dbus;tag=b95c605d610b89486ce93e74461df0ac09e3e837;nobranch=1" BBCLASSEXTEND += " native " diff --git a/meta-tizen/recipes-tizen/meta-common/meta-common_git.bb b/meta-tizen/recipes-tizen/meta-common/meta-common_git.bb index b4a2a8f..5e7269c 100644 --- a/meta-tizen/recipes-tizen/meta-common/meta-common_git.bb +++ b/meta-tizen/recipes-tizen/meta-common/meta-common_git.bb @@ -4,7 +4,7 @@ PRIORITY = "10" LIC_FILES_CHKSUM ??= "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" -SRC_URI += "git://review.tizen.org/profile/common/meta;tag=ebbc2b97e4bfb99afbab1ec7741c835e4f9161b7;nobranch=1" +SRC_URI += "git://review.tizen.org/profile/common/meta;tag=591fbbd9b1239c9670fc25b84adbfa42d43b500c;nobranch=1" BBCLASSEXTEND += " native " diff --git a/meta-tizen/recipes-tizen/meta-generic/meta-generic.inc b/meta-tizen/recipes-tizen/meta-generic/meta-generic.inc index d3114b0..1c85130 100644 --- a/meta-tizen/recipes-tizen/meta-generic/meta-generic.inc +++ b/meta-tizen/recipes-tizen/meta-generic/meta-generic.inc @@ -12,6 +12,10 @@ inherit autotools-brokensep BBCLASSEXTEND = "" PROVIDES = "" +#PROVIDES by meta-generic-adaptation +PROVIDES += "meta-generic-adaptation" + + #PROVIDES by meta-generic @@ -71,15 +75,21 @@ do_install() { } PACKAGES = "${PN}-dbg ${PN}-doc ${PN}-locale" +PACKAGES += " meta-generic-adaptation " PACKAGES += " meta-generic " +meta-generic-adaptation_files = "" +meta-generic-adaptation_files += "${sysconfdir}/profile.d/generic-adaptation.sh" + meta-generic_files = "" meta-generic_files += "${prefix}/share/package-groups/generic/*.yaml" meta-generic_files += "${prefix}/share/image-configurations/generic/scripts" MANIFESTFILES_${PN} = "meta-generic.manifest" +FILES_${PN}-adaptation = "${meta-generic-adaptation_files}" FILES_${PN} = "${meta-generic_files}" +PKG_meta-generic-adaptation= "meta-generic-adaptation" PKG_meta-generic= "meta-generic" require meta-generic-extraconf.inc diff --git a/meta-tizen/recipes-tizen/meta-generic/meta-generic_git.bb b/meta-tizen/recipes-tizen/meta-generic/meta-generic_git.bb index cae73ae..905a856 100644 --- a/meta-tizen/recipes-tizen/meta-generic/meta-generic_git.bb +++ b/meta-tizen/recipes-tizen/meta-generic/meta-generic_git.bb @@ -4,7 +4,7 @@ PRIORITY = "10" LIC_FILES_CHKSUM ??= "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" -SRC_URI += "git://review.tizen.org/platform/upstream/meta-generic;tag=e004cf9375570711deb255f5ccc1b774b204d4d7;nobranch=1" +SRC_URI += "git://review.tizen.org/platform/upstream/meta-generic;tag=b7d3ced2f1ab861d84626c24e2c4912730ca4b08;nobranch=1" BBCLASSEXTEND += " native " diff --git a/meta-tizen/recipes-tizen/phoned/phoned.inc b/meta-tizen/recipes-tizen/phoned/phoned.inc index 74d79a1..49a934f 100644 --- a/meta-tizen/recipes-tizen/phoned/phoned.inc +++ b/meta-tizen/recipes-tizen/phoned/phoned.inc @@ -23,7 +23,6 @@ inherit tizen_cmake DEPENDS += "evolution-data-server" DEPENDS += "dbus" DEPENDS += "expat" -DEPENDS += "aul" #Replace "DEPENDS" on gettext by "inherit gettext" inherit gettext DEPENDS += "json-glib" @@ -32,6 +31,7 @@ do_prep() { cd ${S} chmod -Rf a+rX,u+w,g-w,o-w ${S} #setup -q + cp ${S}/packaging/phoned.manifest . } @@ -49,9 +49,7 @@ do_compile() { unset DISPLAY LD_AS_NEEDED=1; export LD_AS_NEEDED ; - - - export LDFLAGS+="-Wl,--rpath="${prefix}/lib/wrt-plugins" -Wl,--as-needed" + export LDFLAGS="${LDFLAGS} -Wl,--rpath="${prefix}/lib/wrt-plugins" -Wl,--as-needed" cmake \ @@ -65,9 +63,12 @@ do_compile() { -DCMAKE_SKIP_RPATH:BOOL=ON \ -DBUILD_SHARED_LIBS:BOOL=ON \ -DCMAKE_TOOLCHAIN_FILE=${WORKDIR}/toolchain.cmake \ - ${EXTRA_OECMAKE} . -DCMAKE_INSTALL_PREFIX=${prefix} -DENABLE_TIME_TRACER="OFF" + ${EXTRA_OECMAKE} . \ + -DCMAKE_INSTALL_PREFIX=${prefix} \ + -DENABLE_TIME_TRACER="OFF" \ + -DSYSTEMD_SERVICE_PREFIX="${systemd_unitdir}/user" - make -j16 VERBOSE=1 + oe_runmake -j16 VERBOSE=1 @@ -109,6 +110,7 @@ phoned_files += "${prefix}/bin/phoned" phoned_files += "${prefix}/share/dbus-1/services/org.tizen.phone.service" phoned_files += "${systemd_unitdir}/user/phoned.service" phoned_files += "${systemd_unitdir}/user/weston.target.wants/phoned.service" +MANIFESTFILES_${PN} = "phoned.manifest" FILES_${PN} = "${phoned_files}" diff --git a/meta-tizen/recipes-tizen/phoned/phoned_git.bb b/meta-tizen/recipes-tizen/phoned/phoned_git.bb index bbc9ed2..73aff27 100644 --- a/meta-tizen/recipes-tizen/phoned/phoned_git.bb +++ b/meta-tizen/recipes-tizen/phoned/phoned_git.bb @@ -4,7 +4,7 @@ PRIORITY = "10" LIC_FILES_CHKSUM ??= "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" -SRC_URI += "git://review.tizen.org/profile/ivi/phoned;tag=9bc11b7607090e103bf0f87a83d06f4f637bea46;nobranch=1" +SRC_URI += "git://review.tizen.org/profile/ivi/phoned;tag=7e698bc380b479faec28ffd192058ee162de9cb5;nobranch=1" BBCLASSEXTEND += " native " -- 2.7.4