From 5648b5adeb2d281ad56898f94fd0131d7a8567a3 Mon Sep 17 00:00:00 2001
From: Andrew Lukoshko <andrew.lukoshko@gmail.com>
Date: Sat, 24 May 2025 11:53:43 +0200
Subject: [PATCH] Update almalinux-10 and add almalinux-kitten-10

---
 config.yaml                   |   7 +-
 files/almalinux-10.xml        |  24 +--
 files/almalinux-kitten-10.xml | 274 ++++++++++++++++++++++++++++++++++
 3 files changed, 291 insertions(+), 14 deletions(-)
 create mode 100644 files/almalinux-kitten-10.xml

diff --git a/config.yaml b/config.yaml
index 4d32aba..9a9f517 100644
--- a/config.yaml
+++ b/config.yaml
@@ -3,10 +3,10 @@ actions:
       - target: "spec"
         section: "install"
         location: "bottom"
-        content: "cp %{SOURCE1001} %{buildroot}/%{_datadir}/osinfo/os/almalinux.org/"
+        content: "cp %{SOURCE1001} %{SOURCE1002} %{buildroot}/%{_datadir}/osinfo/os/almalinux.org/"
 
   - modify_release:
-    - suffix: ".alma.1"
+    - suffix: ".alma.2"
       enabled: true
 
   - changelog_entry:
@@ -19,3 +19,6 @@ actions:
       - type: "source"
         name: "almalinux-10.xml"
         number: 1001
+      - type: "source"
+        name: "almalinux-kitten-10.xml"
+        number: 1002
diff --git a/files/almalinux-10.xml b/files/almalinux-10.xml
index 89eb8aa..459ebd3 100644
--- a/files/almalinux-10.xml
+++ b/files/almalinux-10.xml
@@ -222,48 +222,48 @@
       <kernel>images/kernel.img</kernel>
     </media>
     <tree arch="x86_64">
-      <url>https://repo.almalinux.org/10/BaseOS/x86_64/os/</url>
+      <url>https://repo.almalinux.org/almalinux/10/BaseOS/x86_64/os/</url>
       <treeinfo>
-        <family>AlmaLinux</family>
+        <family>^AlmaLinux$</family>
         <version>^10$</version>
         <arch>x86_64</arch>
       </treeinfo>
     </tree>
     <tree arch="aarch64">
-      <url>https://repo.almalinux.org/10/BaseOS/aarch64/os/</url>
+      <url>https://repo.almalinux.org/almalinux/10/BaseOS/aarch64/os/</url>
       <treeinfo>
-        <family>AlmaLinux</family>
+        <family>^AlmaLinux$</family>
         <version>^10$</version>
         <arch>aarch64</arch>
       </treeinfo>
     </tree>
     <tree arch="ppc64le">
-      <url>https://repo.almalinux.org/10/BaseOS/ppc64le/os/</url>
+      <url>https://repo.almalinux.org/almalinux/10/BaseOS/ppc64le/os/</url>
       <treeinfo>
-        <family>AlmaLinux</family>
+        <family>^AlmaLinux$</family>
         <version>^10$</version>
         <arch>ppc64le</arch>
       </treeinfo>
     </tree>
     <tree arch="s390x">
-      <url>https://repo.almalinux.org/10/BaseOS/s390x/os/</url>
+      <url>https://repo.almalinux.org/almalinux/10/BaseOS/os/</url>
       <treeinfo>
-        <family>AlmaLinux</family>
+        <family>^AlmaLinux$</family>
         <version>^10$</version>
         <arch>s390x</arch>
       </treeinfo>
     </tree>
     <image arch="x86_64" format="qcow2" cloud-init="true">
-      <url>https://repo.almalinux.org/10/cloud/x86_64/images/AlmaLinux-10-GenericCloud-latest.x86_64.qcow2</url>
+      <url>https://repo.almalinux.org/almalinux/10/cloud/x86_64/images/AlmaLinux-10-GenericCloud-latest.x86_64.qcow2</url>
     </image>
     <image arch="aarch64" format="qcow2" cloud-init="true">
-      <url>https://repo.almalinux.org/10/cloud/aarch64/images/AlmaLinux-10-GenericCloud-latest.aarch64.qcow2</url>
+      <url>https://repo.almalinux.org/almalinux/10/cloud/aarch64/images/AlmaLinux-10-GenericCloud-latest.aarch64.qcow2</url>
     </image>
     <image arch="ppc64le" format="qcow2" cloud-init="true">
