config.yaml

@@ -1,39 +1,33 @@
 actions:
   - replace:
       - target: "spec"
-        find: |
-              # CentOS also defines rhel so we check for centos first
-              %if 0%{?centos}
-              
-              # CentOS 9 supports building for CentOS 8 and later
-              %if 0%{?centos} >= 9
-              install -m 0644 -vp repositories/centos-*                          %{buildroot}%{_datadir}/osbuild-composer/repositories/
+        find: "# CentOS also defines rhel so we check for centos first"
         replace: |
+              # CentOS also defines rhel so we check for centos first
+              
               %if 0%{?almalinux}
-              %if 0%{?almalinux} >= 9
-              install -m 0644 -vp repositories/almalinux-*                        %{buildroot}%{_datadir}/osbuild-composer/repositories/
+              # AL10 support all AL versions
+              %if 0%{?almalinux} >= 10
+              install -m 0644 -vp vendor/github.com/osbuild/images/data/repositories/almalinux*                       %{buildroot}%{_datadir}/osbuild-composer/repositories/
+              %else
+              # AL8 supports in AL9 and AL8
+              install -m 0644 -vp vendor/github.com/osbuild/images/data/repositories/almalinux-8*                      %{buildroot}%{_datadir}/osbuild-composer/repositories/
+              %if 0%{?rhel} == 9
+              install -m 0644 -vp vendor/github.com/osbuild/images/data/repositories/almalinux-9*                      %{buildroot}%{_datadir}/osbuild-composer/repositories/
+              %endif
+              %endif
+              
+              %else
+              # Check for CentOS
         count: 1
       - target: "spec"
-        find: |
-          # CentOS 8 only supports building for CentOS 8
-          install -m 0644 -vp repositories/centos-%{centos}*                 %{buildroot}%{_datadir}/osbuild-composer/repositories/
-          install -m 0644 -vp repositories/centos-stream-%{centos}*          %{buildroot}%{_datadir}/osbuild-composer/repositories/
-          
-          %endif
-          %else
-          %if 0%{?rhel}
-          # RHEL 9 supports building for RHEL 8 and later
-          %if 0%{?rhel} >= 9
-          install -m 0644 -vp repositories/rhel-*                            %{buildroot}%{_datadir}/osbuild-composer/repositories/
-          
-          %else
-          # RHEL 8 only supports building for 8
-          install -m 0644 -vp repositories/rhel-%{rhel}*                     %{buildroot}%{_datadir}/osbuild-composer/repositories/
-          
-          %endif
-        replace: "install -m 0644 -vp repositories/almalinux-8*                        %{buildroot}%{_datadir}/osbuild-composer/repositories/"
+        find: "# Fedora can build for all included fedora releases"
+        replace: |
+              %endif
+              
+              # Fedora can build for all included fedora releases
         count: 1
-        
+
   - modify_release:
     - suffix: ".alma.1"
       enabled: true
@@ -42,13 +36,4 @@ actions:
       - name: "Eduard Abdullin"
         email: "eabdullin@almalinux.org"
         line:
-          - "Install AlmaLinux repositories"
-          - "Add AlmaLinux support"
-
-  - add_files:
-      - type: "patch"
-        name: "0001-AlmaLinux-support-patch.patch"
-        number: 100
-      - type: "patch"
-        name: "0001-Remove-libreport-rhel-anaconda-bugzilla-from-anacond.patch"
-        number: 101
+          - "Add AlmaLinux repositories"

files/0001-Remove-libreport-rhel-anaconda-bugzilla-from-anacond.patch

@@ -1,25 +0,0 @@
-From a4435c48480b969785d9afbec7ad3657db24f43b Mon Sep 17 00:00:00 2001
-From: eabdullin <ed.abdullin.1@gmail.com>
-Date: Thu, 28 Mar 2024 13:12:22 +0300
-Subject: [PATCH] Remove libreport-rhel-anaconda-bugzilla from anaconda
- packageset
-
----
- vendor/github.com/osbuild/images/pkg/distro/rhel8/bare_metal.go | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/vendor/github.com/osbuild/images/pkg/distro/rhel8/bare_metal.go b/vendor/github.com/osbuild/images/pkg/distro/rhel8/bare_metal.go
-index 05c54e5..68b0100 100644
---- a/vendor/github.com/osbuild/images/pkg/distro/rhel8/bare_metal.go
-+++ b/vendor/github.com/osbuild/images/pkg/distro/rhel8/bare_metal.go
-@@ -214,7 +214,6 @@ func anacondaPackageSet(t *imageType) rpmmd.PackageSet {
- 			"libibverbs",
- 			"libreport-plugin-bugzilla",
- 			"libreport-plugin-reportuploader",
--			"libreport-rhel-anaconda-bugzilla",
- 			"librsvg2",
- 			"linux-firmware",
- 			"lklug-fonts",
--- 
-2.39.3 (Apple Git-146)
-