rpms
/
osinfo-db
7
0
Fork 0
Code Issues Pull Requests Releases Activity

import osinfo-db-20200203-1.el8

This commit is contained in:
CentOS Sources 2020-04-28 04:56:46 -04:00 committed by Andrew Lukoshko
parent 6787c12d6e
commit e6cd92597b
7 changed files with 179 additions and 163 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -1 +1 @@
SOURCES/osinfo-db-20190611.tar.xz SOURCES/osinfo-db-20200203.tar.xz

2
.osinfo-db.metadata
View File

@ -1 +1 @@
abce45f689a58ea209afa3cf632fc67a7b2373b3 SOURCES/osinfo-db-20190611.tar.xz 07a02df203465ea2c8c64aa989d9552415c6e853 SOURCES/osinfo-db-20200203.tar.xz

144
SOURCES/0002-rhel-Add-rhel-7.7.patch → SOURCES/0001-rhel-Add-7.8-entry.patch
View File

@ -1,36 +1,33 @@
From ffcda8a251b7dd6dec51359f403da0757c2a857c Mon Sep 17 00:00:00 2001 From 0db41559bbf1a7ed0985e423f0effddbadb28375 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= <fidencio@redhat.com> From: rpm-build <rpm-build>
Date: Thu, 23 May 2019 10:41:22 +0200 Date: Tue, 10 Dec 2019 10:12:55 +0100
Subject: [PATCH 2/2] rhel: Add rhel-7.7 Subject: [PATCH] rhel: Add 7.8 entry
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: Fabiano Fidêncio <fidencio@redhat.com> Signed-off-by: rpm-build <rpm-build>
--- ---
os/redhat.com/rhel-7-unknown.xml | 24 +++--- os/redhat.com/rhel-7-unknown.xml | 22 ++---
os/redhat.com/rhel-7.7.xml | 139 +++++++++++++++++++++++++++++++ os/redhat.com/rhel-7.8.xml | 154 +++++++++++++++++++++++++++++++
2 files changed, 151 insertions(+), 12 deletions(-) 2 files changed, 165 insertions(+), 11 deletions(-)
create mode 100644 os/redhat.com/rhel-7.7.xml create mode 100644 os/redhat.com/rhel-7.8.xml
diff --git a/os/redhat.com/rhel-7-unknown.xml b/os/redhat.com/rhel-7-unknown.xml diff --git a/os/redhat.com/rhel-7-unknown.xml b/os/redhat.com/rhel-7-unknown.xml
index 1477a1a..7256b09 100644 index db2b59f..36f7dc9 100644
--- a/os/redhat.com/rhel-7-unknown.xml --- a/os/redhat.com/rhel-7-unknown.xml
+++ b/os/redhat.com/rhel-7-unknown.xml +++ b/os/redhat.com/rhel-7-unknown.xml
@@ -19,13 +19,13 @@ @@ -19,13 +19,13 @@
<family>linux</family> <family>linux</family>
<distro>rhel</distro> <distro>rhel</distro>
<codename>Maipo</codename> <codename>Maipo</codename>
- <upgrades id="http://redhat.com/rhel/7.6"/> - <upgrades id="http://redhat.com/rhel/7.7"/>
- <derives-from id="http://redhat.com/rhel/7.6"/> - <derives-from id="http://redhat.com/rhel/7.7"/>
+ <upgrades id="http://redhat.com/rhel/7.7"/> + <upgrades id="http://redhat.com/rhel/7.8"/>
+ <derives-from id="http://redhat.com/rhel/7.7"/> + <derives-from id="http://redhat.com/rhel/7.8"/>
<media arch="x86_64"> <media arch="x86_64">
<iso> <iso>
<system-id>LINUX</system-id> <system-id>LINUX</system-id>
- <volume-id>.*RHEL-7.([7-9]|[1-9][0-9]).*x86_64.*</volume-id> - <volume-id>.*RHEL-7.([89]|[1-9][0-9]).*x86_64.*</volume-id>
+ <volume-id>.*RHEL-7.([8-9]|[1-9][0-9]).*x86_64.*</volume-id> + <volume-id>.*RHEL-7.(9|[1-9][0-9]).*x86_64.*</volume-id>
</iso> </iso>
<kernel>isolinux/vmlinuz</kernel> <kernel>isolinux/vmlinuz</kernel>
<initrd>isolinux/initrd.img</initrd> <initrd>isolinux/initrd.img</initrd>
@ -38,40 +35,40 @@ index 1477a1a..7256b09 100644
<media arch="aarch64"> <media arch="aarch64">
<iso> <iso>
<system-id>LINUX</system-id> <system-id>LINUX</system-id>
- <volume-id>RHEL-7.([7-9]|[1-9][0-9]).*aarch64$</volume-id> - <volume-id>RHEL-7.([89]|[1-9][0-9]).*aarch64$</volume-id>
+ <volume-id>RHEL-7.([8-9]|[1-9][0-9]).*aarch64$</volume-id> + <volume-id>RHEL-7.(9|[1-9][0-9]).*aarch64$</volume-id>
</iso> </iso>
</media> </media>
<media arch="ppc64"> <media arch="ppc64">
<iso> <iso>
<system-id>PPC</system-id> <system-id>PPC</system-id>
- <volume-id>RHEL[-_]7.([7-9]|[1-9][0-9]).*ppc64$</volume-id> - <volume-id>RHEL[-_]7.([89]|[1-9][0-9]).*ppc64$</volume-id>
+ <volume-id>RHEL[-_]7.([8-9]|[1-9][0-9]).*ppc64$</volume-id> + <volume-id>RHEL[-_]7.(9|[1-9][0-9]).*ppc64$</volume-id>
</iso> </iso>
</media> </media>
<media arch="ppc64le"> <media arch="ppc64le">
<iso> <iso>
<system-id>PPC</system-id> <system-id>PPC</system-id>
- <volume-id>RHEL[-_]7.([7-9]|[1-9][0-9]).*ppc64le$</volume-id> - <volume-id>RHEL[-_]7.([89]|[1-9][0-9]).*ppc64le$</volume-id>
+ <volume-id>RHEL[-_]7.([8-9]|[1-9][0-9]).*ppc64le$</volume-id> + <volume-id>RHEL[-_]7.(9|[1-9][0-9]).*ppc64le$</volume-id>
</iso> </iso>
</media> </media>
<media arch="s390x"> <media arch="s390x">
<iso> <iso>
<system-id>LINUX</system-id> <system-id>LINUX</system-id>
- <volume-id>RHEL-7.([7-9]|[1-9][0-9]).*s390x$</volume-id> - <volume-id>RHEL-7.([89]|[1-9][0-9]).*s390x$</volume-id>
+ <volume-id>RHEL-7.([8-9]|[1-9][0-9]).*s390x$</volume-id> + <volume-id>RHEL-7.(9|[1-9][0-9]).*s390x$</volume-id>
</iso> </iso>
</media> </media>
<tree arch="ppc64"> <tree arch="ppc64">
<treeinfo> <treeinfo>
<family>Red Hat Enterprise Linux</family> <family>Red Hat Enterprise Linux</family>
- <version>^7.([7-9]|[1-9][0-9])$</version> - <version>^7.([89]|[1-9][0-9])$</version>
+ <version>^7.([8-9]|[1-9][0-9])$</version> + <version>^7.(9|[1-9][0-9])$</version>
<arch>ppc64</arch> <arch>ppc64</arch>
</treeinfo> </treeinfo>
</tree> </tree>
@ -79,8 +76,8 @@ index 1477a1a..7256b09 100644
<tree arch="ppc64le"> <tree arch="ppc64le">
<treeinfo> <treeinfo>
<family>Red Hat Enterprise Linux</family> <family>Red Hat Enterprise Linux</family>
- <version>^7.([7-9]|[1-9][0-9])$</version> - <version>^7.([89]|[1-9][0-9])$</version>
+ <version>^7.([8-9]|[1-9][0-9])$</version> + <version>^7.(9|[1-9][0-9])$</version>
<arch>ppc64le</arch> <arch>ppc64le</arch>
</treeinfo> </treeinfo>
</tree> </tree>
@ -88,8 +85,8 @@ index 1477a1a..7256b09 100644
<tree arch="s390x"> <tree arch="s390x">
<treeinfo> <treeinfo>
<family>Red Hat Enterprise Linux</family> <family>Red Hat Enterprise Linux</family>
- <version>^7.([7-9]|[1-9][0-9])$</version> - <version>^7.([89]|[1-9][0-9])$</version>
+ <version>^7.([8-9]|[1-9][0-9])$</version> + <version>^7.(9|[1-9][0-9])$</version>
<arch>s390x</arch> <arch>s390x</arch>
</treeinfo> </treeinfo>
</tree> </tree>
@ -97,31 +94,24 @@ index 1477a1a..7256b09 100644
<tree arch="x86_64"> <tree arch="x86_64">
<treeinfo> <treeinfo>
<family>Red Hat Enterprise Linux</family> <family>Red Hat Enterprise Linux</family>
- <version>^7.([7-9]|[1-9][0-9])$</version> - <version>^7.([89]|[1-9][0-9])$</version>
+ <version>^7.([8-9]|[1-9][0-9])$</version> + <version>^7.(9|[1-9][0-9])$</version>
<arch>x86_64</arch> <arch>x86_64</arch>
</treeinfo> </treeinfo>
</tree> </tree>
@@ -134,4 +134,4 @@ diff --git a/os/redhat.com/rhel-7.8.xml b/os/redhat.com/rhel-7.8.xml
<script id='http://redhat.com/rhel/kickstart/desktop'/>
</installer>
</os>
-</libosinfo>
\ No newline at end of file
+</libosinfo>
diff --git a/os/redhat.com/rhel-7.7.xml b/os/redhat.com/rhel-7.7.xml
new file mode 100644 new file mode 100644
index 0000000..c140542 index 0000000..d658600
--- /dev/null --- /dev/null
+++ b/os/redhat.com/rhel-7.7.xml +++ b/os/redhat.com/rhel-7.8.xml
@@ -0,0 +1,139 @@ @@ -0,0 +1,154 @@
+<?xml version="1.0" encoding="UTF-8"?> +<?xml version="1.0" encoding="UTF-8"?>
+<libosinfo version="0.0.1"> +<libosinfo version="0.0.1">
+ +
+ <os id="http://redhat.com/rhel/7.7"> + <os id="http://redhat.com/rhel/7.8">
+ <short-id>rhel7.7</short-id> + <short-id>rhel7.8</short-id>
+ <name>Red Hat Enterprise Linux 7.7</name> + <name>Red Hat Enterprise Linux 7.8</name>
+ <version>7.7</version> + <version>7.8</version>
+ <vendor>Red Hat, Inc</vendor> + <vendor>Red Hat, Inc</vendor>
+ <vendor xml:lang="ca">Red Hat, Inc</vendor> + <vendor xml:lang="ca">Red Hat, Inc</vendor>
+ <vendor xml:lang="de">Red Hat, Inc</vendor> + <vendor xml:lang="de">Red Hat, Inc</vendor>
@ -136,15 +126,15 @@ index 0000000..c140542
+ <family>linux</family> + <family>linux</family>
+ <distro>rhel</distro> + <distro>rhel</distro>
+ <codename>Maipo</codename> + <codename>Maipo</codename>
+ <upgrades id="http://redhat.com/rhel/7.6"/> + <upgrades id="http://redhat.com/rhel/7.7"/>
+ <derives-from id="http://redhat.com/rhel/7.6"/> + <derives-from id="http://redhat.com/rhel/7.7"/>
+ +
+ <release-date>2018-10-30</release-date> + <release-date>2020-03-31</release-date>
+ +
+ <media arch="x86_64"> + <media arch="x86_64">
+ <iso> + <iso>
+ <system-id>LINUX</system-id> + <system-id>LINUX</system-id>
+ <volume-id>.*RHEL-7.7.*x86_64.*</volume-id> + <volume-id>.*RHEL-7.8.*x86_64.*</volume-id>
+ </iso> + </iso>
+ <kernel>isolinux/vmlinuz</kernel> + <kernel>isolinux/vmlinuz</kernel>
+ <initrd>isolinux/initrd.img</initrd> + <initrd>isolinux/initrd.img</initrd>
@ -153,59 +143,59 @@ index 0000000..c140542
+ <media arch="aarch64"> + <media arch="aarch64">
+ <iso> + <iso>
+ <system-id>LINUX</system-id> + <system-id>LINUX</system-id>
+ <volume-id>RHEL-7.7.*aarch64$</volume-id> + <volume-id>RHEL-7.8.*aarch64$</volume-id>
+ </iso> + </iso>
+ </media> + </media>
+ +
+ <media arch="ppc64"> + <media arch="ppc64">
+ <iso> + <iso>
+ <system-id>PPC</system-id> + <system-id>PPC</system-id>
+ <volume-id>RHEL[-_]7.7.*ppc64$</volume-id> + <volume-id>RHEL[-_]7.8.*ppc64$</volume-id>
+ </iso> + </iso>
+ </media> + </media>
+ +
+ <media arch="ppc64le"> + <media arch="ppc64le">
+ <iso> + <iso>
+ <system-id>PPC</system-id> + <system-id>PPC</system-id>
+ <volume-id>RHEL[-_]7.7.*ppc64le$</volume-id> + <volume-id>RHEL[-_]7.8.*ppc64le$</volume-id>
+ </iso> + </iso>
+ </media> + </media>
+ +
+ <media arch="s390x"> + <media arch="s390x">
+ <iso> + <iso>
+ <system-id>LINUX</system-id> + <system-id>LINUX</system-id>
+ <volume-id>RHEL-7.7.*s390x$</volume-id> + <volume-id>RHEL-7.8.*s390x$</volume-id>
+ </iso> + </iso>
+ </media> + </media>
+ +
+ <tree arch="ppc64"> + <tree arch="ppc64">
+ <treeinfo> + <treeinfo>
+ <family>Red Hat Enterprise Linux</family> + <family>Red Hat Enterprise Linux$</family>
+ <version>^7.7$</version> + <version>^7.8$</version>
+ <arch>ppc64</arch> + <arch>ppc64$</arch>
+ </treeinfo> + </treeinfo>
+ </tree> + </tree>
+ +
+ <tree arch="ppc64le"> + <tree arch="ppc64le">
+ <treeinfo> + <treeinfo>
+ <family>Red Hat Enterprise Linux</family> + <family>Red Hat Enterprise Linux$</family>
+ <version>^7.7$</version> + <version>^7.8$</version>
+ <arch>ppc64le</arch> + <arch>ppc64le</arch>
+ </treeinfo> + </treeinfo>
+ </tree> + </tree>
+ +
+ <tree arch="s390x"> + <tree arch="s390x">
+ <treeinfo> + <treeinfo>
+ <family>Red Hat Enterprise Linux</family> + <family>Red Hat Enterprise Linux$</family>
+ <version>^7.7$</version> + <version>^7.8$</version>
+ <arch>s390x</arch> + <arch>s390x</arch>
+ </treeinfo> + </treeinfo>
+ </tree> + </tree>
+ +
+ <tree arch="x86_64"> + <tree arch="x86_64">
+ <treeinfo> + <treeinfo>
+ <family>Red Hat Enterprise Linux</family> + <family>Red Hat Enterprise Linux$</family>
+ <version>^7.7$</version> + <version>^7.8$</version>
+ <arch>x86_64</arch> + <arch>x86_64</arch>
+ </treeinfo> + </treeinfo>
+ </tree> + </tree>
@ -225,6 +215,21 @@ index 0000000..c140542
+ </recommended> + </recommended>
+ </resources> + </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>
+ </resources>
+
+ <resources arch="all"> + <resources arch="all">
+ <minimum> + <minimum>
+ <n-cpus>1</n-cpus> + <n-cpus>1</n-cpus>
@ -236,7 +241,7 @@ index 0000000..c140542
+ <recommended> + <recommended>
+ <cpu>1000000000</cpu> + <cpu>1000000000</cpu>
+ <ram>1073741824</ram> + <ram>1073741824</ram>
+ <storage>10737418240</storage> + <storage>21474836480</storage>
+ </recommended> + </recommended>
+ +
+ <maximum> + <maximum>
@ -254,6 +259,7 @@ index 0000000..c140542
+ </installer> + </installer>
+ </os> + </os>
+</libosinfo> +</libosinfo>
\ No newline at end of file
-- --
2.21.0 2.23.0

