-
Notifications
You must be signed in to change notification settings - Fork 612
Adopt (significantly modified) version of Fedora kiwi xml #16583
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
base: tomls/base/main
Are you sure you want to change the base?
Changes from all commits
9ef77d7
34e5d42
fe4d470
fb552d3
e013a30
82a0ff4
0a84b6d
cd11ebe
7500a22
62ff87f
8fb8649
79b18bf
bb83906
a068dc4
9493707
ebbc667
58aa2c0
81676fc
29a60b4
1f5353b
0543504
0b53932
03ad8a6
fa18b74
ec7faa6
aefc742
fb23500
83fd85e
b1e46cc
61144ce
545f34f
8bd1afb
eec0681
a0a759c
05fbd9c
3b27b03
e7885d9
3f9a9ef
aeeb89d
8009d0e
f8fd67a
becb33f
965afd0
5ef7128
3579e1a
597093a
2d20b91
b94ac22
37e0bcc
2d39ab9
4ea8aff
a40b07b
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
|
|
||
| <image schemaversion="7.4" name="AzureLinux"> | ||
| <description type="system"> | ||
| <author>Microsoft</author> | ||
| <contact>azurelinux@microsoft.com</contact> | ||
| <specification>AzureLinux</specification> | ||
| </description> | ||
| <preferences> | ||
| <version>4</version> | ||
| <packagemanager>dnf5</packagemanager> | ||
| <locale>en_US</locale> | ||
| <keytable>us</keytable> | ||
| <timezone>UTC</timezone> | ||
| <release-version>4</release-version> | ||
| </preferences> | ||
| <include from="this://./common/base.xml"/> | ||
| <include from="this://./common/boot.xml"/> | ||
| <include from="this://./repositories/core.xml"/> | ||
| <include from="this://./vm/azure.xml"/> | ||
| <include from="this://./vm/base.xml"/> | ||
| <include from="this://./vm/boot.xml"/> | ||
| <include from="this://./vm/hyperv.xml"/> | ||
| <include from="this://./vm/qemu.xml"/> | ||
| <packages type="bootstrap"> | ||
| <package name="filesystem"/> | ||
| </packages> | ||
| </image> | ||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,52 @@ | ||
| <image> | ||
| <profiles> | ||
| <profile name="CoreCommon" description="Core common packages"/> | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. What's the intended scoping of "Core" vs. "Base"? I'm assuming we're inheriting the terms from Fedora's kiwi files, but I don't think I'll have an easy time keeping them straight.
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. as you said, it's inherited from Fedora's terminology. |
||
| </profiles> | ||
| <packages type="image" patternType="plusRecommended" profiles="CoreCommon"> | ||
| <package name="audit"/> | ||
| <package name="bash"/> | ||
| <package name="coreutils"/> | ||
| <package name="curl"/> | ||
| <package name="dnf5"/> | ||
| <package name="dnf5-plugins"/> | ||
| <package name="dracut-config-generic"/> | ||
| <package name="dracut-config-rescue"/> | ||
| <package name="e2fsprogs"/> | ||
| <package name="filesystem"/> | ||
| <package name="firewalld"/> | ||
| <package name="glibc"/> | ||
| <package name="hostname"/> | ||
| <package name="initscripts"/> | ||
| <package name="iproute"/> | ||
| <package name="iputils"/> | ||
| <package name="kbd"/> | ||
| <package name="less"/> | ||
| <package name="man-db"/> | ||
| <package name="ncurses"/> | ||
| <package name="openssh-clients"/> | ||
| <package name="openssh-server"/> | ||
| <package name="parted"/> | ||
| <package name="policycoreutils"/> | ||
| <package name="procps-ng"/> | ||
| <package name="rootfiles"/> | ||
| <package name="rpm"/> | ||
| <package name="selinux-policy-targeted"/> | ||
| <package name="setup"/> | ||
| <package name="shadow-utils"/> | ||
| <package name="sudo"/> | ||
| <package name="systemd"/> | ||
| <package name="systemd-networkd"/> | ||
| <package name="systemd-oomd-defaults"/> | ||
| <package name="systemd-resolved"/> | ||
| <package name="util-linux"/> | ||
| <package name="vim-minimal"/> | ||
ddstreet marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| <package name="zram-generator-defaults"/> | ||
| <ignore name="7zip"/> | ||
| <ignore name="gawk-all-langpacks"/> | ||
| <ignore name="libsecret"/> | ||
| <ignore name="memstrack"/> | ||
| <ignore name="mkpasswd"/> | ||
| <ignore name="pinentry"/> | ||
| <ignore name="whois-nls"/> | ||
| </packages> | ||
| </image> | ||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| <image> | ||
| <profiles> | ||
| <profile name="BootCore" description="Boot core packages"/> | ||
| </profiles> | ||
| <packages type="bootstrap" patternType="plusRecommended" profiles="BootCore"> | ||
| <package name="grubby"/> | ||
| </packages> | ||
| <packages type="image" patternType="plusRecommended" profiles="BootCore"> | ||
| <ignore name="kernel-*debug*"/> | ||
| <package name="grub2-efi-aa64" arch="aarch64"/> | ||
| <package name="grub2-efi-aa64-modules" arch="aarch64"/> | ||
| <package name="grub2-efi-x64" arch="x86_64"/> | ||
| <package name="grub2-efi-x64-modules" arch="x86_64"/> | ||
| <package name="grub2-pc" arch="x86_64"/> | ||
| <package name="grub2-pc-modules" arch="x86_64"/> | ||
| <package name="shim-signed-aa64" arch="aarch64"/> | ||
| <package name="shim-signed-x64" arch="x86_64"/> | ||
| <package name="kernel-core"/> | ||
| </packages> | ||
| <packages type="iso" patternType="plusRecommended" profiles="BootCore"> | ||
| <package name="grub2-efi-aa64-cdboot" arch="aarch64"/> | ||
| <package name="grub2-efi-x64-cdboot" arch="x86_64"/> | ||
| </packages> | ||
| </image> |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -6,6 +6,18 @@ definition = { type = "kiwi", path = "vm-base/vm-base.kiwi" } | |
| description = "Container Base Image" | ||
| definition = { type = "kiwi", path = "container-base/container-base.kiwi" } | ||
|
|
||
| [images.AzureVM] | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. How do you see AzureVM being different from the We should also align on naming within the TOML file (i.e.,
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
see the package list comparisons in previous comments
i think so, yes
sure that's fine, do you have specific name suggestions? |
||
| description = "AzureVM" | ||
| definition = { profile = "AzureVM", type = "kiwi", path = "AzureLinux.kiwi" } | ||
|
|
||
| [images.HypervVM] | ||
| description = "HypervVM" | ||
| definition = { profile = "HypervVM", type = "kiwi", path = "AzureLinux.kiwi" } | ||
|
|
||
| [images.QemuVM] | ||
| description = "QemuVM" | ||
| definition = { profile = "QemuVM", type = "kiwi", path = "AzureLinux.kiwi" } | ||
|
|
||
| # NOTE: | ||
| # sudo dnf install -y kiwi-cli | ||
| # sudo kiwi --loglevel 10 \ | ||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| <image> | ||
| <repository type="rpm-md" alias="evergreen"> | ||
| <source path="http://20.88.251.114/kojifiles/repos-dist/azl4-bootstrap-rpms-tag-20260405/latest/$basearch/" /> | ||
| </repository> | ||
| </image> |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| <image> | ||
| <repository type="rpm-md" alias="azurelinux"> | ||
| <source path="https://packages.microsoft.com/azurelinux/$releasever/prod/base/$basearch/" /> | ||
| </repository> | ||
| </image> |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| core-evergreen.xml |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,40 @@ | ||
| <image> | ||
| <profiles> | ||
| <profile name="AzureVM" description="Azure Base Guest Image"> | ||
| <requires profile="CoreHypervVM"/> | ||
| <requires profile="BaseVM"/> | ||
| </profile> | ||
| </profiles> | ||
| <packages type="bootstrap" patternType="plusRecommended" profiles="AzureVM"> | ||
| <package name="azurelinux-release-cloud"/> | ||
| </packages> | ||
| <packages type="image" patternType="plusRecommended" profiles="AzureVM"> | ||
| <package name="azurelinux-release-cloud"/> | ||
| <package name="azure-vm-utils"/> | ||
| <package name="WALinuxAgent"/> | ||
| </packages> | ||
| <preferences profiles="AzureVM" arch="x86_64"> | ||
| <type image="oem" format="vhd-fixed" formatoptions="force_size" | ||
| filesystem="ext4" | ||
| kernelcmdline="no_timer_check console=tty1 console=ttyS0,115200n8 earlyprintk=ttyS0 systemd.firstboot=off" | ||
| devicepersistency="by-uuid" | ||
| bootpartition="false" efipartsize="100" firmware="uefi" | ||
| rootfs_label="azurelinux" | ||
| > | ||
| <bootloader name="grub2" bls="true" console="serial" timeout="0"/> | ||
| <size unit="G">5</size> | ||
| </type> | ||
| </preferences> | ||
| <preferences profiles="AzureVM" arch="aarch64"> | ||
| <type image="oem" format="vhd-fixed" formatoptions="force_size" | ||
| filesystem="ext4" | ||
| kernelcmdline="no_timer_check console=tty1 console=ttyAMA0,115200n8 earlyprintk=ttyAMA0 systemd.firstboot=off" | ||
| devicepersistency="by-uuid" | ||
| bootpartition="false" efipartsize="100" firmware="uefi" | ||
| rootfs_label="azurelinux" | ||
| > | ||
| <bootloader name="grub2" console="serial" timeout="0"/> | ||
| <size unit="G">5</size> | ||
| </type> | ||
| </preferences> | ||
| </image> |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,49 @@ | ||
| <image> | ||
| <profiles> | ||
| <profile name="CoreVM" description="Core packages for VMs"> | ||
| <requires profile="CoreCommon"/> | ||
| </profile> | ||
| <profile name="CoreHypervVM" description="Core packages for Hyper-V VMs"> | ||
| <requires profile="BootVM"/> | ||
| <requires profile="CoreVM"/> | ||
| </profile> | ||
| <profile name="CoreQemuVM" description="Core packages for Qemu VMs"> | ||
| <requires profile="BootVM"/> | ||
| <requires profile="CoreVM"/> | ||
| </profile> | ||
| <profile name="BaseVM" description="Base packages for VMs"> | ||
| <requires profile="CoreVM"/> | ||
| </profile> | ||
| </profiles> | ||
| <packages type="image" patternType="plusRecommended" profiles="CoreVM"> | ||
| <package name="cloud-init"/> | ||
| <package name="cloud-utils-growpart"/> | ||
| <package name="dracut-config-generic"/> | ||
| <package name="grubby"/> | ||
| <package name="rsync"/> | ||
| <package name="tar"/> | ||
| <package name="chrony"/> | ||
| <!-- console-login-helper-messages-issuegen requires | ||
| NetworkManager; it may be useful to re-include | ||
| once it can work for systemd-networkd also --> | ||
| <!-- <package name="console-login-helper-messages-issuegen"/> --> | ||
| <package name="console-login-helper-messages-motdgen"/> | ||
| <package name="console-login-helper-messages-profile"/> | ||
| <package name="systemd-oomd-defaults"/> | ||
| </packages> | ||
| <packages type="image" patternType="plusRecommended" profiles="CoreHypervVM"> | ||
| <package name="hyperv-daemons"/> | ||
| </packages> | ||
| <packages type="image" patternType="plusRecommended" profiles="CoreQemuVM"> | ||
| <package name="qemu-guest-agent"/> | ||
| </packages> | ||
| <packages type="image" patternType="plusRecommended" profiles="BaseVM"> | ||
| <ignore name="kernel"/> | ||
ddstreet marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| <ignore name="*-firmware"/> | ||
| <ignore name="geolite2-city"/> | ||
| <ignore name="geolite2-country"/> | ||
| <package name="dracut-kiwi-oem-repart"/> | ||
| <package name="glibc-langpack-en"/> | ||
| <package name="kernel-modules"/> | ||
| </packages> | ||
| </image> | ||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,10 @@ | ||
| <image> | ||
| <profiles> | ||
| <profile name="BootVM" description="Boot packages for VMs"> | ||
| <requires profile="BootCore"/> | ||
| </profile> | ||
| </profiles> | ||
| <packages type="image" patternType="plusRecommended" profiles="BootVM"> | ||
| <package name="grub2-tools" arch="aarch64,x86_64"/> | ||
| </packages> | ||
| </image> |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,38 @@ | ||
| <image> | ||
| <profiles> | ||
| <profile name="HypervVM" description="Hyperv Base Guest Image"> | ||
| <requires profile="CoreHypervVM"/> | ||
| <requires profile="BaseVM"/> | ||
| </profile> | ||
| </profiles> | ||
| <packages type="bootstrap" patternType="plusRecommended" profiles="HypervVM"> | ||
| <package name="azurelinux-release"/> | ||
| </packages> | ||
| <packages type="image" patternType="plusRecommended" profiles="HypervVM"> | ||
| <package name="azurelinux-release"/> | ||
| </packages> | ||
| <preferences profiles="HypervVM" arch="x86_64"> | ||
| <type image="oem" format="vhdx" | ||
| filesystem="ext4" | ||
| kernelcmdline="no_timer_check console=tty1 console=ttyS0,115200n8 systemd.firstboot=off" | ||
| devicepersistency="by-uuid" | ||
| bootpartition="false" efipartsize="100" firmware="uefi" | ||
| rootfs_label="azurelinux" | ||
| > | ||
| <bootloader name="grub2" bls="true" console="serial" timeout="0"/> | ||
| <size unit="G">5</size> | ||
| </type> | ||
| </preferences> | ||
| <preferences profiles="HypervVM" arch="aarch64"> | ||
| <type image="oem" format="vhdx" | ||
| filesystem="ext4" | ||
| kernelcmdline="no_timer_check console=tty1 console=ttyAMA0,115200n8 systemd.firstboot=off" | ||
| devicepersistency="by-uuid" | ||
| bootpartition="false" efipartsize="100" firmware="uefi" | ||
| rootfs_label="azurelinux" | ||
| > | ||
| <bootloader name="grub2" bls="true" console="serial" timeout="0"/> | ||
| <size unit="G">5</size> | ||
| </type> | ||
| </preferences> | ||
| </image> |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,38 @@ | ||
| <image> | ||
| <profiles> | ||
| <profile name="QemuVM" description="Qemu Base Guest Image"> | ||
| <requires profile="CoreQemuVM"/> | ||
| <requires profile="BaseVM"/> | ||
| </profile> | ||
| </profiles> | ||
| <packages type="bootstrap" patternType="plusRecommended" profiles="QemuVM"> | ||
| <package name="azurelinux-release"/> | ||
| </packages> | ||
| <packages type="image" patternType="plusRecommended" profiles="QemuVM"> | ||
| <package name="azurelinux-release"/> | ||
| </packages> | ||
| <preferences profiles="QemuVM" arch="x86_64"> | ||
| <type image="oem" format="qcow2" | ||
| filesystem="ext4" | ||
| kernelcmdline="no_timer_check console=tty1 console=ttyS0,115200n8 systemd.firstboot=off" | ||
| devicepersistency="by-uuid" | ||
| bootpartition="false" efipartsize="100" firmware="uefi" | ||
| rootfs_label="azurelinux" | ||
| > | ||
| <bootloader name="grub2" bls="true" console="serial" timeout="0"/> | ||
| <size unit="G">5</size> | ||
| </type> | ||
| </preferences> | ||
| <preferences profiles="QemuVM" arch="aarch64"> | ||
| <type image="oem" format="qcow2" | ||
| filesystem="ext4" | ||
| kernelcmdline="no_timer_check console=tty1 console=ttyAMA0,115200n8 systemd.firstboot=off" | ||
| devicepersistency="by-uuid" | ||
| bootpartition="false" efipartsize="100" firmware="uefi" | ||
| rootfs_label="azurelinux" | ||
| > | ||
| <bootloader name="grub2" bls="true" console="serial" timeout="0"/> | ||
| <size unit="G">5</size> | ||
| </type> | ||
| </preferences> | ||
| </image> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We should probably discuss the whole
4vs.4.0thing to make sure we're consistent. (I don't think I have a strong opinion one way or the other.)There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
i'd prefer '4' since we have not yet ever released a '.1' for any of our releases, and keeping it an integer also aligns with Fedora versioning.