rpms
/
osinfo-db
21
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

merge into: rpms:i9-beta
Branches Tags
rpms:i9-beta
rpms:i10c-beta
rpms:c10-beta
rpms:i10cs
rpms:cs10
rpms:i9
rpms:i9c-beta
rpms:c9-beta
rpms:i8c-beta
rpms:c8-beta
rpms:i8c
rpms:c8
rpms:i9c
rpms:c9
...
pull from: rpms:c9
Branches Tags
rpms:i9-beta
rpms:i10c-beta
rpms:c10-beta
rpms:i10cs
rpms:cs10
rpms:i9
rpms:i9c-beta
rpms:c9-beta
rpms:i8c-beta
rpms:c8-beta
rpms:i8c
rpms:c8
rpms:i9c
rpms:c9

No commits in common. 'i9-beta' and 'c9' have entirely different histories.
i9-beta ... c9

6 changed files with 21 additions and 302 deletions
Show Stats

2
.gitignore vendored
Unescape View File

@ -1 +1 @@
SOURCES/osinfo-db-20240701.tar.xz SOURCES/osinfo-db-20230518.tar.xz

2
.osinfo-db.metadata
Unescape View File

@ -1 +1 @@
43b0f08a371095c22285e4cbe550cafaa5decd2e SOURCES/osinfo-db-20240701.tar.xz 3bcd3e87c3f58bf4a62e2c75644c063a82462823 SOURCES/osinfo-db-20230518.tar.xz

253
SOURCES/0001-Added-MSVSphere-support.patch
Unescape View File