143
SOURCES/0001-rhel-Add-rhel-8.1.patch → SOURCES/0002-rhel-Add-8.2-entry.patch
View File

@ -1,37 +1,33 @@
From cfb289f3c78bee9dd7bc0fcf96dca46187ef3f68 Mon Sep 17 00:00:00 2001 From ea3d294c14e8d43fbe24afe5c59d11f52a96e8ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= <fidencio@redhat.com> From: rpm-build <rpm-build>
Date: Thu, 23 May 2019 10:36:53 +0200 Date: Tue, 10 Dec 2019 10:13:28 +0100
Subject: [PATCH 1/2] rhel: Add rhel-8.1 Subject: [PATCH] rhel: Add 8.2 entry
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: Fabiano Fidêncio <fidencio@redhat.com> Signed-off-by: rpm-build <rpm-build>
--- ---
os/redhat.com/rhel-8-unknown.xml | 22 +++--- os/redhat.com/rhel-8-unknown.xml | 20 ++---
os/redhat.com/rhel-8.1.xml | 127 +++++++++++++++++++++++++++++++ os/redhat.com/rhel-8.2.xml | 134 +++++++++++++++++++++++++++++++
2 files changed, 139 insertions(+), 12 deletions(-) 2 files changed, 144 insertions(+), 10 deletions(-)
create mode 100644 os/redhat.com/rhel-8.1.xml create mode 100644 os/redhat.com/rhel-8.2.xml
diff --git a/os/redhat.com/rhel-8-unknown.xml b/os/redhat.com/rhel-8-unknown.xml diff --git a/os/redhat.com/rhel-8-unknown.xml b/os/redhat.com/rhel-8-unknown.xml
index 226a018..fcf601d 100644 index 1480185..82cfb4a 100644
--- a/os/redhat.com/rhel-8-unknown.xml --- a/os/redhat.com/rhel-8-unknown.xml
+++ b/os/redhat.com/rhel-8-unknown.xml +++ b/os/redhat.com/rhel-8-unknown.xml
@@ -18,14 +18,14 @@ @@ -19,13 +19,13 @@
<vendor xml:lang="uk">Red Hat, Inc</vendor>
<family>linux</family> <family>linux</family>
<distro>rhel</distro> <distro>rhel</distro>
<codename>Ootpa</codename> <codename>Ootpa</codename>
- <upgrades id="http://redhat.com/rhel/8.0"/> - <upgrades id="http://redhat.com/rhel/8.1"/>
- <derives-from id="http://redhat.com/rhel/8.0"/> - <derives-from id="http://redhat.com/rhel/8.1"/>
+ <upgrades id="http://redhat.com/rhel/8.1"/> + <upgrades id="http://redhat.com/rhel/8.2"/>
+ <derives-from id="http://redhat.com/rhel/8.1"/> + <derives-from id="http://redhat.com/rhel/8.2"/>
<media arch="x86_64"> <media arch="x86_64">
<iso> <iso>
<system-id>LINUX</system-id> <system-id>LINUX</system-id>
- <volume-id>.*RHEL-8-([1-9]|[1-9][0-9])(-[0-9]|[1-9][0-9])?.*x86_64.*</volume-id> - <volume-id>.*RHEL-8-([2-9]|[1-9][0-9])(-[0-9]|[1-9][0-9])?.*x86_64.*</volume-id>
+ <volume-id>.*RHEL-8-([2-9]|[1-9][0-9])(-[0-9]|[1-9][0-9])?.*x86_64.*</volume-id> + <volume-id>.*RHEL-8-([3-9]|[1-9][0-9])(-[0-9]|[1-9][0-9])?.*x86_64.*</volume-id>
</iso> </iso>
<kernel>isolinux/vmlinuz</kernel> <kernel>isolinux/vmlinuz</kernel>
<initrd>isolinux/initrd.img</initrd> <initrd>isolinux/initrd.img</initrd>
@ -39,32 +35,32 @@ index 226a018..fcf601d 100644
<media arch="aarch64"> <media arch="aarch64">
<iso> <iso>
<system-id>LINUX</system-id> <system-id>LINUX</system-id>
- <volume-id>RHEL-8-([1-9]|[1-9][0-9])(-[0-9]|[1-9][0-9])?.*aarch64$</volume-id> - <volume-id>RHEL-8-([2-9]|[1-9][0-9])(-[0-9]|[1-9][0-9])?.*aarch64$</volume-id>
+ <volume-id>RHEL-8-([2-9]|[1-9][0-9])(-[0-9]|[1-9][0-9])?.*aarch64$</volume-id> + <volume-id>RHEL-8-([3-9]|[1-9][0-9])(-[0-9]|[1-9][0-9])?.*aarch64$</volume-id>
</iso> </iso>
</media> </media>
<media arch="ppc64le"> <media arch="ppc64le">
<iso> <iso>
<system-id>PPC</system-id> <system-id>PPC</system-id>
- <volume-id>RHEL[_-]8[_-]([1-9]|[1-9][0-9])([_-]([0-9]|[1-9][0-9]))?.*ppc64le$</volume-id> - <volume-id>RHEL[_-]8[_-]([2-9]|[1-9][0-9])([_-]([0-9]|[1-9][0-9]))?.*ppc64le$</volume-id>
+ <volume-id>RHEL[_-]8[_-]([2-9]|[1-9][0-9])([_-]([0-9]|[1-9][0-9]))?.*ppc64le$</volume-id> + <volume-id>RHEL[_-]8[_-]([3-9]|[1-9][0-9])([_-]([0-9]|[1-9][0-9]))?.*ppc64le$</volume-id>
</iso> </iso>
</media> </media>
<media arch="s390x"> <media arch="s390x">
<iso> <iso>
<system-id>LINUX</system-id> <system-id>LINUX</system-id>
- <volume-id>RHEL-8-([1-9]|[1-9][0-9])(-[0-9]|[1-9][0-9])?.*s390x$</volume-id> - <volume-id>RHEL-8-([2-9]|[1-9][0-9])(-[0-9]|[1-9][0-9])?.*s390x$</volume-id>
+ <volume-id>RHEL-8-([2-9]|[1-9][0-9])(-[0-9]|[1-9][0-9])?.*s390x$</volume-id> + <volume-id>RHEL-8-([3-9]|[1-9][0-9])(-[0-9]|[1-9][0-9])?.*s390x$</volume-id>
</iso> </iso>
</media> </media>
<tree arch="aarch64"> <tree arch="aarch64">
<treeinfo> <treeinfo>
<family>Red Hat Enterprise Linux</family> <family>Red Hat Enterprise Linux</family>
- <version>^8.([1-9]|[1-9][0-9])(-[0-9]|[1-9][0-9])?$</version> - <version>^8.([2-9]|[1-9][0-9])(-[0-9]|[1-9][0-9])?$</version>
+ <version>^8.([2-9]|[1-9][0-9])(-[0-9]|[1-9][0-9])?$</version> + <version>^8.([3-9]|[1-9][0-9])(-[0-9]|[1-9][0-9])?$</version>
<arch>aarch64</arch> <arch>aarch64</arch>
</treeinfo> </treeinfo>
</tree> </tree>
@ -72,8 +68,8 @@ index 226a018..fcf601d 100644
<tree arch="ppc64le"> <tree arch="ppc64le">
<treeinfo> <treeinfo>
<family>Red Hat Enterprise Linux</family> <family>Red Hat Enterprise Linux</family>
- <version>^8.([1-9]|[1-9][0-9])(.([0-9]|[1-9][0-9]))?$</version> - <version>^8.([2-9]|[1-9][0-9])(.([0-9]|[1-9][0-9]))?$</version>
+ <version>^8.([2-9]|[1-9][0-9])(.([0-9]|[1-9][0-9]))?$</version> + <version>^8.([3-9]|[1-9][0-9])(.([0-9]|[1-9][0-9]))?$</version>
<arch>ppc64le</arch> <arch>ppc64le</arch>
</treeinfo> </treeinfo>
</tree> </tree>
@ -81,8 +77,8 @@ index 226a018..fcf601d 100644
<tree arch="s390x"> <tree arch="s390x">
<treeinfo> <treeinfo>
<family>Red Hat Enterprise Linux</family> <family>Red Hat Enterprise Linux</family>
- <version>^8.([1-9]|[1-9][0-9])(.([0-9]|[1-9][0-9]))?$</version> - <version>^8.([2-9]|[1-9][0-9])(.([0-9]|[1-9][0-9]))?$</version>
+ <version>^8.([2-9]|[1-9][0-9])(.([0-9]|[1-9][0-9]))?$</version> + <version>^8.([3-9]|[1-9][0-9])(.([0-9]|[1-9][0-9]))?$</version>
<arch>s390x</arch> <arch>s390x</arch>
</treeinfo> </treeinfo>
</tree> </tree>
@ -90,31 +86,24 @@ index 226a018..fcf601d 100644
<tree arch="x86_64"> <tree arch="x86_64">
<treeinfo> <treeinfo>
<family>Red Hat Enterprise Linux</family> <family>Red Hat Enterprise Linux</family>
- <version>^8.([1-9]|[1-9][0-9])(.([0-9]|[1-9][0-9]))?$</version> - <version>^8.([2-9]|[1-9][0-9])(.([0-9]|[1-9][0-9]))?$</version>
+ <version>^8.([2-9]|[1-9][0-9])(.([0-9]|[1-9][0-9]))?$</version> + <version>^8.([3-9]|[1-9][0-9])(.([0-9]|[1-9][0-9]))?$</version>
<arch>x86_64</arch> <arch>x86_64</arch>
</treeinfo> </treeinfo>
</tree> </tree>
@@ -114,4 +114,4 @@ diff --git a/os/redhat.com/rhel-8.2.xml b/os/redhat.com/rhel-8.2.xml
</recommended>
</resources>
</os>
-</libosinfo>
\ No newline at end of file
+</libosinfo>
diff --git a/os/redhat.com/rhel-8.1.xml b/os/redhat.com/rhel-8.1.xml
new file mode 100644 new file mode 100644
index 0000000..1022cca index 0000000..cfc9599
--- /dev/null --- /dev/null
+++ b/os/redhat.com/rhel-8.1.xml +++ b/os/redhat.com/rhel-8.2.xml
@@ -0,0 +1,127 @@ @@ -0,0 +1,134 @@
+<?xml version="1.0" encoding="UTF-8"?> +<?xml version="1.0" encoding="UTF-8"?>
+<libosinfo version="0.0.1"> +<libosinfo version="0.0.1">
+ +
+ <os id="http://redhat.com/rhel/8.1"> + <os id="http://redhat.com/rhel/8.2">
+ <short-id>rhel8.1</short-id> + <short-id>rhel8.2</short-id>
+ <name>Red Hat Enterprise Linux 8.1</name> + <name>Red Hat Enterprise Linux 8.2</name>
+ <version>8.1</version> + <version>8.2</version>
+ <vendor>Red Hat, Inc</vendor> + <vendor>Red Hat, Inc</vendor>
+ <vendor xml:lang="ca">Red Hat, Inc</vendor> + <vendor xml:lang="ca">Red Hat, Inc</vendor>
+ <vendor xml:lang="de">Red Hat, Inc</vendor> + <vendor xml:lang="de">Red Hat, Inc</vendor>
@ -129,13 +118,15 @@ index 0000000..1022cca
+ <family>linux</family> + <family>linux</family>
+ <distro>rhel</distro> + <distro>rhel</distro>
+ <codename>Ootpa</codename> + <codename>Ootpa</codename>
+ <upgrades id="http://redhat.com/rhel/8.0"/> + <upgrades id="http://redhat.com/rhel/8.1"/>
+ <derives-from id="http://redhat.com/rhel/8.0"/> + <derives-from id="http://redhat.com/rhel/8.1"/>
+
+ <release-date>2020-04-28</release-date>
+ +
+ <media arch="x86_64"> + <media arch="x86_64">
+ <iso> + <iso>
+ <system-id>LINUX</system-id> + <system-id>LINUX</system-id>
+ <volume-id>RHEL-8-1-(([0-9]|[1-9][0-9])-)?BaseOS-x86_64</volume-id> + <volume-id>RHEL-8-2-(([0-9]|[1-9][0-9])-)?BaseOS-x86_64</volume-id>
+ </iso> + </iso>
+ <kernel>isolinux/vmlinuz</kernel> + <kernel>isolinux/vmlinuz</kernel>
+ <initrd>isolinux/initrd.img</initrd> + <initrd>isolinux/initrd.img</initrd>
@ -144,7 +135,7 @@ index 0000000..1022cca
+ <media arch="ppc64le"> + <media arch="ppc64le">
+ <iso> + <iso>
+ <system-id>PPC</system-id> + <system-id>PPC</system-id>
+ <volume-id>RHEL[_-]8[_-]1[_-](([0-9]|[1-9][0-9])[_-])?BaseOS[_-]ppc64le</volume-id> + <volume-id>RHEL[_-]8[_-]2[_-](([0-9]|[1-9][0-9])[_-])?BaseOS[_-]ppc64le</volume-id>
+ </iso> + </iso>
+ <kernel>ppc/ppc64/vmlinuz</kernel> + <kernel>ppc/ppc64/vmlinuz</kernel>
+ <initrd>ppc/ppc64/initrd.img</initrd> + <initrd>ppc/ppc64/initrd.img</initrd>
@ -153,21 +144,21 @@ index 0000000..1022cca
+ <media arch="aarch64"> + <media arch="aarch64">
+ <iso> + <iso>
+ <system-id>LINUX</system-id> + <system-id>LINUX</system-id>
+ <volume-id>RHEL-8-1-(([0-9]|[1-9][0-9])-)?BaseOS-aarch64</volume-id> + <volume-id>RHEL-8-2-(([0-9]|[1-9][0-9])-)?BaseOS-aarch64</volume-id>
+ </iso> + </iso>
+ </media> + </media>
+ +
+ <media arch="s390x"> + <media arch="s390x">
+ <iso> + <iso>
+ <system-id>LINUX</system-id> + <system-id>LINUX</system-id>
+ <volume-id>RHEL-8-1-(([0-9]|[1-9][0-9])-)?BaseOS-s390x</volume-id> + <volume-id>RHEL-8-2-(([0-9]|[1-9][0-9])-)?BaseOS-s390x</volume-id>
+ </iso> + </iso>
+ </media> + </media>
+ +
+ <tree arch="aarch64"> + <tree arch="aarch64">
+ <treeinfo> + <treeinfo>
+ <family>Red Hat Enterprise Linux</family> + <family>Red Hat Enterprise Linux</family>
+ <version>^8.1(.([0-9]|[1-9][0-9]))?$</version> + <version>^8.2(.([0-9]|[1-9][0-9]))?$</version>
+ <arch>aarch64</arch> + <arch>aarch64</arch>
+ </treeinfo> + </treeinfo>
+ </tree> + </tree>
@ -175,7 +166,7 @@ index 0000000..1022cca
+ <tree arch="ppc64le"> + <tree arch="ppc64le">
+ <treeinfo> + <treeinfo>
+ <family>Red Hat Enterprise Linux</family> + <family>Red Hat Enterprise Linux</family>
+ <version>^8.1(.([0-9]|[1-9][0-9]))?$</version> + <version>^8.2(.([0-9]|[1-9][0-9]))?$</version>
+ <arch>ppc64le</arch> + <arch>ppc64le</arch>
+ </treeinfo> + </treeinfo>
+ </tree> + </tree>
@ -183,7 +174,7 @@ index 0000000..1022cca
+ <tree arch="s390x"> + <tree arch="s390x">
+ <treeinfo> + <treeinfo>
+ <family>Red Hat Enterprise Linux</family> + <family>Red Hat Enterprise Linux</family>
+ <version>^8.1(.([0-9]|[1-9][0-9]))?$</version> + <version>^8.2(.([0-9]|[1-9][0-9]))?$</version>
+ <arch>s390x</arch> + <arch>s390x</arch>
+ </treeinfo> + </treeinfo>
+ </tree> + </tree>
@ -191,20 +182,12 @@ index 0000000..1022cca
+ <tree arch="x86_64"> + <tree arch="x86_64">
+ <treeinfo> + <treeinfo>
+ <family>Red Hat Enterprise Linux</family> + <family>Red Hat Enterprise Linux</family>
+ <version>^8.1(.([0-9]|[1-9][0-9]))?$</version> + <version>^8.2(.([0-9]|[1-9][0-9]))?$</version>
+ <arch>x86_64</arch> + <arch>x86_64</arch>
+ </treeinfo> + </treeinfo>
+ </tree> + </tree>
+ +
+ <tree arch="aarch64"> + <resources arch="ppc64le">
+ <treeinfo>
+ <family>Red Hat Enterprise Linux</family>
+ <version>^8.1(.([0-9]|[1-9][0-9]))?$</version>
+ <arch>aarch64</arch>
+ </treeinfo>
+ </tree>
+
+ <resources arch="ppc64">
+ <minimum> + <minimum>
+ <n-cpus>1</n-cpus> + <n-cpus>1</n-cpus>
+ <cpu>1000000000</cpu> + <cpu>1000000000</cpu>
@ -223,18 +206,32 @@ index 0000000..1022cca
+ <minimum> + <minimum>
+ <n-cpus>1</n-cpus> + <n-cpus>1</n-cpus>
+ <cpu>1000000000</cpu> + <cpu>1000000000</cpu>
+ <ram>1073741824</ram> + <ram>1610612736</ram>
+ <storage>10737418240</storage> + <storage>10737418240</storage>
+ </minimum> + </minimum>
+ +
+ <recommended> + <recommended>
+ <cpu>1000000000</cpu> + <cpu>1000000000</cpu>
+ <ram>1073741824</ram> + <ram>1610612736</ram>
+ <storage>10737418240</storage> + <storage>21474836480</storage>
+ </recommended> + </recommended>
+
+ <maximum>
+ <ram>26388279066624</ram>
+ </maximum>
+
+ <network-install>
+ <ram>3221225472</ram>
+ </network-install>
+ </resources> + </resources>
+
+ <installer>
+ <script id='http://redhat.com/rhel/kickstart/jeos'/>
+ <script id='http://redhat.com/rhel/kickstart/desktop'/>
+ </installer>
+ </os> + </os>
+</libosinfo> +</libosinfo>
\ No newline at end of file
-- --
2.21.0 2.23.0

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

