config.yaml

@@ -2,38 +2,36 @@ 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/
+              # Only include repositories for the distribution and release
+              install -m 0755 -vd                                                %{buildroot}%{_datadir}/osbuild-composer/repositories
         replace: |
+              # Only include repositories for the distribution and release
+              install -m 0755 -vd                                                %{buildroot}%{_datadir}/osbuild-composer/repositories
+              
               %if 0%{?almalinux}
-              %if 0%{?almalinux} >= 9
-              install -m 0644 -vp repositories/almalinux-*                        %{buildroot}%{_datadir}/osbuild-composer/repositories/
+              %if 0%{?almalinux} >= 10
+              
+              install -m 0644 -vp repositories/almalinux-*                       %{buildroot}%{_datadir}/osbuild-composer/repositories/
+              
+              %else
+              install -m 0644 -vp repositories/almalinux-8*                       %{buildroot}%{_datadir}/osbuild-composer/repositories/
+              
+              %if 0%{?almalinux} == 9
+              install -m 0644 -vp repositories/almalinux-9*                       %{buildroot}%{_datadir}/osbuild-composer/repositories/
+              %endif
+              %endif
+              
+              %else
         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
@@ -43,12 +41,13 @@ actions:
         email: "eabdullin@almalinux.org"
         line:
           - "Install AlmaLinux repositories"
-          - "Add AlmaLinux support"
+          - "Add AlmaLinux support patch (Thanks @pastalian)"
+          - "Remove libreport-rhel-bugzilla from package set"
 
   - 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
+      - type: "patch"
+        name: "0002-AlmaLinux-support-patch.patch"
+        number: 102

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

@@ -1,18 +1,18 @@
-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
+From 8ee4f9ba6264c2772708426bbe6026b2d28eb815 Mon Sep 17 00:00:00 2001
+From: eabdullin <eabdullin@almalinux.org>
+Date: Thu, 26 Dec 2024 15:52:33 +0300
+Subject: [PATCH 1/2] Remove libreport-rhel-anaconda-bugzilla from anaconda
  packageset
 
 ---
- vendor/github.com/osbuild/images/pkg/distro/rhel8/bare_metal.go | 1 -
+ .../osbuild/images/pkg/distro/rhel/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 {
+diff --git a/vendor/github.com/osbuild/images/pkg/distro/rhel/rhel8/bare_metal.go b/vendor/github.com/osbuild/images/pkg/distro/rhel/rhel8/bare_metal.go
+index 0d5fbe0..1fbbed3 100644
+--- a/vendor/github.com/osbuild/images/pkg/distro/rhel/rhel8/bare_metal.go
++++ b/vendor/github.com/osbuild/images/pkg/distro/rhel/rhel8/bare_metal.go
+@@ -228,7 +228,6 @@ func anacondaPackageSet(t *rhel.ImageType) rpmmd.PackageSet {
  			"libibverbs",
  			"libreport-plugin-bugzilla",
  			"libreport-plugin-reportuploader",
@@ -21,5 +21,5 @@ index 05c54e5..68b0100 100644
  			"linux-firmware",
  			"lklug-fonts",
 -- 
-2.39.3 (Apple Git-146)
+2.39.5 (Apple Git-154)