diff --git a/helpers/DATA/osinfo-db/01_fix_t9_broken_links.patch b/helpers/DATA/osinfo-db/01_fix_t9_broken_links.patch new file mode 100644 index 0000000..75a1732 --- /dev/null +++ b/helpers/DATA/osinfo-db/01_fix_t9_broken_links.patch @@ -0,0 +1,52 @@ +From 99dc628f9a606921968d8433facf3ded0461384f Mon Sep 17 00:00:00 2001 +From: Victor Toso +Date: Mon, 3 Apr 2023 15:05:36 +0200 +Subject: [PATCH] trisquel9: fix broken links + +Trisquel already released versions 10 and 11 and has removed from its +site the iso images. Remove the urls from the database. + +Signed-off-by: Victor Toso +--- + data/os/trisquel.info/trisquel-9.xml.in | 4 ---- + 1 file changed, 4 deletions(-) + +diff --git a/data/os/trisquel.info/trisquel-9.xml.in b/data/os/trisquel.info/trisquel-9.xml.in +index 9ff6f1a5e..ba94fad9d 100644 +--- a/data/os/trisquel.info/trisquel-9.xml.in ++++ b/data/os/trisquel.info/trisquel-9.xml.in +@@ -28,7 +28,6 @@ + + + +- https://cdimage.trisquel.info/trisquel-images/trisquel_9.0.2_amd64.iso + + trisquel 9.0.(\d) amd64.* + +@@ -37,7 +36,6 @@ + + + +- https://cdimage.trisquel.info/trisquel-images/trisquel-mini_9.0.2_amd64.iso + + trisquel-mini 9.0.(\d) amd64.* + +@@ -46,7 +44,6 @@ + + + +- https://cdimage.trisquel.info/trisquel-images/trisquel-sugar_9.0.2_amd64.iso + + trisquel-sugar 9.0.(\d) amd64.* + +@@ -55,7 +52,6 @@ + + + +- https://cdimage.trisquel.info/trisquel-images/triskel_9.0.2_amd64.iso + + triskel 9.0.(\d) amd64.* + +-- +GitLab + diff --git a/helpers/DATA/osinfo-db/guix_1.3-e75ed5cd.patch b/helpers/DATA/osinfo-db/guix_1.3-e75ed5cd.patch deleted file mode 100644 index a57e6dc..0000000 --- a/helpers/DATA/osinfo-db/guix_1.3-e75ed5cd.patch +++ /dev/null @@ -1,150 +0,0 @@ -From e75ed5cdfb18ba61366881589dabdcfa253fca78 Mon Sep 17 00:00:00 2001 -From: Mathieu Othacehe -Date: Tue, 28 Sep 2021 16:45:52 +0000 -Subject: [PATCH] guix: Add 1.3 release. - -Signed-off-by: Mathieu Othacehe ---- - data/os/guix.gnu.org/guix-1.3.xml.in | 48 +++++++++++++++++++ - ...ix-system-install-1.3.0.i686-linux.iso.txt | 33 +++++++++++++ - ...-system-install-1.3.0.x86_64-linux.iso.txt | 33 +++++++++++++ - 3 files changed, 114 insertions(+) - create mode 100644 data/os/guix.gnu.org/guix-1.3.xml.in - create mode 100644 tests/isodata/guix/guix-1.3/guix-system-install-1.3.0.i686-linux.iso.txt - create mode 100644 tests/isodata/guix/guix-1.3/guix-system-install-1.3.0.x86_64-linux.iso.txt - -diff --git a/data/os/guix.gnu.org/guix-1.3.xml.in b/data/os/guix.gnu.org/guix-1.3.xml.in -new file mode 100644 -index 00000000..c1e53850 ---- /dev/null -+++ b/data/os/guix.gnu.org/guix-1.3.xml.in -@@ -0,0 +1,48 @@ -+ -+ -+ -+ guix-1.3 -+ Guix 1.3 -+ 1.3 -+ Guix Contributors -+ linux -+ guix -+ -+ -+ -+ 2021-05-11 -+ -+ -+ https://ftp.gnu.org/gnu/guix/guix-system-install-1.3.0.i686-linux.iso -+ -+ GUIX_I686-LINUX_1.3.0 -+ 636252160 -+ -+ gnu/store/506a8398hzkdqcm6y7r45fm0dvpaagks-linux-libre-5.4.31/bzImage -+ gnu/store/f1gga79nhl5if3rmm9n793c6jmdkb0j9-raw-initrd/initrd.cpio.gz -+ -+ -+ https://ftp.gnu.org/gnu/guix/guix-system-install-1.3.0.x86_64-linux.iso -+ -+ GUIX_X86_64-LINUX_1.3.0 -+ 638605312 -+ -+ gnu/store/g56i8savnfr7981fil03idkjl0syj29d-linux-libre-5.4.31/bzImage -+ gnu/store/33mpn6f0hy4m73m4isd5lg83qxwclld8-raw-initrd/initrd.cpio.gz -+ -+ -+ -+ -+ -+ 536870912 -+ 4294967296 -+ -+ -+ -+ 2147483648 -+ 21474836480 -+ -+ -+ -+ -diff --git a/tests/isodata/guix/guix-1.3/guix-system-install-1.3.0.i686-linux.iso.txt b/tests/isodata/guix/guix-1.3/guix-system-install-1.3.0.i686-linux.iso.txt -new file mode 100644 -index 00000000..1a5c24cd ---- /dev/null -+++ b/tests/isodata/guix/guix-1.3/guix-system-install-1.3.0.i686-linux.iso.txt -@@ -0,0 +1,33 @@ -+CD-ROM is in ISO 9660 format -+System id: -+Volume id: GUIX_I686-LINUX_1.3.0 -+Volume set id: -+Publisher id: -+Data preparer id: XORRISO-1.5.2 2019.10.26.180001, LIBISOBURN-1.5.2, LIBISOFS-1.5.2, LIBBURN-1.5.2 -+Application id: -+Copyright File id: -+Abstract File id: -+Bibliographic File id: -+Volume set size is: 1 -+Volume set sequence number is: 1 -+Logical block size is: 2048 -+Volume size is: 310670 -+El Torito VD version 1 found, boot catalog is in sector 49266 -+NO Joliet present -+ -+SUSP signatures version 1 found -+Rock Ridge signatures version 1 found -+Rock Ridge id 'RRIP_1991A' -+Eltorito validation header: -+ Hid 1 -+ Arch 0 (x86) -+ ID '' -+ Cksum AA 55 OK -+ Key 55 AA -+ Eltorito defaultboot header: -+ Bootid 88 (bootable) -+ Boot media 0 (No Emulation Boot) -+ Load segment 0 -+ Sys type 0 -+ Nsect 4 -+ Bootoff C9C9 51657 -diff --git a/tests/isodata/guix/guix-1.3/guix-system-install-1.3.0.x86_64-linux.iso.txt b/tests/isodata/guix/guix-1.3/guix-system-install-1.3.0.x86_64-linux.iso.txt -new file mode 100644 -index 00000000..f65ca7f3 ---- /dev/null -+++ b/tests/isodata/guix/guix-1.3/guix-system-install-1.3.0.x86_64-linux.iso.txt -@@ -0,0 +1,33 @@ -+CD-ROM is in ISO 9660 format -+System id: -+Volume id: GUIX_X86_64-LINUX_1.3.0 -+Volume set id: -+Publisher id: -+Data preparer id: XORRISO-1.5.2 2019.10.26.180001, LIBISOBURN-1.5.2, LIBISOFS-1.5.2, LIBBURN-1.5.2 -+Application id: -+Copyright File id: -+Abstract File id: -+Bibliographic File id: -+Volume set size is: 1 -+Volume set sequence number is: 1 -+Logical block size is: 2048 -+Volume size is: 311819 -+El Torito VD version 1 found, boot catalog is in sector 49075 -+NO Joliet present -+ -+SUSP signatures version 1 found -+Rock Ridge signatures version 1 found -+Rock Ridge id 'RRIP_1991A' -+Eltorito validation header: -+ Hid 1 -+ Arch 0 (x86) -+ ID '' -+ Cksum AA 55 OK -+ Key 55 AA -+ Eltorito defaultboot header: -+ Bootid 88 (bootable) -+ Boot media 0 (No Emulation Boot) -+ Load segment 0 -+ Sys type 0 -+ Nsect 4 -+ Bootoff C4F4 50420 --- -GitLab - diff --git a/helpers/DATA/osinfo-db/guix_base-9bb849fe.patch b/helpers/DATA/osinfo-db/guix_base-9bb849fe.patch deleted file mode 100644 index 130dd2f..0000000 --- a/helpers/DATA/osinfo-db/guix_base-9bb849fe.patch +++ /dev/null @@ -1,148 +0,0 @@ -From 9bb849fee4fd22d58a1e3d154c26272e1f642605 Mon Sep 17 00:00:00 2001 -From: Julien Lepiller -Date: Sat, 29 Aug 2020 00:53:56 +0200 -Subject: [PATCH] guix: add distro - -Signed-off-by: Julien Lepiller ---- - data/os/guix.gnu.org/guix-1.1.xml.in | 46 +++++++++++++++++++ - ...ix-system-install-1.1.0.i686-linux.iso.txt | 33 +++++++++++++ - ...-system-install-1.1.0.x86_64-linux.iso.txt | 33 +++++++++++++ - 3 files changed, 112 insertions(+) - create mode 100644 data/os/guix.gnu.org/guix-1.1.xml.in - create mode 100644 tests/isodata/guix/guix-1.1/guix-system-install-1.1.0.i686-linux.iso.txt - create mode 100644 tests/isodata/guix/guix-1.1/guix-system-install-1.1.0.x86_64-linux.iso.txt - -diff --git a/data/os/guix.gnu.org/guix-1.1.xml.in b/data/os/guix.gnu.org/guix-1.1.xml.in -new file mode 100644 -index 00000000..5533687e ---- /dev/null -+++ b/data/os/guix.gnu.org/guix-1.1.xml.in -@@ -0,0 +1,46 @@ -+ -+ -+ -+ guix-1.1 -+ Guix 1.1 -+ 1.1 -+ Guix Contributors -+ linux -+ guix -+ -+ 2020-04-15 -+ -+ -+ -+ -+ GUIX_IMAGE -+ 584865792 -+ -+ gnu/store/506a8398hzkdqcm6y7r45fm0dvpaagks-linux-libre-5.4.31/bzImage -+ gnu/store/f1gga79nhl5if3rmm9n793c6jmdkb0j9-raw-initrd/initrd.cpio.gz -+ -+ -+ -+ -+ GUIX_IMAGE -+ 586209280 -+ -+ gnu/store/g56i8savnfr7981fil03idkjl0syj29d-linux-libre-5.4.31/bzImage -+ gnu/store/33mpn6f0hy4m73m4isd5lg83qxwclld8-raw-initrd/initrd.cpio.gz -+ -+ -+ -+ -+ -+ 536870912 -+ 4294967296 -+ -+ -+ -+ 2147483648 -+ 21474836480 -+ -+ -+ -+ -diff --git a/tests/isodata/guix/guix-1.1/guix-system-install-1.1.0.i686-linux.iso.txt b/tests/isodata/guix/guix-1.1/guix-system-install-1.1.0.i686-linux.iso.txt -new file mode 100644 -index 00000000..2bda2615 ---- /dev/null -+++ b/tests/isodata/guix/guix-1.1/guix-system-install-1.1.0.i686-linux.iso.txt -@@ -0,0 +1,33 @@ -+CD-ROM is in ISO 9660 format -+System id: -+Volume id: GUIX_IMAGE -+Volume set id: -+Publisher id: -+Data preparer id: XORRISO-1.5.2 2019.10.26.180001, LIBISOBURN-1.5.2, LIBISOFS-1.5.2, LIBBURN-1.5.2 -+Application id: -+Copyright File id: -+Abstract File id: -+Bibliographic File id: -+Volume set size is: 1 -+Volume set sequence number is: 1 -+Logical block size is: 2048 -+Volume size is: 285579 -+El Torito VD version 1 found, boot catalog is in sector 49266 -+NO Joliet present -+ -+SUSP signatures version 1 found -+Rock Ridge signatures version 1 found -+Rock Ridge id 'RRIP_1991A' -+Eltorito validation header: -+ Hid 1 -+ Arch 0 (x86) -+ ID '' -+ Cksum AA 55 OK -+ Key 55 AA -+ Eltorito defaultboot header: -+ Bootid 88 (bootable) -+ Boot media 0 (No Emulation Boot) -+ Load segment 0 -+ Sys type 0 -+ Nsect 4 -+ Bootoff C9C9 51657 -diff --git a/tests/isodata/guix/guix-1.1/guix-system-install-1.1.0.x86_64-linux.iso.txt b/tests/isodata/guix/guix-1.1/guix-system-install-1.1.0.x86_64-linux.iso.txt -new file mode 100644 -index 00000000..840368b3 ---- /dev/null -+++ b/tests/isodata/guix/guix-1.1/guix-system-install-1.1.0.x86_64-linux.iso.txt -@@ -0,0 +1,33 @@ -+CD-ROM is in ISO 9660 format -+System id: -+Volume id: GUIX_IMAGE -+Volume set id: -+Publisher id: -+Data preparer id: XORRISO-1.5.2 2019.10.26.180001, LIBISOBURN-1.5.2, LIBISOFS-1.5.2, LIBBURN-1.5.2 -+Application id: -+Copyright File id: -+Abstract File id: -+Bibliographic File id: -+Volume set size is: 1 -+Volume set sequence number is: 1 -+Logical block size is: 2048 -+Volume size is: 286235 -+El Torito VD version 1 found, boot catalog is in sector 49075 -+NO Joliet present -+ -+SUSP signatures version 1 found -+Rock Ridge signatures version 1 found -+Rock Ridge id 'RRIP_1991A' -+Eltorito validation header: -+ Hid 1 -+ Arch 0 (x86) -+ ID '' -+ Cksum AA 55 OK -+ Key 55 AA -+ Eltorito defaultboot header: -+ Bootid 88 (bootable) -+ Boot media 0 (No Emulation Boot) -+ Load segment 0 -+ Sys type 0 -+ Nsect 4 -+ Bootoff C4F4 50420 --- -GitLab - diff --git a/helpers/DATA/osinfo-db/hyperbola_03-a77800ad.patch b/helpers/DATA/osinfo-db/hyperbola_03-a77800ad.patch deleted file mode 100644 index 81d465c..0000000 --- a/helpers/DATA/osinfo-db/hyperbola_03-a77800ad.patch +++ /dev/null @@ -1,160 +0,0 @@ -From a77800ad268fef69928a93e0e5083bab22fd6155 Mon Sep 17 00:00:00 2001 -From: Mercy Corder -Date: Sun, 12 Dec 2021 21:48:08 +0000 -Subject: [PATCH] add Hyperbola - ---- - data/os/hyperbola.info/hyperbola-03.xml.in | 65 +++++++++++++++++++ - .../hyperbola-milky-way-v0.3.1-dual.iso.txt | 30 +++++++++ - ...hypertalking-milky-way-v0.3.1-dual.iso.txt | 30 +++++++++ - 3 files changed, 125 insertions(+) - create mode 100644 data/os/hyperbola.info/hyperbola-03.xml.in - create mode 100644 tests/isodata/hyperbola/hyperbola-milky-way-v0.3.1-dual.iso.txt - create mode 100644 tests/isodata/hyperbola/hypertalking-milky-way-v0.3.1-dual.iso.txt - -diff --git a/data/os/hyperbola.info/hyperbola-03.xml.in b/data/os/hyperbola.info/hyperbola-03.xml.in -new file mode 100644 -index 00000000..893cda51 ---- /dev/null -+++ b/data/os/hyperbola.info/hyperbola-03.xml.in -@@ -0,0 +1,65 @@ -+ -+ -+ -+ -+ hyperbola03 -+ Hyperbola -+ 03 -+ Hyperbola Project -+ linux -+ hyperbola -+ 2019-09-23 -+ -+ -+ Hypebola 03 -+ -+ -+ Hypetalking 03 -+ -+ -+ -+ -+ -+ https://repo.hyperbola.info:50000/other/live_images/gnu-plus-linux-libre/hyperbola-milky-way-v0.3.1/hyperbola-milky-way-v0.3.1-dual.iso -+ -+ HYPER_v031.* -+ 691011584 -+ -+ hyperbola/boot/x86_64/vmlinuz -+ hyperbola/boot/x86_64/hyperiso.img -+ -+ -+ -+ https://repo.hyperbola.info:50000/other/live_images/gnu-plus-linux-libre/hypertalking-milky-way-v0.3.1/hypertalking-milky-way-v0.3.1-dual.iso -+ -+ HYPER_v031.* -+ 721420288 -+ -+ hyperbola/boot/x86_64/vmlinuz -+ hyperbola/boot/x86_64/hyperiso.img -+ -+ -+ -+ -+ 1 -+ 1000000000 -+ 53687091 -+ 1000000000 -+ -+ -+ 1 -+ 1000000000 -+ 67108864 -+ 16106127360 -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -diff --git a/tests/isodata/hyperbola/hyperbola-milky-way-v0.3.1-dual.iso.txt b/tests/isodata/hyperbola/hyperbola-milky-way-v0.3.1-dual.iso.txt -new file mode 100644 -index 00000000..e584f713 ---- /dev/null -+++ b/tests/isodata/hyperbola/hyperbola-milky-way-v0.3.1-dual.iso.txt -@@ -0,0 +1,30 @@ -+CD-ROM is in ISO 9660 format -+System id: -+Volume id: HYPER_v031 -+Volume set id: -+Publisher id: HYPERBOLA GNU/LINUX-LIBRE -+Data preparer id: PREPARED BY MKHYPERISO -+Application id: HYPERBOLA GNU/LINUX-LIBRE LIVE/RESCUE CD -+Copyright File id: -+Abstract File id: -+Bibliographic File id: -+Volume set size is: 1 -+Volume set sequence number is: 1 -+Logical block size is: 2048 -+Volume size is: 337408 -+El Torito VD version 1 found, boot catalog is in sector 41 -+NO Joliet present -+Rock Ridge signatures version 1 found -+Eltorito validation header: -+ Hid 1 -+ Arch 0 (x86) -+ ID '' -+ Key 55 AA -+ Eltorito defaultboot header: -+ Bootid 88 (bootable) -+ Boot media 0 (No Emulation Boot) -+ Load segment 0 -+ Sys type 0 -+ Nsect 4 -+ Bootoff 4C2A 19498 -+ -diff --git a/tests/isodata/hyperbola/hypertalking-milky-way-v0.3.1-dual.iso.txt b/tests/isodata/hyperbola/hypertalking-milky-way-v0.3.1-dual.iso.txt -new file mode 100644 -index 00000000..f7598bd5 ---- /dev/null -+++ b/tests/isodata/hyperbola/hypertalking-milky-way-v0.3.1-dual.iso.txt -@@ -0,0 +1,30 @@ -+CD-ROM is in ISO 9660 format -+System id: -+Volume id: HYPER_v031 -+Volume set id: -+Publisher id: HYPERBOLA GNU/LINUX-LIBRE -+Data preparer id: PREPARED BY MKHYPERISO -+Application id: HYPERBOLA GNU/LINUX-LIBRE LIVE/RESCUE CD -+Copyright File id: -+Abstract File id: -+Bibliographic File id: -+Volume set size is: 1 -+Volume set sequence number is: 1 -+Logical block size is: 2048 -+Volume size is: 352256 -+El Torito VD version 1 found, boot catalog is in sector 41 -+NO Joliet present -+Rock Ridge signatures version 1 found -+Eltorito validation header: -+ Hid 1 -+ Arch 0 (x86) -+ ID '' -+ Key 55 AA -+ Eltorito defaultboot header: -+ Bootid 88 (bootable) -+ Boot media 0 (No Emulation Boot) -+ Load segment 0 -+ Sys type 0 -+ Nsect 4 -+ Bootoff 4C2A 19498 -+ --- -GitLab - diff --git a/helpers/DATA/osinfo-db/pure-os_8-3570a396.patch b/helpers/DATA/osinfo-db/pure-os_8-3570a396.patch deleted file mode 100644 index 18b28df..0000000 --- a/helpers/DATA/osinfo-db/pure-os_8-3570a396.patch +++ /dev/null @@ -1,58 +0,0 @@ -From 3570a3965b6ebce5b59b8b2e96f0730f4c3e1340 Mon Sep 17 00:00:00 2001 -From: Chris Lamb -Date: Mon, 11 Feb 2019 23:24:40 +0100 -Subject: [PATCH] pureos: Add generic PureOS entry. -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Signed-off-by: Chris Lamb -Reviewed-by: Fabiano Fidêncio ---- - data/os/pureos.net/pureos-8.xml.in | 34 ++++++++++++++++++++++++++++++ - 1 file changed, 34 insertions(+) - create mode 100644 data/os/pureos.net/pureos-8.xml.in - -diff --git a/data/os/pureos.net/pureos-8.xml.in b/data/os/pureos.net/pureos-8.xml.in -new file mode 100644 -index 00000000..13c5ba6b ---- /dev/null -+++ b/data/os/pureos.net/pureos-8.xml.in -@@ -0,0 +1,34 @@ -+ -+ -+ -+ pureos8 -+ PureOS -+ 8 -+ Purism, SPC -+ linux -+ pureos -+ -+ -+ -+ 1000000000 -+ 1 -+ 1073741824 -+ 5368709120 -+ -+ -+ 1000000000 -+ 1073741824 -+ 16106127360 -+ -+ -+ -+ -+ -+ PureOS 8.0 GNOME Live -+ -+ casper/vmlinuz -+ casper/initrd.img -+ -+ -+ --- -GitLab - diff --git a/helpers/DATA/osinfo-db/recommended-distros b/helpers/DATA/osinfo-db/recommended-distros new file mode 100644 index 0000000..a45299b --- /dev/null +++ b/helpers/DATA/osinfo-db/recommended-distros @@ -0,0 +1,9 @@ +# Distro - Domain - Lowercase_name +Dragora - dragora.org - dragora +Dyne:bolic - dyne.org - dynebolic +Guix - guix.gnu.org - guix +Hyperbola - hyperbola.info - hyperbola +Parabola - parabola.nu - parabola +PureOS - pureos.net - pureos +Trisquel - trisquel.info - trisquel +Ututo - ututo.org - ututo diff --git a/helpers/DATA/osinfo-db/trisquel9-e43f4830.patch b/helpers/DATA/osinfo-db/trisquel9-e43f4830.patch deleted file mode 100644 index 8705b82..0000000 --- a/helpers/DATA/osinfo-db/trisquel9-e43f4830.patch +++ /dev/null @@ -1,245 +0,0 @@ -From e43f4830933fa4f88ab6f6017be566bea559305d Mon Sep 17 00:00:00 2001 -From: Mercy -Date: Fri, 10 Dec 2021 23:35:10 -0700 -Subject: [PATCH] Trisquel: Add Trisquel 9 Etiona Trisquel GNU/Linux is a free - OS for home users, small businesses, and education - -Signed-off-by: Mercy ---- - data/os/trisquel.info/trisquel-9.xml.in | 76 +++++++++++++++++++ - .../trisquel9/triskel_9.0.1_amd64.iso.txt | 29 +++++++ - .../trisquel-mini_9.0.1_amd64.iso.txt | 29 +++++++ - .../trisquel-sugar_9.0.1_amd64.iso.txt | 29 +++++++ - .../trisquel9/trisquel_9.0.1_amd64.iso.txt | 29 +++++++ - 5 files changed, 192 insertions(+) - create mode 100644 data/os/trisquel.info/trisquel-9.xml.in - create mode 100644 tests/isodata/trisquel/trisquel9/triskel_9.0.1_amd64.iso.txt - create mode 100644 tests/isodata/trisquel/trisquel9/trisquel-mini_9.0.1_amd64.iso.txt - create mode 100644 tests/isodata/trisquel/trisquel9/trisquel-sugar_9.0.1_amd64.iso.txt - create mode 100644 tests/isodata/trisquel/trisquel9/trisquel_9.0.1_amd64.iso.txt - -diff --git a/data/os/trisquel.info/trisquel-9.xml.in b/data/os/trisquel.info/trisquel-9.xml.in -new file mode 100644 -index 00000000..2d3f5352 ---- /dev/null -+++ b/data/os/trisquel.info/trisquel-9.xml.in -@@ -0,0 +1,76 @@ -+ -+ -+ -+ -+ trisquel9 -+ Trisquel -+ 9 -+ The Trisquel Project -+ linux -+ trisquel -+ 2021-10-16 -+ -+ -+ -+ Trisquel 9 -+ -+ -+ Triskel 9 -+ -+ -+ Trisquel 9 Mini -+ -+ -+ Trisquel 9 Sugar Toast -+ -+ -+ -+ -+ -+ https://cdimage.trisquel.info/trisquel-images/trisquel_9.0.1_amd64.iso -+ -+ trisquel 9.0.1 amd64.* -+ -+ casper/vmlinuz -+ casper/initrd -+ -+ -+ -+ https://cdimage.trisquel.info/trisquel-images/trisquel-mini_9.0.1_amd64.iso -+ -+ trisquel-mini 9.0.1 amd64.* -+ -+ casper/vmlinuz -+ casper/initrd -+ -+ -+ -+ https://cdimage.trisquel.info/trisquel-images/trisquel-sugar_9.0.1_amd64.iso -+ -+ trisquel-sugar 9.0.1 amd64.* -+ -+ casper/vmlinuz -+ casper/initrd -+ -+ -+ -+ https://cdimage.trisquel.info/trisquel-images/triskel_9.0.1_amd64.iso -+ -+ triskel 9.0.1 amd64.* -+ -+ casper/vmlinuz -+ casper/initrd -+ -+ -+ -+ -+ -+ 1000000000 -+ 1073741824 -+ 16106127360 -+ -+ -+ -+ -+ -diff --git a/tests/isodata/trisquel/trisquel9/triskel_9.0.1_amd64.iso.txt b/tests/isodata/trisquel/trisquel9/triskel_9.0.1_amd64.iso.txt -new file mode 100644 -index 00000000..b220fd50 ---- /dev/null -+++ b/tests/isodata/trisquel/trisquel9/triskel_9.0.1_amd64.iso.txt -@@ -0,0 +1,29 @@ -+CD-ROM is in ISO 9660 format -+System id: -+Volume id: triskel 9.0.1 amd64 -+Volume set id: -+Publisher id: -+Data preparer id: XORRISO-1.4.8 2017.09.12.143001, LIBISOBURN-1.4.8, LIBISOFS-1.4.8, LIBBURN-1.4.8 -+Application id: TRISKEL 9.0.1 AMD64 -+Copyright File id: -+Abstract File id: -+Bibliographic File id: -+Volume set size is: 1 -+Volume set sequence number is: 1 -+Logical block size is: 2048 -+Volume size is: 1032192 -+El Torito VD version 1 found, boot catalog is in sector 79 -+Joliet with UCS level 3 found -+Rock Ridge signatures version 1 found -+Eltorito validation header: -+ Hid 1 -+ Arch 0 (x86) -+ ID '' -+ Key 55 AA -+ Eltorito defaultboot header: -+ Bootid 88 (bootable) -+ Boot media 0 (No Emulation Boot) -+ Load segment 0 -+ Sys type 0 -+ Nsect 4 -+ Bootoff 250 592 -diff --git a/tests/isodata/trisquel/trisquel9/trisquel-mini_9.0.1_amd64.iso.txt b/tests/isodata/trisquel/trisquel9/trisquel-mini_9.0.1_amd64.iso.txt -new file mode 100644 -index 00000000..747f1be5 ---- /dev/null -+++ b/tests/isodata/trisquel/trisquel9/trisquel-mini_9.0.1_amd64.iso.txt -@@ -0,0 +1,29 @@ -+CD-ROM is in ISO 9660 format -+System id: -+Volume id: trisquel-mini 9.0.1 amd64 -+Volume set id: -+Publisher id: -+Data preparer id: XORRISO-1.4.8 2017.09.12.143001, LIBISOBURN-1.4.8, LIBISOFS-1.4.8, LIBBURN-1.4.8 -+Application id: TRISQUEL-MINI 9.0.1 AMD64 -+Copyright File id: -+Abstract File id: -+Bibliographic File id: -+Volume set size is: 1 -+Volume set sequence number is: 1 -+Logical block size is: 2048 -+Volume size is: 625856 -+El Torito VD version 1 found, boot catalog is in sector 79 -+Joliet with UCS level 3 found -+Rock Ridge signatures version 1 found -+Eltorito validation header: -+ Hid 1 -+ Arch 0 (x86) -+ ID '' -+ Key 55 AA -+ Eltorito defaultboot header: -+ Bootid 88 (bootable) -+ Boot media 0 (No Emulation Boot) -+ Load segment 0 -+ Sys type 0 -+ Nsect 4 -+ Bootoff 250 592 -diff --git a/tests/isodata/trisquel/trisquel9/trisquel-sugar_9.0.1_amd64.iso.txt b/tests/isodata/trisquel/trisquel9/trisquel-sugar_9.0.1_amd64.iso.txt -new file mode 100644 -index 00000000..2b45e3e5 ---- /dev/null -+++ b/tests/isodata/trisquel/trisquel9/trisquel-sugar_9.0.1_amd64.iso.txt -@@ -0,0 +1,29 @@ -+CD-ROM is in ISO 9660 format -+System id: -+Volume id: trisquel-sugar 9.0.1 amd64 -+Volume set id: -+Publisher id: -+Data preparer id: XORRISO-1.4.8 2017.09.12.143001, LIBISOBURN-1.4.8, LIBISOFS-1.4.8, LIBBURN-1.4.8 -+Application id: TRISQUEL-SUGAR 9.0.1 AMD64 -+Copyright File id: -+Abstract File id: -+Bibliographic File id: -+Volume set size is: 1 -+Volume set sequence number is: 1 -+Logical block size is: 2048 -+Volume size is: 582336 -+El Torito VD version 1 found, boot catalog is in sector 79 -+Joliet with UCS level 3 found -+Rock Ridge signatures version 1 found -+Eltorito validation header: -+ Hid 1 -+ Arch 0 (x86) -+ ID '' -+ Key 55 AA -+ Eltorito defaultboot header: -+ Bootid 88 (bootable) -+ Boot media 0 (No Emulation Boot) -+ Load segment 0 -+ Sys type 0 -+ Nsect 4 -+ Bootoff 250 592 -diff --git a/tests/isodata/trisquel/trisquel9/trisquel_9.0.1_amd64.iso.txt b/tests/isodata/trisquel/trisquel9/trisquel_9.0.1_amd64.iso.txt -new file mode 100644 -index 00000000..6bfcb7dd ---- /dev/null -+++ b/tests/isodata/trisquel/trisquel9/trisquel_9.0.1_amd64.iso.txt -@@ -0,0 +1,29 @@ -+CD-ROM is in ISO 9660 format -+System id: -+Volume id: trisquel 9.0.1 amd64 -+Volume set id: -+Publisher id: -+Data preparer id: XORRISO-1.4.8 2017.09.12.143001, LIBISOBURN-1.4.8, LIBISOFS-1.4.8, LIBBURN-1.4.8 -+Application id: TRISQUEL 9.0.1 AMD64 -+Copyright File id: -+Abstract File id: -+Bibliographic File id: -+Volume set size is: 1 -+Volume set sequence number is: 1 -+Logical block size is: 2048 -+Volume size is: 1340864 -+El Torito VD version 1 found, boot catalog is in sector 79 -+Joliet with UCS level 3 found -+Rock Ridge signatures version 1 found -+Eltorito validation header: -+ Hid 1 -+ Arch 0 (x86) -+ ID '' -+ Key 55 AA -+ Eltorito defaultboot header: -+ Bootid 88 (bootable) -+ Boot media 0 (No Emulation Boot) -+ Load segment 0 -+ Sys type 0 -+ Nsect 4 -+ Bootoff 250 592 --- -GitLab - diff --git a/helpers/make-osinfo-db b/helpers/make-osinfo-db index 1a85f6b..5bcc3c8 100644 --- a/helpers/make-osinfo-db +++ b/helpers/make-osinfo-db @@ -18,16 +18,79 @@ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # -VERSION=1 +VERSION=2 + +EXTERNAL='deb-src http://ftp.us.debian.org/debian bookworm main' +REPOKEY=04EE7237B7D453EC . ./config +rd_domain=($(cat $DATA/recommended-distros|grep -v \#|awk '{print$3}')) +rd_lcname=($(cat $DATA/recommended-distros|grep -v \#|awk '{print$5}')) + +# Apply latest patchs +for patch in $(ls -v ${DATA}/*.patch) +do + echo "Applying $patch" + patch --no-backup-if-mismatch -Np1 < $patch +done + +# Remove non-free distros references. +TMPDIR=$(mktemp -d os-XXXX) +for i in "${rd_domain[@]}" +do + mv data/os/$i $TMPDIR || true +done +for a in $(ls data/os/) +do + # Remove os references + for b in $(grep -rl $a debian/patches/|sed 's|debian/patches/||') + do + echo "Check for $b ..." + sed -i "/$b/d" debian/patches/series + rm debian/patches/$b + done +done +rm -rf data/os +mv $TMPDIR data/os + +# Remove tests for non-free distros. +TMPDIR2=$(mktemp -d os-XXXX) +TMPDIR3=$(mktemp -d os-XXXX) +for i in "${rd_lcname[@]}" +do + mv tests/isodata/$i $TMPDIR2 || true + mv tests/treeinfodata/$i $TMPDIR3 || true + # Remove references to non-free containers + for a in $(ls tests/isodata/) + do + rm $(grep -rl $a ci/containers/) || true + rm $(grep -rl $a ci/buildenv/) || true + done +done +rm -rf tests/isodata +rm -rf tests/treeinfodata +mv $TMPDIR2 tests/isodata +mv $TMPDIR3 tests/treeinfodata + +# Remove install-scripts +TMPDIR4=$(mktemp -d os-XXXX) +for i in "${rd_domain[@]}" +do + mv data/install-script/$i $TMPDIR4 || true +done +rm -rf data/install-script +mv $TMPDIR4 data/install-script + +# Avoid test error out. +rm tests/test_treeinfo.py \ + tests/test_related.py + #Apply changes for new fully free distros availbale at libosinfo. # trisquel.info sed -i '/derives-from/d' data/os/trisquel.info/trisquel-9.xml.in sed -i '/release-date/a \ \ \ \ Etiona' data/os/trisquel.info/trisquel-9.xml.in - -changelog "Apply changes for new fully free distros availbale at libosinfo." +changelog "Remove non-free suggestions from db osinfo." compile