@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEECbnI/yI+8ROvoGo57pJsK9rMF3sFAlz/o8gACgkQ7pJsK9rM
F3u0lxAAvPfT4OsLaRKprmckJ0UArEmE1ki4mB83KrU3q9ctxitA0tnNHTNlnJ83
nHNNVjEkDrGH27cstzXT0zRxzGR2z4xyxPRSGwHTmzmT24Tf+RRuYKmqOrYXeaYL
fAdn3TvhlLZxglutBWZowWJesaGAnpht74uIJZx62ZtsKrzNQfnhOJmIE8+FWs6f
WRUWSAwq9wtHVlje0mDl2ak99GOXDoxcsW4cbEHm0nWGFvo3BsbCdd7ioFesFzet
ELG/vDSi6jxbk/93OE3KTn4VAz2FHsc2o8trtbzy1a/kPcic85Q7JqeLBnWCgBwQ
8u5fRlOyH3Zt8JfDO8OVy9tTULo4HXPnoCrgKHEVuI2tnaBdROS0FmKOfLyw/+Ql
Oqbf/YiEMoSQ38cdMdgXb3F5Z45eSrIscQjqabYi71NUtzlCHPh8qJ/4o0XJqgNp
yOT3j/9PTxig7hngPpXugyaeiqutGpyUk2n+whbUwOT8IFZhAQ4cSpv0OMqB6hqx
c6rQRMYHYuk79krZV1SUrpH0cZT+OvemYX//Uu96NbYezi3N/2WPkqxfEK6GhnKV
5MUcP6HXO/7XwrPxjQjmMFeC6FBgGOZ/XbtxUjvpIs3vzZNjBYTHvQligIbwb6V5
rDAGycEJjzguQVG9XuA6ecTOrikz5UPG8CxZfbMHN4pJd5Usmhk=
=A1Os
-----END PGP SIGNATURE-----

