diff --git a/.gitignore b/.gitignore index 171935d..9f97fd8 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/osinfo-db-20200529.tar.xz +SOURCES/osinfo-db-20200804.tar.xz diff --git a/.osinfo-db.metadata b/.osinfo-db.metadata index 9449b4e..cd71895 100644 --- a/.osinfo-db.metadata +++ b/.osinfo-db.metadata @@ -1 +1 @@ -f35431aa1f569927c689d3d827cdd385062d3246 SOURCES/osinfo-db-20200529.tar.xz +17303d28e1aaefc37e71920a69e1872a37319869 SOURCES/osinfo-db-20200804.tar.xz diff --git a/SOURCES/0001-rhel-Add-8.3-entry.patch b/SOURCES/0001-rhel-Add-8.3-entry.patch index 1d4a66e..2e7c867 100644 --- a/SOURCES/0001-rhel-Add-8.3-entry.patch +++ b/SOURCES/0001-rhel-Add-8.3-entry.patch @@ -1,20 +1,23 @@ -From d01d95487589da131e125c7af251ec193b80c707 Mon Sep 17 00:00:00 2001 -From: rpm-build -Date: Sun, 31 May 2020 14:20:28 +0100 +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: rpm-build +Signed-off-by: Fabiano Fidêncio --- - os/redhat.com/rhel-8-unknown.xml | 20 ++--- - os/redhat.com/rhel-8.3.xml | 134 +++++++++++++++++++++++++++++++ - 2 files changed, 144 insertions(+), 10 deletions(-) + 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 66afe5a..8094635 100644 +index b7f0ba2..dc9941d 100644 --- a/os/redhat.com/rhel-8-unknown.xml +++ b/os/redhat.com/rhel-8-unknown.xml -@@ -25,13 +25,13 @@ +@@ -28,12 +28,12 @@ linux rhel Ootpa @@ -22,7 +25,6 @@ index 66afe5a..8094635 100644 - + + - LINUX @@ -31,31 +33,28 @@ index 66afe5a..8094635 100644 isolinux/vmlinuz isolinux/initrd.img -@@ -40,28 +40,28 @@ +@@ -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$ - - - + + 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$ - - - + + 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$ - - - + + 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 @@ -64,7 +63,6 @@ index 66afe5a..8094635 100644 aarch64 -@@ -69,7 +69,7 @@ Red Hat Enterprise Linux @@ -73,7 +71,6 @@ index 66afe5a..8094635 100644 ppc64le -@@ -77,7 +77,7 @@ Red Hat Enterprise Linux @@ -82,7 +79,6 @@ index 66afe5a..8094635 100644 s390x -@@ -85,7 +85,7 @@ Red Hat Enterprise Linux @@ -93,36 +89,35 @@ index 66afe5a..8094635 100644 diff --git a/os/redhat.com/rhel-8.3.xml b/os/redhat.com/rhel-8.3.xml new file mode 100644 -index 0000000..6427990 +index 0000000..b0ed3fe --- /dev/null +++ b/os/redhat.com/rhel-8.3.xml -@@ -0,0 +1,134 @@ -+ +@@ -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 ++ 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 + + -+ -+ 2020-11-03 -+ + + + LINUX @@ -131,7 +126,6 @@ index 0000000..6427990 + isolinux/vmlinuz + isolinux/initrd.img + -+ + + + PPC @@ -140,21 +134,18 @@ index 0000000..6427990 + 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 @@ -162,7 +153,6 @@ index 0000000..6427990 + aarch64 + + -+ + + + Red Hat Enterprise Linux @@ -170,7 +160,6 @@ index 0000000..6427990 + ppc64le + + -+ + + + Red Hat Enterprise Linux @@ -178,7 +167,6 @@ index 0000000..6427990 + s390x + + -+ + + + Red Hat Enterprise Linux @@ -186,7 +174,6 @@ index 0000000..6427990 + x86_64 + + -+ + + + 1 @@ -194,44 +181,83 @@ index 0000000..6427990 + 2147483648 + 10737418240 + -+ + + 4000000000 + 2147483648 + 21474836480 + ++ ++ 768 ++ 35184372088832 ++ + -+ -+ ++ + -+ 1 + 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 ++ ++ + -+