From a952da1d8276cde37a9bbdd7293e2e257bf30237 Mon Sep 17 00:00:00 2001 From: MSVSphere Packaging Team Date: Wed, 8 Nov 2023 16:20:57 +0300 Subject: [PATCH] import osinfo-db-20230518-1.el9 --- .gitignore | 2 +- .osinfo-db.metadata | 2 +- ...dd-prereleases-rhel-8.8-and-rhel-9.2.patch | 526 ------------------ SOURCES/osinfo-db-20221130.tar.xz.asc | 16 - SOURCES/osinfo-db-20230518.tar.xz.asc | 16 + SPECS/osinfo-db.spec | 18 +- 6 files changed, 25 insertions(+), 555 deletions(-) delete mode 100644 SOURCES/0001-Add-prereleases-rhel-8.8-and-rhel-9.2.patch delete mode 100644 SOURCES/osinfo-db-20221130.tar.xz.asc create mode 100644 SOURCES/osinfo-db-20230518.tar.xz.asc diff --git a/.gitignore b/.gitignore index c03d99c..340937c 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/osinfo-db-20221130.tar.xz +SOURCES/osinfo-db-20230518.tar.xz diff --git a/.osinfo-db.metadata b/.osinfo-db.metadata index 5a59b0b..e55f907 100644 --- a/.osinfo-db.metadata +++ b/.osinfo-db.metadata @@ -1 +1 @@ -616479396f654ac9d8676bed4b07e02f9f093e23 SOURCES/osinfo-db-20221130.tar.xz +3bcd3e87c3f58bf4a62e2c75644c063a82462823 SOURCES/osinfo-db-20230518.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 deleted file mode 100644 index ada6cff..0000000 --- a/SOURCES/0001-Add-prereleases-rhel-8.8-and-rhel-9.2.patch +++ /dev/null @@ -1,526 +0,0 @@ -From aa68a741f6d821042ba9f6cba9b8b25788c02990 Mon Sep 17 00:00:00 2001 -From: 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 ---- - 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 @@ - linux - rhel - Ootpa -- -- -+ -+ - - - LINUX -- .*RHEL-8-([8-9]|[1-9][0-9])(-[0-9]|[1-9][0-9])?.*x86_64.* -+ .*RHEL-8-(9|[1-9][0-9])(-[0-9]|[1-9][0-9])?.*x86_64.* - - isolinux/vmlinuz - isolinux/initrd.img -@@ -47,7 +47,7 @@ - - - LINUX -- RHEL-8-([8-9]|[1-9][0-9])(-[0-9]|[1-9][0-9])?.*aarch64$ -+ RHEL-8-(9|[1-9][0-9])(-[0-9]|[1-9][0-9])?.*aarch64$ - - images/pxeboot/vmlinuz - images/pxeboot/initrd.img -@@ -55,7 +55,7 @@ - - - PPC -- RHEL[_-]8[_-]([8-9]|[1-9][0-9])([_-]([0-9]|[1-9][0-9]))?.*ppc64le$ -+ RHEL[_-]8[_-](9|[1-9][0-9])([_-]([0-9]|[1-9][0-9]))?.*ppc64le$ - - ppc/ppc64/vmlinuz - ppc/ppc64/initrd.img -@@ -63,34 +63,34 @@ - - - LINUX -- RHEL-8-([8-9]|[1-9][0-9])(-[0-9]|[1-9][0-9])?.*s390x$ -+ RHEL-8-(9|[1-9][0-9])(-[0-9]|[1-9][0-9])?.*s390x$ - - - - - Red Hat Enterprise Linux -- ^8.([8-9]|[1-9][0-9])(-[0-9]|[1-9][0-9])?$ -+ ^8.(9|[1-9][0-9])(-[0-9]|[1-9][0-9])?$ - aarch64 - - - - - Red Hat Enterprise Linux -- ^8.([8-9]|[1-9][0-9])(.([0-9]|[1-9][0-9]))?$ -+ ^8.(9|[1-9][0-9])(.([0-9]|[1-9][0-9]))?$ - ppc64le - - - - - Red Hat Enterprise Linux -- ^8.([8-9]|[1-9][0-9])(.([0-9]|[1-9][0-9]))?$ -+ ^8.(9|[1-9][0-9])(.([0-9]|[1-9][0-9]))?$ - s390x - - - - - Red Hat Enterprise Linux -- ^8.([8-9]|[1-9][0-9])(.([0-9]|[1-9][0-9]))?$ -+ ^8.(9|[1-9][0-9])(.([0-9]|[1-9][0-9]))?$ - x86_64 - - -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 @@ -+ -+ -+ -+ -+ rhel8.8 -+ Red Hat Enterprise Linux 8.8 -+ 8.8 -+ Red Hat, Inc -+ Red Hat, Inc -+ Red Hat, Inc -+ Red Hat, Inc -+ Red Hat, Inc -+ Red Hat, Inc -+ Red Hat, Inc -+ Red Hat, Inc -+ Red Hat, Inc -+ Red Hat, Inc -+ Red Hat, Inc -+ Red Hat, Inc -+ Red Hat, Inc -+ Red Hat, Inc -+ Red Hat, Inc -+ linux -+ rhel -+ Ootpa -+ -+ -+ prerelease -+ -+ -+ LINUX -+ RHEL-8-8-(([0-9]|[1-9][0-9])-)?BaseOS-x86_64 -+ -+ isolinux/vmlinuz -+ isolinux/initrd.img -+ -+ -+ -+ PPC -+ RHEL[_-]8[_-]8[_-](([0-9]|[1-9][0-9])[_-])?BaseOS[_-]ppc64le -+ -+ ppc/ppc64/vmlinuz -+ ppc/ppc64/initrd.img -+ -+ -+ -+ LINUX -+ RHEL-8-8-(([0-9]|[1-9][0-9])-)?BaseOS-aarch64 -+ -+ images/pxeboot/vmlinuz -+ images/pxeboot/initrd.img -+ -+ -+ -+ LINUX -+ RHEL-8-8-(([0-9]|[1-9][0-9])-)?BaseOS-s390x -+ -+ -+ -+ -+ Red Hat Enterprise Linux -+ ^8.8(.([0-9]|[1-9][0-9]))?$ -+ aarch64 -+ -+ -+ -+ -+ Red Hat Enterprise Linux -+ ^8.8(.([0-9]|[1-9][0-9]))?$ -+ ppc64le -+ -+ -+ -+ -+ Red Hat Enterprise Linux -+ ^8.8(.([0-9]|[1-9][0-9]))?$ -+ s390x -+ -+ -+ -+ -+ Red Hat Enterprise Linux -+ ^8.8(.([0-9]|[1-9][0-9]))?$ -+ x86_64 -+ -+ -+ -+ -+ 1 -+ 1000000000 -+ 2147483648 -+ 10737418240 -+ -+ -+ 4000000000 -+ 2147483648 -+ 21474836480 -+ -+ -+ 768 -+ 35184372088832 -+ -+ -+ -+ -+ 1000000000 -+ 1610612736 -+ 10737418240 -+ -+ -+ 1000000000 -+ 1610612736 -+ 21474836480 -+ -+ -+ 768 -+ 26388279066624 -+ -+ -+ 3221225472 -+ -+ -+ -+ -+ 1073741824 -+ 10737418240 -+ -+ -+ 21474836480 -+ -+ -+ 340 -+ 17592186044416 -+ -+ -+ 2147483648 -+ -+ -+ -+ -+ 2147483648 -+ 10737418240 -+ -+ -+ 21474836480 -+ -+ -+ 256 -+ 1649267441664 -+ -+ -+ -+ -+ 1 -+ 1000000000 -+ 1610612736 -+ 10737418240 -+ -+ -+ 1000000000 -+ 1610612736 -+ 21474836480 -+ -+ -+ -+