From d4b3bcc864dc5a54ec64fe7e2ef226b54dedcf1758af1519fd3364e0fed1a5b6 Mon Sep 17 00:00:00 2001 From: Max Lin Date: Mon, 2 Mar 2026 19:32:53 +0800 Subject: [PATCH] Merge factory branch into Leap-16.1 --- .gitattributes | 3 +- .gitignore | 5 ++- _service | 2 +- agama-products.changes | 84 +++++++++++++++++++++++++++++++++++++++++- agama-products.spec | 24 +++++++----- agama.obscpio | 4 +- agama.obsinfo | 6 +-- 7 files changed, 109 insertions(+), 19 deletions(-) diff --git a/.gitattributes b/.gitattributes index 9b03811..37a8eaa 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,4 +1,4 @@ -## Default LFS +*.changes merge=merge-changes *.7z filter=lfs diff=lfs merge=lfs -text *.bsp filter=lfs diff=lfs merge=lfs -text *.bz2 filter=lfs diff=lfs merge=lfs -text @@ -12,6 +12,7 @@ *.pdf filter=lfs diff=lfs merge=lfs -text *.png filter=lfs diff=lfs merge=lfs -text *.rpm filter=lfs diff=lfs merge=lfs -text +*.tar filter=lfs diff=lfs merge=lfs -text *.tbz filter=lfs diff=lfs merge=lfs -text *.tbz2 filter=lfs diff=lfs merge=lfs -text *.tgz filter=lfs diff=lfs merge=lfs -text diff --git a/.gitignore b/.gitignore index 57affb6..8b731c3 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,4 @@ -.osc +*.obscpio +*.osc +_build.* +.pbuild diff --git a/_service b/_service index 743aaba..fb6fe85 100644 --- a/_service +++ b/_service @@ -8,7 +8,7 @@ git - Leap-16.0 + master products.d enable agama-products.changes diff --git a/agama-products.changes b/agama-products.changes index a1fe1e4..c6d8b5d 100644 --- a/agama-products.changes +++ b/agama-products.changes @@ -1,10 +1,92 @@ +------------------------------------------------------------------- +Wed Feb 18 14:05:51 UTC 2026 - Imobach Gonzalez Sosa + +- Select the correct SLES and SLES4SAP release package depending on the mode + (bsc#1258271). + +------------------------------------------------------------------- +Wed Feb 11 14:53:05 UTC 2026 - Eugenio Paolantonio + +- Add Beta tag to the SLES and SLES4SAP product names + (gh#agama-project/agama#3151) + +------------------------------------------------------------------- +Wed Feb 11 13:58:01 UTC 2026 - Imobach Gonzalez Sosa + +- Add standard and immutable modes to SLES for SAP (bsc#1258042). + +------------------------------------------------------------------- +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 + +- Fix packaging after the inclusion of Leap 16.1 specification + (gh#agama-project/agama#3098). + +------------------------------------------------------------------- +Fri Jan 30 11:36:18 UTC 2026 - Imobach Gonzalez Sosa + +- Rename "transactional_base" to "immutable_base" (related to jsc#PED-14307). + +------------------------------------------------------------------- +Thu Jan 29 11:00:00 UTC 2026 - Lubos Kocman + +- Add Leap 16.1 product definition +- Drop Leap 16.0 product definition +------------------------------------------------------------------- +Wed Jan 28 13:01:02 UTC 2026 - Imobach Gonzalez Sosa + +- Fix the optional_patterns attribute in the product definitions + (jsc#PED-14307). + +------------------------------------------------------------------- +Wed Jan 28 11:01:02 UTC 2026 - Imobach Gonzalez Sosa + +- Define "standard" and "immutable" modes for SLES (jsc#PED-14307). + +------------------------------------------------------------------- +Fri Jan 9 14:44:00 UTC 2026 - Imobach Gonzalez Sosa + +- Version 19.pre +- Do not offer or pre-install YaST2. + +------------------------------------------------------------------- +Tue Dec 2 12:40:33 UTC 2025 - Dominique Leuenberger + +- Do not list yast2 patterns and do not pre-install yast + (boo#1254414). + +------------------------------------------------------------------- +Thu Nov 13 13:30:58 UTC 2025 - Ladislav Slezák + +- Do not build on 32bit arches (like i586) and PPC64-BE, + the dependant libsuseconnect is 64bit only (bsc#1251846) + +------------------------------------------------------------------- +Thu Nov 13 09:39:58 UTC 2025 - Josef Reidinger + +- Fix removal of kalpa to work also in SLE + +------------------------------------------------------------------- +Wed Nov 12 15:42:28 UTC 2025 - Imobach Gonzalez Sosa + +- Version 18 + +------------------------------------------------------------------- +Fri Oct 17 19:50:58 UTC 2025 - Shawn Dunn + +- Remove Kalpa from multi-distribution installation image. + ------------------------------------------------------------------- Mon Sep 29 04:56:47 UTC 2025 - Lubos Kocman - Update patterns and packages Leap Micro 6.2 Fixes install issues of Leap Micro 6.2 (boo#1250435) - Explicitly add opensuse-migration-tool - ------------------------------------------------------------------- Fri Sep 12 14:30:16 UTC 2025 - Ladislav Slezák diff --git a/agama-products.spec b/agama-products.spec index b819537..45a695b 100644 --- a/agama-products.spec +++ b/agama-products.spec @@ -26,6 +26,9 @@ URL: https://github.com/agama-project/agama BuildArch: noarch Source0: agama.tar +# do not include in the 32bit repos, the Agama is 64bit only +ExcludeArch: %ix86 s390 ppc64 + %description Products definition for Agama installer. @@ -42,16 +45,18 @@ env \ %{_builddir}/agama/install.sh -# Keep only Leap based distros on Leap -%if 0%{?is_opensuse} && 0%{?suse_version} == 1600 +# 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, 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 Leap + Leap Micro) -%if 0%{?is_opensuse} && 0%{?suse_version} > 1600 +# Keep TW-based distros on TW (drop Kalpa + Leap + Leap Micro) +%if 0%{?is_opensuse} && 0%{?suse_version} > 1610 rm -f %{buildroot}%{_datadir}/agama/products.d/leap*.yaml %endif @@ -67,14 +72,13 @@ 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 -%{_datadir}/agama/products.d/kalpa.yaml %endif -%if !0%{?is_opensuse} || 0%{?suse_version} == 1600 -%{_datadir}/agama/products.d/leap_160.yaml +%if !0%{?is_opensuse} || 0%{?suse_version} <= 1610 +%{_datadir}/agama/products.d/leap_161.yaml %{_datadir}/agama/products.d/leap_micro_62.yaml %endif @@ -90,7 +94,7 @@ Definition of SLE-based products (e.g., SUSE Linux Enterprise Server) for the Ag %license LICENSE %dir %{_datadir}/agama %dir %{_datadir}/agama/products.d -%{_datadir}/agama/products.d/sles_160.yaml -%{_datadir}/agama/products.d/sles_sap_160.yaml +%{_datadir}/agama/products.d/sles_161.yaml +%{_datadir}/agama/products.d/sles_sap_161.yaml %changelog diff --git a/agama.obscpio b/agama.obscpio index f8d6752..a146730 100644 --- a/agama.obscpio +++ b/agama.obscpio @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8c537e73ae67dbd445e626b6135e6d04c9d586613cd22b445e59d09697b514e6 -size 115723 +oid sha256:bc7036c2cbac853ac2d0b4b18758fea224c2c239a12ba60cbfb586297aa31166 +size 128011 diff --git a/agama.obsinfo b/agama.obsinfo index b3207cd..01e43fb 100644 --- a/agama.obsinfo +++ b/agama.obsinfo @@ -1,4 +1,4 @@ name: agama -version: 17+351.33aa1acf5 -mtime: 1759128696 -commit: 33aa1acf55a0eb9c8e42dbaaef5f0a937de31b73 +version: 19.pre+1670.99418d6d9 +mtime: 1771919083 +commit: 99418d6d99c67620fc525ef8c1f5215e9a025df5 -- 2.51.1