diff options
| author |   Roger Zanoni <rzanoni@igalia.com> | 2021-02-23 14:05:08 +0100 |
|---|---|---|
| committer | Roger Zanoni <rzanoni@igalia.com> | 2021-03-24 10:11:18 +0100 |
| commit | 0aa3cdff0b96437d1103c340431f53005c643f6a (patch) | |
| tree | 6d2f5fec8de0e50e2c5ba7f0f0e9e31557693fee /recipes-wam/wam | |
| parent | 4028c08d117c5dbdf74391f2bfa783a6f190a78f (diff) | |
web-runtime: Update from chromium79 to chromium84
This patch contains all the squashed changes needed to bump
WAM and chromium, including the ported changes from cr79.
Bug-AGL: SPEC-3806
Signed-off-by: Roger Zanoni <rzanoni@igalia.com>
Change-Id: If2b18e2978e8b1050e4b167b9627c1a526867cfb
Diffstat (limited to 'recipes-wam/wam')
| -rw-r--r-- | recipes-wam/wam/files/WebAppMgr@.service | 2 | ||||
| -rw-r--r-- | recipes-wam/wam/wam_git.bb | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/recipes-wam/wam/files/WebAppMgr@.service b/recipes-wam/wam/files/WebAppMgr@.service index 5dfed9c53..beffd114c 100644 --- a/recipes-wam/wam/files/WebAppMgr@.service +++ b/recipes-wam/wam/files/WebAppMgr@.service @@ -29,7 +29,7 @@ EnvironmentFile=-/etc/default/WebAppMgr.env Environment=XDG_RUNTIME_DIR=/run/user/%i Environment=DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%i/bus Environment=WAM_DATA_PATH="/home/%i/wamdata" -ExecStart=/usr/bin/WebAppMgr --no-sandbox --use-viz-fmp-with-timeout=0 --in-process-gpu --remote-debugging-port=9998 --user-data-dir="/home/%i/wamdata" --webos-wam +ExecStart=/usr/bin/WebAppMgr --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/%i/wamdata" --webos-wam Restart=on-failure RestartSec=50 diff --git a/recipes-wam/wam/wam_git.bb b/recipes-wam/wam/wam_git.bb index 536b71f94..b9cefb891 100644 --- a/recipes-wam/wam/wam_git.bb +++ b/recipes-wam/wam/wam_git.bb @@ -5,13 +5,13 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Apache-2.0;md5=89aea4e17d99a7ca inherit cmake -DEPENDS = "glib-2.0 jsoncpp boost chromium79 libhomescreen" +DEPENDS = "glib-2.0 jsoncpp boost chromium84 libhomescreen" EXTRA_OECMAKE = "\ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=${prefix} \ -DPLATFORM_NAME=${@'${DISTRO}'.upper().replace('-', '_')} \ - -DCHROMIUM_SRC_DIR=${STAGING_INCDIR}/chromium79" + -DCHROMIUM_SRC_DIR=${STAGING_INCDIR}/chromium84" PR="r0" @@ -25,7 +25,7 @@ lcl_maybe_fortify = "" SECURITY_STACK_PROTECTOR = "" SRC_URI = "\ - git://github.com/igalia/${BPN}.git;branch=@43.agl.jellyfish;protocol=https \ + git://github.com/igalia/${BPN}.git;branch=koi;protocol=https \ file://WebAppMgr@.service \ file://WebAppMgr.env \ file://wam-user-setup.sh \ @@ -33,7 +33,7 @@ SRC_URI = "\ file://trunc-webapp-roles.patch \ " S = "${WORKDIR}/git" -SRCREV = "8a1ec2f3e474199a689ae71a12ba70a230770c0d" +SRCREV = "2a246d2ea79bd335b86942a5579d6de0c9ddce40" do_install_append() { install -d ${D}${sysconfdir}/wam |