diff --git a/.gitignore b/.gitignore index 86daa0b..171935d 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/osinfo-db-20200203.tar.xz +SOURCES/osinfo-db-20200529.tar.xz diff --git a/.osinfo-db.metadata b/.osinfo-db.metadata index 58681f2..9449b4e 100644 --- a/.osinfo-db.metadata +++ b/.osinfo-db.metadata @@ -1 +1 @@ -07a02df203465ea2c8c64aa989d9552415c6e853 SOURCES/osinfo-db-20200203.tar.xz +f35431aa1f569927c689d3d827cdd385062d3246 SOURCES/osinfo-db-20200529.tar.xz diff --git a/SOURCES/0001-rhel-Add-7.8-entry.patch b/SOURCES/0001-rhel-Add-7.8-entry.patch deleted file mode 100644 index e7b4e56..0000000 --- a/SOURCES/0001-rhel-Add-7.8-entry.patch +++ /dev/null @@ -1,265 +0,0 @@ -From 0db41559bbf1a7ed0985e423f0effddbadb28375 Mon Sep 17 00:00:00 2001 -From: rpm-build -Date: Tue, 10 Dec 2019 10:12:55 +0100 -Subject: [PATCH] rhel: Add 7.8 entry - -Signed-off-by: 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 @@ - linux - rhel - Maipo -- -- -+ -+ - - - - LINUX -- .*RHEL-7.([89]|[1-9][0-9]).*x86_64.* -+ .*RHEL-7.(9|[1-9][0-9]).*x86_64.* - - isolinux/vmlinuz - isolinux/initrd.img -@@ -34,35 +34,35 @@ - - - LINUX -- RHEL-7.([89]|[1-9][0-9]).*aarch64$ -+ RHEL-7.(9|[1-9][0-9]).*aarch64$ - - - - - - PPC -- RHEL[-_]7.([89]|[1-9][0-9]).*ppc64$ -+ RHEL[-_]7.(9|[1-9][0-9]).*ppc64$ - - - - - - PPC -- RHEL[-_]7.([89]|[1-9][0-9]).*ppc64le$ -+ RHEL[-_]7.(9|[1-9][0-9]).*ppc64le$ - - - - - - LINUX -- RHEL-7.([89]|[1-9][0-9]).*s390x$ -+ RHEL-7.(9|[1-9][0-9]).*s390x$ - - - - - - Red Hat Enterprise Linux -- ^7.([89]|[1-9][0-9])$ -+ ^7.(9|[1-9][0-9])$ - ppc64 - - -@@ -70,7 +70,7 @@ - - - Red Hat Enterprise Linux -- ^7.([89]|[1-9][0-9])$ -+ ^7.(9|[1-9][0-9])$ - ppc64le - - -@@ -78,7 +78,7 @@ - - - Red Hat Enterprise Linux -- ^7.([89]|[1-9][0-9])$ -+ ^7.(9|[1-9][0-9])$ - s390x - - -@@ -86,7 +86,7 @@ - - - Red Hat Enterprise Linux -- ^7.([89]|[1-9][0-9])$ -+ ^7.(9|[1-9][0-9])$ - x86_64 - - -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 @@ -+ -+ -+ -+ -+ rhel7.8 -+ Red Hat Enterprise Linux 7.8 -+ 7.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 -+ linux -+ rhel -+ Maipo -+ -+ -+ -+ 2020-03-31 -+ -+ -+ -+ LINUX -+ .*RHEL-7.8.*x86_64.* -+ -+ isolinux/vmlinuz -+ isolinux/initrd.img -+ -+ -+ -+ -+ LINUX -+ RHEL-7.8.*aarch64$ -+ -+ -+ -+ -+ -+ PPC -+ RHEL[-_]7.8.*ppc64$ -+ -+ -+ -+ -+ -+ PPC -+ RHEL[-_]7.8.*ppc64le$ -+ -+ -+ -+ -+ -+ LINUX -+ RHEL-7.8.*s390x$ -+ -+ -+ -+ -+ -+ Red Hat Enterprise Linux$ -+ ^7.8$ -+ ppc64$ -+ -+ -+ -+ -+ -+ Red Hat Enterprise Linux$ -+ ^7.8$ -+ ppc64le -+ -+ -+ -+ -+ -+ Red Hat Enterprise Linux$ -+ ^7.8$ -+ s390x -+ -+ -+ -+ -+ -+ Red Hat Enterprise Linux$ -+ ^7.8$ -+ x86_64 -+ -+ -+ -+ -+ -+ 1 -+ 1000000000 -+ 2147483648 -+ 10737418240 -+ -+ -+ -+ 4000000000 -+ 2147483648 -+ 21474836480 -+ -+ -+ -+ -+ -+ 1 -+ 1000000000 -+ 2147483648 -+ 10737418240 -+ -+ -+ -+ 4000000000 -+ 2147483648 -+ 21474836480 -+ -+ -+ -+ -+ -+ 1 -+ 1000000000 -+ 1073741824 -+ 10737418240 -+ -+ -+ -+ 1000000000 -+ 1073741824 -+ 21474836480 -+ -+ -+ -+ 13194139533312 -+ -+ -+ -+ 1610612736 -+ -+ -+ -+ -+