Re: [PATCH] Add RHEL6.10 support

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Věra,

On Wed, Jul 18, 2018 at 10:53 AM, Věra Cholasta <vbudikov@xxxxxxxxxx> wrote:
> ---
>  data/os/redhat.com/rhel-6.10.xml.in | 53 +++++++++++++++++++++++++++++++++++++
>  1 file changed, 53 insertions(+)
>  create mode 100644 data/os/redhat.com/rhel-6.10.xml.in
>
> diff --git a/data/os/redhat.com/rhel-6.10.xml.in b/data/os/redhat.com/rhel-6.10.xml.in
> new file mode 100644
> index 0000000..4d17935
> --- /dev/null
> +++ b/data/os/redhat.com/rhel-6.10.xml.in
> @@ -0,0 +1,53 @@
> +<libosinfo version="0.0.1">
> +<!-- Licensed under the GNU General Public License version 2 or later.
> +     See http://www.gnu.org/licenses/ for a copy of the license text -->
> +  <os id="http://redhat.com/rhel/6.10";>
> +    <short-id>rhel6.10</short-id>
> +    <_name>Red Hat Enterprise Linux 6.10</_name>
> +    <version>6.10</version>
> +    <_vendor>Red Hat, Inc</_vendor>
> +    <family>linux</family>
> +    <distro>rhel</distro>
> +    <codename>Santiago</codename>
> +    <upgrades id="http://redhat.com/rhel/6.10"/>
> +    <derives-from id="http://redhat.com/rhel/6.10"/>
> +
> +    <release-date>2018-05-25</release-date>
> +    <eol-date>2024-06-30</eol-date>
> +
> +    <media arch="i686">
> +      <iso>
> +        <system-id>LINUX</system-id>
> +        <volume-id>RHEL-6.10 .*.i386.*</volume-id>

There's no need for the .* in the end of the volume-id.

> +      </iso>
> +      <kernel>isolinux/vmlinuz</kernel>
> +      <initrd>isolinux/initrd.img</initrd>
> +    </media>
> +    <media arch="x86_64">
> +      <iso>
> +        <system-id>LINUX</system-id>
> +        <volume-id>.*RHEL-6.10 .*.x86_64.*</volume-id>

Same here.

> +      </iso>
> +      <kernel>isolinux/vmlinuz</kernel>
> +      <initrd>isolinux/initrd.img</initrd>
> +    </media>
> +
> +    <resources arch="all">
> +      <minimum>
> +        <n-cpus>1</n-cpus>
> +        <ram>536870912</ram>
> +      </minimum>
> +
> +      <recommended>
> +        <cpu>400000000</cpu>
> +        <ram>1073741824</ram>
> +        <storage>9663676416</storage>
> +      </recommended>
> +    </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
> --
> 1.8.3.1
>
> _______________________________________________
> Libosinfo mailing list
> Libosinfo@xxxxxxxxxx
> https://www.redhat.com/mailman/listinfo/libosinfo

As you're also adding tests to s390x and ppc64 isos, we'd have to also
add those here.

If you agree, I'll squash the following patch into yours before pushing those:
[ffidenci@pessoa osinfo-db]$ git diff
diff --git a/data/os/redhat.com/rhel-6.10.xml.in
b/data/os/redhat.com/rhel-6.10.xml.in
index 4d17935..c977c8c 100644
--- a/data/os/redhat.com/rhel-6.10.xml.in
+++ b/data/os/redhat.com/rhel-6.10.xml.in
@@ -18,7 +18,7 @@
     <media arch="i686">
       <iso>
         <system-id>LINUX</system-id>
-        <volume-id>RHEL-6.10 .*.i386.*</volume-id>
+        <volume-id>RHEL-6.10 .*.i386$</volume-id>
       </iso>
       <kernel>isolinux/vmlinuz</kernel>
       <initrd>isolinux/initrd.img</initrd>
@@ -26,7 +26,23 @@
     <media arch="x86_64">
       <iso>
         <system-id>LINUX</system-id>
-        <volume-id>.*RHEL-6.10 .*.x86_64.*</volume-id>
+        <volume-id>RHEL-6.10 .*.x86_64$</volume-id>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+    <media arch="ppc">
+      <iso>
+        <system-id>PPC</system-id>
+        <volume-id>RHEL-6.10 .*.ppc64$</volume-id>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+    <media arch="s390x">
+      <iso>
+        <system-id>LINUX</system-id>
+        <volume-id>RHEL-6.10 .*.s390x$</volume-id>
       </iso>


Best Regards,
-- 
Fabiano Fidêncio

_______________________________________________
Libosinfo mailing list
Libosinfo@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libosinfo




[Index of Archives]     [Virt Tools]     [Libvirt Users]     [Fedora Users]     [Fedora Maintainers]     [Fedora Desktop]     [Fedora SELinux]     [Big List of Linux Books]     [Yosemite News]     [KDE Users]

  Powered by Linux