From ff7b8dc548f6837d4c9820cfe11e7c438dd9addc Mon Sep 17 00:00:00 2001 From: Ruben Rodriguez <ruben@trisquel.info> Date: Thu, 14 Jul 2022 15:21:17 -0400 Subject: [PATCH] debootstrap: added aramo release --- helpers/DATA/debootstrap/aramo | 1 + helpers/DATA/debootstrap/trisquel | 10 ++-------- helpers/DATA/debootstrap/trisquel-common | 10 ++-------- helpers/make-debootstrap | 8 +++----- 4 files changed, 8 insertions(+), 21 deletions(-) create mode 120000 helpers/DATA/debootstrap/aramo diff --git a/helpers/DATA/debootstrap/aramo b/helpers/DATA/debootstrap/aramo new file mode 120000 index 00000000..fe1d5212 --- /dev/null +++ b/helpers/DATA/debootstrap/aramo @@ -0,0 +1 @@ +trisquel \ No newline at end of file diff --git a/helpers/DATA/debootstrap/trisquel b/helpers/DATA/debootstrap/trisquel index dc0054f4..8c1dea71 100644 --- a/helpers/DATA/debootstrap/trisquel +++ b/helpers/DATA/debootstrap/trisquel @@ -1,11 +1,5 @@ -case $ARCH in - amd64|i386) - default_mirror http://archive.trisquel.org/trisquel - ;; - *) - default_mirror http://ports.trisquel.org/trisquel - ;; -esac +default_mirror http://archive.trisquel.org/trisquel + mirror_style release download_style apt finddebs_style from-indices diff --git a/helpers/DATA/debootstrap/trisquel-common b/helpers/DATA/debootstrap/trisquel-common index dc0054f4..8c1dea71 100644 --- a/helpers/DATA/debootstrap/trisquel-common +++ b/helpers/DATA/debootstrap/trisquel-common @@ -1,11 +1,5 @@ -case $ARCH in - amd64|i386) - default_mirror http://archive.trisquel.org/trisquel - ;; - *) - default_mirror http://ports.trisquel.org/trisquel - ;; -esac +default_mirror http://archive.trisquel.org/trisquel + mirror_style release download_style apt finddebs_style from-indices diff --git a/helpers/make-debootstrap b/helpers/make-debootstrap index 9df1ae15..cea7b013 100644 --- a/helpers/make-debootstrap +++ b/helpers/make-debootstrap @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright (C) 2008-2020 Ruben Rodriguez <ruben@trisquel.info> +# Copyright (C) 2008-2022 Ruben Rodriguez <ruben@trisquel.info> # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -17,7 +17,7 @@ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # -VERSION=5 +VERSION=6 NETINST=true . ./config @@ -25,9 +25,7 @@ NETINST=true rm scripts/* cp -a $DATA/* scripts/ -replace ports.trisquel.org archive.trisquel.org - -changelog "Only include trisquel origins + armfh ports to archive" +changelog "Only include trisquel origins" compile -- GitLab