diff options
| author |   Jan-Simon Moeller <jsmoeller@linuxfoundation.org> | 2023-11-17 16:07:15 +0100 |
|---|---|---|
| committer | Jan-Simon Moeller <jsmoeller@linuxfoundation.org> | 2023-11-23 14:48:51 +0000 |
| commit | 54cc3c843ca4477b23c86f2029039f413a2b31d1 (patch) | |
| tree | 8b1c56ace0bb4823201505a2fc541d7baabf701b /recipes-wam/wam | |
| parent | bbdcf9e0a6d3e9a4ca3279f36afe6180d74f9e63 (diff) | |
Make CEF the default and deprecate chromium
We complete the migration to CEF (Chromium Embedded Framework) by
making CEF the default and deprecating the outdated chromium recipe.
Bug-AGL: SPEC-4975
Change-Id: I59e3cdedda46ad74947a7b7e8d51dea70ecbd033
Signed-off-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>
Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl-demo/+/29449
Tested-by: Jenkins Job builder account
ci-image-build: Jenkins Job builder account
ci-image-boot-test: Jenkins Job builder account
Diffstat (limited to 'recipes-wam/wam')
| -rw-r--r-- | recipes-wam/wam/wam.inc | 12 | ||||
| -rw-r--r-- | recipes-wam/wam/wam_git.bb | 2 |
2 files changed, 1 insertions, 13 deletions
diff --git a/recipes-wam/wam/wam.inc b/recipes-wam/wam/wam.inc deleted file mode 100644 index f78fcfe53..000000000 --- a/recipes-wam/wam/wam.inc +++ /dev/null @@ -1,12 +0,0 @@ -DEPENDS += " chromium " - -EXTRA_OECMAKE = "\ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=${prefix} \ - -DPLATFORM_NAME=${@'${DISTRO}'.upper().replace('-', '_')} \ - -DCHROMIUM_SRC_DIR=${STAGING_INCDIR}/chromium" - -do_install:append() { - install -v -D -m 644 ${WORKDIR}/WebAppMgr.env ${D}${sysconfdir}/default/WebAppMgr.env - sed -i -e 's#@WAM_EXE_DIR@#${bindir}#g' ${D}${systemd_system_unitdir}/WebAppMgr.service -} diff --git a/recipes-wam/wam/wam_git.bb b/recipes-wam/wam/wam_git.bb index 570c6f8da..9f2c79ad1 100644 --- a/recipes-wam/wam/wam_git.bb +++ b/recipes-wam/wam/wam_git.bb @@ -45,7 +45,7 @@ do_install:append:agl-devel() { touch ${D}${localstatedir}/agl-devel/preferences/devmode_enabled } -require ${@bb.utils.contains('AGL_FEATURES', 'agl-cef', 'wam-cef.inc', 'wam.inc', d)} +require wam-cef.inc FILES:${PN} += "${sysconfdir}/init \ ${sysconfdir}/wam \ |