diff options
Diffstat (limited to 'external/meta-updater/conf')
9 files changed, 10 insertions, 8 deletions
diff --git a/external/meta-updater/conf/distro/poky-sota-systemd.conf b/external/meta-updater/conf/distro/poky-sota-systemd.conf index 0dc50b0e..4b7990f2 100644 --- a/external/meta-updater/conf/distro/poky-sota-systemd.conf +++ b/external/meta-updater/conf/distro/poky-sota-systemd.conf @@ -9,4 +9,4 @@ DISTRO_CODENAME = "sota" DISTRO_FEATURES_append = " systemd" VIRTUAL-RUNTIME_init_manager = "systemd" -PREFERRED_RPROVIDER_virtual/network-configuration ??= "networkd-dhcp-conf" +PREFERRED_RPROVIDER_network-configuration ??= "networkd-dhcp-conf" diff --git a/external/meta-updater/conf/distro/sota.conf.inc b/external/meta-updater/conf/distro/sota.conf.inc index 1d5f8df1..9804694c 100644 --- a/external/meta-updater/conf/distro/sota.conf.inc +++ b/external/meta-updater/conf/distro/sota.conf.inc @@ -11,10 +11,11 @@ INHERIT += " sota" USER_CLASSES_remove = "image-prelink" # Enable reproducible builds. Use 0 as mtime, the same as OSTree is using. +INHERIT_remove = "reproducible_build" INHERIT += "reproducible_build_simple" -export SOURCE_DATE_EPOCH ?= "0" -REPRODUCIBLE_TIMESTAMP_ROOTFS ?= "0" +export SOURCE_DATE_EPOCH = "0" +REPRODUCIBLE_TIMESTAMP_ROOTFS = "0" HOSTTOOLS += "git sync sha256sum" HOSTTOOLS_NONFATAL += "java repo python" diff --git a/external/meta-updater/conf/include/bblayers/sota.inc b/external/meta-updater/conf/include/bblayers/sota.inc index 26eea228..c4ecd4ee 100644 --- a/external/meta-updater/conf/include/bblayers/sota.inc +++ b/external/meta-updater/conf/include/bblayers/sota.inc @@ -1,3 +1,4 @@ BBLAYERS += "${METADIR}/meta-updater" BBLAYERS += "${METADIR}/meta-openembedded/meta-filesystems" BBLAYERS += "${METADIR}/meta-openembedded/meta-oe" +BBLAYERS += "${METADIR}/meta-openembedded/meta-python" diff --git a/external/meta-updater/conf/include/bblayers/sota_freedom-u540.inc b/external/meta-updater/conf/include/bblayers/sota_freedom-u540.inc new file mode 100644 index 00000000..977f96b2 --- /dev/null +++ b/external/meta-updater/conf/include/bblayers/sota_freedom-u540.inc @@ -0,0 +1,2 @@ +BBLAYERS += "${METADIR}/meta-riscv" +BBLAYERS += "${METADIR}/meta-updater-riscv" diff --git a/external/meta-updater/conf/include/bblayers/sota_raspberrypi2.inc b/external/meta-updater/conf/include/bblayers/sota_raspberrypi2.inc index 03f8f44b..ea420bad 100644 --- a/external/meta-updater/conf/include/bblayers/sota_raspberrypi2.inc +++ b/external/meta-updater/conf/include/bblayers/sota_raspberrypi2.inc @@ -1,3 +1,2 @@ -BBLAYERS += "${METADIR}/meta-openembedded/meta-python" BBLAYERS += "${METADIR}/meta-updater-raspberrypi" BBLAYERS += "${METADIR}/meta-raspberrypi" diff --git a/external/meta-updater/conf/include/bblayers/sota_raspberrypi3-64.inc b/external/meta-updater/conf/include/bblayers/sota_raspberrypi3-64.inc index 03f8f44b..ea420bad 100644 --- a/external/meta-updater/conf/include/bblayers/sota_raspberrypi3-64.inc +++ b/external/meta-updater/conf/include/bblayers/sota_raspberrypi3-64.inc @@ -1,3 +1,2 @@ -BBLAYERS += "${METADIR}/meta-openembedded/meta-python" BBLAYERS += "${METADIR}/meta-updater-raspberrypi" BBLAYERS += "${METADIR}/meta-raspberrypi" diff --git a/external/meta-updater/conf/include/bblayers/sota_raspberrypi3.inc b/external/meta-updater/conf/include/bblayers/sota_raspberrypi3.inc index 42d5eb1a..7e320af2 100644 --- a/external/meta-updater/conf/include/bblayers/sota_raspberrypi3.inc +++ b/external/meta-updater/conf/include/bblayers/sota_raspberrypi3.inc @@ -1,4 +1,3 @@ -BBLAYERS += "${METADIR}/meta-openembedded/meta-python" BBLAYERS += "${METADIR}/meta-updater-raspberrypi" BBLAYERS += "${METADIR}/meta-raspberrypi" BBLAYERS += "${METADIR}/meta-openembedded/meta-networking" diff --git a/external/meta-updater/conf/layer.conf b/external/meta-updater/conf/layer.conf index 39ea749f..a002e96a 100644 --- a/external/meta-updater/conf/layer.conf +++ b/external/meta-updater/conf/layer.conf @@ -10,8 +10,9 @@ BBFILE_PATTERN_sota = "^${LAYERDIR}/" BBFILE_PRIORITY_sota = "7" LAYERDEPENDS_sota = "openembedded-layer" +LAYERDEPENDS_sota += "meta-python" LAYERDEPENDS_sota += "filesystems-layer" -LAYERSERIES_COMPAT_sota = "thud" +LAYERSERIES_COMPAT_sota = "dunfell" SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \ aktualizr-device-prov->aktualizr \ diff --git a/external/meta-updater/conf/local.conf.nonostree.append b/external/meta-updater/conf/local.conf.nonostree.append index 0e63e988..ee56b69d 100644 --- a/external/meta-updater/conf/local.conf.nonostree.append +++ b/external/meta-updater/conf/local.conf.nonostree.append @@ -2,7 +2,7 @@ DISTRO_FEATURES_append = " systemd" VIRTUAL-RUNTIME_init_manager = "systemd" -PREFERRED_RPROVIDER_virtual/network-configuration ??= "networkd-dhcp-conf" +PREFERRED_RPROVIDER_network-configuration ??= "networkd-dhcp-conf" SOTA_DEPLOY_CREDENTIALS ?= "1" PACKAGECONFIG_pn-aktualizr = "" |