diff --git a/layers/meta-belden-coreos/classes/coreos-image.bbclass b/layers/meta-belden-coreos/classes/coreos-image.bbclass index 6eca24d..46d6f31 100644 --- a/layers/meta-belden-coreos/classes/coreos-image.bbclass +++ b/layers/meta-belden-coreos/classes/coreos-image.bbclass @@ -10,13 +10,17 @@ FEATURE_PACKAGES_container = "packagegroup-coreos-container" FEATURE_PACKAGES_container-dev-tools = "packagegroup-coreos-container-dev-tools" FEATURE_PACKAGES_container-cockpit = "cockpit-podman" +FEATURE_PACKAGES_networkmanager = "networkmanager networkmanager-nmcli" +FEATURE_PACKAGES_networkmanager-dev-tools = "networkmanager-nmtui" +FEATURE_PACKAGES_networkmanager-cockpit = "cockpit-networkmanager" + # The cockpit feature automatically install the corresponding # *-cockpit FEATURES_PACKAGES for any image features FEATURE_PACKAGES_cockpit = "packagegroup-coreos-cockpit ${@get_feature_packages_with_suffix('cockpit', d)}" # The dev-tools feature automatically install the corresponding # *-dev-tools FEATURES_PACKAGES for any image features -FEATURE_PACKAGES_dev-tools = "${@get_feature_packages_with_suffix('dev-tool', d)}" +FEATURE_PACKAGES_dev-tools = "${@get_feature_packages_with_suffix('dev-tools', d)}" def get_feature_packages_with_suffix(suffix, d): """ @@ -58,6 +62,7 @@ PACKAGE_EXCLUDE_COMPLEMENTARY:append = "${@bb.utils.contains_any('PACKAGE_INSTAL # IMAGE_FEATURES_CONFLICTS_foo = 'bar1 bar2' # An error exception would be raised if both image features foo and bar1(or bar2) are included + COREOS_IMAGE_BASE_INSTALL = '\ packagegroup-core-boot \ packagegroup-base-extended \ diff --git a/layers/meta-belden-coreos/conf/layer.conf b/layers/meta-belden-coreos/conf/layer.conf index 061726e..9a797c1 100644 --- a/layers/meta-belden-coreos/conf/layer.conf +++ b/layers/meta-belden-coreos/conf/layer.conf @@ -12,6 +12,7 @@ BBFILE_PRIORITY_meta-belden-coreos = "6" LAYERDEPENDS_meta-belden-coreos = "\ core \ openembedded-layer \ + networking-layer \ virtualization-layer \ webserver \ " diff --git a/layers/meta-belden-coreos/recipes-core/images/coreos-image-full-cmdline.bb b/layers/meta-belden-coreos/recipes-core/images/coreos-image-full-cmdline.bb index c482561..0efc2c1 100644 --- a/layers/meta-belden-coreos/recipes-core/images/coreos-image-full-cmdline.bb +++ b/layers/meta-belden-coreos/recipes-core/images/coreos-image-full-cmdline.bb @@ -3,5 +3,5 @@ functionality installed." inherit coreos-image -IMAGE_FEATURES += "ssh-server container dev-tools cockpit" +IMAGE_FEATURES += "ssh-server container dev-tools cockpit networkmanager" IMAGE_INSTALL:append = " packagegroup-core-full-cmdline"