go.mod: update to images@v0.117.0
This commit updates to images v0.117.0 so that the cross-distro.sh test works again (images removed fedora-39.json in main but the uses the previous version of images that includes fedora-39 so there is a mismatch (we should look into if there is a way to get github.com/osbuild/images@latest instead of main in the cross-arch test). It also updates all the vendor stuff that got pulled via the new images release (which is giantonormous). This update requires updating the Go version to 1.22.8
This commit is contained in:
Michael Vogt
Achilleas Koutsou
parent
886ddc0bcc
commit
409b4f6048
584 changed files with 60776 additions and 50181 deletions
38
vendor/github.com/osbuild/images/pkg/distro/fedora/distro.go
generated
vendored
38
vendor/github.com/osbuild/images/pkg/distro/fedora/distro.go
generated
vendored
|
|
@ -13,6 +13,7 @@ import (
|
|||
"github.com/osbuild/images/pkg/customizations/oscap"
|
||||
"github.com/osbuild/images/pkg/datasizes"
|
||||
"github.com/osbuild/images/pkg/distro"
|
||||
"github.com/osbuild/images/pkg/distro/packagesets"
|
||||
"github.com/osbuild/images/pkg/osbuild"
|
||||
"github.com/osbuild/images/pkg/platform"
|
||||
"github.com/osbuild/images/pkg/rpmmd"
|
||||
|
|
@ -90,8 +91,15 @@ var (
|
|||
filename: "installer.iso",
|
||||
mimeType: "application/x-iso9660-image",
|
||||
packageSets: map[string]packageSetFunc{
|
||||
osPkgsKey: minimalrpmPackageSet,
|
||||
installerPkgsKey: imageInstallerPackageSet,
|
||||
osPkgsKey: func(t *imageType) rpmmd.PackageSet {
|
||||
// use the minimal raw image type for the OS package set
|
||||
ft := &imageType{
|
||||
name: "minimal-raw",
|
||||
arch: t.arch,
|
||||
}
|
||||
return packagesets.Load(ft, VersionReplacements())
|
||||
},
|
||||
installerPkgsKey: packageSetLoader,
|
||||
},
|
||||
defaultImageConfig: &distro.ImageConfig{
|
||||
Locale: common.ToPtr("en_US.UTF-8"),
|
||||
|
|
@ -114,7 +122,7 @@ var (
|
|||
filename: "live-installer.iso",
|
||||
mimeType: "application/x-iso9660-image",
|
||||
packageSets: map[string]packageSetFunc{
|
||||
installerPkgsKey: liveInstallerPackageSet,
|
||||
installerPkgsKey: packageSetLoader,
|
||||
},
|
||||
defaultImageConfig: &distro.ImageConfig{
|
||||
Locale: common.ToPtr("en_US.UTF-8"),
|
||||
|
|
@ -136,7 +144,7 @@ var (
|
|||
filename: "commit.tar",
|
||||
mimeType: "application/x-tar",
|
||||
packageSets: map[string]packageSetFunc{
|
||||
osPkgsKey: iotCommitPackageSet,
|
||||
osPkgsKey: packageSetLoader,
|
||||
},
|
||||
defaultImageConfig: &distro.ImageConfig{
|
||||
EnabledServices: iotServices,
|
||||
|
|
@ -155,7 +163,7 @@ var (
|
|||
filename: "iot-bootable-container.tar",
|
||||
mimeType: "application/x-tar",
|
||||
packageSets: map[string]packageSetFunc{
|
||||
osPkgsKey: bootableContainerPackageSet,
|
||||
osPkgsKey: packageSetLoader,
|
||||
},
|
||||
rpmOstree: true,
|
||||
image: bootableContainerImage,
|
||||
|
|
@ -171,7 +179,7 @@ var (
|
|||
filename: "container.tar",
|
||||
mimeType: "application/x-tar",
|
||||
packageSets: map[string]packageSetFunc{
|
||||
osPkgsKey: iotCommitPackageSet,
|
||||
osPkgsKey: packageSetLoader,
|
||||
containerPkgsKey: func(t *imageType) rpmmd.PackageSet {
|
||||
return rpmmd.PackageSet{}
|
||||
},
|
||||
|
|
@ -195,7 +203,7 @@ var (
|
|||
filename: "installer.iso",
|
||||
mimeType: "application/x-iso9660-image",
|
||||
packageSets: map[string]packageSetFunc{
|
||||
installerPkgsKey: iotInstallerPackageSet,
|
||||
installerPkgsKey: packageSetLoader,
|
||||
},
|
||||
defaultImageConfig: &distro.ImageConfig{
|
||||
Locale: common.ToPtr("en_US.UTF-8"),
|
||||
|
|
@ -216,7 +224,7 @@ var (
|
|||
filename: "simplified-installer.iso",
|
||||
mimeType: "application/x-iso9660-image",
|
||||
packageSets: map[string]packageSetFunc{
|
||||
installerPkgsKey: iotSimplifiedInstallerPackageSet,
|
||||
installerPkgsKey: packageSetLoader,
|
||||
},
|
||||
defaultImageConfig: &distro.ImageConfig{
|
||||
EnabledServices: iotServices,
|
||||
|
|
@ -306,7 +314,7 @@ var (
|
|||
mimeType: "application/x-qemu-disk",
|
||||
environment: &environment.KVM{},
|
||||
packageSets: map[string]packageSetFunc{
|
||||
osPkgsKey: qcow2CommonPackageSet,
|
||||
osPkgsKey: packageSetLoader,
|
||||
},
|
||||
defaultImageConfig: &distro.ImageConfig{
|
||||
DefaultTarget: common.ToPtr("multi-user.target"),
|
||||
|
|
@ -337,7 +345,7 @@ var (
|
|||
filename: "disk.vmdk",
|
||||
mimeType: "application/x-vmdk",
|
||||
packageSets: map[string]packageSetFunc{
|
||||
osPkgsKey: vmdkCommonPackageSet,
|
||||
osPkgsKey: packageSetLoader,
|
||||
},
|
||||
defaultImageConfig: vmdkDefaultImageConfig,
|
||||
kernelOptions: cloudKernelOptions,
|
||||
|
|
@ -356,7 +364,7 @@ var (
|
|||
filename: "image.ova",
|
||||
mimeType: "application/ovf",
|
||||
packageSets: map[string]packageSetFunc{
|
||||
osPkgsKey: vmdkCommonPackageSet,
|
||||
osPkgsKey: packageSetLoader,
|
||||
},
|
||||
defaultImageConfig: vmdkDefaultImageConfig,
|
||||
kernelOptions: cloudKernelOptions,
|
||||
|
|
@ -375,7 +383,7 @@ var (
|
|||
filename: "container.tar",
|
||||
mimeType: "application/x-tar",
|
||||
packageSets: map[string]packageSetFunc{
|
||||
osPkgsKey: containerPackageSet,
|
||||
osPkgsKey: packageSetLoader,
|
||||
},
|
||||
defaultImageConfig: &distro.ImageConfig{
|
||||
NoSElinux: common.ToPtr(true),
|
||||
|
|
@ -396,7 +404,7 @@ var (
|
|||
filename: "wsl.tar",
|
||||
mimeType: "application/x-tar",
|
||||
packageSets: map[string]packageSetFunc{
|
||||
osPkgsKey: containerPackageSet,
|
||||
osPkgsKey: packageSetLoader,
|
||||
},
|
||||
defaultImageConfig: &distro.ImageConfig{
|
||||
NoSElinux: common.ToPtr(true),
|
||||
|
|
@ -423,7 +431,7 @@ var (
|
|||
compression: "xz",
|
||||
mimeType: "application/xz",
|
||||
packageSets: map[string]packageSetFunc{
|
||||
osPkgsKey: minimalrpmPackageSet,
|
||||
osPkgsKey: packageSetLoader,
|
||||
},
|
||||
defaultImageConfig: &distro.ImageConfig{
|
||||
EnabledServices: minimalRawServices,
|
||||
|
|
@ -660,7 +668,7 @@ func newDistro(version int) distro.Distro {
|
|||
vhdImgType.exports = []string{"vpc"}
|
||||
vhdImgType.environment = &environment.Azure{}
|
||||
vhdImgType.packageSets = map[string]packageSetFunc{
|
||||
osPkgsKey: vhdCommonPackageSet,
|
||||
osPkgsKey: packageSetLoader,
|
||||
}
|
||||
vhdConfig := distro.ImageConfig{
|
||||
SshdConfig: &osbuild.SshdConfigStageOptions{
|
||||
|
|
|
|||
710
vendor/github.com/osbuild/images/pkg/distro/fedora/package_sets.go
generated
vendored
710
vendor/github.com/osbuild/images/pkg/distro/fedora/package_sets.go
generated
vendored
|
|
@ -1,714 +1,10 @@
|
|||
package fedora
|
||||
|
||||
// This file defines package sets that are used by more than one image type.
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
|
||||
"github.com/osbuild/images/internal/common"
|
||||
"github.com/osbuild/images/pkg/arch"
|
||||
"github.com/osbuild/images/pkg/distro/packagesets"
|
||||
"github.com/osbuild/images/pkg/rpmmd"
|
||||
)
|
||||
|
||||
func cloudBaseSet(t *imageType) rpmmd.PackageSet {
|
||||
return rpmmd.PackageSet{
|
||||
Include: []string{
|
||||
"@Fedora Cloud Server",
|
||||
"chrony", // not mentioned in the kickstart, anaconda pulls it when setting the timezone
|
||||
"langpacks-en",
|
||||
},
|
||||
Exclude: []string{
|
||||
"dracut-config-rescue",
|
||||
"firewalld",
|
||||
"geolite2-city",
|
||||
"geolite2-country",
|
||||
"plymouth",
|
||||
},
|
||||
}
|
||||
}
|
||||
|
||||
func qcow2CommonPackageSet(t *imageType) rpmmd.PackageSet {
|
||||
return cloudBaseSet(t).Append(
|
||||
rpmmd.PackageSet{
|
||||
Include: []string{
|
||||
"qemu-guest-agent",
|
||||
},
|
||||
})
|
||||
}
|
||||
|
||||
func vhdCommonPackageSet(t *imageType) rpmmd.PackageSet {
|
||||
return cloudBaseSet(t).Append(
|
||||
rpmmd.PackageSet{
|
||||
Include: []string{
|
||||
"WALinuxAgent",
|
||||
},
|
||||
})
|
||||
}
|
||||
|
||||
func vmdkCommonPackageSet(t *imageType) rpmmd.PackageSet {
|
||||
return rpmmd.PackageSet{
|
||||
Include: []string{
|
||||
"@Fedora Cloud Server",
|
||||
"chrony",
|
||||
"systemd-udev",
|
||||
"langpacks-en",
|
||||
"open-vm-tools",
|
||||
},
|
||||
Exclude: []string{
|
||||
"dracut-config-rescue",
|
||||
"etables",
|
||||
"firewalld",
|
||||
"geolite2-city",
|
||||
"geolite2-country",
|
||||
"gobject-introspection",
|
||||
"plymouth",
|
||||
"zram-generator-defaults",
|
||||
"grubby-deprecated",
|
||||
"extlinux-bootloader",
|
||||
},
|
||||
}
|
||||
}
|
||||
|
||||
// fedora iot commit OS package set
|
||||
func iotCommitPackageSet(t *imageType) rpmmd.PackageSet {
|
||||
ps := rpmmd.PackageSet{
|
||||
Include: []string{
|
||||
"NetworkManager",
|
||||
"NetworkManager-wifi",
|
||||
"NetworkManager-wwan",
|
||||
"aardvark-dns",
|
||||
"atheros-firmware",
|
||||
"attr",
|
||||
"authselect",
|
||||
"basesystem",
|
||||
"bash",
|
||||
"bash-completion",
|
||||
"brcmfmac-firmware",
|
||||
"chrony",
|
||||
"clevis",
|
||||
"clevis-dracut",
|
||||
"clevis-luks",
|
||||
"clevis-pin-tpm2",
|
||||
"container-selinux",
|
||||
"containernetworking-plugins",
|
||||
"coreutils",
|
||||
"cracklib-dicts",
|
||||
"criu",
|
||||
"cryptsetup",
|
||||
"curl",
|
||||
"dbus-parsec",
|
||||
"dosfstools",
|
||||
"dracut-config-generic",
|
||||
"dracut-network",
|
||||
"e2fsprogs",
|
||||
"efibootmgr",
|
||||
"fdo-client",
|
||||
"fdo-owner-cli",
|
||||
"fedora-iot-config",
|
||||
"fedora-release-iot",
|
||||
"firewalld",
|
||||
"fwupd",
|
||||
"fwupd-efi",
|
||||
"fwupd-plugin-modem-manager",
|
||||
"fwupd-plugin-uefi-capsule-data",
|
||||
"glibc",
|
||||
"glibc-minimal-langpack",
|
||||
"gnupg2",
|
||||
"greenboot",
|
||||
"greenboot-default-health-checks",
|
||||
"gzip",
|
||||
"hostname",
|
||||
"ignition",
|
||||
"ignition-edge",
|
||||
"ima-evm-utils",
|
||||
"iproute",
|
||||
"iputils",
|
||||
"iwd",
|
||||
"iwlwifi-mvm-firmware",
|
||||
"kernel-tools",
|
||||
"keyutils",
|
||||
"less",
|
||||
"libsss_sudo",
|
||||
"linux-firmware",
|
||||
"lvm2",
|
||||
"netavark",
|
||||
"nss-altfiles",
|
||||
"openssh-clients",
|
||||
"openssh-server",
|
||||
"openssl",
|
||||
"parsec",
|
||||
"pinentry",
|
||||
"podman",
|
||||
"policycoreutils",
|
||||
"policycoreutils-python-utils",
|
||||
"polkit",
|
||||
"procps-ng",
|
||||
"realtek-firmware",
|
||||
"rootfiles",
|
||||
"rpm",
|
||||
"screen",
|
||||
"selinux-policy-targeted",
|
||||
"setools-console",
|
||||
"setup",
|
||||
"shadow-utils",
|
||||
"skopeo",
|
||||
"slirp4netns",
|
||||
"ssh-key-dir",
|
||||
"sssd-client",
|
||||
"sudo",
|
||||
"systemd",
|
||||
"systemd-resolved",
|
||||
"tar",
|
||||
"tmux",
|
||||
"tpm2-pkcs11",
|
||||
"traceroute",
|
||||
"usbguard",
|
||||
"util-linux",
|
||||
"vim-minimal",
|
||||
"wireless-regdb",
|
||||
"wpa_supplicant",
|
||||
"xfsprogs",
|
||||
"xz",
|
||||
"zezere-ignition",
|
||||
"zram-generator",
|
||||
},
|
||||
}
|
||||
|
||||
if common.VersionLessThan(t.arch.distro.osVersion, "40") {
|
||||
ps = ps.Append(rpmmd.PackageSet{
|
||||
Include: []string{
|
||||
"passwd", // provided by shadow-utils in F40+
|
||||
"podman-plugins", // deprecated in podman 5
|
||||
},
|
||||
})
|
||||
}
|
||||
if common.VersionLessThan(t.arch.distro.osVersion, "41") {
|
||||
ps = ps.Append(rpmmd.PackageSet{
|
||||
Include: []string{
|
||||
"dnsmasq", // deprecated for F41+
|
||||
},
|
||||
})
|
||||
}
|
||||
if common.VersionGreaterThanOrEqual(t.arch.distro.osVersion, "41") {
|
||||
ps = ps.Append(rpmmd.PackageSet{
|
||||
Include: []string{
|
||||
"bootupd", // Added in F41+
|
||||
},
|
||||
})
|
||||
}
|
||||
|
||||
return ps
|
||||
}
|
||||
|
||||
func bootableContainerPackageSet(t *imageType) rpmmd.PackageSet {
|
||||
// Replicating package selection from centos-bootc:
|
||||
// https://github.com/CentOS/centos-bootc/
|
||||
ps := rpmmd.PackageSet{
|
||||
Include: []string{
|
||||
"acl",
|
||||
"attr", // used by admins interactively
|
||||
"bootc",
|
||||
"bootupd",
|
||||
"chrony", // NTP support
|
||||
"container-selinux",
|
||||
"container-selinux",
|
||||
"crun",
|
||||
"cryptsetup",
|
||||
"dnf",
|
||||
"dosfstools",
|
||||
"e2fsprogs",
|
||||
"fwupd", // if you're using linux-firmware, you probably also want fwupd
|
||||
"gdisk",
|
||||
"iproute", "iproute-tc", // route manipulation and QoS
|
||||
"iptables", "nftables", // firewall manipulation
|
||||
"iptables-services", // additional firewall support
|
||||
"kbd", // i18n
|
||||
"keyutils", // Manipulating the kernel keyring; used by bootc
|
||||
"libsss_sudo", // allow communication between sudo and SSSD for caching sudo rules by SSSD
|
||||
"linux-firmware", // linux-firmware now a recommends so let's explicitly include it
|
||||
"logrotate", // There are things that write outside of the journal still (such as the classic wtmp, etc.). auditd also writes outside the journal but it has its own log rotation. Anything package layered will also tend to expect files dropped in /etc/logrotate.d to work. Really, this is a legacy thing, but if we don't have it then people's disks will slowly fill up with logs.
|
||||
"lsof",
|
||||
"lvm2", // Storage configuration/management
|
||||
"nano", // default editor
|
||||
"ncurses", // provides terminal tools like clear, reset, tput, and tset
|
||||
"NetworkManager-cloud-setup", // support for cloud quirks and dynamic config in real rootfs: https://github.com/coreos/fedora-coreos-tracker/issues/320
|
||||
"NetworkManager", "hostname", // standard tools for configuring network/hostname
|
||||
"NetworkManager-team", "teamd", // teaming https://github.com/coreos/fedora-coreos-config/pull/289 and http://bugzilla.redhat.com/1758162
|
||||
"NetworkManager-tui", // interactive Networking configuration during coreos-install
|
||||
"nfs-utils-coreos", "iptables-nft", // minimal NFS client
|
||||
"nss-altfiles",
|
||||
"openssh-clients",
|
||||
"openssh-server",
|
||||
"openssl",
|
||||
"ostree",
|
||||
"shadow-utils", // User configuration
|
||||
"podman",
|
||||
"rpm-ostree",
|
||||
"selinux-policy-targeted",
|
||||
"sg3_utils",
|
||||
"skopeo",
|
||||
"socat", "net-tools", "bind-utils", // interactive network tools for admins
|
||||
"sssd-client", "sssd-ad", "sssd-ipa", "sssd-krb5", "sssd-ldap", // SSSD backends
|
||||
"stalld", // Boost starving threads https://github.com/coreos/fedora-coreos-tracker/issues/753
|
||||
"subscription-manager", // To ensure we can enable client certs to access RHEL content
|
||||
"sudo",
|
||||
"systemd",
|
||||
"systemd-resolved", // resolved was broken out to its own package in rawhide/f35
|
||||
"tpm2-tools", // needed for tpm2 bound luks
|
||||
"WALinuxAgent-udev", // udev rules for Azure (rhbz#1748432)
|
||||
"xfsprogs",
|
||||
"zram-generator", // zram-generator (but not zram-generator-defaults) for F33 change
|
||||
},
|
||||
Exclude: []string{
|
||||
"cowsay", // just in case
|
||||
"grubby",
|
||||
"initscripts", // make sure initscripts doesn't get pulled back in https://github.com/coreos/fedora-coreos-tracker/issues/220#issuecomment-611566254
|
||||
"NetworkManager-initscripts-ifcfg-rh", // do not use legacy ifcfg config format in NetworkManager See https://github.com/coreos/fedora-coreos-config/pull/1991
|
||||
"nodejs",
|
||||
"plymouth", // for (datacenter/cloud oriented) servers, we want to see the details by default. https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/thread/HSMISZ3ETWQ4ETVLWZQJ55ARZT27AAV3/
|
||||
"systemd-networkd", // we use NetworkManager
|
||||
},
|
||||
}
|
||||
|
||||
if common.VersionLessThan(t.arch.distro.osVersion, "40") {
|
||||
ps = ps.Append(rpmmd.PackageSet{
|
||||
Include: []string{
|
||||
"passwd", // provided by shadow-utils in F40+
|
||||
},
|
||||
})
|
||||
}
|
||||
|
||||
switch t.Arch().Name() {
|
||||
case arch.ARCH_AARCH64.String():
|
||||
ps.Append(rpmmd.PackageSet{
|
||||
Include: []string{
|
||||
"irqbalance",
|
||||
"ostree-grub2",
|
||||
},
|
||||
Exclude: []string{
|
||||
"perl",
|
||||
"perl-interpreter",
|
||||
},
|
||||
})
|
||||
case arch.ARCH_PPC64LE.String():
|
||||
ps.Append(rpmmd.PackageSet{
|
||||
Include: []string{
|
||||
"irqbalance",
|
||||
"librtas",
|
||||
"powerpc-utils-core",
|
||||
"ppc64-diag-rtas",
|
||||
},
|
||||
})
|
||||
case arch.ARCH_X86_64.String():
|
||||
ps.Append(rpmmd.PackageSet{
|
||||
Include: []string{
|
||||
"irqbalance",
|
||||
},
|
||||
Exclude: []string{
|
||||
"perl",
|
||||
"perl-interpreter",
|
||||
},
|
||||
})
|
||||
}
|
||||
|
||||
return ps
|
||||
}
|
||||
|
||||
// INSTALLER PACKAGE SET
|
||||
|
||||
func installerPackageSet(t *imageType) rpmmd.PackageSet {
|
||||
return rpmmd.PackageSet{
|
||||
Include: []string{
|
||||
"anaconda-dracut",
|
||||
"atheros-firmware",
|
||||
"brcmfmac-firmware",
|
||||
"curl",
|
||||
"dracut-config-generic",
|
||||
"dracut-network",
|
||||
"hostname",
|
||||
"iwlwifi-dvm-firmware",
|
||||
"iwlwifi-mvm-firmware",
|
||||
"kernel",
|
||||
"linux-firmware",
|
||||
"less",
|
||||
"nfs-utils",
|
||||
"openssh-clients",
|
||||
"ostree",
|
||||
"plymouth",
|
||||
"realtek-firmware",
|
||||
"rng-tools",
|
||||
"rpcbind",
|
||||
"selinux-policy-targeted",
|
||||
"systemd",
|
||||
"tar",
|
||||
"xfsprogs",
|
||||
"xz",
|
||||
},
|
||||
}
|
||||
}
|
||||
|
||||
func anacondaPackageSet(t *imageType) rpmmd.PackageSet {
|
||||
|
||||
// common installer packages
|
||||
ps := installerPackageSet(t)
|
||||
|
||||
ps = ps.Append(rpmmd.PackageSet{
|
||||
Include: []string{
|
||||
"aajohan-comfortaa-fonts",
|
||||
"abattis-cantarell-fonts",
|
||||
"alsa-firmware",
|
||||
"alsa-tools-firmware",
|
||||
"anaconda",
|
||||
"anaconda-dracut",
|
||||
"anaconda-install-img-deps",
|
||||
"anaconda-widgets",
|
||||
"atheros-firmware",
|
||||
"audit",
|
||||
"bind-utils",
|
||||
"bitmap-fangsongti-fonts",
|
||||
"brcmfmac-firmware",
|
||||
"bzip2",
|
||||
"cryptsetup",
|
||||
"curl",
|
||||
"dbus-x11",
|
||||
"dejavu-sans-fonts",
|
||||
"dejavu-sans-mono-fonts",
|
||||
"device-mapper-persistent-data",
|
||||
"dmidecode",
|
||||
"dnf",
|
||||
"dracut-config-generic",
|
||||
"dracut-network",
|
||||
"efibootmgr",
|
||||
"ethtool",
|
||||
"fcoe-utils",
|
||||
"ftp",
|
||||
"gdb-gdbserver",
|
||||
"gdisk",
|
||||
"glibc-all-langpacks",
|
||||
"gnome-kiosk",
|
||||
"google-noto-sans-cjk-ttc-fonts",
|
||||
"grub2-tools",
|
||||
"grub2-tools-extra",
|
||||
"grub2-tools-minimal",
|
||||
"grubby",
|
||||
"gsettings-desktop-schemas",
|
||||
"hdparm",
|
||||
"hexedit",
|
||||
"hostname",
|
||||
"initscripts",
|
||||
"ipmitool",
|
||||
"iwlwifi-dvm-firmware",
|
||||
"iwlwifi-mvm-firmware",
|
||||
"jomolhari-fonts",
|
||||
"kacst-farsi-fonts",
|
||||
"kacst-qurn-fonts",
|
||||
"kbd",
|
||||
"kbd-misc",
|
||||
"kdump-anaconda-addon",
|
||||
"kernel",
|
||||
"khmeros-base-fonts",
|
||||
"less",
|
||||
"libblockdev-lvm-dbus",
|
||||
"libibverbs",
|
||||
"libreport-plugin-bugzilla",
|
||||
"libreport-plugin-reportuploader",
|
||||
"librsvg2",
|
||||
"linux-firmware",
|
||||
"lldpad",
|
||||
"lohit-assamese-fonts",
|
||||
"lohit-bengali-fonts",
|
||||
"lohit-devanagari-fonts",
|
||||
"lohit-gujarati-fonts",
|
||||
"lohit-gurmukhi-fonts",
|
||||
"lohit-kannada-fonts",
|
||||
"lohit-odia-fonts",
|
||||
"lohit-tamil-fonts",
|
||||
"lohit-telugu-fonts",
|
||||
"lsof",
|
||||
"madan-fonts",
|
||||
"mtr",
|
||||
"mt-st",
|
||||
"net-tools",
|
||||
"nfs-utils",
|
||||
"nmap-ncat",
|
||||
"nm-connection-editor",
|
||||
"nss-tools",
|
||||
"openssh-clients",
|
||||
"openssh-server",
|
||||
"ostree",
|
||||
"pciutils",
|
||||
"perl-interpreter",
|
||||
"pigz",
|
||||
"plymouth",
|
||||
"python3-pyatspi",
|
||||
"rdma-core",
|
||||
"realtek-firmware",
|
||||
"rit-meera-new-fonts",
|
||||
"rng-tools",
|
||||
"rpcbind",
|
||||
"rpm-ostree",
|
||||
"rsync",
|
||||
"rsyslog",
|
||||
"selinux-policy-targeted",
|
||||
"sg3_utils",
|
||||
"sil-abyssinica-fonts",
|
||||
"sil-padauk-fonts",
|
||||
"sil-scheherazade-new-fonts",
|
||||
"smartmontools",
|
||||
"spice-vdagent",
|
||||
"strace",
|
||||
"systemd",
|
||||
"tar",
|
||||
"thai-scalable-waree-fonts",
|
||||
"tigervnc-server-minimal",
|
||||
"tigervnc-server-module",
|
||||
"udisks2",
|
||||
"udisks2-iscsi",
|
||||
"usbutils",
|
||||
"vim-minimal",
|
||||
"volume_key",
|
||||
"wget",
|
||||
"xfsdump",
|
||||
"xfsprogs",
|
||||
"xorg-x11-drivers",
|
||||
"xorg-x11-fonts-misc",
|
||||
"xorg-x11-server-Xorg",
|
||||
"xorg-x11-xauth",
|
||||
"metacity",
|
||||
"xrdb",
|
||||
"xz",
|
||||
},
|
||||
})
|
||||
|
||||
switch t.Arch().Name() {
|
||||
case arch.ARCH_X86_64.String():
|
||||
ps = ps.Append(rpmmd.PackageSet{
|
||||
Include: []string{
|
||||
"biosdevname",
|
||||
"dmidecode",
|
||||
"grub2-tools-efi",
|
||||
"memtest86+",
|
||||
},
|
||||
})
|
||||
|
||||
case arch.ARCH_AARCH64.String():
|
||||
ps = ps.Append(rpmmd.PackageSet{
|
||||
Include: []string{
|
||||
"dmidecode",
|
||||
},
|
||||
})
|
||||
|
||||
default:
|
||||
panic(fmt.Sprintf("unsupported arch: %s", t.Arch().Name()))
|
||||
}
|
||||
|
||||
return ps
|
||||
}
|
||||
|
||||
func iotInstallerPackageSet(t *imageType) rpmmd.PackageSet {
|
||||
// include anaconda packages
|
||||
ps := anacondaPackageSet(t)
|
||||
|
||||
if common.VersionGreaterThanOrEqual(t.arch.distro.osVersion, "39") {
|
||||
ps = ps.Append(rpmmd.PackageSet{
|
||||
Include: []string{
|
||||
"fedora-release-iot",
|
||||
},
|
||||
})
|
||||
}
|
||||
|
||||
return ps
|
||||
}
|
||||
|
||||
func liveInstallerPackageSet(t *imageType) rpmmd.PackageSet {
|
||||
ps := rpmmd.PackageSet{
|
||||
Include: []string{
|
||||
"@workstation-product-environment",
|
||||
"@anaconda-tools",
|
||||
"anaconda-install-env-deps",
|
||||
"anaconda-live",
|
||||
"anaconda-dracut",
|
||||
"dracut-live",
|
||||
"glibc-all-langpacks",
|
||||
"kernel",
|
||||
"kernel-modules",
|
||||
"kernel-modules-extra",
|
||||
"livesys-scripts",
|
||||
"rng-tools",
|
||||
"rdma-core",
|
||||
"gnome-kiosk",
|
||||
},
|
||||
Exclude: []string{
|
||||
"@dial-up",
|
||||
"@input-methods",
|
||||
"@standard",
|
||||
"device-mapper-multipath",
|
||||
"fcoe-utils",
|
||||
"gfs2-utils",
|
||||
"reiserfs-utils",
|
||||
"sdubby",
|
||||
},
|
||||
}
|
||||
|
||||
if common.VersionGreaterThanOrEqual(t.arch.distro.osVersion, VERSION_RAWHIDE) {
|
||||
ps = ps.Append(rpmmd.PackageSet{
|
||||
Include: []string{
|
||||
"anaconda-webui",
|
||||
},
|
||||
})
|
||||
}
|
||||
|
||||
return ps
|
||||
}
|
||||
|
||||
func imageInstallerPackageSet(t *imageType) rpmmd.PackageSet {
|
||||
ps := anacondaPackageSet(t)
|
||||
|
||||
if common.VersionGreaterThanOrEqual(t.arch.distro.osVersion, VERSION_RAWHIDE) {
|
||||
ps = ps.Append(rpmmd.PackageSet{
|
||||
Include: []string{
|
||||
"anaconda-webui",
|
||||
},
|
||||
})
|
||||
}
|
||||
|
||||
return ps
|
||||
}
|
||||
|
||||
func containerPackageSet(t *imageType) rpmmd.PackageSet {
|
||||
ps := rpmmd.PackageSet{
|
||||
Include: []string{
|
||||
"bash",
|
||||
"coreutils",
|
||||
"yum",
|
||||
"dnf",
|
||||
"fedora-release-container",
|
||||
"glibc-minimal-langpack",
|
||||
"rootfiles",
|
||||
"rpm",
|
||||
"sudo",
|
||||
"tar",
|
||||
"util-linux-core",
|
||||
"vim-minimal",
|
||||
},
|
||||
Exclude: []string{
|
||||
"crypto-policies-scripts",
|
||||
"dbus-broker",
|
||||
"deltarpm",
|
||||
"dosfstools",
|
||||
"e2fsprogs",
|
||||
"elfutils-debuginfod-client",
|
||||
"fuse-libs",
|
||||
"gawk-all-langpacks",
|
||||
"glibc-gconv-extra",
|
||||
"glibc-langpack-en",
|
||||
"gnupg2-smime",
|
||||
"grubby",
|
||||
"kernel-core",
|
||||
"kernel-debug-core",
|
||||
"kernel",
|
||||
"langpacks-en_GB",
|
||||
"langpacks-en",
|
||||
"libss",
|
||||
"libxcrypt-compat",
|
||||
"nano",
|
||||
"openssl-pkcs11",
|
||||
"pinentry",
|
||||
"python3-unbound",
|
||||
"shared-mime-info",
|
||||
"sssd-client",
|
||||
"sudo-python-plugin",
|
||||
"systemd",
|
||||
"trousers",
|
||||
"whois-nls",
|
||||
"xkeyboard-config",
|
||||
},
|
||||
}
|
||||
|
||||
return ps
|
||||
}
|
||||
|
||||
func minimalrpmPackageSet(t *imageType) rpmmd.PackageSet {
|
||||
return rpmmd.PackageSet{
|
||||
Include: []string{
|
||||
"@core",
|
||||
"initial-setup",
|
||||
"libxkbcommon",
|
||||
"NetworkManager-wifi",
|
||||
"brcmfmac-firmware",
|
||||
"realtek-firmware",
|
||||
"iwlwifi-mvm-firmware",
|
||||
},
|
||||
}
|
||||
}
|
||||
|
||||
func iotSimplifiedInstallerPackageSet(t *imageType) rpmmd.PackageSet {
|
||||
// common installer packages
|
||||
ps := installerPackageSet(t)
|
||||
|
||||
ps = ps.Append(rpmmd.PackageSet{
|
||||
Include: []string{
|
||||
"attr",
|
||||
"basesystem",
|
||||
"binutils",
|
||||
"bsdtar",
|
||||
"clevis-dracut",
|
||||
"clevis-luks",
|
||||
"cloud-utils-growpart",
|
||||
"coreos-installer",
|
||||
"coreos-installer-dracut",
|
||||
"coreutils",
|
||||
"device-mapper-multipath",
|
||||
"dosfstools",
|
||||
"dracut-live",
|
||||
"e2fsprogs",
|
||||
"fcoe-utils",
|
||||
"fdo-init",
|
||||
"fedora-logos",
|
||||
"gdisk",
|
||||
"gzip",
|
||||
"ima-evm-utils",
|
||||
"iproute",
|
||||
"iptables",
|
||||
"iputils",
|
||||
"iscsi-initiator-utils",
|
||||
"keyutils",
|
||||
"lldpad",
|
||||
"lvm2",
|
||||
"mdadm",
|
||||
"nss-softokn",
|
||||
"policycoreutils",
|
||||
"policycoreutils-python-utils",
|
||||
"procps-ng",
|
||||
"rootfiles",
|
||||
"setools-console",
|
||||
"sudo",
|
||||
"traceroute",
|
||||
"util-linux",
|
||||
},
|
||||
})
|
||||
|
||||
if common.VersionGreaterThanOrEqual(t.arch.distro.osVersion, "40") {
|
||||
ps = ps.Append(rpmmd.PackageSet{
|
||||
Include: []string{
|
||||
"shadow-utils", // includes passwd
|
||||
},
|
||||
})
|
||||
} else {
|
||||
// F39 only
|
||||
ps = ps.Append(rpmmd.PackageSet{
|
||||
Include: []string{
|
||||
"passwd",
|
||||
},
|
||||
})
|
||||
}
|
||||
if common.VersionLessThan(t.arch.distro.osVersion, "41") {
|
||||
ps = ps.Append(rpmmd.PackageSet{
|
||||
Include: []string{
|
||||
"dnsmasq", // deprecated for F41+
|
||||
},
|
||||
})
|
||||
}
|
||||
|
||||
return ps
|
||||
func packageSetLoader(t *imageType) rpmmd.PackageSet {
|
||||
return packagesets.Load(t, VersionReplacements())
|
||||
}
|
||||
|
|
|
|||
8
vendor/github.com/osbuild/images/pkg/distro/fedora/version.go
generated
vendored
8
vendor/github.com/osbuild/images/pkg/distro/fedora/version.go
generated
vendored
|
|
@ -6,3 +6,11 @@ const VERSION_RAWHIDE = "42"
|
|||
// Fedora version 41 and later use a plain squashfs rootfs on the iso instead of
|
||||
// compressing an ext4 filesystem.
|
||||
const VERSION_ROOTFS_SQUASHFS = "41"
|
||||
|
||||
func VersionReplacements() map[string]string {
|
||||
return map[string]string{
|
||||
"VERSION_BRANCHED": VERSION_BRANCHED,
|
||||
"VERSION_RAWHIDE": VERSION_RAWHIDE,
|
||||
"VERSION_ROOTFS_SQUASHFS": VERSION_ROOTFS_SQUASHFS,
|
||||
}
|
||||
}
|
||||
|
|
|
|||
904
vendor/github.com/osbuild/images/pkg/distro/packagesets/fedora/package_sets.yaml
generated
vendored
Normal file
904
vendor/github.com/osbuild/images/pkg/distro/packagesets/fedora/package_sets.yaml
generated
vendored
Normal file
|
|
@ -0,0 +1,904 @@
|
|||
---
|
||||
cloud_base: # not used directly; added for reference
|
||||
include:
|
||||
- "@Fedora Cloud Server"
|
||||
- "chrony" # not mentioned in the kickstart anaconda pulls it when setting the timezone
|
||||
- "langpacks-en"
|
||||
exclude:
|
||||
- "dracut-config-rescue"
|
||||
- "firewalld"
|
||||
- "geolite2-city"
|
||||
- "geolite2-country"
|
||||
- "plymouth"
|
||||
|
||||
qcow2: &qcow2
|
||||
include:
|
||||
# cloud_base
|
||||
- "@Fedora Cloud Server"
|
||||
- "chrony" # not mentioned in the kickstart anaconda pulls it when setting the timezone
|
||||
- "langpacks-en"
|
||||
|
||||
# qcow2
|
||||
- "qemu-guest-agent"
|
||||
exclude:
|
||||
# cloud_base
|
||||
- "dracut-config-rescue"
|
||||
- "firewalld"
|
||||
- "geolite2-city"
|
||||
- "geolite2-country"
|
||||
- "plymouth"
|
||||
|
||||
ami:
|
||||
<<: *qcow2
|
||||
|
||||
oci:
|
||||
<<: *qcow2
|
||||
|
||||
openstack:
|
||||
<<: *qcow2
|
||||
|
||||
vhd:
|
||||
include:
|
||||
# cloud_base
|
||||
- "@Fedora Cloud Server"
|
||||
- "chrony" # not mentioned in the kickstart anaconda pulls it when setting the timezone
|
||||
- "langpacks-en"
|
||||
|
||||
# vhd
|
||||
- "WALinuxAgent"
|
||||
exclude:
|
||||
# cloud_base
|
||||
- "dracut-config-rescue"
|
||||
- "firewalld"
|
||||
- "geolite2-city"
|
||||
- "geolite2-country"
|
||||
- "plymouth"
|
||||
|
||||
vmdk: &vmdk
|
||||
include:
|
||||
- "@Fedora Cloud Server"
|
||||
- "chrony"
|
||||
- "systemd-udev"
|
||||
- "langpacks-en"
|
||||
- "open-vm-tools"
|
||||
exclude:
|
||||
- "dracut-config-rescue"
|
||||
- "etables"
|
||||
- "firewalld"
|
||||
- "geolite2-city"
|
||||
- "geolite2-country"
|
||||
- "gobject-introspection"
|
||||
- "plymouth"
|
||||
- "zram-generator-defaults"
|
||||
- "grubby-deprecated"
|
||||
- "extlinux-bootloader"
|
||||
|
||||
ova:
|
||||
<<: *vmdk
|
||||
|
||||
# NOTE: keep in sync with official fedora-iot definitions:
|
||||
# https://pagure.io/fedora-iot/ostree/blob/main/f/fedora-iot-base.yaml
|
||||
iot_commit: &iot_commit
|
||||
include:
|
||||
- "NetworkManager"
|
||||
- "NetworkManager-wifi"
|
||||
- "NetworkManager-wwan"
|
||||
- "aardvark-dns"
|
||||
- "atheros-firmware"
|
||||
- "attr"
|
||||
- "authselect"
|
||||
- "bash"
|
||||
- "bash-completion"
|
||||
- "brcmfmac-firmware"
|
||||
- "chrony"
|
||||
- "clevis"
|
||||
- "clevis-dracut"
|
||||
- "clevis-luks"
|
||||
- "clevis-pin-tpm2"
|
||||
- "container-selinux"
|
||||
- "containernetworking-plugins"
|
||||
- "coreutils"
|
||||
- "cracklib-dicts"
|
||||
- "criu"
|
||||
- "cryptsetup"
|
||||
- "curl"
|
||||
- "dbus-parsec"
|
||||
- "dosfstools"
|
||||
- "dracut-config-generic"
|
||||
- "dracut-network"
|
||||
- "e2fsprogs"
|
||||
- "efibootmgr"
|
||||
- "fdo-client"
|
||||
- "fdo-owner-cli"
|
||||
- "fedora-iot-config"
|
||||
- "fedora-release-iot"
|
||||
- "firewalld"
|
||||
- "fwupd"
|
||||
- "fwupd-efi"
|
||||
- "fwupd-plugin-modem-manager"
|
||||
- "fwupd-plugin-uefi-capsule-data"
|
||||
- "glibc"
|
||||
- "glibc-minimal-langpack"
|
||||
- "gnupg2"
|
||||
- "greenboot"
|
||||
- "greenboot-default-health-checks"
|
||||
- "gzip"
|
||||
- "hostname"
|
||||
- "ignition"
|
||||
- "ignition-edge"
|
||||
- "ima-evm-utils"
|
||||
- "iproute"
|
||||
- "iputils"
|
||||
- "iwd"
|
||||
- "iwlwifi-mvm-firmware"
|
||||
- "kernel-tools"
|
||||
- "keyutils"
|
||||
- "less"
|
||||
- "libsss_sudo"
|
||||
- "linux-firmware"
|
||||
- "lvm2"
|
||||
- "netavark"
|
||||
- "nss-altfiles"
|
||||
- "openssh-clients"
|
||||
- "openssh-server"
|
||||
- "openssl"
|
||||
- "parsec"
|
||||
- "pinentry"
|
||||
- "podman"
|
||||
- "policycoreutils"
|
||||
- "policycoreutils-python-utils"
|
||||
- "polkit"
|
||||
- "procps-ng"
|
||||
- "realtek-firmware"
|
||||
- "rootfiles"
|
||||
- "rpm"
|
||||
- "screen"
|
||||
- "selinux-policy-targeted"
|
||||
- "setools-console"
|
||||
- "setup"
|
||||
- "shadow-utils"
|
||||
- "skopeo"
|
||||
- "slirp4netns"
|
||||
- "ssh-key-dir"
|
||||
- "sssd-client"
|
||||
- "sudo"
|
||||
- "systemd"
|
||||
- "systemd-resolved"
|
||||
- "tar"
|
||||
- "tmux"
|
||||
- "tpm2-pkcs11"
|
||||
- "traceroute"
|
||||
- "usbguard"
|
||||
- "util-linux"
|
||||
- "vim-minimal"
|
||||
- "wireless-regdb"
|
||||
- "wpa_supplicant"
|
||||
- "xfsprogs"
|
||||
- "xz"
|
||||
- "zezere-ignition"
|
||||
- "zram-generator"
|
||||
condition:
|
||||
version_less_than:
|
||||
"41":
|
||||
include:
|
||||
- "dnsmasq"
|
||||
"43":
|
||||
include:
|
||||
- "basesystem"
|
||||
version_greater_or_equal:
|
||||
"41":
|
||||
include:
|
||||
- "bootupd"
|
||||
"43":
|
||||
include:
|
||||
- "filesystem"
|
||||
|
||||
iot_container:
|
||||
<<: *iot_commit
|
||||
|
||||
iot_bootable_container:
|
||||
include:
|
||||
- "acl"
|
||||
- "attr" # used by admins interactively
|
||||
- "bootc"
|
||||
- "bootupd"
|
||||
- "chrony" # NTP support
|
||||
- "container-selinux"
|
||||
- "container-selinux"
|
||||
- "crun"
|
||||
- "cryptsetup"
|
||||
- "dnf"
|
||||
- "dosfstools"
|
||||
- "e2fsprogs"
|
||||
- "fwupd" # if you're using linux-firmware you probably also want fwupd
|
||||
- "gdisk"
|
||||
- "iproute" # route manipulation and QoS
|
||||
- "iproute-tc"
|
||||
- "iptables" # firewall manipulation
|
||||
- "nftables"
|
||||
- "iptables-services" # additional firewall support
|
||||
- "kbd" # i18n
|
||||
- "keyutils" # Manipulating the kernel keyring; used by bootc
|
||||
- "libsss_sudo" # allow communication between sudo and SSSD for caching sudo rules by SSSD
|
||||
- "linux-firmware" # linux-firmware now a recommends so let's explicitly include it
|
||||
- "logrotate" # There are things that write outside of the journal still (such as the classic wtmp etc.). auditd also writes outside the journal but it has its own log rotation. Anything package layered will also tend to expect files dropped in /etc/logrotate.d to work. Really this is a legacy thing but if we don't have it then people's disks will slowly fill up with logs.
|
||||
- "lsof"
|
||||
- "lvm2" # Storage configuration/management
|
||||
- "nano" # default editor
|
||||
- "ncurses" # provides terminal tools like clear reset tput and tset
|
||||
- "NetworkManager-cloud-setup" # support for cloud quirks and dynamic config in real rootfs: https:#github.com/coreos/fedora-coreos-tracker/issues/320
|
||||
- "NetworkManager" # standard tools for configuring network/hostname
|
||||
- "hostname"
|
||||
- "NetworkManager-team" # teaming https:#github.com/coreos/fedora-coreos-config/pull/289 and http:#bugzilla.redhat.com/1758162
|
||||
- "teamd"
|
||||
- "NetworkManager-tui" # interactive Networking configuration during coreos-install
|
||||
- "nfs-utils-coreos" # minimal NFS client
|
||||
- "iptables-nft"
|
||||
- "nss-altfiles"
|
||||
- "openssh-clients"
|
||||
- "openssh-server"
|
||||
- "openssl"
|
||||
- "ostree"
|
||||
- "shadow-utils" # User configuration
|
||||
- "podman"
|
||||
- "rpm-ostree"
|
||||
- "selinux-policy-targeted"
|
||||
- "sg3_utils"
|
||||
- "skopeo"
|
||||
- "socat" # interactive network tools for admins
|
||||
- "net-tools"
|
||||
- "bind-utils"
|
||||
- "sssd-client" # SSSD backends
|
||||
- "sssd-ad"
|
||||
- "sssd-ipa"
|
||||
- "sssd-krb5"
|
||||
- "sssd-ldap"
|
||||
- "stalld" # Boost starving threads https:#github.com/coreos/fedora-coreos-tracker/issues/753
|
||||
- "subscription-manager" # To ensure we can enable client certs to access RHEL content
|
||||
- "sudo"
|
||||
- "systemd"
|
||||
- "systemd-resolved" # resolved was broken out to its own package in rawhide/f35
|
||||
- "tpm2-tools" # needed for tpm2 bound luks
|
||||
- "WALinuxAgent-udev" # udev rules for Azure (rhbz#1748432)
|
||||
- "xfsprogs"
|
||||
- "zram-generator" # zram-generator (but not zram-generator-defaults) for F33 change
|
||||
exclude:
|
||||
- "cowsay" # just in case
|
||||
- "grubby"
|
||||
- "initscripts" # make sure initscripts doesn't get pulled back in https:#github.com/coreos/fedora-coreos-tracker/issues/220#issuecomment-611566254
|
||||
- "NetworkManager-initscripts-ifcfg-rh" # do not use legacy ifcfg config format in NetworkManager See https:#github.com/coreos/fedora-coreos-config/pull/1991
|
||||
- "nodejs"
|
||||
- "plymouth" # for (datacenter/cloud oriented) servers we want to see the details by default. https:#lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/thread/HSMISZ3ETWQ4ETVLWZQJ55ARZT27AAV3/
|
||||
- "systemd-networkd" # we use NetworkManager
|
||||
condition:
|
||||
architecture:
|
||||
aarch64:
|
||||
include:
|
||||
- "irqbalance"
|
||||
- "ostree-grub2"
|
||||
exclude:
|
||||
- "perl"
|
||||
- "perl-interpreter"
|
||||
ppc64le:
|
||||
include:
|
||||
- "irqbalance"
|
||||
- "librtas"
|
||||
- "powerpc-utils-core"
|
||||
- "ppc64-diag-rtas"
|
||||
x86_64:
|
||||
include:
|
||||
- "irqbalance"
|
||||
exclude:
|
||||
- "perl"
|
||||
- "perl-interpreter"
|
||||
|
||||
installer:
|
||||
include:
|
||||
- "anaconda-dracut"
|
||||
- "atheros-firmware"
|
||||
- "brcmfmac-firmware"
|
||||
- "curl"
|
||||
- "dracut-config-generic"
|
||||
- "dracut-network"
|
||||
- "hostname"
|
||||
- "iwlwifi-dvm-firmware"
|
||||
- "iwlwifi-mvm-firmware"
|
||||
- "kernel"
|
||||
- "linux-firmware"
|
||||
- "less"
|
||||
- "nfs-utils"
|
||||
- "openssh-clients"
|
||||
- "ostree"
|
||||
- "plymouth"
|
||||
- "realtek-firmware"
|
||||
- "rng-tools"
|
||||
- "rpcbind"
|
||||
- "selinux-policy-targeted"
|
||||
- "systemd"
|
||||
- "tar"
|
||||
- "xfsprogs"
|
||||
- "xz"
|
||||
|
||||
|
||||
anaconda:
|
||||
include:
|
||||
- "aajohan-comfortaa-fonts"
|
||||
- "abattis-cantarell-fonts"
|
||||
- "alsa-firmware"
|
||||
- "alsa-tools-firmware"
|
||||
- "anaconda"
|
||||
- "anaconda-dracut"
|
||||
- "anaconda-install-img-deps"
|
||||
- "anaconda-widgets"
|
||||
- "atheros-firmware"
|
||||
- "audit"
|
||||
- "bind-utils"
|
||||
- "bitmap-fangsongti-fonts"
|
||||
- "brcmfmac-firmware"
|
||||
- "bzip2"
|
||||
- "cryptsetup"
|
||||
- "curl"
|
||||
- "dbus-x11"
|
||||
- "dejavu-sans-fonts"
|
||||
- "dejavu-sans-mono-fonts"
|
||||
- "device-mapper-persistent-data"
|
||||
- "dmidecode"
|
||||
- "dnf"
|
||||
- "dracut-config-generic"
|
||||
- "dracut-network"
|
||||
- "efibootmgr"
|
||||
- "ethtool"
|
||||
- "fcoe-utils"
|
||||
- "ftp"
|
||||
- "gdb-gdbserver"
|
||||
- "gdisk"
|
||||
- "glibc-all-langpacks"
|
||||
- "gnome-kiosk"
|
||||
- "google-noto-sans-cjk-ttc-fonts"
|
||||
- "grub2-tools"
|
||||
- "grub2-tools-extra"
|
||||
- "grub2-tools-minimal"
|
||||
- "grubby"
|
||||
- "gsettings-desktop-schemas"
|
||||
- "hdparm"
|
||||
- "hexedit"
|
||||
- "hostname"
|
||||
- "initscripts"
|
||||
- "ipmitool"
|
||||
- "iwlwifi-dvm-firmware"
|
||||
- "iwlwifi-mvm-firmware"
|
||||
- "jomolhari-fonts"
|
||||
- "kacst-farsi-fonts"
|
||||
- "kacst-qurn-fonts"
|
||||
- "kbd"
|
||||
- "kbd-misc"
|
||||
- "kdump-anaconda-addon"
|
||||
- "kernel"
|
||||
- "khmeros-base-fonts"
|
||||
- "less"
|
||||
- "libblockdev-lvm-dbus"
|
||||
- "libibverbs"
|
||||
- "libreport-plugin-bugzilla"
|
||||
- "libreport-plugin-reportuploader"
|
||||
- "librsvg2"
|
||||
- "linux-firmware"
|
||||
- "lldpad"
|
||||
- "lohit-assamese-fonts"
|
||||
- "lohit-bengali-fonts"
|
||||
- "lohit-devanagari-fonts"
|
||||
- "lohit-gujarati-fonts"
|
||||
- "lohit-gurmukhi-fonts"
|
||||
- "lohit-kannada-fonts"
|
||||
- "lohit-odia-fonts"
|
||||
- "lohit-tamil-fonts"
|
||||
- "lohit-telugu-fonts"
|
||||
- "lsof"
|
||||
- "madan-fonts"
|
||||
- "mtr"
|
||||
- "mt-st"
|
||||
- "net-tools"
|
||||
- "nfs-utils"
|
||||
- "nmap-ncat"
|
||||
- "nm-connection-editor"
|
||||
- "nss-tools"
|
||||
- "openssh-clients"
|
||||
- "openssh-server"
|
||||
- "ostree"
|
||||
- "pciutils"
|
||||
- "perl-interpreter"
|
||||
- "pigz"
|
||||
- "plymouth"
|
||||
- "python3-pyatspi"
|
||||
- "rdma-core"
|
||||
- "realtek-firmware"
|
||||
- "rit-meera-new-fonts"
|
||||
- "rng-tools"
|
||||
- "rpcbind"
|
||||
- "rpm-ostree"
|
||||
- "rsync"
|
||||
- "rsyslog"
|
||||
- "selinux-policy-targeted"
|
||||
- "sg3_utils"
|
||||
- "sil-abyssinica-fonts"
|
||||
- "sil-padauk-fonts"
|
||||
- "sil-scheherazade-new-fonts"
|
||||
- "smartmontools"
|
||||
- "spice-vdagent"
|
||||
- "strace"
|
||||
- "systemd"
|
||||
- "tar"
|
||||
- "thai-scalable-waree-fonts"
|
||||
- "tigervnc-server-minimal"
|
||||
- "tigervnc-server-module"
|
||||
- "udisks2"
|
||||
- "udisks2-iscsi"
|
||||
- "usbutils"
|
||||
- "vim-minimal"
|
||||
- "volume_key"
|
||||
- "wget"
|
||||
- "xfsdump"
|
||||
- "xfsprogs"
|
||||
- "xorg-x11-drivers"
|
||||
- "xorg-x11-fonts-misc"
|
||||
- "xorg-x11-server-Xorg"
|
||||
- "xorg-x11-xauth"
|
||||
- "metacity"
|
||||
- "xrdb"
|
||||
- "xz"
|
||||
condition:
|
||||
architecture:
|
||||
x86_64:
|
||||
include:
|
||||
- "biosdevname"
|
||||
- "dmidecode"
|
||||
- "grub2-tools-efi"
|
||||
- "memtest86+"
|
||||
aarch64:
|
||||
include:
|
||||
- "dmidecode"
|
||||
|
||||
iot_installer:
|
||||
# anaconda
|
||||
include:
|
||||
- "aajohan-comfortaa-fonts"
|
||||
- "abattis-cantarell-fonts"
|
||||
- "alsa-firmware"
|
||||
- "alsa-tools-firmware"
|
||||
- "anaconda"
|
||||
- "anaconda-dracut"
|
||||
- "anaconda-install-img-deps"
|
||||
- "anaconda-widgets"
|
||||
- "atheros-firmware"
|
||||
- "audit"
|
||||
- "bind-utils"
|
||||
- "bitmap-fangsongti-fonts"
|
||||
- "brcmfmac-firmware"
|
||||
- "bzip2"
|
||||
- "cryptsetup"
|
||||
- "curl"
|
||||
- "dbus-x11"
|
||||
- "dejavu-sans-fonts"
|
||||
- "dejavu-sans-mono-fonts"
|
||||
- "device-mapper-persistent-data"
|
||||
- "dmidecode"
|
||||
- "dnf"
|
||||
- "dracut-config-generic"
|
||||
- "dracut-network"
|
||||
- "efibootmgr"
|
||||
- "ethtool"
|
||||
- "fcoe-utils"
|
||||
- "ftp"
|
||||
- "gdb-gdbserver"
|
||||
- "gdisk"
|
||||
- "glibc-all-langpacks"
|
||||
- "gnome-kiosk"
|
||||
- "google-noto-sans-cjk-ttc-fonts"
|
||||
- "grub2-tools"
|
||||
- "grub2-tools-extra"
|
||||
- "grub2-tools-minimal"
|
||||
- "grubby"
|
||||
- "gsettings-desktop-schemas"
|
||||
- "hdparm"
|
||||
- "hexedit"
|
||||
- "hostname"
|
||||
- "initscripts"
|
||||
- "ipmitool"
|
||||
- "iwlwifi-dvm-firmware"
|
||||
- "iwlwifi-mvm-firmware"
|
||||
- "jomolhari-fonts"
|
||||
- "kacst-farsi-fonts"
|
||||
- "kacst-qurn-fonts"
|
||||
- "kbd"
|
||||
- "kbd-misc"
|
||||
- "kdump-anaconda-addon"
|
||||
- "kernel"
|
||||
- "khmeros-base-fonts"
|
||||
- "less"
|
||||
- "libblockdev-lvm-dbus"
|
||||
- "libibverbs"
|
||||
- "libreport-plugin-bugzilla"
|
||||
- "libreport-plugin-reportuploader"
|
||||
- "librsvg2"
|
||||
- "linux-firmware"
|
||||
- "lldpad"
|
||||
- "lohit-assamese-fonts"
|
||||
- "lohit-bengali-fonts"
|
||||
- "lohit-devanagari-fonts"
|
||||
- "lohit-gujarati-fonts"
|
||||
- "lohit-gurmukhi-fonts"
|
||||
- "lohit-kannada-fonts"
|
||||
- "lohit-odia-fonts"
|
||||
- "lohit-tamil-fonts"
|
||||
- "lohit-telugu-fonts"
|
||||
- "lsof"
|
||||
- "madan-fonts"
|
||||
- "mtr"
|
||||
- "mt-st"
|
||||
- "net-tools"
|
||||
- "nfs-utils"
|
||||
- "nmap-ncat"
|
||||
- "nm-connection-editor"
|
||||
- "nss-tools"
|
||||
- "openssh-clients"
|
||||
- "openssh-server"
|
||||
- "ostree"
|
||||
- "pciutils"
|
||||
- "perl-interpreter"
|
||||
- "pigz"
|
||||
- "plymouth"
|
||||
- "python3-pyatspi"
|
||||
- "rdma-core"
|
||||
- "realtek-firmware"
|
||||
- "rit-meera-new-fonts"
|
||||
- "rng-tools"
|
||||
- "rpcbind"
|
||||
- "rpm-ostree"
|
||||
- "rsync"
|
||||
- "rsyslog"
|
||||
- "selinux-policy-targeted"
|
||||
- "sg3_utils"
|
||||
- "sil-abyssinica-fonts"
|
||||
- "sil-padauk-fonts"
|
||||
- "sil-scheherazade-new-fonts"
|
||||
- "smartmontools"
|
||||
- "spice-vdagent"
|
||||
- "strace"
|
||||
- "systemd"
|
||||
- "tar"
|
||||
- "thai-scalable-waree-fonts"
|
||||
- "tigervnc-server-minimal"
|
||||
- "tigervnc-server-module"
|
||||
- "udisks2"
|
||||
- "udisks2-iscsi"
|
||||
- "usbutils"
|
||||
- "vim-minimal"
|
||||
- "volume_key"
|
||||
- "wget"
|
||||
- "xfsdump"
|
||||
- "xfsprogs"
|
||||
- "xorg-x11-drivers"
|
||||
- "xorg-x11-fonts-misc"
|
||||
- "xorg-x11-server-Xorg"
|
||||
- "xorg-x11-xauth"
|
||||
- "metacity"
|
||||
- "xrdb"
|
||||
- "xz"
|
||||
|
||||
# iot_installer
|
||||
- "fedora-release-iot"
|
||||
condition:
|
||||
# anaconda
|
||||
architecture:
|
||||
x86_64:
|
||||
include:
|
||||
- "biosdevname"
|
||||
- "dmidecode"
|
||||
- "grub2-tools-efi"
|
||||
- "memtest86+"
|
||||
aarch64:
|
||||
include:
|
||||
- "dmidecode"
|
||||
|
||||
|
||||
live_installer:
|
||||
include:
|
||||
- "@workstation-product-environment"
|
||||
- "@anaconda-tools"
|
||||
- "anaconda-install-env-deps"
|
||||
- "anaconda-live"
|
||||
- "anaconda-dracut"
|
||||
- "dracut-live"
|
||||
- "glibc-all-langpacks"
|
||||
- "kernel"
|
||||
- "kernel-modules"
|
||||
- "kernel-modules-extra"
|
||||
- "livesys-scripts"
|
||||
- "rng-tools"
|
||||
- "rdma-core"
|
||||
- "gnome-kiosk"
|
||||
exclude:
|
||||
- "@dial-up"
|
||||
- "@input-methods"
|
||||
- "@standard"
|
||||
- "device-mapper-multipath"
|
||||
- "fcoe-utils"
|
||||
- "gfs2-utils"
|
||||
- "reiserfs-utils"
|
||||
- "sdubby"
|
||||
condition:
|
||||
version_greater_or_equal:
|
||||
VERSION_RAWHIDE:
|
||||
include:
|
||||
- "anaconda-webui"
|
||||
|
||||
|
||||
image_installer:
|
||||
# anaconda
|
||||
include:
|
||||
- "aajohan-comfortaa-fonts"
|
||||
- "abattis-cantarell-fonts"
|
||||
- "alsa-firmware"
|
||||
- "alsa-tools-firmware"
|
||||
- "anaconda"
|
||||
- "anaconda-dracut"
|
||||
- "anaconda-install-img-deps"
|
||||
- "anaconda-widgets"
|
||||
- "atheros-firmware"
|
||||
- "audit"
|
||||
- "bind-utils"
|
||||
- "bitmap-fangsongti-fonts"
|
||||
- "brcmfmac-firmware"
|
||||
- "bzip2"
|
||||
- "cryptsetup"
|
||||
- "curl"
|
||||
- "dbus-x11"
|
||||
- "dejavu-sans-fonts"
|
||||
- "dejavu-sans-mono-fonts"
|
||||
- "device-mapper-persistent-data"
|
||||
- "dmidecode"
|
||||
- "dnf"
|
||||
- "dracut-config-generic"
|
||||
- "dracut-network"
|
||||
- "efibootmgr"
|
||||
- "ethtool"
|
||||
- "fcoe-utils"
|
||||
- "ftp"
|
||||
- "gdb-gdbserver"
|
||||
- "gdisk"
|
||||
- "glibc-all-langpacks"
|
||||
- "gnome-kiosk"
|
||||
- "google-noto-sans-cjk-ttc-fonts"
|
||||
- "grub2-tools"
|
||||
- "grub2-tools-extra"
|
||||
- "grub2-tools-minimal"
|
||||
- "grubby"
|
||||
- "gsettings-desktop-schemas"
|
||||
- "hdparm"
|
||||
- "hexedit"
|
||||
- "hostname"
|
||||
- "initscripts"
|
||||
- "ipmitool"
|
||||
- "iwlwifi-dvm-firmware"
|
||||
- "iwlwifi-mvm-firmware"
|
||||
- "jomolhari-fonts"
|
||||
- "kacst-farsi-fonts"
|
||||
- "kacst-qurn-fonts"
|
||||
- "kbd"
|
||||
- "kbd-misc"
|
||||
- "kdump-anaconda-addon"
|
||||
- "kernel"
|
||||
- "khmeros-base-fonts"
|
||||
- "less"
|
||||
- "libblockdev-lvm-dbus"
|
||||
- "libibverbs"
|
||||
- "libreport-plugin-bugzilla"
|
||||
- "libreport-plugin-reportuploader"
|
||||
- "librsvg2"
|
||||
- "linux-firmware"
|
||||
- "lldpad"
|
||||
- "lohit-assamese-fonts"
|
||||
- "lohit-bengali-fonts"
|
||||
- "lohit-devanagari-fonts"
|
||||
- "lohit-gujarati-fonts"
|
||||
- "lohit-gurmukhi-fonts"
|
||||
- "lohit-kannada-fonts"
|
||||
- "lohit-odia-fonts"
|
||||
- "lohit-tamil-fonts"
|
||||
- "lohit-telugu-fonts"
|
||||
- "lsof"
|
||||
- "madan-fonts"
|
||||
- "mtr"
|
||||
- "mt-st"
|
||||
- "net-tools"
|
||||
- "nfs-utils"
|
||||
- "nmap-ncat"
|
||||
- "nm-connection-editor"
|
||||
- "nss-tools"
|
||||
- "openssh-clients"
|
||||
- "openssh-server"
|
||||
- "ostree"
|
||||
- "pciutils"
|
||||
- "perl-interpreter"
|
||||
- "pigz"
|
||||
- "plymouth"
|
||||
- "python3-pyatspi"
|
||||
- "rdma-core"
|
||||
- "realtek-firmware"
|
||||
- "rit-meera-new-fonts"
|
||||
- "rng-tools"
|
||||
- "rpcbind"
|
||||
- "rpm-ostree"
|
||||
- "rsync"
|
||||
- "rsyslog"
|
||||
- "selinux-policy-targeted"
|
||||
- "sg3_utils"
|
||||
- "sil-abyssinica-fonts"
|
||||
- "sil-padauk-fonts"
|
||||
- "sil-scheherazade-new-fonts"
|
||||
- "smartmontools"
|
||||
- "spice-vdagent"
|
||||
- "strace"
|
||||
- "systemd"
|
||||
- "tar"
|
||||
- "thai-scalable-waree-fonts"
|
||||
- "tigervnc-server-minimal"
|
||||
- "tigervnc-server-module"
|
||||
- "udisks2"
|
||||
- "udisks2-iscsi"
|
||||
- "usbutils"
|
||||
- "vim-minimal"
|
||||
- "volume_key"
|
||||
- "wget"
|
||||
- "xfsdump"
|
||||
- "xfsprogs"
|
||||
- "xorg-x11-drivers"
|
||||
- "xorg-x11-fonts-misc"
|
||||
- "xorg-x11-server-Xorg"
|
||||
- "xorg-x11-xauth"
|
||||
- "metacity"
|
||||
- "xrdb"
|
||||
- "xz"
|
||||
condition:
|
||||
architecture:
|
||||
x86_64:
|
||||
include:
|
||||
- "biosdevname"
|
||||
- "dmidecode"
|
||||
- "grub2-tools-efi"
|
||||
- "memtest86+"
|
||||
aarch64:
|
||||
include:
|
||||
- "dmidecode"
|
||||
|
||||
container: &container
|
||||
include:
|
||||
- "bash"
|
||||
- "coreutils"
|
||||
- "yum"
|
||||
- "dnf"
|
||||
- "fedora-release-container"
|
||||
- "glibc-minimal-langpack"
|
||||
- "rootfiles"
|
||||
- "rpm"
|
||||
- "sudo"
|
||||
- "tar"
|
||||
- "util-linux-core"
|
||||
- "vim-minimal"
|
||||
exclude:
|
||||
- "crypto-policies-scripts"
|
||||
- "dbus-broker"
|
||||
- "deltarpm"
|
||||
- "dosfstools"
|
||||
- "e2fsprogs"
|
||||
- "elfutils-debuginfod-client"
|
||||
- "fuse-libs"
|
||||
- "gawk-all-langpacks"
|
||||
- "glibc-gconv-extra"
|
||||
- "glibc-langpack-en"
|
||||
- "gnupg2-smime"
|
||||
- "grubby"
|
||||
- "kernel-core"
|
||||
- "kernel-debug-core"
|
||||
- "kernel"
|
||||
- "langpacks-en_GB"
|
||||
- "langpacks-en"
|
||||
- "libss"
|
||||
- "libxcrypt-compat"
|
||||
- "nano"
|
||||
- "openssl-pkcs11"
|
||||
- "pinentry"
|
||||
- "python3-unbound"
|
||||
- "shared-mime-info"
|
||||
- "sssd-client"
|
||||
- "sudo-python-plugin"
|
||||
- "systemd"
|
||||
- "trousers"
|
||||
- "whois-nls"
|
||||
- "xkeyboard-config"
|
||||
|
||||
wsl:
|
||||
<<: *container
|
||||
|
||||
minimal_raw:
|
||||
include:
|
||||
- "@core"
|
||||
- "initial-setup"
|
||||
- "libxkbcommon"
|
||||
- "NetworkManager-wifi"
|
||||
- "brcmfmac-firmware"
|
||||
- "realtek-firmware"
|
||||
- "iwlwifi-mvm-firmware"
|
||||
|
||||
|
||||
iot_simplified_installer:
|
||||
include:
|
||||
# installer.include
|
||||
- "anaconda-dracut"
|
||||
- "atheros-firmware"
|
||||
- "brcmfmac-firmware"
|
||||
- "curl"
|
||||
- "dracut-config-generic"
|
||||
- "dracut-network"
|
||||
- "hostname"
|
||||
- "iwlwifi-dvm-firmware"
|
||||
- "iwlwifi-mvm-firmware"
|
||||
- "kernel"
|
||||
- "linux-firmware"
|
||||
- "less"
|
||||
- "nfs-utils"
|
||||
- "openssh-clients"
|
||||
- "ostree"
|
||||
- "plymouth"
|
||||
- "realtek-firmware"
|
||||
- "rng-tools"
|
||||
- "rpcbind"
|
||||
- "selinux-policy-targeted"
|
||||
- "systemd"
|
||||
- "tar"
|
||||
- "xfsprogs"
|
||||
- "xz"
|
||||
|
||||
# iot_simplified_installer.include
|
||||
- "attr"
|
||||
- "basesystem"
|
||||
- "binutils"
|
||||
- "bsdtar"
|
||||
- "clevis-dracut"
|
||||
- "clevis-luks"
|
||||
- "cloud-utils-growpart"
|
||||
- "coreos-installer"
|
||||
- "coreos-installer-dracut"
|
||||
- "coreutils"
|
||||
- "device-mapper-multipath"
|
||||
- "dosfstools"
|
||||
- "dracut-live"
|
||||
- "e2fsprogs"
|
||||
- "fcoe-utils"
|
||||
- "fdo-init"
|
||||
- "fedora-logos"
|
||||
- "gdisk"
|
||||
- "gzip"
|
||||
- "ima-evm-utils"
|
||||
- "iproute"
|
||||
- "iptables"
|
||||
- "iputils"
|
||||
- "iscsi-initiator-utils"
|
||||
- "keyutils"
|
||||
- "lldpad"
|
||||
- "lvm2"
|
||||
- "mdadm"
|
||||
- "nss-softokn"
|
||||
- "policycoreutils"
|
||||
- "policycoreutils-python-utils"
|
||||
- "procps-ng"
|
||||
- "rootfiles"
|
||||
- "setools-console"
|
||||
- "sudo"
|
||||
- "traceroute"
|
||||
- "util-linux"
|
||||
- "shadow-utils" # includes passwd
|
||||
condition:
|
||||
version_less_than:
|
||||
"41":
|
||||
include:
|
||||
- "dnsmasq" # deprecated for F41+
|
||||
97
vendor/github.com/osbuild/images/pkg/distro/packagesets/loader.go
generated
vendored
Normal file
97
vendor/github.com/osbuild/images/pkg/distro/packagesets/loader.go
generated
vendored
Normal file
|
|
@ -0,0 +1,97 @@
|
|||
package packagesets
|
||||
|
||||
import (
|
||||
"embed"
|
||||
"fmt"
|
||||
"path/filepath"
|
||||
"strings"
|
||||
|
||||
"github.com/osbuild/images/internal/common"
|
||||
"github.com/osbuild/images/pkg/distro"
|
||||
"github.com/osbuild/images/pkg/rpmmd"
|
||||
"gopkg.in/yaml.v3"
|
||||
)
|
||||
|
||||
//go:embed */*.yaml
|
||||
var Data embed.FS
|
||||
|
||||
type packageSet struct {
|
||||
Include []string `yaml:"include"`
|
||||
Exclude []string `yaml:"exclude"`
|
||||
Condition *conditions `yaml:"condition,omitempty"`
|
||||
}
|
||||
|
||||
type conditions struct {
|
||||
Architecture map[string]packageSet `yaml:"architecture,omitempty"`
|
||||
VersionLessThan map[string]packageSet `yaml:"version_less_than,omitempty"`
|
||||
VersionGreaterOrEqual map[string]packageSet `yaml:"version_greater_or_equal,omitempty"`
|
||||
}
|
||||
|
||||
func Load(it distro.ImageType, replacements map[string]string) rpmmd.PackageSet {
|
||||
typeName := strings.ReplaceAll(it.Name(), "-", "_")
|
||||
|
||||
arch := it.Arch()
|
||||
archName := arch.Name()
|
||||
distribution := arch.Distro()
|
||||
distroNameVer := distribution.Name()
|
||||
distroName := strings.SplitN(distroNameVer, "-", 2)[0]
|
||||
distroVersion := distribution.OsVersion()
|
||||
|
||||
distroSets, err := Data.Open(filepath.Join(distroName, "package_sets.yaml"))
|
||||
if err != nil {
|
||||
panic(err)
|
||||
}
|
||||
|
||||
decoder := yaml.NewDecoder(distroSets)
|
||||
decoder.KnownFields(true)
|
||||
|
||||
var pkgSets map[string]packageSet
|
||||
if err := decoder.Decode(&pkgSets); err != nil {
|
||||
panic(err)
|
||||
}
|
||||
|
||||
pkgSet, ok := pkgSets[typeName]
|
||||
if !ok {
|
||||
panic(fmt.Sprintf("unknown package set name %q", typeName))
|
||||
}
|
||||
rpmmdPkgSet := rpmmd.PackageSet{
|
||||
Include: pkgSet.Include,
|
||||
Exclude: pkgSet.Exclude,
|
||||
}
|
||||
|
||||
if pkgSet.Condition != nil {
|
||||
// process conditions
|
||||
if archSet, ok := pkgSet.Condition.Architecture[archName]; ok {
|
||||
rpmmdPkgSet = rpmmdPkgSet.Append(rpmmd.PackageSet{
|
||||
Include: archSet.Include,
|
||||
Exclude: archSet.Exclude,
|
||||
})
|
||||
}
|
||||
|
||||
for ltVer, ltSet := range pkgSet.Condition.VersionLessThan {
|
||||
if r, ok := replacements[ltVer]; ok {
|
||||
ltVer = r
|
||||
}
|
||||
if common.VersionLessThan(distroVersion, ltVer) {
|
||||
rpmmdPkgSet = rpmmdPkgSet.Append(rpmmd.PackageSet{
|
||||
Include: ltSet.Include,
|
||||
Exclude: ltSet.Exclude,
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
for gteqVer, gteqSet := range pkgSet.Condition.VersionGreaterOrEqual {
|
||||
if r, ok := replacements[gteqVer]; ok {
|
||||
gteqVer = r
|
||||
}
|
||||
if common.VersionGreaterThanOrEqual(distroVersion, gteqVer) {
|
||||
rpmmdPkgSet = rpmmdPkgSet.Append(rpmmd.PackageSet{
|
||||
Include: gteqSet.Include,
|
||||
Exclude: gteqSet.Exclude,
|
||||
})
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return rpmmdPkgSet
|
||||
}
|
||||
16
vendor/github.com/osbuild/images/pkg/manifest/subscription.go
generated
vendored
16
vendor/github.com/osbuild/images/pkg/manifest/subscription.go
generated
vendored
|
|
@ -211,13 +211,21 @@ func runInsightsClientOnBoot() (*fsnode.Directory, *fsnode.File, error) {
|
|||
return icDropinDirectory, icDropinFile, nil
|
||||
}
|
||||
|
||||
// Filename and contents for the insights-client service drop-in.
|
||||
// Filename and contents for the insights-client-boot service drop-in.
|
||||
// This is a temporary workaround until the org.osbuild.systemd.unit stage
|
||||
// gains support for all the options we need.
|
||||
//
|
||||
// The insights-client-boot.service is defined as first boot with a conditional file
|
||||
// that gets removed when it runs (similar to the registration service).
|
||||
// We are overriding that here to run at every boot to collect changes after upgrades, etc.
|
||||
func insightsClientDropin() (string, string) {
|
||||
return "/etc/systemd/system/insights-client.service.d/override.conf", `[Unit]
|
||||
return "/etc/systemd/system/insights-client-boot.service.d/override.conf", `[Unit]
|
||||
Requisite=greenboot-healthcheck.service
|
||||
After=network-online.target greenboot-healthcheck.service osbuild-first-boot.service
|
||||
After=network-online.target greenboot-healthcheck.service osbuild-first-boot.service osbuild-subscription-register.service
|
||||
ConditionPathExists=
|
||||
[Service]
|
||||
ExecStartPre=
|
||||
[Install]
|
||||
WantedBy=multi-user.target`
|
||||
WantedBy=multi-user.target
|
||||
`
|
||||
}
|
||||
|
|
|
|||
2
vendor/github.com/osbuild/images/pkg/reporegistry/reporegistry.go
generated
vendored
2
vendor/github.com/osbuild/images/pkg/reporegistry/reporegistry.go
generated
vendored
|
|
@ -22,7 +22,7 @@ type RepoRegistry struct {
|
|||
// Note that the confPaths must point directly to the directory with
|
||||
// the json repo files.
|
||||
func New(repoConfigPaths []string, repoConfigFS []fs.FS) (*RepoRegistry, error) {
|
||||
repositories, err := loadAllRepositories(repoConfigPaths, repoConfigFS)
|
||||
repositories, err := LoadAllRepositories(repoConfigPaths, repoConfigFS)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
|
|
|||
4
vendor/github.com/osbuild/images/pkg/reporegistry/repository.go
generated
vendored
4
vendor/github.com/osbuild/images/pkg/reporegistry/repository.go
generated
vendored
|
|
@ -12,9 +12,9 @@ import (
|
|||
"github.com/osbuild/images/pkg/rpmmd"
|
||||
)
|
||||
|
||||
// loadAllRepositories loads all repositories for given distros from the given list of paths.
|
||||
// LoadAllRepositories loads all repositories for given distros from the given list of paths.
|
||||
// Behavior is the same as with the LoadRepositories() method.
|
||||
func loadAllRepositories(confPaths []string, confFSes []fs.FS) (rpmmd.DistrosRepoConfigs, error) {
|
||||
func LoadAllRepositories(confPaths []string, confFSes []fs.FS) (rpmmd.DistrosRepoConfigs, error) {
|
||||
var mergedFSes []fs.FS
|
||||
|
||||
for _, confPath := range confPaths {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue