From d6a199ffe215946830ba1af9370bed39e7b4c8d2beb16981227504d8ae7635d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= <adrian@suse.de>
Date: Fri, 7 Mar 2025 09:29:25 +0100
Subject: [PATCH] Sync from SUSE:SLFO:Main patterns-micro revision
 27308cf7d385fb46734dee06e373523b

---
 patterns-micro.changes | 10 ++++++++
 patterns-micro.spec    | 56 ++++++++----------------------------------
 2 files changed, 20 insertions(+), 46 deletions(-)

diff --git a/patterns-micro.changes b/patterns-micro.changes
index c391cb6..371c2fa 100644
--- a/patterns-micro.changes
+++ b/patterns-micro.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Thu Mar  6 15:17:02 UTC 2025 - Eugenio Paolantonio <eugenio.paolantonio@suse.com>
+
+- Drop patterns-micro-hardware-tools and patterns-micro-firmware:
+  + They are not needed anymore, see jsc#PED-11715 for more details.
+  + Package requirements are now folded back to
+    patterns-micro-hardware.
+- Make patterns-micro-default depend on pattern() = transactional_base
+  and pattern() = bootloader.
+
 -------------------------------------------------------------------
 Mon Feb 24 15:59:27 UTC 2025 - Frederic Crozat <fcrozat@suse.com>
 
diff --git a/patterns-micro.spec b/patterns-micro.spec
index 237cfea..9d2e5dd 100644
--- a/patterns-micro.spec
+++ b/patterns-micro.spec
@@ -44,9 +44,10 @@ Obsoletes:      patterns-microos-defaults
 Provides:       patterns-microos-defaults
 Requires:       audit
 Requires:       systemd-coredump
-Requires:       pattern() = base
-Requires:	suseconnect-ng
-Requires:	rollback-helper
+Requires:       pattern() = transactional_base
+Requires:       pattern() = bootloader
+Requires:       suseconnect-ng
+Requires:       rollback-helper
 # jsc#SMO-376 - pick the SL-Micro flavor
 Requires:       (registries-conf-suse if libcontainers-common)
 
@@ -139,52 +140,23 @@ Provides:       pattern-icon() = pattern-kubic
 Provides:       pattern-order() = 9030
 Provides:       pattern-visible()
 Obsoletes:      patterns-microos-hardware
+Obsoletes:      patterns-base-hardware
 Provides:       patterns-microos-hardware
-Requires:       pattern() = hardware-tools
-Requires:       pattern() = firmware
-
-%description hardware
-Packages required to install SUSE Linux Framework One on real hardware.
-
-%package hardware-tools
-Summary:        Hardware Tools
-Group:          Metapackages
-Provides:       pattern() = hardware_tools
-Provides:       pattern-category() = SLFO
-Provides:       pattern-icon() = pattern-kubic
-Provides:       pattern-order() = 9035
-Provides:       pattern-visible()
+Provides:       patterns-base-hardware
 Requires:       ethtool
 %ifnarch s390x
 Requires:       irqbalance
 %endif
 Requires:       fcoe-utils
 Requires:       hwinfo
-Provides:	patterns-base-hardware-tools = %{version}
-Obsoletes:	patterns-base-hardware-tools
-
-%description hardware-tools
-Packages required to manage SUSE Linux Framework One on real hardware.
-
-%package firmware
-Summary:        Various firmware packages
-Group:          Metapackages
-Provides:       pattern() = firmware
-Provides:       pattern-category() = SLFO
-Provides:       pattern-icon() = pattern-kubic
-Provides:       pattern-order() = 9040
-Provides:       pattern-visible()
 %ifarch %ix86 x86_64
 Requires:       ucode-amd
 Requires:       ucode-intel
 %endif
-Requires:	    kernel-firmware-all
-Provides:	patterns-base-firmware = %{version}
-Obsoletes:	patterns-base-firmware
-
-%description firmware
-Packages that requires various firmwares on SUSE Linux Framework One
+Requires:       kernel-firmware-all
 
+%description hardware
+Packages required to install SUSE Linux Framework One on real hardware.
 
 %package fips
 Summary:        FIPS 140-3 Support
@@ -405,7 +377,7 @@ Packages required to enable SUSE Linux Framework One in the Cloud.
 mkdir -p %{buildroot}%{_docdir}/patterns-micro/
 PATTERNS='
     defaults elemental_client
-    onlyDVD alt_onlyDVD hardware hardware_tools firmware kvm_host
+    onlyDVD alt_onlyDVD hardware kvm_host
     sssd_ldap ima_evm ra_agent ra_verifier fips salt_minion cloud
 '
 for i in $PATTERNS; do
@@ -433,14 +405,6 @@ done
 %dir %{_docdir}/patterns-micro
 %{_docdir}/patterns-micro/hardware.txt
 
-%files hardware-tools
-%dir %{_docdir}/patterns-micro
-%{_docdir}/patterns-micro/hardware_tools.txt
-
-%files firmware
-%dir %{_docdir}/patterns-micro
-%{_docdir}/patterns-micro/firmware.txt
-
 %files kvm_host
 %dir %{_docdir}/patterns-micro
 %{_docdir}/patterns-micro/kvm_host.txt