From 1f810dbecc338255d64e064e300ae96cb6eb1e7d Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Sat, 28 Apr 2018 23:29:04 +0200 Subject: [PATCH] Replacing jessie and old repo with stretch and new repo --- auto_build.sh | 4 ++-- build-yunohost | 8 +++----- profiles/advanced.preseed | 4 ++-- profiles/default.preseed | 4 ++-- profiles/test.preseed | 8 ++++---- 5 files changed, 13 insertions(+), 15 deletions(-) diff --git a/auto_build.sh b/auto_build.sh index e74ffe0..ca28718 100755 --- a/auto_build.sh +++ b/auto_build.sh @@ -3,7 +3,7 @@ # Get the script directory script_dir="$(dirname $(realpath $0))" -repo_url="http://repo.yunohost.org/debian/" +repo_url="http://forge.yunohost.org/debian/" build_yunohost_org_dir="/var/www/build" @@ -59,7 +59,7 @@ compare_version () { fi } -deb_dist=jessie +deb_dist=stretch dist=stable compare_version "$(get_ynh_release)" diff --git a/build-yunohost b/build-yunohost index 8053bd8..712e1f1 100755 --- a/build-yunohost +++ b/build-yunohost @@ -2,10 +2,10 @@ # Usage ./build-yunohost [ARCH [DIST [DEB_DIST]]] # ARCH amd64|i386 # DIST stable|testing -# DEB_DIST jessie|stretch +# DEB_DIST stretch -readonly DEFAULT_DEB_DIST="jessie" -readonly REPO_URL="http://repo.yunohost.org/debian/" +readonly DEFAULT_DEB_DIST="stretch" +readonly REPO_URL="http://forge.yunohost.org/debian/" readonly ARCH_CHOICE=$1 readonly DIST="${2:-stable}" @@ -22,10 +22,8 @@ function build info "Starting build for arch $ARCH ..." if [ "$DIST" = "testing" ] ; then - sed -i "s#$REPO_URL jessie stable#$REPO_URL $DEB_DIST stable testing#" profiles/*.preseed sed -i "s#$REPO_URL stretch stable#$REPO_URL $DEB_DIST stable testing#" profiles/*.preseed else - sed -i "s#$REPO_URL jessie stable testing#$REPO_URL $DEB_DIST stable#" profiles/*.preseed sed -i "s#$REPO_URL stretch stable testing#$REPO_URL $DEB_DIST stable#" profiles/*.preseed fi diff --git a/profiles/advanced.preseed b/profiles/advanced.preseed index ddaae9f..936cc4f 100644 --- a/profiles/advanced.preseed +++ b/profiles/advanced.preseed @@ -69,8 +69,8 @@ d-i apt-setup/services-select multiselect security, updates d-i apt-setup/security_host string security.debian.org d-i apt-setup/local0/repository string \ - http://repo.yunohost.org/debian/ jessie stable -d-i apt-setup/local0/key string http://repo.yunohost.org/debian/yunohost.asc + http://forge.yunohost.org/debian/ stretch stable +d-i apt-setup/local0/key string http://forge.yunohost.org/yunohost.asc d-i apt-setup/local0/comment string YunoHost repository #d-i debian-installer/allow_unauthenticated string true diff --git a/profiles/default.preseed b/profiles/default.preseed index 123f1a9..869e3c5 100644 --- a/profiles/default.preseed +++ b/profiles/default.preseed @@ -69,8 +69,8 @@ d-i apt-setup/services-select multiselect security, updates d-i apt-setup/security_host string security.debian.org d-i apt-setup/local0/repository string \ - http://repo.yunohost.org/debian/ jessie stable -d-i apt-setup/local0/key string http://repo.yunohost.org/debian/yunohost.asc + http://forge.yunohost.org/debian/ stretch stable +d-i apt-setup/local0/key string http://forge.yunohost.org/yunohost.asc d-i apt-setup/local0/comment string YunoHost repository #d-i debian-installer/allow_unauthenticated string true diff --git a/profiles/test.preseed b/profiles/test.preseed index f043d4f..65be132 100644 --- a/profiles/test.preseed +++ b/profiles/test.preseed @@ -40,11 +40,11 @@ d-i passwd/make-user boolean fasle d-i apt-setup/non-free boolean true d-i apt-setup/contrib boolean true d-i apt-setup/local0/repository string \ - http://repo.yunohost.org/ megusta main + http://forge.yunohost.org/ stretch stable d-i apt-setup/local1/repository string \ - http://repo.yunohost.org/ test main -d-i apt-setup/local0/key string http://repo.yunohost.org/yunohost.asc -d-i apt-setup/local1/key string http://repo.yunohost.org/yunohost.asc + http://forge.yunohost.org/ stretch stable +d-i apt-setup/local0/key string http://forge.yunohost.org/yunohost.asc +d-i apt-setup/local1/key string http://forge.yunohost.org/yunohost.asc d-i debian-installer/allow_unauthenticated string true tasksel tasksel/first multiselect standard, web-server, ssh-server d-i pkgsel/include postfix yunohost