powerel7
/
virt
2
0
Fork 0
Code Issues Pull Requests Releases Activity

osinfo-db package update 

Signed-off-by: virtbuilder_pel7ppc64lebuilder0 <virtbuilder@powerel.org>
master
virtbuilder_pel7ppc64lebuilder0 2020-06-02 00:41:35 +02:00
parent d06c8e09de
commit 6b3935492b
6 changed files with 686 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

278
SOURCES/0001-rhel-7.7-Add-entry.patch Normal file
View File

@ -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

270
SOURCES/0002-rhel-7.8-Add-entry.patch Normal file
View File

@ -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

34
SOURCES/0003-install-script-rhel-jeos-packages-section-must-end-w.patch Normal file
View File

@ -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

34
SOURCES/0004-install-script-fedora-jeos-packages-section-must-end.patch Normal file
View File

@ -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 &gt; 6">
@hardware-support
</xsl:if>
+%end
%post --erroronfail
--
2.23.0

33
SOURCES/0005-install-script-rhel-jeos-Single-quote-value-for-comp.patch Normal file
View File

@ -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

41
SPECS/osinfo-db.spec
View File

@ -4,8 +4,8 @@

Summary: osinfo database files
Name: osinfo-db
Version: 20191125
Release: 1%{?dist}
Version: 20190805
Release: 2%{?dist}
License: LGPLv2+
Source0: https://releases.pagure.org/libosinfo/%{name}-%{version}.tar.xz
Source1: /https://releases.pagure.org/libosinfo/%{name}-%{version}.tar.xz.asc
@ -15,7 +15,12 @@ BuildRequires: osinfo-db-tools
BuildArch: noarch
Requires: hwdata

Patch0: add-rhel7.6-data.patch
### Downstream Patches ###
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
@ -24,7 +29,9 @@ provisioning of new virtual machines

%prep
%setup -q
%patch0 -p1 -b .add-rhel7.6-data
for p in %patches ; do
%__patch -p1 -i $p
done

# For us to be able to apply patches on top of a rebase,
# we:
@ -50,6 +57,32 @@ 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

* Tue Mar 19 2019 Fabiano Fidêncio <fidencio@redhat.com> - 20190319-1
- Resolves: rhbz#1647782 - Rebase osinfo-db to the latest version

* Mon Dec 17 2018 Fabiano Fidêncio <fidencio@redhat.com> - 20181214-1
- Resolves: rhbz#1647782 - Rebase osinfo-db to the latest version

* Fri Dec 07 2018 Fabiano Fidêncio <fidencio@redhat.com> - 20181203-2
- Resolves: rhbz#1656914 - backport change to support Fedora 29 Silverblue

* Thu Dec 06 2018 Fabiano Fidêncio <fidencio@redhat.com> - 20181203-1
- Resolves: rhbz#1647782 - Rebase osinfo-db to the latest version

* Fri Nov 16 2018 Fabiano Fidêncio <fidencio@redhat.com> - 20181011-1
- Resolves: rhbz#1647782 - Rebase osinfo-db to the latest version

* Mon Jun 11 2018 Felipe Borges <feborges@redhat.com> - 20180531-1
- Rebase to 20180531
- Add RHEL 7.6