From 4ebecbaa445d99a866b8c5f99a7776ff8677d313 Mon Sep 17 00:00:00 2001
From: ebasov <eduard.basov@softline.com>
Date: Tue, 12 Nov 2024 15:37:25 +0300
Subject: [PATCH] Fix .patch and add aarch64

---
 SOURCES/0001-Added-MSVSphere-support.patch | 48 +++++++++++++++++-----
 SPECS/osinfo-db.spec                       |  5 ++-
 2 files changed, 42 insertions(+), 11 deletions(-)

diff --git a/SOURCES/0001-Added-MSVSphere-support.patch b/SOURCES/0001-Added-MSVSphere-support.patch
index 6b4c535..4008089 100644
--- a/SOURCES/0001-Added-MSVSphere-support.patch
+++ b/SOURCES/0001-Added-MSVSphere-support.patch
@@ -8,7 +8,7 @@ Subject: [PATCH] Remaking original [PATCH] Added MSVSphere support from
  .../redhat.com/rhel-kickstart-desktop.xml     |  7 ++
  .../redhat.com/rhel-kickstart-jeos.xml        |  7 ++
  os/msvsphere-os.ru/msvsphere-8.xml            | 78 +++++++++++++++++
- os/msvsphere-os.ru/msvsphere-9.xml            | 87 +++++++++++++++++++
+ os/msvsphere-os.ru/msvsphere-9.xml            | 112 +++++++++++++++++++
  4 files changed, 179 insertions(+)
  create mode 100644 os/msvsphere-os.ru/msvsphere-8.xml
  create mode 100644 os/msvsphere-os.ru/msvsphere-9.xml
@@ -88,7 +88,7 @@ index 0000000..e5cb57b
 +    <media arch="x86_64">
 +      <iso>
 +        <system-id>LINUX</system-id>
-+        <volume-id>MSVSphere-8-*-x86_64-dvd.*</volume-id>
++        <volume-id>MSVSphere-8.*x86_64.*</volume-id>
 +      </iso>
 +      <kernel>isolinux/vmlinuz</kernel>
 +      <initrd>isolinux/initrd.img</initrd>
@@ -112,12 +112,12 @@ index 0000000..e5cb57b
 +        <n-cpus>1</n-cpus>
 +        <cpu>1000000000</cpu>
 +        <ram>1610612736</ram>
-+        <storage>10737418240</storage>
++        <storage>21474836480</storage>
 +      </minimum>
 +      <recommended>
 +        <cpu>1000000000</cpu>
 +        <ram>1610612736</ram>
-+        <storage>21474836480</storage>
++        <storage>42949672960</storage>
 +      </recommended>
 +      <network-install>
 +        <ram>3221225472</ram>
@@ -135,7 +135,7 @@ new file mode 100644
 index 0000000..05dc550
 --- /dev/null
 +++ b/os/msvsphere-os.ru/msvsphere-9.xml
-@@ -0,0 +1,84 @@
+@@ -0,0 +1,112 @@
 +<?xml version="1.0" encoding="UTF-8"?>
 +<libosinfo version="0.0.1">
 +  <os id="http://msvsphere-os.ru/msvsphere/9">
@@ -168,11 +168,18 @@ index 0000000..05dc550
 +    <release-status>prerelease</release-status>
 +    <media arch="x86_64">
 +      <iso>
-+        <volume-id>MSVSphere-9.*-x86_64.*</volume-id>
++        <volume-id>MSVSphere-9.*x86_64.*</volume-id>
 +      </iso>
 +      <kernel>isolinux/vmlinuz</kernel>
 +      <initrd>isolinux/initrd.img</initrd>
 +    </media>
++    <media arch="aarch64">
++      <iso>
++        <volume-id>MSVSphere-9.*aarch64.*</volume-id>
++      </iso>
++      <kernel>images/pxeboot/vmlinuz</kernel>
++      <initrd>images/pxeboot/initrd.img</initrd>
++    </media>
 +    <tree arch="x86_64">
 +      <url>http://repo1.msvsphere-os.ru/msvsphere/9/BaseOS/x86_64/os/</url>
 +      <treeinfo>
@@ -181,16 +188,24 @@ index 0000000..05dc550
 +        <arch>x86_64</arch>
 +      </treeinfo>
 +    </tree>
++    <tree arch="aarch64">
++      <url>http://repo1.msvsphere-os.ru/msvsphere/9/BaseOS/aarch64/os/</url>
++      <treeinfo>
++        <family>MSVSphere</family>
++        <version>^9$</version>
++        <arch>aarch64</arch>
++      </treeinfo>
++    </tree>
 +    <resources arch="x86_64">
 +      <minimum>
 +        <cpu>1000000000</cpu>
 +        <ram>1610612736</ram>
-+        <storage>10737418240</storage>
++        <storage>21474836480</storage>
 +      </minimum>
 +      <recommended>
 +        <cpu>1000000000</cpu>
 +        <ram>1610612736</ram>
-+        <storage>21474836480</storage>
++        <storage>42949672960</storage>
 +      </recommended>
 +      <maximum>
 +        <n-cpus>768</n-cpus>
@@ -200,17 +215,30 @@ index 0000000..05dc550
 +        <ram>3221225472</ram>
 +      </network-install>
 +    </resources>
++    <resources arch="aarch64">
++      <minimum>
++        <ram>2147483648</ram>
++        <storage>21474836480</storage>
++      </minimum>
++      <recommended>
++        <storage>42949672960</storage>
++      </recommended>
++      <maximum>
++        <n-cpus>256</n-cpus>
++        <ram>1649267441664</ram>
++      </maximum>
++    </resources>
 +    <resources arch="all">
 +      <minimum>
 +        <n-cpus>1</n-cpus>
 +        <cpu>1000000000</cpu>
 +        <ram>1610612736</ram>
-+        <storage>10737418240</storage>
++        <storage>21474836480</storage>
 +      </minimum>
 +      <recommended>
 +        <cpu>1000000000</cpu>
 +        <ram>1610612736</ram>
-+        <storage>21474836480</storage>
++        <storage>42949672960</storage>
 +      </recommended>
 +    </resources>
 +    <cloud-image-username>msvsphere</cloud-image-username>
diff --git a/SPECS/osinfo-db.spec b/SPECS/osinfo-db.spec
index 0908adf..bfa6034 100644
--- a/SPECS/osinfo-db.spec
+++ b/SPECS/osinfo-db.spec
@@ -3,7 +3,7 @@
 Summary: osinfo database files
 Name: osinfo-db
 Version: 20240701
-Release: 1%{?dist}.inferit
+Release: 2%{?dist}.inferit
 License: LGPLv2+
 Source0: https://fedorahosted.org/releases/l/i/libosinfo/%{name}-%{version}.tar.xz
 Source1: https://fedorahosted.org/releases/l/i/libosinfo/%{name}-%{version}.tar.xz.asc
@@ -44,6 +44,9 @@ find %{buildroot}/%{_datadir}/osinfo/os/microsoft.com/ -name "win-*.d" -type d -
 %{_datadir}/osinfo/schema
 
 %changelog
+* Tue Nov 12 2024 Eduard Basov <ebasov@msvsphere-os.ru> - 20240701-2.inferit
+- Fix .patch and add aarch64
+
 * Wed Oct 16 2024 Eduard Basov <ebasov@msvsphere-os.ru> - 20240701-1.inferit
 - Fix applying patch for MSVSphere support
 - Update to new release (v20240701)