Skip to contentSkip to conversation

package/wf111: don't require a pre-downloaded tarball

PATCH New Yann E. MORIN 2 participants 6 messages Feb 3, 2018

lore
Share & tools
lore
#0 lore raw

cover package/wf111: don't require a pre-downloaded tarball

Hello All!

The download site is now longer behind a click-wrap registration process, so we can do a direct download now.

Also, fix the archive name for the armv5te variant.

Regards,
Yann E. MORIN.

The following changes since commit 233202597d9411399aeaded2f9a7cd14f2e29833

python3: bump to 2.6.4 (2018-02-03 08:26:16 +0100)

are available in the git repository at:

git://git.buildroot.org/~ymorin/git/buildroot.git

for you to fetch changes up to ef05e42aa7a51d33c666507728602993d04344bb

package/wf111: do a direct download (2018-02-03 17:57:14 +0100)

----------------------------------------------------------------
Yann E. MORIN (2):
package/wf111: fix armv5 URL
package/wf111: do a direct download

 package/wf111/Config.in | 11 -----------
 package/wf111/wf111.mk  |  9 ++-------
 2 files changed, 2 insertions(+), 18 deletions(-)
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
#1 lore raw

PATCH 1/2 package/wf111: fix armv5 URL

Commit b857c7481 (package/wf111: bump to version 5.2.2-r3) forgot to completely update the archive name for the armv5te variant.

Cc Julien CORJON <[email protected]>
Cc Antoine T?nart <[email protected]>
---
 package/wf111/wf111.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
package/wf111/wf111.mk +1 -1
index ed55672136..5178944fa3 100644
@@ -16,7 +16,7 @@ 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)
-WF111_SOURCE = wf111-linux-driver-$(WF111_VERSION)-armv5t.tar.gz
+WF111_SOURCE = wf111-linux-driver-$(WF111_VERSION)-armv5te.tar.gz
 else ifeq ($(BR2_i386),y)
 WF111_SOURCE = wf111-linux-driver-$(WF111_VERSION)-x86.tar.gz
 endif
Signature · 1 line
2.14.1
#2 lore raw

PATCH 1/2 package/wf111: fix armv5 URL

Quoted 8 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Yann" == Yann E MORIN <[email protected]> writes:

Commit b857c7481 (package/wf111: bump to version 5.2.2-r3) forgot to completely update the archive name for the armv5te variant.

Cc Julien CORJON <[email protected]>
Cc Antoine T?nart <[email protected]>

Committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard
#3 lore raw

PATCH 2/2 package/wf111: do a direct download

In reply to Yann E. MORIN

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

Cc Julien CORJON <[email protected]>
Cc Antoine T?nart <[email protected]>
---
 package/wf111/Config.in | 11 -----------
 package/wf111/wf111.mk  |  7 +------
 2 files changed, 1 insertion(+), 17 deletions(-)
package/wf111/Config.in +0 -11
index 081bd960cb..7b61ea195f 100644
@@ -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
package/wf111/wf111.mk +1 -6
index 5178944fa3..72526333fd 100644
@@ -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)
Signature · 1 line
2.14.1
#4 lore raw

PATCH 2/2 package/wf111: do a direct download

Quoted 18 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Yann" == Yann E MORIN <[email protected]> writes:

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

Cc Julien CORJON <[email protected]>
Cc Antoine T?nart <[email protected]>
---
 package/wf111/Config.in | 11 -----------
 package/wf111/wf111.mk  |  7 +------
 2 files changed, 1 insertion(+), 17 deletions(-)
package/wf111/Config.in +0 -0
index 081bd960cb..7b61ea195f 100644

package/wf111/Config.in config BR2_PACKAGE_WF111 · line 20

Quoted 2 lines
package/wf111/Config.in +0 -0
@@ -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.

Signature · 1 line
Bye, Peter Korsgaard
#5 lore raw

PATCH 2/2 package/wf111: do a direct download

Peter, All,

On 2018-02-03 20:16 +0100, Peter Korsgaard spake thusly:

Quoted 19 lines
Quoted 18 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Yann" == Yann E MORIN <[email protected]> writes:

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

Cc Julien CORJON <[email protected]>
Cc Antoine T?nart <[email protected]>
---
 package/wf111/Config.in | 11 -----------
 package/wf111/wf111.mk  |  7 +------
 2 files changed, 1 insertion(+), 17 deletions(-)
package/wf111/Config.in +0 -0
index 081bd960cb..7b61ea195f 100644
@@ -19,17 +19,6 @@ config BR2_PACKAGE_WF111
Quoted 4 lines

package/wf111/Config.in config BR2_PACKAGE_WF111 · line 20

Quoted 1 line
package/wf111/Config.in +0 -0
 	  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...

Quoted 4 lines

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.

Quoted 8 lines

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.

Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'