feat(edk2): disable Xen OVMF build variant#16469
Open
christopherco wants to merge 1 commit intotomls/base/mainfrom
Open
feat(edk2): disable Xen OVMF build variant#16469christopherco wants to merge 1 commit intotomls/base/mainfrom
christopherco wants to merge 1 commit intotomls/base/mainfrom
Conversation
Collaborator
Author
|
Replaces #16465 |
Azure Linux targets Hyper-V/KVM, not Xen. The upstream edk2 spec builds a Xen OVMF firmware variant (edk2-ovmf-xen) when %fedora is defined. Disable by renaming [build.ovmf.xen] in edk2-build.fedora so the build script skips the Xen target, and remove the ovmf-xen subpackage via spec-remove-section overlays. All other Fedora-path features (IGVM, 4M qcow2, experimental, riscv64, loongarch64, ext4, tools-python) are preserved. Verified: build succeeds, edk2-ovmf-xen RPM is no longer produced, main edk2-ovmf package is intact.
christopherco
force-pushed
the
chrco/remove-xen-edk2-no-subpackage
branch
from
aa49e98 to
1e57568
Compare
christopherco
requested review from
ddstreetmicrosoft and
reubeno
as code owners
Collaborator
Author
|
CI fix - #16529 |
Contributor
There was a problem hiding this comment.
Pull request overview
This PR aims to disable building the Xen-specific OVMF firmware variant in the edk2 component, aligning Azure Linux firmware outputs with Hyper-V/KVM targets while preserving other Fedora-path firmware/features.
Changes:
- Add a dedicated
edk2.comp.tomlwith overlays intended to disable the Xen OVMF build and remove theovmf-xensubpackage. - Remove the bare
[components.edk2]entry frombase/comps/components.tomlnow thatedk2has a dedicated component definition file.
Reviewed changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated 1 comment.
| File | Description |
|---|---|
| base/comps/edk2/edk2.comp.toml | Introduces overlays to skip the Xen build target and drop the ovmf-xen subpackage. |
| base/comps/components.toml | Removes the inline edk2 component entry in favor of the dedicated *.comp.toml file. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
Comment on lines
+17
to
+31
| type = "spec-remove-section" | ||
| section = "%package" | ||
| package = "ovmf-xen" | ||
|
|
||
| [[components.edk2.overlays]] | ||
| description = "Remove %description ovmf-xen" | ||
| type = "spec-remove-section" | ||
| section = "%description" | ||
| package = "ovmf-xen" | ||
|
|
||
| [[components.edk2.overlays]] | ||
| description = "Remove %files ovmf-xen" | ||
| type = "spec-remove-section" | ||
| section = "%files" | ||
| package = "ovmf-xen" |
There was a problem hiding this comment.
spec-remove-section is not a valid overlay type in the current azldev schema (external/schemas/azldev.schema.json lists only spec--tag/lines/search-replace, patch-, file-*). As written, this component config will fail schema validation / overlay application. Please replace these with supported overlay types (e.g., spec-search-replace scoped to the relevant %package/%description/%files blocks, or another supported mechanism to prevent the ovmf-xen subpackage from being defined/built).
Suggested change
| type = "spec-remove-section" | |
| section = "%package" | |
| package = "ovmf-xen" | |
| [[components.edk2.overlays]] | |
| description = "Remove %description ovmf-xen" | |
| type = "spec-remove-section" | |
| section = "%description" | |
| package = "ovmf-xen" | |
| [[components.edk2.overlays]] | |
| description = "Remove %files ovmf-xen" | |
| type = "spec-remove-section" | |
| section = "%files" | |
| package = "ovmf-xen" | |
| type = "spec-search-replace" | |
| section = "%package" | |
| package = "ovmf-xen" | |
| regex = '^.*$' | |
| replacement = '' | |
| [[components.edk2.overlays]] | |
| description = "Remove %description ovmf-xen" | |
| type = "spec-search-replace" | |
| section = "%description" | |
| package = "ovmf-xen" | |
| regex = '^.*$' | |
| replacement = '' | |
| [[components.edk2.overlays]] | |
| description = "Remove %files ovmf-xen" | |
| type = "spec-search-replace" | |
| section = "%files" | |
| package = "ovmf-xen" | |
| regex = '^.*$' | |
| replacement = '' |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Azure Linux targets Hyper-V/KVM, not Xen. The upstream edk2 spec builds a Xen OVMF firmware variant (edk2-ovmf-xen) when %fedora is defined.
Disable by renaming [build.ovmf.xen] in edk2-build.fedora so the build script skips the Xen target, and remove the ovmf-xen subpackage via spec-remove-section overlays.
All other Fedora-path features (IGVM, 4M qcow2, experimental, riscv64, loongarch64, ext4, tools-python) are preserved.
Verified: build succeeds, edk2-ovmf-xen RPM is no longer produced, main edk2-ovmf package is intact.