diff --git a/.gitignore b/.gitignore index 8135c92..238c17a 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/osinfo-db-20190611.tar.xz +SOURCES/osinfo-db-20191125.tar.xz diff --git a/.osinfo-db.metadata b/.osinfo-db.metadata index d64b889..ce34916 100644 --- a/.osinfo-db.metadata +++ b/.osinfo-db.metadata @@ -1 +1 @@ -abce45f689a58ea209afa3cf632fc67a7b2373b3 SOURCES/osinfo-db-20190611.tar.xz +fc22fc42f91ce7846d025c98466e2a8f71727f55 SOURCES/osinfo-db-20191125.tar.xz diff --git a/SOURCES/0001-rhel-Add-7.8-entry.patch b/SOURCES/0001-rhel-Add-7.8-entry.patch new file mode 100644 index 0000000..e7b4e56 --- /dev/null +++ b/SOURCES/0001-rhel-Add-7.8-entry.patch @@ -0,0 +1,265 @@ +From 0db41559bbf1a7ed0985e423f0effddbadb28375 Mon Sep 17 00:00:00 2001 +From: rpm-build <rpm-build> +Date: Tue, 10 Dec 2019 10:12:55 +0100 +Subject: [PATCH] rhel: Add 7.8 entry + +Signed-off-by: rpm-build <rpm-build> +--- + os/redhat.com/rhel-7-unknown.xml | 22 ++--- + os/redhat.com/rhel-7.8.xml | 154 +++++++++++++++++++++++++++++++ + 2 files changed, 165 insertions(+), 11 deletions(-) + 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 +index db2b59f..36f7dc9 100644 +--- a/os/redhat.com/rhel-7-unknown.xml ++++ b/os/redhat.com/rhel-7-unknown.xml +@@ -19,13 +19,13 @@ + <family>linux</family> + <distro>rhel</distro> + <codename>Maipo</codename> +- <upgrades id="http://redhat.com/rhel/7.7"/> +- <derives-from id="http://redhat.com/rhel/7.7"/> ++ <upgrades id="http://redhat.com/rhel/7.8"/> ++ <derives-from id="http://redhat.com/rhel/7.8"/> + + <media arch="x86_64"> + <iso> + <system-id>LINUX</system-id> +- <volume-id>.*RHEL-7.([89]|[1-9][0-9]).*x86_64.*</volume-id> ++ <volume-id>.*RHEL-7.(9|[1-9][0-9]).*x86_64.*</volume-id> + </iso> + <kernel>isolinux/vmlinuz</kernel> + <initrd>isolinux/initrd.img</initrd> +@@ -34,35 +34,35 @@ + <media arch="aarch64"> + <iso> + <system-id>LINUX</system-id> +- <volume-id>RHEL-7.([89]|[1-9][0-9]).*aarch64$</volume-id> ++ <volume-id>RHEL-7.(9|[1-9][0-9]).*aarch64$</volume-id> + </iso> + </media> + + <media arch="ppc64"> + <iso> + <system-id>PPC</system-id> +- <volume-id>RHEL[-_]7.([89]|[1-9][0-9]).*ppc64$</volume-id> ++ <volume-id>RHEL[-_]7.(9|[1-9][0-9]).*ppc64$</volume-id> + </iso> + </media> + + <media arch="ppc64le"> + <iso> + <system-id>PPC</system-id> +- <volume-id>RHEL[-_]7.([89]|[1-9][0-9]).*ppc64le$</volume-id> ++ <volume-id>RHEL[-_]7.(9|[1-9][0-9]).*ppc64le$</volume-id> + </iso> + </media> + + <media arch="s390x"> + <iso> + <system-id>LINUX</system-id> +- <volume-id>RHEL-7.([89]|[1-9][0-9]).*s390x$</volume-id> ++ <volume-id>RHEL-7.(9|[1-9][0-9]).*s390x$</volume-id> + </iso> + </media> + + <tree arch="ppc64"> + <treeinfo> + <family>Red Hat Enterprise Linux</family> +- <version>^7.([89]|[1-9][0-9])$</version> ++ <version>^7.(9|[1-9][0-9])$</version> + <arch>ppc64</arch> + </treeinfo> + </tree> +@@ -70,7 +70,7 @@ + <tree arch="ppc64le"> + <treeinfo> + <family>Red Hat Enterprise Linux</family> +- <version>^7.([89]|[1-9][0-9])$</version> ++ <version>^7.(9|[1-9][0-9])$</version> + <arch>ppc64le</arch> + </treeinfo> + </tree> +@@ -78,7 +78,7 @@ + <tree arch="s390x"> + <treeinfo> + <family>Red Hat Enterprise Linux</family> +- <version>^7.([89]|[1-9][0-9])$</version> ++ <version>^7.(9|[1-9][0-9])$</version> + <arch>s390x</arch> + </treeinfo> + </tree> +@@ -86,7 +86,7 @@ + <tree arch="x86_64"> + <treeinfo> + <family>Red Hat Enterprise Linux</family> +- <version>^7.([89]|[1-9][0-9])$</version> ++ <version>^7.(9|[1-9][0-9])$</version> + <arch>x86_64</arch> + </treeinfo> + </tree> +diff --git a/os/redhat.com/rhel-7.8.xml b/os/redhat.com/rhel-7.8.xml +new file mode 100644 +index 0000000..d658600 +--- /dev/null ++++ b/os/redhat.com/rhel-7.8.xml +@@ -0,0 +1,154 @@ ++<?xml version="1.0" encoding="UTF-8"?> ++<libosinfo version="0.0.1"> ++ ++ <os id="http://redhat.com/rhel/7.8"> ++ <short-id>rhel7.8</short-id> ++ <name>Red Hat Enterprise Linux 7.8</name> ++ <version>7.8</version> ++ <vendor>Red Hat, Inc</vendor> ++ <vendor xml:lang="ca">Red Hat, Inc</vendor> ++ <vendor xml:lang="de">Red Hat, Inc</vendor> ++ <vendor xml:lang="es">Red Hat, Inc</vendor> ++ <vendor xml:lang="fr">Red Hat, Inc</vendor> ++ <vendor xml:lang="id">Red Hat, Inc</vendor> ++ <vendor xml:lang="it">Red Hat, Inc</vendor> ++ <vendor xml:lang="ja">Red Hat, Inc</vendor> ++ <vendor xml:lang="pl">Red Hat, Inc</vendor> ++ <vendor xml:lang="pt_BR">Red Hat, Inc</vendor> ++ <vendor xml:lang="uk">Red Hat, Inc</vendor> ++ <family>linux</family> ++ <distro>rhel</distro> ++ <codename>Maipo</codename> ++ <upgrades id="http://redhat.com/rhel/7.7"/> ++ <derives-from id="http://redhat.com/rhel/7.7"/> ++ ++ <release-date>2020-03-31</release-date> ++ ++ <media arch="x86_64"> ++ <iso> ++ <system-id>LINUX</system-id> ++ <volume-id>.*RHEL-7.8.*x86_64.*</volume-id> ++ </iso> ++ <kernel>isolinux/vmlinuz</kernel> ++ <initrd>isolinux/initrd.img</initrd> ++ </media> ++ ++ <media arch="aarch64"> ++ <iso> ++ <system-id>LINUX</system-id> ++ <volume-id>RHEL-7.8.*aarch64$</volume-id> ++ </iso> ++ </media> ++ ++ <media arch="ppc64"> ++ <iso> ++ <system-id>PPC</system-id> ++ <volume-id>RHEL[-_]7.8.*ppc64$</volume-id> ++ </iso> ++ </media> ++ ++ <media arch="ppc64le"> ++ <iso> ++ <system-id>PPC</system-id> ++ <volume-id>RHEL[-_]7.8.*ppc64le$</volume-id> ++ </iso> ++ </media> ++ ++ <media arch="s390x"> ++ <iso> ++ <system-id>LINUX</system-id> ++ <volume-id>RHEL-7.8.*s390x$</volume-id> ++ </iso> ++ </media> ++ ++ <tree arch="ppc64"> ++ <treeinfo> ++ <family>Red Hat Enterprise Linux$</family> ++ <version>^7.8$</version> ++ <arch>ppc64$</arch> ++ </treeinfo> ++ </tree> ++ ++ <tree arch="ppc64le"> ++ <treeinfo> ++ <family>Red Hat Enterprise Linux$</family> ++ <version>^7.8$</version> ++ <arch>ppc64le</arch> ++ </treeinfo> ++ </tree> ++ ++ <tree arch="s390x"> ++ <treeinfo> ++ <family>Red Hat Enterprise Linux$</family> ++ <version>^7.8$</version> ++ <arch>s390x</arch> ++ </treeinfo> ++ </tree> ++ ++ <tree arch="x86_64"> ++ <treeinfo> ++ <family>Red Hat Enterprise Linux$</family> ++ <version>^7.8$</version> ++ <arch>x86_64</arch> ++ </treeinfo> ++ </tree> ++ ++ <resources arch="ppc64"> ++ <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="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"> ++ <minimum> ++ <n-cpus>1</n-cpus> ++ <cpu>1000000000</cpu> ++ <ram>1073741824</ram> ++ <storage>10737418240</storage> ++ </minimum> ++ ++ <recommended> ++ <cpu>1000000000</cpu> ++ <ram>1073741824</ram> ++ <storage>21474836480</storage> ++ </recommended> ++ ++ <maximum> ++ <ram>13194139533312</ram> ++ </maximum> ++ ++ <network-install> ++ <ram>1610612736</ram> ++ </network-install> ++ </resources> ++ ++ <installer> ++ <script id='http://redhat.com/rhel/kickstart/jeos'/> ++ <script id='http://redhat.com/rhel/kickstart/desktop'/> ++ </installer> ++ </os> ++</libosinfo> +\ No newline at end of file +-- +2.23.0 + diff --git a/SOURCES/0001-rhel-Add-rhel-8.1.patch b/SOURCES/0001-rhel-Add-rhel-8.1.patch deleted file mode 100644 index 26cbed2..0000000 --- a/SOURCES/0001-rhel-Add-rhel-8.1.patch +++ /dev/null @@ -1,240 +0,0 @@ -From cfb289f3c78bee9dd7bc0fcf96dca46187ef3f68 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= <fidencio@redhat.com> -Date: Thu, 23 May 2019 10:36:53 +0200 -Subject: [PATCH 1/2] rhel: Add rhel-8.1 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Signed-off-by: Fabiano Fidêncio <fidencio@redhat.com> ---- - os/redhat.com/rhel-8-unknown.xml | 22 +++--- - os/redhat.com/rhel-8.1.xml | 127 +++++++++++++++++++++++++++++++ - 2 files changed, 139 insertions(+), 12 deletions(-) - create mode 100644 os/redhat.com/rhel-8.1.xml - -diff --git a/os/redhat.com/rhel-8-unknown.xml b/os/redhat.com/rhel-8-unknown.xml -index 226a018..fcf601d 100644 ---- a/os/redhat.com/rhel-8-unknown.xml -+++ b/os/redhat.com/rhel-8-unknown.xml -@@ -18,14 +18,14 @@ - <vendor xml:lang="uk">Red Hat, Inc</vendor> - <family>linux</family> - <distro>rhel</distro> - <codename>Ootpa</codename> -- <upgrades id="http://redhat.com/rhel/8.0"/> -- <derives-from id="http://redhat.com/rhel/8.0"/> -+ <upgrades id="http://redhat.com/rhel/8.1"/> -+ <derives-from id="http://redhat.com/rhel/8.1"/> - - <media arch="x86_64"> - <iso> - <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> - </iso> - <kernel>isolinux/vmlinuz</kernel> - <initrd>isolinux/initrd.img</initrd> -@@ -34,28 +34,28 @@ - <media arch="aarch64"> - <iso> - <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> - </iso> - </media> - - <media arch="ppc64le"> - <iso> - <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> - </iso> - </media> - - <media arch="s390x"> - <iso> - <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> - </iso> - </media> - - <tree arch="aarch64"> - <treeinfo> - <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> - <arch>aarch64</arch> - </treeinfo> - </tree> -@@ -63,7 +63,7 @@ - <tree arch="ppc64le"> - <treeinfo> - <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> - <arch>ppc64le</arch> - </treeinfo> - </tree> -@@ -71,7 +71,7 @@ - <tree arch="s390x"> - <treeinfo> - <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> - <arch>s390x</arch> - </treeinfo> - </tree> -@@ -79,7 +79,7 @@ - <tree arch="x86_64"> - <treeinfo> - <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> - <arch>x86_64</arch> - </treeinfo> - </tree> -@@ -114,4 +114,4 @@ - </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 -index 0000000..1022cca ---- /dev/null -+++ b/os/redhat.com/rhel-8.1.xml -@@ -0,0 +1,127 @@ -+<?xml version="1.0" encoding="UTF-8"?> -+<libosinfo version="0.0.1"> -+ -+ <os id="http://redhat.com/rhel/8.1"> -+ <short-id>rhel8.1</short-id> -+ <name>Red Hat Enterprise Linux 8.1</name> -+ <version>8.1</version> -+ <vendor>Red Hat, Inc</vendor> -+ <vendor xml:lang="ca">Red Hat, Inc</vendor> -+ <vendor xml:lang="de">Red Hat, Inc</vendor> -+ <vendor xml:lang="es">Red Hat, Inc</vendor> -+ <vendor xml:lang="fr">Red Hat, Inc</vendor> -+ <vendor xml:lang="id">Red Hat, Inc</vendor> -+ <vendor xml:lang="it">Red Hat, Inc</vendor> -+ <vendor xml:lang="ja">Red Hat, Inc</vendor> -+ <vendor xml:lang="pl">Red Hat, Inc</vendor> -+ <vendor xml:lang="pt_BR">Red Hat, Inc</vendor> -+ <vendor xml:lang="uk">Red Hat, Inc</vendor> -+ <family>linux</family> -+ <distro>rhel</distro> -+ <codename>Ootpa</codename> -+ <upgrades id="http://redhat.com/rhel/8.0"/> -+ <derives-from id="http://redhat.com/rhel/8.0"/> -+ -+ <media arch="x86_64"> -+ <iso> -+ <system-id>LINUX</system-id> -+ <volume-id>RHEL-8-1-(([0-9]|[1-9][0-9])-)?BaseOS-x86_64</volume-id> -+ </iso> -+ <kernel>isolinux/vmlinuz</kernel> -+ <initrd>isolinux/initrd.img</initrd> -+ </media> -+ -+ <media arch="ppc64le"> -+ <iso> -+ <system-id>PPC</system-id> -+ <volume-id>RHEL[_-]8[_-]1[_-](([0-9]|[1-9][0-9])[_-])?BaseOS[_-]ppc64le</volume-id> -+ </iso> -+ <kernel>ppc/ppc64/vmlinuz</kernel> -+ <initrd>ppc/ppc64/initrd.img</initrd> -+ </media> -+ -+ <media arch="aarch64"> -+ <iso> -+ <system-id>LINUX</system-id> -+ <volume-id>RHEL-8-1-(([0-9]|[1-9][0-9])-)?BaseOS-aarch64</volume-id> -+ </iso> -+ </media> -+ -+ <media arch="s390x"> -+ <iso> -+ <system-id>LINUX</system-id> -+ <volume-id>RHEL-8-1-(([0-9]|[1-9][0-9])-)?BaseOS-s390x</volume-id> -+ </iso> -+ </media> -+ -+ <tree arch="aarch64"> -+ <treeinfo> -+ <family>Red Hat Enterprise Linux</family> -+ <version>^8.1(.([0-9]|[1-9][0-9]))?$</version> -+ <arch>aarch64</arch> -+ </treeinfo> -+ </tree> -+ -+ <tree arch="ppc64le"> -+ <treeinfo> -+ <family>Red Hat Enterprise Linux</family> -+ <version>^8.1(.([0-9]|[1-9][0-9]))?$</version> -+ <arch>ppc64le</arch> -+ </treeinfo> -+ </tree> -+ -+ <tree arch="s390x"> -+ <treeinfo> -+ <family>Red Hat Enterprise Linux</family> -+ <version>^8.1(.([0-9]|[1-9][0-9]))?$</version> -+ <arch>s390x</arch> -+ </treeinfo> -+ </tree> -+ -+ <tree arch="x86_64"> -+ <treeinfo> -+ <family>Red Hat Enterprise Linux</family> -+ <version>^8.1(.([0-9]|[1-9][0-9]))?$</version> -+ <arch>x86_64</arch> -+ </treeinfo> -+ </tree> -+ -+ <tree arch="aarch64"> -+ <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> -+ <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"> -+ <minimum> -+ <n-cpus>1</n-cpus> -+ <cpu>1000000000</cpu> -+ <ram>1073741824</ram> -+ <storage>10737418240</storage> -+ </minimum> -+ -+ <recommended> -+ <cpu>1000000000</cpu> -+ <ram>1073741824</ram> -+ <storage>10737418240</storage> -+ </recommended> -+ </resources> -+ </os> -+</libosinfo> --- -2.21.0 - diff --git a/SOURCES/0002-rhel-Add-8.2-entry.patch b/SOURCES/0002-rhel-Add-8.2-entry.patch new file mode 100644 index 0000000..52ebeac --- /dev/null +++ b/SOURCES/0002-rhel-Add-8.2-entry.patch @@ -0,0 +1,237 @@ +From ea3d294c14e8d43fbe24afe5c59d11f52a96e8ec Mon Sep 17 00:00:00 2001 +From: rpm-build <rpm-build> +Date: Tue, 10 Dec 2019 10:13:28 +0100 +Subject: [PATCH] rhel: Add 8.2 entry + +Signed-off-by: rpm-build <rpm-build> +--- + os/redhat.com/rhel-8-unknown.xml | 20 ++--- + os/redhat.com/rhel-8.2.xml | 134 +++++++++++++++++++++++++++++++ + 2 files changed, 144 insertions(+), 10 deletions(-) + 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 +index 1480185..82cfb4a 100644 +--- a/os/redhat.com/rhel-8-unknown.xml ++++ b/os/redhat.com/rhel-8-unknown.xml +@@ -19,13 +19,13 @@ + <family>linux</family> + <distro>rhel</distro> + <codename>Ootpa</codename> +- <upgrades id="http://redhat.com/rhel/8.1"/> +- <derives-from id="http://redhat.com/rhel/8.1"/> ++ <upgrades id="http://redhat.com/rhel/8.2"/> ++ <derives-from id="http://redhat.com/rhel/8.2"/> + + <media arch="x86_64"> + <iso> + <system-id>LINUX</system-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> + <kernel>isolinux/vmlinuz</kernel> + <initrd>isolinux/initrd.img</initrd> +@@ -34,28 +34,28 @@ + <media arch="aarch64"> + <iso> + <system-id>LINUX</system-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> + </media> + + <media arch="ppc64le"> + <iso> + <system-id>PPC</system-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> + </media> + + <media arch="s390x"> + <iso> + <system-id>LINUX</system-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> + </media> + + <tree arch="aarch64"> + <treeinfo> + <family>Red Hat Enterprise Linux</family> +- <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> + </treeinfo> + </tree> +@@ -63,7 +63,7 @@ + <tree arch="ppc64le"> + <treeinfo> + <family>Red Hat Enterprise Linux</family> +- <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> + </treeinfo> + </tree> +@@ -71,7 +71,7 @@ + <tree arch="s390x"> + <treeinfo> + <family>Red Hat Enterprise Linux</family> +- <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> + </treeinfo> + </tree> +@@ -79,7 +79,7 @@ + <tree arch="x86_64"> + <treeinfo> + <family>Red Hat Enterprise Linux</family> +- <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> + </treeinfo> + </tree> +diff --git a/os/redhat.com/rhel-8.2.xml b/os/redhat.com/rhel-8.2.xml +new file mode 100644 +index 0000000..cfc9599 +--- /dev/null ++++ b/os/redhat.com/rhel-8.2.xml +@@ -0,0 +1,134 @@ ++<?xml version="1.0" encoding="UTF-8"?> ++<libosinfo version="0.0.1"> ++ ++ <os id="http://redhat.com/rhel/8.2"> ++ <short-id>rhel8.2</short-id> ++ <name>Red Hat Enterprise Linux 8.2</name> ++ <version>8.2</version> ++ <vendor>Red Hat, Inc</vendor> ++ <vendor xml:lang="ca">Red Hat, Inc</vendor> ++ <vendor xml:lang="de">Red Hat, Inc</vendor> ++ <vendor xml:lang="es">Red Hat, Inc</vendor> ++ <vendor xml:lang="fr">Red Hat, Inc</vendor> ++ <vendor xml:lang="id">Red Hat, Inc</vendor> ++ <vendor xml:lang="it">Red Hat, Inc</vendor> ++ <vendor xml:lang="ja">Red Hat, Inc</vendor> ++ <vendor xml:lang="pl">Red Hat, Inc</vendor> ++ <vendor xml:lang="pt_BR">Red Hat, Inc</vendor> ++ <vendor xml:lang="uk">Red Hat, Inc</vendor> ++ <family>linux</family> ++ <distro>rhel</distro> ++ <codename>Ootpa</codename> ++ <upgrades id="http://redhat.com/rhel/8.1"/> ++ <derives-from id="http://redhat.com/rhel/8.1"/> ++ ++ <release-date>2020-04-28</release-date> ++ ++ <media arch="x86_64"> ++ <iso> ++ <system-id>LINUX</system-id> ++ <volume-id>RHEL-8-2-(([0-9]|[1-9][0-9])-)?BaseOS-x86_64</volume-id> ++ </iso> ++ <kernel>isolinux/vmlinuz</kernel> ++ <initrd>isolinux/initrd.img</initrd> ++ </media> ++ ++ <media arch="ppc64le"> ++ <iso> ++ <system-id>PPC</system-id> ++ <volume-id>RHEL[_-]8[_-]2[_-](([0-9]|[1-9][0-9])[_-])?BaseOS[_-]ppc64le</volume-id> ++ </iso> ++ <kernel>ppc/ppc64/vmlinuz</kernel> ++ <initrd>ppc/ppc64/initrd.img</initrd> ++ </media> ++ ++ <media arch="aarch64"> ++ <iso> ++ <system-id>LINUX</system-id> ++ <volume-id>RHEL-8-2-(([0-9]|[1-9][0-9])-)?BaseOS-aarch64</volume-id> ++ </iso> ++ </media> ++ ++ <media arch="s390x"> ++ <iso> ++ <system-id>LINUX</system-id> ++ <volume-id>RHEL-8-2-(([0-9]|[1-9][0-9])-)?BaseOS-s390x</volume-id> ++ </iso> ++ </media> ++ ++ <tree arch="aarch64"> ++ <treeinfo> ++ <family>Red Hat Enterprise Linux</family> ++ <version>^8.2(.([0-9]|[1-9][0-9]))?$</version> ++ <arch>aarch64</arch> ++ </treeinfo> ++ </tree> ++ ++ <tree arch="ppc64le"> ++ <treeinfo> ++ <family>Red Hat Enterprise Linux</family> ++ <version>^8.2(.([0-9]|[1-9][0-9]))?$</version> ++ <arch>ppc64le</arch> ++ </treeinfo> ++ </tree> ++ ++ <tree arch="s390x"> ++ <treeinfo> ++ <family>Red Hat Enterprise Linux</family> ++ <version>^8.2(.([0-9]|[1-9][0-9]))?$</version> ++ <arch>s390x</arch> ++ </treeinfo> ++ </tree> ++ ++ <tree arch="x86_64"> ++ <treeinfo> ++ <family>Red Hat Enterprise Linux</family> ++ <version>^8.2(.([0-9]|[1-9][0-9]))?$</version> ++ <arch>x86_64</arch> ++ </treeinfo> ++ </tree> ++ ++ <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"> ++ <minimum> ++ <n-cpus>1</n-cpus> ++ <cpu>1000000000</cpu> ++ <ram>1610612736</ram> ++ <storage>10737418240</storage> ++ </minimum> ++ ++ <recommended> ++ <cpu>1000000000</cpu> ++ <ram>1610612736</ram> ++ <storage>21474836480</storage> ++ </recommended> ++ ++ <maximum> ++ <ram>26388279066624</ram> ++ </maximum> ++ ++ <network-install> ++ <ram>3221225472</ram> ++ </network-install> ++ </resources> ++ ++ <installer> ++ <script id='http://redhat.com/rhel/kickstart/jeos'/> ++ <script id='http://redhat.com/rhel/kickstart/desktop'/> ++ </installer> ++ </os> ++</libosinfo> +\ No newline at end of file +-- +2.23.0 + diff --git a/SOURCES/0002-rhel-Add-rhel-7.7.patch b/SOURCES/0002-rhel-Add-rhel-7.7.patch deleted file mode 100644 index 3939bec..0000000 --- a/SOURCES/0002-rhel-Add-rhel-7.7.patch +++ /dev/null @@ -1,259 +0,0 @@ -From ffcda8a251b7dd6dec51359f403da0757c2a857c Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= <fidencio@redhat.com> -Date: Thu, 23 May 2019 10:41:22 +0200 -Subject: [PATCH 2/2] rhel: Add rhel-7.7 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Signed-off-by: Fabiano Fidêncio <fidencio@redhat.com> ---- - os/redhat.com/rhel-7-unknown.xml | 24 +++--- - os/redhat.com/rhel-7.7.xml | 139 +++++++++++++++++++++++++++++++ - 2 files changed, 151 insertions(+), 12 deletions(-) - create mode 100644 os/redhat.com/rhel-7.7.xml - -diff --git a/os/redhat.com/rhel-7-unknown.xml b/os/redhat.com/rhel-7-unknown.xml -index 1477a1a..7256b09 100644 ---- a/os/redhat.com/rhel-7-unknown.xml -+++ b/os/redhat.com/rhel-7-unknown.xml -@@ -19,13 +19,13 @@ - <family>linux</family> - <distro>rhel</distro> - <codename>Maipo</codename> -- <upgrades id="http://redhat.com/rhel/7.6"/> -- <derives-from id="http://redhat.com/rhel/7.6"/> -+ <upgrades id="http://redhat.com/rhel/7.7"/> -+ <derives-from id="http://redhat.com/rhel/7.7"/> - - <media arch="x86_64"> - <iso> - <system-id>LINUX</system-id> -- <volume-id>.*RHEL-7.([7-9]|[1-9][0-9]).*x86_64.*</volume-id> -+ <volume-id>.*RHEL-7.([8-9]|[1-9][0-9]).*x86_64.*</volume-id> - </iso> - <kernel>isolinux/vmlinuz</kernel> - <initrd>isolinux/initrd.img</initrd> -@@ -34,35 +34,35 @@ - <media arch="aarch64"> - <iso> - <system-id>LINUX</system-id> -- <volume-id>RHEL-7.([7-9]|[1-9][0-9]).*aarch64$</volume-id> -+ <volume-id>RHEL-7.([8-9]|[1-9][0-9]).*aarch64$</volume-id> - </iso> - </media> - - <media arch="ppc64"> - <iso> - <system-id>PPC</system-id> -- <volume-id>RHEL[-_]7.([7-9]|[1-9][0-9]).*ppc64$</volume-id> -+ <volume-id>RHEL[-_]7.([8-9]|[1-9][0-9]).*ppc64$</volume-id> - </iso> - </media> - - <media arch="ppc64le"> - <iso> - <system-id>PPC</system-id> -- <volume-id>RHEL[-_]7.([7-9]|[1-9][0-9]).*ppc64le$</volume-id> -+ <volume-id>RHEL[-_]7.([8-9]|[1-9][0-9]).*ppc64le$</volume-id> - </iso> - </media> - - <media arch="s390x"> - <iso> - <system-id>LINUX</system-id> -- <volume-id>RHEL-7.([7-9]|[1-9][0-9]).*s390x$</volume-id> -+ <volume-id>RHEL-7.([8-9]|[1-9][0-9]).*s390x$</volume-id> - </iso> - </media> - - <tree arch="ppc64"> - <treeinfo> - <family>Red Hat Enterprise Linux</family> -- <version>^7.([7-9]|[1-9][0-9])$</version> -+ <version>^7.([8-9]|[1-9][0-9])$</version> - <arch>ppc64</arch> - </treeinfo> - </tree> -@@ -70,7 +70,7 @@ - <tree arch="ppc64le"> - <treeinfo> - <family>Red Hat Enterprise Linux</family> -- <version>^7.([7-9]|[1-9][0-9])$</version> -+ <version>^7.([8-9]|[1-9][0-9])$</version> - <arch>ppc64le</arch> - </treeinfo> - </tree> -@@ -78,7 +78,7 @@ - <tree arch="s390x"> - <treeinfo> - <family>Red Hat Enterprise Linux</family> -- <version>^7.([7-9]|[1-9][0-9])$</version> -+ <version>^7.([8-9]|[1-9][0-9])$</version> - <arch>s390x</arch> - </treeinfo> - </tree> -@@ -86,7 +86,7 @@ - <tree arch="x86_64"> - <treeinfo> - <family>Red Hat Enterprise Linux</family> -- <version>^7.([7-9]|[1-9][0-9])$</version> -+ <version>^7.([8-9]|[1-9][0-9])$</version> - <arch>x86_64</arch> - </treeinfo> - </tree> -@@ -134,4 +134,4 @@ - <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 -index 0000000..c140542 ---- /dev/null -+++ b/os/redhat.com/rhel-7.7.xml -@@ -0,0 +1,139 @@ -+<?xml version="1.0" encoding="UTF-8"?> -+<libosinfo version="0.0.1"> -+ -+ <os id="http://redhat.com/rhel/7.7"> -+ <short-id>rhel7.7</short-id> -+ <name>Red Hat Enterprise Linux 7.7</name> -+ <version>7.7</version> -+ <vendor>Red Hat, Inc</vendor> -+ <vendor xml:lang="ca">Red Hat, Inc</vendor> -+ <vendor xml:lang="de">Red Hat, Inc</vendor> -+ <vendor xml:lang="es">Red Hat, Inc</vendor> -+ <vendor xml:lang="fr">Red Hat, Inc</vendor> -+ <vendor xml:lang="id">Red Hat, Inc</vendor> -+ <vendor xml:lang="it">Red Hat, Inc</vendor> -+ <vendor xml:lang="ja">Red Hat, Inc</vendor> -+ <vendor xml:lang="pl">Red Hat, Inc</vendor> -+ <vendor xml:lang="pt_BR">Red Hat, Inc</vendor> -+ <vendor xml:lang="uk">Red Hat, Inc</vendor> -+ <family>linux</family> -+ <distro>rhel</distro> -+ <codename>Maipo</codename> -+ <upgrades id="http://redhat.com/rhel/7.6"/> -+ <derives-from id="http://redhat.com/rhel/7.6"/> -+ -+ <release-date>2018-10-30</release-date> -+ -+ <media arch="x86_64"> -+ <iso> -+ <system-id>LINUX</system-id> -+ <volume-id>.*RHEL-7.7.*x86_64.*</volume-id> -+ </iso> -+ <kernel>isolinux/vmlinuz</kernel> -+ <initrd>isolinux/initrd.img</initrd> -+ </media> -+ -+ <media arch="aarch64"> -+ <iso> -+ <system-id>LINUX</system-id> -+ <volume-id>RHEL-7.7.*aarch64$</volume-id> -+ </iso> -+ </media> -+ -+ <media arch="ppc64"> -+ <iso> -+ <system-id>PPC</system-id> -+ <volume-id>RHEL[-_]7.7.*ppc64$</volume-id> -+ </iso> -+ </media> -+ -+ <media arch="ppc64le"> -+ <iso> -+ <system-id>PPC</system-id> -+ <volume-id>RHEL[-_]7.7.*ppc64le$</volume-id> -+ </iso> -+ </media> -+ -+ <media arch="s390x"> -+ <iso> -+ <system-id>LINUX</system-id> -+ <volume-id>RHEL-7.7.*s390x$</volume-id> -+ </iso> -+ </media> -+ -+ <tree arch="ppc64"> -+ <treeinfo> -+ <family>Red Hat Enterprise Linux</family> -+ <version>^7.7$</version> -+ <arch>ppc64</arch> -+ </treeinfo> -+ </tree> -+ -+ <tree arch="ppc64le"> -+ <treeinfo> -+ <family>Red Hat Enterprise Linux</family> -+ <version>^7.7$</version> -+ <arch>ppc64le</arch> -+ </treeinfo> -+ </tree> -+ -+ <tree arch="s390x"> -+ <treeinfo> -+ <family>Red Hat Enterprise Linux</family> -+ <version>^7.7$</version> -+ <arch>s390x</arch> -+ </treeinfo> -+ </tree> -+ -+ <tree arch="x86_64"> -+ <treeinfo> -+ <family>Red Hat Enterprise Linux</family> -+ <version>^7.7$</version> -+ <arch>x86_64</arch> -+ </treeinfo> -+ </tree> -+ -+ <resources arch="ppc64"> -+ <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"> -+ <minimum> -+ <n-cpus>1</n-cpus> -+ <cpu>1000000000</cpu> -+ <ram>1073741824</ram> -+ <storage>10737418240</storage> -+ </minimum> -+ -+ <recommended> -+ <cpu>1000000000</cpu> -+ <ram>1073741824</ram> -+ <storage>10737418240</storage> -+ </recommended> -+ -+ <maximum> -+ <ram>13194139533312</ram> -+ </maximum> -+ -+ <network-install> -+ <ram>1610612736</ram> -+ </network-install> -+ </resources> -+ -+ <installer> -+ <script id='http://redhat.com/rhel/kickstart/jeos'/> -+ <script id='http://redhat.com/rhel/kickstart/desktop'/> -+ </installer> -+ </os> -+</libosinfo> --- -2.21.0 - diff --git a/SOURCES/osinfo-db-20190611.tar.xz.asc b/SOURCES/osinfo-db-20190611.tar.xz.asc deleted file mode 100644 index 6df1f68..0000000 --- a/SOURCES/osinfo-db-20190611.tar.xz.asc +++ /dev/null @@ -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----- diff --git a/SOURCES/osinfo-db-20191125.tar.xz.asc b/SOURCES/osinfo-db-20191125.tar.xz.asc new file mode 100644 index 0000000..3f3ec34 --- /dev/null +++ b/SOURCES/osinfo-db-20191125.tar.xz.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCAAdFiEECbnI/yI+8ROvoGo57pJsK9rMF3sFAl3byYsACgkQ7pJsK9rM +F3tGZA/9Guv0yNMUTxJuuSVPiLfqEe/g1+boBT7xb7Ul1LaWuoHhMvYUj0ou+mza +ZEeN/Pa+CP/ka1JaO4oisFnFsFHCJV44B8g0HrIGY6yCUQlF3iBV8bxJGqls08PD +9Q4j9Gzp0Ds4bJDEHDQytmTNKv3gpRqe6+gpEXTzt0cKI13WKEYmoyChBmgdyDv0 +SFhAYsjtKauDoKwrUIXcDA+p5PASHfj75HaFz4rso13qjjr1YnpEUCfbsq4NY4NM +RG+A4PlvsI7+W59NKFpq4wot6V0uDngR0PTJw3VXeMrFGlqV84O8Xeim0aK9WlLa +yXm4PN37FZG9G4ZcwfnmSJv8FI76dgUsPb4V69lRN3XU70rLwszcIpApH1cWdbjN +/iFmOCgf7dFdKMVKWKw16/v937sFMsq+Cx1D6HmlIBozLIZfFmOldK+iovlhv8PS +3kfvlBaFGr7UygYDPnp1Hugc4upp9BqefWnczxIlTWMimH0nqUfVVJLDabwgG0RQ +wuFaVkAXj/UFNS2bLOYa+bdIN2qi8sjBn22W0F08avjh6AL6SXr9b39gE9FJQwFW +XJ7Nu5yZY1FvpCphyTIg5IdkYD0lLSf5bEx7YH81g0j7piCVLbkcKKWrXTmK0PSS +Ai+Yl3sJgWymsiZouusvsTHJw/BCWWuCUti8Wm//urOiEN3HTzM= +=utPk +-----END PGP SIGNATURE----- diff --git a/SPECS/osinfo-db.spec b/SPECS/osinfo-db.spec index d0c6547..57511e4 100644 --- a/SPECS/osinfo-db.spec +++ b/SPECS/osinfo-db.spec @@ -4,7 +4,7 @@ Summary: osinfo database files Name: osinfo-db -Version: 20190611 +Version: 20191125 Release: 1%{?dist} License: LGPLv2+ 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/ ### Downstream Patches ### -Patch0001: 0001-rhel-Add-rhel-8.1.patch -Patch0002: 0002-rhel-Add-rhel-7.7.patch +Patch0001: 0001-rhel-Add-7.8-entry.patch +Patch0002: 0002-rhel-Add-8.2-entry.patch BuildRequires: intltool BuildRequires: osinfo-db-tools @@ -34,6 +34,9 @@ done # Remove spurious leftovers from when applying the patches 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: # 1. unpack the sources # 2. patch the sources @@ -57,6 +60,12 @@ osinfo-db-import --root %{buildroot} --dir %{_datadir}/osinfo %{PatchedSource} %{_datadir}/osinfo/schema %changelog +* 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 - Update to v20190611 release - Resolves: rhbz#1699990 - Rebase to the latest upstream release