[gnome-continuous-yocto/gnomeostree-3.28-rocko: 5783/8267] DEBIAN_MIRROR: switch from ftp to http

[Emmanuele Bassi <ebassi src gnome org>]

commit 97e194e555d078c2bacd62c383636e011bef6c32
Author: Maxin B. John <maxin john intel com>
Date:   Tue May 9 19:19:21 2017 +0300

    DEBIAN_MIRROR: switch from ftp to http
    
    All public-facing debian.org FTP services will be shut down on November 1, 2017
    The mirrors should just be accessed using HTTP instead.
    
    https://www.debian.org/News/2017/20170425
    
    Fixes [YOCTO #11413]
    
    (From OE-Core rev: c2cdc4d9155d7a3b9cba60fa9cbb448cf64c62bd)
    
    Signed-off-by: Maxin B. John <maxin john intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 meta/classes/mirrors.bbclass |   34 +++++++++++++++++-----------------
 meta/conf/bitbake.conf       |    4 ++--
 2 files changed, 19 insertions(+), 19 deletions(-)
---
diff --git a/meta/classes/mirrors.bbclass b/meta/classes/mirrors.bbclass
index 1174ef6..9c83463 100644
--- a/meta/classes/mirrors.bbclass
+++ b/meta/classes/mirrors.bbclass
@@ -2,23 +2,23 @@ MIRRORS += "\
 ${DEBIAN_MIRROR}       http://snapshot.debian.org/archive/debian-archive/20120328T092752Z/debian/pool \n \
 ${DEBIAN_MIRROR}       http://snapshot.debian.org/archive/debian-archive/20110127T084257Z/debian/pool \n \
 ${DEBIAN_MIRROR}       http://snapshot.debian.org/archive/debian-archive/20090802T004153Z/debian/pool \n \
-${DEBIAN_MIRROR}       ftp://ftp.de.debian.org/debian/pool \n \
-${DEBIAN_MIRROR}       ftp://ftp.au.debian.org/debian/pool \n \
-${DEBIAN_MIRROR}       ftp://ftp.cl.debian.org/debian/pool \n \
-${DEBIAN_MIRROR}       ftp://ftp.hr.debian.org/debian/pool \n \
-${DEBIAN_MIRROR}       ftp://ftp.fi.debian.org/debian/pool \n \
-${DEBIAN_MIRROR}       ftp://ftp.hk.debian.org/debian/pool \n \
-${DEBIAN_MIRROR}       ftp://ftp.hu.debian.org/debian/pool \n \
-${DEBIAN_MIRROR}       ftp://ftp.ie.debian.org/debian/pool \n \
-${DEBIAN_MIRROR}       ftp://ftp.it.debian.org/debian/pool \n \
-${DEBIAN_MIRROR}       ftp://ftp.jp.debian.org/debian/pool \n \
-${DEBIAN_MIRROR}       ftp://ftp.no.debian.org/debian/pool \n \
-${DEBIAN_MIRROR}       ftp://ftp.pl.debian.org/debian/pool \n \
-${DEBIAN_MIRROR}       ftp://ftp.ro.debian.org/debian/pool \n \
-${DEBIAN_MIRROR}       ftp://ftp.si.debian.org/debian/pool \n \
-${DEBIAN_MIRROR}       ftp://ftp.es.debian.org/debian/pool \n \
-${DEBIAN_MIRROR}       ftp://ftp.se.debian.org/debian/pool \n \
-${DEBIAN_MIRROR}       ftp://ftp.tr.debian.org/debian/pool \n \
+${DEBIAN_MIRROR}       http://ftp.de.debian.org/debian/pool \n \
+${DEBIAN_MIRROR}       http://ftp.au.debian.org/debian/pool \n \
+${DEBIAN_MIRROR}       http://ftp.cl.debian.org/debian/pool \n \
+${DEBIAN_MIRROR}       http://ftp.hr.debian.org/debian/pool \n \
+${DEBIAN_MIRROR}       http://ftp.fi.debian.org/debian/pool \n \
+${DEBIAN_MIRROR}       http://ftp.hk.debian.org/debian/pool \n \
+${DEBIAN_MIRROR}       http://ftp.hu.debian.org/debian/pool \n \
+${DEBIAN_MIRROR}       http://ftp.ie.debian.org/debian/pool \n \
+${DEBIAN_MIRROR}       http://ftp.it.debian.org/debian/pool \n \
+${DEBIAN_MIRROR}       http://ftp.jp.debian.org/debian/pool \n \
+${DEBIAN_MIRROR}       http://ftp.no.debian.org/debian/pool \n \
+${DEBIAN_MIRROR}       http://ftp.pl.debian.org/debian/pool \n \
+${DEBIAN_MIRROR}       http://ftp.ro.debian.org/debian/pool \n \
+${DEBIAN_MIRROR}       http://ftp.si.debian.org/debian/pool \n \
+${DEBIAN_MIRROR}       http://ftp.es.debian.org/debian/pool \n \
+${DEBIAN_MIRROR}       http://ftp.se.debian.org/debian/pool \n \
+${DEBIAN_MIRROR}       http://ftp.tr.debian.org/debian/pool \n \
 ${GNU_MIRROR}  ftp://mirrors.kernel.org/gnu \n \
 ${KERNELORG_MIRROR}    http://www.kernel.org/pub \n \
 ${GNUPG_MIRROR}        ftp://ftp.gnupg.org/gcrypt \n \
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 2dd2bb1..8e4f4bb 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -601,7 +601,7 @@ BBLAYERS_FETCH_DIR ??= "${COREBASE}"
 ##################################################################
 
 APACHE_MIRROR = "http://archive.apache.org/dist";
-DEBIAN_MIRROR = "ftp://ftp.debian.org/debian/pool";
+DEBIAN_MIRROR = "http://ftp.debian.org/debian/pool";
 GENTOO_MIRROR = "http://distfiles.gentoo.org/distfiles";
 GNOME_GIT = "git://git.gnome.org"
 GNOME_MIRROR = "http://ftp.gnome.org/pub/GNOME/sources";
@@ -635,7 +635,7 @@ SRC_URI[vardepsexclude] += "\
 "
 
 # You can use the mirror of your country to get faster downloads by putting
-#  export DEBIAN_MIRROR = "ftp://ftp.de.debian.org/debian/pool";
+#  export DEBIAN_MIRROR = "http://ftp.de.debian.org/debian/pool";
 #     into your local.conf
 
 FETCHCMD_svn = "/usr/bin/env svn --non-interactive --trust-server-cert"