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

Patch changes and adding a new version of tarball #1

Merged
tigro merged 3 commits from :i9 into i9 2 months ago
Conversation 2 Commits 3 Files Changed 6
6 changed files with 32 additions and 34 deletions
Show Stats Download Patch File Download Diff File

2
.gitignore vendored
Unescape View File

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

2
.osinfo-db.metadata
Unescape View File

@ -1 +1 @@
3bcd3e87c3f58bf4a62e2c75644c063a82462823 SOURCES/osinfo-db-20230518.tar.xz
ad1464b0d179d74a987f653857d8c78a6549e2f6 SOURCES/osinfo-db-20231215.tar.xz

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

@ -22,7 +22,7 @@ index 82911f4..315b475 100644
<xsl:text>/BaseOS/os/</xsl:text>
</xsl:when>
+ <xsl:when test="os/distro = 'msvsphere'">
+ <xsl:text>https://rsync.inferitos.ru/msvsphere/</xsl:text>
+ <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"/>
@ -40,7 +40,7 @@ index 21d3e85..295a006 100644
<xsl:text>/BaseOS/os/</xsl:text>
</xsl:when>
+ <xsl:when test="os/distro = 'msvsphere'">
+ <xsl:text>https://rsync.inferitos.ru/msvsphere/</xsl:text>
+ <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"/>
@ -54,7 +54,7 @@ new file mode 100644
index 0000000..e5cb57b
--- /dev/null
+++ b/os/msvsphere-os.ru/msvsphere-8.xml
@@ -0,0 +1,78 @@
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<libosinfo version="0.0.1">
+ <os id="http://msvsphere-os.ru/msvsphere/8">
tigro commented 2 months ago
Review

Вот тут нет ошибки?

Вот тут нет ошибки?
ebasov commented 2 months ago
Review

Тут нет ошибки.
Вот где это всплывает:
[edbasov@MiWiFi-R4AC-srv SPECS]$ osinfo-query os | grep msvsphere
msvsphere8 | MSVSphere 8 | 8 | http://msvsphere-os.ru/msvsphere/8
msvsphere9 | MSVSphere 9 | 9 | http://msvsphere-os.ru/msvsphere/9

Пример Альмы:
[edbasov@MiWiFi-R4AC-srv SPECS]$ osinfo-query os | grep alma
almalinux8 | AlmaLinux 8 | 8 | http://almalinux.org/almalinux/8
almalinux9 | AlmaLinux 9 | 9 | http://almalinux.org/almalinux/9

Тут нет ошибки. Вот где это всплывает: [edbasov@MiWiFi-R4AC-srv SPECS]$ osinfo-query os | grep msvsphere msvsphere8 | MSVSphere 8 | 8 | http://msvsphere-os.ru/msvsphere/8 msvsphere9 | MSVSphere 9 | 9 | http://msvsphere-os.ru/msvsphere/9 Пример Альмы: [edbasov@MiWiFi-R4AC-srv SPECS]$ osinfo-query os | grep alma almalinux8 | AlmaLinux 8 | 8 | http://almalinux.org/almalinux/8 almalinux9 | AlmaLinux 9 | 9 | http://almalinux.org/almalinux/9
@ -88,13 +88,13 @@ index 0000000..e5cb57b
+ <media arch="x86_64">
+ <iso>
+ <system-id>LINUX</system-id>
+ <volume-id>MSVSphere-8-([3-9]|[1-9][0-9])-x86_64-dvd.*</volume-id>
+ <volume-id>MSVSphere-8-*-x86_64-dvd.*</volume-id>
+ </iso>
+ <kernel>isolinux/vmlinuz</kernel>
+ <initrd>isolinux/initrd.img</initrd>
+ </media>
+ <tree arch="x86_64">
+ <url>http://rsync.inferitos.ru/msvsphere/8/BaseOS/x86_64/os/</url>
+ <url>http://repo1.msvsphere-os.ru/msvsphere/8/BaseOS/x86_64/os/</url>
tigro commented 2 months ago
Review

Нет такого урла. Ошибка в домене

Нет такого урла. Ошибка в домене
+ <treeinfo>
+ <family>MSVSphere</family>
+ <version>^8$</version>
@ -107,9 +107,6 @@ index 0000000..e5cb57b
+ <version>^8$</version>
+ </treeinfo>
+ </tree>
+ <image arch="x86_64" format="qcow2" cloud-init="true">
+ <url>https://rsync.inferitos.ru/msvsphere/8/images/MSVSphere-8.8-2023xxxx.gencloud.x86_64.qcow2</url>
tigro commented 2 months ago
Review

