From b1dde3452a08bdd3835bedc323fabe747318e82d Mon Sep 17 00:00:00 2001 From: Ronan Le Martret Date: Thu, 2 Oct 2014 11:28:11 +0200 Subject: [PATCH] meta-tizen: update recipes Change-Id: I919bf8edb615f6cc915d96cf8b83ef955491f4ba (From meta-tizen rev: 1ec729d428c5dd61d6ee8195eccacc7461eafd36) Signed-off-by: Ronan Le Martret Signed-off-by: Patrick Ohly --- .../Modello-AMBSimulator/Modello-AMBSimulator.inc | 5 +++-- .../Modello-Appmanager/Modello-Appmanager.inc | 5 +++-- .../Modello-Dashboard/Modello-Dashboard.inc | 5 +++-- .../recipes-tizen/Modello-Hvac/Modello-Hvac.inc | 5 +++-- .../Modello-Installer-extraconf.inc | 6 +++--- .../Modello-Multimediaplayer.inc | 5 +++-- .../recipes-tizen/Modello-Nav/Modello-Nav.inc | 5 +++-- .../recipes-tizen/Modello-Phone/Modello-Phone.inc | 5 +++-- .../recipes-tizen/Modello-SDL/Modello-SDL.inc | 5 +++-- meta-tizen/recipes-tizen/ail/ail.inc | 10 ++++----- .../recipes-tizen/alarm-manager/alarm-manager.inc | 9 ++++---- .../alarm-manager/alarm-manager_git.bb | 2 +- .../audio-session-manager_git.bb | 2 +- meta-tizen/recipes-tizen/avsystem/avsystem_git.bb | 2 +- .../capi-content-media-content-extraconf.inc | 1 + .../capi-content-media-content_git.bb | 2 +- meta-tizen/recipes-tizen/crosswalk/crosswalk.inc | 5 +++-- meta-tizen/recipes-tizen/gpg2/gpg2.inc | 10 +++------ meta-tizen/recipes-tizen/gpg2/gpg2_git.bb | 2 +- meta-tizen/recipes-tizen/lemolo/lemolo_git.bb | 2 +- .../libmedia-service/libmedia-service_git.bb | 2 +- .../libmedia-thumbnail/libmedia-thumbnail_git.bb | 2 +- meta-tizen/recipes-tizen/libmm-log/libmm-log.inc | 6 +++--- .../recipes-tizen/libmm-log/libmm-log_git.bb | 2 +- .../recipes-tizen/media-server/media-server.inc | 24 +++++++++++++--------- .../recipes-tizen/media-server/media-server_git.bb | 2 +- .../recipes-tizen/msg-service/msg-service.inc | 2 -- .../recipes-tizen/msg-service/msg-service_git.bb | 2 +- 28 files changed, 72 insertions(+), 63 deletions(-) diff --git a/meta-tizen/recipes-tizen/Modello-AMBSimulator/Modello-AMBSimulator.inc b/meta-tizen/recipes-tizen/Modello-AMBSimulator/Modello-AMBSimulator.inc index c019d9d..24378c5 100644 --- a/meta-tizen/recipes-tizen/Modello-AMBSimulator/Modello-AMBSimulator.inc +++ b/meta-tizen/recipes-tizen/Modello-AMBSimulator/Modello-AMBSimulator.inc @@ -63,9 +63,9 @@ do_install() { mkdir -p ${D} rm -rf ${D} - mkdir -p ${D}%{TZ_SYS_APP_PREINSTALL} + mkdir -p ${D}/opt/usr/apps/.preinstallWidgets mkdir -p ${D}${prefix}/share/Modello/Common/icons - zip -r ${D}%{TZ_SYS_APP_PREINSTALL}/Modello-AMBSimulator.wgt config.xml manifest.json css AMBSimulator_icon.png index.html js templates + zip -r ${D}/opt/usr/apps/.preinstallWidgets/Modello-AMBSimulator.wgt config.xml manifest.json css AMBSimulator_icon.png index.html js templates install -m 0644 AMBSimulator_icon.png ${D}${prefix}/share/Modello/Common/icons @@ -75,6 +75,7 @@ PACKAGES = "${PN}-dbg ${PN}-doc ${PN}-locale" PACKAGES += " Modello-AMBSimulator " Modello-AMBSimulator_files = "" +Modello-AMBSimulator_files += "/opt/usr/apps/.preinstallWidgets/Modello-AMBSimulator.wgt" Modello-AMBSimulator_files += "${prefix}/share/Modello/Common/icons/AMBSimulator_icon.png" MANIFESTFILES_${PN} = "Modello-AMBSimulator.manifest" diff --git a/meta-tizen/recipes-tizen/Modello-Appmanager/Modello-Appmanager.inc b/meta-tizen/recipes-tizen/Modello-Appmanager/Modello-Appmanager.inc index a752b69..a89c139 100644 --- a/meta-tizen/recipes-tizen/Modello-Appmanager/Modello-Appmanager.inc +++ b/meta-tizen/recipes-tizen/Modello-Appmanager/Modello-Appmanager.inc @@ -63,9 +63,9 @@ do_install() { mkdir -p ${D} rm -rf ${D} - mkdir -p ${D}%{TZ_SYS_APP_PREINSTALL} + mkdir -p ${D}/opt/usr/apps/.preinstallWidgets mkdir -p ${D}${prefix}/share/Modello/Common/icons - zip -r ${D}%{TZ_SYS_APP_PREINSTALL}/Modello-Appmanager.wgt config.xml css AppManager_icon.png index.html js templates + zip -r ${D}/opt/usr/apps/.preinstallWidgets/Modello-Appmanager.wgt config.xml css AppManager_icon.png index.html js templates install -m 0644 AppManager_icon.png ${D}${prefix}/share/Modello/Common/icons @@ -75,6 +75,7 @@ PACKAGES = "${PN}-dbg ${PN}-doc ${PN}-locale" PACKAGES += " Modello-Appmanager " Modello-Appmanager_files = "" +Modello-Appmanager_files += "/opt/usr/apps/.preinstallWidgets/Modello-Appmanager.wgt" Modello-Appmanager_files += "${prefix}/share/Modello/Common/icons/AppManager_icon.png" MANIFESTFILES_${PN} = "Modello-Appmanager.manifest" diff --git a/meta-tizen/recipes-tizen/Modello-Dashboard/Modello-Dashboard.inc b/meta-tizen/recipes-tizen/Modello-Dashboard/Modello-Dashboard.inc index c384cea..a6fdd6b 100644 --- a/meta-tizen/recipes-tizen/Modello-Dashboard/Modello-Dashboard.inc +++ b/meta-tizen/recipes-tizen/Modello-Dashboard/Modello-Dashboard.inc @@ -63,9 +63,9 @@ do_install() { mkdir -p ${D} rm -rf ${D} - mkdir -p ${D}%{TZ_SYS_APP_PREINSTALL} + mkdir -p ${D}/opt/usr/apps/.preinstallWidgets mkdir -p ${D}${prefix}/share/Modello/Common/icons - zip -r ${D}%{TZ_SYS_APP_PREINSTALL}/Modello-Dashboard.wgt components config.xml css Dashboard_icon.png index.html js + zip -r ${D}/opt/usr/apps/.preinstallWidgets/Modello-Dashboard.wgt components config.xml css Dashboard_icon.png index.html js install -m 0644 Dashboard_icon.png ${D}${prefix}/share/Modello/Common/icons @@ -75,6 +75,7 @@ PACKAGES = "${PN}-dbg ${PN}-doc ${PN}-locale" PACKAGES += " Modello-Dashboard " Modello-Dashboard_files = "" +Modello-Dashboard_files += "/opt/usr/apps/.preinstallWidgets/Modello-Dashboard.wgt" Modello-Dashboard_files += "${prefix}/share/Modello/Common/icons/Dashboard_icon.png" MANIFESTFILES_${PN} = "Modello-Dashboard.manifest" diff --git a/meta-tizen/recipes-tizen/Modello-Hvac/Modello-Hvac.inc b/meta-tizen/recipes-tizen/Modello-Hvac/Modello-Hvac.inc index fa95ef1..a9768dc 100644 --- a/meta-tizen/recipes-tizen/Modello-Hvac/Modello-Hvac.inc +++ b/meta-tizen/recipes-tizen/Modello-Hvac/Modello-Hvac.inc @@ -63,9 +63,9 @@ do_install() { mkdir -p ${D} rm -rf ${D} - mkdir -p ${D}%{TZ_SYS_APP_PREINSTALL} + mkdir -p ${D}/opt/usr/apps/.preinstallWidgets mkdir -p ${D}${prefix}/share/Modello/Common/icons - zip -r ${D}%{TZ_SYS_APP_PREINSTALL}/Modello-Hvac.wgt config.xml css HVAC_icon.png index.html js + zip -r ${D}/opt/usr/apps/.preinstallWidgets/Modello-Hvac.wgt config.xml css HVAC_icon.png index.html js install -m 0644 HVAC_icon.png ${D}${prefix}/share/Modello/Common/icons @@ -75,6 +75,7 @@ PACKAGES = "${PN}-dbg ${PN}-doc ${PN}-locale" PACKAGES += " Modello-Hvac " Modello-Hvac_files = "" +Modello-Hvac_files += "/opt/usr/apps/.preinstallWidgets/Modello-Hvac.wgt" Modello-Hvac_files += "${prefix}/share/Modello/Common/icons/HVAC_icon.png" FILES_${PN} = "${Modello-Hvac_files}" 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 3a36038..293c055 100644 --- a/meta-tizen/recipes-tizen/Modello-Installer/Modello-Installer-extraconf.inc +++ b/meta-tizen/recipes-tizen/Modello-Installer/Modello-Installer-extraconf.inc @@ -13,6 +13,6 @@ do_install_append() { ln -sf ../modello-installer-postinst.service ${D}${systemd_unitdir}/system/multi-user.target.wants/modello-installer-postinst.service } -FILES_Modello-Installer-xwalk += "${prefix}/share/modello-installer/modello-installer-postinst.sh" -FILES_Modello-Installer-xwalk += "${systemd_unitdir}/system/modello-installer-postinst.service" -FILES_Modello-Installer-xwalk += "${systemd_unitdir}/system/multi-user.target.wants/modello-installer-postinst.service" +FILES_${PN}-xwalk += "${prefix}/share/modello-installer/modello-installer-postinst.sh" +FILES_${PN}-xwalk += "${systemd_unitdir}/system/modello-installer-postinst.service" +FILES_${PN}-xwalk += "${systemd_unitdir}/system/multi-user.target.wants/modello-installer-postinst.service" diff --git a/meta-tizen/recipes-tizen/Modello-Multimediaplayer/Modello-Multimediaplayer.inc b/meta-tizen/recipes-tizen/Modello-Multimediaplayer/Modello-Multimediaplayer.inc index 193d1ae..ca8f789 100644 --- a/meta-tizen/recipes-tizen/Modello-Multimediaplayer/Modello-Multimediaplayer.inc +++ b/meta-tizen/recipes-tizen/Modello-Multimediaplayer/Modello-Multimediaplayer.inc @@ -63,9 +63,9 @@ do_install() { mkdir -p ${D} rm -rf ${D} - mkdir -p ${D}%{TZ_SYS_APP_PREINSTALL} + mkdir -p ${D}/opt/usr/apps/.preinstallWidgets mkdir -p ${D}${prefix}/share/Modello/Common/icons - zip -r ${D}%{TZ_SYS_APP_PREINSTALL}/Modello-Multimediaplayer.wgt components config.xml css MultimediaPlayer_icon.png images index.html js + zip -r ${D}/opt/usr/apps/.preinstallWidgets/Modello-Multimediaplayer.wgt components config.xml css MultimediaPlayer_icon.png images index.html js install -m 0644 MultimediaPlayer_icon.png ${D}${prefix}/share/Modello/Common/icons @@ -75,6 +75,7 @@ PACKAGES = "${PN}-dbg ${PN}-doc ${PN}-locale" PACKAGES += " Modello-Multimediaplayer " Modello-Multimediaplayer_files = "" +Modello-Multimediaplayer_files += "/opt/usr/apps/.preinstallWidgets/Modello-Multimediaplayer.wgt" Modello-Multimediaplayer_files += "${prefix}/share/Modello/Common/icons/MultimediaPlayer_icon.png" MANIFESTFILES_${PN} = "Modello-Multimediaplayer.manifest" diff --git a/meta-tizen/recipes-tizen/Modello-Nav/Modello-Nav.inc b/meta-tizen/recipes-tizen/Modello-Nav/Modello-Nav.inc index b3f6684..36d1bb6 100644 --- a/meta-tizen/recipes-tizen/Modello-Nav/Modello-Nav.inc +++ b/meta-tizen/recipes-tizen/Modello-Nav/Modello-Nav.inc @@ -63,9 +63,9 @@ do_install() { mkdir -p ${D} rm -rf ${D} - mkdir -p ${D}%{TZ_SYS_APP_PREINSTALL} + mkdir -p ${D}/opt/usr/apps/.preinstallWidgets mkdir -p ${D}${prefix}/share/Modello/Common/icons - zip -r ${D}%{TZ_SYS_APP_PREINSTALL}/Modello-Nav.wgt config.xml css Navigation_icon.png images index.html js templates + zip -r ${D}/opt/usr/apps/.preinstallWidgets/Modello-Nav.wgt config.xml css Navigation_icon.png images index.html js templates install -m 0644 Navigation_icon.png ${D}${prefix}/share/Modello/Common/icons @@ -75,6 +75,7 @@ PACKAGES = "${PN}-dbg ${PN}-doc ${PN}-locale" PACKAGES += " Modello-Nav " Modello-Nav_files = "" +Modello-Nav_files += "/opt/usr/apps/.preinstallWidgets/Modello-Nav.wgt" Modello-Nav_files += "${prefix}/share/Modello/Common/icons/Navigation_icon.png" MANIFESTFILES_${PN} = "Modello-Nav.manifest" diff --git a/meta-tizen/recipes-tizen/Modello-Phone/Modello-Phone.inc b/meta-tizen/recipes-tizen/Modello-Phone/Modello-Phone.inc index 059f7f3..6142f32 100644 --- a/meta-tizen/recipes-tizen/Modello-Phone/Modello-Phone.inc +++ b/meta-tizen/recipes-tizen/Modello-Phone/Modello-Phone.inc @@ -64,9 +64,9 @@ do_install() { mkdir -p ${D} rm -rf ${D} - mkdir -p ${D}%{TZ_SYS_APP_PREINSTALL} + mkdir -p ${D}/opt/usr/apps/.preinstallWidgets mkdir -p ${D}${prefix}/share/Modello/Common/icons - zip -r ${D}%{TZ_SYS_APP_PREINSTALL}/Modello-Phone.wgt config.xml css data Phone_icon.png index.html js templates + zip -r ${D}/opt/usr/apps/.preinstallWidgets/Modello-Phone.wgt config.xml css data Phone_icon.png index.html js templates install -m 0644 Phone_icon.png ${D}${prefix}/share/Modello/Common/icons @@ -76,6 +76,7 @@ PACKAGES = "${PN}-dbg ${PN}-doc ${PN}-locale" PACKAGES += " Modello-Phone " Modello-Phone_files = "" +Modello-Phone_files += "/opt/usr/apps/.preinstallWidgets/Modello-Phone.wgt" Modello-Phone_files += "${prefix}/share/Modello/Common/icons/Phone_icon.png" MANIFESTFILES_${PN} = "Modello-Phone.manifest" diff --git a/meta-tizen/recipes-tizen/Modello-SDL/Modello-SDL.inc b/meta-tizen/recipes-tizen/Modello-SDL/Modello-SDL.inc index 02d24b1..e52e575 100644 --- a/meta-tizen/recipes-tizen/Modello-SDL/Modello-SDL.inc +++ b/meta-tizen/recipes-tizen/Modello-SDL/Modello-SDL.inc @@ -63,9 +63,9 @@ do_install() { mkdir -p ${D} rm -rf ${D} - mkdir -p ${D}%{TZ_SYS_APP_PREINSTALL} + mkdir -p ${D}/opt/usr/apps/.preinstallWidgets mkdir -p ${D}${prefix}/share/Modello/Common/icons - zip -r ${D}%{TZ_SYS_APP_PREINSTALL}/Modello-SDL.wgt app audio config.xml css ffw SmartDeviceLink_icon.png images index.html js lib locale + zip -r ${D}/opt/usr/apps/.preinstallWidgets/Modello-SDL.wgt app audio config.xml css ffw SmartDeviceLink_icon.png images index.html js lib locale install -m 0644 SmartDeviceLink_icon.png ${D}${prefix}/share/Modello/Common/icons @@ -75,6 +75,7 @@ PACKAGES = "${PN}-dbg ${PN}-doc ${PN}-locale" PACKAGES += " Modello-SDL " Modello-SDL_files = "" +Modello-SDL_files += "/opt/usr/apps/.preinstallWidgets/Modello-SDL.wgt" Modello-SDL_files += "${prefix}/share/Modello/Common/icons/SmartDeviceLink_icon.png" MANIFESTFILES_${PN} = "Modello-SDL.manifest" diff --git a/meta-tizen/recipes-tizen/ail/ail.inc b/meta-tizen/recipes-tizen/ail/ail.inc index 416117c..63c1d5e 100644 --- a/meta-tizen/recipes-tizen/ail/ail.inc +++ b/meta-tizen/recipes-tizen/ail/ail.inc @@ -117,7 +117,7 @@ pkg_postinst_${PN}() { ldconfig # Create tizenglobalapp user needed for global installation - useradd -d $D${prefix}/apps -m %TZ_SYS_GLOBALAPP_USER -r -c "system user for common applications" -g root + useradd -d $D${prefix}/apps -m tizenglobalapp -r -c "system user for common applications" -g root #mkdir -p $D${prefix}/apps/.config/xwalk-service/applications #cd $D${prefix}/apps/ #ln -s .config/xwalk-service/applications/ @@ -140,10 +140,10 @@ pkg_postinst_${PN}() { chsmack -a '*' $D${prefix}/share/applications chmod g+w $D${prefix}/share/applications chmod g+w $D${prefix}/share/applications - chown %TZ_SYS_GLOBALAPP_USER:root $D${prefix}/share/applications - chown %TZ_SYS_GLOBALAPP_USER:root $D${prefix}/share/applications - chown %TZ_SYS_GLOBALAPP_USER:root $D${prefix}/apps - chown %TZ_SYS_GLOBALAPP_USER:root $D${prefix}/dbspace + chown tizenglobalapp:root $D${prefix}/share/applications + chown tizenglobalapp:root $D${prefix}/share/applications + chown tizenglobalapp:root $D${prefix}/apps + chown tizenglobalapp:root $D${prefix}/dbspace ail_initdb 2>/dev/null chsmack -a '*' $D${prefix}/dbspace/.app_info.db* diff --git a/meta-tizen/recipes-tizen/alarm-manager/alarm-manager.inc b/meta-tizen/recipes-tizen/alarm-manager/alarm-manager.inc index 70e1aa6..899e5d5 100644 --- a/meta-tizen/recipes-tizen/alarm-manager/alarm-manager.inc +++ b/meta-tizen/recipes-tizen/alarm-manager/alarm-manager.inc @@ -44,16 +44,17 @@ DEPENDS += "dlog" DEPENDS += "dbus" DEPENDS += "app-svc" DEPENDS += "tizen-platform-config" -DEPENDS += "aul" +inherit pkgconfig DEPENDS += "bundle" -DEPENDS += "glib-2.0" +DEPENDS += "aul" DEPENDS += "system-server" -DEPENDS += "libslp-db-util" +DEPENDS += "dbus-glib" DEPENDS += "security-server" DEPENDS += "heynoti" +DEPENDS += "glib-2.0" DEPENDS += "libtapi" DEPENDS += "vconf" -DEPENDS += "dbus-glib" +DEPENDS += "libslp-db-util" do_prep() { cd ${S} diff --git a/meta-tizen/recipes-tizen/alarm-manager/alarm-manager_git.bb b/meta-tizen/recipes-tizen/alarm-manager/alarm-manager_git.bb index 211bb09..67eef8a 100644 --- a/meta-tizen/recipes-tizen/alarm-manager/alarm-manager_git.bb +++ b/meta-tizen/recipes-tizen/alarm-manager/alarm-manager_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/alarm-manager;tag=19baeb3cdc026c400eef251ab4df53d2c3c05cf9;nobranch=1" +SRC_URI += "git://review.tizen.org/platform/core/appfw/alarm-manager;tag=b8807e9c4192e960c4abe2002cbde3e8d280fad4;nobranch=1" BBCLASSEXTEND += " native " diff --git a/meta-tizen/recipes-tizen/audio-session-manager/audio-session-manager_git.bb b/meta-tizen/recipes-tizen/audio-session-manager/audio-session-manager_git.bb index 74c00ee..7158b61 100644 --- a/meta-tizen/recipes-tizen/audio-session-manager/audio-session-manager_git.bb +++ b/meta-tizen/recipes-tizen/audio-session-manager/audio-session-manager_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/multimedia/audio-session-manager;tag=ee4096c72a636cd1112a62903fefb0432e720bea;nobranch=1" +SRC_URI += "git://review.tizen.org/platform/core/multimedia/audio-session-manager;tag=e3971547dc8877cb20ab39f5e437f5dc40a275a0;nobranch=1" BBCLASSEXTEND += " native " diff --git a/meta-tizen/recipes-tizen/avsystem/avsystem_git.bb b/meta-tizen/recipes-tizen/avsystem/avsystem_git.bb index af6b883..339db3b 100644 --- a/meta-tizen/recipes-tizen/avsystem/avsystem_git.bb +++ b/meta-tizen/recipes-tizen/avsystem/avsystem_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/multimedia/avsystem;tag=72435ebdb656183ee0b74c8232757498987fe34a;nobranch=1" +SRC_URI += "git://review.tizen.org/platform/core/multimedia/avsystem;tag=e2bc7b88d123b0ff997061e9a4998106f7f5c3f3;nobranch=1" BBCLASSEXTEND += " native " diff --git a/meta-tizen/recipes-tizen/capi-content-media-content/capi-content-media-content-extraconf.inc b/meta-tizen/recipes-tizen/capi-content-media-content/capi-content-media-content-extraconf.inc index e69de29..a24e60e 100644 --- a/meta-tizen/recipes-tizen/capi-content-media-content/capi-content-media-content-extraconf.inc +++ b/meta-tizen/recipes-tizen/capi-content-media-content/capi-content-media-content-extraconf.inc @@ -0,0 +1 @@ +export LD_AS_NEEDED = "1" \ No newline at end of file diff --git a/meta-tizen/recipes-tizen/capi-content-media-content/capi-content-media-content_git.bb b/meta-tizen/recipes-tizen/capi-content-media-content/capi-content-media-content_git.bb index 6359a28..ac972a6 100644 --- a/meta-tizen/recipes-tizen/capi-content-media-content/capi-content-media-content_git.bb +++ b/meta-tizen/recipes-tizen/capi-content-media-content/capi-content-media-content_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/media-content;tag=49cf7dead7122d4a475a6cfd5f7bc8959a14865f;nobranch=1" +SRC_URI += "git://review.tizen.org/platform/core/api/media-content;tag=af69336d70625b89d376c9b1fa90225eb2deed95;nobranch=1" BBCLASSEXTEND += " native " diff --git a/meta-tizen/recipes-tizen/crosswalk/crosswalk.inc b/meta-tizen/recipes-tizen/crosswalk/crosswalk.inc index 70ff25e..35d19c0 100644 --- a/meta-tizen/recipes-tizen/crosswalk/crosswalk.inc +++ b/meta-tizen/recipes-tizen/crosswalk/crosswalk.inc @@ -210,7 +210,7 @@ do_install() { # Register xwalk to the package manager. install -p -D crosswalk.xml ${D}${prefix}/share/packages/crosswalk.xml - install -p -D crosswalk.png ${D}%TZ_SYS_RW_ICONS/default/small/crosswalk.png + install -p -D crosswalk.png ${D}${prefix}/share/icons/default/small/crosswalk.png } @@ -218,7 +218,7 @@ do_install() { pkg_postinst_${PN}() { #!/bin/sh -e - mkdir -p %TZ_SYS_RO_ICONS/default/small + mkdir -p $D${prefix}/share/icons/default/small mkdir -p $D${prefix}/share/packages ln -sf $D${prefix}/lib/xwalk/libxwalk-backendlib.so /etc/package-manager/backendlib/libxpk.so ln -sf $D${prefix}/lib/xwalk/libxwalk-backendlib.so /etc/package-manager/backendlib/libwgt.so @@ -251,6 +251,7 @@ crosswalk_files += "${prefix}/lib/xwalk/xwalk.pak" crosswalk_files += "${prefix}/lib/xwalk/libxwalk-backendlib.so" crosswalk_files += "${prefix}/lib/xwalk/xwalk_backend_wrapper.sh" crosswalk_files += "${prefix}/share/packages/crosswalk.xml" +crosswalk_files += "${prefix}/share/icons/default/small/crosswalk.png" crosswalk_files += "/usr/share/dbus-1/services/org.crosswalkproject.Runtime1.service" crosswalk_files += "/usr/lib/systemd/user/xwalk.service" crosswalk_files += "${prefix}/share/xwalk/*" diff --git a/meta-tizen/recipes-tizen/gpg2/gpg2.inc b/meta-tizen/recipes-tizen/gpg2/gpg2.inc index 1061ba7..85d2ed4 100644 --- a/meta-tizen/recipes-tizen/gpg2/gpg2.inc +++ b/meta-tizen/recipes-tizen/gpg2/gpg2.inc @@ -38,6 +38,7 @@ DEPENDS += "libassuan" DEPENDS += "adns" DEPENDS += "pth" DEPENDS += "zlib" +inherit pkgconfig DEPENDS += "libgpg-error" DEPENDS_append_class-native = " automake-native" DEPENDS_append_class-target = " automake-native" @@ -72,7 +73,6 @@ do_compile() { unset DISPLAY LD_AS_NEEDED=1; export LD_AS_NEEDED ; - autoreconf -fi # build PIEs (position independent executables) for address space randomisation: PIE="-fpie" export CFLAGS="$CFLAGS ${PIE}" @@ -80,10 +80,10 @@ do_compile() { autotools_do_configure - make -j16 + oe_runmake -j16 exit 0 - make check + oe_runmake check ${D}${prefix}/bin/gpgsplit -v -p pubsplit- --uncompress