[PATCH] treewide: unify OpenWrt hosted source URL
Multiple sources are hosted on OpenWrts source server only. The source URLs to point to the server vary based on different epochs in OpenWrts history. Unify them to use always the new source CDN and HTTPS. If the CDN fails, sources.o.o is used as a fallback via downloads.pl. Signed-off-by: Paul Spooren --- package/boot/fconfig/Makefile | 2 +- package/firmware/b43legacy-firmware/Makefile | 2 +- package/firmware/lantiq/dsl-vrx200-firmware-xdsl/Makefile | 2 +- package/kernel/broadcom-wl/Makefile | 2 +- package/kernel/lantiq/ltq-adsl/Makefile | 2 +- package/kernel/lantiq/ltq-tapi/Makefile | 2 +- package/kernel/lantiq/ltq-vdsl-mei/Makefile | 2 +- package/kernel/lantiq/ltq-vdsl/Makefile | 2 +- package/kernel/lantiq/ltq-vmmc/Makefile | 2 +- package/kernel/mac80211/broadcom.mk | 6 +++--- package/network/config/ltq-adsl-app/Makefile | 2 +- package/network/config/ltq-vdsl-app/Makefile | 2 +- tools/lzma-old/Makefile | 2 +- tools/lzma/Makefile | 2 +- 14 files changed, 16 insertions(+), 16 deletions(-) diff --git a/package/boot/fconfig/Makefile b/package/boot/fconfig/Makefile index 9b806fe97c..31986e6942 100644 --- a/package/boot/fconfig/Makefile +++ b/package/boot/fconfig/Makefile @@ -12,7 +12,7 @@ PKG_VERSION:=20080329 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=https://downloads.openwrt.org/sources +PKG_SOURCE_URL:=https://sources.cdn.openwrt.org PKG_HASH:=4ff0e8f07e35e46b705c0dbe9d9544ede01ea092a69e3f7db03e55a3f2bb8eb7 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME) diff --git a/package/firmware/b43legacy-firmware/Makefile b/package/firmware/b43legacy-firmware/Makefile index 9b9c0070b2..0108c2a169 100644 --- a/package/firmware/b43legacy-firmware/Makefile +++ b/package/firmware/b43legacy-firmware/Makefile @@ -12,7 +12,7 @@ PKG_VERSION:=3.130.20.0 PKG_RELEASE:=1 PKG_SOURCE:=wl_apsta-$(PKG_VERSION).o -PKG_SOURCE_URL:=https://downloads.openwrt.org/sources +PKG_SOURCE_URL:=https://sources.cdn.openwrt.org PKG_HASH:=7dba610b1d96dd14e901bcbce14cd6ecd1b1ac6f5c0035b0d6b6dc46a7c3ef90 include $(INCLUDE_DIR)/package.mk diff --git a/package/firmware/lantiq/dsl-vrx200-firmware-xdsl/Makefile b/package/firmware/lantiq/dsl-vrx200-firmware-xdsl/Makefile index a076fe2596..781c85ec87 100644 --- a/package/firmware/lantiq/dsl-vrx200-firmware-xdsl/Makefile +++ b/package/firmware/lantiq/dsl-vrx200-firmware-xdsl/Makefile @@ -10,7 +10,7 @@ PKG_NAME:=dsl_vr9_firmware_xdsl PKG_VERSION:=05.08.01.08.01.06_05.08.00.0B.01.01_osc PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=http://mirror2.openwrt.org/sources +PKG_SOURCE_URL:=https://sources.cdn.openwrt.org PKG_HASH:=44cd94130571fe42dfa8f0f9d44597d104e9e77962617fe38646b7a0b4184a2b PKG_BUILD_DEPENDS:=bsdiff/host diff --git a/package/kernel/broadcom-wl/Makefile b/package/kernel/broadcom-wl/Makefile index 661c7f0589..8774b64dc0 100644 --- a/package/kernel/broadcom-wl/Makefile +++ b/package/kernel/broadcom-wl/Makefile @@ -13,7 +13,7 @@ PKG_VERSION:=5.10.56.27.3 PKG_RELEASE:=10 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(ARCH).tar.bz2 -PKG_SOURCE_URL:=https://downloads.openwrt.org/sources +PKG_SOURCE_URL:=https://sources.cdn.openwrt.org ifeq ($(ARCH),mipsel) PKG_HASH:=26a8c370f48fc129d0731cfd751c36cae1419b0bc8ca35781126744e60eae009 diff --git a/package/kernel/lantiq/ltq-adsl/Makefile b/package/kernel/lantiq/ltq-adsl/Makefile index 1a9128fc58..e7cd23f48a 100644 --- a/package/kernel/lantiq/ltq-adsl/Makefile +++ b/package/kernel/lantiq/ltq-adsl/Makefile @@ -13,7 +13,7 @@ PKG_VERSION:=3.24.4.4 PKG_RELEASE:=3 PKG_SOURCE:=drv_dsl_cpe_api_danube-$(PKG_VERSION).tar.gz PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/ltq-dsl-$(BUILD_VARIANT)/drv_dsl_cpe_api-$(PKG_VERSION) -PKG_SOURCE_URL:=https://mirror2.openwrt.org/sources/ +PKG_SOURCE_URL:=https://sources.cdn.openwrt.org PKG_HASH:=eb2ed59715d3bf4e8a1460bbbe2f1660039e0a9f9d72afb1b2b16590094eb33c PKG_MAINTAINER:=John Crispin diff --git a/package/kernel/lantiq/ltq-tapi/Makefile b/package/kernel/lantiq/ltq-tapi/Makefile index 072041c589..f364dca723 100644 --- a/package/kernel/lantiq/ltq-tapi/Makefile +++ b/package/kernel/lantiq/ltq-tapi/Makefile @@ -13,7 +13,7 @@ PKG_VERSION:=3.13.0 PKG_RELEASE:=4 PKG_SOURCE:=drv_tapi-$(PKG_VERSION).tar.bz2 -PKG_SOURCE_URL:=http://mirror2.openwrt.org/sources +PKG_SOURCE_URL:=https://sources.cdn.openwrt.org PKG_HASH:=109374d52872716570fca3fef3b93c9a93159a804dfd42484b19152b825af5c0 PKG_MAINTAINER:=John Crispin diff --git a/package/kernel/lantiq/ltq-vdsl-mei/Makefile b/package/kernel/lantiq/ltq-vdsl-mei/Makefile index 5d15f2650b..82c779daa0 100644 --- a/package/kernel/lantiq/ltq-vdsl-mei/Makefile +++ b/package/kernel/lantiq/ltq-vdsl-mei/Makefile @@ -14,7 +1
Re: [PATCH] treewide: unify OpenWrt hosted source URL
Paul Spooren kirjoitti 30.1.2021 klo 23.54: Multiple sources are hosted on OpenWrts source server only. The source URLs to point to the server vary based on different epochs in OpenWrts history. Unify them to use always the new source CDN and HTTPS. If the CDN fails, sources.o.o is used as a fallback via downloads.pl. Signed-off-by: Paul Spooren --- package/boot/fconfig/Makefile | 2 +- package/firmware/b43legacy-firmware/Makefile | 2 +- package/firmware/lantiq/dsl-vrx200-firmware-xdsl/Makefile | 2 +- package/kernel/broadcom-wl/Makefile | 2 +- package/kernel/lantiq/ltq-adsl/Makefile | 2 +- package/kernel/lantiq/ltq-tapi/Makefile | 2 +- package/kernel/lantiq/ltq-vdsl-mei/Makefile | 2 +- package/kernel/lantiq/ltq-vdsl/Makefile | 2 +- package/kernel/lantiq/ltq-vmmc/Makefile | 2 +- package/kernel/mac80211/broadcom.mk | 6 +++--- package/network/config/ltq-adsl-app/Makefile | 2 +- package/network/config/ltq-vdsl-app/Makefile | 2 +- tools/lzma-old/Makefile | 2 +- tools/lzma/Makefile | 2 +- 14 files changed, 16 insertions(+), 16 deletions(-) diff --git a/package/boot/fconfig/Makefile b/package/boot/fconfig/Makefile index 9b806fe97c..31986e6942 100644 --- a/package/boot/fconfig/Makefile +++ b/package/boot/fconfig/Makefile @@ -12,7 +12,7 @@ PKG_VERSION:=20080329 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=https://downloads.openwrt.org/sources +PKG_SOURCE_URL:=https://sources.cdn.openwrt.org Would it make sense to define a similar @OPENWRT alias in scripts/download.pl as we have done for SF, APACHE, GITHUB, GNU, SAVANNAH, KERNEL and GNOME ? https://github.com/openwrt/openwrt/blob/master/scripts/download.pl#L192-L255 Then we could in future change those download locations centrally in download.pl, instead of changing it every single Makefile where it is used. The Makefiles could just contain PKG_SOURCE_URL:=@OPENWRT (One afterthought: the pushed contents might actually be empty, as the actual download locations are pushed on lines 261-263 to the same trial queue. Not quite sure about the pushing order logic, but might work.) ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [PATCH] treewide: unify OpenWrt hosted source URL
On Sun, Jan 31, 2021 at 10:08, Hannu Nyman wrote: Paul Spooren kirjoitti 30.1.2021 klo 23.54: Multiple sources are hosted on OpenWrts source server only. The source URLs to point to the server vary based on different epochs in OpenWrts history. Unify them to use always the new source CDN and HTTPS. If the CDN fails, sources.o.o is used as a fallback via downloads.pl. Signed-off-by: Paul Spooren --- package/boot/fconfig/Makefile | 2 +- package/firmware/b43legacy-firmware/Makefile | 2 +- package/firmware/lantiq/dsl-vrx200-firmware-xdsl/Makefile | 2 +- package/kernel/broadcom-wl/Makefile | 2 +- package/kernel/lantiq/ltq-adsl/Makefile | 2 +- package/kernel/lantiq/ltq-tapi/Makefile | 2 +- package/kernel/lantiq/ltq-vdsl-mei/Makefile | 2 +- package/kernel/lantiq/ltq-vdsl/Makefile | 2 +- package/kernel/lantiq/ltq-vmmc/Makefile | 2 +- package/kernel/mac80211/broadcom.mk | 6 +++--- package/network/config/ltq-adsl-app/Makefile | 2 +- package/network/config/ltq-vdsl-app/Makefile | 2 +- tools/lzma-old/Makefile | 2 +- tools/lzma/Makefile | 2 +- 14 files changed, 16 insertions(+), 16 deletions(-) diff --git a/package/boot/fconfig/Makefile b/package/boot/fconfig/Makefile index 9b806fe97c..31986e6942 100644 --- a/package/boot/fconfig/Makefile +++ b/package/boot/fconfig/Makefile @@ -12,7 +12,7 @@ PKG_VERSION:=20080329 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=https://downloads.openwrt.org/sources +PKG_SOURCE_URL:=https://sources.cdn.openwrt.org Would it make sense to define a similar @OPENWRT alias in scripts/download.pl as we have done for SF, APACHE, GITHUB, GNU, SAVANNAH, KERNEL and GNOME ? I had the same idea but thought it's awkward to define a variable which is then empty. I'll give it a try and see how it looks. We could then decide for either solution. https://github.com/openwrt/openwrt/blob/master/scripts/download.pl#L192-L255 Then we could in future change those download locations centrally in download.pl, instead of changing it every single Makefile where it is used. The Makefiles could just contain PKG_SOURCE_URL:=@OPENWRT (One afterthought: the pushed contents might actually be empty, as the actual download locations are pushed on lines 261-263 to the same trial queue. Not quite sure about the pushing order logic, but might work.) ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [PATCH] treewide: unify OpenWrt hosted source URL
Paul Spooren kirjoitti 31.1.2021 klo 11.19: On Sun, Jan 31, 2021 at 10:08, Hannu Nyman wrote: Paul Spooren kirjoitti 30.1.2021 klo 23.54: Multiple sources are hosted on OpenWrts source server only. The source URLs to point to the server vary based on different epochs in OpenWrts history. Unify them to use always the new source CDN and HTTPS. If the CDN fails, sources.o.o is used as a fallback via downloads.pl. Signed-off-by: Paul Spooren --- ... PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=https://downloads.openwrt.org/sources +PKG_SOURCE_URL:=https://sources.cdn.openwrt.org Would it make sense to define a similar @OPENWRT alias in scripts/download.pl as we have done for SF, APACHE, GITHUB, GNU, SAVANNAH, KERNEL and GNOME ? I had the same idea but thought it's awkward to define a variable which is then empty. I'll give it a try and see how it looks. We could then decide for either solution. Just an elsif block with a comment about the actual sites being added at the end as deafult fallback sites in any case. (and possibly a no-op line like sleep(1), if the elsif block needs some actual contents. (not sure about perl)). Or possibly an elsif block containing the same cdn line, so that it gets added twice (once here, once as fallback). Seems extraflous, but would look tidy. https://github.com/openwrt/openwrt/blob/master/scripts/download.pl#L192-L255 Then we could in future change those download locations centrally in download.pl, instead of changing it every single Makefile where it is used. The Makefiles could just contain PKG_SOURCE_URL:=@OPENWRT (One afterthought: the pushed contents might actually be empty, as the actual download locations are pushed on lines 261-263 to the same trial queue. Not quite sure about the pushing order logic, but might work.) ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
