diff mbox series

[2/2] package/wf111: do a direct download

Message ID ef05e42aa7a51d33c666507728602993d04344bb.1517677545.git.yann.morin.1998@free.fr
State Accepted
Commit 65fe1c7c5e94df25f14d4cddd76c8902586b3118
Headers show
Series [1/2] package/wf111: fix armv5 URL | expand

Commit Message

Yann E. MORIN Feb. 3, 2018, 5:05 p.m. UTC
We can now do a download without prior registration, so we can drop the
requirement for a local, pre-downloaded tarball, now.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Julien CORJON <corjon.j@ecagroup.com>
Cc: Antoine Ténart <antoine.tenart@free-electrons.com>
---
 package/wf111/Config.in | 11 -----------
 package/wf111/wf111.mk  |  7 +------
 2 files changed, 1 insertion(+), 17 deletions(-)

Comments

Peter Korsgaard Feb. 3, 2018, 7:16 p.m. UTC | #1
>>>>> "Yann" == Yann E MORIN <yann.morin.1998@free.fr> writes:

 > We can now do a download without prior registration, so we can drop the
 > requirement for a local, pre-downloaded tarball, now.

 > Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
 > Cc: Julien CORJON <corjon.j@ecagroup.com>
 > Cc: Antoine Ténart <antoine.tenart@free-electrons.com>
 > ---
 >  package/wf111/Config.in | 11 -----------
 >  package/wf111/wf111.mk  |  7 +------
 >  2 files changed, 1 insertion(+), 17 deletions(-)

 > diff --git a/package/wf111/Config.in b/package/wf111/Config.in
 > index 081bd960cb..7b61ea195f 100644
 > --- a/package/wf111/Config.in
 > +++ b/package/wf111/Config.in
 > @@ -19,17 +19,6 @@ config BR2_PACKAGE_WF111
 
 >  	  https://www.silabs.com/products/wireless/wi-fi/wf111-bluegiga-module

When you click on the links on that page you are still served a login
page, but direct download does indeed work.

The question is if we are allowed to redistribute the tarballs?
Otherwise we should set WF111_REDISTRIBUTE = NO

Do you use this package? Looking at the .mk file we have this comment:

# Due to the stupidity of the package Makefile, we can't invoke
# separately the build step and the install step and get a correct
# behavior. So we do everything in the install step.

But as far as I can see, you CAN build the Linux driver outside the
install step (E.G. make all).

Committed, thanks.
Yann E. MORIN Feb. 3, 2018, 7:32 p.m. UTC | #2
Peter, All,

On 2018-02-03 20:16 +0100, Peter Korsgaard spake thusly:
> >>>>> "Yann" == Yann E MORIN <yann.morin.1998@free.fr> writes:
> 
>  > We can now do a download without prior registration, so we can drop the
>  > requirement for a local, pre-downloaded tarball, now.
> 
>  > Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
>  > Cc: Julien CORJON <corjon.j@ecagroup.com>
>  > Cc: Antoine Ténart <antoine.tenart@free-electrons.com>
>  > ---
>  >  package/wf111/Config.in | 11 -----------
>  >  package/wf111/wf111.mk  |  7 +------
>  >  2 files changed, 1 insertion(+), 17 deletions(-)
> 
>  > diff --git a/package/wf111/Config.in b/package/wf111/Config.in
>  > index 081bd960cb..7b61ea195f 100644
>  > --- a/package/wf111/Config.in
>  > +++ b/package/wf111/Config.in
>  > @@ -19,17 +19,6 @@ config BR2_PACKAGE_WF111
>  
>  >  	  https://www.silabs.com/products/wireless/wi-fi/wf111-bluegiga-module
> 
> When you click on the links on that page you are still served a login
> page, but direct download does indeed work.

Weird. I did not even try to click from the browser; I just copy-pasted
the URL to a wget and it worked...

> The question is if we are allowed to redistribute the tarballs?
> Otherwise we should set WF111_REDISTRIBUTE = NO
> 
> Do you use this package?

No I'm not, I was just fed up with it because of that stupid click-wrap
login page. So, when I noticed Julien updated the homepage, I took the
oportunity to check if the archives still required login. Nope, so I
updated the package.

> Looking at the .mk file we have this comment:
> 
> # Due to the stupidity of the package Makefile, we can't invoke
> # separately the build step and the install step and get a correct
> # behavior. So we do everything in the install step.
> 
> But as far as I can see, you CAN build the Linux driver outside the
> install step (E.G. make all).

I have not even had a cursory look at it, to be honest. I just checked
that the download for the three archives (armv5, armv7 and x86) was
working OK.

Someone that is atcually interested in that package would have to look
at it further...

Regards,
Yann E. MORIN.
diff mbox series

Patch

diff --git a/package/wf111/Config.in b/package/wf111/Config.in
index 081bd960cb..7b61ea195f 100644
--- a/package/wf111/Config.in
+++ b/package/wf111/Config.in
@@ -19,17 +19,6 @@  config BR2_PACKAGE_WF111
 
 	  https://www.silabs.com/products/wireless/wi-fi/wf111-bluegiga-module
 
-if BR2_PACKAGE_WF111
-
-config BR2_PACKAGE_WF111_TARBALL_PATH
-	string "Local tarball location"
-	help
-	  The WF111 tarball can be retrieved on the Silicon Labs
-	  website after registration. This option specifies the path
-	  where the tarball is locally saved.
-
-endif
-
 comment "wf111 needs a glibc toolchain"
 	depends on BR2_LINUX_KERNEL
 	depends on BR2_ARM_CPU_ARMV5 || BR2_ARM_CPU_ARMV7A || BR2_i386
diff --git a/package/wf111/wf111.mk b/package/wf111/wf111.mk
index 5178944fa3..72526333fd 100644
--- a/package/wf111/wf111.mk
+++ b/package/wf111/wf111.mk
@@ -5,14 +5,9 @@ 
 ################################################################################
 
 WF111_VERSION = 5-2-2-r3
-WF111_SITE_METHOD = file
-WF111_SITE = $(call qstrip,$(BR2_PACKAGE_WF111_TARBALL_PATH))
+WF111_SITE = https://www.silabs.com/documents/login/software
 WF111_DEPENDENCIES = linux
 
-ifeq ($(BR2_PACKAGE_WF111)$(call qstrip,$(BR2_PACKAGE_WF111_TARBALL_PATH)),y)
-$(error No tarball location specified, check BR2_PACKAGE_WF111_TARBALL_PATH)
-endif
-
 ifeq ($(BR2_ARM_CPU_ARMV7A),y)
 WF111_SOURCE = wf111-linux-driver-$(WF111_VERSION)-armv7-a.tar.gz
 else ifeq ($(BR2_ARM_CPU_ARMV5),y)