Skip to content

Commit 4fad015

Browse files
committed
distrodefs: add new (hidden) bootc-rpm-installer imgtype
This commits adds a new `bootc-rpm-installer` image type that contains only the rpm packages lists and installer config for now so that bootc-image-builder can use the images library to get what rpm package it needs to install to build a bootable ISO. The advantage is that we can retire the code in bib that the YAML loading for the pacakge lists and that we have one central location when we need to update image definitions. The other advantage is that all the syntax for conditions on the exact version works. Note that this image type is not visible by default because the loader will skip image types that have no filename set. This is used by osbuild/bootc-image-builder#1066
1 parent 03ebf57 commit 4fad015

File tree

3 files changed

+337
-0
lines changed

3 files changed

+337
-0
lines changed

data/distrodefs/fedora/imagetypes.yaml

Lines changed: 120 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2297,3 +2297,123 @@ image_types:
22972297
- *x86_64_bios_platform
22982298
- *aarch64_platform
22992299
supported_blueprint_options: *supported_options_pxe
2300+
2301+
"bootc-rpm-installer":
2302+
# Note that this image type is partial and only used by
2303+
# bootc-image-builder not by the "images" library directly. We
2304+
# still keep the config here so that there is a single place for
2305+
# all imagetype configs.
2306+
installer_config: *default_installer_config
2307+
package_sets:
2308+
installer:
2309+
- include:
2310+
- aajohan-comfortaa-fonts
2311+
- abattis-cantarell-fonts
2312+
- alsa-firmware
2313+
- alsa-tools-firmware
2314+
- anaconda
2315+
- anaconda-dracut
2316+
- anaconda-install-img-deps
2317+
- anaconda-widgets
2318+
- atheros-firmware
2319+
- audit
2320+
- bind-utils
2321+
- bitmap-fangsongti-fonts
2322+
- brcmfmac-firmware
2323+
- bzip2
2324+
- cryptsetup
2325+
- curl
2326+
- dbus-x11
2327+
- dejavu-sans-fonts
2328+
- dejavu-sans-mono-fonts
2329+
- device-mapper-persistent-data
2330+
- dmidecode
2331+
- dnf
2332+
- dracut-config-generic
2333+
- dracut-network
2334+
- efibootmgr
2335+
- ethtool
2336+
- fcoe-utils
2337+
- ftp
2338+
- gdb-gdbserver
2339+
- gdisk
2340+
- glibc-all-langpacks
2341+
- gnome-kiosk
2342+
- google-noto-sans-cjk-ttc-fonts
2343+
- grub2-tools
2344+
- grub2-tools-extra
2345+
- grub2-tools-minimal
2346+
- grubby
2347+
- gsettings-desktop-schemas
2348+
- hdparm
2349+
- hexedit
2350+
- hostname
2351+
- initscripts
2352+
- ipmitool
2353+
- iwlwifi-dvm-firmware
2354+
- iwlwifi-mvm-firmware
2355+
- jomolhari-fonts
2356+
- kbd
2357+
- kbd-misc
2358+
- kdump-anaconda-addon
2359+
- kernel
2360+
- khmeros-base-fonts
2361+
- less
2362+
- libblockdev-lvm-dbus
2363+
- libibverbs
2364+
- libreport-plugin-bugzilla
2365+
- libreport-plugin-reportuploader
2366+
- librsvg2
2367+
- linux-firmware
2368+
- lldpad
2369+
- lsof
2370+
- madan-fonts
2371+
- mt-st
2372+
- mtr
2373+
- net-tools
2374+
- nfs-utils
2375+
- nm-connection-editor
2376+
- nmap-ncat
2377+
- nss-tools
2378+
- openssh-clients
2379+
- openssh-server
2380+
- ostree
2381+
- pciutils
2382+
- perl-interpreter
2383+
- pigz
2384+
- plymouth
2385+
- prefixdevname
2386+
- python3-pyatspi
2387+
- rdma-core
2388+
- realtek-firmware
2389+
- rit-meera-new-fonts
2390+
- rng-tools
2391+
- rpcbind
2392+
- rpm-ostree
2393+
- rsync
2394+
- rsyslog
2395+
- selinux-policy-targeted
2396+
- sg3_utils
2397+
- sil-abyssinica-fonts
2398+
- sil-padauk-fonts
2399+
- smartmontools
2400+
- spice-vdagent
2401+
- strace
2402+
- systemd
2403+
- tar
2404+
- tigervnc-server-minimal
2405+
- tigervnc-server-module
2406+
- udisks2
2407+
- udisks2-iscsi
2408+
- usbutils
2409+
- vim-minimal
2410+
- volume_key
2411+
- wget
2412+
- xfsdump
2413+
- xfsprogs
2414+
- xorg-x11-drivers
2415+
- xorg-x11-fonts-misc
2416+
- xorg-x11-server-Xorg
2417+
- xorg-x11-xauth
2418+
- xrdb
2419+
- xz

