diff mbox series

[LEDE-DEV,1/3] uboot-envtools: Remove openwrt mirror from PKG_SOURCE_URL.

Message ID 20180220204301.15490-1-rosenp@gmail.com
State Rejected
Delegated to: John Crispin
Headers show
Series [LEDE-DEV,1/3] uboot-envtools: Remove openwrt mirror from PKG_SOURCE_URL. | expand

Commit Message

Rosen Penev Feb. 20, 2018, 8:42 p.m. UTC
This mirror is already attempted in case the other fails. Doesn't matter though since it doesn't work anyway (404 error). Discovered through "make download V=s" Output:

make[2]: Entering directory '/home/mangix/devstuff/openwrt/package/boot/uboot-envtools'
mkdir -p /home/mangix/devstuff/openwrt/dl
SHELL= flock /home/mangix/devstuff/openwrt/tmp/.u-boot-2015.10.tar.bz2.flock -c '  	/home/mangix/devstuff/openwrt/scripts/download.pl "/home/mangix/devstuff/openwrt/dl" "u-boot-2015.10.tar.bz2" "bdc68d5f9455ad933b059c735d983f2c8b6b552dafb062e5ff1444f623021955" "" "http://mirror2.openwrt.org/sources" "ftp://ftp.denx.de/pub/u-boot"    '
+ curl -f --connect-timeout 20 --retry 5 --location --insecure http://mirror2.openwrt.org/sources/u-boot-2015.10.tar.bz2
  % Total    % Received % Xferd  Average Speed   Time    Time     Time  Current
                                 Dload  Upload   Total   Spent    Left  Speed
  0     0    0     0    0     0      0      0 --:--:-- --:--:-- --:--:--     0
curl: (22) The requested URL returned error: 404 Not Found
Download failed.
+ curl -f --connect-timeout 20 --retry 5 --location --insecure ftp://ftp.denx.de/pub/u-boot/u-boot-2015.10.tar.bz2
  % Total    % Received % Xferd  Average Speed   Time    Time     Time  Current
                                 Dload  Upload   Total   Spent    Left  Speed
100  9.9M  100  9.9M    0     0  2034k      0  0:00:05  0:00:05 --:--:-- 2317k
make[2]: Leaving directory '/home/mangix/devstuff/openwrt/package/boot/uboot-envtools'

Signed-off-by: Rosen Penev <rosenp@gmail.com>
---
 package/boot/uboot-envtools/Makefile | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

Comments

Felix Fietkau Feb. 22, 2018, 11:49 a.m. UTC | #1
On 2018-02-20 22:36, Rosen Penev wrote:
> On Tue, Feb 20, 2018 at 1:23 PM, Felix Fietkau <nbd@nbd.name> wrote:
>> On 2018-02-20 21:42, Rosen Penev wrote:
>>> This mirror is already attempted in case the other fails. Doesn't matter though since it doesn't work anyway (404 error). Discovered through "make download V=s" Output:
>>>
>>> make[2]: Entering directory '/home/mangix/devstuff/openwrt/package/boot/uboot-envtools'
>>> mkdir -p /home/mangix/devstuff/openwrt/dl
>>> SHELL= flock /home/mangix/devstuff/openwrt/tmp/.u-boot-2015.10.tar.bz2.flock -c '     /home/mangix/devstuff/openwrt/scripts/download.pl "/home/mangix/devstuff/openwrt/dl" "u-boot-2015.10.tar.bz2" "bdc68d5f9455ad933b059c735d983f2c8b6b552dafb062e5ff1444f623021955" "" "http://mirror2.openwrt.org/sources" "ftp://ftp.denx.de/pub/u-boot"    '
>>> + curl -f --connect-timeout 20 --retry 5 --location --insecure http://mirror2.openwrt.org/sources/u-boot-2015.10.tar.bz2
>>>   % Total    % Received % Xferd  Average Speed   Time    Time     Time  Current
>>>                                  Dload  Upload   Total   Spent    Left  Speed
>>>   0     0    0     0    0     0      0      0 --:--:-- --:--:-- --:--:--     0
>>> curl: (22) The requested URL returned error: 404 Not Found
>>> Download failed.
>>> + curl -f --connect-timeout 20 --retry 5 --location --insecure ftp://ftp.denx.de/pub/u-boot/u-boot-2015.10.tar.bz2
>>>   % Total    % Received % Xferd  Average Speed   Time    Time     Time  Current
>>>                                  Dload  Upload   Total   Spent    Left  Speed
>>> 100  9.9M  100  9.9M    0     0  2034k      0  0:00:05  0:00:05 --:--:-- 2317k
>>> make[2]: Leaving directory '/home/mangix/devstuff/openwrt/package/boot/uboot-envtools'
>>>
>>> Signed-off-by: Rosen Penev <rosenp@gmail.com>
>> We should add http://sources.lede-project.org before the primary FTP
>> site. FTP has a habit of failing in many environments (it's a rather
>> nasty protocol).
> 
> It's a bit redundant, no?
Redundant, but avoids potentially long timeouts on FTP failures.

> U-Boot is also officially available on GitHub with 325 releases
> currently. Might be a better idea to switch to that.
Feel free to propose a patch for that.

- Felix
diff mbox series

Patch

diff --git a/package/boot/uboot-envtools/Makefile b/package/boot/uboot-envtools/Makefile
index 57a2ec5393..54ba425b31 100644
--- a/package/boot/uboot-envtools/Makefile
+++ b/package/boot/uboot-envtools/Makefile
@@ -14,9 +14,7 @@  PKG_RELEASE:=1
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/u-boot-$(PKG_VERSION)
 PKG_SOURCE:=$(PKG_DISTNAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=\
-	http://mirror2.openwrt.org/sources \
-	ftp://ftp.denx.de/pub/u-boot
+PKG_SOURCE_URL:=ftp://ftp.denx.de/pub/u-boot
 PKG_HASH:=bdc68d5f9455ad933b059c735d983f2c8b6b552dafb062e5ff1444f623021955
 
 PKG_BUILD_DEPENDS:=fstools