* [PATCH 1/2 v2] wl18xx-compat: version update
@ 2014-07-31 21:28 Yaniv Machani
2014-07-31 21:28 ` [PATCH 2/2] wpa-supplicant-wl18xx: configuration files update Yaniv Machani
2014-08-04 21:16 ` [PATCH 1/2 v2] wl18xx-compat: version update Denys Dmytriyenko
0 siblings, 2 replies; 8+ messages in thread
From: Yaniv Machani @ 2014-07-31 21:28 UTC (permalink / raw)
To: meta-arago
- Update to latest version tag - ol_r8.a9.14
- move to git.ti.com and use backports module.
- clean some unused commands.
Signed-off-by: Yaniv Machani <yanivma@ti.com>
---
v2 - Updated after inputs
changed to wl18xx, combined PR.
format-patch didn't recognized it as renamed file.
.../packagegroup-arago-tisdk-connectivity.bb | 1 +
.../ti-compat-wireless-wl18xx_r8.a8.10.bb | 61 --------------------
.../ti-compat-wireless-wl18xx_r8.a9.14.bb | 56 ++++++++++++++++++
3 files changed, 57 insertions(+), 61 deletions(-)
delete mode 100644 meta-arago-extras/recipes-bsp/ti-compat-wireless/ti-compat-wireless-wl18xx_r8.a8.10.bb
create mode 100644 meta-arago-extras/recipes-bsp/ti-compat-wireless/ti-compat-wireless-wl18xx_r8.a9.14.bb
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 fa82e7e..fafffee 100755
--- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-connectivity.bb
+++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-connectivity.bb
@@ -31,6 +31,7 @@ WLAN_COMMON = "\
# netperf
FIRMWARE_AND_DRIVERS = "\
+ ti-compat-wireless-wl18xx \
wl18xx-firmware \
"
diff --git a/meta-arago-extras/recipes-bsp/ti-compat-wireless/ti-compat-wireless-wl18xx_r8.a8.10.bb b/meta-arago-extras/recipes-bsp/ti-compat-wireless/ti-compat-wireless-wl18xx_r8.a8.10.bb
deleted file mode 100644
index 0e7281a..0000000
--- a/meta-arago-extras/recipes-bsp/ti-compat-wireless/ti-compat-wireless-wl18xx_r8.a8.10.bb
+++ /dev/null
@@ -1,61 +0,0 @@
-# This is a TI specific version of the compat-wireless recipe using a
-# compat-wireless package created from the TI Systems Tested mac80211 releases.
-
-DESCRIPTION = "ti compat-wireless drivers for wl18xx"
-HOMEPAGE = "https://gforge.ti.com/gf/project/ecs_nlcp/"
-SECTION = "kernel/modules"
-LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7"
-
-RDEPENDS_${PN} = "wireless-tools"
-
-PROVIDES += "ti-compat-wireless-wl12xx"
-RPROVIDES_${PN} += "ti-compat-wireless-wl12xx"
-RREPLACES_${PN} += "ti-compat-wireless-wl12xx"
-RCONFLICTS_${PN} += "ti-compat-wireless-wl12xx"
-
-COMPATIBLE_MACHINE = "(omap-a15)"
-
-PV = "r8.a8.08"
-inherit module
-
-PR = "${MACHINE_KERNEL_PR}"
-PR_append = "b"
-
-# Tags: ol_r8.a8.10
-SRCREV_wl18xx = "eaa1820c02dc076e6ad9254e9cb7a3bb0c17471b"
-SRCREV_compat = "5d80865281795f962e1400a95202bbd07dd763c0"
-SRCREV_compat-wireless = "23a0d62ea1a57327709a77f08d6265ec807a909f"
-
-SRCREV_FORMAT = "compat-wireless"
-
-S = "${WORKDIR}/compat-wireless"
-
-SRC_URI = "git://github.com/TI-OpenLink/compat-wireless.git;destsuffix=compat-wireless;name=compat-wireless \
- git://github.com/TI-OpenLink/compat.git;destsuffix=compat;name=compat \
- git://github.com/TI-OpenLink/wl18xx.git;destsuffix=wl18xx;name=wl18xx \
-"
-
-EXTRA_OEMAKE = "KLIB_BUILD=${STAGING_KERNEL_DIR} KLIB=${D}"
-
-do_configure() {
- cd ${S}
- GIT_TREE="${WORKDIR}/wl18xx" GIT_COMPAT_TREE="${WORKDIR}/compat" ./scripts/admin-refresh.sh network
- ./scripts/driver-select wl18xx
-
- # Now generate the sourceipk with the properly configured sources
- sourceipk_do_create_srcipk
-}
-
-do_configure_append() {
- sed -i "s#@./scripts/update-initramfs## " Makefile
-}
-
-do_install() {
- # Remove hardcoded references to host depmod
- sed -i "s#@/sbin/depmod -a## " Makefile
- sed -i "s#@/sbin/depmod -ae## " Makefile
-
- # Install modules
- oe_runmake DEPMOD=echo DESTDIR="${D}" INSTALL_MOD_PATH="${D}" LDFLAGS="" install-modules
-}
diff --git a/meta-arago-extras/recipes-bsp/ti-compat-wireless/ti-compat-wireless-wl18xx_r8.a9.14.bb b/meta-arago-extras/recipes-bsp/ti-compat-wireless/ti-compat-wireless-wl18xx_r8.a9.14.bb
new file mode 100644
index 0000000..a5d5429
--- /dev/null
+++ b/meta-arago-extras/recipes-bsp/ti-compat-wireless/ti-compat-wireless-wl18xx_r8.a9.14.bb
@@ -0,0 +1,56 @@
+# This is a TI specific version of the compat-wireless recipe using a
+# compat-wireless package created from the TI Systems Tested mac80211 releases.
+
+DESCRIPTION = "ti compat-wireless drivers for wl18xx"
+HOMEPAGE = "https://git.ti.com/wilink8-wlan/wl18xx"
+SECTION = "kernel/modules"
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7"
+
+RDEPENDS_${PN} = "wireless-tools"
+
+PROVIDES += "ti-compat-wireless-wl18xx"
+RPROVIDES_${PN} += "ti-compat-wireless-wl18xx"
+RREPLACES_${PN} += "ti-compat-wireless-wl18xx"
+RCONFLICTS_${PN} += "ti-compat-wireless-wl18xx"
+
+PV = "r8.a9.14"
+inherit module
+
+PR = "${MACHINE_KERNEL_PR}+a+gitr${SRCPV}"
+
+# Tags: ol_r8.a9.14
+SRCREV_wl18xx = "0e48c4b55cfa0d557a098cbe92b1f092f1a9ad67"
+BRANCH_wl18xx = "ap_p2p"
+SRCREV_backports = "0d46f43a2f3ccdd53de19eee5b9c674bf8ef09a2"
+BRANCH_backports = "ap_dfs_mbss_all"
+
+SRCREV_FORMAT = "wl18xx"
+
+S = "${WORKDIR}/compat-wireless"
+
+SRC_URI = "git://git.ti.com/wilink8-wlan/wl18xx.git;branch=${BRANCH_wl18xx};destsuffix=wl18xx;name=wl18xx \
+ git://git.ti.com/wilink8-wlan/backports.git;branch=${BRANCH_backports};destsuffix=backports;name=backports \
+ "
+
+export KLIB_BUILD="${STAGING_KERNEL_DIR}"
+export KLIB="${D}"
+
+do_configure() {
+ cd "${WORKDIR}/backports"
+ unset CC
+ #Generate compat-wireless
+ python ./gentree.py --clean "${WORKDIR}/wl18xx" "${WORKDIR}/compat-wireless"
+
+ cd ${S}
+ make defconfig-wl18xx
+
+ # Now generate the sourceipk with the properly configured sources
+ sourceipk_do_create_srcipk
+}
+
+do_install() {
+ # Install modules
+ oe_runmake modules_install
+}
+
--
1.7.9
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH 2/2] wpa-supplicant-wl18xx: configuration files update
2014-07-31 21:28 [PATCH 1/2 v2] wl18xx-compat: version update Yaniv Machani
@ 2014-07-31 21:28 ` Yaniv Machani
2014-08-04 21:18 ` Denys Dmytriyenko
2014-08-04 21:16 ` [PATCH 1/2 v2] wl18xx-compat: version update Denys Dmytriyenko
1 sibling, 1 reply; 8+ messages in thread
From: Yaniv Machani @ 2014-07-31 21:28 UTC (permalink / raw)
To: meta-arago
- clean non releveant configuration flags.
Signed-off-by: Yaniv Machani <yanivma@ti.com>
---
.../wpa-supplicant/p2p_supplicant.conf | 3 +--
.../wpa-supplicant/wpa_supplicant.conf | 3 ++-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/meta-arago-extras/recipes-connectivity/wpa-supplicant/wpa-supplicant/p2p_supplicant.conf b/meta-arago-extras/recipes-connectivity/wpa-supplicant/wpa-supplicant/p2p_supplicant.conf
index 2de8730..3bdc306 100755
--- a/meta-arago-extras/recipes-connectivity/wpa-supplicant/wpa-supplicant/p2p_supplicant.conf
+++ b/meta-arago-extras/recipes-connectivity/wpa-supplicant/wpa-supplicant/p2p_supplicant.conf
@@ -3,12 +3,11 @@ update_config=0
device_name=TI-SITARA-P2P
device_type=1-0050F204-1
config_methods=virtual_push_button physical_display keypad
-p2p_go_intent=0
+#p2p_go_intent=0
country=US
##p2p_pref_chan=115:36 115:40
driver_param=use_multi_chan_concurrent=1 use_p2p_group_interface=1
p2p_go_max_inactivity=60
p2p_go_ht40=1
-p2p_multi_chan=1
disassoc_low_ack=1
concurrent_sched_scan=1
diff --git a/meta-arago-extras/recipes-connectivity/wpa-supplicant/wpa-supplicant/wpa_supplicant.conf b/meta-arago-extras/recipes-connectivity/wpa-supplicant/wpa-supplicant/wpa_supplicant.conf
index f144a38..4233eb2 100644
--- a/meta-arago-extras/recipes-connectivity/wpa-supplicant/wpa-supplicant/wpa_supplicant.conf
+++ b/meta-arago-extras/recipes-connectivity/wpa-supplicant/wpa-supplicant/wpa_supplicant.conf
@@ -59,6 +59,7 @@ driver_param=use_multi_chan_concurrent=1 use_p2p_group_interface=1
# inactive stations.
p2p_go_max_inactivity=60
p2p_go_ht40=1
-p2p_multi_chan=1
disassoc_low_ack=1
concurrent_sched_scan=1
+p2p_disabled=1
+
--
1.7.9
^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH 1/2 v2] wl18xx-compat: version update
2014-07-31 21:28 [PATCH 1/2 v2] wl18xx-compat: version update Yaniv Machani
2014-07-31 21:28 ` [PATCH 2/2] wpa-supplicant-wl18xx: configuration files update Yaniv Machani
@ 2014-08-04 21:16 ` Denys Dmytriyenko
2014-08-05 13:18 ` Maupin, Chase
1 sibling, 1 reply; 8+ messages in thread
From: Denys Dmytriyenko @ 2014-08-04 21:16 UTC (permalink / raw)
To: Yaniv Machani; +Cc: meta-arago
On Fri, Aug 01, 2014 at 12:28:34AM +0300, Yaniv Machani wrote:
> - Update to latest version tag - ol_r8.a9.14
> - move to git.ti.com and use backports module.
> - clean some unused commands.
>
> Signed-off-by: Yaniv Machani <yanivma@ti.com>
> ---
> v2 - Updated after inputs
> changed to wl18xx, combined PR.
> format-patch didn't recognized it as renamed file.
>
> .../packagegroup-arago-tisdk-connectivity.bb | 1 +
> .../ti-compat-wireless-wl18xx_r8.a8.10.bb | 61 --------------------
> .../ti-compat-wireless-wl18xx_r8.a9.14.bb | 56 ++++++++++++++++++
> 3 files changed, 57 insertions(+), 61 deletions(-)
> delete mode 100644 meta-arago-extras/recipes-bsp/ti-compat-wireless/ti-compat-wireless-wl18xx_r8.a8.10.bb
> create mode 100644 meta-arago-extras/recipes-bsp/ti-compat-wireless/ti-compat-wireless-wl18xx_r8.a9.14.bb
>
> 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 fa82e7e..fafffee 100755
> --- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-connectivity.bb
> +++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-connectivity.bb
> @@ -31,6 +31,7 @@ WLAN_COMMON = "\
> # netperf
>
> FIRMWARE_AND_DRIVERS = "\
> + ti-compat-wireless-wl18xx \
> wl18xx-firmware \
> "
>
> diff --git a/meta-arago-extras/recipes-bsp/ti-compat-wireless/ti-compat-wireless-wl18xx_r8.a8.10.bb b/meta-arago-extras/recipes-bsp/ti-compat-wireless/ti-compat-wireless-wl18xx_r8.a8.10.bb
> deleted file mode 100644
> index 0e7281a..0000000
> --- a/meta-arago-extras/recipes-bsp/ti-compat-wireless/ti-compat-wireless-wl18xx_r8.a8.10.bb
> +++ /dev/null
> @@ -1,61 +0,0 @@
> -# This is a TI specific version of the compat-wireless recipe using a
> -# compat-wireless package created from the TI Systems Tested mac80211 releases.
> -
> -DESCRIPTION = "ti compat-wireless drivers for wl18xx"
> -HOMEPAGE = "https://gforge.ti.com/gf/project/ecs_nlcp/"
> -SECTION = "kernel/modules"
> -LICENSE = "GPLv2"
> -LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7"
> -
> -RDEPENDS_${PN} = "wireless-tools"
> -
> -PROVIDES += "ti-compat-wireless-wl12xx"
> -RPROVIDES_${PN} += "ti-compat-wireless-wl12xx"
> -RREPLACES_${PN} += "ti-compat-wireless-wl12xx"
> -RCONFLICTS_${PN} += "ti-compat-wireless-wl12xx"
> -
> -COMPATIBLE_MACHINE = "(omap-a15)"
> -
> -PV = "r8.a8.08"
> -inherit module
> -
> -PR = "${MACHINE_KERNEL_PR}"
> -PR_append = "b"
> -
> -# Tags: ol_r8.a8.10
> -SRCREV_wl18xx = "eaa1820c02dc076e6ad9254e9cb7a3bb0c17471b"
> -SRCREV_compat = "5d80865281795f962e1400a95202bbd07dd763c0"
> -SRCREV_compat-wireless = "23a0d62ea1a57327709a77f08d6265ec807a909f"
> -
> -SRCREV_FORMAT = "compat-wireless"
> -
> -S = "${WORKDIR}/compat-wireless"
> -
> -SRC_URI = "git://github.com/TI-OpenLink/compat-wireless.git;destsuffix=compat-wireless;name=compat-wireless \
> - git://github.com/TI-OpenLink/compat.git;destsuffix=compat;name=compat \
> - git://github.com/TI-OpenLink/wl18xx.git;destsuffix=wl18xx;name=wl18xx \
> -"
> -
> -EXTRA_OEMAKE = "KLIB_BUILD=${STAGING_KERNEL_DIR} KLIB=${D}"
> -
> -do_configure() {
> - cd ${S}
> - GIT_TREE="${WORKDIR}/wl18xx" GIT_COMPAT_TREE="${WORKDIR}/compat" ./scripts/admin-refresh.sh network
> - ./scripts/driver-select wl18xx
> -
> - # Now generate the sourceipk with the properly configured sources
> - sourceipk_do_create_srcipk
> -}
> -
> -do_configure_append() {
> - sed -i "s#@./scripts/update-initramfs## " Makefile
> -}
> -
> -do_install() {
> - # Remove hardcoded references to host depmod
> - sed -i "s#@/sbin/depmod -a## " Makefile
> - sed -i "s#@/sbin/depmod -ae## " Makefile
> -
> - # Install modules
> - oe_runmake DEPMOD=echo DESTDIR="${D}" INSTALL_MOD_PATH="${D}" LDFLAGS="" install-modules
> -}
> diff --git a/meta-arago-extras/recipes-bsp/ti-compat-wireless/ti-compat-wireless-wl18xx_r8.a9.14.bb b/meta-arago-extras/recipes-bsp/ti-compat-wireless/ti-compat-wireless-wl18xx_r8.a9.14.bb
> new file mode 100644
> index 0000000..a5d5429
> --- /dev/null
> +++ b/meta-arago-extras/recipes-bsp/ti-compat-wireless/ti-compat-wireless-wl18xx_r8.a9.14.bb
> @@ -0,0 +1,56 @@
> +# This is a TI specific version of the compat-wireless recipe using a
> +# compat-wireless package created from the TI Systems Tested mac80211 releases.
> +
> +DESCRIPTION = "ti compat-wireless drivers for wl18xx"
> +HOMEPAGE = "https://git.ti.com/wilink8-wlan/wl18xx"
> +SECTION = "kernel/modules"
> +LICENSE = "GPLv2"
> +LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7"
> +
> +RDEPENDS_${PN} = "wireless-tools"
> +
> +PROVIDES += "ti-compat-wireless-wl18xx"
> +RPROVIDES_${PN} += "ti-compat-wireless-wl18xx"
> +RREPLACES_${PN} += "ti-compat-wireless-wl18xx"
> +RCONFLICTS_${PN} += "ti-compat-wireless-wl18xx"
Sorry, now I'm confused. I didn't understand Chase's original comment here,
but now, after the change, it doesn't make any sense - the recipe named
ti-compat-wireless-wl18xx already PROVIDES and RPROVIDES the same, plus it
cannot RREPLACES and RCONFLICTS to itself. So, what's the purpose of the above
4 lines?
> +PV = "r8.a9.14"
> +inherit module
> +
> +PR = "${MACHINE_KERNEL_PR}+a+gitr${SRCPV}"
> +
> +# Tags: ol_r8.a9.14
> +SRCREV_wl18xx = "0e48c4b55cfa0d557a098cbe92b1f092f1a9ad67"
> +BRANCH_wl18xx = "ap_p2p"
> +SRCREV_backports = "0d46f43a2f3ccdd53de19eee5b9c674bf8ef09a2"
> +BRANCH_backports = "ap_dfs_mbss_all"
> +
> +SRCREV_FORMAT = "wl18xx"
> +
> +S = "${WORKDIR}/compat-wireless"
> +
> +SRC_URI = "git://git.ti.com/wilink8-wlan/wl18xx.git;branch=${BRANCH_wl18xx};destsuffix=wl18xx;name=wl18xx \
> + git://git.ti.com/wilink8-wlan/backports.git;branch=${BRANCH_backports};destsuffix=backports;name=backports \
> + "
> +
> +export KLIB_BUILD="${STAGING_KERNEL_DIR}"
> +export KLIB="${D}"
> +
> +do_configure() {
> + cd "${WORKDIR}/backports"
> + unset CC
> + #Generate compat-wireless
> + python ./gentree.py --clean "${WORKDIR}/wl18xx" "${WORKDIR}/compat-wireless"
> +
> + cd ${S}
> + make defconfig-wl18xx
> +
> + # Now generate the sourceipk with the properly configured sources
> + sourceipk_do_create_srcipk
> +}
> +
> +do_install() {
> + # Install modules
> + oe_runmake modules_install
> +}
> +
> --
> 1.7.9
>
> _______________________________________________
> meta-arago mailing list
> meta-arago@arago-project.org
> http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 2/2] wpa-supplicant-wl18xx: configuration files update
2014-07-31 21:28 ` [PATCH 2/2] wpa-supplicant-wl18xx: configuration files update Yaniv Machani
@ 2014-08-04 21:18 ` Denys Dmytriyenko
0 siblings, 0 replies; 8+ messages in thread
From: Denys Dmytriyenko @ 2014-08-04 21:18 UTC (permalink / raw)
To: Yaniv Machani; +Cc: meta-arago
It would be safer to bump the corresponding recipe PR here, as you are not
modifying the recipe itself...
On Fri, Aug 01, 2014 at 12:28:35AM +0300, Yaniv Machani wrote:
> - clean non releveant configuration flags.
>
> Signed-off-by: Yaniv Machani <yanivma@ti.com>
> ---
> .../wpa-supplicant/p2p_supplicant.conf | 3 +--
> .../wpa-supplicant/wpa_supplicant.conf | 3 ++-
> 2 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/meta-arago-extras/recipes-connectivity/wpa-supplicant/wpa-supplicant/p2p_supplicant.conf b/meta-arago-extras/recipes-connectivity/wpa-supplicant/wpa-supplicant/p2p_supplicant.conf
> index 2de8730..3bdc306 100755
> --- a/meta-arago-extras/recipes-connectivity/wpa-supplicant/wpa-supplicant/p2p_supplicant.conf
> +++ b/meta-arago-extras/recipes-connectivity/wpa-supplicant/wpa-supplicant/p2p_supplicant.conf
> @@ -3,12 +3,11 @@ update_config=0
> device_name=TI-SITARA-P2P
> device_type=1-0050F204-1
> config_methods=virtual_push_button physical_display keypad
> -p2p_go_intent=0
> +#p2p_go_intent=0
> country=US
> ##p2p_pref_chan=115:36 115:40
> driver_param=use_multi_chan_concurrent=1 use_p2p_group_interface=1
> p2p_go_max_inactivity=60
> p2p_go_ht40=1
> -p2p_multi_chan=1
> disassoc_low_ack=1
> concurrent_sched_scan=1
> diff --git a/meta-arago-extras/recipes-connectivity/wpa-supplicant/wpa-supplicant/wpa_supplicant.conf b/meta-arago-extras/recipes-connectivity/wpa-supplicant/wpa-supplicant/wpa_supplicant.conf
> index f144a38..4233eb2 100644
> --- a/meta-arago-extras/recipes-connectivity/wpa-supplicant/wpa-supplicant/wpa_supplicant.conf
> +++ b/meta-arago-extras/recipes-connectivity/wpa-supplicant/wpa-supplicant/wpa_supplicant.conf
> @@ -59,6 +59,7 @@ driver_param=use_multi_chan_concurrent=1 use_p2p_group_interface=1
> # inactive stations.
> p2p_go_max_inactivity=60
> p2p_go_ht40=1
> -p2p_multi_chan=1
> disassoc_low_ack=1
> concurrent_sched_scan=1
> +p2p_disabled=1
> +
> --
> 1.7.9
>
> _______________________________________________
> meta-arago mailing list
> meta-arago@arago-project.org
> http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 1/2 v2] wl18xx-compat: version update
2014-08-04 21:16 ` [PATCH 1/2 v2] wl18xx-compat: version update Denys Dmytriyenko
@ 2014-08-05 13:18 ` Maupin, Chase
2014-08-05 14:46 ` Cooper Jr., Franklin
0 siblings, 1 reply; 8+ messages in thread
From: Maupin, Chase @ 2014-08-05 13:18 UTC (permalink / raw)
To: Dmytriyenko, Denys, Machani, Yaniv; +Cc: meta-arago
>-----Original Message-----
>From: meta-arago-bounces@arago-project.org [mailto:meta-arago-
>bounces@arago-project.org] On Behalf Of Dmytriyenko, Denys
>Sent: Monday, August 04, 2014 4:17 PM
>To: Machani, Yaniv
>Cc: meta-arago@arago-project.org
>Subject: Re: [meta-arago] [PATCH 1/2 v2] wl18xx-compat: version
>update
>
>On Fri, Aug 01, 2014 at 12:28:34AM +0300, Yaniv Machani wrote:
>> - Update to latest version tag - ol_r8.a9.14
>> - move to git.ti.com and use backports module.
>> - clean some unused commands.
>>
>> Signed-off-by: Yaniv Machani <yanivma@ti.com>
>> ---
>> v2 - Updated after inputs
>> changed to wl18xx, combined PR.
>> format-patch didn't recognized it as renamed file.
>>
>> .../packagegroup-arago-tisdk-connectivity.bb | 1 +
>> .../ti-compat-wireless-wl18xx_r8.a8.10.bb | 61 -----
>---------------
>> .../ti-compat-wireless-wl18xx_r8.a9.14.bb | 56
>++++++++++++++++++
>> 3 files changed, 57 insertions(+), 61 deletions(-)
>> delete mode 100644 meta-arago-extras/recipes-bsp/ti-compat-
>wireless/ti-compat-wireless-wl18xx_r8.a8.10.bb
>> create mode 100644 meta-arago-extras/recipes-bsp/ti-compat-
>wireless/ti-compat-wireless-wl18xx_r8.a9.14.bb
>>
>> 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 fa82e7e..fafffee 100755
>> --- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-
>arago-tisdk-connectivity.bb
>> +++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-
>arago-tisdk-connectivity.bb
>> @@ -31,6 +31,7 @@ WLAN_COMMON = "\
>> # netperf
>>
>> FIRMWARE_AND_DRIVERS = "\
>> + ti-compat-wireless-wl18xx \
>> wl18xx-firmware \
>> "
>>
>> diff --git a/meta-arago-extras/recipes-bsp/ti-compat-
>wireless/ti-compat-wireless-wl18xx_r8.a8.10.bb b/meta-arago-
>extras/recipes-bsp/ti-compat-wireless/ti-compat-wireless-
>wl18xx_r8.a8.10.bb
>> deleted file mode 100644
>> index 0e7281a..0000000
>> --- a/meta-arago-extras/recipes-bsp/ti-compat-wireless/ti-
>compat-wireless-wl18xx_r8.a8.10.bb
>> +++ /dev/null
>> @@ -1,61 +0,0 @@
>> -# This is a TI specific version of the compat-wireless recipe
>using a
>> -# compat-wireless package created from the TI Systems Tested
>mac80211 releases.
>> -
>> -DESCRIPTION = "ti compat-wireless drivers for wl18xx"
>> -HOMEPAGE = "https://gforge.ti.com/gf/project/ecs_nlcp/"
>> -SECTION = "kernel/modules"
>> -LICENSE = "GPLv2"
>> -LIC_FILES_CHKSUM =
>"file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7"
>> -
>> -RDEPENDS_${PN} = "wireless-tools"
>> -
>> -PROVIDES += "ti-compat-wireless-wl12xx"
>> -RPROVIDES_${PN} += "ti-compat-wireless-wl12xx"
>> -RREPLACES_${PN} += "ti-compat-wireless-wl12xx"
>> -RCONFLICTS_${PN} += "ti-compat-wireless-wl12xx"
>> -
>> -COMPATIBLE_MACHINE = "(omap-a15)"
>> -
>> -PV = "r8.a8.08"
>> -inherit module
>> -
>> -PR = "${MACHINE_KERNEL_PR}"
>> -PR_append = "b"
>> -
>> -# Tags: ol_r8.a8.10
>> -SRCREV_wl18xx = "eaa1820c02dc076e6ad9254e9cb7a3bb0c17471b"
>> -SRCREV_compat = "5d80865281795f962e1400a95202bbd07dd763c0"
>> -SRCREV_compat-wireless =
>"23a0d62ea1a57327709a77f08d6265ec807a909f"
>> -
>> -SRCREV_FORMAT = "compat-wireless"
>> -
>> -S = "${WORKDIR}/compat-wireless"
>> -
>> -SRC_URI = "git://github.com/TI-OpenLink/compat-
>wireless.git;destsuffix=compat-wireless;name=compat-wireless \
>> - git://github.com/TI-
>OpenLink/compat.git;destsuffix=compat;name=compat \
>> - git://github.com/TI-
>OpenLink/wl18xx.git;destsuffix=wl18xx;name=wl18xx \
>> -"
>> -
>> -EXTRA_OEMAKE = "KLIB_BUILD=${STAGING_KERNEL_DIR} KLIB=${D}"
>> -
>> -do_configure() {
>> - cd ${S}
>> - GIT_TREE="${WORKDIR}/wl18xx"
>GIT_COMPAT_TREE="${WORKDIR}/compat" ./scripts/admin-refresh.sh
>network
>> - ./scripts/driver-select wl18xx
>> -
>> - # Now generate the sourceipk with the properly configured
>sources
>> - sourceipk_do_create_srcipk
>> -}
>> -
>> -do_configure_append() {
>> - sed -i "s#@./scripts/update-initramfs## " Makefile
>> -}
>> -
>> -do_install() {
>> - # Remove hardcoded references to host depmod
>> - sed -i "s#@/sbin/depmod -a## " Makefile
>> - sed -i "s#@/sbin/depmod -ae## " Makefile
>> -
>> - # Install modules
>> - oe_runmake DEPMOD=echo DESTDIR="${D}"
>INSTALL_MOD_PATH="${D}" LDFLAGS="" install-modules
>> -}
>> diff --git a/meta-arago-extras/recipes-bsp/ti-compat-
>wireless/ti-compat-wireless-wl18xx_r8.a9.14.bb b/meta-arago-
>extras/recipes-bsp/ti-compat-wireless/ti-compat-wireless-
>wl18xx_r8.a9.14.bb
>> new file mode 100644
>> index 0000000..a5d5429
>> --- /dev/null
>> +++ b/meta-arago-extras/recipes-bsp/ti-compat-wireless/ti-
>compat-wireless-wl18xx_r8.a9.14.bb
>> @@ -0,0 +1,56 @@
>> +# This is a TI specific version of the compat-wireless recipe
>using a
>> +# compat-wireless package created from the TI Systems Tested
>mac80211 releases.
>> +
>> +DESCRIPTION = "ti compat-wireless drivers for wl18xx"
>> +HOMEPAGE = "https://git.ti.com/wilink8-wlan/wl18xx"
>> +SECTION = "kernel/modules"
>> +LICENSE = "GPLv2"
>> +LIC_FILES_CHKSUM =
>"file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7"
>> +
>> +RDEPENDS_${PN} = "wireless-tools"
>> +
>> +PROVIDES += "ti-compat-wireless-wl18xx"
>> +RPROVIDES_${PN} += "ti-compat-wireless-wl18xx"
>> +RREPLACES_${PN} += "ti-compat-wireless-wl18xx"
>> +RCONFLICTS_${PN} += "ti-compat-wireless-wl18xx"
>
>Sorry, now I'm confused. I didn't understand Chase's original
>comment here,
>but now, after the change, it doesn't make any sense - the recipe
>named
>ti-compat-wireless-wl18xx already PROVIDES and RPROVIDES the same,
>plus it
>cannot RREPLACES and RCONFLICTS to itself. So, what's the purpose
>of the above
>4 lines?
My comment was he was providing ti-compat-wireless-wl12xx but at the same time was adding ti-compat-wireless-wl18xx to the list of packages to install. I guess I was thinking that he didn't need to do both.
>
>
>> +PV = "r8.a9.14"
>> +inherit module
>> +
>> +PR = "${MACHINE_KERNEL_PR}+a+gitr${SRCPV}"
>> +
>> +# Tags: ol_r8.a9.14
>> +SRCREV_wl18xx = "0e48c4b55cfa0d557a098cbe92b1f092f1a9ad67"
>> +BRANCH_wl18xx = "ap_p2p"
>> +SRCREV_backports = "0d46f43a2f3ccdd53de19eee5b9c674bf8ef09a2"
>> +BRANCH_backports = "ap_dfs_mbss_all"
>> +
>> +SRCREV_FORMAT = "wl18xx"
>> +
>> +S = "${WORKDIR}/compat-wireless"
>> +
>> +SRC_URI = "git://git.ti.com/wilink8-
>wlan/wl18xx.git;branch=${BRANCH_wl18xx};destsuffix=wl18xx;name=wl1
>8xx \
>> + git://git.ti.com/wilink8-
>wlan/backports.git;branch=${BRANCH_backports};destsuffix=backports
>;name=backports \
>> + "
>> +
>> +export KLIB_BUILD="${STAGING_KERNEL_DIR}"
>> +export KLIB="${D}"
>> +
>> +do_configure() {
>> + cd "${WORKDIR}/backports"
>> + unset CC
>> + #Generate compat-wireless
>> + python ./gentree.py --clean "${WORKDIR}/wl18xx"
>"${WORKDIR}/compat-wireless"
>> +
>> + cd ${S}
>> + make defconfig-wl18xx
>> +
>> + # Now generate the sourceipk with the properly configured
>sources
>> + sourceipk_do_create_srcipk
>> +}
>> +
>> +do_install() {
>> + # Install modules
>> + oe_runmake modules_install
>> +}
>> +
>> --
>> 1.7.9
>>
>> _______________________________________________
>> meta-arago mailing list
>> meta-arago@arago-project.org
>> http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
>_______________________________________________
>meta-arago mailing list
>meta-arago@arago-project.org
>http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 1/2 v2] wl18xx-compat: version update
2014-08-05 13:18 ` Maupin, Chase
@ 2014-08-05 14:46 ` Cooper Jr., Franklin
2014-08-05 19:03 ` Machani, Yaniv
0 siblings, 1 reply; 8+ messages in thread
From: Cooper Jr., Franklin @ 2014-08-05 14:46 UTC (permalink / raw)
To: Maupin, Chase, Dmytriyenko, Denys, Machani, Yaniv; +Cc: meta-arago
> -----Original Message-----
> From: meta-arago-bounces@arago-project.org [mailto:meta-arago-
> bounces@arago-project.org] On Behalf Of Maupin, Chase
> Sent: Tuesday, August 05, 2014 8:18 AM
> To: Dmytriyenko, Denys; Machani, Yaniv
> Cc: meta-arago@arago-project.org
> Subject: Re: [meta-arago] [PATCH 1/2 v2] wl18xx-compat: version update
>
> >-----Original Message-----
> >From: meta-arago-bounces@arago-project.org [mailto:meta-arago-
> >bounces@arago-project.org] On Behalf Of Dmytriyenko, Denys
> >Sent: Monday, August 04, 2014 4:17 PM
> >To: Machani, Yaniv
> >Cc: meta-arago@arago-project.org
> >Subject: Re: [meta-arago] [PATCH 1/2 v2] wl18xx-compat: version update
> >
> >On Fri, Aug 01, 2014 at 12:28:34AM +0300, Yaniv Machani wrote:
> >> - Update to latest version tag - ol_r8.a9.14
> >> - move to git.ti.com and use backports module.
> >> - clean some unused commands.
> >>
> >> Signed-off-by: Yaniv Machani <yanivma@ti.com>
> >> ---
> >> v2 - Updated after inputs
> >> changed to wl18xx, combined PR.
> >> format-patch didn't recognized it as renamed file.
> >>
> >> .../packagegroup-arago-tisdk-connectivity.bb | 1 +
> >> .../ti-compat-wireless-wl18xx_r8.a8.10.bb | 61 -----
> >---------------
> >> .../ti-compat-wireless-wl18xx_r8.a9.14.bb | 56
> >++++++++++++++++++
> >> 3 files changed, 57 insertions(+), 61 deletions(-) delete mode
> >> 100644 meta-arago-extras/recipes-bsp/ti-compat-
> >wireless/ti-compat-wireless-wl18xx_r8.a8.10.bb
> >> create mode 100644 meta-arago-extras/recipes-bsp/ti-compat-
> >wireless/ti-compat-wireless-wl18xx_r8.a9.14.bb
> >>
> >> 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 fa82e7e..fafffee 100755
> >> --- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-
> >arago-tisdk-connectivity.bb
> >> +++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-
> >arago-tisdk-connectivity.bb
> >> @@ -31,6 +31,7 @@ WLAN_COMMON = "\
> >> # netperf
> >>
> >> FIRMWARE_AND_DRIVERS = "\
> >> + ti-compat-wireless-wl18xx \
> >> wl18xx-firmware \
> >> "
> >>
> >> diff --git a/meta-arago-extras/recipes-bsp/ti-compat-
> >wireless/ti-compat-wireless-wl18xx_r8.a8.10.bb b/meta-arago-
> >extras/recipes-bsp/ti-compat-wireless/ti-compat-wireless-
> >wl18xx_r8.a8.10.bb
> >> deleted file mode 100644
> >> index 0e7281a..0000000
> >> --- a/meta-arago-extras/recipes-bsp/ti-compat-wireless/ti-
> >compat-wireless-wl18xx_r8.a8.10.bb
> >> +++ /dev/null
> >> @@ -1,61 +0,0 @@
> >> -# This is a TI specific version of the compat-wireless recipe
> >using a
> >> -# compat-wireless package created from the TI Systems Tested
> >mac80211 releases.
> >> -
> >> -DESCRIPTION = "ti compat-wireless drivers for wl18xx"
> >> -HOMEPAGE = "https://gforge.ti.com/gf/project/ecs_nlcp/"
> >> -SECTION = "kernel/modules"
> >> -LICENSE = "GPLv2"
> >> -LIC_FILES_CHKSUM =
> >"file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7"
> >> -
> >> -RDEPENDS_${PN} = "wireless-tools"
> >> -
> >> -PROVIDES += "ti-compat-wireless-wl12xx"
> >> -RPROVIDES_${PN} += "ti-compat-wireless-wl12xx"
> >> -RREPLACES_${PN} += "ti-compat-wireless-wl12xx"
> >> -RCONFLICTS_${PN} += "ti-compat-wireless-wl12xx"
> >> -
> >> -COMPATIBLE_MACHINE = "(omap-a15)"
> >> -
> >> -PV = "r8.a8.08"
> >> -inherit module
> >> -
> >> -PR = "${MACHINE_KERNEL_PR}"
> >> -PR_append = "b"
> >> -
> >> -# Tags: ol_r8.a8.10
> >> -SRCREV_wl18xx = "eaa1820c02dc076e6ad9254e9cb7a3bb0c17471b"
> >> -SRCREV_compat = "5d80865281795f962e1400a95202bbd07dd763c0"
> >> -SRCREV_compat-wireless =
> >"23a0d62ea1a57327709a77f08d6265ec807a909f"
> >> -
> >> -SRCREV_FORMAT = "compat-wireless"
> >> -
> >> -S = "${WORKDIR}/compat-wireless"
> >> -
> >> -SRC_URI = "git://github.com/TI-OpenLink/compat-
> >wireless.git;destsuffix=compat-wireless;name=compat-wireless \
> >> - git://github.com/TI-
> >OpenLink/compat.git;destsuffix=compat;name=compat \
> >> - git://github.com/TI-
> >OpenLink/wl18xx.git;destsuffix=wl18xx;name=wl18xx \
> >> -"
> >> -
> >> -EXTRA_OEMAKE = "KLIB_BUILD=${STAGING_KERNEL_DIR} KLIB=${D}"
> >> -
> >> -do_configure() {
> >> - cd ${S}
> >> - GIT_TREE="${WORKDIR}/wl18xx"
> >GIT_COMPAT_TREE="${WORKDIR}/compat" ./scripts/admin-refresh.sh
> network
> >> - ./scripts/driver-select wl18xx
> >> -
> >> - # Now generate the sourceipk with the properly configured
> >sources
> >> - sourceipk_do_create_srcipk
> >> -}
> >> -
> >> -do_configure_append() {
> >> - sed -i "s#@./scripts/update-initramfs## " Makefile
> >> -}
> >> -
> >> -do_install() {
> >> - # Remove hardcoded references to host depmod
> >> - sed -i "s#@/sbin/depmod -a## " Makefile
> >> - sed -i "s#@/sbin/depmod -ae## " Makefile
> >> -
> >> - # Install modules
> >> - oe_runmake DEPMOD=echo DESTDIR="${D}"
> >INSTALL_MOD_PATH="${D}" LDFLAGS="" install-modules
> >> -}
> >> diff --git a/meta-arago-extras/recipes-bsp/ti-compat-
> >wireless/ti-compat-wireless-wl18xx_r8.a9.14.bb b/meta-arago-
> >extras/recipes-bsp/ti-compat-wireless/ti-compat-wireless-
> >wl18xx_r8.a9.14.bb
> >> new file mode 100644
> >> index 0000000..a5d5429
> >> --- /dev/null
> >> +++ b/meta-arago-extras/recipes-bsp/ti-compat-wireless/ti-
> >compat-wireless-wl18xx_r8.a9.14.bb
> >> @@ -0,0 +1,56 @@
> >> +# This is a TI specific version of the compat-wireless recipe
> >using a
> >> +# compat-wireless package created from the TI Systems Tested
> >mac80211 releases.
> >> +
> >> +DESCRIPTION = "ti compat-wireless drivers for wl18xx"
> >> +HOMEPAGE = "https://git.ti.com/wilink8-wlan/wl18xx"
> >> +SECTION = "kernel/modules"
> >> +LICENSE = "GPLv2"
> >> +LIC_FILES_CHKSUM =
> >"file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7"
> >> +
> >> +RDEPENDS_${PN} = "wireless-tools"
> >> +
> >> +PROVIDES += "ti-compat-wireless-wl18xx"
> >> +RPROVIDES_${PN} += "ti-compat-wireless-wl18xx"
> >> +RREPLACES_${PN} += "ti-compat-wireless-wl18xx"
> >> +RCONFLICTS_${PN} += "ti-compat-wireless-wl18xx"
> >
> >Sorry, now I'm confused. I didn't understand Chase's original comment
> >here, but now, after the change, it doesn't make any sense - the recipe
> >named ti-compat-wireless-wl18xx already PROVIDES and RPROVIDES the
> >same, plus it cannot RREPLACES and RCONFLICTS to itself. So, what's the
> >purpose of the above
> >4 lines?
>
> My comment was he was providing ti-compat-wireless-wl12xx but at the same
> time was adding ti-compat-wireless-wl18xx to the list of packages to install. I
> guess I was thinking that he didn't need to do both.
[Franklin] I don't see where he was providing " ti-compat-wireless-wl12xx" in the new recipe but the simple answer is that these four lines aren't needed.
I think he was confused why PROVIDES/ RPROVIDES_${PN}/ RREPLACES_${PN}/ RCONFLICTS_${PN} += "ti-compat-wireless-wl12xx" was needed before and thought it needed to be updated.
Yaniv,
Back when we supported wilink 6 and wilink 8 those lines were added so we could easily switch between wilink 6 and wilink 8 for devices that supported both by determining the PREFERRED_PROVIDER which allows you to select a specific recipe among many recipes that may "provide" the same thing. In that case provided Wilink support. However, since we removed wilink 6 support we no longer have references to " ti-compat-wireless-wl12xx" beyond this recipe so those lines aren't needed here. Also you don't need to update it to "ti-compat-wireless-wl18xx" since its really only used for when you want a recipe to be a replacement for a different recipe/package. Right now you are saying you want the recipe " ti-compat-wireless-wl18xx" to provide " ti-compat-wireless-wl18xx" (already the default), replace itself and that it also conflicts with itself.
>
> >
> >
> >> +PV = "r8.a9.14"
> >> +inherit module
> >> +
> >> +PR = "${MACHINE_KERNEL_PR}+a+gitr${SRCPV}"
> >> +
> >> +# Tags: ol_r8.a9.14
> >> +SRCREV_wl18xx = "0e48c4b55cfa0d557a098cbe92b1f092f1a9ad67"
> >> +BRANCH_wl18xx = "ap_p2p"
> >> +SRCREV_backports = "0d46f43a2f3ccdd53de19eee5b9c674bf8ef09a2"
> >> +BRANCH_backports = "ap_dfs_mbss_all"
> >> +
> >> +SRCREV_FORMAT = "wl18xx"
> >> +
> >> +S = "${WORKDIR}/compat-wireless"
> >> +
> >> +SRC_URI = "git://git.ti.com/wilink8-
> >wlan/wl18xx.git;branch=${BRANCH_wl18xx};destsuffix=wl18xx;name=wl1
> >8xx \
> >> + git://git.ti.com/wilink8-
> >wlan/backports.git;branch=${BRANCH_backports};destsuffix=backports
> >;name=backports \
> >> + "
> >> +
> >> +export KLIB_BUILD="${STAGING_KERNEL_DIR}"
> >> +export KLIB="${D}"
> >> +
> >> +do_configure() {
> >> + cd "${WORKDIR}/backports"
> >> + unset CC
> >> + #Generate compat-wireless
> >> + python ./gentree.py --clean "${WORKDIR}/wl18xx"
> >"${WORKDIR}/compat-wireless"
> >> +
> >> + cd ${S}
> >> + make defconfig-wl18xx
> >> +
> >> + # Now generate the sourceipk with the properly configured
> >sources
> >> + sourceipk_do_create_srcipk
> >> +}
> >> +
> >> +do_install() {
> >> + # Install modules
> >> + oe_runmake modules_install
> >> +}
> >> +
> >> --
> >> 1.7.9
> >>
> >> _______________________________________________
> >> meta-arago mailing list
> >> meta-arago@arago-project.org
> >> http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
> >_______________________________________________
> >meta-arago mailing list
> >meta-arago@arago-project.org
> >http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
> _______________________________________________
> meta-arago mailing list
> meta-arago@arago-project.org
> http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 1/2 v2] wl18xx-compat: version update
2014-08-05 14:46 ` Cooper Jr., Franklin
@ 2014-08-05 19:03 ` Machani, Yaniv
0 siblings, 0 replies; 8+ messages in thread
From: Machani, Yaniv @ 2014-08-05 19:03 UTC (permalink / raw)
To: Cooper Jr., Franklin, Maupin, Chase, Dmytriyenko, Denys; +Cc: meta-arago
> -----Original Message-----
> From: Cooper Jr., Franklin
> Sent: Tuesday, August 05, 2014 5:47 PM
> To: Maupin, Chase; Dmytriyenko, Denys; Machani, Yaniv
> Cc: meta-arago@arago-project.org
> Subject: RE: [meta-arago] [PATCH 1/2 v2] wl18xx-compat: version update
>
>
>
> > -----Original Message-----
> > From: meta-arago-bounces@arago-project.org [mailto:meta-arago-
> > bounces@arago-project.org] On Behalf Of Maupin, Chase
> > Sent: Tuesday, August 05, 2014 8:18 AM
> > To: Dmytriyenko, Denys; Machani, Yaniv
> > Cc: meta-arago@arago-project.org
> > Subject: Re: [meta-arago] [PATCH 1/2 v2] wl18xx-compat: version update
> >
> > >-----Original Message-----
> > >From: meta-arago-bounces@arago-project.org [mailto:meta-arago-
> > >bounces@arago-project.org] On Behalf Of Dmytriyenko, Denys
> > >Sent: Monday, August 04, 2014 4:17 PM
> > >To: Machani, Yaniv
> > >Cc: meta-arago@arago-project.org
> > >Subject: Re: [meta-arago] [PATCH 1/2 v2] wl18xx-compat: version
> > >update
> > >
> > >On Fri, Aug 01, 2014 at 12:28:34AM +0300, Yaniv Machani wrote:
> > >> - Update to latest version tag - ol_r8.a9.14
> > >> - move to git.ti.com and use backports module.
> > >> - clean some unused commands.
> > >>
> > >> Signed-off-by: Yaniv Machani <yanivma@ti.com>
> > >> ---
> > >> v2 - Updated after inputs
> > >> changed to wl18xx, combined PR.
> > >> format-patch didn't recognized it as renamed file.
> > >>
> > >> .../packagegroup-arago-tisdk-connectivity.bb | 1 +
> > >> .../ti-compat-wireless-wl18xx_r8.a8.10.bb | 61 -----
> > >---------------
> > >> .../ti-compat-wireless-wl18xx_r8.a9.14.bb | 56
> > >++++++++++++++++++
> > >> 3 files changed, 57 insertions(+), 61 deletions(-) delete mode
> > >> 100644 meta-arago-extras/recipes-bsp/ti-compat-
> > >wireless/ti-compat-wireless-wl18xx_r8.a8.10.bb
> > >> create mode 100644 meta-arago-extras/recipes-bsp/ti-compat-
> > >wireless/ti-compat-wireless-wl18xx_r8.a9.14.bb
> > >>
> > >> 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 fa82e7e..fafffee 100755
> > >> --- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-
> > >arago-tisdk-connectivity.bb
> > >> +++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-
> > >arago-tisdk-connectivity.bb
> > >> @@ -31,6 +31,7 @@ WLAN_COMMON = "\
> > >> # netperf
> > >>
> > >> FIRMWARE_AND_DRIVERS = "\
> > >> + ti-compat-wireless-wl18xx \
> > >> wl18xx-firmware \
> > >> "
> > >>
> > >> diff --git a/meta-arago-extras/recipes-bsp/ti-compat-
> > >wireless/ti-compat-wireless-wl18xx_r8.a8.10.bb b/meta-arago-
> > >extras/recipes-bsp/ti-compat-wireless/ti-compat-wireless-
> > >wl18xx_r8.a8.10.bb
> > >> deleted file mode 100644
> > >> index 0e7281a..0000000
> > >> --- a/meta-arago-extras/recipes-bsp/ti-compat-wireless/ti-
> > >compat-wireless-wl18xx_r8.a8.10.bb
> > >> +++ /dev/null
> > >> @@ -1,61 +0,0 @@
> > >> -# This is a TI specific version of the compat-wireless recipe
> > >using a
> > >> -# compat-wireless package created from the TI Systems Tested
> > >mac80211 releases.
> > >> -
> > >> -DESCRIPTION = "ti compat-wireless drivers for wl18xx"
> > >> -HOMEPAGE = "https://gforge.ti.com/gf/project/ecs_nlcp/"
> > >> -SECTION = "kernel/modules"
> > >> -LICENSE = "GPLv2"
> > >> -LIC_FILES_CHKSUM =
> > >"file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7"
> > >> -
> > >> -RDEPENDS_${PN} = "wireless-tools"
> > >> -
> > >> -PROVIDES += "ti-compat-wireless-wl12xx"
> > >> -RPROVIDES_${PN} += "ti-compat-wireless-wl12xx"
> > >> -RREPLACES_${PN} += "ti-compat-wireless-wl12xx"
> > >> -RCONFLICTS_${PN} += "ti-compat-wireless-wl12xx"
> > >> -
> > >> -COMPATIBLE_MACHINE = "(omap-a15)"
> > >> -
> > >> -PV = "r8.a8.08"
> > >> -inherit module
> > >> -
> > >> -PR = "${MACHINE_KERNEL_PR}"
> > >> -PR_append = "b"
> > >> -
> > >> -# Tags: ol_r8.a8.10
> > >> -SRCREV_wl18xx = "eaa1820c02dc076e6ad9254e9cb7a3bb0c17471b"
> > >> -SRCREV_compat = "5d80865281795f962e1400a95202bbd07dd763c0"
> > >> -SRCREV_compat-wireless =
> > >"23a0d62ea1a57327709a77f08d6265ec807a909f"
> > >> -
> > >> -SRCREV_FORMAT = "compat-wireless"
> > >> -
> > >> -S = "${WORKDIR}/compat-wireless"
> > >> -
> > >> -SRC_URI = "git://github.com/TI-OpenLink/compat-
> > >wireless.git;destsuffix=compat-wireless;name=compat-wireless \
> > >> - git://github.com/TI-
> > >OpenLink/compat.git;destsuffix=compat;name=compat \
> > >> - git://github.com/TI-
> > >OpenLink/wl18xx.git;destsuffix=wl18xx;name=wl18xx \
> > >> -"
> > >> -
> > >> -EXTRA_OEMAKE = "KLIB_BUILD=${STAGING_KERNEL_DIR} KLIB=${D}"
> > >> -
> > >> -do_configure() {
> > >> - cd ${S}
> > >> - GIT_TREE="${WORKDIR}/wl18xx"
> > >GIT_COMPAT_TREE="${WORKDIR}/compat" ./scripts/admin-refresh.sh
> > network
> > >> - ./scripts/driver-select wl18xx
> > >> -
> > >> - # Now generate the sourceipk with the properly configured
> > >sources
> > >> - sourceipk_do_create_srcipk
> > >> -}
> > >> -
> > >> -do_configure_append() {
> > >> - sed -i "s#@./scripts/update-initramfs## " Makefile
> > >> -}
> > >> -
> > >> -do_install() {
> > >> - # Remove hardcoded references to host depmod
> > >> - sed -i "s#@/sbin/depmod -a## " Makefile
> > >> - sed -i "s#@/sbin/depmod -ae## " Makefile
> > >> -
> > >> - # Install modules
> > >> - oe_runmake DEPMOD=echo DESTDIR="${D}"
> > >INSTALL_MOD_PATH="${D}" LDFLAGS="" install-modules
> > >> -}
> > >> diff --git a/meta-arago-extras/recipes-bsp/ti-compat-
> > >wireless/ti-compat-wireless-wl18xx_r8.a9.14.bb b/meta-arago-
> > >extras/recipes-bsp/ti-compat-wireless/ti-compat-wireless-
> > >wl18xx_r8.a9.14.bb
> > >> new file mode 100644
> > >> index 0000000..a5d5429
> > >> --- /dev/null
> > >> +++ b/meta-arago-extras/recipes-bsp/ti-compat-wireless/ti-
> > >compat-wireless-wl18xx_r8.a9.14.bb
> > >> @@ -0,0 +1,56 @@
> > >> +# This is a TI specific version of the compat-wireless recipe
> > >using a
> > >> +# compat-wireless package created from the TI Systems Tested
> > >mac80211 releases.
> > >> +
> > >> +DESCRIPTION = "ti compat-wireless drivers for wl18xx"
> > >> +HOMEPAGE = "https://git.ti.com/wilink8-wlan/wl18xx"
> > >> +SECTION = "kernel/modules"
> > >> +LICENSE = "GPLv2"
> > >> +LIC_FILES_CHKSUM =
> > >"file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7"
> > >> +
> > >> +RDEPENDS_${PN} = "wireless-tools"
> > >> +
> > >> +PROVIDES += "ti-compat-wireless-wl18xx"
> > >> +RPROVIDES_${PN} += "ti-compat-wireless-wl18xx"
> > >> +RREPLACES_${PN} += "ti-compat-wireless-wl18xx"
> > >> +RCONFLICTS_${PN} += "ti-compat-wireless-wl18xx"
> > >
> > >Sorry, now I'm confused. I didn't understand Chase's original comment
> > >here, but now, after the change, it doesn't make any sense - the
> > >recipe named ti-compat-wireless-wl18xx already PROVIDES and
> RPROVIDES
> > >the same, plus it cannot RREPLACES and RCONFLICTS to itself. So,
> > >what's the purpose of the above
> > >4 lines?
> >
> > My comment was he was providing ti-compat-wireless-wl12xx but at the
> > same time was adding ti-compat-wireless-wl18xx to the list of packages
> > to install. I guess I was thinking that he didn't need to do both.
> [Franklin] I don't see where he was providing " ti-compat-wireless-wl12xx" in
> the new recipe but the simple answer is that these four lines aren't needed.
> I think he was confused why PROVIDES/ RPROVIDES_${PN}/
> RREPLACES_${PN}/ RCONFLICTS_${PN} += "ti-compat-wireless-wl12xx" was
> needed before and thought it needed to be updated.
>
> Yaniv,
> Back when we supported wilink 6 and wilink 8 those lines were added so we
> could easily switch between wilink 6 and wilink 8 for devices that supported
> both by determining the PREFERRED_PROVIDER which allows you to select a
> specific recipe among many recipes that may "provide" the same thing. In
> that case provided Wilink support. However, since we removed wilink 6
> support we no longer have references to " ti-compat-wireless-wl12xx"
> beyond this recipe so those lines aren't needed here. Also you don't need to
> update it to "ti-compat-wireless-wl18xx" since its really only used for when
> you want a recipe to be a replacement for a different recipe/package. Right
> now you are saying you want the recipe " ti-compat-wireless-wl18xx" to
> provide " ti-compat-wireless-wl18xx" (already the default), replace itself and
> that it also conflicts with itself.
>
>
[Machani, Yaniv] Ok, so as I understand, all these lines should be removed, right ?
I guess I'll remove the other references to wl12xx in other recipes as well.
> >
> > >
> > >
> > >> +PV = "r8.a9.14"
> > >> +inherit module
> > >> +
> > >> +PR = "${MACHINE_KERNEL_PR}+a+gitr${SRCPV}"
> > >> +
> > >> +# Tags: ol_r8.a9.14
> > >> +SRCREV_wl18xx = "0e48c4b55cfa0d557a098cbe92b1f092f1a9ad67"
> > >> +BRANCH_wl18xx = "ap_p2p"
> > >> +SRCREV_backports = "0d46f43a2f3ccdd53de19eee5b9c674bf8ef09a2"
> > >> +BRANCH_backports = "ap_dfs_mbss_all"
> > >> +
> > >> +SRCREV_FORMAT = "wl18xx"
> > >> +
> > >> +S = "${WORKDIR}/compat-wireless"
> > >> +
> > >> +SRC_URI = "git://git.ti.com/wilink8-
> >
> >wlan/wl18xx.git;branch=${BRANCH_wl18xx};destsuffix=wl18xx;name=wl1
> > >8xx \
> > >> + git://git.ti.com/wilink8-
> > >wlan/backports.git;branch=${BRANCH_backports};destsuffix=backports
> > >;name=backports \
> > >> + "
> > >> +
> > >> +export KLIB_BUILD="${STAGING_KERNEL_DIR}"
> > >> +export KLIB="${D}"
> > >> +
> > >> +do_configure() {
> > >> + cd "${WORKDIR}/backports"
> > >> + unset CC
> > >> + #Generate compat-wireless
> > >> + python ./gentree.py --clean "${WORKDIR}/wl18xx"
> > >"${WORKDIR}/compat-wireless"
> > >> +
> > >> + cd ${S}
> > >> + make defconfig-wl18xx
> > >> +
> > >> + # Now generate the sourceipk with the properly configured
> > >sources
> > >> + sourceipk_do_create_srcipk
> > >> +}
> > >> +
> > >> +do_install() {
> > >> + # Install modules
> > >> + oe_runmake modules_install
> > >> +}
> > >> +
> > >> --
> > >> 1.7.9
> > >>
> > >> _______________________________________________
> > >> meta-arago mailing list
> > >> meta-arago@arago-project.org
> > >> http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
> > >_______________________________________________
> > >meta-arago mailing list
> > >meta-arago@arago-project.org
> > >http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
> > _______________________________________________
> > meta-arago mailing list
> > meta-arago@arago-project.org
> > http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 1/2 v2] wl18xx-compat: version update
@ 2014-08-05 4:19 Machani, Yaniv
0 siblings, 0 replies; 8+ messages in thread
From: Machani, Yaniv @ 2014-08-05 4:19 UTC (permalink / raw)
To: Dmytriyenko, Denys; +Cc: meta-arago
[-- Attachment #1: Type: text/plain, Size: 7305 bytes --]
On Aug 5, 2014 12:16 AM, "Dmytriyenko, Denys" <denys@ti.com> wrote:
>
> On Fri, Aug 01, 2014 at 12:28:34AM +0300, Yaniv Machani wrote:
> > - Update to latest version tag - ol_r8.a9.14
> > - move to git.ti.com and use backports module.
> > - clean some unused commands.
> >
> > Signed-off-by: Yaniv Machani <yanivma@ti.com>
> > ---
> > v2 - Updated after inputs
> > changed to wl18xx, combined PR.
> > format-patch didn't recognized it as renamed file.
> >
> > .../packagegroup-arago-tisdk-connectivity.bb | 1 +
> > .../ti-compat-wireless-wl18xx_r8.a8.10.bb | 61 --------------------
> > .../ti-compat-wireless-wl18xx_r8.a9.14.bb | 56 ++++++++++++++++++
> > 3 files changed, 57 insertions(+), 61 deletions(-)
> > delete mode 100644 meta-arago-extras/recipes-bsp/ti-compat-wireless/ti-compat-wireless-wl18xx_r8.a8.10.bb
> > create mode 100644 meta-arago-extras/recipes-bsp/ti-compat-wireless/ti-compat-wireless-wl18xx_r8.a9.14.bb
> >
> > 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 fa82e7e..fafffee 100755
> > --- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-connectivity.bb
> > +++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-connectivity.bb
> > @@ -31,6 +31,7 @@ WLAN_COMMON = "\
> > # netperf
> >
> > FIRMWARE_AND_DRIVERS = "\
> > + ti-compat-wireless-wl18xx \
> > wl18xx-firmware \
> > "
> >
> > diff --git a/meta-arago-extras/recipes-bsp/ti-compat-wireless/ti-compat-wireless-wl18xx_r8.a8.10.bb b/meta-arago-extras/recipes-bsp/ti-compat-wireless/ti-compat-wireless-wl18xx_r8.a8.10.bb
> > deleted file mode 100644
> > index 0e7281a..0000000
> > --- a/meta-arago-extras/recipes-bsp/ti-compat-wireless/ti-compat-wireless-wl18xx_r8.a8.10.bb
> > +++ /dev/null
> > @@ -1,61 +0,0 @@
> > -# This is a TI specific version of the compat-wireless recipe using a
> > -# compat-wireless package created from the TI Systems Tested mac80211 releases.
> > -
> > -DESCRIPTION = "ti compat-wireless drivers for wl18xx"
> > -HOMEPAGE = "https://gforge.ti.com/gf/project/ecs_nlcp/"
> > -SECTION = "kernel/modules"
> > -LICENSE = "GPLv2"
> > -LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7"
> > -
> > -RDEPENDS_${PN} = "wireless-tools"
> > -
> > -PROVIDES += "ti-compat-wireless-wl12xx"
> > -RPROVIDES_${PN} += "ti-compat-wireless-wl12xx"
> > -RREPLACES_${PN} += "ti-compat-wireless-wl12xx"
> > -RCONFLICTS_${PN} += "ti-compat-wireless-wl12xx"
> > -
> > -COMPATIBLE_MACHINE = "(omap-a15)"
> > -
> > -PV = "r8.a8.08"
> > -inherit module
> > -
> > -PR = "${MACHINE_KERNEL_PR}"
> > -PR_append = "b"
> > -
> > -# Tags: ol_r8.a8.10
> > -SRCREV_wl18xx = "eaa1820c02dc076e6ad9254e9cb7a3bb0c17471b"
> > -SRCREV_compat = "5d80865281795f962e1400a95202bbd07dd763c0"
> > -SRCREV_compat-wireless = "23a0d62ea1a57327709a77f08d6265ec807a909f"
> > -
> > -SRCREV_FORMAT = "compat-wireless"
> > -
> > -S = "${WORKDIR}/compat-wireless"
> > -
> > -SRC_URI = "git://github.com/TI-OpenLink/compat-wireless.git;destsuffix=compat-wireless;name=compat-wireless \
> > - git://github.com/TI-OpenLink/compat.git;destsuffix=compat;name=compat \
> > - git://github.com/TI-OpenLink/wl18xx.git;destsuffix=wl18xx;name=wl18xx \
> > -"
> > -
> > -EXTRA_OEMAKE = "KLIB_BUILD=${STAGING_KERNEL_DIR} KLIB=${D}"
> > -
> > -do_configure() {
> > - cd ${S}
> > - GIT_TREE="${WORKDIR}/wl18xx" GIT_COMPAT_TREE="${WORKDIR}/compat" ./scripts/admin-refresh.sh network
> > - ./scripts/driver-select wl18xx
> > -
> > - # Now generate the sourceipk with the properly configured sources
> > - sourceipk_do_create_srcipk
> > -}
> > -
> > -do_configure_append() {
> > - sed -i "s#@./scripts/update-initramfs## " Makefile
> > -}
> > -
> > -do_install() {
> > - # Remove hardcoded references to host depmod
> > - sed -i "s#@/sbin/depmod -a## " Makefile
> > - sed -i "s#@/sbin/depmod -ae## " Makefile
> > -
> > - # Install modules
> > - oe_runmake DEPMOD=echo DESTDIR="${D}" INSTALL_MOD_PATH="${D}" LDFLAGS="" install-modules
> > -}
> > diff --git a/meta-arago-extras/recipes-bsp/ti-compat-wireless/ti-compat-wireless-wl18xx_r8.a9.14.bb b/meta-arago-extras/recipes-bsp/ti-compat-wireless/ti-compat-wireless-wl18xx_r8.a9.14.bb
> > new file mode 100644
> > index 0000000..a5d5429
> > --- /dev/null
> > +++ b/meta-arago-extras/recipes-bsp/ti-compat-wireless/ti-compat-wireless-wl18xx_r8.a9.14.bb
> > @@ -0,0 +1,56 @@
> > +# This is a TI specific version of the compat-wireless recipe using a
> > +# compat-wireless package created from the TI Systems Tested mac80211 releases.
> > +
> > +DESCRIPTION = "ti compat-wireless drivers for wl18xx"
> > +HOMEPAGE = "https://git.ti.com/wilink8-wlan/wl18xx"
> > +SECTION = "kernel/modules"
> > +LICENSE = "GPLv2"
> > +LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7"
> > +
> > +RDEPENDS_${PN} = "wireless-tools"
> > +
> > +PROVIDES += "ti-compat-wireless-wl18xx"
> > +RPROVIDES_${PN} += "ti-compat-wireless-wl18xx"
> > +RREPLACES_${PN} += "ti-compat-wireless-wl18xx"
> > +RCONFLICTS_${PN} += "ti-compat-wireless-wl18xx"
>
> Sorry, now I'm confused. I didn't understand Chase's original comment here,
> but now, after the change, it doesn't make any sense - the recipe named
> ti-compat-wireless-wl18xx already PROVIDES and RPROVIDES the same, plus it
> cannot RREPLACES and RCONFLICTS to itself. So, what's the purpose of the above
> 4 lines?
>
[Yaniv] if I understand correctly, this means all these lines should be removed completely, right ?
We have any wl12xx referenced ?
>
> > +PV = "r8.a9.14"
> > +inherit module
> > +
> > +PR = "${MACHINE_KERNEL_PR}+a+gitr${SRCPV}"
> > +
> > +# Tags: ol_r8.a9.14
> > +SRCREV_wl18xx = "0e48c4b55cfa0d557a098cbe92b1f092f1a9ad67"
> > +BRANCH_wl18xx = "ap_p2p"
> > +SRCREV_backports = "0d46f43a2f3ccdd53de19eee5b9c674bf8ef09a2"
> > +BRANCH_backports = "ap_dfs_mbss_all"
> > +
> > +SRCREV_FORMAT = "wl18xx"
> > +
> > +S = "${WORKDIR}/compat-wireless"
> > +
> > +SRC_URI = "git://git.ti.com/wilink8-wlan/wl18xx.git;branch=${BRANCH_wl18xx};destsuffix=wl18xx;name=wl18xx \
> > + git://git.ti.com/wilink8-wlan/backports.git;branch=${BRANCH_backports};destsuffix=backports;name=backports \
> > + "
> > +
> > +export KLIB_BUILD="${STAGING_KERNEL_DIR}"
> > +export KLIB="${D}"
> > +
> > +do_configure() {
> > + cd "${WORKDIR}/backports"
> > + unset CC
> > + #Generate compat-wireless
> > + python ./gentree.py --clean "${WORKDIR}/wl18xx" "${WORKDIR}/compat-wireless"
> > +
> > + cd ${S}
> > + make defconfig-wl18xx
> > +
> > + # Now generate the sourceipk with the properly configured sources
> > + sourceipk_do_create_srcipk
> > +}
> > +
> > +do_install() {
> > + # Install modules
> > + oe_runmake modules_install
> > +}
> > +
> > --
> > 1.7.9
> >
> > _______________________________________________
> > meta-arago mailing list
> > meta-arago@arago-project.org
> > http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
[-- Attachment #2: Type: text/html, Size: 10897 bytes --]
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2014-08-05 19:04 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-07-31 21:28 [PATCH 1/2 v2] wl18xx-compat: version update Yaniv Machani
2014-07-31 21:28 ` [PATCH 2/2] wpa-supplicant-wl18xx: configuration files update Yaniv Machani
2014-08-04 21:18 ` Denys Dmytriyenko
2014-08-04 21:16 ` [PATCH 1/2 v2] wl18xx-compat: version update Denys Dmytriyenko
2014-08-05 13:18 ` Maupin, Chase
2014-08-05 14:46 ` Cooper Jr., Franklin
2014-08-05 19:03 ` Machani, Yaniv
2014-08-05 4:19 Machani, Yaniv
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.