16
SOURCES/osinfo-db-20200203.tar.xz.asc Normal file
View File

@ -0,0 +1,16 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEECbnI/yI+8ROvoGo57pJsK9rMF3sFAl44Xu0ACgkQ7pJsK9rM
F3vOBBAAvFyGMt3+Cf8M9GLXVytqBnucbp9T2I8fgD/X7DkrtgVcjhFbFGfgWFHZ
SUQezbVXV1nfDnm+7MQNy+Z2tta6gmUzfCL5iPZWf6A+Cu8sEGToqC3SWKKjz5y6
zHsor4F32S4ArD+3BnNSWeR4wY3dkY7WqxBcC700x8SiKq1+F/u8w+lCV9X2FU9a
WzPnCT5wqGv4LvtpyJ0C6gqqTcxg2itCub7OOK9vmkMipgaM7rjtIoD5nX3vP7OG
gubXoehe+FPb/ya/pZ3YZ9jYI44BaATfecLlG1L+ig3W6lp8B/MHjWrKiuEQZztX
maae4EBcd8PsAwwltJRsfOhWdexSeEGZs1VqIQU2YuOnu8s3C4YxNxFhtL1s6pMB
5pMIfPr835VB4WiZxehG6gezQFN93cH93+ZKyjO7wgV5Kq2YfjjKHqOSetGy57yf
VHdWZhss9ln3U7vfzYIs4IYkCj9L53kOKi61/rBk/Wxh7A//7gQndiHVwI++mJcg
d3pxfUXplevP0JMpbPgw83EBf2YycO7xFF7fbAp2LW5nQAFWzGomhC5ZTI41zekM
palSCT6H0/AoB6/hUwkihfHSw6VhOOBHY/BOc6JQ/y9FkVzpoq7zueEI1t+bd3Y7
ZUuo3S/GEr/cyLJHmRG9U0LFI5gcqSYCej+vrBnDF7ZWiCmcHQw=
=3nIy
-----END PGP SIGNATURE-----

