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

choose-mirror: use git Mirrors.masterlist source.

Browse source
This commit is contained in:
Luis Guzmán 2024-12-05 00:00:34 +00:00 • committed by Ark74
parent 3c21ffde85
commit 67d17e9a6d
2 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
helpers/DATA/choose-mirror/rev_Makefile.patch
View file

@ -5,7 +5,7 @@ diff -ru choose-mirror-2.78ubuntu7+10.0trisquel3/Makefile choose-mirror-2.111/Ma
STRIP=strip STRIP=strip
# Derivative distributions may want to change these. # Derivative distributions may want to change these.
-#MIRRORLISTURL=https://anonscm.debian.org/git/mirror/mirror-masterlist.git/plain/Mirrors.masterlist -#MIRRORLISTURL=https://gitlab.trisquel.org/trisquel/trisquel-packages/-/raw/master/extra/mirrors/Mirrors.masterlist
-MASTERLIST=Mirrors.masterlist.trisquel -MASTERLIST=Mirrors.masterlist.trisquel
+MIRRORLISTURL=https://salsa.debian.org/mirror-team/masterlist/raw/master/Mirrors.masterlist +MIRRORLISTURL=https://salsa.debian.org/mirror-team/masterlist/raw/master/Mirrors.masterlist
+MASTERLIST=Mirrors.masterlist +MASTERLIST=Mirrors.masterlist

11
helpers/make-choose-mirror
View file

@ -1,6 +1,6 @@
#!/bin/sh #!/bin/sh
# #
# Copyright (C) 2022 Luis Guzmán <ark@switnet.org> # Copyright (C) 2024 Luis Guzmán <ark@switnet.org>
# Copyright (C) 2009-2018 Ruben Rodriguez <ruben@gnu.org> # Copyright (C) 2009-2018 Ruben Rodriguez <ruben@gnu.org>
# #
# This program is free software; you can redistribute it and/or modify # This program is free software; you can redistribute it and/or modify
@ -18,14 +18,15 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
# #
VERSION=5 VERSION=6
EXTERNAL='deb-src http://ftp.debian.org/debian bullseye main' EXTERNAL='deb-src http://ftp.debian.org/debian bullseye main'
REPOKEY=0E98404D386FA1D9 REPOKEY=0E98404D386FA1D9
NETINST=true NETINST=true
. ./config . ./config
patch --no-backup-if-mismatch -R -p1 < $DATA/rev_Makefile.patch Mirrors_masterlist_git="trisquel-packages/-/raw/master/extra/mirrors/Mirrors.masterlist"
patch --no-backup-if-mismatch -R -p1 < $DATA/rev_choose-mirror-bin.templates-in.patch patch_Rp1 $DATA/rev_Makefile.patch
patch_Rp1 $DATA/rev_choose-mirror-bin.templates-in.patch
sed -i '/oldstable/d; sed -i '/oldstable/d;
/testing/d; /testing/d;
@ -40,7 +41,7 @@ replace "/debian/" "/trisquel/" .
sed -i 's|Mirrors.masterlist|Mirrors.masterlist.trisquel|' mirrorlist sed -i 's|Mirrors.masterlist|Mirrors.masterlist.trisquel|' mirrorlist
rm Mirrors.masterlist rm Mirrors.masterlist
wget https://archive.trisquel.org/trisquel/Mirrors.masterlist -o /dev/null -O Mirrors.masterlist.trisquel wget https://gitlab.trisquel.org/trisquel/$Mirrors_masterlist_git -o /dev/null -O Mirrors.masterlist.trisquel
changelog "Rebranded and adapted for Trisquel" changelog "Rebranded and adapted for Trisquel"
package package