Skip to content

Commit 0140263

Browse files
committed
wip: Ubuntu 24, Debian and Devuan 12
issue #2129
1 parent 8869c20 commit 0140263

File tree

2 files changed

+49
-29
lines changed

2 files changed

+49
-29
lines changed

lib/Ravada.pm

Lines changed: 47 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -373,7 +373,7 @@ sub _update_isos {
373373
,md5 => '1d6bdf5cbc6ca98c31f02d23e418dd96'
374374
},
375375
mate_focal_fossa => {
376-
name => 'Ubuntu Mate Focal Fossa 64 bits'
376+
name => 'Ubuntu Mate 20.04 Focal Fossa 64 bits'
377377
,description => 'Ubuntu Mate 20.04 (Focal Fossa) 64 bits'
378378
,arch => 'x86_64'
379379
,xml => 'focal_fossa-amd64.xml'
@@ -384,7 +384,7 @@ sub _update_isos {
384384
,min_ram => 1
385385
},
386386
mate_bionic => {
387-
name => 'Ubuntu Mate Bionic 64 bits'
387+
name => 'Ubuntu Mate 18.04 Bionic 64 bits'
388388
,description => 'Ubuntu Mate 18.04 (Bionic Beaver) 64 bits'
389389
,arch => 'x86_64'
390390
,xml => 'bionic-amd64.xml'
@@ -394,7 +394,7 @@ sub _update_isos {
394394
,min_ram => 1
395395
},
396396
mate_bionic_i386 => {
397-
name => 'Ubuntu Mate Bionic 32 bits'
397+
name => 'Ubuntu Mate 18.04 Bionic 32 bits'
398398
,description => 'Ubuntu Mate 18.04 (Bionic Beaver) 32 bits'
399399
,arch => 'i686'
400400
,xml => 'bionic-i386.xml'
@@ -403,29 +403,8 @@ sub _update_isos {
403403
,sha256_url => '$url/SHA256SUMS'
404404
,min_ram => 1
405405
},
406-
ubuntu_xenial => {
407-
name => 'Ubuntu Xenial Xerus 64 bits'
408-
,description => 'Ubuntu 16.04 LTS Xenial Xerus 64 bits'
409-
,arch => 'x86_64'
410-
,xml => 'xenial64-amd64.xml'
411-
,xml_volume => 'xenial64-volume.xml'
412-
,url => 'http://releases.ubuntu.com/16.04/ubuntu-16.04.*-desktop-amd64.iso'
413-
,sha256_url => '$url/SHA256SUMS'
414-
,min_disk_size => '10'
415-
},
416-
417-
mate_xenial => {
418-
name => 'Ubuntu Mate Xenial'
419-
,description => 'Ubuntu Mate 16.04.3 (Xenial) 64 bits'
420-
,arch => 'x86_64'
421-
,xml => 'yakkety64-amd64.xml'
422-
,xml_volume => 'yakkety64-volume.xml'
423-
,url => 'http://cdimage.ubuntu.com/ubuntu-mate/releases/16.04.*/release/ubuntu-mate-16.04.*-desktop-amd64.iso'
424-
,sha256_url => '$url/SHA256SUMS'
425-
,min_disk_size => '10'
426-
},
427406
,focal_fossa=> {
428-
name => 'Ubuntu Focal Fossa'
407+
name => 'Ubuntu 20.04 Focal Fossa'
429408
,description => 'Ubuntu 20.04 Focal Fossa 64 bits'
430409
,arch => 'x86_64'
431410
,xml => 'focal_fossa-amd64.xml'
@@ -439,7 +418,7 @@ sub _update_isos {
439418
,arch => 'x86_64'
440419
}
441420
,jammy_jellyfish => {
442-
name => 'Ubuntu Jammy Jellyfish'
421+
name => 'Ubuntu 22.04 Jammy Jellyfish'
443422
,description => 'Ubuntu 22.04 Jammy Jellyfish 64 bits'
444423
,arch => 'x86_64'
445424
,xml => 'focal_fossa-amd64.xml'
@@ -455,7 +434,7 @@ sub _update_isos {
455434
}
456435

457436
,bionic=> {
458-
name => 'Ubuntu Bionic Beaver'
437+
name => 'Ubuntu 18.04 Bionic Beaver'
459438
,description => 'Ubuntu 18.04 Bionic Beaver 64 bits'
460439
,arch => 'x86_64'
461440
,xml => 'bionic-amd64.xml'
@@ -467,6 +446,22 @@ sub _update_isos {
467446
,min_ram => 1
468447
,arch => 'x86_64'
469448
}
449+
,ubuntu_noble => {
450+
name => 'Ubuntu 24.04 Noble Nombat'
451+
,description => 'Ubuntu 24.04 Noble Nombat 64 bits'
452+
,arch => 'x86_64'
453+
,xml => 'focal_fossa-amd64.xml'
454+
,xml_volume => 'focal_fossa64-volume.xml'
455+
,url => 'http://releases.ubuntu.com/24.04/'
456+
,file_re => '^ubuntu-24.04.*-desktop-amd64.iso'
457+
,sha256_url => '$url/SHA256SUMS'
458+
,min_disk_size => '14'
459+
,min_ram => 4
460+
,options => { machine => 'pc-q35', bios => 'UEFI' }
461+
,arch => 'x86_64'
462+
463+
}
464+
470465

471466

472467
,mint20_64 => {
@@ -751,7 +746,7 @@ sub _update_isos {
751746
}
752747

753748
,devuan_beowulf_amd64=> {
754-
name =>'Devuan Beowulf 64 bits'
749+
name =>'Devuan 10 Beowulf 64 bits'
755750
,description => 'Devuan Beowulf Desktop Live (amd64)'
756751
,arch => 'x86_64'
757752
,url => 'http://tw1.mirror.blendbyte.net/devuan-cd/devuan_beowulf/desktop-live/'
@@ -762,7 +757,7 @@ sub _update_isos {
762757
,min_disk_size => '10'
763758
}
764759
,devuan_beowulf_i386=> {
765-
name =>'Devuan Beowulf 32 bits'
760+
name =>'Devuan 10 Beowulf 32 bits'
766761
,description => 'Devuan Beowulf Desktop Live (i386)'
767762
,arch => 'i686'
768763
,url => 'http://tw1.mirror.blendbyte.net/devuan-cd/devuan_beowulf/desktop-live/'
@@ -772,6 +767,29 @@ sub _update_isos {
772767
,xml_volume => 'jessie-volume.xml'
773768
,min_disk_size => '10'
774769
}
770+
,devuan_daedalus_amd64=> {
771+
name =>'Devuan 12 Daedalus 64 bits'
772+
,description => 'Devuan Daedalus Desktop Live (amd64)'
773+
,arch => 'x86_64'
774+
,url => 'http://tw1.mirror.blendbyte.net/devuan-cd/devuan_daedalus/desktop-live/'
775+
,file_re => 'devuan_daedalus_.*_amd64_desktop-live.iso'
776+
,sha256_url => '$url/SHASUMS.txt'
777+
,xml => 'jessie-amd64.xml'
778+
,xml_volume => 'jessie-volume.xml'
779+
,min_disk_size => '10'
780+
}
781+
,devuan_daedalus_i386=> {
782+
name =>'Devuan 12 Daedalus 32 bits'
783+
,description => 'Devuan Daedalus Desktop Live (i386)'
784+
,arch => 'i686'
785+
,url => 'http://tw1.mirror.blendbyte.net/devuan-cd/devuan_daedalus/desktop-live/'
786+
,file_re => 'devuan_daedalus_.*_i386_desktop-live.iso'
787+
,sha256_url => '$url/SHASUMS.txt'
788+
,xml => 'jessie-i386.xml'
789+
,xml_volume => 'jessie-volume.xml'
790+
,min_disk_size => '10'
791+
}
792+
775793
,parrot_xfce_amd64 => {
776794
name => 'Parrot Home Edition XFCE'
777795
,description => 'Parrot Home Edition XFCE 64 Bits'

t/request/15_download.t

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,8 @@ for my $vm_name ('KVM') {
9090
#
9191
# Request for Debian Streth ISO
9292
for my $iso (search_id_isos) {
93+
next unless $iso->{name} =~ /Ubuntu.*24/
94+
|| $iso->{name} =~ /De.an 12/;
9395
test_download($vm, $iso,1);
9496
}
9597
#test_download($vm, $id_iso,0);

0 commit comments

Comments
 (0)