diff --git a/.gitignore b/.gitignore index 9f97fd8..e7a945c 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/osinfo-db-20200804.tar.xz +SOURCES/osinfo-db-20200813.tar.xz diff --git a/.osinfo-db.metadata b/.osinfo-db.metadata index cd71895..8506a0a 100644 --- a/.osinfo-db.metadata +++ b/.osinfo-db.metadata @@ -1 +1 @@ -17303d28e1aaefc37e71920a69e1872a37319869 SOURCES/osinfo-db-20200804.tar.xz +be3815c0c09ce4009ee8c927cfffc290311cbea9 SOURCES/osinfo-db-20200813.tar.xz diff --git a/SOURCES/0001-rhel-Add-8.3-entry.patch b/SOURCES/0001-rhel-Add-8.3-entry.patch deleted file mode 100644 index 2e7c867..0000000 --- a/SOURCES/0001-rhel-Add-8.3-entry.patch +++ /dev/null @@ -1,263 +0,0 @@ -From 6bf4cdcf52a55263c6d6f2ea63873fd497fc5b54 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= -Date: Tue, 4 Aug 2020 23:29:53 +0200 -Subject: [PATCH] rhel: Add 8.3 entry -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Signed-off-by: Fabiano FidĂȘncio ---- - os/redhat.com/rhel-8-unknown.xml | 20 ++-- - os/redhat.com/rhel-8.3.xml | 165 +++++++++++++++++++++++++++++++ - 2 files changed, 175 insertions(+), 10 deletions(-) - create mode 100644 os/redhat.com/rhel-8.3.xml - -diff --git a/os/redhat.com/rhel-8-unknown.xml b/os/redhat.com/rhel-8-unknown.xml -index b7f0ba2..dc9941d 100644 ---- a/os/redhat.com/rhel-8-unknown.xml -+++ b/os/redhat.com/rhel-8-unknown.xml -@@ -28,12 +28,12 @@ - linux - rhel - Ootpa -- -- -+ -+ - - - LINUX -- .*RHEL-8-([3-9]|[1-9][0-9])(-[0-9]|[1-9][0-9])?.*x86_64.* -+ .*RHEL-8-([4-9]|[1-9][0-9])(-[0-9]|[1-9][0-9])?.*x86_64.* - - isolinux/vmlinuz - isolinux/initrd.img -@@ -41,46 +41,46 @@ - - - LINUX -- RHEL-8-([3-9]|[1-9][0-9])(-[0-9]|[1-9][0-9])?.*aarch64$ -+ RHEL-8-([4-9]|[1-9][0-9])(-[0-9]|[1-9][0-9])?.*aarch64$ - - - - - PPC -- RHEL[_-]8[_-]([3-9]|[1-9][0-9])([_-]([0-9]|[1-9][0-9]))?.*ppc64le$ -+ RHEL[_-]8[_-]([4-9]|[1-9][0-9])([_-]([0-9]|[1-9][0-9]))?.*ppc64le$ - - - - - LINUX -- RHEL-8-([3-9]|[1-9][0-9])(-[0-9]|[1-9][0-9])?.*s390x$ -+ RHEL-8-([4-9]|[1-9][0-9])(-[0-9]|[1-9][0-9])?.*s390x$ - - - - - Red Hat Enterprise Linux -- ^8.([3-9]|[1-9][0-9])(-[0-9]|[1-9][0-9])?$ -+ ^8.([4-9]|[1-9][0-9])(-[0-9]|[1-9][0-9])?$ - aarch64 - - - - - Red Hat Enterprise Linux -- ^8.([3-9]|[1-9][0-9])(.([0-9]|[1-9][0-9]))?$ -+ ^8.([4-9]|[1-9][0-9])(.([0-9]|[1-9][0-9]))?$ - ppc64le - - - - - Red Hat Enterprise Linux -- ^8.([3-9]|[1-9][0-9])(.([0-9]|[1-9][0-9]))?$ -+ ^8.([4-9]|[1-9][0-9])(.([0-9]|[1-9][0-9]))?$ - s390x - - - - - Red Hat Enterprise Linux -- ^8.([3-9]|[1-9][0-9])(.([0-9]|[1-9][0-9]))?$ -+ ^8.([4-9]|[1-9][0-9])(.([0-9]|[1-9][0-9]))?$ - x86_64 - - -diff --git a/os/redhat.com/rhel-8.3.xml b/os/redhat.com/rhel-8.3.xml -new file mode 100644 -index 0000000..b0ed3fe ---- /dev/null -+++ b/os/redhat.com/rhel-8.3.xml -@@ -0,0 +1,165 @@ -+ -+ -+ -+ -+ rhel8.3 -+ Red Hat Enterprise Linux 8.3 -+ 8.3 -+ 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 -+ -+ -+ -+ -+ LINUX -+ RHEL-8-3-(([0-9]|[1-9][0-9])-)?BaseOS-x86_64 -+ -+ isolinux/vmlinuz -+ isolinux/initrd.img -+ -+ -+ -+ PPC -+ RHEL[_-]8[_-]3[_-](([0-9]|[1-9][0-9])[_-])?BaseOS[_-]ppc64le -+ -+ ppc/ppc64/vmlinuz -+ ppc/ppc64/initrd.img -+ -+ -+ -+ LINUX -+ RHEL-8-3-(([0-9]|[1-9][0-9])-)?BaseOS-aarch64 -+ -+ -+ -+ -+ LINUX -+ RHEL-8-3-(([0-9]|[1-9][0-9])-)?BaseOS-s390x -+ -+ -+ -+ -+ Red Hat Enterprise Linux -+ ^8.3(.([0-9]|[1-9][0-9]))?$ -+ aarch64 -+ -+ -+ -+ -+ Red Hat Enterprise Linux -+ ^8.3(.([0-9]|[1-9][0-9]))?$ -+ ppc64le -+ -+ -+ -+ -+ Red Hat Enterprise Linux -+ ^8.3(.([0-9]|[1-9][0-9]))?$ -+ s390x -+ -+ -+ -+ -+ Red Hat Enterprise Linux -+ ^8.3(.([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 -+ -+ -+ -+