From de2ef7d6807ed03bc70bfefae373a77a9e9d3766 Mon Sep 17 00:00:00 2001 From: ebasov Date: Tue, 12 Nov 2024 15:17:26 +0300 Subject: [PATCH 1/4] Fix .patch and add aarch64 --- SOURCES/0001-Added-MSVSphere-support.patch | 48 +++++++++++++++++----- 1 file changed, 38 insertions(+), 10 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 + + + LINUX -+ MSVSphere-8-*-x86_64-dvd.* ++ MSVSphere-8.*x86_64.* + + isolinux/vmlinuz + isolinux/initrd.img @@ -112,12 +112,12 @@ index 0000000..e5cb57b + 1 + 1000000000 + 1610612736 -+ 10737418240 ++ 21474836480 + + + 1000000000 + 1610612736 -+ 21474836480 ++ 42949672960 + + + 3221225472 @@ -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 @@ + + + @@ -168,11 +168,18 @@ index 0000000..05dc550 + prerelease + + -+ MSVSphere-9.*-x86_64.* ++ MSVSphere-9.*x86_64.* + + isolinux/vmlinuz + isolinux/initrd.img + ++ ++ ++ MSVSphere-9.*aarch64.* ++ ++ images/pxeboot/vmlinuz ++ images/pxeboot/initrd.img ++ + + http://repo1.msvsphere-os.ru/msvsphere/9/BaseOS/x86_64/os/ + @@ -181,16 +188,24 @@ index 0000000..05dc550 + x86_64 + + ++ ++ http://repo1.msvsphere-os.ru/msvsphere/9/BaseOS/aarch64/os/ ++ ++ MSVSphere ++ ^9$ ++ aarch64 ++ ++ + + + 1000000000 + 1610612736 -+ 10737418240 ++ 21474836480 + + + 1000000000 + 1610612736 -+ 21474836480 ++ 42949672960 + + + 768 @@ -200,17 +215,30 @@ index 0000000..05dc550 + 3221225472 + + ++ ++ ++ 2147483648 ++ 21474836480 ++ ++ ++ 42949672960 ++ ++ ++ 256 ++ 1649267441664 ++ ++ + + + 1 + 1000000000 + 1610612736 -+ 10737418240 ++ 21474836480 + + + 1000000000 + 1610612736 -+ 21474836480 ++ 42949672960 + + + msvsphere -- 2.36.5 From 94e8e9230467de3bb862e42fcf348bb2c8d437f1 Mon Sep 17 00:00:00 2001 From: ebasov Date: Tue, 12 Nov 2024 15:28:28 +0300 Subject: [PATCH 2/4] =?UTF-8?q?=D0=98=D0=B7=D0=BC=D0=B5=D0=BD=D0=B8=D0=BB(?= =?UTF-8?q?=D0=B0)=20=D0=BD=D0=B0=20'SPECS/osinfo-db.spec'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SPECS/osinfo-db.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/SPECS/osinfo-db.spec b/SPECS/osinfo-db.spec index 71e9fbc..7ea27b7 100644 --- a/SPECS/osinfo-db.spec +++ b/SPECS/osinfo-db.spec @@ -3,7 +3,7 @@ Summary: osinfo database files Name: osinfo-db Version: 20231215 -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,10 @@ find %{buildroot}/%{_datadir}/osinfo/os/microsoft.com/ -name "win-*.d" -type d - %{_datadir}/osinfo/schema %changelog +* Tue Nov 12 2024 Eduard Basov - 20231215-2.inferit +- Fix .patch and add aarch64 + + * Wed Oct 16 2024 Eduard Basov - 20231215-1.inferit - Fix applying patch for MSVSphere support - Update to new release (v20231215) -- 2.36.5 From 762f152597d87e3b45fe5d698ed2efea7eff6d6b Mon Sep 17 00:00:00 2001 From: ebasov Date: Tue, 12 Nov 2024 15:28:51 +0300 Subject: [PATCH 3/4] =?UTF-8?q?=D0=98=D0=B7=D0=BC=D0=B5=D0=BD=D0=B8=D0=BB(?= =?UTF-8?q?=D0=B0)=20=D0=BD=D0=B0=20'SPECS/osinfo-db.spec'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SPECS/osinfo-db.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/SPECS/osinfo-db.spec b/SPECS/osinfo-db.spec index 7ea27b7..1a17d9d 100644 --- a/SPECS/osinfo-db.spec +++ b/SPECS/osinfo-db.spec @@ -47,7 +47,6 @@ find %{buildroot}/%{_datadir}/osinfo/os/microsoft.com/ -name "win-*.d" -type d - * Tue Nov 12 2024 Eduard Basov - 20231215-2.inferit - Fix .patch and add aarch64 - * Wed Oct 16 2024 Eduard Basov - 20231215-1.inferit - Fix applying patch for MSVSphere support - Update to new release (v20231215) -- 2.36.5 From f218eab4a900f1ae6c7512fa05ac26e308ed5270 Mon Sep 17 00:00:00 2001 From: ebasov Date: Tue, 12 Nov 2024 16:17:45 +0300 Subject: [PATCH 4/4] =?UTF-8?q?=D0=98=D0=B7=D0=BC=D0=B5=D0=BD=D0=B8=D0=BB(?= =?UTF-8?q?=D0=B0)=20=D0=BD=D0=B0=20'SPECS/osinfo-db.spec'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: ebasov --- SPECS/osinfo-db.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/SPECS/osinfo-db.spec b/SPECS/osinfo-db.spec index 1a17d9d..8c40b58 100644 --- a/SPECS/osinfo-db.spec +++ b/SPECS/osinfo-db.spec @@ -3,7 +3,7 @@ Summary: osinfo database files Name: osinfo-db Version: 20231215 -Release: 2%{?dist}.inferit +Release: 1%{?dist}.inferit.1 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,7 +44,7 @@ find %{buildroot}/%{_datadir}/osinfo/os/microsoft.com/ -name "win-*.d" -type d - %{_datadir}/osinfo/schema %changelog -* Tue Nov 12 2024 Eduard Basov - 20231215-2.inferit +* Tue Nov 12 2024 Eduard Basov - 20231215-1.inferit.1 - Fix .patch and add aarch64 * Wed Oct 16 2024 Eduard Basov - 20231215-1.inferit -- 2.36.5