[PATCH 12/14] arago-tisdk-connectivity: Restored connectivity modules compilation

[PATCH 12/14] arago-tisdk-connectivity: Restored connectivity modules compilation

[Yaniv Mahani]

From: Yaniv Machani <yanivma@ti.com>

- Modules compatibility issues with libnl were fixed.

Signed-off-by: Yaniv Machani <yanivma@ti.com>
---
 .../packagegroup-arago-tisdk-connectivity.bb       |   16 ++++++----------
 1 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-connectivity.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-connectivity.bb
index 0aa019d..c159b9d 100644
--- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-connectivity.bb
+++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-connectivity.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "Task to install wlan and bluetooth packages into the target FS"
 LICENSE = "MIT"
-PR = "r17"
+PR = "r18"
 
 inherit packagegroup
 
@@ -23,14 +23,11 @@ WLAN_COMMON = "\
     pulseaudio-module-bluetooth-device \
     eventdump \
     ${@base_contains('WILINK_VERSION','WILINK-8','wlconf','',d)} \
+    wpa-supplicant \
+    crda \
+    hostap-daemon \
+    ti-wifi-utils \
 "
-
-# TI/ECS versions of wpa-supplicant/crda/hostap/wifi-utils require older libnl,
-# which no longer exists
-#    wpa-supplicant
-#    crda
-#    hostap-daemon
-#    ti-wifi-utils
 # No bluetooth/bluetooth.h
 #    oppserver
 
@@ -42,8 +39,7 @@ WLAN_COMMON = "\
 #    ti-compat-bluetooth
 
 FIRMWARE_AND_DRIVERS = "\
-    bt-firmware \
-    bt-enable \
+    "${@base_contains('WILINK_VERSION','WILINK-6',' oppserver bt-firmware bt-enable' , '',d)}"
     wl12xx-firmware \
 "
 
-- 
1.7.9

Re: [PATCH 12/14] arago-tisdk-connectivity: Restored connectivity modules compilation

[Cooper Jr., Franklin]

You addressed all my comments thanks.
Although like my other comment please mention what the differences are between versions of a patch.

Acked-by: Franklin Cooper Jr. <fcooper@ti.com>

