From 255026c5b388926c14dd447fdb0607cc64b31169 Mon Sep 17 00:00:00 2001 From: Jonathan Lebon Date: Thu, 4 Feb 2021 16:42:03 -0500 Subject: [PATCH] extensions: adapt for new rpm-ostree support With https://github.com/coreos/rpm-ostree/pull/2439 and https://github.com/coreos/coreos-assembler/pull/2028, support for extensions is now more robust. The extensions.yaml file is now fed directly to rpm-ostree. We just need to do some minor tweaks: - drop listing usbguard deps, rpm-ostree fetches them automatically - mark `kernel-devel` as a development extension; this will signal the MCO that it's not intended to be directly layered on the host - use `match-base-evr: kernel` to enforce that the kernel development packages have the same EVR as the base kernel package in the OSTree --- extensions.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/extensions.yaml b/extensions.yaml index 8b8da9635..55cb2d277 100644 --- a/extensions.yaml +++ b/extensions.yaml @@ -1,26 +1,26 @@ # RPMs as operating system extensions, distinct from the base ostree commit/image # https://github.com/openshift/enhancements/blob/master/enhancements/rhcos/extensions.md # and https://github.com/coreos/fedora-coreos-tracker/issues/401 -# We currently explicitly list dependencies for each extension; see -# https://github.com/coreos/rpm-ostree/issues/2055 + +repos: + - rhel-8-nfv extensions: # https://github.com/coreos/fedora-coreos-tracker/issues/326 usbguard: packages: - usbguard - - libqb - - protobuf - # kernel-devel # https://github.com/kmods-via-containers/kmods-via-containers/issues/3 # https://gitlab.cee.redhat.com/coreos/redhat-coreos/merge_requests/866 kernel-devel: + kind: development packages: - kernel-devel - kernel-core - kernel-headers - kernel-modules - kernel-modules-extra + match-base-evr: kernel # GRPA-2822 # https://github.com/openshift/machine-config-operator/pull/1330 # https://github.com/openshift/enhancements/blob/master/enhancements/support-for-realtime-kernel.md