У нас нет такого образа и должно быть repo1.msvsphere-os.ru

У нас нет такого образа и должно быть repo1.msvsphere-os.ru
+ </image>
+ <resources arch="all">
+ <minimum>
+ <n-cpus>1</n-cpus>
@ -138,7 +135,7 @@ new file mode 100644
index 0000000..05dc550
--- /dev/null
+++ b/os/msvsphere-os.ru/msvsphere-9.xml
@@ -0,0 +1,87 @@
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<libosinfo version="0.0.1">
+ <os id="http://msvsphere-os.ru/msvsphere/9">
@ -177,16 +174,13 @@ index 0000000..05dc550
+ <initrd>isolinux/initrd.img</initrd>
+ </media>
+ <tree arch="x86_64">
+ <url>http://rsync.inferitos.ru/msvsphere/9/BaseOS/x86_64/os/</url>
+ <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>
+ <image arch="x86_64" format="qcow2" cloud-init="true">
+ <url>https://rsync.inferitos.ru/msvsphere/9/images/MSVSphere-9.2-20230708.gencloud.x86_64.qcow2</url>
tigro commented 2 months ago
Review

У нас нет такого образа и URL должен быть repo1.msvsphere-os.ru

У нас нет такого образа и URL должен быть repo1.msvsphere-os.ru
+ </image>
+ <resources arch="x86_64">
+ <minimum>
+ <cpu>1000000000</cpu>

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

@ -1,16 +0,0 @@
-----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-20231215.tar.xz.asc
Unescape View File

@ -0,0 +1,16 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEEIG07NS9WbzsOZXLpl9kSPeN6SE8FAmV8aCcACgkQl9kSPeN6
SE/Wjw//WjeiRGVlXa317HAyltKFMUK2EDlGoyxTyY5WCUpKzuZBcgCJCaND1xER
R4HbksjI20wSI8U4Mkt9S7+aLaA4ulea08+jQSrT7UPh6mBL3uvFMcAeUzC0o2wi
yq7XSsOAWK7eac713GRqIo3wi94yXDS22CXFmY2VAgWGXfK+klHonbuE01x5sSxr
26qzRThaNsVNa2pk43rFSsAiIZ/aoTa/CH91eiZU1ESxNFelEcEv3AjWYC6iStQc
nhjWPO8LycEQVCVxNLHllyK/YJyZSkWHyZf7CMc2D9TzjTWz13hgV5ATvsCjRYaQ
OFEagRaTlUxlFawzDp7r3MiOvuvQ7Q4Ylj3cNd4OzQdT7psR1Mdc8BEi6MUr4BEM
ZZmEemKYjrbk4lkMFPyRLf15ZOcPB3OkjUeG6yRwcRuzO24z/Dtpz6B+0xmNTbbO
yJ2BX96o/7ter5RaEyzG/zv7EXamgRHurTaG5lHZ1CVRNEA4WoKQOzn58U6MNQqs
iSlh2Ue6booD+bQORWzfaKCb/REvzSUBzcEPR2ObooTLxdLA63l8Ti7oTeFVLg92
J4of6MnXKXy+QVzkH8qhnOnR5EG4cw0rdsP5VM5O4vMFRgUyi2UiypPKqYKyLqjV
SmxKmsZEH93gC0bhitXqUbmzg+vDPhahVUvKK3oJr284YciXJ4M=
=oQvF
-----END PGP SIGNATURE-----

8
SPECS/osinfo-db.spec
Unescape View File

@ -2,8 +2,8 @@
Summary: osinfo database files
Name: osinfo-db
Version: 20230518
Release: 1%{?dist}.inferit.1
Version: 20231215
Release: 1%{?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
* Wed Oct 16 2024 Eduard Basov <ebasov@msvsphere-os.ru> - 20231215-1.inferit
- Fix applying patch for MSVSphere support
- Update to new release (v20231215)
* Mon Dec 4 2023 Arkady L. Shane <tigro@msvsphere-os.ru> - 20230518-1.inferit.1
- Fix applying patch for MSVSphere support
- Update to new release (v20230518)

Write Preview
Loading…
Cancel
Save