@ -1,253 +0,0 @@
From 461c67a95d47363e147793367e027f10f520e0e2 Mon Sep 17 00:00:00 2001
From: Alexey Lyubimov <a.lyubimov@softline.com>
Date: Mon, 16 Oct 2023 17:24:03 +0300
Subject: [PATCH] Remaking original [PATCH] Added MSVSphere support from
ac17c12f781cd539b653695408af3df59ab23201 after update to osinfo-db-20230518
---
.../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 | 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
diff --git a/install-script/redhat.com/rhel-kickstart-desktop.xml b/install-script/redhat.com/rhel-kickstart-desktop.xml
index 82911f4..315b475 100644
--- a/install-script/redhat.com/rhel-kickstart-desktop.xml
+++ b/install-script/redhat.com/rhel-kickstart-desktop.xml
@@ -179,6 +179,13 @@
<xsl:call-template name="arch"/>
<xsl:text>/BaseOS/os/</xsl:text>
</xsl:when>
+ <xsl:when test="os/distro = 'msvsphere'">
+ <xsl:text>https://repo1.msvsphere-os.ru/msvsphere/</xsl:text>
+ <xsl:call-template name="version"/>
+ <xsl:text>/BaseOS/</xsl:text>
+ <xsl:call-template name="arch"/>
+ <xsl:text>/os/</xsl:text>
+ </xsl:when>
<xsl:when test="os/distro = 'rocky'">
<xsl:text>https://download.rockylinux.org/pub/rocky/</xsl:text>
<xsl:call-template name="version"/>
diff --git a/install-script/redhat.com/rhel-kickstart-jeos.xml b/install-script/redhat.com/rhel-kickstart-jeos.xml
index 21d3e85..295a006 100644
--- a/install-script/redhat.com/rhel-kickstart-jeos.xml
+++ b/install-script/redhat.com/rhel-kickstart-jeos.xml
@@ -159,6 +159,13 @@
<xsl:call-template name="arch"/>
<xsl:text>/BaseOS/os/</xsl:text>
</xsl:when>
+ <xsl:when test="os/distro = 'msvsphere'">
+ <xsl:text>https://repo1.msvsphere-os.ru/msvsphere/</xsl:text>
+ <xsl:call-template name="version"/>
+ <xsl:text>/BaseOS/</xsl:text>
+ <xsl:call-template name="arch"/>
+ <xsl:text>/os/</xsl:text>
+ </xsl:when>
<xsl:when test="os/distro = 'rocky'">
<xsl:text>https://download.rockylinux.org/pub/rocky/</xsl:text>
<xsl:call-template name="version"/>
diff --git a/os/msvsphere-os.ru/msvsphere-8.xml b/os/msvsphere-os.ru/msvsphere-8.xml
new file mode 100644
index 0000000..e5cb57b
--- /dev/null
+++ b/os/msvsphere-os.ru/msvsphere-8.xml
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<libosinfo version="0.0.1">
+ <os id="http://msvsphere-os.ru/msvsphere/8">
+ <short-id>msvsphere8</short-id>
+ <name>MSVSphere 8</name>
+ <name xml:lang="cs">MSVSphere 8</name>
+ <name xml:lang="ka">MSVSphere 8</name>
+ <name xml:lang="fi">MSVSphere 8</name>
+ <name xml:lang="uk">MSVSphere 8</name>
+ <name xml:lang="tr">MSVSphere 8</name>
+ <name xml:lang="pt_BR">MSVSphere 8</name>
+ <name xml:lang="pl">MSVSphere 8</name>
+ <name xml:lang="it">MSVSphere 8</name>
+ <name xml:lang="id">MSVSphere 8</name>
+ <name xml:lang="de">MSVSphere 8</name>
+ <version>8</version>
+ <vendor>LLC "NCSD"</vendor>
+ <vendor xml:lang="cs">LLC "NCSD"</vendor>
+ <vendor xml:lang="ka">LLC "NCSD"</vendor>
+ <vendor xml:lang="ko">LLC "NCSD"</vendor>
+ <vendor xml:lang="uk">LLC "NCSD"</vendor>
+ <vendor xml:lang="tr">LLC "NCSD"</vendor>
+ <vendor xml:lang="pl">LLC "NCSD"</vendor>
+ <vendor xml:lang="it">LLC "NCSD"</vendor>
+ <vendor xml:lang="id">LLC "NCSD"</vendor>
+ <vendor xml:lang="de">LLC "NCSD"</vendor>
+ <family>linux</family>
+ <distro>msvsphere</distro>
+ <clones id="http://redhat.com/rhel/8.8"/>
+ <release-status>prerelease</release-status>
+ <media arch="x86_64">
+ <iso>
+ <system-id>LINUX</system-id>
+ <volume-id>MSVSphere-8.*x86_64.*</volume-id>
+ </iso>
+ <kernel>isolinux/vmlinuz</kernel>
+ <initrd>isolinux/initrd.img</initrd>
+ </media>
+ <tree arch="x86_64">
+ <url>http://repo1.msvsphere-os.ru/msvsphere/8/BaseOS/x86_64/os/</url>
+ <treeinfo>
+ <family>MSVSphere</family>
+ <version>^8$</version>
+ <arch>x86_64</arch>
+ </treeinfo>
+ </tree>
+ <tree arch="all">
+ <treeinfo>
+ <family>MSVSphere</family>
+ <version>^8$</version>
+ </treeinfo>
+ </tree>
+ <resources arch="all">
+ <minimum>
+ <n-cpus>1</n-cpus>
+ <cpu>1000000000</cpu>
+ <ram>1610612736</ram>
+ <storage>21474836480</storage>
+ </minimum>
+ <recommended>
+ <cpu>1000000000</cpu>
+ <ram>1610612736</ram>
+ <storage>42949672960</storage>
+ </recommended>
+ <network-install>
+ <ram>3221225472</ram>
+ </network-install>
+ </resources>
+ <cloud-image-username>msvsphere</cloud-image-username>
+ <installer>
+ <script id="http://redhat.com/rhel/kickstart/jeos"/>
+ <script id="http://redhat.com/rhel/kickstart/desktop"/>
+ </installer>
+ </os>
+</libosinfo>
diff --git a/os/msvsphere-os.ru/msvsphere-9.xml b/os/msvsphere-os.ru/msvsphere-9.xml
new file mode 100644
index 0000000..05dc550
--- /dev/null
+++ b/os/msvsphere-os.ru/msvsphere-9.xml
@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<libosinfo version="0.0.1">
+ <os id="http://msvsphere-os.ru/msvsphere/9">
+ <short-id>msvsphere9</short-id>
+ <name>MSVSphere 9</name>
+ <name xml:lang="cs">MSVSphere 9</name>
+ <name xml:lang="ka">MSVSphere 9</name>
+ <name xml:lang="fi">MSVSphere 9</name>
+ <name xml:lang="uk">MSVSphere 9</name>
+ <name xml:lang="tr">MSVSphere 9</name>
+ <name xml:lang="pt_BR">MSVSphere 9</name>
+ <name xml:lang="pl">MSVSphere 9</name>
+ <name xml:lang="it">MSVSphere 9</name>
+ <name xml:lang="id">MSVSphere 9</name>
+ <name xml:lang="de">MSVSphere 9</name>
+ <version>9</version>
+ <vendor>LLC "NCSD"</vendor>
+ <vendor xml:lang="cs">LLC "NCSD"</vendor>
+ <vendor xml:lang="ka">LLC "NCSD"</vendor>
+ <vendor xml:lang="ko">LLC "NCSD"</vendor>
+ <vendor xml:lang="uk">LLC "NCSD"</vendor>
+ <vendor xml:lang="tr">LLC "NCSD"</vendor>
+ <vendor xml:lang="pl">LLC "NCSD"</vendor>
+ <vendor xml:lang="it">LLC "NCSD"</vendor>
+ <vendor xml:lang="id">LLC "NCSD"</vendor>
+ <vendor xml:lang="de">LLC "NCSD"</vendor>
+ <family>linux</family>
+ <distro>msvsphere</distro>
+ <clones id="http://redhat.com/rhel/9.1"/>
+ <release-status>prerelease</release-status>
+ <media arch="x86_64">
+ <iso>
+ <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>
+ <family>MSVSphere</family>
+ <version>^9$</version>
+ <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>21474836480</storage>
+ </minimum>
+ <recommended>
+ <cpu>1000000000</cpu>
+ <ram>1610612736</ram>
+ <storage>42949672960</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>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>21474836480</storage>
+ </minimum>
+ <recommended>
+ <cpu>1000000000</cpu>
+ <ram>1610612736</ram>
+ <storage>42949672960</storage>
+ </recommended>
+ </resources>
+ <cloud-image-username>msvsphere</cloud-image-username>
+ <installer>
+ <script id="http://redhat.com/rhel/kickstart/jeos"/>
+ <script id="http://redhat.com/rhel/kickstart/desktop"/>
+ </installer>
+ </os>
+</libosinfo>
--
2.39.3

