Alexey, Same issue here applying the patch with `git am ...` On Thu, 2018-10-18 at 14:30 +0300, a.shabalin@xxxxxxxxx wrote: > Signed-off-by: Alexey Shabalin <shaba@xxxxxxxxxxxx> > --- > data/os/altlinux.org/alt-8.0.xml.in | 70 ++++++++++ > data/os/altlinux.org/alt-8.1.xml.in | 122 +++++++++++++++++ > data/os/altlinux.org/alt-8.2.xml.in | 205 > ++++++++++++++++++++++++++++ > 3 files changed, 397 insertions(+) > create mode 100644 data/os/altlinux.org/alt-8.0.xml.in > create mode 100644 data/os/altlinux.org/alt-8.1.xml.in > create mode 100644 data/os/altlinux.org/alt-8.2.xml.in Anyways, this patch looks good. I'll wait for the isodata of those ISOs before pushing just to be sure our tests are going to pass. :-) (And once our tests pass, I'll add the Reviewed-by: ... and push them) > > diff --git a/data/os/altlinux.org/alt-8.0.xml.in > b/data/os/altlinux.org/alt-8.0.xml.in > new file mode 100644 > index 0000000..56b8aff > --- /dev/null > +++ b/data/os/altlinux.org/alt-8.0.xml.in > @@ -0,0 +1,70 @@ > +<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://altlinux.org/alt/8.0";> > + <short-id>alt8.0</short-id> > + <_name>ALT 8 Education</_name> > + <version>8.0</version> > + <_vendor>BaseALT</_vendor> > + <family>linux</family> > + <distro>alt</distro> > + <codename>Hypericum</codename> > + <upgrades id="http://altlinux.org/altlinux/7.0"/> > + <derives-from id="http://altlinux.org/altlinux/7.0"/> > + > + <release-date>2016-06-01</release-date> > + <eol-date>2019-12-16</eol-date> > + > + <devices> > + <device id="http://pcisig.com/pci/1af4/1041"/> <!-- virtio1.0- > net --> > + <device id="http://pcisig.com/pci/1af4/1042"/> <!-- virtio1.0- > block --> > + <device id="http://pcisig.com/pci/1af4/1043"/> <!-- virtio1.0- > console --> > + <device id="http://pcisig.com/pci/1af4/1044"/> <!-- virtio1.0- > rng --> > + <device id="http://pcisig.com/pci/1af4/1045"/> <!-- virtio1.0- > balloon --> > + <device id="http://pcisig.com/pci/1af4/1048"/> <!-- virtio1.0- > scsi --> > + <device id="http://pcisig.com/pci/1af4/1049"/> <!-- virtio1.0- > 9p > --> > + <device id="http://pcisig.com/pci/1af4/1052"/> <!-- virtio1.0- > input --> > + <device id="http://qemu.org/chipset/x86/q35"/> <!-- qemu-x86- > q35 > --> > + <device id="http://pcisig.com/pci/8086/10d3"/> <!-- e1000e --> > + <device id="http://pcisig.com/pci/8086/293e"/> <!-- ich9-hda > --> > + </devices> > + > + <!-- Education --> > + <media arch="i686"> > + <url> > http://ftp.altlinux.org/pub/distributions/ALTLinux/p8/images/education/alt-education-8.2-i586.iso</url > + <iso> > + <system-id>LINUX</system-id> > + <volume-id>ALT education/i586</volume-id> > + <publisher-id>ALT LINUX TEAM</publisher-id> > + <application-id>EDUCATION</application-id> > + </iso> > + <kernel>syslinux/alt0/vmlinuz</kernel> > + <initrd>syslinux/alt0/full.cz</initrd> > + </media> > + <media arch="x86_64"> > + <url> > http://ftp.altlinux.org/pub/distributions/ALTLinux/p8/images/education/alt-education-8.2-x86_64.iso</url > + <iso> > + <system-id>LINUX</system-id> > + <volume-id>ALT education/x86_64</volume-id> > + <publisher-id>ALT LINUX TEAM</publisher-id> > + <application-id>EDUCATION</application-id> > + </iso> > + <kernel>syslinux/alt0/vmlinuz</kernel> > + <initrd>syslinux/alt0/full.cz</initrd> > + </media> > + > + <resources arch="all"> > + <minimum> > + <n-cpus>1</n-cpus> > + <cpu>1000000000</cpu> > + <ram>536870912</ram> > + <storage>10737418240</storage> > + </minimum> > + <recommended> > + <ram>2147483648</ram> > + <storage>21474836480</storage> > + </recommended> > + </resources> > + > + </os> > +</libosinfo> > diff --git a/data/os/altlinux.org/alt-8.1.xml.in > b/data/os/altlinux.org/alt-8.1.xml.in > new file mode 100644 > index 0000000..46d6dcd > --- /dev/null > +++ b/data/os/altlinux.org/alt-8.1.xml.in > @@ -0,0 +1,122 @@ > +<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://altlinux.org/alt/8.1";> > + <short-id>alt8.1</short-id> > + <_name>ALT 8.1</_name> > + <version>8.1</version> > + <_vendor>BaseALT</_vendor> > + <family>linux</family> > + <distro>alt</distro> > + <codename>Hypericum</codename> > + <upgrades id="http://altlinux.org/alt/8.0"/> > + <derives-from id="http://altlinux.org/alt/8.0"/> > + > + <release-date>2016-06-01</release-date> > + <eol-date>2017-12-30</eol-date> > + > + <variant id="workstation"> > + <_name>ALT 8.1 Workstation</_name> > + </variant> > + <variant id="kworkstation"> > + <_name>ALT 8.1 Workstation K</_name> > + </variant> > + <variant id="kworkstation-live"> > + <_name>ALT 8.1 Workstation K</_name> > + </variant> > + > + <!-- Workstation --> > + <media arch="i686"> > + <variant id="workstation"/> > + <url> > http://ftp.altlinux.org/pub/distributions/ALTLinux/p8/images/workstation/alt-workstation-8.1-i586.iso</url > + <iso> > + <system-id>LINUX</system-id> > + <volume-id>ALT Workstation</volume-id> > + <publisher-id>BASEALT LTD</publisher-id> > + <application-id>8.1/I586</application-id> > + </iso> > + <kernel>syslinux/alt0/vmlinuz</kernel> > + <initrd>syslinux/alt0/full.cz</initrd> > + </media> > + <media arch="x86_64"> > + <variant id="workstation"/> > + <url> > http://ftp.altlinux.org/pub/distributions/ALTLinux/p8/images/workstation/alt-workstation-8.1-x86_64.iso</url > + <iso> > + <system-id>LINUX</system-id> > + <volume-id>ALT Workstation</volume-id> > + <publisher-id>BASEALT LTD</publisher-id> > + <application-id>8.1/X86_64</application-id> > + </iso> > + <kernel>syslinux/alt0/vmlinuz</kernel> > + <initrd>syslinux/alt0/full.cz</initrd> > + </media> > + > + <!-- K Workstation --> > + <media arch="i686"> > + <variant id="kworkstation"/> > + <url> > http://ftp.altlinux.org/pub/distributions/ALTLinux/p8/images/kworkstation/alt-kworkstation-8.1-install-i586.iso</url > + <iso> > + <system-id>LINUX</system-id> > + <volume-id>Workstation K</volume-id> > + <publisher-id>BASEALT LTD</publisher-id> > + <application-id>8.0/I586</application-id> > + <volume-size>1756120</volume-size> > + </iso> > + <kernel>syslinux/alt0/vmlinuz</kernel> > + <initrd>syslinux/alt0/full.cz</initrd> > + </media> > + <media arch="x86_64"> > + <variant id="kworkstation"/> > + <url> > http://ftp.altlinux.org/pub/distributions/ALTLinux/p8/images/kworkstation/alt-kworkstation-8.1-install-x86_64.iso</url > + <iso> > + <system-id>LINUX</system-id> > + <volume-id>Workstation K</volume-id> > + <publisher-id>BASEALT LTD</publisher-id> > + <application-id>8.0/X86_64</application-id> > + <volume-size>1836000</volume-size> > + </iso> > + <kernel>syslinux/alt0/vmlinuz</kernel> > + <initrd>syslinux/alt0/full.cz</initrd> > + </media> > + <media arch="i686" live="true"> > + <variant id="kworkstation-live"/> > + <url> > http://ftp.altlinux.org/pub/distributions/ALTLinux/p8/images/kworkstation/alt-kworkstation-8.1-live-i586.iso</url > + <iso> > + <system-id>LINUX</system-id> > + <volume-id>Workstation K</volume-id> > + <publisher-id>BASEALT LTD</publisher-id> > + <application-id>8.0/I586</application-id> > + <volume-size>1042432</volume-size> > + </iso> > + <kernel>syslinux/alt0/vmlinuz</kernel> > + <initrd>syslinux/alt0/full.cz</initrd> > + </media> > + <media arch="x86_64" live="true"> > + <variant id="kworkstation-live"/> > + <url> > http://ftp.altlinux.org/pub/distributions/ALTLinux/p8/images/kworkstation/alt-kworkstation-8.1-live-x86_64.iso</url > + <iso> > + <system-id>LINUX</system-id> > + <volume-id>Workstation K</volume-id> > + <publisher-id>BASEALT LTD</publisher-id> > + <application-id>8.0/X86_64</application-id> > + <volume-size>1106496</volume-size> > + </iso> > + <kernel>syslinux/alt0/vmlinuz</kernel> > + <initrd>syslinux/alt0/full.cz</initrd> > + </media> > + > + <resources arch="all"> > + <minimum> > + <n-cpus>1</n-cpus> > + <cpu>1000000000</cpu> > + <ram>536870912</ram> > + <storage>10737418240</storage> > + </minimum> > + <recommended> > + <ram>2147483648</ram> > + <storage>21474836480</storage> > + </recommended> > + </resources> > + > + </os> > +</libosinfo> > diff --git a/data/os/altlinux.org/alt-8.2.xml.in > b/data/os/altlinux.org/alt-8.2.xml.in > new file mode 100644 > index 0000000..94ccbc8 > --- /dev/null > +++ b/data/os/altlinux.org/alt-8.2.xml.in > @@ -0,0 +1,205 @@ > +<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://altlinux.org/alt/8.2";> > + <short-id>alt8.2</short-id> > + <_name>ALT 8.2</_name> > + <version>8.2</version> > + <_vendor>BaseALT</_vendor> > + <family>linux</family> > + <distro>alt</distro> > + <codename>Hypericum</codename> > + <upgrades id="http://altlinux.org/alt/8.1"/> > + <derives-from id="http://altlinux.org/alt/8.1"/> > + > + <release-date>2017-12-30</release-date> > + <eol-date>2019-12-16</eol-date> > + > + <variant id="workstation"> > + <_name>ALT 8.2 Workstation</_name> > + </variant> > + <variant id="kworkstation"> > + <_name>ALT 8.2 Workstation K</_name> > + </variant> > + <variant id="kworkstation-live"> > + <_name>ALT 8.2 Workstation K</_name> > + </variant> > + <variant id="server"> > + <_name>ALT 8.2 Server</_name> > + </variant> > + <variant id="simply"> > + <_name>ALT 8.2 Simply</_name> > + </variant> > + <variant id="simply-live"> > + <_name>ALT 8.2 Simply</_name> > + </variant> > + > + <!-- Workstation --> > + <media arch="i686"> > + <variant id="workstation"/> > + <url> > http://ftp.altlinux.org/pub/distributions/ALTLinux/p8/images/workstation/alt-workstation-8.2-i586.iso</url > + <iso> > + <system-id>LINUX</system-id> > + <volume-id>ALT Workstation</volume-id> > + <publisher-id>BASEALT LTD</publisher-id> > + <application-id>8.2/I586</application-id> > + </iso> > + <kernel>syslinux/alt0/vmlinuz</kernel> > + <initrd>syslinux/alt0/full.cz</initrd> > + </media> > + <media arch="x86_64"> > + <variant id="workstation"/> > + <url> > http://ftp.altlinux.org/pub/distributions/ALTLinux/p8/images/workstation/alt-workstation-8.2-x86_64.iso</url > + <iso> > + <system-id>LINUX</system-id> > + <volume-id>ALT Workstation</volume-id> > + <publisher-id>BASEALT LTD</publisher-id> > + <application-id>8.2/X86_64</application-id> > + </iso> > + <kernel>syslinux/alt0/vmlinuz</kernel> > + <initrd>syslinux/alt0/full.cz</initrd> > + </media> > + > + <!-- K Workstation --> > + <media arch="i686"> > + <variant id="kworkstation"/> > + <url> > http://ftp.altlinux.org/pub/distributions/ALTLinux/p8/images/kworkstation/alt-kworkstation-8.2-install-i586.iso</url > + <iso> > + <system-id>LINUX</system-id> > + <volume-id>Workstation K</volume-id> > + <publisher-id>BASEALT LTD</publisher-id> > + <application-id>8.2/I586</application-id> > + <volume-size>1831424</volume-size> > + </iso> > + <kernel>syslinux/alt0/vmlinuz</kernel> > + <initrd>syslinux/alt0/full.cz</initrd> > + </media> > + <media arch="x86_64"> > + <variant id="kworkstation"/> > + <url> > http://ftp.altlinux.org/pub/distributions/ALTLinux/p8/images/kworkstation/alt-kworkstation-8.2-install-x86_64.iso</url > + <iso> > + <system-id>LINUX</system-id> > + <volume-id>Workstation K</volume-id> > + <publisher-id>BASEALT LTD</publisher-id> > + <application-id>8.2/X86_64</application-id> > + <volume-size>1933312</volume-size> > + </iso> > + <kernel>syslinux/alt0/vmlinuz</kernel> > + <initrd>syslinux/alt0/full.cz</initrd> > + </media> > + <media arch="i686" live="true"> > + <variant id="kworkstation-live"/> > + <url> > http://ftp.altlinux.org/pub/distributions/ALTLinux/p8/images/kworkstation/alt-kworkstation-8.2-live-i586.iso</url > + <iso> > + <system-id>LINUX</system-id> > + <volume-id>Workstation K</volume-id> > + <publisher-id>BASEALT LTD</publisher-id> > + <application-id>8.2/I586</application-id> > + <volume-size>1157584</volume-size> > + </iso> > + <kernel>syslinux/alt0/vmlinuz</kernel> > + <initrd>syslinux/alt0/full.cz</initrd> > + </media> > + <media arch="x86_64" live="true"> > + <variant id="kworkstation-live"/> > + <url> > http://ftp.altlinux.org/pub/distributions/ALTLinux/p8/images/kworkstation/alt-kworkstation-8.2-live-x86_64.iso</url > + <iso> > + <system-id>LINUX</system-id> > + <volume-id>Workstation K</volume-id> > + <publisher-id>BASEALT LTD</publisher-id> > + <application-id>8.2/X86_64</application-id> > + <volume-size>1242752</volume-size> > + </iso> > + <kernel>syslinux/alt0/vmlinuz</kernel> > + <initrd>syslinux/alt0/full.cz</initrd> > + </media> > + > + <!-- Simply --> > + <media arch="i686"> > + <variant id="simply"/> > + <url> > http://ftp.altlinux.org/pub/distributions/ALTLinux/p8/images/simply/alt-simply-8.2.0-i586.iso</url > + <iso> > + <system-id>LINUX</system-id> > + <volume-id>Simply Linux/i586</volume-id> > + <publisher-id>BASEALT LTD</publisher-id> > + <application-id>8.2.0/I586</application-id> > + </iso> > + <kernel>syslinux/alt0/vmlinuz</kernel> > + <initrd>syslinux/alt0/full.cz</initrd> > + </media> > + <media arch="x86_64"> > + <variant id="simply"/> > + <url> > http://ftp.altlinux.org/pub/distributions/ALTLinux/p8/images/simply/alt-simply-8.2.0-x86_64.iso</url > + <iso> > + <system-id>LINUX</system-id> > + <volume-id>Simply Linux/x86_64</volume-id> > + <publisher-id>BASEALT LTD</publisher-id> > + <application-id>8.2.0/X86_64</application-id> > + </iso> > + <kernel>syslinux/alt0/vmlinuz</kernel> > + <initrd>syslinux/alt0/full.cz</initrd> > + </media> > + <media arch="i686" live="true"> > + <variant id="simply-live"/> > + <url> > http://ftp.altlinux.org/pub/distributions/ALTLinux/p8/images/simply/alt-simply-8.2.0-live-i586.iso</url > + <iso> > + <system-id>LINUX</system-id> > + <volume-id>Simply Linux live/i586</volume-id> > + <publisher-id>BASEALT LTD</publisher-id> > + <application-id>8.2.0/I586</application-id> > + </iso> > + <kernel>syslinux/alt0/vmlinuz</kernel> > + <initrd>syslinux/alt0/full.cz</initrd> > + </media> > + <media arch="x86_64" live="true"> > + <variant id="simply-live"/> > + <url> > http://ftp.altlinux.org/pub/distributions/ALTLinux/p8/images/simply/alt-simply-8.2.0-live-x86_64.iso</url > + <iso> > + <system-id>LINUX</system-id> > + <volume-id>Simply Linux live/x86_64</volume-id> > + <publisher-id>BASEALT LTD</publisher-id> > + <application-id>8.2.0/X86_64</application-id> > + </iso> > + <kernel>syslinux/alt0/vmlinuz</kernel> > + <initrd>syslinux/alt0/full.cz</initrd> > + </media> > + > + <!-- Server --> > + <media arch="i686"> > + <variant id="server"/> > + <url> > http://ftp.altlinux.org/pub/distributions/ALTLinux/p8/images/server/alt-server-8.2-i586.iso</url > + <iso> > + <volume-id>ISOIMAGE</volume-id> > + <publisher-id>ALT LINUX TEAM</publisher-id> > + <volume-size>1136464</volume-size> > + </iso> > + <kernel>syslinux/alt0/vmlinuz</kernel> > + <initrd>syslinux/alt0/full.cz</initrd> > + </media> > + <media arch="x86_64"> > + <variant id="server"/> > + <url> > http://ftp.altlinux.org/pub/distributions/ALTLinux/p8/images/server/alt-server-8.2-x86_64.iso</url > + <iso> > + <volume-id>ISOIMAGE</volume-id> > + <publisher-id>ALT LINUX TEAM</publisher-id> > + <volume-size>1353232</volume-size> > + </iso> > + <kernel>syslinux/alt0/vmlinuz</kernel> > + <initrd>syslinux/alt0/full.cz</initrd> > + </media> > + > + <resources arch="all"> > + <minimum> > + <n-cpus>1</n-cpus> > + <cpu>1000000000</cpu> > + <ram>536870912</ram> > + <storage>10737418240</storage> > + </minimum> > + <recommended> > + <ram>2147483648</ram> > + <storage>21474836480</storage> > + </recommended> > + </resources> > + > + </os> > +</libosinfo> _______________________________________________ Libosinfo mailing list Libosinfo@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/libosinfo
