diff --git a/helpers/make-choose-mirror b/helpers/make-choose-mirror index 70a7dd0..82db0e2 100644 --- a/helpers/make-choose-mirror +++ b/helpers/make-choose-mirror @@ -18,12 +18,13 @@ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # -VERSION=8 +VERSION=9 EXTERNAL='deb-src http://ftp.debian.org/debian trixie main' REPOKEY=0E98404D386FA1D9 NETINST=true . ./config +#FIXME: Propose a way to integrate from git and avoid fetching via wget/curl. Mirrors_masterlist_git="trisquel-packages/-/raw/master/extra/mirrors/Mirrors.masterlist" patch_p1 $DATA/Makefile_mirrors-masterlist.patch patch_p1 $DATA/choose-mirror-bin.templates-in.patch diff --git a/helpers/make-python-apt b/helpers/make-python-apt index 22a4fae..6970245 100644 --- a/helpers/make-python-apt +++ b/helpers/make-python-apt @@ -24,7 +24,7 @@ # list available on the resulting netinstall (mini.iso) image. # The same way as 'ubiquity' is for for the next Live Desktop ISOs. -VERSION=10 +VERSION=11 COMPONENT=main #Be aware to not pull/build before publish date on T12. @@ -34,6 +34,7 @@ COMPONENT=main Mirrors_masterlist=$(mktemp) Mirrors_masterlist_git="trisquel-packages/-/raw/master/extra/mirrors/Mirrors.masterlist" +#FIXME: Propose a way to integrate from git and avoid fetching via wget/curl. wget https://gitlab.trisquel.org/trisquel/$Mirrors_masterlist_git -o /dev/null -O $Mirrors_masterlist python3 $DATA/parse-mirror-masterlist.py $Mirrors_masterlist > data/templates/Trisquel.mirrors rm $Mirrors_masterlist