diff options
| author |   Scott Murray <scott.murray@konsulko.com> | 2021-08-02 17:10:51 -0400 |
|---|---|---|
| committer |   Jan-Simon Moeller <jsmoeller@linuxfoundation.org> | 2021-08-23 11:56:42 +0000 |
| commit | dd6fc5dcaa0a027b7651bb365d5dd0f623498f8f (patch) | |
| tree | 428562251f7033e4d44c848e7258243fb9421a94 /meta-agl-core/recipes-core | |
| parent | 756165e01db655cdbd2788eb134fba79fea7fd90 (diff) | |
Convert to new override syntax
This is mostly the result of running a slightly customized version
of the convert-overrides.py script from poky with additional
overrides added. A few minor fixups were done by hand afterwards
during a review of the changes.
The intent of these changes is to minimize the effort to keep the
"next" branch that builds against poky master up to date and tested
in preparation for the switch to the next Yocto LTS release in
early 2022.
Bug-AGL: SPEC-4052
Signed-off-by: Scott Murray <scott.murray@konsulko.com>
Change-Id: Ia3bf63b7cb1aa1d95ada373d1a3ab56def0a125d
Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl/+/26564
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')
| -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" |