Merge pull request #4 from cgwalters/eln-bootc

Add bootc to eln
2023-11-01 17:25:51 -04:00
commit 6d3fb74cca
@@ -1,4 +1,6 @@
 releasever: stream9
+variables:
+  distro: "stream9"

 repos:
  - baseos
@@ -1,4 +1,6 @@
 releasever: 38
+variables:
+  distro: "f38"

 repos:
  - fedora
@@ -1,3 +1,3 @@
 include:
-  - fedora-tier-0-38.yaml
+  - fedora-tier-0-eln.yaml
  - fedora-dev.yaml
@@ -1,4 +1,6 @@
 releasever: 39
+variables:
+  distro: "eln"

 repos:
  - eln-baseos
@@ -1,4 +1,6 @@
 releasever: 38
+variables:
+  distro: "f38"

 repos:
  - fedora
@@ -1,4 +1,6 @@
 releasever: 39
+variables:
+  distro: "eln"

 repos:
  - eln-baseos
@@ -1,11 +1,7 @@
-include:
-  - ostree.yaml
-
 # The bootc components.
 packages:
 - 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
 - gdisk xfsprogs e2fsprogs dosfstools

@@ -16,12 +12,6 @@ exclude-packages:
  - kernel-debug-core

 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
  - |
    #!/usr/bin/env bash
@@ -49,8 +49,12 @@ remove-from-packages:
  # https://bugzilla.redhat.com/show_bug.cgi?id=2105177
  - [dbus-common, /usr/lib/sysusers.d/dbus.conf]

+conditional-include:
+  - if: distro != "stream9"
+    include: bootc.yaml
+
 include:
-  - bootc.yaml
+  - ostree.yaml
  - initramfs.yaml

 packages: