CMXSL.org/package-helpers-cmxsl
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

osinfo-data: clean applied patches upstream.

Browse source
This commit is contained in:
Ark74 2025-04-17 15:53:02 -06:00
parent c5d312a14b
commit ecafd9c542
4 changed files with 2 additions and 69 deletions
Download patch file Download diff file Expand all files Collapse all files

40
helpers/DATA/osinfo-db/001-update_url_to_trisquel_11.0.1_iso.patch
View file

@ -1,40 +0,0 @@
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 @@
<!-- x86_64 -->
<media arch="x86_64" live="true" installer-script="false">
<variant id="trisquel"/>
- <url>https://cdimage.trisquel.info/trisquel-images/trisquel_11.0_amd64.iso</url>
+ <url>https://cdimage.trisquel.info/trisquel-images/trisquel_11.0.1_amd64.iso</url>
<iso>
<volume-id>trisquel 11.\d(.\d+)? amd64.*</volume-id>
</iso>
@@ -40,7 +40,7 @@
</media>
<media arch="x86_64" live="true" installer-script="false">
<variant id="mini"/>
- <url>https://cdimage.trisquel.info/trisquel-images/trisquel-mini_11.0_amd64.iso</url>
+ <url>https://cdimage.trisquel.info/trisquel-images/trisquel-mini_11.0.1_amd64.iso</url>
<iso>
<volume-id>trisquel-mini 11.\d(.\d+)? amd64.*</volume-id>
</iso>
@@ -49,7 +49,7 @@
</media>
<media arch="x86_64" live="true" installer-script="false">
<variant id="sugar-toast"/>
- <url>https://cdimage.trisquel.info/trisquel-images/trisquel-sugar_11.0_amd64.iso</url>
+ <url>https://cdimage.trisquel.info/trisquel-images/trisquel-sugar_11.0.1_amd64.iso</url>
<iso>
<volume-id>trisquel-sugar 11.\d(.\d+)? amd64.*</volume-id>
</iso>
@@ -58,7 +58,7 @@
</media>
<media arch="x86_64" live="true" installer-script="false">
<variant id="triskel"/>
- <url>https://cdimage.trisquel.info/trisquel-images/triskel_11.0_amd64.iso</url>
+ <url>https://cdimage.trisquel.info/trisquel-images/triskel_11.0.1_amd64.iso</url>
<iso>
<volume-id>triskel 11.\d(.\d+)? amd64.*</volume-id>
</iso>

24
helpers/DATA/osinfo-db/002-add_upgrades_id_trisquel.patch
View file

@ -1,24 +0,0 @@
diff --git a/data/os/trisquel.info/trisquel-10.xml.in b/data/os/trisquel.info/trisquel-10.xml.in
index f012ba00..78fd5bdd 100644
--- a/data/os/trisquel.info/trisquel-10.xml.in
+++ b/data/os/trisquel.info/trisquel-10.xml.in
@@ -11,6 +11,7 @@
<family>linux</family>
<distro>trisquel</distro>
<codename>Nabia</codename>
+ <upgrades id="http://trisquel.info/trisquel/9"/>
<derives-from id="http://ubuntu.com/ubuntu/20.04"/>
<release-date>2022-02-01</release-date>
diff --git a/data/os/trisquel.info/trisquel-11.xml.in b/data/os/trisquel.info/trisquel-11.xml.in
index 0c986732..8619adb1 100644
--- a/data/os/trisquel.info/trisquel-11.xml.in
+++ b/data/os/trisquel.info/trisquel-11.xml.in
@@ -11,6 +11,7 @@
<family>linux</family>
<distro>trisquel</distro>
<codename>Aramo</codename>
+ <upgrades id="http://trisquel.info/trisquel/10"/>
<derives-from id="http://ubuntu.com/ubuntu/22.04"/>
<release-date>2023-03-19</release-date>

0
helpers/DATA/osinfo-db/003-modify_derivation_use_trisquel_logo.patch → helpers/DATA/osinfo-db/patch_changes/003-modify_derivation_use_trisquel_logo.patch
View file

7
helpers/make-osinfo-db
View file

@ -24,11 +24,8 @@ VERSION=8
rd_domain=($(cat $DATA/recommended-distros|grep -v \#|awk '{print$3}'))
# Apply latest patches
for patch in $(ls -v ${DATA}/*.patch)
do
patch_p1 $patch
done
# Apply patches
apply_patch_changes
# Remove non-free distros references.
TMPDIR=$(mktemp -d os-XXXX)