16
SOURCES/osinfo-db-20230518.tar.xz.asc
Unescape View File

@ -0,0 +1,16 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEEIG07NS9WbzsOZXLpl9kSPeN6SE8FAmRmJYwACgkQl9kSPeN6
SE/AqA/+JhUFgVcGDaZ1c7/XBbLFN3QPhtKJd8A30YH2Xxd5/GEuKsnYUrAGpIe6
oM3X+08cY2OEJSlb6zShV7NsqQtGcbgCmG4s01UJFC1lKSRWRQJlj7a48Ujo+Sd3
dJafRY6AboOYNP0rVUqxsJX4Bgy26DmX/K+q8nZaZwS+nEPQ4XS1WY8l7g+sbGDb
IAflmpp2CGn7ofp68JCAGt1IJfdCQVece6rPitxdRp+SLIfTkeiHWW6sG9oPPoNW
9Lu4Dtk4DfnatgcDQQLvbA033q6SqZ46td9L0fnGDUQFn+oEh9+v6AR5cMWlWG47
IHhDzFlkRUVXpz+AbfSCjssHkF3Xh7pLjpH/KVvyOZVZzeASRYXNXyRgemUZXw1U
U2T1WjINDQHUkkNwa+ORcF+p3u41Nn8vDRYf07HQPpW10qqCbHs50hxsSnV9Vgll
BfDC4IQ6sP7oEfIdNAYIpRjeO0FaL8g7R/Z4y48cfv1jbvgIL7WJQLSXjn82PhKI
URLAh47kxv4n6OBX3i/F8HTz5x3sAsNlLKVasHVyAoMSMneCT/CBdD7FUfExb7Ig
m+uVZ6pFQoX/lHlmXvcTYlP3o931o6ta4BxSsO1X0nwk9PBQxDDtyF7euwERBfKm
VzsT70zk3ViZZ3SxEZf5G13VKI/V6cIVqAu7tTOtVAj/FX5EWX0=
=yhtU
-----END PGP SIGNATURE-----

16
SOURCES/osinfo-db-20240701.tar.xz.asc
Unescape View File

@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEEIG07NS9WbzsOZXLpl9kSPeN6SE8FAmaCy9kACgkQl9kSPeN6
SE9RBQ//fvv3bA8iSnzOivi63lf+xsJlR2E+aMYxQrcXbtUHHLRvViVB4BUoqID9
rD/+I0uhf9KCG50TQlsfUsRJ9SiCZJ4UQODBzigsaZStuMvC/9nBGfajDA+sH66A
03P0ERO7wiWXorYISCu18TrJ85mdat/04C8317PMYLuaQUkmEaBAEnGeMBqVAKxK
172OhizLB6NSZA4ATOx2qIk2IvH7v0dA8ugfEd5Ou3BWyIWJfPD0nmVJUgjmX0mO
LbUAxeWilH7ROls/EPoJjED8Ne6xfw4u+vFKZo1Jp45h1F2obCtsre1xmXr5uiNV
eh5pQnc45xFI/KLpZLMwcrGT5f8EJzvErtod1ypeRcSGFFD4dsWS0+KH9FLZv7ei
iXAQTqs9OmP98V6LRI6PXiiURApzA4YF8cBLeSNk6Uzyft2vt1+C2UOXE6K+zu8n
dwszQI+pu/AVBjir5Cp9YtNP0OS5J3+hYJ7Oz8UJkmt9WNU1VTIXTemzHDB4Nuxa
srZ+M6RVRtDYMHMM9nM/cYDSMUgrUDKcxAwMdWAMMT2wk1lkPU/45pi3KiiziGrj
nrnPDVXkY1vBaKXBaYGt0XHN0DYofcDauIvdlk1VG5XL3Lsek5WgWj64ltXnAyJM
ls9t5GKESjrH13+qDdE4c2yNmWuz4uzRWzH8QuKOpr/79YZCMW4=
=oWKM
-----END PGP SIGNATURE-----