data/distrodefs/rhel-10/imagetypes.yaml

Lines changed: 101 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2272,3 +2272,104 @@ image_types:
22722272
- *x86_64_bios_platform
22732273
- *aarch64_platform
22742274
supported_blueprint_options: *supported_options_pxe
2275+
2276+
"bootc-rpm-installer":
2277+
# Note that this image type is partial and only used by
2278+
# bootc-image-builder not by the "images" library directly. We
2279+
# still keep the config here so that there is a single place for
2280+
# all imagetype configs.
2281+
installer_config: *default_installer_config
2282+
package_sets:
2283+
installer:
2284+
- include:
2285+
- "@hardware-support"
2286+
- alsa-firmware
2287+
- alsa-tools-firmware
2288+
- anaconda
2289+
- anaconda-dracut
2290+
- anaconda-install-img-deps
2291+
- anaconda-widgets
2292+
- audit
2293+
- bind-utils
2294+
- bzip2
2295+
- cryptsetup
2296+
- curl
2297+
- dbus-x11
2298+
- dejavu-sans-fonts
2299+
- dejavu-sans-mono-fonts
2300+
- device-mapper-persistent-data
2301+
- dmidecode
2302+
- dnf
2303+
- dracut-config-generic
2304+
- dracut-network
2305+
- efibootmgr
2306+
- ethtool
2307+
- fcoe-utils
2308+
- ftp
2309+
- gdb-gdbserver
2310+
- glibc-all-langpacks
2311+
- gnome-kiosk
2312+
- google-noto-sans-cjk-ttc-fonts
2313+
- grub2-tools
2314+
- grub2-tools-extra
2315+
- grub2-tools-minimal
2316+
- grubby
2317+
- gsettings-desktop-schemas
2318+
- hdparm
2319+
- hexedit
2320+
- hostname
2321+
- initscripts
2322+
- ipmitool
2323+
- jomolhari-fonts
2324+
- kbd
2325+
- kbd-misc
2326+
- kdump-anaconda-addon
2327+
- kernel
2328+
- less
2329+
- libblockdev-lvm-dbus
2330+
- libibverbs
2331+
- librsvg2
2332+
- linux-firmware
2333+
- lldpad
2334+
- lsof
2335+
- madan-fonts
2336+
- mt-st
2337+
- mtr
2338+
- net-tools
2339+
- nfs-utils
2340+
- nm-connection-editor
2341+
- nmap-ncat
2342+
- nss-tools
2343+
- openssh-clients
2344+
- openssh-server
2345+
- ostree
2346+
- pciutils
2347+
- perl-interpreter
2348+
- pigz
2349+
- plymouth
2350+
- prefixdevname
2351+
- python3-pyatspi
2352+
- rdma-core
2353+
- rng-tools
2354+
- rpcbind
2355+
- rpm-ostree
2356+
- rsync
2357+
- rsyslog
2358+
- selinux-policy-targeted
2359+
- sg3_utils
2360+
- sil-padauk-fonts
2361+
- smartmontools
2362+
- spice-vdagent
2363+
- strace
2364+
- systemd
2365+
- tar
2366+
- udisks2
2367+
- udisks2-iscsi
2368+
- usbutils
2369+
- vim-minimal
2370+
- volume_key
2371+
- wget
2372+
- xfsdump
2373+
- xfsprogs
2374+
- xrdb
2375+
- xz

data/distrodefs/rhel-9/imagetypes.yaml