> -----Original Message-----
> From: meta-arago-bounces@arago-project.org [mailto:meta-arago-
> bounces@arago-project.org] On Behalf Of Machani, Yaniv
> Sent: Monday, December 02, 2013 8:09 AM
> To: meta-arago@arago-project.org
> Subject: [meta-arago] [PATCH 12/14] arago-tisdk-connectivity: Restored
> connectivity modules compilation
> 
> From: Yaniv Machani <yanivma@ti.com>
> 
> - Modules compatibility issues with libnl were fixed.
> 
> Signed-off-by: Yaniv Machani <yanivma@ti.com>
> ---
>  .../packagegroup-arago-tisdk-connectivity.bb       |   16 ++++++----------
>  1 files changed, 6 insertions(+), 10 deletions(-)
> 
> diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-
> arago-tisdk-connectivity.bb b/meta-arago-distro/recipes-
> core/packagegroups/packagegroup-arago-tisdk-connectivity.bb
> index 0aa019d..c159b9d 100644
> --- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-
> tisdk-connectivity.bb
> +++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-ti
> +++ sdk-connectivity.bb
> @@ -1,6 +1,6 @@
>  DESCRIPTION = "Task to install wlan and bluetooth packages into the target FS"
>  LICENSE = "MIT"
> -PR = "r17"
> +PR = "r18"
> 
>  inherit packagegroup
> 
> @@ -23,14 +23,11 @@ WLAN_COMMON = "\
>      pulseaudio-module-bluetooth-device \
>      eventdump \
>      ${@base_contains('WILINK_VERSION','WILINK-8','wlconf','',d)} \
> +    wpa-supplicant \
> +    crda \
> +    hostap-daemon \
> +    ti-wifi-utils \
>  "
> -
> -# TI/ECS versions of wpa-supplicant/crda/hostap/wifi-utils require older libnl, -
> # which no longer exists
> -#    wpa-supplicant
> -#    crda
> -#    hostap-daemon
> -#    ti-wifi-utils
>  # No bluetooth/bluetooth.h
>  #    oppserver
> 
> @@ -42,8 +39,7 @@ WLAN_COMMON = "\
>  #    ti-compat-bluetooth
> 
>  FIRMWARE_AND_DRIVERS = "\
> -    bt-firmware \
> -    bt-enable \
> +    "${@base_contains('WILINK_VERSION','WILINK-6',' oppserver bt-firmware
> bt-enable' , '',d)}"
>      wl12xx-firmware \
>  "
> 
> --
> 1.7.9
> 
> _______________________________________________
> meta-arago mailing list
> meta-arago@arago-project.org
> http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago

Re: [PATCH 12/14] arago-tisdk-connectivity: Restored connectivity modules compilation

[Denys Dmytriyenko]

On Mon, Dec 02, 2013 at 04:09:07PM +0200, Yaniv Mahani wrote:
> From: Yaniv Machani <yanivma@ti.com>
> 
> - Modules compatibility issues with libnl were fixed.
> 
> Signed-off-by: Yaniv Machani <yanivma@ti.com>
> ---
>  .../packagegroup-arago-tisdk-connectivity.bb       |   16 ++++++----------
>  1 files changed, 6 insertions(+), 10 deletions(-)
> 
> diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-connectivity.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-connectivity.bb
> index 0aa019d..c159b9d 100644
> --- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-connectivity.bb
> +++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-connectivity.bb
> @@ -1,6 +1,6 @@
>  DESCRIPTION = "Task to install wlan and bluetooth packages into the target FS"
>  LICENSE = "MIT"
> -PR = "r17"
> +PR = "r18"
>  
>  inherit packagegroup
>  
> @@ -23,14 +23,11 @@ WLAN_COMMON = "\
>      pulseaudio-module-bluetooth-device \
>      eventdump \
>      ${@base_contains('WILINK_VERSION','WILINK-8','wlconf','',d)} \
> +    wpa-supplicant \
> +    crda \
> +    hostap-daemon \
> +    ti-wifi-utils \
>  "
> -
> -# TI/ECS versions of wpa-supplicant/crda/hostap/wifi-utils require older libnl,
> -# which no longer exists
> -#    wpa-supplicant
> -#    crda
> -#    hostap-daemon
> -#    ti-wifi-utils


>  # No bluetooth/bluetooth.h
>  #    oppserver

As oppserver used to be in common list, I commented it out here as 
unbuildable. Since you took care of it below for WiLink6, please remove the 
comment above.

BTW, what is the statis of Bluetooth in WiLink8? If it's not supported at all, 
should we also remove the other traces of BT, like bluez etc?


> @@ -42,8 +39,7 @@ WLAN_COMMON = "\
>  #    ti-compat-bluetooth

What about other commented out pieces:

ti-compat-wireless-wl12xx
ti-compat-bluetooth
wifi-direct-demo
battleship
wpa-gui-e

Although I see the patch from Eyal to update ti-compat-wireless - I assume 
you'd want to update this packagegroup again.


>  FIRMWARE_AND_DRIVERS = "\
> -    bt-firmware \
> -    bt-enable \
> +    "${@base_contains('WILINK_VERSION','WILINK-6',' oppserver bt-firmware bt-enable' , '',d)}"

Not critical, but there are some "ugly" whitespaces inside the parentheses 
above.


>      wl12xx-firmware \
>  "
>  
> -- 
> 1.7.9
> 
> _______________________________________________
> meta-arago mailing list
> meta-arago@arago-project.org
> http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago

[PATCH 12/14] arago-tisdk-connectivity: Restored connectivity modules compilation

[Yaniv Mahani]

From: Yaniv Machani <yanivma@ti.com>

- Modules compatibility issues with libnl were fixed.

Signed-off-by: Yaniv Machani <yanivma@ti.com>
---
 .../packagegroup-arago-tisdk-connectivity.bb       |   13 +++++--------
 1 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-connectivity.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-connectivity.bb
index 0aa019d..2ef4353 100644
--- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-connectivity.bb
+++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-connectivity.bb
@@ -23,14 +23,11 @@ WLAN_COMMON = "\
     pulseaudio-module-bluetooth-device \
     eventdump \
     ${@base_contains('WILINK_VERSION','WILINK-8','wlconf','',d)} \
+    wpa-supplicant-wl18xx \
+    crda \
+    hostap-daemon-wl18xx \
+    ti-wifi-utils-wl18xx \
 "
-
-# TI/ECS versions of wpa-supplicant/crda/hostap/wifi-utils require older libnl,
-# which no longer exists
-#    wpa-supplicant
-#    crda
-#    hostap-daemon
-#    ti-wifi-utils
 # No bluetooth/bluetooth.h
 #    oppserver
 
@@ -44,7 +41,7 @@ WLAN_COMMON = "\
 FIRMWARE_AND_DRIVERS = "\
     bt-firmware \
     bt-enable \
-    wl12xx-firmware \
+    wl18xx-firmware \
 "
 
 BLUETOOTH_STACK = "\
-- 
1.7.9

Re: [PATCH 12/14] arago-tisdk-connectivity: Restored connectivity modules compilation

[Cooper Jr., Franklin]

This patch only will make things work for Wilink 8 since  your hard coding Wilink 8 versions of the recipes. Just let the PREFERRED_PROVIDER handle setting the correct recipes.
Also make tweaks to include only the bluetooth stuff if Wilink 6 is being used.

> -----Original Message-----
> From: meta-arago-bounces@arago-project.org [mailto:meta-arago-
> bounces@arago-project.org] On Behalf Of Machani, Yaniv
> Sent: Thursday, November 28, 2013 5:39 AM
> To: meta-arago@arago-project.org
> Subject: [meta-arago] [PATCH 12/14] arago-tisdk-connectivity: Restored
> connectivity modules compilation
> 
> From: Yaniv Machani <yanivma@ti.com>
> 
> - Modules compatibility issues with libnl were fixed.
> 
> Signed-off-by: Yaniv Machani <yanivma@ti.com>
> ---
>  .../packagegroup-arago-tisdk-connectivity.bb       |   13 +++++--------
>  1 files changed, 5 insertions(+), 8 deletions(-)
> 
> diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-
> arago-tisdk-connectivity.bb b/meta-arago-distro/recipes-
> core/packagegroups/packagegroup-arago-tisdk-connectivity.bb
> index 0aa019d..2ef4353 100644
> --- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-
> tisdk-connectivity.bb
> +++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-ti
> +++ sdk-connectivity.bb
[Franklin] PR bump is missing.
> @@ -23,14 +23,11 @@ WLAN_COMMON = "\
>      pulseaudio-module-bluetooth-device \
>      eventdump \
>      ${@base_contains('WILINK_VERSION','WILINK-8','wlconf','',d)} \
> +    wpa-supplicant-wl18xx \
[Franklin] Replace this with wpa-supplicant
> +    crda \
> +    hostap-daemon-wl18xx \
[Franklin] Replace this with hostap-daemon
> +    ti-wifi-utils-wl18xx \
[Franklin] Replace this with ti-wifi-utils
>  "
> -
> -# TI/ECS versions of wpa-supplicant/crda/hostap/wifi-utils require older libnl, -
> # which no longer exists
> -#    wpa-supplicant
> -#    crda
> -#    hostap-daemon
> -#    ti-wifi-utils
>  # No bluetooth/bluetooth.h
>  #    oppserver
> 
> @@ -44,7 +41,7 @@ WLAN_COMMON = "\
>  FIRMWARE_AND_DRIVERS = "\
>      bt-firmware \
>      bt-enable \
[Franklin] Change this so it includes this only if WILINK 6 is being use
> -    wl12xx-firmware \
> +    wl18xx-firmware \
[Franklin] Leave wl12xx-firmware.
>  "
> 
>  BLUETOOTH_STACK = "\
> --
> 1.7.9
> 
> _______________________________________________
> meta-arago mailing list
> meta-arago@arago-project.org
> http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago