Add bootc to eln
To do this though add a `distro` variable we can use to differentiate between stream9 vs not-stream9 for now. bootc exists now in eln since - https://pagure.io/pungi-fedora/pull-request/1217 - https://github.com/minimization/content-resolver-input/pull/1006
This commit is contained in:
parent
e988155b2f
commit
05f8c0f10c
7 changed files with 16 additions and 12 deletions
|
|
@ -1,4 +1,6 @@
|
||||||
releasever: stream9
|
releasever: stream9
|
||||||
|
variables:
|
||||||
|
distro: "stream9"
|
||||||
|
|
||||||
repos:
|
repos:
|
||||||
- baseos
|
- baseos
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,6 @@
|
||||||
releasever: 38
|
releasever: 38
|
||||||
|
variables:
|
||||||
|
distro: "f38"
|
||||||
|
|
||||||
repos:
|
repos:
|
||||||
- fedora
|
- fedora
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,6 @@
|
||||||
releasever: 39
|
releasever: 39
|
||||||
|
variables:
|
||||||
|
distro: "eln"
|
||||||
|
|
||||||
repos:
|
repos:
|
||||||
- eln-baseos
|
- eln-baseos
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,6 @@
|
||||||
releasever: 38
|
releasever: 38
|
||||||
|
variables:
|
||||||
|
distro: "f38"
|
||||||
|
|
||||||
repos:
|
repos:
|
||||||
- fedora
|
- fedora
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,6 @@
|
||||||
releasever: 39
|
releasever: 39
|
||||||
|
variables:
|
||||||
|
distro: "eln"
|
||||||
|
|
||||||
repos:
|
repos:
|
||||||
- eln-baseos
|
- eln-baseos
|
||||||
|
|
|
||||||
|
|
@ -1,11 +1,7 @@
|
||||||
include:
|
|
||||||
- ostree.yaml
|
|
||||||
|
|
||||||
# The bootc components.
|
# The bootc components.
|
||||||
packages:
|
packages:
|
||||||
- systemd
|
- systemd
|
||||||
# For now this will be shipped in rpm-ostree; TODO fix this by shipping a separate epackage
|
- bootc
|
||||||
# - bootc
|
|
||||||
# Required by bootc install today, though we'll likely switch bootc to use a Rust crate instead of sgdisk
|
# Required by bootc install today, though we'll likely switch bootc to use a Rust crate instead of sgdisk
|
||||||
- gdisk xfsprogs e2fsprogs dosfstools
|
- gdisk xfsprogs e2fsprogs dosfstools
|
||||||
|
|
||||||
|
|
@ -16,12 +12,6 @@ exclude-packages:
|
||||||
- kernel-debug-core
|
- kernel-debug-core
|
||||||
|
|
||||||
postprocess:
|
postprocess:
|
||||||
# rpm-ostree can be an alias for bootc, we want to enable that here.
|
|
||||||
- |
|
|
||||||
#!/usr/bin/env bash
|
|
||||||
if test ! -x /usr/bin/bootc && test -x /usr/bin/rpm-ostree; then
|
|
||||||
ln -sr /usr/bin/{rpm-ostree,bootc}
|
|
||||||
fi
|
|
||||||
# XFS is our default filesystem
|
# XFS is our default filesystem
|
||||||
- |
|
- |
|
||||||
#!/usr/bin/env bash
|
#!/usr/bin/env bash
|
||||||
|
|
|
||||||
|
|
@ -49,8 +49,12 @@ remove-from-packages:
|
||||||
# https://bugzilla.redhat.com/show_bug.cgi?id=2105177
|
# https://bugzilla.redhat.com/show_bug.cgi?id=2105177
|
||||||
- [dbus-common, /usr/lib/sysusers.d/dbus.conf]
|
- [dbus-common, /usr/lib/sysusers.d/dbus.conf]
|
||||||
|
|
||||||
|
conditional-include:
|
||||||
|
- if: distro != "stream9"
|
||||||
|
include: bootc.yaml
|
||||||
|
|
||||||
include:
|
include:
|
||||||
- bootc.yaml
|
- ostree.yaml
|
||||||
- initramfs.yaml
|
- initramfs.yaml
|
||||||
|
|
||||||
packages:
|
packages:
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue