diff --git a/live/README.md b/live/README.md index 5babe11ded..2a3177ea92 100644 --- a/live/README.md +++ b/live/README.md @@ -16,7 +16,7 @@ - [Image definition](#image-definition) - [KIWI files](#kiwi-files) - [Image configuration](#image-configuration) - - [GRUB2 menu](#grub2-menu) + - [GRUB2 menu](#grub2-menu) - [SSH server](#ssh-server) - [Autologin](#autologin) - [Firefox profile](#firefox-profile) @@ -155,7 +155,7 @@ The main Kiwi source files are located in the [src](src) subdirectory: The Live ISO is configured to allow using some features and allow running Agama there. -## GRUB2 menu +### GRUB2 menu grub.cfg, defining boot menu items of the Agama image, is generated by scripts stored in [config-cdroot](https://github.com/openSUSE/agama/tree/master/live/config-cdroot). diff --git a/products.d/agama-products.changes b/products.d/agama-products.changes index 4082c01b10..8c4fd3663d 100644 --- a/products.d/agama-products.changes +++ b/products.d/agama-products.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Feb 2 15:48:07 UTC 2026 - Ladislav Slezák + +- Prepare the spec file for the %suse_version 1610 in Leap 16.1 + (gh#agama-project/agama#3120) + ------------------------------------------------------------------- Fri Jan 30 12:44:21 UTC 2026 - Imobach Gonzalez Sosa diff --git a/products.d/agama-products.spec b/products.d/agama-products.spec index 32c305edf8..5587a73d54 100644 --- a/products.d/agama-products.spec +++ b/products.d/agama-products.spec @@ -48,15 +48,15 @@ env \ # for now remove kalpa from all builds until it is fixed rm -f %{buildroot}%{_datadir}/agama/products.d/kalpa.yaml -# Keep only Leap based distros on Leap -%if 0%{?is_opensuse} && 0%{?suse_version} == 1600 +# Keep only Leap based distros on Leap, Tumbleweed uses version 1699 +%if 0%{?is_opensuse} && 0%{?suse_version} <= 1610 rm -f %{buildroot}%{_datadir}/agama/products.d/microos.yaml rm -f %{buildroot}%{_datadir}/agama/products.d/tumbleweed.yaml rm -f %{buildroot}%{_datadir}/agama/products.d/slowroll.yaml %endif # Keep TW-based distros on TW (drop Kalpa + Leap + Leap Micro) -%if 0%{?is_opensuse} && 0%{?suse_version} > 1600 +%if 0%{?is_opensuse} && 0%{?suse_version} > 1610 rm -f %{buildroot}%{_datadir}/agama/products.d/leap*.yaml %endif @@ -72,12 +72,12 @@ Definition of openSUSE products (Tumbleweed, Leap, MicroOS and Slowroll) for the %dir %{_datadir}/agama %dir %{_datadir}/agama/products.d # if building on SLES add all opensuse products -%if !0%{?is_opensuse} || 0%{?suse_version} > 1600 +%if !0%{?is_opensuse} || 0%{?suse_version} > 1610 %{_datadir}/agama/products.d/microos.yaml %{_datadir}/agama/products.d/tumbleweed.yaml %{_datadir}/agama/products.d/slowroll.yaml %endif -%if !0%{?is_opensuse} || 0%{?suse_version} == 1600 +%if !0%{?is_opensuse} || 0%{?suse_version} <= 1610 %{_datadir}/agama/products.d/leap_161.yaml %{_datadir}/agama/products.d/leap_micro_62.yaml %endif