Hey Lin, On Tue, May 19, 2015 at 05:29:54PM +0800, Lin Ma wrote: > Add entries for SUSE Linux Enterprise Server 11 SP1, SP2, SP3 and SP4. > > Changes in V1: Add media and release-date entries, add testcases This looks good, I had to add the changes below to make 'make check' test for the new SUSE data and succeed. ACK from me with these changes squashed in, I'll push your patch+these additional changes. > > Signed-off-by: Lin Ma <lma@xxxxxxxx> > --- > data/oses/suse.xml.in | 139 ++++++++++++++++++++- > .../sles11sp1/SLES-11-SP1-DVD-i586-GM-DVD1.iso.txt | 29 +++++ > .../SLES-11-SP1-DVD-x86_64-GM-DVD1.iso.txt | 29 +++++ > .../sles11sp2/SLES-11-SP2-DVD-i586-GM-DVD1.iso.txt | 29 +++++ > .../SLES-11-SP2-DVD-x86_64-GM-DVD1.iso.txt | 29 +++++ > .../sles11sp3/SLES-11-SP3-DVD-i586-GM-DVD1.iso.txt | 29 +++++ > .../SLES-11-SP3-DVD-x86_64-GM-DVD1.iso.txt | 29 +++++ > .../SLE-12-Server-DVD-x86_64-GM-DVD1.iso.txt | 29 +++++ > 8 files changed, 340 insertions(+), 2 deletions(-) > create mode 100644 test/isodata/sles/sles11sp1/SLES-11-SP1-DVD-i586-GM-DVD1.iso.txt > create mode 100644 test/isodata/sles/sles11sp1/SLES-11-SP1-DVD-x86_64-GM-DVD1.iso.txt > create mode 100644 test/isodata/sles/sles11sp2/SLES-11-SP2-DVD-i586-GM-DVD1.iso.txt > create mode 100644 test/isodata/sles/sles11sp2/SLES-11-SP2-DVD-x86_64-GM-DVD1.iso.txt > create mode 100644 test/isodata/sles/sles11sp3/SLES-11-SP3-DVD-i586-GM-DVD1.iso.txt > create mode 100644 test/isodata/sles/sles11sp3/SLES-11-SP3-DVD-x86_64-GM-DVD1.iso.txt > create mode 100644 test/isodata/sles/sles12/SLE-12-Server-DVD-x86_64-GM-DVD1.iso.txt > > diff --git a/data/oses/suse.xml.in b/data/oses/suse.xml.in > index a591db5..822e030 100644 > --- a/data/oses/suse.xml.in > +++ b/data/oses/suse.xml.in > @@ -34,6 +34,128 @@ > </devices> > </os> > > + <os id="http://suse.com/sles/11.1";> > + <short-id>sles11sp1</short-id> > + <_name>SUSE Linux Enterprise Server 11 SP1</_name> > + <version>11.1</version> > + <_vendor>SUSE</_vendor> > + <family>linux</family> > + <distro>sles</distro> > + <upgrades id="http://suse.com/sles/11"/> > + > + <release-date>2010-06-02</release-date> > + > + <!-- Server --> Why do you mention "Server" here? Does this mean there are other SUSE isos for desktop or something else? Here is the small diff I had to add: diff --git a/data/oses/suse.xml.in b/data/oses/suse.xml.in index 822e030..ce23f59 100644 --- a/data/oses/suse.xml.in +++ b/data/oses/suse.xml.in @@ -50,7 +50,7 @@ <media arch="i686"> <iso> <system-id>LINUX</system-id> - <volume-id>SLES-11-SP1-DVD-i386</volume-id> + <volume-id>SLES-11-SP1-DVD-i586</volume-id> </iso> <kernel>boot/i386/loader/linux</kernel> <initrd>boot/i386/loader/initrd</initrd> @@ -81,7 +81,7 @@ <media arch="i686"> <iso> <system-id>LINUX</system-id> - <volume-id>SLES-11-SP2-DVD-i386</volume-id> + <volume-id>SLES-11-SP2-DVD-i586</volume-id> </iso> <kernel>boot/i386/loader/linux</kernel> <initrd>boot/i386/loader/initrd</initrd> @@ -112,7 +112,7 @@ <media arch="i686"> <iso> <system-id>LINUX</system-id> - <volume-id>SLES-11-SP3-DVD-i386</volume-id> + <volume-id>SLES-11-SP3-DVD-i586</volume-id> </iso> <kernel>boot/i386/loader/linux</kernel> <initrd>boot/i386/loader/initrd</initrd> @@ -141,7 +141,7 @@ <media arch="i686"> <iso> <system-id>LINUX</system-id> - <volume-id>SLES-11-SP4-DVD-i386</volume-id> + <volume-id>SLES-11-SP4-DVD-i586</volume-id> </iso> <kernel>boot/i386/loader/linux</kernel> <initrd>boot/i386/loader/initrd</initrd> diff --git a/test/test-isodetect.c b/test/test-isodetect.c index b427d54..c100ece 100644 --- a/test/test-isodetect.c +++ b/test/test-isodetect.c @@ -418,6 +418,12 @@ START_TEST(test_mageia) } END_TEST +START_TEST(test_sles) +{ + test_one("sles"); +} +END_TEST + static Suite * list_suite(void) { @@ -436,6 +442,7 @@ list_suite(void) tcase_add_test(tc, test_gnome); tcase_add_test(tc, test_altlinux); tcase_add_test(tc, test_mageia); + tcase_add_test(tc, test_sles); suite_add_tcase(s, tc); return s; }
Attachment:
pgpy8fypbFzi0.pgp
Description: PGP signature
_______________________________________________ Libosinfo mailing list Libosinfo@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/libosinfo