19
SPECS/osinfo-db.spec
View File

@ -4,7 +4,7 @@
Summary: osinfo database files Summary: osinfo database files
Name: osinfo-db Name: osinfo-db
Version: 20190611 Version: 20200203
Release: 1%{?dist} 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
@ -12,8 +12,8 @@ Source1: https://fedorahosted.org/releases/l/i/libosinfo/%{name}-%{version}.tar.
URL: http://libosinfo.org/ URL: http://libosinfo.org/
### Downstream Patches ### ### Downstream Patches ###
Patch0001: 0001-rhel-Add-rhel-8.1.patch Patch0001: 0001-rhel-Add-7.8-entry.patch
Patch0002: 0002-rhel-Add-rhel-7.7.patch Patch0002: 0002-rhel-Add-8.2-entry.patch
BuildRequires: intltool BuildRequires: intltool
BuildRequires: osinfo-db-tools BuildRequires: osinfo-db-tools
@ -34,6 +34,9 @@ done
# Remove spurious leftovers from when applying the patches # Remove spurious leftovers from when applying the patches
find ../%{name}-%{version}/ -name "*.orig" -exec rm -f {} \; find ../%{name}-%{version}/ -name "*.orig" -exec rm -f {} \;
# Remove the upstream virtio-win / spice-guest-tools drivers
find ../%{name}-%{version}/os/microsoft.com/ -name "win-*.d" -type d -exec rm -rf {} +
# For us to be able to apply patches on top of a rebase, we: # For us to be able to apply patches on top of a rebase, we:
# 1. unpack the sources # 1. unpack the sources
# 2. patch the sources # 2. patch the sources
@ -57,6 +60,16 @@ osinfo-db-import --root %{buildroot} --dir %{_datadir}/osinfo %{PatchedSource}
%{_datadir}/osinfo/schema %{_datadir}/osinfo/schema
%changelog %changelog
* Mon Feb 03 2020 Fabiano Fidêncio <fidencio@redhat.com> - 20200203-1
- Update to v20200203 release
- Resolves: rhbz#1780529 - Update to the latest upstream release
* Tue Dec 10 2019 Fabiano Fidêncio <fidencio@redhat.com> - 20191125-1
- Updated to v20191125 release
- Resolves: rhbz#1780529 - Update to the latest upstream release
- Add rhel8.2 & rhel7.8 entries
- Remove upstream virtio-win / spice-guest-tools drivers
* Wed Jun 12 2019 Fabiano Fidêncio <fidencio@redhat.com> - 20190611-1 * Wed Jun 12 2019 Fabiano Fidêncio <fidencio@redhat.com> - 20190611-1
- Update to v20190611 release - Update to v20190611 release
- Resolves: rhbz#1699990 - Rebase to the latest upstream release - Resolves: rhbz#1699990 - Rebase to the latest upstream release