ci: Move grub2 for opensuse to mkosi tools tree packages

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index ae870f7325e622c005ae57df91ba2fec2c218bc7..a8c05c8fdf17b2c7872e1c5a1046f9eca1b92904 100644 (file)
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -210,12 +210,10 @@ jobs:
 
       - name: Build tools tree
         run: |
-          # TODO: Remove grub2 hack when https://bugzilla.opensuse.org/show_bug.cgi?id=1227464 is resolved.
           mkosi \
             --directory "" \
             --distribution ${{ matrix.tools }} \
-            --include mkosi-tools \
-            $( [[ ${{ matrix.tools }} == opensuse ]] && echo --package=grub2)
+            --include mkosi-tools
 
       - name: Build image
         run: mkosi --distribution ${{ matrix.distro }} -f

diff --git a/mkosi.conf.d/40-tools/mkosi.conf.d/opensuse.conf b/mkosi.conf.d/40-tools/mkosi.conf.d/opensuse.conf
index bf6ffb87e22aaaf86b43915ffc78d5c35f9e6234..966500e6812e87e2cbaa608f64afabca9bfd53bd 100644 (file)
--- a/mkosi.conf.d/40-tools/mkosi.conf.d/opensuse.conf
+++ b/mkosi.conf.d/40-tools/mkosi.conf.d/opensuse.conf
@@ -5,6 +5,7 @@ ToolsTreeDistribution=opensuse
 
 [Build]
 ToolsTreePackages=
+        grub2 # TODO: Move to default tools tree when https://bugzilla.opensuse.org/show_bug.cgi?id=1227464 is resolved.
         mypy
         python3-pytest
         ruff