diff options
Diffstat (limited to 'conf')
-rw-r--r-- | conf/distro/poky-sota-systemd.conf | 2 | ||||
-rw-r--r-- | conf/distro/poky-sota.conf | 2 | ||||
-rw-r--r-- | conf/distro/sota.conf.inc | 8 | ||||
-rw-r--r-- | conf/layer.conf | 12 | ||||
-rw-r--r-- | conf/local.conf.nonostree.append | 8 | ||||
-rw-r--r-- | conf/local.conf.systemd.append | 4 |
6 files changed, 18 insertions, 18 deletions
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" | |||
7 | DISTRO_VERSION = "1.0" | 7 | DISTRO_VERSION = "1.0" |
8 | DISTRO_CODENAME = "sota" | 8 | DISTRO_CODENAME = "sota" |
9 | 9 | ||
10 | DISTRO_FEATURES_append = " systemd" | 10 | DISTRO_FEATURES:append = " systemd" |
11 | VIRTUAL-RUNTIME_init_manager = "systemd" | 11 | VIRTUAL-RUNTIME_init_manager = "systemd" |
12 | PREFERRED_RPROVIDER_network-configuration ??= "networkd-dhcp-conf" | 12 | 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" | |||
6 | DISTRO_VERSION = "1.0" | 6 | DISTRO_VERSION = "1.0" |
7 | DISTRO_CODENAME = "sota" | 7 | DISTRO_CODENAME = "sota" |
8 | 8 | ||
9 | IMAGE_INSTALL_append_sota = " ostree-booted" | 9 | 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 @@ | |||
4 | # | 4 | # |
5 | # require conf/distro/sota.conf.inc | 5 | # require conf/distro/sota.conf.inc |
6 | 6 | ||
7 | DISTRO_FEATURES_append = " sota usrmerge" | 7 | DISTRO_FEATURES:append = " sota usrmerge" |
8 | DISTRO_FEATURES_NATIVE_append = " sota" | 8 | DISTRO_FEATURES_NATIVE:append = " sota" |
9 | INHERIT += " sota" | 9 | INHERIT += " sota" |
10 | # Prelinking increases the size of downloads and causes build errors | 10 | # Prelinking increases the size of downloads and causes build errors |
11 | USER_CLASSES_remove = "image-prelink" | 11 | USER_CLASSES:remove = "image-prelink" |
12 | 12 | ||
13 | # Enable reproducible builds. Use 0 as mtime, the same as OSTree is using. | 13 | # Enable reproducible builds. Use 0 as mtime, the same as OSTree is using. |
14 | INHERIT_remove = "reproducible_build" | 14 | INHERIT:remove = "reproducible_build" |
15 | INHERIT += "reproducible_build_simple" | 15 | INHERIT += "reproducible_build_simple" |
16 | 16 | ||
17 | export SOURCE_DATE_EPOCH = "0" | 17 | 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 \ | |||
6 | ${LAYERDIR}/recipes-*/*/*.bbappend" | 6 | ${LAYERDIR}/recipes-*/*/*.bbappend" |
7 | 7 | ||
8 | BBFILE_COLLECTIONS += "sota" | 8 | BBFILE_COLLECTIONS += "sota" |
9 | BBFILE_PATTERN_sota = "^${LAYERDIR}/" | 9 | BBFILE_PATTERN:sota = "^${LAYERDIR}/" |
10 | BBFILE_PRIORITY_sota = "7" | 10 | BBFILE_PRIORITY:sota = "7" |
11 | 11 | ||
12 | LAYERDEPENDS_sota = "openembedded-layer" | 12 | LAYERDEPENDS:sota = "openembedded-layer" |
13 | LAYERDEPENDS_sota += "meta-python" | 13 | LAYERDEPENDS:sota += "meta-python" |
14 | LAYERDEPENDS_sota += "filesystems-layer" | 14 | LAYERDEPENDS:sota += "filesystems-layer" |
15 | LAYERSERIES_COMPAT_sota = "dunfell gatesgarth hardknott" | 15 | LAYERSERIES_COMPAT:sota = "dunfell gatesgarth hardknott" |
16 | 16 | ||
17 | SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \ | 17 | SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \ |
18 | aktualizr-device-prov->aktualizr \ | 18 | 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 @@ | |||
1 | 1 | ||
2 | DISTRO_FEATURES_append = " systemd" | 2 | DISTRO_FEATURES:append = " systemd" |
3 | VIRTUAL-RUNTIME_init_manager = "systemd" | 3 | VIRTUAL-RUNTIME_init_manager = "systemd" |
4 | 4 | ||
5 | PREFERRED_RPROVIDER_network-configuration ??= "networkd-dhcp-conf" | 5 | PREFERRED_RPROVIDER_network-configuration ??= "networkd-dhcp-conf" |
6 | 6 | ||
7 | SOTA_DEPLOY_CREDENTIALS ?= "1" | 7 | SOTA_DEPLOY_CREDENTIALS ?= "1" |
8 | PACKAGECONFIG_pn-aktualizr = "" | 8 | PACKAGECONFIG:pn-aktualizr = "" |
9 | 9 | ||
10 | IMAGE_INSTALL_append += "aktualizr" | 10 | IMAGE_INSTALL:append += "aktualizr" |
11 | IMAGE_INSTALL_append += "aktualizr-shared-prov" | 11 | 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 @@ | |||
3 | # It greatly helps diagnosing issues on testing devices but should be | 3 | # It greatly helps diagnosing issues on testing devices but should be |
4 | # carefully weighted against file system usage and flash device wear for | 4 | # carefully weighted against file system usage and flash device wear for |
5 | # production systems. Please refer to systemd's docs for more details | 5 | # production systems. Please refer to systemd's docs for more details |
6 | IMAGE_INSTALL_append += " systemd-journald-persistent" | 6 | IMAGE_INSTALL:append += " systemd-journald-persistent" |
7 | 7 | ||
8 | # Set resource limits for aktualizr service | 8 | # Set resource limits for aktualizr service |
9 | # | 9 | # |
@@ -12,4 +12,4 @@ IMAGE_INSTALL_append += " systemd-journald-persistent" | |||
12 | #RESOURCE_CPU_WEIGHT_pn-aktualizr = "100" | 12 | #RESOURCE_CPU_WEIGHT_pn-aktualizr = "100" |
13 | #RESOURCE_MEMORY_HIGH_pn-aktualizr = "100M" | 13 | #RESOURCE_MEMORY_HIGH_pn-aktualizr = "100M" |
14 | #RESOURCE_MEMORY_MAX_pn-aktualizr = "80%" | 14 | #RESOURCE_MEMORY_MAX_pn-aktualizr = "80%" |
15 | IMAGE_INSTALL_append += " aktualizr-resource-control" | 15 | IMAGE_INSTALL:append += " aktualizr-resource-control" |