diff --git a/.gitignore b/.gitignore index d834d8f..8d2e5da 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/osinfo-db-20190319.tar.xz +SOURCES/osinfo-db-20190805.tar.xz diff --git a/.osinfo-db.metadata b/.osinfo-db.metadata index 4da2c9f..bd3462e 100644 --- a/.osinfo-db.metadata +++ b/.osinfo-db.metadata @@ -1 +1 @@ -a42677f7ed9b97d7f43e14703bd1ea81db6b1b87 SOURCES/osinfo-db-20190319.tar.xz +43eb1655226be925e82e4d06d4d936988aaecf9a SOURCES/osinfo-db-20190805.tar.xz diff --git a/SOURCES/0001-rhel-7.7-Add-entry.patch b/SOURCES/0001-rhel-7.7-Add-entry.patch new file mode 100644 index 0000000..71251c1 --- /dev/null +++ b/SOURCES/0001-rhel-7.7-Add-entry.patch @@ -0,0 +1,278 @@ +From 0958ad6b66d0dba71f1a1cfcbf3986035f052e84 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= <fidencio@redhat.com> +Date: Mon, 12 Aug 2019 14:42:08 +0200 +Subject: [PATCH] rhel-7.7: Add entry +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Together with this change, also update the rhel-7-unknown entry to match +7.8+. + +Signed-off-by: Fabiano Fidêncio <fidencio@redhat.com> +--- + os/redhat.com/rhel-7-unknown.xml | 24 ++--- + os/redhat.com/rhel-7.7.xml | 154 +++++++++++++++++++++++++++++++ + 2 files changed, 166 insertions(+), 12 deletions(-) + create mode 100644 os/redhat.com/rhel-7.7.xml + +diff --git a/os/redhat.com/rhel-7-unknown.xml b/os/redhat.com/rhel-7-unknown.xml +index 1477a1a..5da2bec 100644 +--- a/os/redhat.com/rhel-7-unknown.xml ++++ b/os/redhat.com/rhel-7-unknown.xml +@@ -19,13 +19,13 @@ + <family>linux</family> + <distro>rhel</distro> + <codename>Maipo</codename> +- <upgrades id="http://redhat.com/rhel/7.6"/> +- <derives-from id="http://redhat.com/rhel/7.6"/> ++ <upgrades id="http://redhat.com/rhel/7.7"/> ++ <derives-from id="http://redhat.com/rhel/7.7"/> + + <media arch="x86_64"> + <iso> + <system-id>LINUX</system-id> +- <volume-id>.*RHEL-7.([7-9]|[1-9][0-9]).*x86_64.*</volume-id> ++ <volume-id>.*RHEL-7.([89]|[1-9][0-9]).*x86_64.*</volume-id> + </iso> + <kernel>isolinux/vmlinuz</kernel> + <initrd>isolinux/initrd.img</initrd> +@@ -34,35 +34,35 @@ + <media arch="aarch64"> + <iso> + <system-id>LINUX</system-id> +- <volume-id>RHEL-7.([7-9]|[1-9][0-9]).*aarch64$</volume-id> ++ <volume-id>RHEL-7.([89]|[1-9][0-9]).*aarch64$</volume-id> + </iso> + </media> + + <media arch="ppc64"> + <iso> + <system-id>PPC</system-id> +- <volume-id>RHEL[-_]7.([7-9]|[1-9][0-9]).*ppc64$</volume-id> ++ <volume-id>RHEL[-_]7.([89]|[1-9][0-9]).*ppc64$</volume-id> + </iso> + </media> + + <media arch="ppc64le"> + <iso> + <system-id>PPC</system-id> +- <volume-id>RHEL[-_]7.([7-9]|[1-9][0-9]).*ppc64le$</volume-id> ++ <volume-id>RHEL[-_]7.([89]|[1-9][0-9]).*ppc64le$</volume-id> + </iso> + </media> + + <media arch="s390x"> + <iso> + <system-id>LINUX</system-id> +- <volume-id>RHEL-7.([7-9]|[1-9][0-9]).*s390x$</volume-id> ++ <volume-id>RHEL-7.([89]|[1-9][0-9]).*s390x$</volume-id> + </iso> + </media> + + <tree arch="ppc64"> + <treeinfo> + <family>Red Hat Enterprise Linux</family> +- <version>^7.([7-9]|[1-9][0-9])$</version> ++ <version>^7.([89]|[1-9][0-9])$</version> + <arch>ppc64</arch> + </treeinfo> + </tree> +@@ -70,7 +70,7 @@ + <tree arch="ppc64le"> + <treeinfo> + <family>Red Hat Enterprise Linux</family> +- <version>^7.([7-9]|[1-9][0-9])$</version> ++ <version>^7.([89]|[1-9][0-9])$</version> + <arch>ppc64le</arch> + </treeinfo> + </tree> +@@ -78,7 +78,7 @@ + <tree arch="s390x"> + <treeinfo> + <family>Red Hat Enterprise Linux</family> +- <version>^7.([7-9]|[1-9][0-9])$</version> ++ <version>^7.([89]|[1-9][0-9])$</version> + <arch>s390x</arch> + </treeinfo> + </tree> +@@ -86,7 +86,7 @@ + <tree arch="x86_64"> + <treeinfo> + <family>Red Hat Enterprise Linux</family> +- <version>^7.([7-9]|[1-9][0-9])$</version> ++ <version>^7.([89]|[1-9][0-9])$</version> + <arch>x86_64</arch> + </treeinfo> + </tree> +@@ -134,4 +134,4 @@ + <script id='http://redhat.com/rhel/kickstart/desktop'/> + </installer> + </os> +-</libosinfo> +\ No newline at end of file ++</libosinfo> +diff --git a/os/redhat.com/rhel-7.7.xml b/os/redhat.com/rhel-7.7.xml +new file mode 100644 +index 0000000..b207574 +--- /dev/null ++++ b/os/redhat.com/rhel-7.7.xml +@@ -0,0 +1,154 @@ ++<?xml version="1.0" encoding="UTF-8"?> ++<libosinfo version="0.0.1"> ++ ++ <os id="http://redhat.com/rhel/7.7"> ++ <short-id>rhel7.7</short-id> ++ <name>Red Hat Enterprise Linux 7.7</name> ++ <version>7.7</version> ++ <vendor>Red Hat, Inc</vendor> ++ <vendor xml:lang="ca">Red Hat, Inc</vendor> ++ <vendor xml:lang="de">Red Hat, Inc</vendor> ++ <vendor xml:lang="es">Red Hat, Inc</vendor> ++ <vendor xml:lang="fr">Red Hat, Inc</vendor> ++ <vendor xml:lang="id">Red Hat, Inc</vendor> ++ <vendor xml:lang="it">Red Hat, Inc</vendor> ++ <vendor xml:lang="ja">Red Hat, Inc</vendor> ++ <vendor xml:lang="pl">Red Hat, Inc</vendor> ++ <vendor xml:lang="pt_BR">Red Hat, Inc</vendor> ++ <vendor xml:lang="uk">Red Hat, Inc</vendor> ++ <family>linux</family> ++ <distro>rhel</distro> ++ <codename>Maipo</codename> ++ <upgrades id="http://redhat.com/rhel/7.6"/> ++ <derives-from id="http://redhat.com/rhel/7.6"/> ++ ++ <release-date>2019-08-06</release-date> ++ ++ <media arch="x86_64"> ++ <iso> ++ <system-id>LINUX</system-id> ++ <volume-id>.*RHEL-7.7.*x86_64.*</volume-id> ++ </iso> ++ <kernel>isolinux/vmlinuz</kernel> ++ <initrd>isolinux/initrd.img</initrd> ++ </media> ++ ++ <media arch="aarch64"> ++ <iso> ++ <system-id>LINUX</system-id> ++ <volume-id>RHEL-7.7.*aarch64$</volume-id> ++ </iso> ++ </media> ++ ++ <media arch="ppc64"> ++ <iso> ++ <system-id>PPC</system-id> ++ <volume-id>RHEL[-_]7.7.*ppc64$</volume-id> ++ </iso> ++ </media> ++ ++ <media arch="ppc64le"> ++ <iso> ++ <system-id>PPC</system-id> ++ <volume-id>RHEL[-_]7.7.*ppc64le$</volume-id> ++ </iso> ++ </media> ++ ++ <media arch="s390x"> ++ <iso> ++ <system-id>LINUX</system-id> ++ <volume-id>RHEL-7.7.*s390x$</volume-id> ++ </iso> ++ </media> ++ ++ <tree arch="ppc64"> ++ <treeinfo> ++ <family>Red Hat Enterprise Linux$</family> ++ <version>^7.7$</version> ++ <arch>ppc64$</arch> ++ </treeinfo> ++ </tree> ++ ++ <tree arch="ppc64le"> ++ <treeinfo> ++ <family>Red Hat Enterprise Linux$</family> ++ <version>^7.7$</version> ++ <arch>ppc64le</arch> ++ </treeinfo> ++ </tree> ++ ++ <tree arch="s390x"> ++ <treeinfo> ++ <family>Red Hat Enterprise Linux$</family> ++ <version>^7.7$</version> ++ <arch>s390x</arch> ++ </treeinfo> ++ </tree> ++ ++ <tree arch="x86_64"> ++ <treeinfo> ++ <family>Red Hat Enterprise Linux$</family> ++ <version>^7.7$</version> ++ <arch>x86_64</arch> ++ </treeinfo> ++ </tree> ++ ++ <resources arch="ppc64"> ++ <minimum> ++ <n-cpus>1</n-cpus> ++ <cpu>1000000000</cpu> ++ <ram>2147483648</ram> ++ <storage>10737418240</storage> ++ </minimum> ++ ++ <recommended> ++ <cpu>4000000000</cpu> ++ <ram>2147483648</ram> ++ <storage>21474836480</storage> ++ </recommended> ++ </resources> ++ ++ <resources arch="ppc64le"> ++ <minimum> ++ <n-cpus>1</n-cpus> ++ <cpu>1000000000</cpu> ++ <ram>2147483648</ram> ++ <storage>10737418240</storage> ++ </minimum> ++ ++ <recommended> ++ <cpu>4000000000</cpu> ++ <ram>2147483648</ram> ++ <storage>21474836480</storage> ++ </recommended> ++ </resources> ++ ++ <resources arch="all"> ++ <minimum> ++ <n-cpus>1</n-cpus> ++ <cpu>1000000000</cpu> ++ <ram>1073741824</ram> ++ <storage>10737418240</storage> ++ </minimum> ++ ++ <recommended> ++ <cpu>1000000000</cpu> ++ <ram>1073741824</ram> ++ <storage>10737418240</storage> ++ </recommended> ++ ++ <maximum> ++ <ram>13194139533312</ram> ++ </maximum> ++ ++ <network-install> ++ <ram>1610612736</ram> ++ </network-install> ++ </resources> ++ ++ <installer> ++ <script id='http://redhat.com/rhel/kickstart/jeos'/> ++ <script id='http://redhat.com/rhel/kickstart/desktop'/> ++ </installer> ++ </os> ++</libosinfo> +\ No newline at end of file +-- +2.21.0 + diff --git a/SOURCES/0001-rhel-Add-rhel-7.7-info.patch b/SOURCES/0001-rhel-Add-rhel-7.7-info.patch deleted file mode 100644 index a9087c2..0000000 --- a/SOURCES/0001-rhel-Add-rhel-7.7-info.patch +++ /dev/null @@ -1,240 +0,0 @@ -From 3a289f212bc3cf71399c18bd5426a0edec05de3b Mon Sep 17 00:00:00 2001 -From: Felipe Borges <feborges@redhat.com> -Date: Mon, 11 Jun 2018 12:42:04 +0200 -Subject: [PATCH 1/2] rhel: Add rhel-7.7 info -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Signed-off-by: Fabiano Fidêncio <fidencio@redhat.com> ---- - os/redhat.com/rhel-7-unknown.xml | 20 ++--- - os/redhat.com/rhel-7.7.xml | 128 +++++++++++++++++++++++++++++++ - 2 files changed, 138 insertions(+), 10 deletions(-) - create mode 100644 os/redhat.com/rhel-7.7.xml - -diff --git a/os/redhat.com/rhel-7-unknown.xml b/os/redhat.com/rhel-7-unknown.xml -index 677b80d..6a3dfa6 100644 ---- a/os/redhat.com/rhel-7-unknown.xml -+++ b/os/redhat.com/rhel-7-unknown.xml -@@ -25,7 +25,7 @@ - <media arch="x86_64"> - <iso> - <system-id>LINUX</system-id> -- <volume-id>.*RHEL-7.([7-9]|[1-9][0-9]).*x86_64.*</volume-id> -+ <volume-id>.*RHEL-7.([8-9]|[1-9][0-9]).*x86_64.*</volume-id> - </iso> - <kernel>isolinux/vmlinuz</kernel> - <initrd>isolinux/initrd.img</initrd> -@@ -34,35 +34,35 @@ - <media arch="aarch64"> - <iso> - <system-id>LINUX</system-id> -- <volume-id>RHEL-7.([7-9]|[1-9][0-9]).*aarch64$</volume-id> -+ <volume-id>RHEL-7.([8-9]|[1-9][0-9]).*aarch64$</volume-id> - </iso> - </media> - - <media arch="ppc64"> - <iso> - <system-id>PPC</system-id> -- <volume-id>RHEL[-_]7.([7-9]|[1-9][0-9]).*ppc64$</volume-id> -+ <volume-id>RHEL[-_]7.([8-9]|[1-9][0-9]).*ppc64$</volume-id> - </iso> - </media> - - <media arch="ppc64le"> - <iso> - <system-id>PPC</system-id> -- <volume-id>RHEL[-_]7.([7-9]|[1-9][0-9]).*ppc64le$</volume-id> -+ <volume-id>RHEL[-_]7.([8-9]|[1-9][0-9]).*ppc64le$</volume-id> - </iso> - </media> - - <media arch="s390x"> - <iso> - <system-id>LINUX</system-id> -- <volume-id>RHEL-7.([7-9]|[1-9][0-9]).*s390x$</volume-id> -+ <volume-id>RHEL-7.([8-9]|[1-9][0-9]).*s390x$</volume-id> - </iso> - </media> - - <tree arch="ppc64"> - <treeinfo> - <family>Red Hat Enterprise Linux</family> -- <version>^7.([7-9]|[1-9][0-9])$</version> -+ <version>^7.([8-9]|[1-9][0-9])$</version> - <arch>ppc64</arch> - </treeinfo> - </tree> -@@ -70,7 +70,7 @@ - <tree arch="ppc64le"> - <treeinfo> - <family>Red Hat Enterprise Linux</family> -- <version>^7.([7-9]|[1-9][0-9])$</version> -+ <version>^7.([8-9]|[1-9][0-9])$</version> - <arch>ppc64le</arch> - </treeinfo> - </tree> -@@ -78,7 +78,7 @@ - <tree arch="s390x"> - <treeinfo> - <family>Red Hat Enterprise Linux</family> -- <version>^7.([7-9]|[1-9][0-9])$</version> -+ <version>^7.([8-9]|[1-9][0-9])$</version> - <arch>s390x</arch> - </treeinfo> - </tree> -@@ -86,7 +86,7 @@ - <tree arch="x86_64"> - <treeinfo> - <family>Red Hat Enterprise Linux</family> -- <version>^7.([7-9]|[1-9][0-9])$</version> -+ <version>^7.([8-9]|[1-9][0-9])$</version> - <arch>x86_64</arch> - </treeinfo> - </tree> -@@ -126,4 +126,4 @@ - <script id='http://redhat.com/rhel/kickstart/desktop'/> - </installer> - </os> --</libosinfo> -\ No newline at end of file -+</libosinfo> -diff --git a/os/redhat.com/rhel-7.7.xml b/os/redhat.com/rhel-7.7.xml -new file mode 100644 -index 0000000..8b55d9c ---- /dev/null -+++ b/os/redhat.com/rhel-7.7.xml -@@ -0,0 +1,128 @@ -+<?xml version="1.0" encoding="UTF-8"?> -+<libosinfo version="0.0.1"> -+ -+ <os id="http://redhat.com/rhel/7.7"> -+ <short-id>rhel7.7</short-id> -+ <name>Red Hat Enterprise Linux 7.7</name> -+ <version>7.7</version> -+ <vendor>Red Hat, Inc</vendor> -+ <vendor xml:lang="ca">Red Hat, Inc</vendor> -+ <vendor xml:lang="de">Red Hat, Inc</vendor> -+ <vendor xml:lang="es">Red Hat, Inc</vendor> -+ <vendor xml:lang="fr">Red Hat, Inc</vendor> -+ <vendor xml:lang="id">Red Hat, Inc</vendor> -+ <vendor xml:lang="ja">Red Hat, Inc</vendor> -+ <vendor xml:lang="pl">Red Hat, Inc</vendor> -+ <vendor xml:lang="pt_BR">Red Hat, Inc</vendor> -+ <vendor xml:lang="uk">Red Hat, Inc</vendor> -+ <family>linux</family> -+ <distro>rhel</distro> -+ <codename>Maipo</codename> -+ <upgrades id="http://redhat.com/rhel/7.6"/> -+ <derives-from id="http://redhat.com/rhel/7.6"/> -+ -+ <media arch="x86_64"> -+ <iso> -+ <system-id>LINUX</system-id> -+ <volume-id>.*RHEL-7.7.*x86_64.*</volume-id> -+ </iso> -+ <kernel>isolinux/vmlinuz</kernel> -+ <initrd>isolinux/initrd.img</initrd> -+ </media> -+ -+ <media arch="aarch64"> -+ <iso> -+ <system-id>LINUX</system-id> -+ <volume-id>RHEL-7.7.*aarch64$</volume-id> -+ </iso> -+ </media> -+ -+ <media arch="ppc64"> -+ <iso> -+ <system-id>PPC</system-id> -+ <volume-id>RHEL[-_]7.7.*ppc64$</volume-id> -+ </iso> -+ </media> -+ -+ <media arch="ppc64le"> -+ <iso> -+ <system-id>PPC</system-id> -+ <volume-id>RHEL[-_]7.7.*ppc64le$</volume-id> -+ </iso> -+ </media> -+ -+ <media arch="s390x"> -+ <iso> -+ <system-id>LINUX</system-id> -+ <volume-id>RHEL-7.7.*s390x$</volume-id> -+ </iso> -+ </media> -+ -+ <tree arch="ppc64"> -+ <treeinfo> -+ <family>Red Hat Enterprise Linux</family> -+ <version>^7.7$</version> -+ <arch>ppc64</arch> -+ </treeinfo> -+ </tree> -+ -+ <tree arch="ppc64le"> -+ <treeinfo> -+ <family>Red Hat Enterprise Linux</family> -+ <version>^7.7$</version> -+ <arch>ppc64le</arch> -+ </treeinfo> -+ </tree> -+ -+ <tree arch="s390x"> -+ <treeinfo> -+ <family>Red Hat Enterprise Linux</family> -+ <version>^7.7$</version> -+ <arch>s390x</arch> -+ </treeinfo> -+ </tree> -+ -+ <tree arch="x86_64"> -+ <treeinfo> -+ <family>Red Hat Enterprise Linux</family> -+ <version>^7.7$</version> -+ <arch>x86_64</arch> -+ </treeinfo> -+ </tree> -+ -+ <resources arch="ppc64"> -+ <minimum> -+ <n-cpus>1</n-cpus> -+ <cpu>1000000000</cpu> -+ <ram>2147483648</ram> -+ <storage>10737418240</storage> -+ </minimum> -+ -+ <recommended> -+ <cpu>4000000000</cpu> -+ <ram>2147483648</ram> -+ <storage>21474836480</storage> -+ </recommended> -+ </resources> -+ -+ <resources arch="all"> -+ <minimum> -+ <n-cpus>1</n-cpus> -+ <cpu>1000000000</cpu> -+ <ram>1073741824</ram> -+ <storage>10737418240</storage> -+ </minimum> -+ -+ <recommended> -+ <cpu>1000000000</cpu> -+ <ram>1073741824</ram> -+ <storage>10737418240</storage> -+ </recommended> -+ </resources> -+ -+ <installer> -+ <script id='http://redhat.com/rhel/kickstart/jeos'/> -+ <script id='http://redhat.com/rhel/kickstart/desktop'/> -+ </installer> -+ </os> -+</libosinfo> --- -2.20.1 - diff --git a/SOURCES/0002-rhel-7.8-Add-entry.patch b/SOURCES/0002-rhel-7.8-Add-entry.patch new file mode 100644 index 0000000..7b880c8 --- /dev/null +++ b/SOURCES/0002-rhel-7.8-Add-entry.patch @@ -0,0 +1,270 @@ +From bcce4c7bd04a9ebf0aec0e83b7137972c4bc4dec Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= <fidencio@redhat.com> +Date: Mon, 12 Aug 2019 14:42:48 +0200 +Subject: [PATCH] rhel-7.8: Add entry +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Together with this change, also update the rhel-7-unknown entry to match +7.9+. + +Signed-off-by: Fabiano Fidêncio <fidencio@redhat.com> +--- + 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 5da2bec..189994a 100644 +--- a/os/redhat.com/rhel-7-unknown.xml ++++ b/os/redhat.com/rhel-7-unknown.xml +@@ -19,13 +19,13 @@ + <family>linux</family> + <distro>rhel</distro> + <codename>Maipo</codename> +- <upgrades id="http://redhat.com/rhel/7.7"/> +- <derives-from id="http://redhat.com/rhel/7.7"/> ++ <upgrades id="http://redhat.com/rhel/7.8"/> ++ <derives-from id="http://redhat.com/rhel/7.8"/> + + <media arch="x86_64"> + <iso> + <system-id>LINUX</system-id> +- <volume-id>.*RHEL-7.([89]|[1-9][0-9]).*x86_64.*</volume-id> ++ <volume-id>.*RHEL-7.(9|[1-9][0-9]).*x86_64.*</volume-id> + </iso> + <kernel>isolinux/vmlinuz</kernel> + <initrd>isolinux/initrd.img</initrd> +@@ -34,35 +34,35 @@ + <media arch="aarch64"> + <iso> + <system-id>LINUX</system-id> +- <volume-id>RHEL-7.([89]|[1-9][0-9]).*aarch64$</volume-id> ++ <volume-id>RHEL-7.(9|[1-9][0-9]).*aarch64$</volume-id> + </iso> + </media> + + <media arch="ppc64"> + <iso> + <system-id>PPC</system-id> +- <volume-id>RHEL[-_]7.([89]|[1-9][0-9]).*ppc64$</volume-id> ++ <volume-id>RHEL[-_]7.(9|[1-9][0-9]).*ppc64$</volume-id> + </iso> + </media> + + <media arch="ppc64le"> + <iso> + <system-id>PPC</system-id> +- <volume-id>RHEL[-_]7.([89]|[1-9][0-9]).*ppc64le$</volume-id> ++ <volume-id>RHEL[-_]7.(9|[1-9][0-9]).*ppc64le$</volume-id> + </iso> + </media> + + <media arch="s390x"> + <iso> + <system-id>LINUX</system-id> +- <volume-id>RHEL-7.([89]|[1-9][0-9]).*s390x$</volume-id> ++ <volume-id>RHEL-7.(9|[1-9][0-9]).*s390x$</volume-id> + </iso> + </media> + + <tree arch="ppc64"> + <treeinfo> + <family>Red Hat Enterprise Linux</family> +- <version>^7.([89]|[1-9][0-9])$</version> ++ <version>^7.(9|[1-9][0-9])$</version> + <arch>ppc64</arch> + </treeinfo> + </tree> +@@ -70,7 +70,7 @@ + <tree arch="ppc64le"> + <treeinfo> + <family>Red Hat Enterprise Linux</family> +- <version>^7.([89]|[1-9][0-9])$</version> ++ <version>^7.(9|[1-9][0-9])$</version> + <arch>ppc64le</arch> + </treeinfo> + </tree> +@@ -78,7 +78,7 @@ + <tree arch="s390x"> + <treeinfo> + <family>Red Hat Enterprise Linux</family> +- <version>^7.([89]|[1-9][0-9])$</version> ++ <version>^7.(9|[1-9][0-9])$</version> + <arch>s390x</arch> + </treeinfo> + </tree> +@@ -86,7 +86,7 @@ + <tree arch="x86_64"> + <treeinfo> + <family>Red Hat Enterprise Linux</family> +- <version>^7.([89]|[1-9][0-9])$</version> ++ <version>^7.(9|[1-9][0-9])$</version> + <arch>x86_64</arch> + </treeinfo> + </tree> +diff --git a/os/redhat.com/rhel-7.8.xml b/os/redhat.com/rhel-7.8.xml +new file mode 100644 +index 0000000..e75ddee +--- /dev/null ++++ b/os/redhat.com/rhel-7.8.xml +@@ -0,0 +1,154 @@ ++<?xml version="1.0" encoding="UTF-8"?> ++<libosinfo version="0.0.1"> ++ ++ <os id="http://redhat.com/rhel/7.8"> ++ <short-id>rhel7.8</short-id> ++ <name>Red Hat Enterprise Linux 7.8</name> ++ <version>7.8</version> ++ <vendor>Red Hat, Inc</vendor> ++ <vendor xml:lang="ca">Red Hat, Inc</vendor> ++ <vendor xml:lang="de">Red Hat, Inc</vendor> ++ <vendor xml:lang="es">Red Hat, Inc</vendor> ++ <vendor xml:lang="fr">Red Hat, Inc</vendor> ++ <vendor xml:lang="id">Red Hat, Inc</vendor> ++ <vendor xml:lang="it">Red Hat, Inc</vendor> ++ <vendor xml:lang="ja">Red Hat, Inc</vendor> ++ <vendor xml:lang="pl">Red Hat, Inc</vendor> ++ <vendor xml:lang="pt_BR">Red Hat, Inc</vendor> ++ <vendor xml:lang="uk">Red Hat, Inc</vendor> ++ <family>linux</family> ++ <distro>rhel</distro> ++ <codename>Maipo</codename> ++ <upgrades id="http://redhat.com/rhel/7.7"/> ++ <derives-from id="http://redhat.com/rhel/7.7"/> ++ ++ <release-date>2019-08-06</release-date> ++ ++ <media arch="x86_64"> ++ <iso> ++ <system-id>LINUX</system-id> ++ <volume-id>.*RHEL-7.8.*x86_64.*</volume-id> ++ </iso> ++ <kernel>isolinux/vmlinuz</kernel> ++ <initrd>isolinux/initrd.img</initrd> ++ </media> ++ ++ <media arch="aarch64"> ++ <iso> ++ <system-id>LINUX</system-id> ++ <volume-id>RHEL-7.8.*aarch64$</volume-id> ++ </iso> ++ </media> ++ ++ <media arch="ppc64"> ++ <iso> ++ <system-id>PPC</system-id> ++ <volume-id>RHEL[-_]7.8.*ppc64$</volume-id> ++ </iso> ++ </media> ++ ++ <media arch="ppc64le"> ++ <iso> ++ <system-id>PPC</system-id> ++ <volume-id>RHEL[-_]7.8.*ppc64le$</volume-id> ++ </iso> ++ </media> ++ ++ <media arch="s390x"> ++ <iso> ++ <system-id>LINUX</system-id> ++ <volume-id>RHEL-7.8.*s390x$</volume-id> ++ </iso> ++ </media> ++ ++ <tree arch="ppc64"> ++ <treeinfo> ++ <family>Red Hat Enterprise Linux$</family> ++ <version>^7.8$</version> ++ <arch>ppc64$</arch> ++ </treeinfo> ++ </tree> ++ ++ <tree arch="ppc64le"> ++ <treeinfo> ++ <family>Red Hat Enterprise Linux$</family> ++ <version>^7.8$</version> ++ <arch>ppc64le</arch> ++ </treeinfo> ++ </tree> ++ ++ <tree arch="s390x"> ++ <treeinfo> ++ <family>Red Hat Enterprise Linux$</family> ++ <version>^7.8$</version> ++ <arch>s390x</arch> ++ </treeinfo> ++ </tree> ++ ++ <tree arch="x86_64"> ++ <treeinfo> ++ <family>Red Hat Enterprise Linux$</family> ++ <version>^7.8$</version> ++ <arch>x86_64</arch> ++ </treeinfo> ++ </tree> ++ ++ <resources arch="ppc64"> ++ <minimum> ++ <n-cpus>1</n-cpus> ++ <cpu>1000000000</cpu> ++ <ram>2147483648</ram> ++ <storage>10737418240</storage> ++ </minimum> ++ ++ <recommended> ++ <cpu>4000000000</cpu> ++ <ram>2147483648</ram> ++ <storage>21474836480</storage> ++ </recommended> ++ </resources> ++ ++ <resources arch="ppc64le"> ++ <minimum> ++ <n-cpus>1</n-cpus> ++ <cpu>1000000000</cpu> ++ <ram>2147483648</ram> ++ <storage>10737418240</storage> ++ </minimum> ++ ++ <recommended> ++ <cpu>4000000000</cpu> ++ <ram>2147483648</ram> ++ <storage>21474836480</storage> ++ </recommended> ++ </resources> ++ ++ <resources arch="all"> ++ <minimum> ++ <n-cpus>1</n-cpus> ++ <cpu>1000000000</cpu> ++ <ram>1073741824</ram> ++ <storage>10737418240</storage> ++ </minimum> ++ ++ <recommended> ++ <cpu>1000000000</cpu> ++ <ram>1073741824</ram> ++ <storage>10737418240</storage> ++ </recommended> ++ ++ <maximum> ++ <ram>13194139533312</ram> ++ </maximum> ++ ++ <network-install> ++ <ram>1610612736</ram> ++ </network-install> ++ </resources> ++ ++ <installer> ++ <script id='http://redhat.com/rhel/kickstart/jeos'/> ++ <script id='http://redhat.com/rhel/kickstart/desktop'/> ++ </installer> ++ </os> ++</libosinfo> +-- +2.21.0 + diff --git a/SOURCES/0002-rhel-Adjust-8.0-8-unknown-regex.patch b/SOURCES/0002-rhel-Adjust-8.0-8-unknown-regex.patch deleted file mode 100644 index 681f53b..0000000 --- a/SOURCES/0002-rhel-Adjust-8.0-8-unknown-regex.patch +++ /dev/null @@ -1,182 +0,0 @@ -From dba9bae09f0f04aa00418092d5ae6c4a41f981bc Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= <fidencio@redhat.com> -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 <fidencio@redhat.com> ---- - 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 @@ - <media arch="x86_64"> - <iso> - <system-id>LINUX</system-id> -- <volume-id>.*RHEL-8-(([1-9]|[1-9][0-9])|(([0-9]|[1-9][0-9])-([0-9]|[1-9][0-9]))).*x86_64.*</volume-id> -+ <volume-id>.*RHEL-8-([1-9]|[1-9][0-9])(-[0-9]|[1-9][0-9])?.*x86_64.*</volume-id> - </iso> - <kernel>isolinux/vmlinuz</kernel> - <initrd>isolinux/initrd.img</initrd> -@@ -34,28 +34,28 @@ - <media arch="aarch64"> - <iso> - <system-id>LINUX</system-id> -- <volume-id>RHEL-8-(([1-9]|[1-9][0-9])|(([0-9]|[1-9][0-9])-([0-9]|[1-9][0-9]))).*aarch64$</volume-id> -+ <volume-id>RHEL-8-([1-9]|[1-9][0-9])(-[0-9]|[1-9][0-9])?.*aarch64$</volume-id> - </iso> - </media> - - <media arch="ppc64le"> - <iso> - <system-id>PPC</system-id> -- <volume-id>RHEL[_-]8[_-](([1-9]|[1-9][0-9])|(([0-9]|[1-9][0-9])[_-]([0-9]|[1-9][0-9]))).*ppc64le$</volume-id> -+ <volume-id>RHEL[_-]8[_-]([1-9]|[1-9][0-9])([_-]([0-9]|[1-9][0-9]))?.*ppc64le$</volume-id> - </iso> - </media> - - <media arch="s390x"> - <iso> - <system-id>LINUX</system-id> -- <volume-id>RHEL-8-(([1-9]|[1-9][0-9])|(([0-9]|[1-9][0-9])-([0-9]|[1-9][0-9]))).*s390x$</volume-id> -+ <volume-id>RHEL-8-([1-9]|[1-9][0-9])(-[0-9]|[1-9][0-9])?.*s390x$</volume-id> - </iso> - </media> - - <tree arch="aarch64"> - <treeinfo> - <family>Red Hat Enterprise Linux</family> -- <version>^8.(([1-9]|[1-9][0-9])|(([0-9]|[1-9][0-9]).([0-9]|[1-9][0-9])))$</version> -+ <version>^8.([1-9]|[1-9][0-9])(-[0-9]|[1-9][0-9])?$</version> - <arch>aarch64</arch> - </treeinfo> - </tree> -@@ -63,7 +63,7 @@ - <tree arch="ppc64le"> - <treeinfo> - <family>Red Hat Enterprise Linux</family> -- <version>^8.(([1-9]|[1-9][0-9])|(([0-9]|[1-9][0-9]).([0-9]|[1-9][0-9])))$</version> -+ <version>^8.([1-9]|[1-9][0-9])(.([0-9]|[1-9][0-9]))?$</version> - <arch>ppc64le</arch> - </treeinfo> - </tree> -@@ -71,7 +71,7 @@ - <tree arch="s390x"> - <treeinfo> - <family>Red Hat Enterprise Linux</family> -- <version>^8.(([1-9]|[1-9][0-9])|(([0-9]|[1-9][0-9]).([0-9]|[1-9][0-9])))$</version> -+ <version>^8.([1-9]|[1-9][0-9])(.([0-9]|[1-9][0-9]))?$</version> - <arch>s390x</arch> - </treeinfo> - </tree> -@@ -79,7 +79,7 @@ - <tree arch="x86_64"> - <treeinfo> - <family>Red Hat Enterprise Linux</family> -- <version>^8.(([1-9]|[1-9][0-9])|(([0-9]|[1-9][0-9]).([0-9]|[1-9][0-9])))$</version> -+ <version>^8.([1-9]|[1-9][0-9])(.([0-9]|[1-9][0-9]))?$</version> - <arch>x86_64</arch> - </treeinfo> - </tree> -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 @@ - <media arch="x86_64"> - <iso> - <system-id>LINUX</system-id> -- <volume-id>RHEL-8-0-BaseOS-x86_64</volume-id> -+ <volume-id>RHEL-8-0-(([0-9]|[1-9][0-9])-)?BaseOS-x86_64</volume-id> - </iso> - <kernel>isolinux/vmlinuz</kernel> - <initrd>isolinux/initrd.img</initrd> -@@ -58,7 +58,7 @@ - <media arch="ppc64le"> - <iso> - <system-id>PPC</system-id> -- <volume-id>RHEL[_-]8[_-]0[_-]BaseOS[_-]ppc64le</volume-id> -+ <volume-id>RHEL[_-]8[_-]0[_-](([0-9]|[1-9][0-9])[_-])?BaseOS[_-]ppc64le</volume-id> - </iso> - <kernel>ppc/ppc64/vmlinuz</kernel> - <initrd>ppc/ppc64/initrd.img</initrd> -@@ -67,21 +67,21 @@ - <media arch="aarch64"> - <iso> - <system-id>LINUX</system-id> -- <volume-id>RHEL-8-0-BaseOS-aarch64</volume-id> -+ <volume-id>RHEL-8-0-(([0-9]|[1-9][0-9])-)?BaseOS-aarch64</volume-id> - </iso> - </media> - - <media arch="s390x"> - <iso> - <system-id>LINUX</system-id> -- <volume-id>RHEL-8-0-BaseOS-s390x</volume-id> -+ <volume-id>RHEL-8-0-(([0-9]|[1-9][0-9])-)?BaseOS-s390x</volume-id> - </iso> - </media> - - <tree arch="aarch64"> - <treeinfo> - <family>Red Hat Enterprise Linux</family> -- <version>8.0$</version> -+ <version>^8.0(.([0-9]|[1-9][0-9]))?$</version> - <arch>aarch64</arch> - </treeinfo> - </tree> -@@ -89,7 +89,7 @@ - <tree arch="ppc64le"> - <treeinfo> - <family>Red Hat Enterprise Linux</family> -- <version>^8.0$</version> -+ <version>^8.0(.([0-9]|[1-9][0-9]))?$</version> - <arch>ppc64le</arch> - </treeinfo> - </tree> -@@ -97,7 +97,7 @@ - <tree arch="s390x"> - <treeinfo> - <family>Red Hat Enterprise Linux</family> -- <version>^8.0$</version> -+ <version>^8.0(.([0-9]|[1-9][0-9]))?$</version> - <arch>s390x</arch> - </treeinfo> - </tree> -@@ -105,7 +105,7 @@ - <tree arch="x86_64"> - <treeinfo> - <family>Red Hat Enterprise Linux</family> -- <version>^8.0$</version> -+ <version>^8.0(.([0-9]|[1-9][0-9]))?$</version> - <arch>x86_64</arch> - </treeinfo> - </tree> -@@ -113,7 +113,7 @@ - <tree arch="aarch64"> - <treeinfo> - <family>Red Hat Enterprise Linux</family> -- <version>^8.0$</version> -+ <version>^8.0(.([0-9]|[1-9][0-9]))?$</version> - <arch>aarch64</arch> - </treeinfo> - </tree> -@@ -148,4 +148,4 @@ - </recommended> - </resources> - </os> --</libosinfo> -\ No newline at end of file -+</libosinfo> --- -2.20.1 - diff --git a/SOURCES/0003-install-script-rhel-jeos-packages-section-must-end-w.patch b/SOURCES/0003-install-script-rhel-jeos-packages-section-must-end-w.patch new file mode 100644 index 0000000..848796a --- /dev/null +++ b/SOURCES/0003-install-script-rhel-jeos-packages-section-must-end-w.patch @@ -0,0 +1,34 @@ +From e93f1f28013f7cb2b69a85a6e073a400fdf4e236 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= <fidencio@redhat.com> +Date: Tue, 10 Sep 2019 14:30:02 +0200 +Subject: [PATCH] install-script,rhel,jeos: %packages section must end with + %end +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Commit aa9b3c7bb54c broke JeOS unattended installations for RHEL/CentOS +by adding a new section (%post) without ending the previous section +(%packages). + +Signed-off-by: Fabiano Fidêncio <fidencio@redhat.com> +Reviewed-by: Cole Robinson <crobinso@redhat.com> +--- + install-script/redhat.com/rhel-kickstart-jeos.xml | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/install-script/redhat.com/rhel-kickstart-jeos.xml b/install-script/redhat.com/rhel-kickstart-jeos.xml +index 9629e30..2b53dcd 100644 +--- a/install-script/redhat.com/rhel-kickstart-jeos.xml ++++ b/install-script/redhat.com/rhel-kickstart-jeos.xml +@@ -167,6 +167,7 @@ url --url=<xsl:call-template name="installation-url"/> + </xsl:otherwise> + </xsl:choose> + @core ++%end + + %post --erroronfail + +-- +2.23.0 + diff --git a/SOURCES/0004-install-script-fedora-jeos-packages-section-must-end.patch b/SOURCES/0004-install-script-fedora-jeos-packages-section-must-end.patch new file mode 100644 index 0000000..9d297f6 --- /dev/null +++ b/SOURCES/0004-install-script-fedora-jeos-packages-section-must-end.patch @@ -0,0 +1,34 @@ +From 291812be80bd5c89be841d3b406e8159b8dc3d83 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= <fidencio@redhat.com> +Date: Tue, 10 Sep 2019 14:36:49 +0200 +Subject: [PATCH] install-script,fedora,jeos: %packages section must end with + %end +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Commit 2650b2febd93 broke JeOS unattended installations for Fedora by +adding a new section (%post) without ending the previous section +(%packages). + +Signed-off-by: Fabiano Fidêncio <fidencio@redhat.com> +Reviewed-by: Cole Robinson <crobinso@redhat.com> +--- + install-script/fedoraproject.org/fedora-kickstart-jeos.xml | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/install-script/fedoraproject.org/fedora-kickstart-jeos.xml b/install-script/fedoraproject.org/fedora-kickstart-jeos.xml +index 6ff6cf0..77b6b50 100644 +--- a/install-script/fedoraproject.org/fedora-kickstart-jeos.xml ++++ b/install-script/fedoraproject.org/fedora-kickstart-jeos.xml +@@ -212,6 +212,7 @@ url <xsl:call-template name="url-or-mirrorlist"/> + <xsl:if test="os/version > 6"> + @hardware-support + </xsl:if> ++%end + + %post --erroronfail + +-- +2.23.0 + diff --git a/SOURCES/0005-install-script-rhel-jeos-Single-quote-value-for-comp.patch b/SOURCES/0005-install-script-rhel-jeos-Single-quote-value-for-comp.patch new file mode 100644 index 0000000..abb7a07 --- /dev/null +++ b/SOURCES/0005-install-script-rhel-jeos-Single-quote-value-for-comp.patch @@ -0,0 +1,33 @@ +From 986b6d9fa071925d472cd5e11217e99192702c08 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= <fidencio@redhat.com> +Date: Tue, 10 Sep 2019 15:33:30 +0200 +Subject: [PATCH] install-script,rhel,jeos: Single quote value for comparison +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +We cannot do comparison as <xsl:test="os/distro = centos">, as it'd just +fail. 'centos' must be single quoted instead. + +Signed-off-by: Fabiano Fidêncio <fidencio@redhat.com> +Reviewed-by: Cole Robinson <crobinso@redhat.com> +--- + install-script/redhat.com/rhel-kickstart-jeos.xml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/install-script/redhat.com/rhel-kickstart-jeos.xml b/install-script/redhat.com/rhel-kickstart-jeos.xml +index 2b53dcd..88a46e2 100644 +--- a/install-script/redhat.com/rhel-kickstart-jeos.xml ++++ b/install-script/redhat.com/rhel-kickstart-jeos.xml +@@ -157,7 +157,7 @@ url --url=<xsl:call-template name="installation-url"/> + </xsl:when> + <xsl:otherwise> + <xsl:choose> +- <xsl:when test="os/distro = centos"> ++ <xsl:when test="os/distro = 'centos'"> + @^minimal + </xsl:when> + <xsl:otherwise> +-- +2.23.0 + diff --git a/SOURCES/osinfo-db-20190319.tar.xz.asc b/SOURCES/osinfo-db-20190319.tar.xz.asc deleted file mode 100644 index b5acaba..0000000 --- a/SOURCES/osinfo-db-20190319.tar.xz.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCAAdFiEECbnI/yI+8ROvoGo57pJsK9rMF3sFAlyQqcAACgkQ7pJsK9rM -F3twSg//W5p9Nr2bnCEqjMoWsHP7nQD42NSVxZ8Z16d/IHgikDsxCioOtAObPnDw -CelKyEcWWOl7djMd7h1Pv2soy7SZ0Ynv1XaFdeHIgYzELicCHG736jHpq0rG/1Sw -qe8mQ0yvyVAyjjmciHO21zNTcqXIpgI0obSpv8/dkJCd2DhECFT7UfPrElbuz1Sx -l+g809dN4x3jES1HPg8zGjI+fbtP/JHTEuPnw+MWfNB76lVZ0bR4R9Z2d19vfV5c -0HcMf35G0TdthO3dZ/lpqK3bcto19e1O/yfpciI5k++PfhAztMvIAP6/4VZ/lfVS -VuxVna0GAT/C9wPE006vTNaCrw3+sqTgwcKnbGGlhMC05Q+RgBoaJ13gcKfc6m9V -YAvopRv1nUTuP2556SWju8s3Nb3bYyPm7c2U/J8bhyXHxlAUvURZZsdJi9w+I0gf -Hd4Qp/+UneMmHdJXqJUYQxhR2OgBHd4dPEBuu28x5LKRxT0y7TRwu+VxLi4GcMjb -0KwG8cNxY5iN73ooAJgyeEwWqmGrD7fhwicTSQELU/12vceVwjSXHojtwNRDCAep -kT6jQny2ANNSFhqsf5SW3gAzyecEfXGsqOnV1LXTj2JUOyqrcGgIYpYvjFwQ2ry0 -0Yu40xIwTKsOwDT8K+Qc32clyqLIEEB8qxieK0Zq7zgFPNYRhNw= -=TXNX ------END PGP SIGNATURE----- diff --git a/SOURCES/osinfo-db-20190805.tar.xz.asc b/SOURCES/osinfo-db-20190805.tar.xz.asc new file mode 100644 index 0000000..26f1fac --- /dev/null +++ b/SOURCES/osinfo-db-20190805.tar.xz.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCAAdFiEECbnI/yI+8ROvoGo57pJsK9rMF3sFAl1IOMkACgkQ7pJsK9rM +F3saexAAxGb6OohVKRUXCloYt63M+cNywNHmIT004V+/It30Weq9POSmNmY0UpyQ ++9DYrlOOZXtXOwERPLZgmpWuK+CCaUorZ7Ll1pHcG1GzSaiumATMVlf0as8qr78v +oJsDN5L6CumI/PFfPLpH/zcYz2mOAcKt8WebUdCghZnFHCgf8lIS4aEXBleQ+Y4p +aW5qRrjF+ShTMlXCsnnim4wN/E+/ijZzGYwbuQOLCzCrT6eRGTYRA4TB274wl62z +tgiIQLDu7UtF4LRJ4zRTozA26VfuwDJyQI+zq6pP/r8gZfzsE7QdjtI40eGtYHP3 +nphcBk7g93PfzBSWTQ+3SiLbmIlj70ft2DGPyPASvQwsClDU1dGSVuCvH0Do7F96 +bC8lkOJZBIahIIO01kw1tSj609IvYCUyP82ANsUX3O9NMHmTXAO6FO4PfM2Wg8IQ +rLkXI2zjyrxyz9BlDTGxT1L3L0mXK3Bjx6PJIo9+pfO7HXVDJ+PYxcNpopCNktAI +Sm8Zl2eM2TgPvvK2GkE8PRIKRaNTuCxe2ujXrpR1CtmDEl8KeDyktZMxNLCSi4x5 +6LxHFeCG8HcSRoA6EUHXipDC82sI6OMuGbY+94c5HYJQrfIvGUFt5AEAn8F55crx +Kg7KouPOFnDmczh8ujbnqfTSNkcC1bx2eXKEq48m3Vdh10ed3OU= +=IsvD +-----END PGP SIGNATURE----- diff --git a/SPECS/osinfo-db.spec b/SPECS/osinfo-db.spec index 763c4f3..1977415 100644 --- a/SPECS/osinfo-db.spec +++ b/SPECS/osinfo-db.spec @@ -4,7 +4,7 @@ Summary: osinfo database files Name: osinfo-db -Version: 20190319 +Version: 20190805 Release: 2%{?dist} License: LGPLv2+ Source0: https://releases.pagure.org/libosinfo/%{name}-%{version}.tar.xz @@ -16,8 +16,11 @@ BuildArch: noarch Requires: hwdata ### Downstream Patches ### -Patch0001: 0001-rhel-Add-rhel-7.7-info.patch -Patch0002: 0002-rhel-Adjust-8.0-8-unknown-regex.patch +Patch0001: 0001-rhel-7.7-Add-entry.patch +Patch0002: 0002-rhel-7.8-Add-entry.patch +Patch0003: 0003-install-script-rhel-jeos-packages-section-must-end-w.patch +Patch0004: 0004-install-script-fedora-jeos-packages-section-must-end.patch +Patch0005: 0005-install-script-rhel-jeos-Single-quote-value-for-comp.patch %description The osinfo database provides information about operating systems and @@ -54,6 +57,14 @@ osinfo-db-import --root %{buildroot} --dir %{_datadir}/osinfo %{PatchedSource} %{_datadir}/osinfo/schema %changelog +* Wed Sep 11 2019 Fabiano Fidêncio <fidencio@redhat.com> - 20190805-2 +- Resolves: rhbz#1750807 - Fedora/RHEL/CentOS JeOS kickstart files for + unattended installation are broken + +* Mon Aug 12 2019 Fabiano Fidêncio <fidencio@redhat.com> - 20190805-1 +- Resolves: rhbz#1737367 - Update to latest upstream release +- Resolves: rhbz#1737369 - Add 7.8 to the osinfo-db which will be used on 7.8 + * Tue Mar 19 2019 Fabiano Fidêncio <fidencio@redhat.com> - 20190319-2 - Related: rhbz#1647782 - Rebase osinfo-db to the latest version