From: Alexandru Avadanii Date: Mon, 5 Sep 2016 12:12:45 +0000 (+0200) Subject: Rebase: fuel-mirror upstream changes X-Git-Tag: danube.1.RC1~166 X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=b4d5044e751801507738dc02d116436d909d2248;p=armband.git Rebase: fuel-mirror upstream changes Slight rebase after upstream change [1]. FIXME: While looking at [1], I noticed that Armband is not using the proper fuel-mirror version due to our divergent patch & build system. This should be fixed later. [1] https://gerrit.opnfv.org/gerrit/#/c/20317/ Change-Id: I55798ba1004312cd737b6613744683437e98865a Signed-off-by: Alexandru Avadanii --- diff --git a/patches/opnfv-fuel/0047-build-ubuntu-mirror-blacklist-ftp.acc.umu.se.patch b/patches/opnfv-fuel/0047-build-ubuntu-mirror-blacklist-ftp.acc.umu.se.patch index e6e6c2b7..560ab753 100644 --- a/patches/opnfv-fuel/0047-build-ubuntu-mirror-blacklist-ftp.acc.umu.se.patch +++ b/patches/opnfv-fuel/0047-build-ubuntu-mirror-blacklist-ftp.acc.umu.se.patch @@ -13,12 +13,10 @@ diff --git a/build/f_isoroot/f_repobuild/select_ubuntu_repo.sh b/build/f_isoroot index 4bca6bd..67219cb 100755 --- a/build/f_isoroot/f_repobuild/select_ubuntu_repo.sh +++ b/build/f_isoroot/f_repobuild/select_ubuntu_repo.sh -@@ -21,7 +21,7 @@ RSYNC="rsync -4 --contimeout 5 --no-motd --list-only" +@@ -21,5 +21,5 @@ RSYNC="rsync -4 --contimeout 5 --no-motd --list-only" # Some Ubuntu mirrors seem less reliable for this type of mirroring - # as they are discoved they can be added to the blacklist below in order # for them not to be considered. -BLACKLIST="mirrors.se.eu.kernel.org mirror.its.dal.ca" +BLACKLIST="mirrors.se.eu.kernel.org ftp.acc.umu.se mirror.its.dal.ca" - return_url=0 -