From 31a770d3c0cb22c9f4ece068208d2e6b2c28f1ee Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Thu, 29 Jul 2021 19:44:05 +0200 Subject: Convert to new override syntax This is the result of automated script (0.9.0) conversion: oe-core/scripts/contrib/convert-overrides.py . converting the metadata to use ":" as the override character instead of "_". Signed-off-by: Martin Jansa --- conf/distro/poky-sota-systemd.conf | 2 +- conf/distro/poky-sota.conf | 2 +- conf/distro/sota.conf.inc | 8 ++++---- conf/layer.conf | 12 ++++++------ conf/local.conf.nonostree.append | 8 ++++---- conf/local.conf.systemd.append | 4 ++-- 6 files changed, 18 insertions(+), 18 deletions(-) (limited to 'conf') diff --git a/conf/distro/poky-sota-systemd.conf b/conf/distro/poky-sota-systemd.conf index 4b7990f..33dd597 100644 --- a/conf/distro/poky-sota-systemd.conf +++ b/conf/distro/poky-sota-systemd.conf @@ -7,6 +7,6 @@ DISTRO_NAME = "OTA-enabled Linux" DISTRO_VERSION = "1.0" DISTRO_CODENAME = "sota" -DISTRO_FEATURES_append = " systemd" +DISTRO_FEATURES:append = " systemd" VIRTUAL-RUNTIME_init_manager = "systemd" PREFERRED_RPROVIDER_network-configuration ??= "networkd-dhcp-conf" diff --git a/conf/distro/poky-sota.conf b/conf/distro/poky-sota.conf index bfac90f..13444fd 100644 --- a/conf/distro/poky-sota.conf +++ b/conf/distro/poky-sota.conf @@ -6,4 +6,4 @@ DISTRO_NAME = "OTA-enabled Linux" DISTRO_VERSION = "1.0" DISTRO_CODENAME = "sota" -IMAGE_INSTALL_append_sota = " ostree-booted" +IMAGE_INSTALL:append:sota = " ostree-booted" diff --git a/conf/distro/sota.conf.inc b/conf/distro/sota.conf.inc index 99035de..f84b834 100644 --- a/conf/distro/sota.conf.inc +++ b/conf/distro/sota.conf.inc @@ -4,14 +4,14 @@ # # require conf/distro/sota.conf.inc -DISTRO_FEATURES_append = " sota usrmerge" -DISTRO_FEATURES_NATIVE_append = " sota" +DISTRO_FEATURES:append = " sota usrmerge" +DISTRO_FEATURES_NATIVE:append = " sota" INHERIT += " sota" # Prelinking increases the size of downloads and causes build errors -USER_CLASSES_remove = "image-prelink" +USER_CLASSES:remove = "image-prelink" # Enable reproducible builds. Use 0 as mtime, the same as OSTree is using. -INHERIT_remove = "reproducible_build" +INHERIT:remove = "reproducible_build" INHERIT += "reproducible_build_simple" export SOURCE_DATE_EPOCH = "0" diff --git a/conf/layer.conf b/conf/layer.conf index bce1439..672fed8 100644 --- a/conf/layer.conf +++ b/conf/layer.conf @@ -6,13 +6,13 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ ${LAYERDIR}/recipes-*/*/*.bbappend" BBFILE_COLLECTIONS += "sota" -BBFILE_PATTERN_sota = "^${LAYERDIR}/" -BBFILE_PRIORITY_sota = "7" +BBFILE_PATTERN:sota = "^${LAYERDIR}/" +BBFILE_PRIORITY:sota = "7" -LAYERDEPENDS_sota = "openembedded-layer" -LAYERDEPENDS_sota += "meta-python" -LAYERDEPENDS_sota += "filesystems-layer" -LAYERSERIES_COMPAT_sota = "dunfell gatesgarth hardknott" +LAYERDEPENDS:sota = "openembedded-layer" +LAYERDEPENDS:sota += "meta-python" +LAYERDEPENDS:sota += "filesystems-layer" +LAYERSERIES_COMPAT:sota = "dunfell gatesgarth hardknott" SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \ aktualizr-device-prov->aktualizr \ diff --git a/conf/local.conf.nonostree.append b/conf/local.conf.nonostree.append index ee56b69..5d0d065 100644 --- a/conf/local.conf.nonostree.append +++ b/conf/local.conf.nonostree.append @@ -1,11 +1,11 @@ -DISTRO_FEATURES_append = " systemd" +DISTRO_FEATURES:append = " systemd" VIRTUAL-RUNTIME_init_manager = "systemd" PREFERRED_RPROVIDER_network-configuration ??= "networkd-dhcp-conf" SOTA_DEPLOY_CREDENTIALS ?= "1" -PACKAGECONFIG_pn-aktualizr = "" +PACKAGECONFIG:pn-aktualizr = "" -IMAGE_INSTALL_append += "aktualizr" -IMAGE_INSTALL_append += "aktualizr-shared-prov" +IMAGE_INSTALL:append += "aktualizr" +IMAGE_INSTALL:append += "aktualizr-shared-prov" diff --git a/conf/local.conf.systemd.append b/conf/local.conf.systemd.append index 12e0182..be2e281 100644 --- a/conf/local.conf.systemd.append +++ b/conf/local.conf.systemd.append @@ -3,7 +3,7 @@ # It greatly helps diagnosing issues on testing devices but should be # carefully weighted against file system usage and flash device wear for # production systems. Please refer to systemd's docs for more details -IMAGE_INSTALL_append += " systemd-journald-persistent" +IMAGE_INSTALL:append += " systemd-journald-persistent" # Set resource limits for aktualizr service # @@ -12,4 +12,4 @@ IMAGE_INSTALL_append += " systemd-journald-persistent" #RESOURCE_CPU_WEIGHT_pn-aktualizr = "100" #RESOURCE_MEMORY_HIGH_pn-aktualizr = "100M" #RESOURCE_MEMORY_MAX_pn-aktualizr = "80%" -IMAGE_INSTALL_append += " aktualizr-resource-control" +IMAGE_INSTALL:append += " aktualizr-resource-control" -- cgit v1.2.3-54-g00ecf