diff options
| author |   Scott Murray <scott.murray@konsulko.com> | 2021-08-02 17:10:51 -0400 |
|---|---|---|
| committer |   Jan-Simon Moeller <jsmoeller@linuxfoundation.org> | 2021-11-20 00:33:16 +0000 |
| commit | bad73bf315325c3428e331984f9d17bb8b2873b3 (patch) | |
| tree | f1af509d2d534d7232ab63304faf52e549fbaeca /meta-agl-core/recipes-core/systemd | |
| parent | 5f1d801530f9b3d7f99826b4cc8cc23df77d1e42 (diff) | |
Convert to new override syntax
This is effectively a manual cherry-pick and squash of commits:
dd6fc5dcaa0a027b7651bb365d5dd0f623498f8f
917a82316bf53ead29d6345a39189d9e4efeef25
20e81c0a9d36660de671dd5ac2e006e31c0e621b
from the master branch with additional review and fixups.
The intent of these changes is to minimize the effort to backport
fixes from the master branch, which has been updated in preparation
for the switch to the next Yocto LTS release in early 2022.
Bug-AGL: SPEC-4144
Signed-off-by: Scott Murray <scott.murray@konsulko.com>
Change-Id: I91c1640c6335d7748a2531d2fe8bf86d2d2aee32
Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl/+/26876
Tested-by: Jenkins Job builder account
ci-image-build: Jenkins Job builder account
ci-image-boot-test: Jenkins Job builder account
Reviewed-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>
Diffstat (limited to 'meta-agl-core/recipes-core/systemd')
| -rw-r--r-- | meta-agl-core/recipes-core/systemd/systemd-conf_aglcore.inc | 2 | ||||
| -rw-r--r-- | meta-agl-core/recipes-core/systemd/systemd_aglcore.inc | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/meta-agl-core/recipes-core/systemd/systemd-conf_aglcore.inc b/meta-agl-core/recipes-core/systemd/systemd-conf_aglcore.inc index 6661eab6c..a539d1826 100644 --- a/meta-agl-core/recipes-core/systemd/systemd-conf_aglcore.inc +++ b/meta-agl-core/recipes-core/systemd/systemd-conf_aglcore.inc @@ -1,4 +1,4 @@ -do_install_append() { +do_install:append() { # Remove ethernet script deployed by upstream unconditionally (SPEC-3221) rm -rf ${D}${systemd_unitdir}/network/80-wired.network || true }
\ No newline at end of file diff --git a/meta-agl-core/recipes-core/systemd/systemd_aglcore.inc b/meta-agl-core/recipes-core/systemd/systemd_aglcore.inc index feca107a8..51a5ff45f 100644 --- a/meta-agl-core/recipes-core/systemd/systemd_aglcore.inc +++ b/meta-agl-core/recipes-core/systemd/systemd_aglcore.inc @@ -1,4 +1,4 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/systemd:" +FILESEXTRAPATHS:prepend := "${THISDIR}/systemd:" SRC_URI += "\ file://0002-network-add-CAN-Termination-tristate-option.patch \ @@ -8,11 +8,11 @@ SRC_URI += "\ " # enable networkd/resolved support -PACKAGECONFIG_append_pn-systemd = " \ +PACKAGECONFIG:append:pn-systemd = " \ ${@bb.utils.contains('VIRTUAL-RUNTIME_net_manager','systemd','networkd resolved','',d)} \ " -do_install_append() { +do_install:append() { # Install /etc/e2fsck.conf to avoid boot stuck by wrong clock time install -m 644 -p -D ${WORKDIR}/e2fsck.conf ${D}${sysconfdir}/e2fsck.conf @@ -25,10 +25,10 @@ do_install_append() { fi } -FILES_${PN} += "${sysconfdir}/e2fsck.conf " +FILES:${PN} += "${sysconfdir}/e2fsck.conf " # SPEC-737: connmand also has a NTP client which races with systemd-timesyncd -PACKAGECONFIG_remove = "timesyncd" +PACKAGECONFIG:remove = "timesyncd" # Enable systemd-coredump when agl-devel is set on -PACKAGECONFIG_append_agl-devel = " coredump" +PACKAGECONFIG:append:agl-devel = " coredump" |