X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=recipes-wam%2Fwam%2Fwam_git.bb;h=a7bfde7e03a791809383840d7cfabc0f4dd1349b;hb=dd3f596c7962ada1d42a54c091edf6df372d6687;hp=cf2d5fad775aed930347d62e534b9883abe96cb7;hpb=6195e3941ed7af426d5a92015c4d2658a9406895;p=AGL%2Fmeta-agl-demo.git diff --git a/recipes-wam/wam/wam_git.bb b/recipes-wam/wam/wam_git.bb index cf2d5fad7..a7bfde7e0 100644 --- a/recipes-wam/wam/wam_git.bb +++ b/recipes-wam/wam/wam_git.bb @@ -5,18 +5,18 @@ 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 protobuf protobuf-native" 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" PROVIDES += "virtual/webruntime" -RPROVIDES_${PN} += "virtual/webruntime" +RPROVIDES:${PN} += "virtual/webruntime" # Disable some of securit_flags # Disable D_FORTIFY_SOURCE=2 and -fstack-protector-strong @@ -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=marlin;protocol=https \ file://WebAppMgr@.service \ file://WebAppMgr.env \ file://wam-user-setup.sh \ @@ -33,9 +33,9 @@ SRC_URI = "\ file://trunc-webapp-roles.patch \ " S = "${WORKDIR}/git" -SRCREV = "a9f18b049d319865514f5f92b248ecdf9c09761d" +SRCREV = "916ad4cc233eaec1f1b12f21c548a31f2b090104" -do_install_append() { +do_install:append() { install -d ${D}${sysconfdir}/wam install -v -m 644 ${S}/files/launch/security_policy.conf ${D}${sysconfdir}/wam/security_policy.conf install -d ${D}${systemd_system_unitdir} @@ -52,11 +52,11 @@ do_install_append() { ln -sf ../wam-user-setup@.service ${D}${systemd_system_unitdir}/user-runtime-dir@.service.wants/ } -FILES_${PN} += "${sysconfdir}/init ${sysconfdir}/wam ${libdir}/webappmanager/plugins/*.so ${systemd_system_unitdir}" +FILES:${PN} += "${sysconfdir}/init ${sysconfdir}/wam ${libdir}/webappmanager/plugins/*.so ${systemd_system_unitdir}" -CXXFLAGS_append_agl-devel = " -DAGL_DEVEL" +CXXFLAGS:append:agl-devel = " -DAGL_DEVEL" -do_install_append_agl-devel() { +do_install:append:agl-devel() { # Enable remote inspector and dev mode install -d ${D}${localstatedir}/agl-devel/preferences touch ${D}${localstatedir}/agl-devel/preferences/debug_system_apps