[PATCH] treewide: unify OpenWrt hosted source URL

Paul Spooren mail at aparcar.org
Sun Jan 31 04:19:02 EST 2021



On Sun, Jan 31, 2021 at 10:08, Hannu Nyman <hannu.nyman at iki.fi> 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 <mail at aparcar.org>
>> ---
>>   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.)
> 





More information about the openwrt-devel mailing list