From ec78afc3ed2b34c8d651adb643e4cfd5967bd859 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luis=20Guzm=C3=A1n?= Date: Sat, 3 Jun 2023 00:29:09 +0000 Subject: [PATCH] osinfo-db: add trisquel supported releases. --- .../trisquel10/triskel_10.0.1_amd64.iso.txt | 29 +++++++ .../trisquel-mini_10.0.1_amd64.iso.txt | 29 +++++++ .../trisquel-sugar_10.0.1_amd64.iso.txt | 29 +++++++ .../trisquel10/trisquel_10.0.1_amd64.iso.txt | 29 +++++++ .../trisquel11/triskel_11.0_amd64.iso.txt | 29 +++++++ .../trisquel-mini_11.0_amd64.iso.txt | 29 +++++++ .../trisquel-sugar_11.0_amd64.iso.txt | 29 +++++++ .../trisquel11/trisquel_11.0_amd64.iso.txt | 29 +++++++ helpers/DATA/osinfo-db/trisquel-10.xml.in | 85 +++++++++++++++++++ helpers/DATA/osinfo-db/trisquel-11.xml.in | 85 +++++++++++++++++++ helpers/make-osinfo-db | 11 ++- 11 files changed, 409 insertions(+), 4 deletions(-) create mode 100644 helpers/DATA/osinfo-db/testdata/trisquel10/triskel_10.0.1_amd64.iso.txt create mode 100644 helpers/DATA/osinfo-db/testdata/trisquel10/trisquel-mini_10.0.1_amd64.iso.txt create mode 100644 helpers/DATA/osinfo-db/testdata/trisquel10/trisquel-sugar_10.0.1_amd64.iso.txt create mode 100644 helpers/DATA/osinfo-db/testdata/trisquel10/trisquel_10.0.1_amd64.iso.txt create mode 100644 helpers/DATA/osinfo-db/testdata/trisquel11/triskel_11.0_amd64.iso.txt create mode 100644 helpers/DATA/osinfo-db/testdata/trisquel11/trisquel-mini_11.0_amd64.iso.txt create mode 100644 helpers/DATA/osinfo-db/testdata/trisquel11/trisquel-sugar_11.0_amd64.iso.txt create mode 100644 helpers/DATA/osinfo-db/testdata/trisquel11/trisquel_11.0_amd64.iso.txt create mode 100644 helpers/DATA/osinfo-db/trisquel-10.xml.in create mode 100644 helpers/DATA/osinfo-db/trisquel-11.xml.in diff --git a/helpers/DATA/osinfo-db/testdata/trisquel10/triskel_10.0.1_amd64.iso.txt b/helpers/DATA/osinfo-db/testdata/trisquel10/triskel_10.0.1_amd64.iso.txt new file mode 100644 index 0000000..1967de8 --- /dev/null +++ b/helpers/DATA/osinfo-db/testdata/trisquel10/triskel_10.0.1_amd64.iso.txt @@ -0,0 +1,29 @@ +CD-ROM is in ISO 9660 format +System id: +Volume id: triskel 10.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 10.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: 1100520 +El Torito VD version 1 found, boot catalog is in sector 82 +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 253 595 diff --git a/helpers/DATA/osinfo-db/testdata/trisquel10/trisquel-mini_10.0.1_amd64.iso.txt b/helpers/DATA/osinfo-db/testdata/trisquel10/trisquel-mini_10.0.1_amd64.iso.txt new file mode 100644 index 0000000..8d64f6f --- /dev/null +++ b/helpers/DATA/osinfo-db/testdata/trisquel10/trisquel-mini_10.0.1_amd64.iso.txt @@ -0,0 +1,29 @@ +CD-ROM is in ISO 9660 format +System id: +Volume id: trisquel-mini 10.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 10.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: 741832 +El Torito VD version 1 found, boot catalog is in sector 82 +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 253 595 diff --git a/helpers/DATA/osinfo-db/testdata/trisquel10/trisquel-sugar_10.0.1_amd64.iso.txt b/helpers/DATA/osinfo-db/testdata/trisquel10/trisquel-sugar_10.0.1_amd64.iso.txt new file mode 100644 index 0000000..ce4f95b --- /dev/null +++ b/helpers/DATA/osinfo-db/testdata/trisquel10/trisquel-sugar_10.0.1_amd64.iso.txt @@ -0,0 +1,29 @@ +CD-ROM is in ISO 9660 format +System id: +Volume id: trisquel-sugar 10.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 10.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: 644008 +El Torito VD version 1 found, boot catalog is in sector 82 +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 253 595 diff --git a/helpers/DATA/osinfo-db/testdata/trisquel10/trisquel_10.0.1_amd64.iso.txt b/helpers/DATA/osinfo-db/testdata/trisquel10/trisquel_10.0.1_amd64.iso.txt new file mode 100644 index 0000000..5a9bef1 --- /dev/null +++ b/helpers/DATA/osinfo-db/testdata/trisquel10/trisquel_10.0.1_amd64.iso.txt @@ -0,0 +1,29 @@ +CD-ROM is in ISO 9660 format +System id: +Volume id: trisquel 10.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 10.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: 1432200 +El Torito VD version 1 found, boot catalog is in sector 82 +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 253 595 diff --git a/helpers/DATA/osinfo-db/testdata/trisquel11/triskel_11.0_amd64.iso.txt b/helpers/DATA/osinfo-db/testdata/trisquel11/triskel_11.0_amd64.iso.txt new file mode 100644 index 0000000..eece5f0 --- /dev/null +++ b/helpers/DATA/osinfo-db/testdata/trisquel11/triskel_11.0_amd64.iso.txt @@ -0,0 +1,29 @@ +CD-ROM is in ISO 9660 format +System id: +Volume id: triskel 11.0 amd64 +Volume set id: +Publisher id: +Data preparer id: XORRISO-1.5.4 2021.01.30.150001, LIBISOBURN-1.5.4, LIBISOFS-1.5.4, LIBBURN-1.5.4 +Application id: TRISKEL 11.0 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: 1170312 +El Torito VD version 1 found, boot catalog is in sector 82 +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 253 595 diff --git a/helpers/DATA/osinfo-db/testdata/trisquel11/trisquel-mini_11.0_amd64.iso.txt b/helpers/DATA/osinfo-db/testdata/trisquel11/trisquel-mini_11.0_amd64.iso.txt new file mode 100644 index 0000000..dabf833 --- /dev/null +++ b/helpers/DATA/osinfo-db/testdata/trisquel11/trisquel-mini_11.0_amd64.iso.txt @@ -0,0 +1,29 @@ +CD-ROM is in ISO 9660 format +System id: +Volume id: trisquel-mini 11.0 amd64 +Volume set id: +Publisher id: +Data preparer id: XORRISO-1.5.4 2021.01.30.150001, LIBISOBURN-1.5.4, LIBISOFS-1.5.4, LIBBURN-1.5.4 +Application id: TRISQUEL-MINI 11.0 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: 770640 +El Torito VD version 1 found, boot catalog is in sector 82 +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 253 595 diff --git a/helpers/DATA/osinfo-db/testdata/trisquel11/trisquel-sugar_11.0_amd64.iso.txt b/helpers/DATA/osinfo-db/testdata/trisquel11/trisquel-sugar_11.0_amd64.iso.txt new file mode 100644 index 0000000..db7d382 --- /dev/null +++ b/helpers/DATA/osinfo-db/testdata/trisquel11/trisquel-sugar_11.0_amd64.iso.txt @@ -0,0 +1,29 @@ +CD-ROM is in ISO 9660 format +System id: +Volume id: trisquel-sugar 11.0 amd64 +Volume set id: +Publisher id: +Data preparer id: XORRISO-1.5.4 2021.01.30.150001, LIBISOBURN-1.5.4, LIBISOFS-1.5.4, LIBBURN-1.5.4 +Application id: TRISQUEL-SUGAR 11.0 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: 627704 +El Torito VD version 1 found, boot catalog is in sector 82 +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 253 595 diff --git a/helpers/DATA/osinfo-db/testdata/trisquel11/trisquel_11.0_amd64.iso.txt b/helpers/DATA/osinfo-db/testdata/trisquel11/trisquel_11.0_amd64.iso.txt new file mode 100644 index 0000000..b606259 --- /dev/null +++ b/helpers/DATA/osinfo-db/testdata/trisquel11/trisquel_11.0_amd64.iso.txt @@ -0,0 +1,29 @@ +CD-ROM is in ISO 9660 format +System id: +Volume id: trisquel 11.0 amd64 +Volume set id: +Publisher id: +Data preparer id: XORRISO-1.5.4 2021.01.30.150001, LIBISOBURN-1.5.4, LIBISOFS-1.5.4, LIBBURN-1.5.4 +Application id: TRISQUEL 11.0 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: 1511080 +El Torito VD version 1 found, boot catalog is in sector 82 +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 253 595 diff --git a/helpers/DATA/osinfo-db/trisquel-10.xml.in b/helpers/DATA/osinfo-db/trisquel-10.xml.in new file mode 100644 index 0000000..a02401a --- /dev/null +++ b/helpers/DATA/osinfo-db/trisquel-10.xml.in @@ -0,0 +1,85 @@ + + + + + trisquel10 + trisquel-nabia + Trisquel + 10 + The Trisquel Project + linux + trisquel + Nabia + + + 2021-05-26 + + + Trisquel 10 + + + Triskel 10 + + + Trisquel 10 Mini + + + Trisquel 10 Sugar Toast + + + + + + https://cdimage.trisquel.info/trisquel-images/trisquel_10.0.1_amd64.iso + + trisquel 10.0.1 amd64.* + + casper/vmlinuz + casper/initrd + + + + https://cdimage.trisquel.info/trisquel-images/trisquel-mini_10.0.1_amd64.iso + + trisquel-mini 10.0.1 amd64.* + + casper/vmlinuz + casper/initrd + + + + https://cdimage.trisquel.info/trisquel-images/trisquel-sugar_10.0.1_amd64.iso + + trisquel-sugar 10.0.1 amd64.* + + casper/vmlinuz + casper/initrd + + + + https://cdimage.trisquel.info/trisquel-images/triskel_10.0.1_amd64.iso + + triskel 10.0.1 amd64.* + + casper/vmlinuz + casper/initrd + + + + + + 1000000000 + 1 + 2147483648 + 5368709120 + + + 2000000000 + 4294967296 + 26843545600 + + + + + diff --git a/helpers/DATA/osinfo-db/trisquel-11.xml.in b/helpers/DATA/osinfo-db/trisquel-11.xml.in new file mode 100644 index 0000000..e6dcf9d --- /dev/null +++ b/helpers/DATA/osinfo-db/trisquel-11.xml.in @@ -0,0 +1,85 @@ + + + + + trisquel11 + trisquel-aramo + Trisquel + 11 + The Trisquel Project + linux + trisquel + Aramo + + + 2023-03-19 + + + Trisquel 11 + + + Triskel 11 + + + Trisquel 11 Mini + + + Trisquel 11 Sugar Toast + + + + + + https://cdimage.trisquel.info/trisquel-images/trisquel_11.0_amd64.iso + + trisquel 11.0 amd64.* + + casper/vmlinuz + casper/initrd + + + + https://cdimage.trisquel.info/trisquel-images/trisquel-mini_11.0_amd64.iso + + trisquel-mini 11.0 amd64.* + + casper/vmlinuz + casper/initrd + + + + https://cdimage.trisquel.info/trisquel-images/trisquel-sugar_11.0_amd64.iso + + trisquel-sugar 11.0 amd64.* + + casper/vmlinuz + casper/initrd + + + + https://cdimage.trisquel.info/trisquel-images/triskel_11.0_amd64.iso + + triskel 11.0 amd64.* + + casper/vmlinuz + casper/initrd + + + + + + 1000000000 + 1 + 2147483648 + 10737418240 + + + 2000000000 + 4294967296 + 26843545600 + + + + + diff --git a/helpers/make-osinfo-db b/helpers/make-osinfo-db index 0624dc7..c4a87a1 100644 --- a/helpers/make-osinfo-db +++ b/helpers/make-osinfo-db @@ -18,7 +18,7 @@ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # -VERSION=4 +VERSION=5 EXTERNAL='deb-src http://ftp.us.debian.org/debian bookworm main' REPOKEY=04EE7237B7D453EC @@ -34,6 +34,10 @@ do patch --no-backup-if-mismatch -Np1 < $patch done +# Manually add trisquel current data +cp $DATA/trisquel-1*.xml.in data/os/trisquel.info/ +cp -R $DATA/testdata/* tests/isodata/trisquel/ + # Remove non-free distros references. TMPDIR=$(mktemp -d os-XXXX) for i in "${rd_domain[@]}" @@ -47,9 +51,8 @@ mv $TMPDIR/* data/os/ # Remove tests that will fail from previos iso url removal. rm tests/test_isoinfo.py tests/test_schema.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 +# Remove ubuntu's artwork to prevent any trademark issue. +sed -i '/derives-from/d' data/os/trisquel.info/trisquel-*.xml.in sed -i '/release-date/a \ \ \ \ Etiona' data/os/trisquel.info/trisquel-9.xml.in changelog "Remove links to non-free distros suggestion from osinfo-db."