From ffdb7550b5ed71093c4cdb77605124c55f85d4bc Mon Sep 17 00:00:00 2001 From: Luis Guzman Date: Mon, 5 Aug 2024 17:55:48 +0000 Subject: [PATCH] osinfo-db: update helpers for ecne --- ...01-update_url_to_trisquel_11.0.1_iso.patch | 40 ++ .../osinfo-db/01_fix_t9_broken_links.patch | 52 -- .../02_662_update_trisquel_9_10_11.patch | 550 ------------------ .../03_663_set_detailed_os_name.patch | 54 -- helpers/make-osinfo-db | 8 +- 5 files changed, 42 insertions(+), 662 deletions(-) create mode 100644 helpers/DATA/osinfo-db/001-update_url_to_trisquel_11.0.1_iso.patch delete mode 100644 helpers/DATA/osinfo-db/01_fix_t9_broken_links.patch delete mode 100644 helpers/DATA/osinfo-db/02_662_update_trisquel_9_10_11.patch delete mode 100644 helpers/DATA/osinfo-db/03_663_set_detailed_os_name.patch diff --git a/helpers/DATA/osinfo-db/001-update_url_to_trisquel_11.0.1_iso.patch b/helpers/DATA/osinfo-db/001-update_url_to_trisquel_11.0.1_iso.patch new file mode 100644 index 0000000..f831296 --- /dev/null +++ b/helpers/DATA/osinfo-db/001-update_url_to_trisquel_11.0.1_iso.patch @@ -0,0 +1,40 @@ +diff --git a/data/os/trisquel.info/trisquel-11.xml.in b/data/os/trisquel.info/trisquel-11.xml.in +index 3b208115..0c986732 100644 +--- a/data/os/trisquel.info/trisquel-11.xml.in ++++ b/data/os/trisquel.info/trisquel-11.xml.in +@@ -31,7 +31,7 @@ + + + +- https://cdimage.trisquel.info/trisquel-images/trisquel_11.0_amd64.iso ++ https://cdimage.trisquel.info/trisquel-images/trisquel_11.0.1_amd64.iso + + trisquel 11.\d(.\d+)? amd64.* + +@@ -40,7 +40,7 @@ + + + +- https://cdimage.trisquel.info/trisquel-images/trisquel-mini_11.0_amd64.iso ++ https://cdimage.trisquel.info/trisquel-images/trisquel-mini_11.0.1_amd64.iso + + trisquel-mini 11.\d(.\d+)? amd64.* + +@@ -49,7 +49,7 @@ + + + +- https://cdimage.trisquel.info/trisquel-images/trisquel-sugar_11.0_amd64.iso ++ https://cdimage.trisquel.info/trisquel-images/trisquel-sugar_11.0.1_amd64.iso + + trisquel-sugar 11.\d(.\d+)? amd64.* + +@@ -58,7 +58,7 @@ + + + +- https://cdimage.trisquel.info/trisquel-images/triskel_11.0_amd64.iso ++ https://cdimage.trisquel.info/trisquel-images/triskel_11.0.1_amd64.iso + + triskel 11.\d(.\d+)? amd64.* + diff --git a/helpers/DATA/osinfo-db/01_fix_t9_broken_links.patch b/helpers/DATA/osinfo-db/01_fix_t9_broken_links.patch deleted file mode 100644 index 75a1732..0000000 --- a/helpers/DATA/osinfo-db/01_fix_t9_broken_links.patch +++ /dev/null @@ -1,52 +0,0 @@ -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/02_662_update_trisquel_9_10_11.patch b/helpers/DATA/osinfo-db/02_662_update_trisquel_9_10_11.patch deleted file mode 100644 index 31adabf..0000000 --- a/helpers/DATA/osinfo-db/02_662_update_trisquel_9_10_11.patch +++ /dev/null @@ -1,550 +0,0 @@ -From 5ad5bf627362b998470e62a00342ca80922cecc5 Mon Sep 17 00:00:00 2001 -From: Ark74 -Date: Fri, 2 Jun 2023 17:40:52 -0600 -Subject: [PATCH 1/3] trisquel: add trisquel 9 eol date. - -Signed-off-by: Ark74 ---- - data/os/trisquel.info/trisquel-9.xml.in | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/data/os/trisquel.info/trisquel-9.xml.in b/data/os/trisquel.info/trisquel-9.xml.in -index ba94fad9..e42155fd 100644 ---- a/data/os/trisquel.info/trisquel-9.xml.in -+++ b/data/os/trisquel.info/trisquel-9.xml.in -@@ -9,9 +9,11 @@ - The Trisquel Project - linux - trisquel -- 2021-10-16 - - -+ 2021-10-16 -+ 2023-05-30 -+ - - Trisquel 9 - --- -GitLab - - -From 55e31b65da69612529f8e3b8c3fe1f29af0f6aa0 Mon Sep 17 00:00:00 2001 -From: Ark74 -Date: Fri, 2 Jun 2023 17:44:18 -0600 -Subject: [PATCH 2/3] trisquel: add trisquel 10 nabia - -Signed-off-by: Ark74 - -trisquel: fix trisquel 10 release date. - -Signed-off-by: Ark74 - -trisquel: update volume-id for t10. - -Signed-off-by: Ark74 ---- - data/os/trisquel.info/trisquel-10.xml.in | 85 +++++++++++++++++++ - .../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 +++++++ - 5 files changed, 201 insertions(+) - create mode 100644 data/os/trisquel.info/trisquel-10.xml.in - create mode 100644 tests/isodata/trisquel/trisquel10/triskel_10.0.1_amd64.iso.txt - create mode 100644 tests/isodata/trisquel/trisquel10/trisquel-mini_10.0.1_amd64.iso.txt - create mode 100644 tests/isodata/trisquel/trisquel10/trisquel-sugar_10.0.1_amd64.iso.txt - create mode 100644 tests/isodata/trisquel/trisquel10/trisquel_10.0.1_amd64.iso.txt - -diff --git a/data/os/trisquel.info/trisquel-10.xml.in b/data/os/trisquel.info/trisquel-10.xml.in -new file mode 100644 -index 00000000..b742acea ---- /dev/null -+++ b/data/os/trisquel.info/trisquel-10.xml.in -@@ -0,0 +1,85 @@ -+ -+ -+ -+ -+ trisquel10 -+ trisquel-nabia -+ Trisquel -+ 10 -+ The Trisquel Project -+ linux -+ trisquel -+ Nabia -+ -+ -+ 2022-02-01 -+ -+ -+ 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.\d amd64.* -+ -+ casper/vmlinuz -+ casper/initrd -+ -+ -+ -+ https://cdimage.trisquel.info/trisquel-images/trisquel-mini_10.0.1_amd64.iso -+ -+ trisquel-mini 10.0.\d amd64.* -+ -+ casper/vmlinuz -+ casper/initrd -+ -+ -+ -+ https://cdimage.trisquel.info/trisquel-images/trisquel-sugar_10.0.1_amd64.iso -+ -+ trisquel-sugar 10.0.\d amd64.* -+ -+ casper/vmlinuz -+ casper/initrd -+ -+ -+ -+ https://cdimage.trisquel.info/trisquel-images/triskel_10.0.1_amd64.iso -+ -+ triskel 10.0.\d amd64.* -+ -+ casper/vmlinuz -+ casper/initrd -+ -+ -+ -+ -+ -+ 1000000000 -+ 1 -+ 2147483648 -+ 5368709120 -+ -+ -+ 2000000000 -+ 4294967296 -+ 26843545600 -+ -+ -+ -+ -+ -diff --git a/tests/isodata/trisquel/trisquel10/triskel_10.0.1_amd64.iso.txt b/tests/isodata/trisquel/trisquel10/triskel_10.0.1_amd64.iso.txt -new file mode 100644 -index 00000000..1967de86 ---- /dev/null -+++ b/tests/isodata/trisquel/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/tests/isodata/trisquel/trisquel10/trisquel-mini_10.0.1_amd64.iso.txt b/tests/isodata/trisquel/trisquel10/trisquel-mini_10.0.1_amd64.iso.txt -new file mode 100644 -index 00000000..8d64f6f8 ---- /dev/null -+++ b/tests/isodata/trisquel/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/tests/isodata/trisquel/trisquel10/trisquel-sugar_10.0.1_amd64.iso.txt b/tests/isodata/trisquel/trisquel10/trisquel-sugar_10.0.1_amd64.iso.txt -new file mode 100644 -index 00000000..ce4f95ba ---- /dev/null -+++ b/tests/isodata/trisquel/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/tests/isodata/trisquel/trisquel10/trisquel_10.0.1_amd64.iso.txt b/tests/isodata/trisquel/trisquel10/trisquel_10.0.1_amd64.iso.txt -new file mode 100644 -index 00000000..5a9bef1e ---- /dev/null -+++ b/tests/isodata/trisquel/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 --- -GitLab - - -From 23677c172f3d5f5d672211655b83c9841809aa29 Mon Sep 17 00:00:00 2001 -From: Ark74 -Date: Fri, 2 Jun 2023 17:44:44 -0600 -Subject: [PATCH 3/3] trisquel: add trisquel 11 aramo - -Signed-off-by: Ark74 - -trisquel: update t11 version match as template for next release. - -Signed-off-by: Ark74 ---- - data/os/trisquel.info/trisquel-11.xml.in | 85 +++++++++++++++++++ - .../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 +++++++ - 5 files changed, 201 insertions(+) - create mode 100644 data/os/trisquel.info/trisquel-11.xml.in - create mode 100644 tests/isodata/trisquel/trisquel11/triskel_11.0_amd64.iso.txt - create mode 100644 tests/isodata/trisquel/trisquel11/trisquel-mini_11.0_amd64.iso.txt - create mode 100644 tests/isodata/trisquel/trisquel11/trisquel-sugar_11.0_amd64.iso.txt - create mode 100644 tests/isodata/trisquel/trisquel11/trisquel_11.0_amd64.iso.txt - -diff --git a/data/os/trisquel.info/trisquel-11.xml.in b/data/os/trisquel.info/trisquel-11.xml.in -new file mode 100644 -index 00000000..845dcc5c ---- /dev/null -+++ b/data/os/trisquel.info/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.\d(.\d+)? amd64.* -+ -+ casper/vmlinuz -+ casper/initrd -+ -+ -+ -+ https://cdimage.trisquel.info/trisquel-images/trisquel-mini_11.0_amd64.iso -+ -+ trisquel-mini 11.\d(.\d+)? amd64.* -+ -+ casper/vmlinuz -+ casper/initrd -+ -+ -+ -+ https://cdimage.trisquel.info/trisquel-images/trisquel-sugar_11.0_amd64.iso -+ -+ trisquel-sugar 11.\d(.\d+)? amd64.* -+ -+ casper/vmlinuz -+ casper/initrd -+ -+ -+ -+ https://cdimage.trisquel.info/trisquel-images/triskel_11.0_amd64.iso -+ -+ triskel 11.\d(.\d+)? amd64.* -+ -+ casper/vmlinuz -+ casper/initrd -+ -+ -+ -+ -+ -+ 1000000000 -+ 1 -+ 2147483648 -+ 10737418240 -+ -+ -+ 2000000000 -+ 4294967296 -+ 26843545600 -+ -+ -+ -+ -+ -diff --git a/tests/isodata/trisquel/trisquel11/triskel_11.0_amd64.iso.txt b/tests/isodata/trisquel/trisquel11/triskel_11.0_amd64.iso.txt -new file mode 100644 -index 00000000..eece5f06 ---- /dev/null -+++ b/tests/isodata/trisquel/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/tests/isodata/trisquel/trisquel11/trisquel-mini_11.0_amd64.iso.txt b/tests/isodata/trisquel/trisquel11/trisquel-mini_11.0_amd64.iso.txt -new file mode 100644 -index 00000000..dabf8331 ---- /dev/null -+++ b/tests/isodata/trisquel/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/tests/isodata/trisquel/trisquel11/trisquel-sugar_11.0_amd64.iso.txt b/tests/isodata/trisquel/trisquel11/trisquel-sugar_11.0_amd64.iso.txt -new file mode 100644 -index 00000000..db7d382c ---- /dev/null -+++ b/tests/isodata/trisquel/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/tests/isodata/trisquel/trisquel11/trisquel_11.0_amd64.iso.txt b/tests/isodata/trisquel/trisquel11/trisquel_11.0_amd64.iso.txt -new file mode 100644 -index 00000000..b6062598 ---- /dev/null -+++ b/tests/isodata/trisquel/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 --- -GitLab - diff --git a/helpers/DATA/osinfo-db/03_663_set_detailed_os_name.patch b/helpers/DATA/osinfo-db/03_663_set_detailed_os_name.patch deleted file mode 100644 index 5756c6f..0000000 --- a/helpers/DATA/osinfo-db/03_663_set_detailed_os_name.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 3e413b22b4234615f1877f471a4e0fce3ab4af7a Mon Sep 17 00:00:00 2001 -From: Ark74 -Date: Sat, 3 Jun 2023 14:54:48 -0600 -Subject: [PATCH] trisquel: set os name for a more detailed one. - -Signed-off-by: Ark74 ---- - data/os/trisquel.info/trisquel-10.xml.in | 2 +- - data/os/trisquel.info/trisquel-11.xml.in | 2 +- - data/os/trisquel.info/trisquel-9.xml.in | 2 +- - 3 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/data/os/trisquel.info/trisquel-10.xml.in b/data/os/trisquel.info/trisquel-10.xml.in -index b742acea..f012ba00 100644 ---- a/data/os/trisquel.info/trisquel-10.xml.in -+++ b/data/os/trisquel.info/trisquel-10.xml.in -@@ -5,7 +5,7 @@ - - trisquel10 - trisquel-nabia -- Trisquel -+ Trisquel 10.0 LTS - 10 - The Trisquel Project - linux -diff --git a/data/os/trisquel.info/trisquel-11.xml.in b/data/os/trisquel.info/trisquel-11.xml.in -index 845dcc5c..3b208115 100644 ---- a/data/os/trisquel.info/trisquel-11.xml.in -+++ b/data/os/trisquel.info/trisquel-11.xml.in -@@ -5,7 +5,7 @@ - - trisquel11 - trisquel-aramo -- Trisquel -+ Trisquel 11.0 LTS - 11 - The Trisquel Project - linux -diff --git a/data/os/trisquel.info/trisquel-9.xml.in b/data/os/trisquel.info/trisquel-9.xml.in -index e42155fd..0fcb8747 100644 ---- a/data/os/trisquel.info/trisquel-9.xml.in -+++ b/data/os/trisquel.info/trisquel-9.xml.in -@@ -4,7 +4,7 @@ - See http://www.gnu.org/licenses/ for a copy of the license text --> - - trisquel9 -- Trisquel -+ Trisquel 9.0 LTS - 9 - The Trisquel Project - linux --- -GitLab - diff --git a/helpers/make-osinfo-db b/helpers/make-osinfo-db index 98872d5..f949b63 100644 --- a/helpers/make-osinfo-db +++ b/helpers/make-osinfo-db @@ -18,10 +18,7 @@ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # -VERSION=7 - -EXTERNAL='deb-src http://ftp.us.debian.org/debian bookworm main' -REPOKEY=6ED0E7B82643E131 +VERSION=8 . ./config @@ -30,8 +27,7 @@ rd_domain=($(cat $DATA/recommended-distros|grep -v \#|awk '{print$3}')) # Apply latest patches for patch in $(ls -v ${DATA}/*.patch) do - echo "Applying $patch" - patch --no-backup-if-mismatch -Np1 < $patch + patch_p1 $patch done # Remove non-free distros references.