diff --git a/.gitignore b/.gitignore index 6ed4ad9..c03d99c 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/osinfo-db-20220727.tar.xz +SOURCES/osinfo-db-20221130.tar.xz diff --git a/.osinfo-db.metadata b/.osinfo-db.metadata index 2eff62d..5a59b0b 100644 --- a/.osinfo-db.metadata +++ b/.osinfo-db.metadata @@ -1 +1 @@ -ee6cb08f27b0ec7f86f0eb95c9ed6b0a72981945 SOURCES/osinfo-db-20220727.tar.xz +616479396f654ac9d8676bed4b07e02f9f093e23 SOURCES/osinfo-db-20221130.tar.xz diff --git a/SOURCES/0001-Add-prereleases-rhel-8.8-and-rhel-9.2.patch b/SOURCES/0001-Add-prereleases-rhel-8.8-and-rhel-9.2.patch new file mode 100644 index 0000000..ada6cff --- /dev/null +++ b/SOURCES/0001-Add-prereleases-rhel-8.8-and-rhel-9.2.patch @@ -0,0 +1,526 @@ +From aa68a741f6d821042ba9f6cba9b8b25788c02990 Mon Sep 17 00:00:00 2001 +From: rpm-build <rpm-build> +Date: Wed, 30 Nov 2022 18:10:19 +0100 +Subject: [PATCH] Add prereleases: rhel-8.8 and rhel-9.2 +Content-type: text/plain + +See: https://gitlab.com/libosinfo/osinfo-db/-/merge_requests/536 +Related: https://bugzilla.redhat.com/show_bug.cgi?id=2135751 + +Signed-off-by: Victor Toso <victortoso@redhat.com> +--- + os/redhat.com/rhel-8-unknown.xml | 20 ++-- + os/redhat.com/rhel-8.8.xml | 171 +++++++++++++++++++++++++++++++ + os/redhat.com/rhel-9-unknown.xml | 20 ++-- + os/redhat.com/rhel-9.2.xml | 169 ++++++++++++++++++++++++++++++ + 4 files changed, 360 insertions(+), 20 deletions(-) + create mode 100644 os/redhat.com/rhel-8.8.xml + create mode 100644 os/redhat.com/rhel-9.2.xml + +diff --git a/os/redhat.com/rhel-8-unknown.xml b/os/redhat.com/rhel-8-unknown.xml +index 6371057..96e8c89 100644 +--- a/os/redhat.com/rhel-8-unknown.xml ++++ b/os/redhat.com/rhel-8-unknown.xml +@@ -34,12 +34,12 @@ + <family>linux</family> + <distro>rhel</distro> + <codename>Ootpa</codename> +- <upgrades id="http://redhat.com/rhel/8.7"/> +- <derives-from id="http://redhat.com/rhel/8.7"/> ++ <upgrades id="http://redhat.com/rhel/8.8"/> ++ <derives-from id="http://redhat.com/rhel/8.8"/> + <media arch="x86_64"> + <iso> + <system-id>LINUX</system-id> +- <volume-id>.*RHEL-8-([8-9]|[1-9][0-9])(-[0-9]|[1-9][0-9])?.*x86_64.*</volume-id> ++ <volume-id>.*RHEL-8-(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> +@@ -47,7 +47,7 @@ + <media arch="aarch64"> + <iso> + <system-id>LINUX</system-id> +- <volume-id>RHEL-8-([8-9]|[1-9][0-9])(-[0-9]|[1-9][0-9])?.*aarch64$</volume-id> ++ <volume-id>RHEL-8-(9|[1-9][0-9])(-[0-9]|[1-9][0-9])?.*aarch64$</volume-id> + </iso> + <kernel>images/pxeboot/vmlinuz</kernel> + <initrd>images/pxeboot/initrd.img</initrd> +@@ -55,7 +55,7 @@ + <media arch="ppc64le"> + <iso> + <system-id>PPC</system-id> +- <volume-id>RHEL[_-]8[_-]([8-9]|[1-9][0-9])([_-]([0-9]|[1-9][0-9]))?.*ppc64le$</volume-id> ++ <volume-id>RHEL[_-]8[_-](9|[1-9][0-9])([_-]([0-9]|[1-9][0-9]))?.*ppc64le$</volume-id> + </iso> + <kernel>ppc/ppc64/vmlinuz</kernel> + <initrd>ppc/ppc64/initrd.img</initrd> +@@ -63,34 +63,34 @@ + <media arch="s390x"> + <iso> + <system-id>LINUX</system-id> +- <volume-id>RHEL-8-([8-9]|[1-9][0-9])(-[0-9]|[1-9][0-9])?.*s390x$</volume-id> ++ <volume-id>RHEL-8-(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.([8-9]|[1-9][0-9])(-[0-9]|[1-9][0-9])?$</version> ++ <version>^8.(9|[1-9][0-9])(-[0-9]|[1-9][0-9])?$</version> + <arch>aarch64</arch> + </treeinfo> + </tree> + <tree arch="ppc64le"> + <treeinfo> + <family>Red Hat Enterprise Linux</family> +- <version>^8.([8-9]|[1-9][0-9])(.([0-9]|[1-9][0-9]))?$</version> ++ <version>^8.(9|[1-9][0-9])(.([0-9]|[1-9][0-9]))?$</version> + <arch>ppc64le</arch> + </treeinfo> + </tree> + <tree arch="s390x"> + <treeinfo> + <family>Red Hat Enterprise Linux</family> +- <version>^8.([8-9]|[1-9][0-9])(.([0-9]|[1-9][0-9]))?$</version> ++ <version>^8.(9|[1-9][0-9])(.([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.([8-9]|[1-9][0-9])(.([0-9]|[1-9][0-9]))?$</version> ++ <version>^8.(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.8.xml b/os/redhat.com/rhel-8.8.xml +new file mode 100644 +index 0000000..f1cc1e0 +--- /dev/null ++++ b/os/redhat.com/rhel-8.8.xml +@@ -0,0 +1,171 @@ ++<?xml version="1.0"?> ++<libosinfo version="0.0.1"> ++ <!-- Licensed under the GNU General Public License version 2 or later. ++ See http://www.gnu.org/licenses/ for a copy of the license text --> ++ <os id="http://redhat.com/rhel/8.8"> ++ <short-id>rhel8.8</short-id> ++ <name>Red Hat Enterprise Linux 8.8</name> ++ <version>8.8</version> ++ <vendor>Red Hat, Inc</vendor> ++ <vendor xml:lang="ka">Red Hat, Inc</vendor> ++ <vendor xml:lang="ko">Red Hat, Inc</vendor> ++ <vendor xml:lang="fi">Red Hat, Inc</vendor> ++ <vendor xml:lang="uk">Red Hat, Inc</vendor> ++ <vendor xml:lang="tr">Red Hat, Inc</vendor> ++ <vendor xml:lang="pt_BR">Red Hat, Inc</vendor> ++ <vendor xml:lang="pl">Red Hat, Inc</vendor> ++ <vendor xml:lang="ja">Red Hat, Inc</vendor> ++ <vendor xml:lang="it">Red Hat, Inc</vendor> ++ <vendor xml:lang="id">Red Hat, Inc</vendor> ++ <vendor xml:lang="fr">Red Hat, Inc</vendor> ++ <vendor xml:lang="es">Red Hat, Inc</vendor> ++ <vendor xml:lang="de">Red Hat, Inc</vendor> ++ <vendor xml:lang="ca">Red Hat, Inc</vendor> ++ <family>linux</family> ++ <distro>rhel</distro> ++ <codename>Ootpa</codename> ++ <upgrades id="http://redhat.com/rhel/8.7"/> ++ <derives-from id="http://redhat.com/rhel/8.7"/> ++ <release-status>prerelease</release-status> ++ <media arch="x86_64"> ++ <iso> ++ <system-id>LINUX</system-id> ++ <volume-id>RHEL-8-8-(([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[_-]8[_-](([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-8-(([0-9]|[1-9][0-9])-)?BaseOS-aarch64</volume-id> ++ </iso> ++ <kernel>images/pxeboot/vmlinuz</kernel> ++ <initrd>images/pxeboot/initrd.img</initrd> ++ </media> ++ <media arch="s390x"> ++ <iso> ++ <system-id>LINUX</system-id> ++ <volume-id>RHEL-8-8-(([0-9]|[1-9][0-9])-)?BaseOS-s390x</volume-id> ++ </iso> ++ </media> ++ <tree arch="aarch64"> ++ <treeinfo> ++ <family>Red Hat Enterprise Linux</family> ++ <version>^8.8(.([0-9]|[1-9][0-9]))?$</version> ++ <arch>aarch64</arch> ++ </treeinfo> ++ </tree> ++ <tree arch="ppc64le"> ++ <treeinfo> ++ <family>Red Hat Enterprise Linux</family> ++ <version>^8.8(.([0-9]|[1-9][0-9]))?$</version> ++ <arch>ppc64le</arch> ++ </treeinfo> ++ </tree> ++ <tree arch="s390x"> ++ <treeinfo> ++ <family>Red Hat Enterprise Linux</family> ++ <version>^8.8(.([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.8(.([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> ++ <maximum> ++ <n-cpus>768</n-cpus> ++ <ram>35184372088832</ram> ++ </maximum> ++ </resources> ++ <resources arch="x86_64"> ++ <minimum> ++ <cpu>1000000000</cpu> ++ <ram>1610612736</ram> ++ <storage>10737418240</storage> ++ </minimum> ++ <recommended> ++ <cpu>1000000000</cpu> ++ <ram>1610612736</ram> ++ <storage>21474836480</storage> ++ </recommended> ++ <maximum> ++ <n-cpus>768</n-cpus> ++ <ram>26388279066624</ram> ++ </maximum> ++ <network-install> ++ <ram>3221225472</ram> ++ </network-install> ++ </resources> ++ <resources arch="s390x"> ++ <minimum> ++ <ram>1073741824</ram> ++ <storage>10737418240</storage> ++ </minimum> ++ <recommended> ++ <storage>21474836480</storage> ++ </recommended> ++ <maximum> ++ <n-cpus>340</n-cpus> ++ <ram>17592186044416</ram> ++ </maximum> ++ <network-install> ++ <ram>2147483648</ram> ++ </network-install> ++ </resources> ++ <resources arch="aarch64"> ++ <minimum> ++ <ram>2147483648</ram> ++ <storage>10737418240</storage> ++ </minimum> ++ <recommended> ++ <storage>21474836480</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>10737418240</storage> ++ </minimum> ++ <recommended> ++ <cpu>1000000000</cpu> ++ <ram>1610612736</ram> ++ <storage>21474836480</storage> ++ </recommended> ++ </resources> ++ <installer> ++ <script id="http://redhat.com/rhel/kickstart/jeos"/> ++ <script id="http://redhat.com/rhel/kickstart/desktop"/> ++ </installer> ++ </os> ++</libosinfo> +diff --git a/os/redhat.com/rhel-9-unknown.xml b/os/redhat.com/rhel-9-unknown.xml +index 59e5046..fcb4a30 100644 +--- a/os/redhat.com/rhel-9-unknown.xml ++++ b/os/redhat.com/rhel-9-unknown.xml +@@ -33,59 +33,59 @@ + <family>linux</family> + <distro>rhel</distro> + <codename>Plow</codename> +- <upgrades id="http://redhat.com/rhel/9.1"/> +- <derives-from id="http://redhat.com/rhel/9.1"/> ++ <upgrades id="http://redhat.com/rhel/9.2"/> ++ <derives-from id="http://redhat.com/rhel/9.2"/> + <media arch="x86_64"> + <iso> +- <volume-id>.*RHEL-9-([2-9]|[1-9][0-9])(-[0-9]|[1-9][0-9])?.*x86_64.*</volume-id> ++ <volume-id>.*RHEL-9-([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> + </media> + <media arch="aarch64"> + <iso> +- <volume-id>RHEL-9-([2-9]|[1-9][0-9])(-[0-9]|[1-9][0-9])?.*aarch64$</volume-id> ++ <volume-id>RHEL-9-([3-9]|[1-9][0-9])(-[0-9]|[1-9][0-9])?.*aarch64$</volume-id> + </iso> + <kernel>images/pxeboot/vmlinuz</kernel> + <initrd>images/pxeboot/initrd.img</initrd> + </media> + <media arch="ppc64le"> + <iso> +- <volume-id>RHEL[_-]9[_-]([2-9]|[1-9][0-9])([_-]([0-9]|[1-9][0-9]))?.*ppc64le$</volume-id> ++ <volume-id>RHEL[_-]9[_-]([3-9]|[1-9][0-9])([_-]([0-9]|[1-9][0-9]))?.*ppc64le$</volume-id> + </iso> + <kernel>ppc/ppc64/vmlinuz</kernel> + <initrd>ppc/ppc64/initrd.img</initrd> + </media> + <media arch="s390x"> + <iso> +- <volume-id>RHEL-9-([2-9]|[1-9][0-9])(-[0-9]|[1-9][0-9])?.*s390x$</volume-id> ++ <volume-id>RHEL-9-([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>^9.([2-9]|[1-9][0-9])(-[0-9]|[1-9][0-9])?$</version> ++ <version>^9.([3-9]|[1-9][0-9])(-[0-9]|[1-9][0-9])?$</version> + <arch>aarch64</arch> + </treeinfo> + </tree> + <tree arch="ppc64le"> + <treeinfo> + <family>Red Hat Enterprise Linux</family> +- <version>^9.([2-9]|[1-9][0-9])(.([0-9]|[1-9][0-9]))?$</version> ++ <version>^9.([3-9]|[1-9][0-9])(.([0-9]|[1-9][0-9]))?$</version> + <arch>ppc64le</arch> + </treeinfo> + </tree> + <tree arch="s390x"> + <treeinfo> + <family>Red Hat Enterprise Linux</family> +- <version>^9.([2-9]|[1-9][0-9])(.([0-9]|[1-9][0-9]))?$</version> ++ <version>^9.([3-9]|[1-9][0-9])(.([0-9]|[1-9][0-9]))?$</version> + <arch>s390x</arch> + </treeinfo> + </tree> + <tree arch="x86_64"> + <treeinfo> + <family>Red Hat Enterprise Linux</family> +- <version>^9.([2-9]|[1-9][0-9])(.([0-9]|[1-9][0-9]))?$</version> ++ <version>^9.([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-9.2.xml b/os/redhat.com/rhel-9.2.xml +new file mode 100644 +index 0000000..cb20484 +--- /dev/null ++++ b/os/redhat.com/rhel-9.2.xml +@@ -0,0 +1,169 @@ ++<?xml version="1.0"?> ++<libosinfo version="0.0.1"> ++ <!-- Licensed under the GNU General Public License version 2 or later. ++ See http://www.gnu.org/licenses/ for a copy of the license text --> ++ <os id="http://redhat.com/rhel/9.2"> ++ <short-id>rhel9.2</short-id> ++ <name>Red Hat Enterprise Linux 9.2</name> ++ <version>9.2</version> ++ <vendor>Red Hat, Inc</vendor> ++ <vendor xml:lang="ka">Red Hat, Inc</vendor> ++ <vendor xml:lang="ko">Red Hat, Inc</vendor> ++ <vendor xml:lang="fi">Red Hat, Inc</vendor> ++ <vendor xml:lang="uk">Red Hat, Inc</vendor> ++ <vendor xml:lang="tr">Red Hat, Inc</vendor> ++ <vendor xml:lang="pt_BR">Red Hat, Inc</vendor> ++ <vendor xml:lang="pl">Red Hat, Inc</vendor> ++ <vendor xml:lang="ja">Red Hat, Inc</vendor> ++ <vendor xml:lang="it">Red Hat, Inc</vendor> ++ <vendor xml:lang="id">Red Hat, Inc</vendor> ++ <vendor xml:lang="fr">Red Hat, Inc</vendor> ++ <vendor xml:lang="es">Red Hat, Inc</vendor> ++ <vendor xml:lang="de">Red Hat, Inc</vendor> ++ <vendor xml:lang="ca">Red Hat, Inc</vendor> ++ <family>linux</family> ++ <distro>rhel</distro> ++ <codename>Plow</codename> ++ <upgrades id="http://redhat.com/rhel/9.1"/> ++ <derives-from id="http://redhat.com/rhel/9.1"/> ++ <release-status>prerelease</release-status> ++ <!-- RHEL 9.2 entries have to cope both with 9.2 and 9.2.x regexes for ++ medias' volume-id and trees' version --> ++ <media arch="x86_64"> ++ <iso> ++ <volume-id>RHEL-9-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> ++ <volume-id>RHEL[_-]9[_-]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> ++ <volume-id>RHEL-9-2-(([0-9]|[1-9][0-9])-)?BaseOS-aarch64</volume-id> ++ </iso> ++ <kernel>images/pxeboot/vmlinuz</kernel> ++ <initrd>images/pxeboot/initrd.img</initrd> ++ </media> ++ <media arch="s390x"> ++ <iso> ++ <volume-id>RHEL-9-2-(([0-9]|[1-9][0-9])-)?BaseOS-s390x</volume-id> ++ </iso> ++ </media> ++ <tree arch="aarch64"> ++ <treeinfo> ++ <family>Red Hat Enterprise Linux</family> ++ <version>^9.2(.([0-9]|[1-9][0-9]))?$</version> ++ <arch>aarch64</arch> ++ </treeinfo> ++ </tree> ++ <tree arch="ppc64le"> ++ <treeinfo> ++ <family>Red Hat Enterprise Linux</family> ++ <version>^9.2(.([0-9]|[1-9][0-9]))?$</version> ++ <arch>ppc64le</arch> ++ </treeinfo> ++ </tree> ++ <tree arch="s390x"> ++ <treeinfo> ++ <family>Red Hat Enterprise Linux</family> ++ <version>^9.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>^9.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> ++ <maximum> ++ <n-cpus>768</n-cpus> ++ <ram>35184372088832</ram> ++ </maximum> ++ </resources> ++ <resources arch="x86_64"> ++ <minimum> ++ <cpu>1000000000</cpu> ++ <ram>1610612736</ram> ++ <storage>10737418240</storage> ++ </minimum> ++ <recommended> ++ <cpu>1000000000</cpu> ++ <ram>1610612736</ram> ++ <storage>21474836480</storage> ++ </recommended> ++ <maximum> ++ <n-cpus>768</n-cpus> ++ <ram>26388279066624</ram> ++ </maximum> ++ <network-install> ++ <ram>3221225472</ram> ++ </network-install> ++ </resources> ++ <resources arch="s390x"> ++ <minimum> ++ <ram>1073741824</ram> ++ <storage>10737418240</storage> ++ </minimum> ++ <recommended> ++ <storage>21474836480</storage> ++ </recommended> ++ <maximum> ++ <n-cpus>340</n-cpus> ++ <ram>17592186044416</ram> ++ </maximum> ++ <network-install> ++ <ram>2147483648</ram> ++ </network-install> ++ </resources> ++ <resources arch="aarch64"> ++ <minimum> ++ <ram>2147483648</ram> ++ <storage>10737418240</storage> ++ </minimum> ++ <recommended> ++ <storage>21474836480</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>10737418240</storage> ++ </minimum> ++ <recommended> ++ <cpu>1000000000</cpu> ++ <ram>1610612736</ram> ++ <storage>21474836480</storage> ++ </recommended> ++ </resources> ++ <installer> ++ <script id="http://redhat.com/rhel/kickstart/jeos"/> ++ <script id="http://redhat.com/rhel/kickstart/desktop"/> ++ </installer> ++ </os> ++</libosinfo> +-- +2.38.1 + diff --git a/SOURCES/0001-rhel-Add-RHEL-8.7-prerelease.patch b/SOURCES/0001-rhel-Add-RHEL-8.7-prerelease.patch deleted file mode 100644 index d136647..0000000 --- a/SOURCES/0001-rhel-Add-RHEL-8.7-prerelease.patch +++ /dev/null @@ -1,272 +0,0 @@ -From 5ce5373899c529027aad4d93c54dc127a7d8fcc6 Mon Sep 17 00:00:00 2001 -From: Victor Toso <victortoso@redhat.com> -Date: Tue, 2 Aug 2022 15:26:05 +0200 -Subject: [PATCH 1/2] rhel: Add RHEL 8.7 (prerelease) -Content-type: text/plain - -Release is planned for November. -Signed-off-by: Victor Toso <victortoso@redhat.com> ---- - os/redhat.com/rhel-8-unknown.xml | 20 ++-- - os/redhat.com/rhel-8.7.xml | 171 +++++++++++++++++++++++++++++++ - 2 files changed, 181 insertions(+), 10 deletions(-) - create mode 100644 os/redhat.com/rhel-8.7.xml - -diff --git a/os/redhat.com/rhel-8-unknown.xml b/os/redhat.com/rhel-8-unknown.xml -index 15ea794..75b8742 100644 ---- a/os/redhat.com/rhel-8-unknown.xml -+++ b/os/redhat.com/rhel-8-unknown.xml -@@ -33,12 +33,12 @@ - <family>linux</family> - <distro>rhel</distro> - <codename>Ootpa</codename> -- <upgrades id="http://redhat.com/rhel/8.6"/> -- <derives-from id="http://redhat.com/rhel/8.6"/> -+ <upgrades id="http://redhat.com/rhel/8.7"/> -+ <derives-from id="http://redhat.com/rhel/8.7"/> - <media arch="x86_64"> - <iso> - <system-id>LINUX</system-id> -- <volume-id>.*RHEL-8-([7-9]|[1-9][0-9])(-[0-9]|[1-9][0-9])?.*x86_64.*</volume-id> -+ <volume-id>.*RHEL-8-([8-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> -@@ -46,7 +46,7 @@ - <media arch="aarch64"> - <iso> - <system-id>LINUX</system-id> -- <volume-id>RHEL-8-([7-9]|[1-9][0-9])(-[0-9]|[1-9][0-9])?.*aarch64$</volume-id> -+ <volume-id>RHEL-8-([8-9]|[1-9][0-9])(-[0-9]|[1-9][0-9])?.*aarch64$</volume-id> - </iso> - <kernel>images/pxeboot/vmlinuz</kernel> - <initrd>images/pxeboot/initrd.img</initrd> -@@ -54,7 +54,7 @@ - <media arch="ppc64le"> - <iso> - <system-id>PPC</system-id> -- <volume-id>RHEL[_-]8[_-]([7-9]|[1-9][0-9])([_-]([0-9]|[1-9][0-9]))?.*ppc64le$</volume-id> -+ <volume-id>RHEL[_-]8[_-]([8-9]|[1-9][0-9])([_-]([0-9]|[1-9][0-9]))?.*ppc64le$</volume-id> - </iso> - <kernel>ppc/ppc64/vmlinuz</kernel> - <initrd>ppc/ppc64/initrd.img</initrd> -@@ -62,34 +62,34 @@ - <media arch="s390x"> - <iso> - <system-id>LINUX</system-id> -- <volume-id>RHEL-8-([7-9]|[1-9][0-9])(-[0-9]|[1-9][0-9])?.*s390x$</volume-id> -+ <volume-id>RHEL-8-([8-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.([7-9]|[1-9][0-9])(-[0-9]|[1-9][0-9])?$</version> -+ <version>^8.([8-9]|[1-9][0-9])(-[0-9]|[1-9][0-9])?$</version> - <arch>aarch64</arch> - </treeinfo> - </tree> - <tree arch="ppc64le"> - <treeinfo> - <family>Red Hat Enterprise Linux</family> -- <version>^8.([7-9]|[1-9][0-9])(.([0-9]|[1-9][0-9]))?$</version> -+ <version>^8.([8-9]|[1-9][0-9])(.([0-9]|[1-9][0-9]))?$</version> - <arch>ppc64le</arch> - </treeinfo> - </tree> - <tree arch="s390x"> - <treeinfo> - <family>Red Hat Enterprise Linux</family> -- <version>^8.([7-9]|[1-9][0-9])(.([0-9]|[1-9][0-9]))?$</version> -+ <version>^8.([8-9]|[1-9][0-9])(.([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.([7-9]|[1-9][0-9])(.([0-9]|[1-9][0-9]))?$</version> -+ <version>^8.([8-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.7.xml b/os/redhat.com/rhel-8.7.xml -new file mode 100644 -index 0000000..b69f8cd ---- /dev/null -+++ b/os/redhat.com/rhel-8.7.xml -@@ -0,0 +1,171 @@ -+<?xml version="1.0"?> -+<libosinfo version="0.0.1"> -+ <!-- Licensed under the GNU General Public License version 2 or later. -+ See http://www.gnu.org/licenses/ for a copy of the license text --> -+ <os id="http://redhat.com/rhel/8.7"> -+ <short-id>rhel8.7</short-id> -+ <name>Red Hat Enterprise Linux 8.7</name> -+ <version>8.7</version> -+ <vendor>Red Hat, Inc</vendor> -+ <vendor xml:lang="ka">Red Hat, Inc</vendor> -+ <vendor xml:lang="ko">Red Hat, Inc</vendor> -+ <vendor xml:lang="fi">Red Hat, Inc</vendor> -+ <vendor xml:lang="uk">Red Hat, Inc</vendor> -+ <vendor xml:lang="tr">Red Hat, Inc</vendor> -+ <vendor xml:lang="pt_BR">Red Hat, Inc</vendor> -+ <vendor xml:lang="pl">Red Hat, Inc</vendor> -+ <vendor xml:lang="ja">Red Hat, Inc</vendor> -+ <vendor xml:lang="it">Red Hat, Inc</vendor> -+ <vendor xml:lang="id">Red Hat, Inc</vendor> -+ <vendor xml:lang="fr">Red Hat, Inc</vendor> -+ <vendor xml:lang="es">Red Hat, Inc</vendor> -+ <vendor xml:lang="de">Red Hat, Inc</vendor> -+ <vendor xml:lang="ca">Red Hat, Inc</vendor> -+ <family>linux</family> -+ <distro>rhel</distro> -+ <codename>Ootpa</codename> -+ <upgrades id="http://redhat.com/rhel/8.6"/> -+ <derives-from id="http://redhat.com/rhel/8.6"/> -+ <release-status>prerelease</release-status> -+ <media arch="x86_64"> -+ <iso> -+ <system-id>LINUX</system-id> -+ <volume-id>RHEL-8-7-(([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[_-]7[_-](([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-7-(([0-9]|[1-9][0-9])-)?BaseOS-aarch64</volume-id> -+ </iso> -+ <kernel>images/pxeboot/vmlinuz</kernel> -+ <initrd>images/pxeboot/initrd.img</initrd> -+ </media> -+ <media arch="s390x"> -+ <iso> -+ <system-id>LINUX</system-id> -+ <volume-id>RHEL-8-7-(([0-9]|[1-9][0-9])-)?BaseOS-s390x</volume-id> -+ </iso> -+ </media> -+ <tree arch="aarch64"> -+ <treeinfo> -+ <family>Red Hat Enterprise Linux</family> -+ <version>^8.7(.([0-9]|[1-9][0-9]))?$</version> -+ <arch>aarch64</arch> -+ </treeinfo> -+ </tree> -+ <tree arch="ppc64le"> -+ <treeinfo> -+ <family>Red Hat Enterprise Linux</family> -+ <version>^8.7(.([0-9]|[1-9][0-9]))?$</version> -+ <arch>ppc64le</arch> -+ </treeinfo> -+ </tree> -+ <tree arch="s390x"> -+ <treeinfo> -+ <family>Red Hat Enterprise Linux</family> -+ <version>^8.7(.([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.7(.([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> -+ <maximum> -+ <n-cpus>768</n-cpus> -+ <ram>35184372088832</ram> -+ </maximum> -+ </resources> -+ <resources arch="x86_64"> -+ <minimum> -+ <cpu>1000000000</cpu> -+ <ram>1610612736</ram> -+ <storage>10737418240</storage> -+ </minimum> -+ <recommended> -+ <cpu>1000000000</cpu> -+ <ram>1610612736</ram> -+ <storage>21474836480</storage> -+ </recommended> -+ <maximum> -+ <n-cpus>768</n-cpus> -+ <ram>26388279066624</ram> -+ </maximum> -+ <network-install> -+ <ram>3221225472</ram> -+ </network-install> -+ </resources> -+ <resources arch="s390x"> -+ <minimum> -+ <ram>1073741824</ram> -+ <storage>10737418240</storage> -+ </minimum> -+ <recommended> -+ <storage>21474836480</storage> -+ </recommended> -+ <maximum> -+ <n-cpus>340</n-cpus> -+ <ram>17592186044416</ram> -+ </maximum> -+ <network-install> -+ <ram>2147483648</ram> -+ </network-install> -+ </resources> -+ <resources arch="aarch64"> -+ <minimum> -+ <ram>2147483648</ram> -+ <storage>10737418240</storage> -+ </minimum> -+ <recommended> -+ <storage>21474836480</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>10737418240</storage> -+ </minimum> -+ <recommended> -+ <cpu>1000000000</cpu> -+ <ram>1610612736</ram> -+ <storage>21474836480</storage> -+ </recommended> -+ </resources> -+ <installer> -+ <script id="http://redhat.com/rhel/kickstart/jeos"/> -+ <script id="http://redhat.com/rhel/kickstart/desktop"/> -+ </installer> -+ </os> -+</libosinfo> --- -2.37.1 - diff --git a/SOURCES/0002-rhel-Add-RHEL-9.1-prerelease.patch b/SOURCES/0002-rhel-Add-RHEL-9.1-prerelease.patch deleted file mode 100644 index 385b077..0000000 --- a/SOURCES/0002-rhel-Add-RHEL-9.1-prerelease.patch +++ /dev/null @@ -1,267 +0,0 @@ -From d2257154ae08fe8ffb44a50350bc940cb01538a1 Mon Sep 17 00:00:00 2001 -From: Victor Toso <victortoso@redhat.com> -Date: Tue, 2 Aug 2022 15:27:53 +0200 -Subject: [PATCH 2/2] rhel: Add RHEL 9.1 (prerelease) -Content-type: text/plain - -Release is planned for November. - -Signed-off-by: Victor Toso <victortoso@redhat.com> ---- - os/redhat.com/rhel-9-unknown.xml | 20 ++-- - os/redhat.com/rhel-9.1.xml | 169 +++++++++++++++++++++++++++++++ - 2 files changed, 179 insertions(+), 10 deletions(-) - create mode 100644 os/redhat.com/rhel-9.1.xml - -diff --git a/os/redhat.com/rhel-9-unknown.xml b/os/redhat.com/rhel-9-unknown.xml -index 7940a23..4caff12 100644 ---- a/os/redhat.com/rhel-9-unknown.xml -+++ b/os/redhat.com/rhel-9-unknown.xml -@@ -32,59 +32,59 @@ - <family>linux</family> - <distro>rhel</distro> - <codename>Plow</codename> -- <upgrades id="http://redhat.com/rhel/9.0"/> -- <derives-from id="http://redhat.com/rhel/9.0"/> -+ <upgrades id="http://redhat.com/rhel/9.1"/> -+ <derives-from id="http://redhat.com/rhel/9.1"/> - <media arch="x86_64"> - <iso> -- <volume-id>.*RHEL-9-([1-9]|[1-9][0-9])(-[0-9]|[1-9][0-9])?.*x86_64.*</volume-id> -+ <volume-id>.*RHEL-9-([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> - </media> - <media arch="aarch64"> - <iso> -- <volume-id>RHEL-9-([1-9]|[1-9][0-9])(-[0-9]|[1-9][0-9])?.*aarch64$</volume-id> -+ <volume-id>RHEL-9-([2-9]|[1-9][0-9])(-[0-9]|[1-9][0-9])?.*aarch64$</volume-id> - </iso> - <kernel>images/pxeboot/vmlinuz</kernel> - <initrd>images/pxeboot/initrd.img</initrd> - </media> - <media arch="ppc64le"> - <iso> -- <volume-id>RHEL[_-]9[_-]([1-9]|[1-9][0-9])([_-]([0-9]|[1-9][0-9]))?.*ppc64le$</volume-id> -+ <volume-id>RHEL[_-]9[_-]([2-9]|[1-9][0-9])([_-]([0-9]|[1-9][0-9]))?.*ppc64le$</volume-id> - </iso> - <kernel>ppc/ppc64/vmlinuz</kernel> - <initrd>ppc/ppc64/initrd.img</initrd> - </media> - <media arch="s390x"> - <iso> -- <volume-id>RHEL-9-([1-9]|[1-9][0-9])(-[0-9]|[1-9][0-9])?.*s390x$</volume-id> -+ <volume-id>RHEL-9-([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>^9.([1-9]|[1-9][0-9])(-[0-9]|[1-9][0-9])?$</version> -+ <version>^9.([2-9]|[1-9][0-9])(-[0-9]|[1-9][0-9])?$</version> - <arch>aarch64</arch> - </treeinfo> - </tree> - <tree arch="ppc64le"> - <treeinfo> - <family>Red Hat Enterprise Linux</family> -- <version>^9.([1-9]|[1-9][0-9])(.([0-9]|[1-9][0-9]))?$</version> -+ <version>^9.([2-9]|[1-9][0-9])(.([0-9]|[1-9][0-9]))?$</version> - <arch>ppc64le</arch> - </treeinfo> - </tree> - <tree arch="s390x"> - <treeinfo> - <family>Red Hat Enterprise Linux</family> -- <version>^9.([1-9]|[1-9][0-9])(.([0-9]|[1-9][0-9]))?$</version> -+ <version>^9.([2-9]|[1-9][0-9])(.([0-9]|[1-9][0-9]))?$</version> - <arch>s390x</arch> - </treeinfo> - </tree> - <tree arch="x86_64"> - <treeinfo> - <family>Red Hat Enterprise Linux</family> -- <version>^9.([1-9]|[1-9][0-9])(.([0-9]|[1-9][0-9]))?$</version> -+ <version>^9.([2-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-9.1.xml b/os/redhat.com/rhel-9.1.xml -new file mode 100644 -index 0000000..78ce34a ---- /dev/null -+++ b/os/redhat.com/rhel-9.1.xml -@@ -0,0 +1,169 @@ -+<?xml version="1.0"?> -+<libosinfo version="0.0.1"> -+ <!-- Licensed under the GNU General Public License version 2 or later. -+ See http://www.gnu.org/licenses/ for a copy of the license text --> -+ <os id="http://redhat.com/rhel/9.1"> -+ <short-id>rhel9.1</short-id> -+ <name>Red Hat Enterprise Linux 9.1</name> -+ <version>9.1</version> -+ <vendor>Red Hat, Inc</vendor> -+ <vendor xml:lang="ka">Red Hat, Inc</vendor> -+ <vendor xml:lang="ko">Red Hat, Inc</vendor> -+ <vendor xml:lang="fi">Red Hat, Inc</vendor> -+ <vendor xml:lang="uk">Red Hat, Inc</vendor> -+ <vendor xml:lang="tr">Red Hat, Inc</vendor> -+ <vendor xml:lang="pt_BR">Red Hat, Inc</vendor> -+ <vendor xml:lang="pl">Red Hat, Inc</vendor> -+ <vendor xml:lang="ja">Red Hat, Inc</vendor> -+ <vendor xml:lang="it">Red Hat, Inc</vendor> -+ <vendor xml:lang="id">Red Hat, Inc</vendor> -+ <vendor xml:lang="fr">Red Hat, Inc</vendor> -+ <vendor xml:lang="es">Red Hat, Inc</vendor> -+ <vendor xml:lang="de">Red Hat, Inc</vendor> -+ <vendor xml:lang="ca">Red Hat, Inc</vendor> -+ <family>linux</family> -+ <distro>rhel</distro> -+ <codename>Plow</codename> -+ <upgrades id="http://redhat.com/rhel/9.0"/> -+ <derives-from id="http://redhat.com/rhel/9.0"/> -+ <release-status>prerelease</release-status> -+ <!-- RHEL 9.1 entries have to cope both with 9.1 and 9.1.x regexes for -+ medias' volume-id and trees' version --> -+ <media arch="x86_64"> -+ <iso> -+ <volume-id>RHEL-9-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> -+ <volume-id>RHEL[_-]9[_-]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> -+ <volume-id>RHEL-9-1-(([0-9]|[1-9][0-9])-)?BaseOS-aarch64</volume-id> -+ </iso> -+ <kernel>images/pxeboot/vmlinuz</kernel> -+ <initrd>images/pxeboot/initrd.img</initrd> -+ </media> -+ <media arch="s390x"> -+ <iso> -+ <volume-id>RHEL-9-1-(([0-9]|[1-9][0-9])-)?BaseOS-s390x</volume-id> -+ </iso> -+ </media> -+ <tree arch="aarch64"> -+ <treeinfo> -+ <family>Red Hat Enterprise Linux</family> -+ <version>^9.1(.([0-9]|[1-9][0-9]))?$</version> -+ <arch>aarch64</arch> -+ </treeinfo> -+ </tree> -+ <tree arch="ppc64le"> -+ <treeinfo> -+ <family>Red Hat Enterprise Linux</family> -+ <version>^9.1(.([0-9]|[1-9][0-9]))?$</version> -+ <arch>ppc64le</arch> -+ </treeinfo> -+ </tree> -+ <tree arch="s390x"> -+ <treeinfo> -+ <family>Red Hat Enterprise Linux</family> -+ <version>^9.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>^9.1(.([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> -+ <maximum> -+ <n-cpus>768</n-cpus> -+ <ram>35184372088832</ram> -+ </maximum> -+ </resources> -+ <resources arch="x86_64"> -+ <minimum> -+ <cpu>1000000000</cpu> -+ <ram>1610612736</ram> -+ <storage>10737418240</storage> -+ </minimum> -+ <recommended> -+ <cpu>1000000000</cpu> -+ <ram>1610612736</ram> -+ <storage>21474836480</storage> -+ </recommended> -+ <maximum> -+ <n-cpus>768</n-cpus> -+ <ram>26388279066624</ram> -+ </maximum> -+ <network-install> -+ <ram>3221225472</ram> -+ </network-install> -+ </resources> -+ <resources arch="s390x"> -+ <minimum> -+ <ram>1073741824</ram> -+ <storage>10737418240</storage> -+ </minimum> -+ <recommended> -+ <storage>21474836480</storage> -+ </recommended> -+ <maximum> -+ <n-cpus>340</n-cpus> -+ <ram>17592186044416</ram> -+ </maximum> -+ <network-install> -+ <ram>2147483648</ram> -+ </network-install> -+ </resources> -+ <resources arch="aarch64"> -+ <minimum> -+ <ram>2147483648</ram> -+ <storage>10737418240</storage> -+ </minimum> -+ <recommended> -+ <storage>21474836480</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>10737418240</storage> -+ </minimum> -+ <recommended> -+ <cpu>1000000000</cpu> -+ <ram>1610612736</ram> -+ <storage>21474836480</storage> -+ </recommended> -+ </resources> -+ <installer> -+ <script id="http://redhat.com/rhel/kickstart/jeos"/> -+ <script id="http://redhat.com/rhel/kickstart/desktop"/> -+ </installer> -+ </os> -+</libosinfo> --- -2.37.1 - diff --git a/SOURCES/osinfo-db-20220727.tar.xz.asc b/SOURCES/osinfo-db-20220727.tar.xz.asc deleted file mode 100644 index f42d513..0000000 --- a/SOURCES/osinfo-db-20220727.tar.xz.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCAAdFiEEIG07NS9WbzsOZXLpl9kSPeN6SE8FAmLhP4UACgkQl9kSPeN6 -SE/5KhAAkUX+43HdTbCNMIyRBYEM+3H0NlTB7k1JJQlphD4QmejDKhQNIKeboB4V -MY+UGjPmuki9TbIeRWs2WKEu1+XXle4MzIWfeupAsEV+oJmJPzUQtRe2RPe2kIW9 -j1HbR8LTOvBS1x0LJsY0zTZJeiWcNbUm/xJpB5Pke7V3eJMw+RljAhNYi8WAtYds -GLh8ZzOxvvBWCFs8fU48ftFx4Apk7nWu0xMqQr2fTm7i02sS8q5f+MkazOUoTkfp -aGEqsUcQpGUMn6La+BfclMSgN9ZIPqfV3mAJSUG8nk78nYWimsjyJCu7sdwxuXm0 -2ToyDirnKTGe+zfIY+Ro8sYEMCHIFyDdpkqY5TaDyFaRuvi67UQ9caj13FcjZZr0 -Y2irtsBovdWtXj17RCDAXFIymptEZtqLhMuA47Y33OEVViX1k0Sjb4u5RLdekBIU -/yu1FESwHXShAPNcnJbCw/bNueYcp0Nk/v84W5KmRYvlKIslIhtCyRmrjrVXLB6i -zjheDaI3W7xDdjv28mt2TF2BrfQO2aodylECSLPnj8D+d8pQchgP633cIMyCqp50 -bM4AlwSD6rGSDh6oieyaJvn+BWS70GjPfOsnFHBNfv5tDbUuKfcDQvkHRCe7UEj3 -dsBL6TokSoRQLULEa3TFi1JEN51Guigi3+SO+d4MTYCtnpgekGo= -=uveg ------END PGP SIGNATURE----- diff --git a/SOURCES/osinfo-db-20221130.tar.xz.asc b/SOURCES/osinfo-db-20221130.tar.xz.asc new file mode 100644 index 0000000..dc123d3 --- /dev/null +++ b/SOURCES/osinfo-db-20221130.tar.xz.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCAAdFiEEIG07NS9WbzsOZXLpl9kSPeN6SE8FAmOHMNQACgkQl9kSPeN6 +SE9V/A/5AZ8TsHOX68X2BAwt6O6LieWQmzBn6PVqeGSdvaahfzyBjRZ4zPCLtkzB +Js9JARw3twe8gckRotCFJLVb6gC4cJRC0tXYroLJBXDLz4ySThXaEBRIN9voL1Z2 +IzC5NN/pry8+iV912e5pShPzjuhHI95nu/DSottsgQNHIW2t0UNkZbLhSbvzz+XD +BiPo/ivdYO4wN4yoNCDs+uQD+icoZULBB7Re8l4wRyoSh0p9eYo8h+iaL340e/dv +0DKIsHTSvCmC7a6LgovYK9GlTk4H5CnzmfXyEYtO5HhTguST7jRh/ah6Vngpyrs1 +4sZHYGfnePSit6/IJB8mdBtZ8F8I8I6/mihYnEeCSCdFZAFGl0k7hjjzULuB/lU7 +GjFYjwpEMeT5bICDnVxYVEX8Lvd6f1hs2ByIqTh4o418BVDtDgy2by3SzmVMaBST +xqIodAbrMH24EX2tQrwNS38UX/CwrWcIwYqpLzIa7iKpm9lqzXMBpICDOCdsOpqe +xVhxH/ORNSYSIqVuP4FQu9uO//EouIaaBXcSGZGqe2zQXHEBRtvM+Mq0mkAMsQ+q +LmiUXP39Cp46QMYg6fl1XNZjdAc70co/NENVViEv/cOwVV3P6kfVJzFfPbnkvNjK +hES62WQ+p2ZldWhAdotjys8KN23KvDE06aPnXUyqduXyg71fusg= +=DW/D +-----END PGP SIGNATURE----- diff --git a/SPECS/osinfo-db.spec b/SPECS/osinfo-db.spec index 65d06c4..562e78d 100644 --- a/SPECS/osinfo-db.spec +++ b/SPECS/osinfo-db.spec @@ -5,14 +5,13 @@ Summary: osinfo database files Name: osinfo-db -Version: 20220727 -Release: 3%{?dist} +Version: 20221130 +Release: 1%{?dist} 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 URL: http://libosinfo.org/ -Patch0001: 0001-rhel-Add-RHEL-8.7-prerelease.patch -Patch0002: 0002-rhel-Add-RHEL-9.1-prerelease.patch +Patch0001: 0001-Add-prereleases-rhel-8.8-and-rhel-9.2.patch BuildRequires: intltool BuildRequires: git-core BuildRequires: osinfo-db-tools @@ -50,9 +49,11 @@ find %{buildroot}/%{_datadir}/osinfo/os/microsoft.com/ -name "win-*.d" -type d - %{_datadir}/osinfo/schema %changelog -* Wed Aug 03 2022 Victor Toso <victortoso@redhat.com> - 20220727-3 -- Fixes previous build not using the patched database - Resolves: rhbz#2112406 +* Wed Nov 30 2022 Victor Toso <victortoso@redhat.com> - 20221130-1 +- Update for new release (v20221130) + Resolves: rhbz#2135751 +- Add rhel-8.8 and rhel-9.2 prereleases + Related: rhbz#2135751 * Tue Aug 02 2022 Victor Toso <victortoso@redhat.com> - 20220727-2 - Add prereleases: rhel-8.7 and rhel-9.1