From 8bec59db35f21f95e713e2ba4765a45ebf1a429f Mon Sep 17 00:00:00 2001 From: Ronan Le Martret Date: Wed, 19 Nov 2014 15:37:41 +0100 Subject: [PATCH] update packages Change-Id: I9eb3e0a4134d8cb715467e326b4c2307f0671b61 --- .../pkgmgr-info/pkgmgr-info_git.bb | 2 +- .../nfc-manager-neard/nfc-manager-neard.inc | 11 ++++++----- .../nfc-manager-neard/nfc-manager-neard_git.bb | 2 +- .../recipes-devtools/meta-generic/meta-generic_git.bb | 2 +- meta-tizen-common-base/recipes-graphics/weston/weston.inc | 6 +++++- meta-tizen-common-base/recipes-graphics/weston/weston_git.bb | 2 +- .../recipes-messaging/msg-service/msg-service.inc | 8 ++------ .../recipes-messaging/msg-service/msg-service_git.bb | 2 +- .../recipes-graphics/weston-common/weston-common_git.bb | 2 +- .../recipes-webframework/wrt-widgets/wrt-widgets_git.bb | 2 +- .../recipes-framework/notification/notification_git.bb | 2 +- 11 files changed, 21 insertions(+), 20 deletions(-) diff --git a/meta-tizen-common-base/recipes-application-framework/pkgmgr-info/pkgmgr-info_git.bb b/meta-tizen-common-base/recipes-application-framework/pkgmgr-info/pkgmgr-info_git.bb index 791c0f2..1cd4e68 100644 --- a/meta-tizen-common-base/recipes-application-framework/pkgmgr-info/pkgmgr-info_git.bb +++ b/meta-tizen-common-base/recipes-application-framework/pkgmgr-info/pkgmgr-info_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/pkgmgr-info;tag=ea3c01c9cf3c3fa47de3598fcb17c6cf8f56adcb;nobranch=1" +SRC_URI += "git://review.tizen.org/platform/core/appfw/pkgmgr-info;tag=608fcd4aaf647da75df552f495d913468d377917;nobranch=1" BBCLASSEXTEND += " native " diff --git a/meta-tizen-common-base/recipes-connectivity/nfc-manager-neard/nfc-manager-neard.inc b/meta-tizen-common-base/recipes-connectivity/nfc-manager-neard/nfc-manager-neard.inc index b94de96..9f3fc55 100644 --- a/meta-tizen-common-base/recipes-connectivity/nfc-manager-neard/nfc-manager-neard.inc +++ b/meta-tizen-common-base/recipes-connectivity/nfc-manager-neard/nfc-manager-neard.inc @@ -133,9 +133,10 @@ do_install() { find ${D} -regex ".*\.la$" | xargs rm -f -- find ${D} -regex ".*\.a$" | xargs rm -f -- - mkdir -p ${D}${prefix}/lib/systemd/system/multi-user.target.wants - cp -af ${S}/packaging/nfc-manager-neard.service ${D}${prefix}/lib/systemd/system/ - ln -s ../nfc-manager-neard.service ${D}${prefix}/lib/systemd/system/multi-user.target.wants/nfc-manager-neard.service + install -d ${D}${systemd_unitdir}/system + install -d ${D}${systemd_unitdir}/system/multi-user.target.wants/ + install -m 644 ${S}/packaging/nfc-manager-neard.service ${D}${systemd_unitdir}/system/nfc-manager-neard.service + ln -s ../nfc-manager-neard.service ${D}${systemd_unitdir}/system/multi-user.target.wants/nfc-manager-neard.service } @@ -198,8 +199,8 @@ nfc-client-lib-neard-dev_files += "${prefix}/include/nfc/*.h" nfc-manager-neard_files = "" nfc-manager-neard_files += "${prefix}/bin/nfc-manager-daemon" -nfc-manager-neard_files += "${prefix}/lib/systemd/system/nfc-manager-neard.service" -nfc-manager-neard_files += "${prefix}/lib/systemd/system/multi-user.target.wants/nfc-manager-neard.service" +nfc-manager-neard_files += "${systemd_unitdir}/system/nfc-manager-neard.service" +nfc-manager-neard_files += "${systemd_unitdir}/system/multi-user.target.wants/nfc-manager-neard.service" nfc-manager-neard_files += "${prefix}/share/dbus-1/system-services/org.tizen.NetNfcService.service" nfc-manager-neard_files += "${prefix}/share/packages/nfc-manager.xml" nfc-manager-neard_files += "${prefix}/share/nfc-manager-daemon/sounds/*" diff --git a/meta-tizen-common-base/recipes-connectivity/nfc-manager-neard/nfc-manager-neard_git.bb b/meta-tizen-common-base/recipes-connectivity/nfc-manager-neard/nfc-manager-neard_git.bb index bebfdb6..85ef8b5 100644 --- a/meta-tizen-common-base/recipes-connectivity/nfc-manager-neard/nfc-manager-neard_git.bb +++ b/meta-tizen-common-base/recipes-connectivity/nfc-manager-neard/nfc-manager-neard_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/connectivity/nfc-manager-neard;tag=ac694692b7c658230610cee0e9e25012fed6c99f;nobranch=1" +SRC_URI += "git://review.tizen.org/platform/core/connectivity/nfc-manager-neard;tag=4763420ab0df18745422e25ec8e7d71f736b8449;nobranch=1" BBCLASSEXTEND += " native " diff --git a/meta-tizen-common-base/recipes-devtools/meta-generic/meta-generic_git.bb b/meta-tizen-common-base/recipes-devtools/meta-generic/meta-generic_git.bb index c48dbe9..a148936 100644 --- a/meta-tizen-common-base/recipes-devtools/meta-generic/meta-generic_git.bb +++ b/meta-tizen-common-base/recipes-devtools/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=72a4d5300da9073826427213bad09ffc53d9934e;nobranch=1" +SRC_URI += "git://review.tizen.org/platform/upstream/meta-generic;tag=b197a0da56f6d41c67da40a7b268edaca71f072b;nobranch=1" BBCLASSEXTEND += " native " diff --git a/meta-tizen-common-base/recipes-graphics/weston/weston.inc b/meta-tizen-common-base/recipes-graphics/weston/weston.inc index 92687bf..b062515 100644 --- a/meta-tizen-common-base/recipes-graphics/weston/weston.inc +++ b/meta-tizen-common-base/recipes-graphics/weston/weston.inc @@ -95,7 +95,7 @@ do_compile() { } -EXTRA_OECONF += " --disable-static --disable-setuid-install --enable-simple-clients --enable-clients --disable-libunwind --disable-xwayland --disable-xwayland-test --disable-x11-compositor --disable-rpi-compositor " +EXTRA_OECONF += " --disable-static --disable-setuid-install --enable-simple-clients --enable-clients --disable-libunwind --disable-xwayland --disable-xwayland-test --disable-x11-compositor --disable-rpi-compositor --with-cairo=glesv2 " do_install() { export RPM_BUILD_ROOT=${D} @@ -121,6 +121,8 @@ do_install() { install -m 755 weston-simple-touch ${D}${prefix}/bin install -m 755 weston-simple-shm ${D}${prefix}/bin install -m 755 weston-simple-egl ${D}${prefix}/bin + install -m 755 weston-nested-client ${D}${prefix}/bin + install -m 755 weston-nested ${D}${prefix}/bin install -m 755 weston-flower ${D}${prefix}/bin install -m 755 weston-image ${D}${prefix}/bin install -m 755 weston-cliptest ${D}${prefix}/bin @@ -184,6 +186,8 @@ weston-clients_files = "" weston-clients_files += "${prefix}/bin/weston-simple-touch" weston-clients_files += "${prefix}/bin/weston-simple-shm" weston-clients_files += "${prefix}/bin/weston-simple-egl" +weston-clients_files += "${prefix}/bin/weston-nested-client" +weston-clients_files += "${prefix}/bin/weston-nested" weston-clients_files += "${prefix}/bin/weston-flower" weston-clients_files += "${prefix}/bin/weston-image" weston-clients_files += "${prefix}/bin/weston-cliptest" diff --git a/meta-tizen-common-base/recipes-graphics/weston/weston_git.bb b/meta-tizen-common-base/recipes-graphics/weston/weston_git.bb index 0c1ad5a..7bfeace 100644 --- a/meta-tizen-common-base/recipes-graphics/weston/weston_git.bb +++ b/meta-tizen-common-base/recipes-graphics/weston/weston_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/weston;tag=1884117b59372e9b9fb80a820ece08302aea1eab;nobranch=1" +SRC_URI += "git://review.tizen.org/platform/upstream/weston;tag=1a5eb4a432485c9c78b937f45115da36979921cf;nobranch=1" BBCLASSEXTEND += " native " diff --git a/meta-tizen-common-base/recipes-messaging/msg-service/msg-service.inc b/meta-tizen-common-base/recipes-messaging/msg-service/msg-service.inc index d1a411f..f86709f 100644 --- a/meta-tizen-common-base/recipes-messaging/msg-service/msg-service.inc +++ b/meta-tizen-common-base/recipes-messaging/msg-service/msg-service.inc @@ -1,8 +1,8 @@ DESCRIPTION = "Messaging Framework Library" HOMEPAGE = "http://nohomepage.org" SECTION = "System/Libraries" -LICENSE = "Flora-1.1" -PV = "0.9.3" +LICENSE = "Apache-2.0" +PV = "0.9.4" SRC_URI = "" @@ -238,12 +238,10 @@ PACKAGES += " msg-service-dev " PACKAGES += " msg-service " mms-plugin_files = "" -mms-plugin_files += "Flora License v1.1 LICENSE.Flora" mms-plugin_files += "${prefix}/lib/libmsg_mms_plugin.so" MANIFESTFILES_mms-plugin = "mms-plugin.manifest" msg-service-tools_files = "" -msg-service-tools_files += "Flora License v1.1 LICENSE.Flora" msg-service-tools_files += "${prefix}/bin/msg-helper" msg-service-tools_files += "${prefix}/bin/msg-server" msg-service-tools_files += "${prefix}/share/media/Sherbet.wav" @@ -260,7 +258,6 @@ msg-service-tools_files += "/var/log/msgfw" MANIFESTFILES_${PN}-tools = "msg-service-tools.manifest" sms-plugin_files = "" -sms-plugin_files += "Flora License v1.1 LICENSE.Flora" sms-plugin_files += "${prefix}/lib/libmsg_sms_plugin.so" MANIFESTFILES_sms-plugin = "sms-plugin.manifest" @@ -271,7 +268,6 @@ msg-service-dev_files += "${prefix}/include/msg-service/*" MANIFESTFILES_${PN}-dev = "msg-service-devel.manifest" msg-service_files = "" -msg-service_files += "Flora License v1.1 LICENSE.Flora" msg-service_files += "${prefix}/lib/libmsg_plugin_manager.so" msg-service_files += "${prefix}/lib/libmsg_mapi.so.*" msg-service_files += "${prefix}/lib/libmsg_framework_handler.so" diff --git a/meta-tizen-common-base/recipes-messaging/msg-service/msg-service_git.bb b/meta-tizen-common-base/recipes-messaging/msg-service/msg-service_git.bb index 23e67bf..19e4317 100644 --- a/meta-tizen-common-base/recipes-messaging/msg-service/msg-service_git.bb +++ b/meta-tizen-common-base/recipes-messaging/msg-service/msg-service_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/messaging/msg-service;tag=da44d306ea4f55e6a7b75c96783bb7c61cd75c8a;nobranch=1" +SRC_URI += "git://review.tizen.org/platform/core/messaging/msg-service;tag=3e2fbed353a12948ed01610a5910bb967cad1445;nobranch=1" BBCLASSEXTEND += " native " diff --git a/meta-tizen-common-demo/recipes-graphics/weston-common/weston-common_git.bb b/meta-tizen-common-demo/recipes-graphics/weston-common/weston-common_git.bb index 563a816..f4aabac 100644 --- a/meta-tizen-common-demo/recipes-graphics/weston-common/weston-common_git.bb +++ b/meta-tizen-common-demo/recipes-graphics/weston-common/weston-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/weston-common;tag=b8043731fa1a64e9abba5edb685295b1dae1ee14;nobranch=1" +SRC_URI += "git://review.tizen.org/profile/common/weston-common;tag=0e6dd7341730320a5e5f93f6829b396c9a3bf779;nobranch=1" BBCLASSEXTEND += " native " diff --git a/meta-tizen-common-demo/recipes-webframework/wrt-widgets/wrt-widgets_git.bb b/meta-tizen-common-demo/recipes-webframework/wrt-widgets/wrt-widgets_git.bb index 2764cac..3e90010 100644 --- a/meta-tizen-common-demo/recipes-webframework/wrt-widgets/wrt-widgets_git.bb +++ b/meta-tizen-common-demo/recipes-webframework/wrt-widgets/wrt-widgets_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/wrt-widgets;tag=b7c5bf1ce8f51ad5ca50ba93e612579b2d451ecd;nobranch=1" +SRC_URI += "git://review.tizen.org/profile/common/wrt-widgets;tag=63c2d78d4a3a9e40f9193fc350ac18a62a41b9e9;nobranch=1" BBCLASSEXTEND += " native " diff --git a/meta-tizen-ivi/recipes-framework/notification/notification_git.bb b/meta-tizen-ivi/recipes-framework/notification/notification_git.bb index 8c59d54..66b7e22 100644 --- a/meta-tizen-ivi/recipes-framework/notification/notification_git.bb +++ b/meta-tizen-ivi/recipes-framework/notification/notification_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/api/notification;tag=38111fc05f2895d4bdaa7f2bcc5e495564cb0095;nobranch=1" +SRC_URI += "git://review.tizen.org/platform/core/api/notification;tag=ca4ab014da6920b269d1792f8fdb84cc57885f2b;nobranch=1" BBCLASSEXTEND += " native " -- 2.7.4