distrodefs: Include default firmware packages only when not Oracle Linux 10 - #2620
distrodefs: Include default firmware packages only when not Oracle Linux 10#2620fwiko wants to merge 6 commits into
Conversation
Signed-off-by: fwiko <raffsimms@gmail.com>
Support a `not_arch` condition similar to `not_distro`, this is useful for this [1] PR to exclude firmware packages only on `s390x`. [1]: osbuild#2620 Signed-off-by: Simon de Vlieger <cmdr@supakeen.com>
Support a `not_arch` condition similar to `not_distro`, this is useful for this [1] PR to exclude firmware packages only on `s390x`. [1]: osbuild#2620 Signed-off-by: Simon de Vlieger <cmdr@supakeen.com>
There was a problem hiding this comment.
Hey this is fine, but there's a few things I'd like to do differently.
First organization wise:
- Let's define this package set as a single anchor under
.common; and call it something likeinstaller_split_firmware_pkgsetand then reference it. It's duplicated multiple times now (it already was, but if we're changing it let's do this as well to make our lives easier in the future and a bit easier to read the diff). If you want you can also put the entire condition as an anchor. - The same package set is also duplicated in the
ppc64leplatform so it can be removed there as well. - The
installer_split_firmware_pkgsetshould also be included under theospackage set for theimage-installerwhich is defined in thebare_metal_pkgset.
Then it also affects more artifacts than it should:
s390xdoesn't have the firmware package set but the new conditions don't exclude it.- There's no
not_archcondition; let's add it and then use it in the split firmware conditions so it's a bit easier to deal with. I've opened a PR to add it: #2621 so you can rebase after that lands and then use it 🙂. - I noticed that we don't refer to the correct platform on
aarch64so I have an open PR to address that as well: #2622.
After rebasing on both #2621 and #2622 (after they land) and with the organization fixes this should be much better.
The easiest way to find these things and see if they're affecting artifacts they shouldn't is to run the ./tools/gen-manifest-checksums.sh which will generate checksums for the manifests that we test in CI (which doesn't include OL, but does include RHEL). If everything goes right it should introduce no changes.
I've applied my suggestions locally (and incorporated those two PRs) and then it leads to no checksum problems so we should be good soon.
Don't address these concerns immediately, perhaps other reviewers have other ideas about the organization of this.
Support a `not_arch` condition similar to `not_distro`, this is useful for this [1] PR to exclude firmware packages only on `s390x`. [1]: osbuild#2620 Signed-off-by: Simon de Vlieger <cmdr@supakeen.com>
Signed-off-by: fwiko <raffsimms@gmail.com>
…o ol10-fix-installer-firmware
Signed-off-by: fwiko <raffsimms@gmail.com>
|
I've consolidated the pkgset and condition for reuse with the I've also noticed the minimal-tar-xz image-type has a subset of the firmware packages hardcoded, do we want to continue on this abstraction path and split the list of firmware packages into categories that would allow a conditions to combine subsets, remove the default, or add a specific condition? |
|
Can you rebase the branch and drop the merge commit? We use a fully linear history here. |
There was a problem hiding this comment.
This commit isn't doing what it's supposed to. I'm seeing a lot of changes in the package selection for RHEL 10 and CentOS 10 images. The packages seem to have been dropped from the image-installer for x86_64 and ppc64le and at the same time added to the network installer for ppc64le and s390x.
Fix a dependency resolution failure when building
image-installerandnetwork-installerimage-types for Oracle Linux 10.After success using image-builder to create OL9 images, we failed to replicate our workflow for OL10 because
distrodefs/rhel-10/imagetypes.yamlspecifies the following firmware packages for thex86_64_installer_platformandaarch64_installer_platformplatform definitions by default:The Oracle Linux 10 Release Notes specify these 14 packages were removed from the AppStream and/or BaseOS repos.
This change isolates the upstream EL10 split hardware firmware packages and conditionally opts into them only when the target distribution is not Oracle Linux.