From 5ce26c157ae8dd1ccf4e3a81cbbe59180fafcd91 Mon Sep 17 00:00:00 2001 From: Ronan Le Martret Date: Wed, 24 Sep 2014 14:38:53 +0200 Subject: [PATCH] meta-tizen: update package Change-Id: I7e42ce830f8a5eaeac7af367b4a81b8319de20b8 (From meta-tizen rev: 5b81d85c9e724dc21eef20e637ac667beed2f596) Signed-off-by: Ronan Le Martret Signed-off-by: Patrick Ohly --- .../config-tizen-profiles/config-tizen-common.bb | 10 +- .../config-tizen-profiles/config-tizen-ivi.bb | 3 +- .../Modello-Appmanager/Modello-Appmanager.inc | 28 ++-- .../Modello-Appmanager/Modello-Appmanager_git.bb | 2 +- meta-tizen/recipes-tizen/ail/ail_git.bb | 2 +- .../ico-uxf-homescreen-sample-apps_git.bb | 10 -- .../ico-uxf-homescreen/ico-uxf-homescreen_git.bb | 10 -- meta-tizen/recipes-tizen/libtbm/libtbm_git.bb | 2 +- .../recipes-tizen/meta-generic/meta-generic_git.bb | 2 +- .../recipes-tizen/murphy/murphy-extraconf.inc | 138 ++-------------- meta-tizen/recipes-tizen/murphy/murphy.inc | 179 +++++++++++++-------- meta-tizen/recipes-tizen/murphy/murphy_git.bb | 2 +- 12 files changed, 148 insertions(+), 240 deletions(-) delete mode 100644 meta-tizen/recipes-tizen/ico-uxf-homescreen-sample-apps/ico-uxf-homescreen-sample-apps_git.bb delete mode 100644 meta-tizen/recipes-tizen/ico-uxf-homescreen/ico-uxf-homescreen_git.bb diff --git a/meta-tizen/recipes-image/config-tizen-profiles/config-tizen-common.bb b/meta-tizen/recipes-image/config-tizen-profiles/config-tizen-common.bb index d508214..ee4ee85 100644 --- a/meta-tizen/recipes-image/config-tizen-profiles/config-tizen-common.bb +++ b/meta-tizen/recipes-image/config-tizen-profiles/config-tizen-common.bb @@ -10,8 +10,8 @@ USERADD_PACKAGES = "${PN}" GROUPADD_PARAM_${PN} = "-g 191 display; -g 100 users; -g 1004 input; -g 190 systemd-journal; -g 54 lock; --system -g 192 weston-launch" -USERADD_PARAM_${PN} = " -d /run/display -m -u 115 -g display -G users,input,tty,display -s /bin/sh display; " -USERADD_PARAM_${PN} += " -d /home/alice -m -u 5001 -g users -G users,display -r -s /bin/sh alice; " -USERADD_PARAM_${PN} += " -d /home/bob -m -u 5002 -g users -G users,display -r -s /bin/sh bob; " -USERADD_PARAM_${PN} += " -d /home/carol -m -u 5003 -g users -G users,display -r -s /bin/sh carol; " -USERADD_PARAM_${PN} += " -d /home/guest -m -u 9999 -g users -G users,display -r -s /bin/sh guest " +USERADD_PARAM_${PN} = " -d /run/display -m -u 115 -g display -G users,input,tty,display -s /bin/sh display; " +USERADD_PARAM_${PN} += " -d /home/alice -m -u 5001 -g users -G users,display -r -s /bin/sh alice; " +USERADD_PARAM_${PN} += " -d /home/bob -m -u 5002 -g users -G users,display -r -s /bin/sh bob; " +USERADD_PARAM_${PN} += " -d /home/carol -m -u 5003 -g users -G users,display -r -s /bin/sh carol; " +USERADD_PARAM_${PN} += " -d /home/guest -m -u 9999 -g users -G users,display -r -s /bin/sh guest " diff --git a/meta-tizen/recipes-image/config-tizen-profiles/config-tizen-ivi.bb b/meta-tizen/recipes-image/config-tizen-profiles/config-tizen-ivi.bb index c5559a7..4769312 100644 --- a/meta-tizen/recipes-image/config-tizen-profiles/config-tizen-ivi.bb +++ b/meta-tizen/recipes-image/config-tizen-profiles/config-tizen-ivi.bb @@ -39,4 +39,5 @@ GROUPADD_PARAM_${PN} += "; --system -g 6026 db_wrt " -USERADD_PARAM_${PN} += " -u 5000 -d /home/app -m -g users -G users,weston-launch -r -s /bin/sh app " +USERADD_PARAM_${PN} += " -u 5000 -d /home/app -m -g users -G users,weston-launch -r -s /bin/sh app " +USERADD_PARAM_${PN} += "; -d /usr/apps -m -g root --system -s /bin/false tizenglobalapp " diff --git a/meta-tizen/recipes-tizen/Modello-Appmanager/Modello-Appmanager.inc b/meta-tizen/recipes-tizen/Modello-Appmanager/Modello-Appmanager.inc index 39fcbcb..f286cbd 100644 --- a/meta-tizen/recipes-tizen/Modello-Appmanager/Modello-Appmanager.inc +++ b/meta-tizen/recipes-tizen/Modello-Appmanager/Modello-Appmanager.inc @@ -1,7 +1,7 @@ -DESCRIPTION = "A proof of concept pure html5 UI" +DESCRIPTION = "Pure html5 UI" HOMEPAGE = "http://nohomepage.org" -SECTION = "Applications/System" -LICENSE = "Apache 2.0" +SECTION = "Automotive/Modello" +LICENSE = "Apache-2.0" SRC_URI = "" @@ -23,12 +23,14 @@ RDEPENDS_Modello_Appmanager += "Modello_Common" DEPENDS = "" #DEPENDS of Modello_Appmanager +DEPENDS += "tizen-platform-config" DEPENDS += "zip" do_prep() { cd ${S} chmod -Rf a+rX,u+w,g-w,o-w ${S} #setup -q -n Modello_Appmanager-0.0.2 + cp ${S}/packaging/Modello_Appmanager.manifest . } @@ -46,8 +48,7 @@ do_compile() { unset DISPLAY LD_AS_NEEDED=1; export LD_AS_NEEDED ; - - make wgtPkg + #empty @@ -63,15 +64,10 @@ do_install() { mkdir -p ${D} rm -rf ${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}%{TZ_SYS_APP_PREINSTALL} + 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 + install -m 0644 AppManager_icon.png ${D}${prefix}/share/Modello/Common/icons } @@ -80,8 +76,8 @@ 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 += "/opt/usr/apps/_common/icons/AppManager_icon.png" +Modello_Appmanager_files += "${prefix}/share/Modello/Common/icons/AppManager_icon.png" +MANIFESTFILES_Modello_Appmanager = "Modello_Appmanager.manifest" FILES_Modello_Appmanager = "${Modello_Appmanager_files}" 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 9060da5..80d6131 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=24feccf415a3cf9300262a3ff7cdbe316afacad1;nobranch=1" +SRC_URI += "git://review.tizen.org/profile/ivi/Modello_Appmanager;tag=96f0d6c497101b90ee5a0c91786a0cf5af88d7a0;nobranch=1" BBCLASSEXTEND += " native " diff --git a/meta-tizen/recipes-tizen/ail/ail_git.bb b/meta-tizen/recipes-tizen/ail/ail_git.bb index 7cfe299..e637298 100644 --- a/meta-tizen/recipes-tizen/ail/ail_git.bb +++ b/meta-tizen/recipes-tizen/ail/ail_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/ail;tag=b5306fc32c824c1620cb7beebeb8908d8121cac1;nobranch=1" +SRC_URI += "git://review.tizen.org/platform/core/appfw/ail;tag=7e3ef0968ba539a3c224c593ffe1d4d47cbc2ac5;nobranch=1" BBCLASSEXTEND += " native " 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 deleted file mode 100644 index 0885917..0000000 --- a/meta-tizen/recipes-tizen/ico-uxf-homescreen-sample-apps/ico-uxf-homescreen-sample-apps_git.bb +++ /dev/null @@ -1,10 +0,0 @@ -require ico-uxf-homescreen-sample-apps.inc - -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=26e72adc94c2b56d46b912a4ad4a105afca2ab31;nobranch=1" - -BBCLASSEXTEND += " native " - 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 deleted file mode 100644 index fb29409..0000000 --- a/meta-tizen/recipes-tizen/ico-uxf-homescreen/ico-uxf-homescreen_git.bb +++ /dev/null @@ -1,10 +0,0 @@ -require ico-uxf-homescreen.inc - -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=0917be365d275b9aaccf8d14b180ffa063fdc044;nobranch=1" - -BBCLASSEXTEND += " native " - diff --git a/meta-tizen/recipes-tizen/libtbm/libtbm_git.bb b/meta-tizen/recipes-tizen/libtbm/libtbm_git.bb index 9551f27..844fbae 100644 --- a/meta-tizen/recipes-tizen/libtbm/libtbm_git.bb +++ b/meta-tizen/recipes-tizen/libtbm/libtbm_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/uifw/libtbm;tag=75deaae6c2bbb793cf77186f3034caf3b1e62e77;nobranch=1" +SRC_URI += "git://review.tizen.org/platform/core/uifw/libtbm;tag=e139de0af17fcee35838afbc6947bd9f7b9c6042;nobranch=1" BBCLASSEXTEND += " native " 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 5536789..d9dc51b 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=85c5240520a4deacc863201f2ec9ed09068cdbe4;nobranch=1" +SRC_URI += "git://review.tizen.org/platform/upstream/meta-generic;tag=a0385703dfe20a676192556cff672dc4442703cb;nobranch=1" BBCLASSEXTEND += " native " diff --git a/meta-tizen/recipes-tizen/murphy/murphy-extraconf.inc b/meta-tizen/recipes-tizen/murphy/murphy-extraconf.inc index 6ec12d8..c71b2f3 100644 --- a/meta-tizen/recipes-tizen/murphy/murphy-extraconf.inc +++ b/meta-tizen/recipes-tizen/murphy/murphy-extraconf.inc @@ -1,130 +1,14 @@ -EXTRA_OECONF = " \ - --with-dynamic-plugins=domain-control,system-controller,ivi-resource-manager,resource-asm \ - --enable-gpl \ - --enable-pulse \ - --enable-glib \ - --disable-qt \ - --enable-libdbus \ - --enable-telephony \ - --enable-websockets \ - --enable-smack \ - --disable-system-controller \ - --enable-system-monitor \ - " +FILES_${PN}-dev += " /usr/include/murphy" +FILES_${PN}-dbg += " /usr/lib/murphy/plugins/.debug" -systemd_unitdir = "/usr/lib/systemd" - -do_configure_append() { - ./bootstrap - autotools_do_configure -} - -do_compile() { - cd ${S} - LANG=C - export LANG - unset DISPLAY - LD_AS_NEEDED=1; export LD_AS_NEEDED ; - - oe_runmake clean - oe_runmake -} +murphy-doc_files = "" +murphy-doc_files += "${prefix}/share/doc/murphy/AUTHORS" +murphy-doc_files += "${prefix}/share/doc/murphy/CODING-STYLE" +murphy-doc_files += "${prefix}/share/doc/murphy/ChangeLog" +murphy-doc_files += "${prefix}/share/doc/murphy/NEWS" +murphy-doc_files += "${prefix}/share/doc/murphy/README" do_install_append() { - # Remove unused directories and files - rm -rf ${D}${systemd_unitdir}/user -} - -FILES_${PN}-dev += "${prefix}/lib/libmurphy-plugin-system-monitor.so" -FILES_${PN}-dev += "${prefix}/include/murphy/resolver/resolver.h" -FILES_${PN}-dev += "${prefix}/include/murphy/core.h" -FILES_${PN}-dev += "${prefix}/include/murphy/config.h" -FILES_${PN}-dev += "${prefix}/include/murphy/common.h" -FILES_${PN}-dev += "${prefix}/include/murphy/domain-control/client.h" -FILES_${PN}-dev += "${prefix}/include/murphy/dbus/dbus-error.h" -FILES_${PN}-dev += "${prefix}/include/murphy/dbus/libdbus.h" -FILES_${PN}-dev += "${prefix}/include/murphy/dbus/dbus-libdbus.h" -FILES_${PN}-dev += "${prefix}/include/murphy/core/domain.h" -FILES_${PN}-dev += "${prefix}/include/murphy/core/method.h" -FILES_${PN}-dev += "${prefix}/include/murphy/core/context.h" -FILES_${PN}-dev += "${prefix}/include/murphy/core/auth.h" -FILES_${PN}-dev += "${prefix}/include/murphy/core/console-command.h" -FILES_${PN}-dev += "${prefix}/include/murphy/core/plugin.h" -FILES_${PN}-dev += "${prefix}/include/murphy/core/console.h" -FILES_${PN}-dev += "${prefix}/include/murphy/core/domain-types.h" -FILES_${PN}-dev += "${prefix}/include/murphy/core/event.h" -FILES_${PN}-dev += "${prefix}/include/murphy/core/scripting.h" -FILES_${PN}-dev += "${prefix}/include/murphy/core/lua-utils/funcbridge.h" -FILES_${PN}-dev += "${prefix}/include/murphy/core/lua-utils/error.h" -FILES_${PN}-dev += "${prefix}/include/murphy/core/lua-utils/lua-utils.h" -FILES_${PN}-dev += "${prefix}/include/murphy/core/lua-utils/include.h" -FILES_${PN}-dev += "${prefix}/include/murphy/core/lua-utils/strarray.h" -FILES_${PN}-dev += "${prefix}/include/murphy/core/lua-utils/object.h" -FILES_${PN}-dev += "${prefix}/include/murphy/core/lua-decision/mdb.h" -FILES_${PN}-dev += "${prefix}/include/murphy/core/lua-decision/element.h" -FILES_${PN}-dev += "${prefix}/include/murphy/core/lua-bindings/murphy.h" -FILES_${PN}-dev += "${prefix}/include/murphy/core/lua-bindings/lua-json.h" -FILES_${PN}-dev += "${prefix}/include/murphy/plugins/resource-native/libmurphy-resource/resource-private.h" -FILES_${PN}-dev += "${prefix}/include/murphy/plugins/resource-native/libmurphy-resource/resource-api.h" -FILES_${PN}-dev += "${prefix}/include/murphy/resource/protocol.h" -FILES_${PN}-dev += "${prefix}/include/murphy/resource/client-api.h" -FILES_${PN}-dev += "${prefix}/include/murphy/resource/config-api.h" -FILES_${PN}-dev += "${prefix}/include/murphy/resource/manager-api.h" -FILES_${PN}-dev += "${prefix}/include/murphy/resource/data-types.h" -FILES_${PN}-dev += "${prefix}/include/murphy/resource/common-api.h" -FILES_${PN}-dev += "${prefix}/include/murphy/common/websocklib.h" -FILES_${PN}-dev += "${prefix}/include/murphy/common/dbus-error.h" -FILES_${PN}-dev += "${prefix}/include/murphy/common/debug-info.h" -FILES_${PN}-dev += "${prefix}/include/murphy/common/mainloop.h" -FILES_${PN}-dev += "${prefix}/include/murphy/common/libdbus.h" -FILES_${PN}-dev += "${prefix}/include/murphy/common/debug.h" -FILES_${PN}-dev += "${prefix}/include/murphy/common/dbus-libdbus.h" -FILES_${PN}-dev += "${prefix}/include/murphy/common/list.h" -FILES_${PN}-dev += "${prefix}/include/murphy/common/fragbuf.h" -FILES_${PN}-dev += "${prefix}/include/murphy/common/websocket.h" -FILES_${PN}-dev += "${prefix}/include/murphy/common/refcnt.h" -FILES_${PN}-dev += "${prefix}/include/murphy/common/native-types.h" -FILES_${PN}-dev += "${prefix}/include/murphy/common/env.h" -FILES_${PN}-dev += "${prefix}/include/murphy/common/utils.h" -FILES_${PN}-dev += "${prefix}/include/murphy/common/macros.h" -FILES_${PN}-dev += "${prefix}/include/murphy/common/hashtbl.h" -FILES_${PN}-dev += "${prefix}/include/murphy/common/transport.h" -FILES_${PN}-dev += "${prefix}/include/murphy/common/mm.h" -FILES_${PN}-dev += "${prefix}/include/murphy/common/file-utils.h" -FILES_${PN}-dev += "${prefix}/include/murphy/common/json.h" -FILES_${PN}-dev += "${prefix}/include/murphy/common/msg.h" -FILES_${PN}-dev += "${prefix}/include/murphy/common/tlv.h" -FILES_${PN}-dev += "${prefix}/include/murphy/common/log.h" -FILES_${PN}-dev += "${prefix}/include/murphy/common/process.h" - -FILES_${PN} += "${prefix}/lib/libmurphy-plugin-system-monitor.so.0" -FILES_${PN} += "${prefix}/lib/libmurphy-plugin-system-monitor.so.0.0.0" -FILES_${PN} += "${prefix}/share/murphy.manifest" -FILES_${PN} += "${prefix}/share/doc/murphy/ChangeLog" -FILES_${PN} += "${prefix}/share/doc/murphy/NEWS" -FILES_${PN} += "${prefix}/share/doc/murphy/CODING-STYLE" -FILES_${PN} += "${prefix}/share/doc/murphy/README" -FILES_${PN} += "${prefix}/share/doc/murphy/AUTHORS" -FILES_${PN} += "${prefix}/share/doc/murphy/INSTALL" -FILES_${PN} += "${prefix}/share/doc/murphy/COPYING" - -FILES_${PN}-dbg += "${prefix}/lib/murphy/plugins/.debug/plugin-ivi-resource-manager.so" -FILES_${PN}-dbg += "${prefix}/lib/murphy/plugins/.debug/plugin-domain-control.so" -FILES_${PN}-dbg += "${prefix}/murphy/plugins/.debug/plugin-resource-native.so" -FILES_${PN}-dbg += "${prefix}/lib/murphy/plugins/.debug/plugin-resource-native.so" - -FILES_${PN}-glib-dev += "${prefix}/include/murphy/glib/glib-glue.h" - -FILES_${PN}-glib += "${prefix}/share/murphy-glib.manifest" - -FILES_${PN}-pulse-dev += "${prefix}/include/murphy/pulse/pulse-glue.h" - -FILES_${PN}-pulse += "${prefix}/share/murphy-pulse.manifest" - -FILES_${PN}-ecore-dev += "${prefix}/include/murphy/ecore/ecore-glue.h" - -FILES_${PN}-ecore += "${prefix}/share/murphy-ecore.manifest" - -FILES_${PN}-ivi-resource-manager += "${prefix}/share/murphy-ivi-resource-manager.manifest" - -FILES_${PN}-tests += "${prefix}/share/murphy-tests.manifest" + rm -fr ${D}${systemd_unitdir}/user + rm ${D}/usr/lib/libmurphy-plugin-system-monitor* +} \ No newline at end of file diff --git a/meta-tizen/recipes-tizen/murphy/murphy.inc b/meta-tizen/recipes-tizen/murphy/murphy.inc index 6455bd9..333be22 100644 --- a/meta-tizen/recipes-tizen/murphy/murphy.inc +++ b/meta-tizen/recipes-tizen/murphy/murphy.inc @@ -1,4 +1,4 @@ -DESCRIPTION = "Murphy policy framework" +DESCRIPTION = "Resource policy framework" HOMEPAGE = "http://nohomepage.org" SECTION = "System/Service" LICENSE = "BSD-3-Clause" @@ -35,8 +35,8 @@ PROVIDES += "murphy-doc" PROVIDES += "murphy-ivi-resource-manager" -#PROVIDES by murphy-ecore-dev -PROVIDES += "murphy-ecore-dev" +#PROVIDES by murphy-glib-dev +PROVIDES += "murphy-glib-dev" #PROVIDES by murphy-pulse-dev @@ -47,12 +47,20 @@ PROVIDES += "murphy-pulse-dev" PROVIDES += "murphy-tests" +#PROVIDES by murphy-gam +PROVIDES += "murphy-gam" + + #PROVIDES by murphy-glib PROVIDES += "murphy-glib" -#PROVIDES by murphy-glib-dev -PROVIDES += "murphy-glib-dev" +#PROVIDES by murphy-gam-dev +PROVIDES += "murphy-gam-dev" + + +#PROVIDES by murphy-ecore-dev +PROVIDES += "murphy-ecore-dev" RDEPENDS = "" @@ -70,9 +78,8 @@ RDEPENDS_${PN}-pulse += "murphy" RDEPENDS_${PN} += "libcap" RDEPENDS_${PN} += "/bin/systemctl" -#RDEPENDS of murphy-ecore-dev (${PN}-ecore-dev) -RDEPENDS_${PN}-ecore-dev += "murphy-ecore" -RDEPENDS_${PN}-ecore-dev += "murphy" +#RDEPENDS of murphy-gam-dev (${PN}-gam-dev) +RDEPENDS_${PN}-gam-dev += "murphy-gam" #RDEPENDS of murphy-pulse-dev (${PN}-pulse-dev) RDEPENDS_${PN}-pulse-dev += "murphy-pulse" @@ -81,6 +88,9 @@ RDEPENDS_${PN}-pulse-dev += "murphy" #RDEPENDS of murphy-tests (${PN}-tests) RDEPENDS_${PN}-tests += "murphy" +#RDEPENDS of murphy-gam (${PN}-gam) +RDEPENDS_${PN}-gam += "murphy" + #RDEPENDS of murphy-glib (${PN}-glib) RDEPENDS_${PN}-glib += "murphy" @@ -88,34 +98,42 @@ RDEPENDS_${PN}-glib += "murphy" RDEPENDS_${PN}-glib-dev += "murphy" RDEPENDS_${PN}-glib-dev += "murphy-glib" +#RDEPENDS of murphy-ecore-dev (${PN}-ecore-dev) +RDEPENDS_${PN}-ecore-dev += "murphy-ecore" +RDEPENDS_${PN}-ecore-dev += "murphy" + DEPENDS = "" #DEPENDS of murphy -DEPENDS += "flex" -DEPENDS += "systemd" -DEPENDS += "smack" DEPENDS += "ofono" -DEPENDS += "ail" DEPENDS += "json-c" DEPENDS += "libxml2" -DEPENDS += "dbus" -DEPENDS += "pulseaudio" +DEPENDS += "audio-session-manager" +DEPENDS += "systemd" +DEPENDS += "aul" DEPENDS += "glib-2.0" DEPENDS += "lua" -DEPENDS += "aul" -DEPENDS_append_class-native = " bison-native" -DEPENDS_append_class-target = " bison-native" -DEPENDS += "ecore" -DEPENDS += "libwebsockets" DEPENDS += "libcap" -DEPENDS += "mesa" -DEPENDS += "audio-session-manager" DEPENDS += "ico-uxf-weston-plugin" +DEPENDS += "flex" +DEPENDS += "tizen-platform-config" +DEPENDS += "weston-ivi-shell" +DEPENDS += "smack" +DEPENDS += "libwebsockets" +DEPENDS += "ecore" +DEPENDS += "mesa" +DEPENDS += "dbus" +DEPENDS += "pulseaudio" +DEPENDS += "ail" +DEPENDS += "wayland-ivi-extension" +DEPENDS_append_class-native = " bison-native" +DEPENDS_append_class-target = " bison-native" do_prep() { cd ${S} chmod -Rf a+rX,u+w,g-w,o-w ${S} #setup -q + cp ${S}/packaging/murphy.manifest . echo "_with_icosyscon: \"0\"" echo "_enable_icosyscon: \"0\"" @@ -163,16 +181,16 @@ do_compile() { CONFIG_OPTIONS="$CONFIG_OPTIONS --enable-system-monitor" - NUM_CPUS="`cat /proc/cpuinfo | tr -s '\t' ' ' | grep '^processor *:' | wc -l`" - [ -z "$NUM_CPUS" ] && NUM_CPUS=1 + ./bootstrap - ./bootstrap && autotools_do_configure + oe_runmake clean + oe_runmake -j16 $V } -EXTRA_OECONF += " $CONFIG_OPTIONS --with-dynamic-plugins=$DYNAMIC_PLUGINS && make clean && make -j$(($NUM_CPUS + 1)) $V" +EXTRA_OECONF += " $CONFIG_OPTIONS --with-dynamic-plugins=$DYNAMIC_PLUGINS" do_install() { export RPM_BUILD_ROOT=${D} @@ -183,7 +201,7 @@ do_install() { rm -rf ${D} mkdir -p ${D} - rm -rf $RPM_BUILD_ROOT + rm -rf ${D} oe_runmake \ DESTDIR=${D} \ @@ -196,17 +214,17 @@ do_install() { # Make sure we have a plugin dir even if all the basic plugins # are configured to be built in. - mkdir -p $RPM_BUILD_ROOT${prefix}/lib/murphy/plugins + mkdir -p ${D}${prefix}/lib/murphy/plugins # Get rid of any *.la files installed by libtool. - rm -f $RPM_BUILD_ROOT${prefix}/lib/*.la + rm -f ${D}${prefix}/lib/*.la # Clean up also the murphy DB installation. - rm -f $RPM_BUILD_ROOT${prefix}/lib/murphy/*.la + rm -f ${D}${prefix}/lib/murphy/*.la # Generate list of linkedin plugins (depends on the configuration). outdir="`pwd`" - pushd $RPM_BUILD_ROOT >& /dev/null && \ + pushd ${D} >& /dev/null && \ find ./${prefix}/lib -name libmurphy-plugin-*.so* | \ sed 's#^./*#/#g' > $outdir/filelist.plugins-base && \ popd >& /dev/null @@ -215,41 +233,41 @@ do_install() { # Generate list of header files, filtering ones that go to subpackages. outdir="`pwd`" - pushd $RPM_BUILD_ROOT >& /dev/null && \ + pushd ${D} >& /dev/null && \ find ./${prefix}/include/murphy | \ - egrep -v '((pulse)|(ecore)|(glib)|(qt))-glue' | \ + grep -E -v '((pulse)|(ecore)|(glib)|(qt))-glue' | \ sed 's#^./*#/#g' > $outdir/filelist.devel-includes && \ popd >& /dev/null # Replace the default sample/test config files with the packaging ones. - rm -f $RPM_BUILD_ROOT${sysconfdir}/murphy/* - cp packaging.in/murphy-lua.conf $RPM_BUILD_ROOT${sysconfdir}/murphy/murphy.conf - cp packaging.in/murphy.lua $RPM_BUILD_ROOT${sysconfdir}/murphy/murphy.lua + rm -f ${D}${sysconfdir}/murphy/* + cp packaging.in/murphy-lua.conf ${D}${sysconfdir}/murphy/murphy.conf + cp packaging.in/murphy.lua ${D}${sysconfdir}/murphy/murphy.lua # Copy plugin configuration files in place. - mkdir -p $RPM_BUILD_ROOT${sysconfdir}/murphy/plugins/amb + mkdir -p ${D}${sysconfdir}/murphy/plugins/amb cp packaging.in/amb-config.lua \ - $RPM_BUILD_ROOT${sysconfdir}/murphy/plugins/amb/config.lua + ${D}${sysconfdir}/murphy/plugins/amb/config.lua # Copy tmpfiles.d config file in place - mkdir -p $RPM_BUILD_ROOT/usr/lib/tmpfiles.d - cp packaging.in/murphyd.conf $RPM_BUILD_ROOT/usr/lib/tmpfiles.d + mkdir -p ${D}/usr/lib/tmpfiles.d + cp packaging.in/murphyd.conf ${D}/usr/lib/tmpfiles.d # Copy the systemd files in place. - mkdir -p $RPM_BUILD_ROOT/lib/systemd/system - mkdir -p $RPM_BUILD_ROOT/lib/systemd/user - cp packaging.in/murphyd.service $RPM_BUILD_ROOT/lib/systemd/system + mkdir -p ${D}${systemd_unitdir}/system + mkdir -p ${D}${systemd_unitdir}/user + cp packaging.in/murphyd.service ${D}${systemd_unitdir}/system - mkdir -p $RPM_BUILD_ROOT${sysconfdir}/dbus-1/system.d - cp packaging.in/org.Murphy.conf $RPM_BUILD_ROOT${sysconfdir}/dbus-1/system.d/org.Murphy.conf + mkdir -p ${D}${sysconfdir}/dbus-1/system.d + sed "s/@TZ_SYS_USER_GROUP@/users/g" \ + packaging.in/org.Murphy.conf.in > packaging.in/org.Murphy.conf + cp packaging.in/org.Murphy.conf \ + ${D}${sysconfdir}/dbus-1/system.d/org.Murphy.conf - # copy the manifest file - cp -a ${S}/packaging/murphy.manifest $RPM_BUILD_ROOT${prefix}/share/murphy.manifest - cp -a ${S}/packaging/murphy.manifest $RPM_BUILD_ROOT${prefix}/share/murphy-tests.manifest - cp -a ${S}/packaging/murphy.manifest $RPM_BUILD_ROOT${prefix}/share/murphy-ivi-resource-manager.manifest - cp -a ${S}/packaging/murphy.manifest $RPM_BUILD_ROOT${prefix}/share/murphy-glib.manifest - cp -a ${S}/packaging/murphy.manifest $RPM_BUILD_ROOT${prefix}/share/murphy-pulse.manifest - cp -a ${S}/packaging/murphy.manifest $RPM_BUILD_ROOT${prefix}/share/murphy-ecore.manifest + # copy (experimental) GAM resource backend configuration files + mkdir -p ${D}${sysconfdir}/murphy/gam + cp packaging.in/gam-*.names packaging.in/gam-*.tree \ + ${D}${sysconfdir}/murphy/gam } @@ -284,6 +302,20 @@ pkg_postinst_${PN}() { } +pkg_postinst_${PN}() { + #!/bin/sh -e + + ldconfig + +} + +pkg_postrm_${PN}() { + #!/bin/sh -e + + ldconfig + +} + pkg_postrm_${PN}() { #!/bin/sh -e @@ -321,11 +353,13 @@ PACKAGES += " murphy-ecore " PACKAGES += " murphy-pulse " PACKAGES += " murphy " PACKAGES += " murphy-ivi-resource-manager " +PACKAGES += " murphy-glib-dev " PACKAGES += " murphy-ecore-dev " PACKAGES += " murphy-pulse-dev " PACKAGES += " murphy-tests " +PACKAGES += " murphy-gam " PACKAGES += " murphy-glib " -PACKAGES += " murphy-glib-dev " +PACKAGES += " murphy-gam-dev " murphy-dev_files = "" murphy-dev_files += "${prefix}/include/murphy-db" @@ -356,24 +390,23 @@ murphy-dev_files += "${prefix}/lib/pkgconfig/murphy-dbus-libdbus.pc" murphy-ecore_files = "" murphy-ecore_files += "${prefix}/lib/libmurphy-ecore.so.*" -MANIFESTFILES_${PN}-ecore = "${prefix}/share/murphy-ecore.manifest" +MANIFESTFILES_${PN}-ecore = "murphy.manifest" murphy-pulse_files = "" murphy-pulse_files += "${prefix}/lib/libmurphy-pulse.so.*" -MANIFESTFILES_${PN}-pulse = "${prefix}/share/murphy-pulse.manifest" +MANIFESTFILES_${PN}-pulse = "murphy.manifest" murphy-doc_files = "" murphy-doc_files += "${prefix}/share/doc/packages/../murphy/AUTHORS" murphy-doc_files += "${prefix}/share/doc/packages/../murphy/CODING-STYLE" murphy-doc_files += "${prefix}/share/doc/packages/../murphy/ChangeLog" -murphy-doc_files += "${prefix}/share/doc/packages/../murphy/INSTALL" murphy-doc_files += "${prefix}/share/doc/packages/../murphy/NEWS" murphy-doc_files += "${prefix}/share/doc/packages/../murphy/README" murphy_files = "" murphy_files += "${prefix}/bin/murphyd" murphy_files += "${sysconfdir}/murphy" -murphy_files += "/lib/systemd/system/murphyd.service" +murphy_files += "${systemd_unitdir}/system/murphyd.service" murphy_files += "/usr/lib/tmpfiles.d/murphyd.conf" murphy_files += "${prefix}/sbin/asm-bridge" murphy_files += "${sysconfdir}/dbus-1/system.d" @@ -397,11 +430,16 @@ murphy_files += "${prefix}/lib/murphy/plugins/plugin-resource-native.so" CONFFILES_${PN} = "" CONFFILES_${PN} += "${sysconfdir}/murphy" CONFFILES_${PN} += "${sysconfdir}/dbus-1/system.d/org.Murphy.conf" -MANIFESTFILES_${PN} = "${prefix}/share/murphy.manifest" +MANIFESTFILES_${PN} = "murphy.manifest" murphy-ivi-resource-manager_files = "" murphy-ivi-resource-manager_files += "${prefix}/lib/murphy/plugins/plugin-ivi-resource-manager.so" -MANIFESTFILES_${PN}-ivi-resource-manager = "${prefix}/share/murphy-ivi-resource-manager.manifest" +MANIFESTFILES_${PN}-ivi-resource-manager = "murphy.manifest" + +murphy-glib-dev_files = "" +murphy-glib-dev_files += "${prefix}/include/murphy/common/glib-glue.h" +murphy-glib-dev_files += "${prefix}/lib/libmurphy-glib.so" +murphy-glib-dev_files += "${prefix}/lib/pkgconfig/murphy-glib.pc" murphy-ecore-dev_files = "" murphy-ecore-dev_files += "${prefix}/include/murphy/common/ecore-glue.h" @@ -419,16 +457,21 @@ murphy-tests_files += "${prefix}/bin/resource-api-test" murphy-tests_files += "${prefix}/bin/resource-api-fuzz" murphy-tests_files += "${prefix}/bin/test-domain-controller" murphy-tests_files += "${prefix}/bin/murphy-console" -MANIFESTFILES_${PN}-tests = "${prefix}/share/murphy-tests.manifest" +MANIFESTFILES_${PN}-tests = "murphy.manifest" + +murphy-gam_files = "" +murphy-gam_files += "${prefix}/lib/libmurphy-decision-tree.so.*" +murphy-gam_files += "${prefix}/lib/libmurphy-decision-tree.so.0.0.0" +murphy-gam_files += "${prefix}/lib/murphy/plugins/plugin-gam-resource-manager.so" murphy-glib_files = "" murphy-glib_files += "${prefix}/lib/libmurphy-glib.so.*" -MANIFESTFILES_${PN}-glib = "${prefix}/share/murphy-glib.manifest" +MANIFESTFILES_${PN}-glib = "murphy.manifest" -murphy-glib-dev_files = "" -murphy-glib-dev_files += "${prefix}/include/murphy/common/glib-glue.h" -murphy-glib-dev_files += "${prefix}/lib/libmurphy-glib.so" -murphy-glib-dev_files += "${prefix}/lib/pkgconfig/murphy-glib.pc" +murphy-gam-dev_files = "" +murphy-gam-dev_files += "${prefix}/bin/decision-test" +murphy-gam-dev_files += "${prefix}/bin/pattern-generator" +murphy-gam-dev_files += "${prefix}/lib/libmurphy-decision-tree.so" FILES_${PN}-dev = "${murphy-dev_files}" FILES_${PN}-ecore = "${murphy-ecore_files}" @@ -436,11 +479,13 @@ FILES_${PN}-pulse = "${murphy-pulse_files}" FILES_${PN}-doc = "${murphy-doc_files}" FILES_${PN} = "${murphy_files}" FILES_${PN}-ivi-resource-manager = "${murphy-ivi-resource-manager_files}" +FILES_${PN}-glib-dev = "${murphy-glib-dev_files}" FILES_${PN}-ecore-dev = "${murphy-ecore-dev_files}" FILES_${PN}-pulse-dev = "${murphy-pulse-dev_files}" FILES_${PN}-tests = "${murphy-tests_files}" +FILES_${PN}-gam = "${murphy-gam_files}" FILES_${PN}-glib = "${murphy-glib_files}" -FILES_${PN}-glib-dev = "${murphy-glib-dev_files}" +FILES_${PN}-gam-dev = "${murphy-gam-dev_files}" PKG_murphy-dev= "murphy-dev" PKG_murphy-ecore= "murphy-ecore" @@ -448,11 +493,13 @@ PKG_murphy-pulse= "murphy-pulse" PKG_murphy-doc= "murphy-doc" PKG_murphy= "murphy" PKG_murphy-ivi-resource-manager= "murphy-ivi-resource-manager" +PKG_murphy-glib-dev= "murphy-glib-dev" PKG_murphy-ecore-dev= "murphy-ecore-dev" PKG_murphy-pulse-dev= "murphy-pulse-dev" PKG_murphy-tests= "murphy-tests" +PKG_murphy-gam= "murphy-gam" PKG_murphy-glib= "murphy-glib" -PKG_murphy-glib-dev= "murphy-glib-dev" +PKG_murphy-gam-dev= "murphy-gam-dev" require murphy-extraconf.inc diff --git a/meta-tizen/recipes-tizen/murphy/murphy_git.bb b/meta-tizen/recipes-tizen/murphy/murphy_git.bb index 1c1f2d5..9a0dac1 100644 --- a/meta-tizen/recipes-tizen/murphy/murphy_git.bb +++ b/meta-tizen/recipes-tizen/murphy/murphy_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/murphy;tag=0624150004879859625240ebb19547e2ad3f3498;nobranch=1" +SRC_URI += "git://review.tizen.org/profile/ivi/murphy;tag=f41ce196884f7b83e805d5f52e84b1ab831bab73;nobranch=1" BBCLASSEXTEND += " native " -- 2.7.4