From dba9bae09f0f04aa00418092d5ae6c4a41f981bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= Date: Tue, 19 Mar 2019 11:16:03 +0100 Subject: [PATCH 2/2] rhel: Adjust 8.0/8-unknown regex MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit By doing this, 8.0.x can also be matched as 8.0. Signed-off-by: Fabiano Fidêncio --- os/redhat.com/rhel-8-unknown.xml | 16 ++++++++-------- os/redhat.com/rhel-8.0.xml | 20 ++++++++++---------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/os/redhat.com/rhel-8-unknown.xml b/os/redhat.com/rhel-8-unknown.xml index 5026cd2..226a018 100644 --- a/os/redhat.com/rhel-8-unknown.xml +++ b/os/redhat.com/rhel-8-unknown.xml @@ -25,7 +25,7 @@ LINUX - .*RHEL-8-(([1-9]|[1-9][0-9])|(([0-9]|[1-9][0-9])-([0-9]|[1-9][0-9]))).*x86_64.* + .*RHEL-8-([1-9]|[1-9][0-9])(-[0-9]|[1-9][0-9])?.*x86_64.* isolinux/vmlinuz isolinux/initrd.img @@ -34,28 +34,28 @@ LINUX - RHEL-8-(([1-9]|[1-9][0-9])|(([0-9]|[1-9][0-9])-([0-9]|[1-9][0-9]))).*aarch64$ + RHEL-8-([1-9]|[1-9][0-9])(-[0-9]|[1-9][0-9])?.*aarch64$ PPC - RHEL[_-]8[_-](([1-9]|[1-9][0-9])|(([0-9]|[1-9][0-9])[_-]([0-9]|[1-9][0-9]))).*ppc64le$ + RHEL[_-]8[_-]([1-9]|[1-9][0-9])([_-]([0-9]|[1-9][0-9]))?.*ppc64le$ LINUX - RHEL-8-(([1-9]|[1-9][0-9])|(([0-9]|[1-9][0-9])-([0-9]|[1-9][0-9]))).*s390x$ + RHEL-8-([1-9]|[1-9][0-9])(-[0-9]|[1-9][0-9])?.*s390x$ Red Hat Enterprise Linux - ^8.(([1-9]|[1-9][0-9])|(([0-9]|[1-9][0-9]).([0-9]|[1-9][0-9])))$ + ^8.([1-9]|[1-9][0-9])(-[0-9]|[1-9][0-9])?$ aarch64 @@ -63,7 +63,7 @@ Red Hat Enterprise Linux - ^8.(([1-9]|[1-9][0-9])|(([0-9]|[1-9][0-9]).([0-9]|[1-9][0-9])))$ + ^8.([1-9]|[1-9][0-9])(.([0-9]|[1-9][0-9]))?$ ppc64le @@ -71,7 +71,7 @@ Red Hat Enterprise Linux - ^8.(([1-9]|[1-9][0-9])|(([0-9]|[1-9][0-9]).([0-9]|[1-9][0-9])))$ + ^8.([1-9]|[1-9][0-9])(.([0-9]|[1-9][0-9]))?$ s390x @@ -79,7 +79,7 @@ Red Hat Enterprise Linux - ^8.(([1-9]|[1-9][0-9])|(([0-9]|[1-9][0-9]).([0-9]|[1-9][0-9])))$ + ^8.([1-9]|[1-9][0-9])(.([0-9]|[1-9][0-9]))?$ x86_64 diff --git a/os/redhat.com/rhel-8.0.xml b/os/redhat.com/rhel-8.0.xml index 3db4aff..20e80d0 100644 --- a/os/redhat.com/rhel-8.0.xml +++ b/os/redhat.com/rhel-8.0.xml @@ -49,7 +49,7 @@ LINUX - RHEL-8-0-BaseOS-x86_64 + RHEL-8-0-(([0-9]|[1-9][0-9])-)?BaseOS-x86_64 isolinux/vmlinuz isolinux/initrd.img @@ -58,7 +58,7 @@ PPC - RHEL[_-]8[_-]0[_-]BaseOS[_-]ppc64le + RHEL[_-]8[_-]0[_-](([0-9]|[1-9][0-9])[_-])?BaseOS[_-]ppc64le ppc/ppc64/vmlinuz ppc/ppc64/initrd.img @@ -67,21 +67,21 @@ LINUX - RHEL-8-0-BaseOS-aarch64 + RHEL-8-0-(([0-9]|[1-9][0-9])-)?BaseOS-aarch64 LINUX - RHEL-8-0-BaseOS-s390x + RHEL-8-0-(([0-9]|[1-9][0-9])-)?BaseOS-s390x Red Hat Enterprise Linux - 8.0$ + ^8.0(.([0-9]|[1-9][0-9]))?$ aarch64 @@ -89,7 +89,7 @@ Red Hat Enterprise Linux - ^8.0$ + ^8.0(.([0-9]|[1-9][0-9]))?$ ppc64le @@ -97,7 +97,7 @@ Red Hat Enterprise Linux - ^8.0$ + ^8.0(.([0-9]|[1-9][0-9]))?$ s390x @@ -105,7 +105,7 @@ Red Hat Enterprise Linux - ^8.0$ + ^8.0(.([0-9]|[1-9][0-9]))?$ x86_64 @@ -113,7 +113,7 @@ Red Hat Enterprise Linux - ^8.0$ + ^8.0(.([0-9]|[1-9][0-9]))?$ aarch64 @@ -148,4 +148,4 @@ - \ No newline at end of file + -- 2.20.1