-      <url>https://repo.almalinux.org/10/cloud/ppc64le/images/AlmaLinux-10-GenericCloud-latest.ppc64le.qcow2</url>
+      <url>https://repo.almalinux.org/almalinux/10/cloud/ppc64le/images/AlmaLinux-10-GenericCloud-latest.ppc64le.qcow2</url>
     </image>
     <image arch="s390x" format="qcow2" cloud-init="true">
-      <url>https://repo.almalinux.org/10/cloud/s390x/images/AlmaLinux-10-GenericCloud-latest.s390x.qcow2</url>
+      <url>https://repo.almalinux.org/almalinux/10/cloud/s390x/images/AlmaLinux-10-GenericCloud-latest.s390x.qcow2</url>
     </image>
     <installer>
       <script id="http://redhat.com/rhel/kickstart/jeos"/>
diff --git a/files/almalinux-kitten-10.xml b/files/almalinux-kitten-10.xml
new file mode 100644
index 0000000..70aef2b
--- /dev/null
+++ b/files/almalinux-kitten-10.xml
@@ -0,0 +1,274 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<libosinfo version="0.0.1">
+  <!-- Licensed under the GNU General Public License version 2 or later.
+     See http://www.gnu.org/licenses/ for a copy of the license text -->
+  <os id="http://almalinux.org/almalinux-kitten/10">
+    <vendor>AlmaLinux OS Foundation</vendor>
+    <vendor xml:lang="fur">AlmaLinux OS Foundation</vendor>
+    <vendor xml:lang="zh_Hans">AlmaLinux OS Foundation</vendor>
+    <vendor xml:lang="cs">AlmaLinux OS Foundation</vendor>
+    <vendor xml:lang="ka">AlmaLinux OS Foundation</vendor>
+    <vendor xml:lang="ko">AlmaLinux OS Foundation</vendor>
+    <vendor xml:lang="uk">AlmaLinux OS Foundation</vendor>
+    <vendor xml:lang="tr">AlmaLinux OS Foundation</vendor>
+    <vendor xml:lang="pt_BR">AlmaLinux OS Foundation</vendor>
+    <vendor xml:lang="pl">AlmaLinux OS Foundation</vendor>
+    <vendor xml:lang="it">AlmaLinux OS Foundation</vendor>
+    <vendor xml:lang="id">AlmaLinux OS Foundation</vendor>
+    <vendor xml:lang="fr">AlmaLinux OS Foundation</vendor>
+    <vendor xml:lang="de">AlmaLinux OS Foundation</vendor>
+    <name>AlmaLinux Kitten 10</name>
+    <short-id>almalinux-kitten10</short-id>
+    <version>10</version>
+    <codename>Lion Cub</codename>
+    <family>linux</family>
+    <distro>almalinux</distro>
+    <release-date>2024-10-22</release-date>
+    <clones id="http://centos.org/centos-stream/10"/>
+    <release-status>rolling</release-status>
+    <variant id="netinst">
+      <name>AlmaLinux Kitten 10</name>
+    </variant>
+    <variant id="minimal">
+      <name>AlmaLinux Kitten 10</name>
+    </variant>
+    <variant id="dvd">
+      <name>AlmaLinux Kitten 10</name>
+    </variant>
+    <resources arch="x86_64">
+      <minimum>
+        <cpu>1000000000</cpu>
+        <ram>1610612736</ram>
+        <storage>10737418240</storage>
+      </minimum>
+      <recommended>
+        <cpu>1000000000</cpu>
+        <ram>1610612736</ram>
+        <storage>21474836480</storage>
+      </recommended>
+      <maximum>
+        <n-cpus>768</n-cpus>
+        <ram>26388279066624</ram>
+      </maximum>
+      <network-install>
+        <ram>3221225472</ram>
+      </network-install>
+    </resources>
+    <resources arch="aarch64">
+      <minimum>
+        <ram>2147483648</ram>
+        <storage>10737418240</storage>
+      </minimum>
+      <recommended>
+        <storage>21474836480</storage>
+      </recommended>
+      <maximum>
+        <n-cpus>256</n-cpus>
+        <ram>1649267441664</ram>
+      </maximum>
+    </resources>
+    <resources arch="ppc64le">
+      <minimum>
+        <n-cpus>1</n-cpus>
+        <cpu>1000000000</cpu>
+        <ram>2147483648</ram>
+        <storage>10737418240</storage>
+      </minimum>
+      <recommended>
+        <cpu>4000000000</cpu>
+        <ram>2147483648</ram>
+        <storage>21474836480</storage>
+      </recommended>
+      <maximum>
+        <n-cpus>768</n-cpus>
+        <ram>35184372088832</ram>
+      </maximum>
+    </resources>
+    <resources arch="s390x">
+      <minimum>
+        <ram>1073741824</ram>
+        <storage>10737418240</storage>
+      </minimum>
+      <recommended>
+        <storage>21474836480</storage>
+      </recommended>
+      <maximum>
+        <n-cpus>340</n-cpus>
+        <ram>17592186044416</ram>
+      </maximum>
+      <network-install>
+        <ram>2147483648</ram>
+      </network-install>
+    </resources>
+    <resources arch="all">
+      <minimum>
+        <n-cpus>1</n-cpus>
+        <cpu>1000000000</cpu>
+        <ram>1610612736</ram>
+        <storage>10737418240</storage>
+      </minimum>
+      <recommended>
+        <cpu>1000000000</cpu>
+        <ram>1610612736</ram>
+        <storage>21474836480</storage>
+      </recommended>
+    </resources>
+    <media arch="x86_64">
+      <variant id="netinst"/>
+      <url>https://kitten.repo.almalinux.org/10-kitten/isos/x86_64/AlmaLinux-Kitten-10-latest-x86_64-boot.iso</url>
+      <iso>
+        <volume-id>AlmaLinux-Kitten-10-x86_64</volume-id>
+      </iso>
+      <initrd>images/pxeboot/initrd.img</initrd>
+      <kernel>images/pxeboot/vmlinuz</kernel>
+    </media>
+    <media arch="aarch64">
+      <variant id="netinst"/>
+      <url>https://kitten.repo.almalinux.org/10-kitten/isos/aarch64/AlmaLinux-Kitten-10-latest-aarch64-boot.iso</url>
+      <iso>
+        <volume-id>AlmaLinux-Kitten-10-aarch64</volume-id>
+      </iso>
+      <initrd>images/pxeboot/initrd.img</initrd>
+      <kernel>images/pxeboot/vmlinuz</kernel>
+    </media>
+    <media arch="ppc64le">
+      <variant id="netinst"/>
+      <url>https://kitten.repo.almalinux.org/10-kitten/isos/ppc64le/AlmaLinux-Kitten-10-latest-ppc64le-boot.iso</url>
+      <iso>
+        <volume-id>AlmaLinux-Kitten-10-ppc64le</volume-id>
+      </iso>
+      <initrd>ppc/ppc64/initrd.img</initrd>
+      <kernel>ppc/ppc64/vmlinuz</kernel>
+    </media>
+    <media arch="s390x">
+      <variant id="netinst"/>
+      <url>https://kitten.repo.almalinux.org/10-kitten/isos/s390x/AlmaLinux-Kitten-10-latest-s390x-boot.iso</url>
+      <iso>
+        <volume-id>AlmaLinux-Kitten-10-s390x</volume-id>
+      </iso>
+      <initrd>images/initrd.img</initrd>
+      <kernel>images/kernel.img</kernel>
+    </media>
+    <media arch="x86_64">
+      <variant id="minimal"/>
+      <url>https://kitten.repo.almalinux.org/10-kitten/isos/x86_64/AlmaLinux-Kitten-10-latest-x86_64-minimal.iso</url>
+      <iso>
+        <volume-id>AlmaLinux-Kitten-10-x86_64</volume-id>
+      </iso>
+      <initrd>isolinux/initrd.img</initrd>
+      <kernel>isolinux/vmlinuz</kernel>
+    </media>
+    <media arch="aarch64">
+      <variant id="minimal"/>
+      <url>https://kitten.repo.almalinux.org/10-kitten/isos/aarch64/AlmaLinux-Kitten-10-latest-aarch64-minimal.iso</url>
+      <iso>
+        <volume-id>AlmaLinux-Kitten-10-aarch64</volume-id>
+      </iso>
+      <initrd>images/pxeboot/initrd.img</initrd>
+      <kernel>images/pxeboot/vmlinuz</kernel>
+    </media>
+    <media arch="ppc64le">
+      <variant id="minimal"/>
+      <url>https://kitten.repo.almalinux.org/10-kitten/isos/ppc64le/AlmaLinux-Kitten-10-latest-ppc64le-minimal.iso</url>
+      <iso>
+        <volume-id>AlmaLinux-Kitten-10-ppc64le</volume-id>
+      </iso>
+      <initrd>ppc/ppc64/initrd.img</initrd>
+      <kernel>ppc/ppc64/vmlinuz</kernel>
+    </media>
+    <media arch="s390x">
+      <variant id="minimal"/>
+      <url>https://kitten.repo.almalinux.org/10-kitten/isos/s390x/AlmaLinux-Kitten-10-latest-s390x-minimal.iso</url>
+      <iso>
+        <volume-id>AlmaLinux-Kitten-10-s390x</volume-id>
+      </iso>
+      <initrd>images/initrd.img</initrd>
+      <kernel>images/kernel.img</kernel>
+    </media>
+    <media arch="x86_64">
+      <variant id="dvd"/>
+      <url>https://kitten.repo.almalinux.org/10-kitten/isos/x86_64/AlmaLinux-Kitten-10-latest-x86_64-dvd.iso</url>
+      <iso>
+        <volume-id>AlmaLinux-Kitten-10-x86_64</volume-id>
+      </iso>
+      <initrd>isolinux/initrd.img</initrd>
+      <kernel>isolinux/vmlinuz</kernel>
+    </media>
+    <media arch="aarch64">
+      <variant id="dvd"/>
+      <url>https://kitten.repo.almalinux.org/10-kitten/isos/aarch64/AlmaLinux-Kitten-10-latest-aarch64-dvd.iso</url>
+      <iso>
+        <volume-id>AlmaLinux-Kitten-10-aarch64</volume-id>
+      </iso>
+      <initrd>images/pxeboot/initrd.img</initrd>
+      <kernel>images/pxeboot/vmlinuz</kernel>
+    </media>
+    <media arch="ppc64le">
+      <variant id="dvd"/>
+      <url>https://kitten.repo.almalinux.org/10-kitten/isos/ppc64le/AlmaLinux-Kitten-10-latest-ppc64le-dvd.iso</url>
+      <iso>
+        <volume-id>AlmaLinux-Kitten-10-ppc64le</volume-id>
+      </iso>
+      <initrd>ppc/ppc64/initrd.img</initrd>
+      <kernel>ppc/ppc64/vmlinuz</kernel>
+    </media>
+    <media arch="s390x">
+      <variant id="dvd"/>
+      <url>https://kitten.repo.almalinux.org/10-kitten/isos/s390x/AlmaLinux-Kitten-10-latest-s390x-dvd.iso</url>
+      <iso>
+        <volume-id>AlmaLinux-Kitten-10-s390x</volume-id>
+      </iso>
+      <initrd>images/initrd.img</initrd>
+      <kernel>images/kernel.img</kernel>
+    </media>
+    <tree arch="x86_64">
+      <url>https://kitten.repo.almalinux.org/10-kitten/BaseOS/x86_64/os/</url>
+      <treeinfo>
+        <family>AlmaLinux Kitten</family>
+        <version>^10$</version>
+        <arch>x86_64</arch>
+      </treeinfo>
+    </tree>
+    <tree arch="aarch64">
+      <url>https://kitten.repo.almalinux.org/10-kitten/BaseOS/aarch64/os/</url>
+      <treeinfo>
+        <family>AlmaLinux Kitten</family>
+        <version>^10$</version>
+        <arch>aarch64</arch>
+      </treeinfo>
+    </tree>
+    <tree arch="ppc64le">
+      <url>https://kitten.repo.almalinux.org/10-kitten/BaseOS/ppc64le/os/</url>
+      <treeinfo>
+        <family>AlmaLinux Kitten</family>
+        <version>^10$</version>
+        <arch>ppc64le</arch>
+      </treeinfo>
+    </tree>
+    <tree arch="s390x">
+      <url>https://kitten.repo.almalinux.org/10-kitten/BaseOS/s390x/os/</url>
+      <treeinfo>
+        <family>AlmaLinux Kitten</family>
+        <version>^10$</version>
+        <arch>s390x</arch>
+      </treeinfo>
+    </tree>
+    <image arch="x86_64" format="qcow2" cloud-init="true">
+      <url>https://kitten.repo.almalinux.org/10-kitten/cloud/x86_64/images/AlmaLinux-Kitten-GenericCloud-10-latest.x86_64.qcow2</url>
+    </image>
+    <image arch="aarch64" format="qcow2" cloud-init="true">
+      <url>https://kitten.repo.almalinux.org/10-kitten/cloud/aarch64/images/AlmaLinux-Kitten-GenericCloud-10-latest.aarch64.qcow2</url>
+    </image>
+    <image arch="ppc64le" format="qcow2" cloud-init="true">
+      <url>https://kitten.repo.almalinux.org/10-kitten/cloud/ppc64le/images/AlmaLinux-Kitten-GenericCloud-10-latest.ppc64le.qcow2</url>
+    </image>
+    <image arch="s390x" format="qcow2" cloud-init="true">
+      <url>https://kitten.repo.almalinux.org/10-kitten/cloud/s390x/images/AlmaLinux-Kitten-GenericCloud-10-latest.s390x.qcow2</url>
+    </image>
+    <installer>
+      <script id="http://redhat.com/rhel/kickstart/jeos"/>
+      <script id="http://redhat.com/rhel/kickstart/desktop"/>
+    </installer>
+    <cloud-image-username>almalinux</cloud-image-username>
+  </os>
+</libosinfo>