diff options
Diffstat (limited to 'recipes-wam/wam')
| -rw-r--r-- | recipes-wam/wam/files/WebAppMgr.service | 5 | ||||
| -rw-r--r-- | recipes-wam/wam/wam_git.bb | 48 |
2 files changed, 26 insertions, 27 deletions
diff --git a/recipes-wam/wam/files/WebAppMgr.service b/recipes-wam/wam/files/WebAppMgr.service index 0dfe971df..ca9a47811 100644 --- a/recipes-wam/wam/files/WebAppMgr.service +++ b/recipes-wam/wam/files/WebAppMgr.service @@ -14,7 +14,7 @@ Description="WebAppMgr is responsible for running web apps and manage their lifecycle" After=agl-compositor.service Requires=agl-compositor.service -Before=agl-session.target +Before=graphical.target BindTo=agl-compositor.service [Service] @@ -22,10 +22,11 @@ Type=simple UMask=0077 OOMScoreAdjust=-1000 EnvironmentFile=-/etc/default/WebAppMgr.env +Environment=XDG_RUNTIME_DIR=/run/user/1001/ ExecStart=/usr/bin/WebAppMgr --use-gl=egl --enable-features=UseOzonePlatform --ozone-platform=wayland --no-sandbox --use-viz-fmp-with-timeout=0 --in-process-gpu --remote-debugging-port=9998 --user-data-dir="/home/%u/wamdata" --webos-wam --agl-shell-appid=homescreen --disable-gpu-vsync --ignore-gpu-blocklist ExecStop=pkill -U %U WebAppMgr Restart=on-failure RestartSec=50 [Install] -WantedBy=agl-session.target +WantedBy=graphical.target diff --git a/recipes-wam/wam/wam_git.bb b/recipes-wam/wam/wam_git.bb index 4b640d5d2..0f2087c65 100644 --- a/recipes-wam/wam/wam_git.bb +++ b/recipes-wam/wam/wam_git.bb @@ -3,51 +3,43 @@ AUTHOR = "Jani Hautakangas <jani.hautakangas@lge.com>" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" -inherit cmake pkgconfig - DEPENDS = "glib-2.0 jsoncpp boost chromium protobuf protobuf-native grpc grpc-native" +SRC_URI = "\ + git://github.com/igalia/${BPN}.git;branch=@58.agl;protocol=https \ + file://WebAppMgr.service \ + file://WebAppMgr.env \ +" +SRCREV = "4fbd6e648913bcf0fba63e4460eb44242c11f71b" + +PV = "ose58.agl" + +S = "${WORKDIR}/git" + +inherit cmake pkgconfig systemd + EXTRA_OECMAKE = "\ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=${prefix} \ -DPLATFORM_NAME=${@'${DISTRO}'.upper().replace('-', '_')} \ -DCHROMIUM_SRC_DIR=${STAGING_INCDIR}/chromium" -PR="r0" - -PROVIDES += "virtual/webruntime" -RPROVIDES:${PN} += "virtual/webruntime" - -# Disable some of securit_flags +# Disable some of security flags # Disable D_FORTIFY_SOURCE=2 and -fstack-protector-strong # Refer conf/distro/include/security_flags.inc in meta-webos/conf/distro/include/webos.inc lcl_maybe_fortify = "" SECURITY_STACK_PROTECTOR = "" -SRC_URI = "\ - git://github.com/igalia/${BPN}.git;branch=@58.agl;protocol=https \ - file://WebAppMgr.service \ - file://WebAppMgr.env \ -" -S = "${WORKDIR}/git" -SRCREV = "4fbd6e648913bcf0fba63e4460eb44242c11f71b" - -PV = "ose58.agl" +SYSTEMD_SERVICE:${PN} = "WebAppMgr.service" do_install:append() { install -v -d ${D}${sysconfdir}/wam install -v -m 644 ${S}/files/launch/security_policy.conf ${D}${sysconfdir}/wam/security_policy.conf - install -v -d ${D}${systemd_user_unitdir} - install -v -m 644 ${WORKDIR}/WebAppMgr.service ${D}${systemd_user_unitdir}/WebAppMgr.service - install -v -d ${D}${sysconfdir}/default/ - install -v -m 644 ${WORKDIR}/WebAppMgr.env ${D}${sysconfdir}/default/WebAppMgr.env + install -v -D -m 644 ${WORKDIR}/WebAppMgr.service ${D}${systemd_system_unitdir}/WebAppMgr.service + install -v -D -m 644 ${WORKDIR}/WebAppMgr.env ${D}${sysconfdir}/default/WebAppMgr.env ln -snf WebAppMgr ${D}${bindir}/web-runtime - install -v -d ${D}${systemd_user_unitdir}/agl-session.target.wants - ln -sf ../WebAppMgr.service ${D}${systemd_user_unitdir}/agl-session.target.wants/ } -FILES:${PN} += "${sysconfdir}/init ${sysconfdir}/wam ${libdir}/webappmanager/plugins/*.so ${systemd_user_unitdir}" - CXXFLAGS:append:agl-devel = " -DAGL_DEVEL" do_install:append:agl-devel() { @@ -56,3 +48,9 @@ do_install:append:agl-devel() { touch ${D}${localstatedir}/agl-devel/preferences/debug_system_apps touch ${D}${localstatedir}/agl-devel/preferences/devmode_enabled } + +FILES:${PN} += "${sysconfdir}/init ${sysconfdir}/wam ${libdir}/webappmanager/plugins/*.so" + +PROVIDES += "virtual/webruntime" +RPROVIDES:${PN} += "virtual/webruntime" + |