Lines changed: 116 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3343,3 +3343,119 @@ image_types:
33433343
- *x86_64_bios_platform
33443344
- *aarch64_platform
33453345
supported_blueprint_options: *supported_options_pxe
3346+
3347+
"bootc-rpm-installer":
3348+
# Note that this image type is partial and only used by
3349+
# bootc-image-builder not by the "images" library directly. We
3350+
# still keep the config here so that there is a single place for
3351+
# all imagetype configs.
3352+
installer_config: *default_installer_config
3353+
package_sets:
3354+
installer:
3355+
- include:
3356+
# This is the same set as the Fedora one, but without packages not available in CentOS/RHEL:
3357+
# atheros-firmware, brcmfmac-firmware, iwlwifi-dvm-firmware, iwlwifi-mvm-firmware, realtek-firmware, rit-meera-new-fonts
3358+
- aajohan-comfortaa-fonts
3359+
- abattis-cantarell-fonts
3360+
- alsa-firmware
3361+
- alsa-tools-firmware
3362+
- anaconda
3363+
- anaconda-dracut
3364+
- anaconda-install-env-deps
3365+
- anaconda-widgets
3366+
- audit
3367+
- bind-utils
3368+
- bitmap-fangsongti-fonts
3369+
- bzip2
3370+
- cryptsetup
3371+
- curl
3372+
- dbus-x11
3373+
- dejavu-sans-fonts
3374+
- dejavu-sans-mono-fonts
3375+
- device-mapper-persistent-data
3376+
- dmidecode
3377+
- dnf
3378+
- dracut-config-generic
3379+
- dracut-network
3380+
- efibootmgr
3381+
- ethtool
3382+
- fcoe-utils
3383+
- ftp
3384+
- gdb-gdbserver
3385+
- gdisk
3386+
- glibc-all-langpacks
3387+
- gnome-kiosk
3388+
- google-noto-sans-cjk-ttc-fonts
3389+
- grub2-tools
3390+
- grub2-tools-extra
3391+
- grub2-tools-minimal
3392+
- grubby
3393+
- gsettings-desktop-schemas
3394+
- hdparm
3395+
- hexedit
3396+
- hostname
3397+
- initscripts
3398+
- ipmitool
3399+
- jomolhari-fonts
3400+
- kbd
3401+
- kbd-misc
3402+
- kdump-anaconda-addon
3403+
- kernel
3404+
- khmeros-base-fonts
3405+
- less
3406+
- libblockdev-lvm-dbus
3407+
- libibverbs
3408+
- libreport-plugin-bugzilla
3409+
- libreport-plugin-reportuploader
3410+
- librsvg2
3411+
- linux-firmware
3412+
- lldpad
3413+
- lsof
3414+
- madan-fonts
3415+
- mt-st
3416+
- mtr
3417+
- net-tools
3418+
- nfs-utils
3419+
- nm-connection-editor
3420+
- nmap-ncat
3421+
- nss-tools
3422+
- openssh-clients
3423+
- openssh-server
3424+
- ostree
3425+
- pciutils
3426+
- perl-interpreter
3427+
- pigz
3428+
- plymouth
3429+
- prefixdevname
3430+
- python3-pyatspi
3431+
- rdma-core
3432+
- rng-tools
3433+
- rpcbind
3434+
- rpm-ostree
3435+
- rsync
3436+
- rsyslog
3437+
- selinux-policy-targeted
3438+
- sg3_utils
3439+
- sil-abyssinica-fonts
3440+
- sil-padauk-fonts
3441+
- smartmontools
3442+
- spice-vdagent
3443+
- strace
3444+
- systemd
3445+
- tar
3446+
- tigervnc-server-minimal
3447+
- tigervnc-server-module
3448+
- udisks2
3449+
- udisks2-iscsi
3450+
- usbutils
3451+
- vim-minimal
3452+
- volume_key
3453+
- wget
3454+
- xfsdump
3455+
- xfsprogs
3456+
- xorg-x11-drivers
3457+
- xorg-x11-fonts-misc
3458+
- xorg-x11-server-Xorg
3459+
- xorg-x11-xauth
3460+
- xrdb
3461+
- xz

0 commit comments

Comments
 (0)