34
SPECS/osinfo-db.spec
Unescape View File

@ -2,12 +2,11 @@
Summary: osinfo database files Summary: osinfo database files
Name: osinfo-db Name: osinfo-db
Version: 20240701 Version: 20230518
Release: 2%{?dist}.inferit.2 Release: 1%{?dist}
License: LGPLv2+ License: LGPLv2+
Source0: https://fedorahosted.org/releases/l/i/libosinfo/%{name}-%{version}.tar.xz 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 Source1: https://fedorahosted.org/releases/l/i/libosinfo/%{name}-%{version}.tar.xz.asc
Patch0001: 0001-Added-MSVSphere-support.patch
URL: http://libosinfo.org/ URL: http://libosinfo.org/
BuildRequires: intltool BuildRequires: intltool
BuildRequires: git-core BuildRequires: git-core
@ -24,9 +23,7 @@ provisioning of new virtual machines
%autosetup -S git_am %autosetup -S git_am
%install %install
#repack osinfo-db-import --root %{buildroot} --dir %{_datadir}/osinfo %{SOURCE0}
tar -c --exclude=.git -af /tmp/%{name}-%{version}.tar.xz -C %{_builddir} %{name}-%{version}
osinfo-db-import --root %{buildroot} --dir %{_datadir}/osinfo /tmp/%{name}-%{version}.tar.xz
%if 0%{?rhel} %if 0%{?rhel}
# Remove the upstream virtio-win / spice-guest-tools drivers # Remove the upstream virtio-win / spice-guest-tools drivers
find %{buildroot}/%{_datadir}/osinfo/os/microsoft.com/ -name "win-*.d" -type d -exec rm -rf {} + find %{buildroot}/%{_datadir}/osinfo/os/microsoft.com/ -name "win-*.d" -type d -exec rm -rf {} +
@ -44,35 +41,10 @@ find %{buildroot}/%{_datadir}/osinfo/os/microsoft.com/ -name "win-*.d" -type d -
%{_datadir}/osinfo/schema %{_datadir}/osinfo/schema
%changelog %changelog
* Wed Nov 27 2024 Arkady L. Shane <tigro@msvsphere-os.ru> - 20240701-2.inferit.2
- Fix Spec (Broken MSVSphere detection)
* Wed Nov 13 2024 Eduard Basov <ebasov@msvsphere-os.ru> - 20240701-2.inferit.1
- Fix .patch and add aarch64
* Wed Oct 16 2024 Eduard Basov <ebasov@msvsphere-os.ru> - 20240701-2.inferit
- Added MSVSphere support
* Fri Aug 02 2024 Victor Toso <victortoso@redhat.com> - 20240701-2
- Fix changelog
Related: rhbz#RHEL-52519
* Fri Aug 02 2024 Victor Toso <victortoso@redhat.com> - 20240701-1
- Update to new release (v20240701)
Resolves: rhbz#RHEL-52519
Resolves: rhbz#RHEL-38636
* Tue Jan 02 2024 Victor Toso <victortoso@redhat.com> - 20231215-1
- Update to new release (v20231215)
Resolves: rhbz#RHEL-19756
* Tue May 23 2023 Victor Toso <victortoso@redhat.com> - 20230518-1 * Tue May 23 2023 Victor Toso <victortoso@redhat.com> - 20230518-1
- Update to new release (v20230518) - Update to new release (v20230518)
Resolves: rhbz#2184784 Resolves: rhbz#2184784
* Fri Apr 14 2023 MSVSphere Packaging Team <packager@msvsphere.ru> - 20221130-1
- Rebuilt for MSVSphere 9.2 beta
* Wed Nov 30 2022 Victor Toso <victortoso@redhat.com> - 20221130-1 * Wed Nov 30 2022 Victor Toso <victortoso@redhat.com> - 20221130-1
- Update for new release (v20221130) - Update for new release (v20221130)
Resolves: rhbz#2135751 Resolves: rhbz#2135751

Write Preview
Loading…
Cancel
Save