* [PATCH 1/2] wl18xx-compat: version update
@ 2014-08-07 16:29 Yaniv Machani
2014-08-07 19:19 ` Maupin, Chase
2014-08-15 21:27 ` Denys Dmytriyenko
0 siblings, 2 replies; 12+ messages in thread
From: Yaniv Machani @ 2014-08-07 16:29 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>
---
.../packagegroup-arago-tisdk-connectivity.bb | 3 +-
.../ti-compat-wireless-wl18xx_r8.a8.10.bb | 61 --------------------
.../ti-compat-wireless-wl18xx_r8.a9.14.bb | 51 ++++++++++++++++
3 files changed, 53 insertions(+), 62 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..7dadca2 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
@@ -1,6 +1,6 @@
DESCRIPTION = "Task to install wireless packages into the target FS"
LICENSE = "MIT"
-PR = "r25"
+PR = "r26"
inherit packagegroup
@@ -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..dca2edb
--- /dev/null
+++ b/meta-arago-extras/recipes-bsp/ti-compat-wireless/ti-compat-wireless-wl18xx_r8.a9.14.bb
@@ -0,0 +1,51 @@
+# 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"
+
+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] 12+ messages in thread
* Re: [PATCH 1/2] wl18xx-compat: version update
2014-08-07 16:29 [PATCH 1/2] wl18xx-compat: version update Yaniv Machani
@ 2014-08-07 19:19 ` Maupin, Chase
2014-08-07 19:48 ` Cooper Jr., Franklin
2014-08-15 21:27 ` Denys Dmytriyenko
1 sibling, 1 reply; 12+ messages in thread
From: Maupin, Chase @ 2014-08-07 19:19 UTC (permalink / raw)
To: Machani, Yaniv, meta-arago
Acked-by: Chase Maupin <chase.maupin@ti.com>
>-----Original Message-----
>From: meta-arago-bounces@arago-project.org [mailto:meta-arago-
>bounces@arago-project.org] On Behalf Of Machani, Yaniv
>Sent: Thursday, August 07, 2014 11:30 AM
>To: meta-arago@arago-project.org
>Subject: [meta-arago] [PATCH 1/2] wl18xx-compat: version update
>
>- 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>
>---
> .../packagegroup-arago-tisdk-connectivity.bb | 3 +-
> .../ti-compat-wireless-wl18xx_r8.a8.10.bb | 61 -------
>-------------
> .../ti-compat-wireless-wl18xx_r8.a9.14.bb | 51
>++++++++++++++++
> 3 files changed, 53 insertions(+), 62 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..7dadca2 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
>@@ -1,6 +1,6 @@
> DESCRIPTION = "Task to install wireless packages into the target
>FS"
> LICENSE = "MIT"
>-PR = "r25"
>+PR = "r26"
>
> inherit packagegroup
>
>@@ -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..dca2edb
>--- /dev/null
>+++ b/meta-arago-extras/recipes-bsp/ti-compat-wireless/ti-compat-
>wireless-wl18xx_r8.a9.14.bb
>@@ -0,0 +1,51 @@
>+# 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"
>+
>+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
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH 1/2] wl18xx-compat: version update
2014-08-07 19:19 ` Maupin, Chase
@ 2014-08-07 19:48 ` Cooper Jr., Franklin
0 siblings, 0 replies; 12+ messages in thread
From: Cooper Jr., Franklin @ 2014-08-07 19:48 UTC (permalink / raw)
To: Maupin, Chase, Machani, Yaniv, meta-arago
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 Maupin, Chase
> Sent: Thursday, August 07, 2014 2:20 PM
> To: Machani, Yaniv; meta-arago@arago-project.org
> Subject: Re: [meta-arago] [PATCH 1/2] wl18xx-compat: version update
>
> Acked-by: Chase Maupin <chase.maupin@ti.com>
>
> >-----Original Message-----
> >From: meta-arago-bounces@arago-project.org [mailto:meta-arago-
> >bounces@arago-project.org] On Behalf Of Machani, Yaniv
> >Sent: Thursday, August 07, 2014 11:30 AM
> >To: meta-arago@arago-project.org
> >Subject: [meta-arago] [PATCH 1/2] wl18xx-compat: version update
> >
> >- 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>
> >---
> > .../packagegroup-arago-tisdk-connectivity.bb | 3 +-
> > .../ti-compat-wireless-wl18xx_r8.a8.10.bb | 61 -------
> >-------------
> > .../ti-compat-wireless-wl18xx_r8.a9.14.bb | 51
> >++++++++++++++++
> > 3 files changed, 53 insertions(+), 62 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..7dadca2 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
> >@@ -1,6 +1,6 @@
> > DESCRIPTION = "Task to install wireless packages into the target FS"
> > LICENSE = "MIT"
> >-PR = "r25"
> >+PR = "r26"
> >
> > inherit packagegroup
> >
> >@@ -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..dca2edb
> >--- /dev/null
> >+++ b/meta-arago-extras/recipes-bsp/ti-compat-wireless/ti-compat-
> >wireless-wl18xx_r8.a9.14.bb
> >@@ -0,0 +1,51 @@
> >+# 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"
> >+
> >+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] 12+ messages in thread
* Re: [PATCH 1/2] wl18xx-compat: version update
2014-08-07 16:29 [PATCH 1/2] wl18xx-compat: version update Yaniv Machani
2014-08-07 19:19 ` Maupin, Chase
@ 2014-08-15 21:27 ` Denys Dmytriyenko
2014-08-16 13:17 ` Machani, Yaniv
1 sibling, 1 reply; 12+ messages in thread
From: Denys Dmytriyenko @ 2014-08-15 21:27 UTC (permalink / raw)
To: Yaniv Machani; +Cc: meta-arago
Yaniv,
We are getting a conflict between modules installed by the kernel and modules
provided by the compat recipe below:
WARNING: The recipe ti-compat-wireless-wl18xx is trying to install files into a shared area when those files already exist. Those files and their manifest location are:
/OE/RAM/arago-daisy/arago-tmp-external-linaro-toolchain/sysroots/am335x-evm/pkgdata/runtime-reverse/kernel-module-cfg80211
Matched in manifest-am335x-evm-linux-ti-staging.packagedata
/OE/RAM/arago-daisy/arago-tmp-external-linaro-toolchain/sysroots/am335x-evm/pkgdata/runtime-reverse/kernel-module-mac80211
Matched in manifest-am335x-evm-linux-ti-staging.packagedata
/OE/RAM/arago-daisy/arago-tmp-external-linaro-toolchain/sysroots/am335x-evm/pkgdata/runtime-reverse/kernel-module-wlcore-sdio
Matched in manifest-am335x-evm-linux-ti-staging.packagedata
/OE/RAM/arago-daisy/arago-tmp-external-linaro-toolchain/sysroots/am335x-evm/pkgdata/runtime-reverse/kernel-module-wlcore
Matched in manifest-am335x-evm-linux-ti-staging.packagedata
/OE/RAM/arago-daisy/arago-tmp-external-linaro-toolchain/sysroots/am335x-evm/pkgdata/runtime-reverse/kernel-module-wl18xx
Matched in manifest-am335x-evm-linux-ti-staging.packagedata
/OE/RAM/arago-daisy/arago-tmp-external-linaro-toolchain/sysroots/am335x-evm/pkgdata/runtime-reverse/kernel-module-wl12xx
Matched in manifest-am335x-evm-linux-ti-staging.packagedata
/OE/RAM/arago-daisy/arago-tmp-external-linaro-toolchain/sysroots/am335x-evm/pkgdata/runtime/kernel-module-cfg80211.packaged
Matched in manifest-am335x-evm-linux-ti-staging.packagedata
/OE/RAM/arago-daisy/arago-tmp-external-linaro-toolchain/sysroots/am335x-evm/pkgdata/runtime/kernel-module-cfg80211
Matched in manifest-am335x-evm-linux-ti-staging.packagedata
/OE/RAM/arago-daisy/arago-tmp-external-linaro-toolchain/sysroots/am335x-evm/pkgdata/runtime/kernel-module-mac80211.packaged
Matched in manifest-am335x-evm-linux-ti-staging.packagedata
/OE/RAM/arago-daisy/arago-tmp-external-linaro-toolchain/sysroots/am335x-evm/pkgdata/runtime/kernel-module-mac80211
Matched in manifest-am335x-evm-linux-ti-staging.packagedata
/OE/RAM/arago-daisy/arago-tmp-external-linaro-toolchain/sysroots/am335x-evm/pkgdata/runtime/kernel-module-wlcore-sdio.packaged
Matched in manifest-am335x-evm-linux-ti-staging.packagedata
/OE/RAM/arago-daisy/arago-tmp-external-linaro-toolchain/sysroots/am335x-evm/pkgdata/runtime/kernel-module-wlcore-sdio
Matched in manifest-am335x-evm-linux-ti-staging.packagedata
/OE/RAM/arago-daisy/arago-tmp-external-linaro-toolchain/sysroots/am335x-evm/pkgdata/runtime/kernel-module-wlcore.packaged
Matched in manifest-am335x-evm-linux-ti-staging.packagedata
/OE/RAM/arago-daisy/arago-tmp-external-linaro-toolchain/sysroots/am335x-evm/pkgdata/runtime/kernel-module-wlcore
Matched in manifest-am335x-evm-linux-ti-staging.packagedata
/OE/RAM/arago-daisy/arago-tmp-external-linaro-toolchain/sysroots/am335x-evm/pkgdata/runtime/kernel-module-wl18xx.packaged
Matched in manifest-am335x-evm-linux-ti-staging.packagedata
/OE/RAM/arago-daisy/arago-tmp-external-linaro-toolchain/sysroots/am335x-evm/pkgdata/runtime/kernel-module-wl18xx
Matched in manifest-am335x-evm-linux-ti-staging.packagedata
/OE/RAM/arago-daisy/arago-tmp-external-linaro-toolchain/sysroots/am335x-evm/pkgdata/runtime/kernel-module-wl12xx.packaged
Matched in manifest-am335x-evm-linux-ti-staging.packagedata
/OE/RAM/arago-daisy/arago-tmp-external-linaro-toolchain/sysroots/am335x-evm/pkgdata/runtime/kernel-module-wl12xx
Matched in manifest-am335x-evm-linux-ti-staging.packagedata
Please verify which package should provide the above files.
The conflict in the sysroots is not fatal, but the problem then comes later,
when all those modules need to be packaged into IPKs with conflicting hash
tags...
ERROR: Recipe linux-ti-staging is trying to change PR from 'r22a+gitrAUTOINC+367e55fbd8-arago1' to 'r22+a+gitrAUTOINC+0e48c4b55c'. This will cause do_package_write_* failures since the incorrect data will be used and they will be unable to find the right workdir.
ERROR: Function failed: read_subpackage_metadata
ERROR: Logfile of failure stored in: /OE/RAM/arago-daisy/arago-tmp-external-linaro-toolchain/work/am335x_evm-oe-linux-gnueabi/linux-ti-staging/3.14.17-r22a+gitrAUTOINC+367e55fbd8-arago1/temp/log.do_package_write_ipk.25017
NOTE: recipe linux-ti-staging-3.14.17-r22a+gitrAUTOINC+367e55fbd8-arago1: task do_package_write_ipk: Failed
ERROR: Task 613 (/home/jenkins/tisdk-build/sources/meta-ti/recipes-kernel/linux/linux-ti-staging_3.14.bb, do_package_write_ipk) failed with exit code '1'
Which modules should be installed and packaged?
--
Denys
On Thu, Aug 07, 2014 at 07:29:55PM +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>
> ---
> .../packagegroup-arago-tisdk-connectivity.bb | 3 +-
> .../ti-compat-wireless-wl18xx_r8.a8.10.bb | 61 --------------------
> .../ti-compat-wireless-wl18xx_r8.a9.14.bb | 51 ++++++++++++++++
> 3 files changed, 53 insertions(+), 62 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..7dadca2 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
> @@ -1,6 +1,6 @@
> DESCRIPTION = "Task to install wireless packages into the target FS"
> LICENSE = "MIT"
> -PR = "r25"
> +PR = "r26"
>
> inherit packagegroup
>
> @@ -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..dca2edb
> --- /dev/null
> +++ b/meta-arago-extras/recipes-bsp/ti-compat-wireless/ti-compat-wireless-wl18xx_r8.a9.14.bb
> @@ -0,0 +1,51 @@
> +# 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"
> +
> +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] 12+ messages in thread
* Re: [PATCH 1/2] wl18xx-compat: version update
2014-08-15 21:27 ` Denys Dmytriyenko
@ 2014-08-16 13:17 ` Machani, Yaniv
2014-08-17 17:14 ` Denys Dmytriyenko
0 siblings, 1 reply; 12+ messages in thread
From: Machani, Yaniv @ 2014-08-16 13:17 UTC (permalink / raw)
To: Dmytriyenko, Denys; +Cc: meta-arago
Hi Denys,
The correct modules are the one's generated by 'r22+a+gitrAUTOINC+0e48c4b55c'
Is there a way not to clean the ti-staging modules ?
Thanks,
Yaniv
-----Original Message-----
From: Dmytriyenko, Denys
Sent: Saturday, August 16, 2014 12:28 AM
To: Machani, Yaniv
Cc: meta-arago@arago-project.org
Subject: Re: [meta-arago] [PATCH 1/2] wl18xx-compat: version update
Yaniv,
We are getting a conflict between modules installed by the kernel and modules provided by the compat recipe below:
WARNING: The recipe ti-compat-wireless-wl18xx is trying to install files into a shared area when those files already exist. Those files and their manifest location are:
/OE/RAM/arago-daisy/arago-tmp-external-linaro-toolchain/sysroots/am335x-evm/pkgdata/runtime-reverse/kernel-module-cfg80211
Matched in manifest-am335x-evm-linux-ti-staging.packagedata
/OE/RAM/arago-daisy/arago-tmp-external-linaro-toolchain/sysroots/am335x-evm/pkgdata/runtime-reverse/kernel-module-mac80211
Matched in manifest-am335x-evm-linux-ti-staging.packagedata
/OE/RAM/arago-daisy/arago-tmp-external-linaro-toolchain/sysroots/am335x-evm/pkgdata/runtime-reverse/kernel-module-wlcore-sdio
Matched in manifest-am335x-evm-linux-ti-staging.packagedata
/OE/RAM/arago-daisy/arago-tmp-external-linaro-toolchain/sysroots/am335x-evm/pkgdata/runtime-reverse/kernel-module-wlcore
Matched in manifest-am335x-evm-linux-ti-staging.packagedata
/OE/RAM/arago-daisy/arago-tmp-external-linaro-toolchain/sysroots/am335x-evm/pkgdata/runtime-reverse/kernel-module-wl18xx
Matched in manifest-am335x-evm-linux-ti-staging.packagedata
/OE/RAM/arago-daisy/arago-tmp-external-linaro-toolchain/sysroots/am335x-evm/pkgdata/runtime-reverse/kernel-module-wl12xx
Matched in manifest-am335x-evm-linux-ti-staging.packagedata
/OE/RAM/arago-daisy/arago-tmp-external-linaro-toolchain/sysroots/am335x-evm/pkgdata/runtime/kernel-module-cfg80211.packaged
Matched in manifest-am335x-evm-linux-ti-staging.packagedata
/OE/RAM/arago-daisy/arago-tmp-external-linaro-toolchain/sysroots/am335x-evm/pkgdata/runtime/kernel-module-cfg80211
Matched in manifest-am335x-evm-linux-ti-staging.packagedata
/OE/RAM/arago-daisy/arago-tmp-external-linaro-toolchain/sysroots/am335x-evm/pkgdata/runtime/kernel-module-mac80211.packaged
Matched in manifest-am335x-evm-linux-ti-staging.packagedata
/OE/RAM/arago-daisy/arago-tmp-external-linaro-toolchain/sysroots/am335x-evm/pkgdata/runtime/kernel-module-mac80211
Matched in manifest-am335x-evm-linux-ti-staging.packagedata
/OE/RAM/arago-daisy/arago-tmp-external-linaro-toolchain/sysroots/am335x-evm/pkgdata/runtime/kernel-module-wlcore-sdio.packaged
Matched in manifest-am335x-evm-linux-ti-staging.packagedata
/OE/RAM/arago-daisy/arago-tmp-external-linaro-toolchain/sysroots/am335x-evm/pkgdata/runtime/kernel-module-wlcore-sdio
Matched in manifest-am335x-evm-linux-ti-staging.packagedata
/OE/RAM/arago-daisy/arago-tmp-external-linaro-toolchain/sysroots/am335x-evm/pkgdata/runtime/kernel-module-wlcore.packaged
Matched in manifest-am335x-evm-linux-ti-staging.packagedata
/OE/RAM/arago-daisy/arago-tmp-external-linaro-toolchain/sysroots/am335x-evm/pkgdata/runtime/kernel-module-wlcore
Matched in manifest-am335x-evm-linux-ti-staging.packagedata
/OE/RAM/arago-daisy/arago-tmp-external-linaro-toolchain/sysroots/am335x-evm/pkgdata/runtime/kernel-module-wl18xx.packaged
Matched in manifest-am335x-evm-linux-ti-staging.packagedata
/OE/RAM/arago-daisy/arago-tmp-external-linaro-toolchain/sysroots/am335x-evm/pkgdata/runtime/kernel-module-wl18xx
Matched in manifest-am335x-evm-linux-ti-staging.packagedata
/OE/RAM/arago-daisy/arago-tmp-external-linaro-toolchain/sysroots/am335x-evm/pkgdata/runtime/kernel-module-wl12xx.packaged
Matched in manifest-am335x-evm-linux-ti-staging.packagedata
/OE/RAM/arago-daisy/arago-tmp-external-linaro-toolchain/sysroots/am335x-evm/pkgdata/runtime/kernel-module-wl12xx
Matched in manifest-am335x-evm-linux-ti-staging.packagedata
Please verify which package should provide the above files.
The conflict in the sysroots is not fatal, but the problem then comes later, when all those modules need to be packaged into IPKs with conflicting hash tags...
ERROR: Recipe linux-ti-staging is trying to change PR from 'r22a+gitrAUTOINC+367e55fbd8-arago1' to 'r22+a+gitrAUTOINC+0e48c4b55c'. This will cause do_package_write_* failures since the incorrect data will be used and they will be unable to find the right workdir.
ERROR: Function failed: read_subpackage_metadata
ERROR: Logfile of failure stored in: /OE/RAM/arago-daisy/arago-tmp-external-linaro-toolchain/work/am335x_evm-oe-linux-gnueabi/linux-ti-staging/3.14.17-r22a+gitrAUTOINC+367e55fbd8-arago1/temp/log.do_package_write_ipk.25017
NOTE: recipe linux-ti-staging-3.14.17-r22a+gitrAUTOINC+367e55fbd8-arago1: task do_package_write_ipk: Failed
ERROR: Task 613 (/home/jenkins/tisdk-build/sources/meta-ti/recipes-kernel/linux/linux-ti-staging_3.14.bb, do_package_write_ipk) failed with exit code '1'
Which modules should be installed and packaged?
--
Denys
On Thu, Aug 07, 2014 at 07:29:55PM +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>
> ---
> .../packagegroup-arago-tisdk-connectivity.bb | 3 +-
> .../ti-compat-wireless-wl18xx_r8.a8.10.bb | 61 --------------------
> .../ti-compat-wireless-wl18xx_r8.a9.14.bb | 51 ++++++++++++++++
> 3 files changed, 53 insertions(+), 62 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..7dadca2 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
> @@ -1,6 +1,6 @@
> DESCRIPTION = "Task to install wireless packages into the target FS"
> LICENSE = "MIT"
> -PR = "r25"
> +PR = "r26"
>
> inherit packagegroup
>
> @@ -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..dca2edb
> --- /dev/null
> +++ b/meta-arago-extras/recipes-bsp/ti-compat-wireless/ti-compat-wireless-wl18xx_r8.a9.14.bb
> @@ -0,0 +1,51 @@
> +# 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"
> +
> +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] 12+ messages in thread
* Re: [PATCH 1/2] wl18xx-compat: version update
2014-08-16 13:17 ` Machani, Yaniv
@ 2014-08-17 17:14 ` Denys Dmytriyenko
0 siblings, 0 replies; 12+ messages in thread
From: Denys Dmytriyenko @ 2014-08-17 17:14 UTC (permalink / raw)
To: Machani, Yaniv, dmurphy; +Cc: meta-arago
On Sat, Aug 16, 2014 at 09:17:18AM -0400, Machani, Yaniv wrote:
> Hi Denys,
> The correct modules are the one's generated by 'r22+a+gitrAUTOINC+0e48c4b55c'
>
> Is there a way not to clean the ti-staging modules ?
Yaniv,
You'd have to disable corresponding modules in the kernel config. If you don't
want to do it in the main defconfig, you can provide a config fragment to Dan.
--
Denys
> -----Original Message-----
> From: Dmytriyenko, Denys
> Sent: Saturday, August 16, 2014 12:28 AM
> To: Machani, Yaniv
> Cc: meta-arago@arago-project.org
> Subject: Re: [meta-arago] [PATCH 1/2] wl18xx-compat: version update
>
> Yaniv,
>
> We are getting a conflict between modules installed by the kernel and modules provided by the compat recipe below:
>
> WARNING: The recipe ti-compat-wireless-wl18xx is trying to install files into a shared area when those files already exist. Those files and their manifest location are:
> /OE/RAM/arago-daisy/arago-tmp-external-linaro-toolchain/sysroots/am335x-evm/pkgdata/runtime-reverse/kernel-module-cfg80211
> Matched in manifest-am335x-evm-linux-ti-staging.packagedata
> /OE/RAM/arago-daisy/arago-tmp-external-linaro-toolchain/sysroots/am335x-evm/pkgdata/runtime-reverse/kernel-module-mac80211
> Matched in manifest-am335x-evm-linux-ti-staging.packagedata
> /OE/RAM/arago-daisy/arago-tmp-external-linaro-toolchain/sysroots/am335x-evm/pkgdata/runtime-reverse/kernel-module-wlcore-sdio
> Matched in manifest-am335x-evm-linux-ti-staging.packagedata
> /OE/RAM/arago-daisy/arago-tmp-external-linaro-toolchain/sysroots/am335x-evm/pkgdata/runtime-reverse/kernel-module-wlcore
> Matched in manifest-am335x-evm-linux-ti-staging.packagedata
> /OE/RAM/arago-daisy/arago-tmp-external-linaro-toolchain/sysroots/am335x-evm/pkgdata/runtime-reverse/kernel-module-wl18xx
> Matched in manifest-am335x-evm-linux-ti-staging.packagedata
> /OE/RAM/arago-daisy/arago-tmp-external-linaro-toolchain/sysroots/am335x-evm/pkgdata/runtime-reverse/kernel-module-wl12xx
> Matched in manifest-am335x-evm-linux-ti-staging.packagedata
> /OE/RAM/arago-daisy/arago-tmp-external-linaro-toolchain/sysroots/am335x-evm/pkgdata/runtime/kernel-module-cfg80211.packaged
> Matched in manifest-am335x-evm-linux-ti-staging.packagedata
> /OE/RAM/arago-daisy/arago-tmp-external-linaro-toolchain/sysroots/am335x-evm/pkgdata/runtime/kernel-module-cfg80211
> Matched in manifest-am335x-evm-linux-ti-staging.packagedata
> /OE/RAM/arago-daisy/arago-tmp-external-linaro-toolchain/sysroots/am335x-evm/pkgdata/runtime/kernel-module-mac80211.packaged
> Matched in manifest-am335x-evm-linux-ti-staging.packagedata
> /OE/RAM/arago-daisy/arago-tmp-external-linaro-toolchain/sysroots/am335x-evm/pkgdata/runtime/kernel-module-mac80211
> Matched in manifest-am335x-evm-linux-ti-staging.packagedata
> /OE/RAM/arago-daisy/arago-tmp-external-linaro-toolchain/sysroots/am335x-evm/pkgdata/runtime/kernel-module-wlcore-sdio.packaged
> Matched in manifest-am335x-evm-linux-ti-staging.packagedata
> /OE/RAM/arago-daisy/arago-tmp-external-linaro-toolchain/sysroots/am335x-evm/pkgdata/runtime/kernel-module-wlcore-sdio
> Matched in manifest-am335x-evm-linux-ti-staging.packagedata
> /OE/RAM/arago-daisy/arago-tmp-external-linaro-toolchain/sysroots/am335x-evm/pkgdata/runtime/kernel-module-wlcore.packaged
> Matched in manifest-am335x-evm-linux-ti-staging.packagedata
> /OE/RAM/arago-daisy/arago-tmp-external-linaro-toolchain/sysroots/am335x-evm/pkgdata/runtime/kernel-module-wlcore
> Matched in manifest-am335x-evm-linux-ti-staging.packagedata
> /OE/RAM/arago-daisy/arago-tmp-external-linaro-toolchain/sysroots/am335x-evm/pkgdata/runtime/kernel-module-wl18xx.packaged
> Matched in manifest-am335x-evm-linux-ti-staging.packagedata
> /OE/RAM/arago-daisy/arago-tmp-external-linaro-toolchain/sysroots/am335x-evm/pkgdata/runtime/kernel-module-wl18xx
> Matched in manifest-am335x-evm-linux-ti-staging.packagedata
> /OE/RAM/arago-daisy/arago-tmp-external-linaro-toolchain/sysroots/am335x-evm/pkgdata/runtime/kernel-module-wl12xx.packaged
> Matched in manifest-am335x-evm-linux-ti-staging.packagedata
> /OE/RAM/arago-daisy/arago-tmp-external-linaro-toolchain/sysroots/am335x-evm/pkgdata/runtime/kernel-module-wl12xx
> Matched in manifest-am335x-evm-linux-ti-staging.packagedata
> Please verify which package should provide the above files.
>
>
> The conflict in the sysroots is not fatal, but the problem then comes later, when all those modules need to be packaged into IPKs with conflicting hash tags...
>
>
> ERROR: Recipe linux-ti-staging is trying to change PR from 'r22a+gitrAUTOINC+367e55fbd8-arago1' to 'r22+a+gitrAUTOINC+0e48c4b55c'. This will cause do_package_write_* failures since the incorrect data will be used and they will be unable to find the right workdir.
> ERROR: Function failed: read_subpackage_metadata
> ERROR: Logfile of failure stored in: /OE/RAM/arago-daisy/arago-tmp-external-linaro-toolchain/work/am335x_evm-oe-linux-gnueabi/linux-ti-staging/3.14.17-r22a+gitrAUTOINC+367e55fbd8-arago1/temp/log.do_package_write_ipk.25017
> NOTE: recipe linux-ti-staging-3.14.17-r22a+gitrAUTOINC+367e55fbd8-arago1: task do_package_write_ipk: Failed
> ERROR: Task 613 (/home/jenkins/tisdk-build/sources/meta-ti/recipes-kernel/linux/linux-ti-staging_3.14.bb, do_package_write_ipk) failed with exit code '1'
>
>
> Which modules should be installed and packaged?
>
> --
> Denys
>
>
> On Thu, Aug 07, 2014 at 07:29:55PM +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>
> > ---
> > .../packagegroup-arago-tisdk-connectivity.bb | 3 +-
> > .../ti-compat-wireless-wl18xx_r8.a8.10.bb | 61 --------------------
> > .../ti-compat-wireless-wl18xx_r8.a9.14.bb | 51 ++++++++++++++++
> > 3 files changed, 53 insertions(+), 62 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..7dadca2 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
> > @@ -1,6 +1,6 @@
> > DESCRIPTION = "Task to install wireless packages into the target FS"
> > LICENSE = "MIT"
> > -PR = "r25"
> > +PR = "r26"
> >
> > inherit packagegroup
> >
> > @@ -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..dca2edb
> > --- /dev/null
> > +++ b/meta-arago-extras/recipes-bsp/ti-compat-wireless/ti-compat-wireless-wl18xx_r8.a9.14.bb
> > @@ -0,0 +1,51 @@
> > +# 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"
> > +
> > +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] 12+ messages in thread
* Re: [PATCH 1/2] wl18xx-compat: version update
2014-07-30 18:27 ` Maupin, Chase
@ 2014-07-30 20:43 ` Machani, Yaniv
0 siblings, 0 replies; 12+ messages in thread
From: Machani, Yaniv @ 2014-07-30 20:43 UTC (permalink / raw)
To: Maupin, Chase, Cooper Jr., Franklin, meta-arago
> -----Original Message-----
> From: Maupin, Chase
> Sent: Wednesday, July 30, 2014 21:28
> To: Cooper Jr., Franklin; Machani, Yaniv; meta-arago@arago-project.org
> Subject: RE: [meta-arago] [PATCH 1/2] wl18xx-compat: version update
>
> >-----Original Message-----
> >From: meta-arago-bounces@arago-project.org [mailto:meta-arago-
> >bounces@arago-project.org] On Behalf Of Cooper Jr., Franklin
> >Sent: Tuesday, July 29, 2014 7:49 PM
> >To: Machani, Yaniv; meta-arago@arago-project.org
> >Subject: Re: [meta-arago] [PATCH 1/2] wl18xx-compat: version update
> >
> >I thought we got away from the compat stuff since the proper support
> >should already be inside of the kernel? Which platforms/kernel is this
> >recipe need for?
> >
> >Also I have two comments below:
> >
> >> -----Original Message-----
> >> From: meta-arago-bounces@arago-project.org [mailto:meta-arago-
> >> bounces@arago-project.org] On Behalf Of Machani, Yaniv
> >> Sent: Tuesday, July 29, 2014 3:14 PM
> >> To: meta-arago@arago-project.org
> >> Subject: [meta-arago] [PATCH 1/2] wl18xx-compat: version update
> >>
> >> - 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>
> >> ---
> >> .../packagegroup-arago-tisdk-connectivity.bb | 1 +
> >> .../ti-compat-wireless-wl18xx_r8.a8.10.bb | 61 -----
> >---------------
> >> .../ti-compat-wireless-wl18xx_r8.a9.14.bb | 57
> >++++++++++++++++++
>
> Use -m option to git-format-patch to help minimize the patch size.
>
[Yaniv] Ack.
> >> 3 files changed, 58 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-ti
> >> +++ sdk-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..bb5e072
> >> --- /dev/null
> >> +++ b/meta-arago-extras/recipes-bsp/ti-compat-wireless/ti-
> >compat-wireles
> >> +++ s-wl18xx_r8.a9.14.bb
> >> @@ -0,0 +1,57 @@
> >> +# 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/"
> >[Franklin] Is there a better homepage for this that can be used here?
> >Gforge is pretty old and the code is now on git.
> >> +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"
>
> If you are providing ti-compat-wireless-wl12xx then why do you need to
> add ti-compat-wireless-wl18xx in the package list?
>
[Yaniv] you are right, I'll update the values across the patches.
> >> +
> >> +PV = "r8.a9.14"
> >> +inherit module
> >> +
> >> +PR = "${MACHINE_KERNEL_PR}"
> >> +PR_append = "b+gitr${SRCPV}"
>
> You can combine these two lines. Also, you can start with "a" instead of "b"
>
[Yaniv] Ack.
> >> +
> >> +# Tags: ol_r8.a9.14
> >> +SRCREV_wl18xx = "30048320c30e94d805b9112daca54cb854c1eda4"
> >> +BRANCH_wl18xx = "ap_dfs_mbss_all"
> >> +SRCREV_backports = "0d46f43a2f3ccdd53de19eee5b9c674bf8ef09a2"
> >> +BRANCH_backports = "ap_dfs_mbss_all"
>
> I don't understand why you are getting two source repositories? Also, the
> BRANCH setting is the same so is there a need to have two values set?
>
[Yaniv] As you mentioned below, both are generating the compat-wireless.
Due to some recent changes, these branches will differ.
> >> +
> >> +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}"
> >[Franklin] Any reason you need to change the above lines and not just
> >use EXTRA_OEMAKE = "KLIB_BUILD=${STAGING_KERNEL_DIR} KLIB=${D}"
> which
> >the older recipe had.
> >> +
> >> +do_configure() {
> >> + cd "${WORKDIR}/backports"
> >> + unset CC
> >> + #Generate compat-wireless
> >> + python ./gentree.py --clean "${WORKDIR}/wl18xx"
> >"${WORKDIR}/compat-
> >> wireless"
>
> I'm assuming the two trees you cloned get turned into the compat-wireless
> directory?
>
[Yaniv] correct, the python generates the compat-wireless.
> >> +
> >> + cd ${S}
> >> + make defconfig-wl18xx
> >> +
> >> + # Now generate the sourceipk with the properly configured
> >sources
> >> + # sourceipk_do_create_srcipk
>
> Why is this commented out? Don't you want to be able to package the
> sources?
>
[Yaniv] Typo- thanks.
> >> +}
> >> +
> >> +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] 12+ messages in thread
* Re: [PATCH 1/2] wl18xx-compat: version update
2014-07-30 10:33 ` Machani, Yaniv
@ 2014-07-30 18:29 ` Maupin, Chase
0 siblings, 0 replies; 12+ messages in thread
From: Maupin, Chase @ 2014-07-30 18:29 UTC (permalink / raw)
To: Machani, Yaniv, Cooper Jr., Franklin, meta-arago
>-----Original Message-----
>From: meta-arago-bounces@arago-project.org [mailto:meta-arago-
>bounces@arago-project.org] On Behalf Of Machani, Yaniv
>Sent: Wednesday, July 30, 2014 5:34 AM
>To: Cooper Jr., Franklin; meta-arago@arago-project.org
>Subject: Re: [meta-arago] [PATCH 1/2] wl18xx-compat: version
>update
>
>> -----Original Message-----
>> From: Cooper Jr., Franklin
>> Sent: Wednesday, July 30, 2014 03:49
>> To: Machani, Yaniv; meta-arago@arago-project.org
>> Subject: RE: [meta-arago] [PATCH 1/2] wl18xx-compat: version
>update
>>
>> I thought we got away from the compat stuff since the proper
>support
>> should already be inside of the kernel? Which platforms/kernel
>is this
>> recipe need for?
>>
>[Yaniv] This is not a matter of support, but a matter of driver
>version support. SDK7 our 8.3 SP1 release.
>SDK8 supposed to have 8.4.. I've sent a detailed email on this few
>weeks ago, I'll resend.
>Compat supports all the platforms that we have added support in
>the kernel. (AM335, am43x-epos, am437x-gp, DRA7)
>
>> Also I have two comments below:
>>
>> > -----Original Message-----
>> > From: meta-arago-bounces@arago-project.org [mailto:meta-arago-
>> > bounces@arago-project.org] On Behalf Of Machani, Yaniv
>> > Sent: Tuesday, July 29, 2014 3:14 PM
>> > To: meta-arago@arago-project.org
>> > Subject: [meta-arago] [PATCH 1/2] wl18xx-compat: version
>update
>> >
>> > - 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>
>> > ---
>> > .../packagegroup-arago-tisdk-connectivity.bb | 1 +
>> > .../ti-compat-wireless-wl18xx_r8.a8.10.bb | 61 ---
>-----------------
>> > .../ti-compat-wireless-wl18xx_r8.a9.14.bb | 57
>++++++++++++++++++
>> > 3 files changed, 58 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-
>> > +++ ti
>> > +++ sdk-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..bb5e072
>> > --- /dev/null
>> > +++ b/meta-arago-extras/recipes-bsp/ti-compat-wireless/ti-
>compat-wirel
>> > +++ es
>> > +++ s-wl18xx_r8.a9.14.bb
>> > @@ -0,0 +1,57 @@
>> > +# 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/"
>> [Franklin] Is there a better homepage for this that can be used
>here? Gforge
>> is pretty old and the code is now on git.
>Sure, I'll change that
>> > +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"
>> > +
>> > +PV = "r8.a9.14"
>> > +inherit module
>> > +
>> > +PR = "${MACHINE_KERNEL_PR}"
>> > +PR_append = "b+gitr${SRCPV}"
>> > +
>> > +# Tags: ol_r8.a9.14
>> > +SRCREV_wl18xx = "30048320c30e94d805b9112daca54cb854c1eda4"
>> > +BRANCH_wl18xx = "ap_dfs_mbss_all"
>> > +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
>8x
>> x
>> > \
>> > +
>> > +git://git.ti.com/wilink8-
>> >
>>
>wlan/backports.git;branch=${BRANCH_backports};destsuffix=backports
>;nam
>> > e=
>> > backports \ "
>> > +
>> > +export KLIB_BUILD="${STAGING_KERNEL_DIR}"
>> > +export KLIB="${D}"
>> [Franklin] Any reason you need to change the above lines and not
>just use
>I need these also in the configure stage , it's used by the python
>script that generates the compat.
What about EXTRA_OECONF?
>> EXTRA_OEMAKE = "KLIB_BUILD=${STAGING_KERNEL_DIR} KLIB=${D}"
>which
>> the older recipe had.
>> > +
>> > +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] 12+ messages in thread
* Re: [PATCH 1/2] wl18xx-compat: version update
2014-07-30 0:49 ` Cooper Jr., Franklin
2014-07-30 10:33 ` Machani, Yaniv
@ 2014-07-30 18:27 ` Maupin, Chase
2014-07-30 20:43 ` Machani, Yaniv
1 sibling, 1 reply; 12+ messages in thread
From: Maupin, Chase @ 2014-07-30 18:27 UTC (permalink / raw)
To: Cooper Jr., Franklin, Machani, Yaniv, meta-arago
>-----Original Message-----
>From: meta-arago-bounces@arago-project.org [mailto:meta-arago-
>bounces@arago-project.org] On Behalf Of Cooper Jr., Franklin
>Sent: Tuesday, July 29, 2014 7:49 PM
>To: Machani, Yaniv; meta-arago@arago-project.org
>Subject: Re: [meta-arago] [PATCH 1/2] wl18xx-compat: version
>update
>
>I thought we got away from the compat stuff since the proper
>support should already be inside of the kernel? Which
>platforms/kernel is this recipe need for?
>
>Also I have two comments below:
>
>> -----Original Message-----
>> From: meta-arago-bounces@arago-project.org [mailto:meta-arago-
>> bounces@arago-project.org] On Behalf Of Machani, Yaniv
>> Sent: Tuesday, July 29, 2014 3:14 PM
>> To: meta-arago@arago-project.org
>> Subject: [meta-arago] [PATCH 1/2] wl18xx-compat: version update
>>
>> - 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>
>> ---
>> .../packagegroup-arago-tisdk-connectivity.bb | 1 +
>> .../ti-compat-wireless-wl18xx_r8.a8.10.bb | 61 -----
>---------------
>> .../ti-compat-wireless-wl18xx_r8.a9.14.bb | 57
>++++++++++++++++++
Use -m option to git-format-patch to help minimize the patch size.
>> 3 files changed, 58 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-ti
>> +++ sdk-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..bb5e072
>> --- /dev/null
>> +++ b/meta-arago-extras/recipes-bsp/ti-compat-wireless/ti-
>compat-wireles
>> +++ s-wl18xx_r8.a9.14.bb
>> @@ -0,0 +1,57 @@
>> +# 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/"
>[Franklin] Is there a better homepage for this that can be used
>here? Gforge is pretty old and the code is now on git.
>> +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"
If you are providing ti-compat-wireless-wl12xx then why do you need to add ti-compat-wireless-wl18xx in the package list?
>> +
>> +PV = "r8.a9.14"
>> +inherit module
>> +
>> +PR = "${MACHINE_KERNEL_PR}"
>> +PR_append = "b+gitr${SRCPV}"
You can combine these two lines. Also, you can start with "a" instead of "b"
>> +
>> +# Tags: ol_r8.a9.14
>> +SRCREV_wl18xx = "30048320c30e94d805b9112daca54cb854c1eda4"
>> +BRANCH_wl18xx = "ap_dfs_mbss_all"
>> +SRCREV_backports = "0d46f43a2f3ccdd53de19eee5b9c674bf8ef09a2"
>> +BRANCH_backports = "ap_dfs_mbss_all"
I don't understand why you are getting two source repositories? Also, the BRANCH setting is the same so is there a need to have two values set?
>> +
>> +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}"
>[Franklin] Any reason you need to change the above lines and not
>just use EXTRA_OEMAKE = "KLIB_BUILD=${STAGING_KERNEL_DIR}
>KLIB=${D}" which the older recipe had.
>> +
>> +do_configure() {
>> + cd "${WORKDIR}/backports"
>> + unset CC
>> + #Generate compat-wireless
>> + python ./gentree.py --clean "${WORKDIR}/wl18xx"
>"${WORKDIR}/compat-
>> wireless"
I'm assuming the two trees you cloned get turned into the compat-wireless directory?
>> +
>> + cd ${S}
>> + make defconfig-wl18xx
>> +
>> + # Now generate the sourceipk with the properly configured
>sources
>> + # sourceipk_do_create_srcipk
Why is this commented out? Don't you want to be able to package the sources?
>> +}
>> +
>> +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] 12+ messages in thread
* Re: [PATCH 1/2] wl18xx-compat: version update
2014-07-30 0:49 ` Cooper Jr., Franklin
@ 2014-07-30 10:33 ` Machani, Yaniv
2014-07-30 18:29 ` Maupin, Chase
2014-07-30 18:27 ` Maupin, Chase
1 sibling, 1 reply; 12+ messages in thread
From: Machani, Yaniv @ 2014-07-30 10:33 UTC (permalink / raw)
To: Cooper Jr., Franklin, meta-arago
> -----Original Message-----
> From: Cooper Jr., Franklin
> Sent: Wednesday, July 30, 2014 03:49
> To: Machani, Yaniv; meta-arago@arago-project.org
> Subject: RE: [meta-arago] [PATCH 1/2] wl18xx-compat: version update
>
> I thought we got away from the compat stuff since the proper support
> should already be inside of the kernel? Which platforms/kernel is this
> recipe need for?
>
[Yaniv] This is not a matter of support, but a matter of driver version support. SDK7 our 8.3 SP1 release.
SDK8 supposed to have 8.4.. I've sent a detailed email on this few weeks ago, I'll resend.
Compat supports all the platforms that we have added support in the kernel. (AM335, am43x-epos, am437x-gp, DRA7)
> Also I have two comments below:
>
> > -----Original Message-----
> > From: meta-arago-bounces@arago-project.org [mailto:meta-arago-
> > bounces@arago-project.org] On Behalf Of Machani, Yaniv
> > Sent: Tuesday, July 29, 2014 3:14 PM
> > To: meta-arago@arago-project.org
> > Subject: [meta-arago] [PATCH 1/2] wl18xx-compat: version update
> >
> > - 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>
> > ---
> > .../packagegroup-arago-tisdk-connectivity.bb | 1 +
> > .../ti-compat-wireless-wl18xx_r8.a8.10.bb | 61 --------------------
> > .../ti-compat-wireless-wl18xx_r8.a9.14.bb | 57 ++++++++++++++++++
> > 3 files changed, 58 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-
> > +++ ti
> > +++ sdk-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..bb5e072
> > --- /dev/null
> > +++ b/meta-arago-extras/recipes-bsp/ti-compat-wireless/ti-compat-wirel
> > +++ es
> > +++ s-wl18xx_r8.a9.14.bb
> > @@ -0,0 +1,57 @@
> > +# 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/"
> [Franklin] Is there a better homepage for this that can be used here? Gforge
> is pretty old and the code is now on git.
Sure, I'll change that
> > +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"
> > +
> > +PV = "r8.a9.14"
> > +inherit module
> > +
> > +PR = "${MACHINE_KERNEL_PR}"
> > +PR_append = "b+gitr${SRCPV}"
> > +
> > +# Tags: ol_r8.a9.14
> > +SRCREV_wl18xx = "30048320c30e94d805b9112daca54cb854c1eda4"
> > +BRANCH_wl18xx = "ap_dfs_mbss_all"
> > +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=wl18x
> x
> > \
> > +
> > +git://git.ti.com/wilink8-
> >
> wlan/backports.git;branch=${BRANCH_backports};destsuffix=backports;nam
> > e=
> > backports \ "
> > +
> > +export KLIB_BUILD="${STAGING_KERNEL_DIR}"
> > +export KLIB="${D}"
> [Franklin] Any reason you need to change the above lines and not just use
I need these also in the configure stage , it's used by the python script that generates the compat.
> EXTRA_OEMAKE = "KLIB_BUILD=${STAGING_KERNEL_DIR} KLIB=${D}" which
> the older recipe had.
> > +
> > +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] 12+ messages in thread
* Re: [PATCH 1/2] wl18xx-compat: version update
2014-07-29 20:13 Yaniv Machani
@ 2014-07-30 0:49 ` Cooper Jr., Franklin
2014-07-30 10:33 ` Machani, Yaniv
2014-07-30 18:27 ` Maupin, Chase
0 siblings, 2 replies; 12+ messages in thread
From: Cooper Jr., Franklin @ 2014-07-30 0:49 UTC (permalink / raw)
To: Machani, Yaniv, meta-arago
I thought we got away from the compat stuff since the proper support should already be inside of the kernel? Which platforms/kernel is this recipe need for?
Also I have two comments below:
> -----Original Message-----
> From: meta-arago-bounces@arago-project.org [mailto:meta-arago-
> bounces@arago-project.org] On Behalf Of Machani, Yaniv
> Sent: Tuesday, July 29, 2014 3:14 PM
> To: meta-arago@arago-project.org
> Subject: [meta-arago] [PATCH 1/2] wl18xx-compat: version update
>
> - 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>
> ---
> .../packagegroup-arago-tisdk-connectivity.bb | 1 +
> .../ti-compat-wireless-wl18xx_r8.a8.10.bb | 61 --------------------
> .../ti-compat-wireless-wl18xx_r8.a9.14.bb | 57 ++++++++++++++++++
> 3 files changed, 58 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-ti
> +++ sdk-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..bb5e072
> --- /dev/null
> +++ b/meta-arago-extras/recipes-bsp/ti-compat-wireless/ti-compat-wireles
> +++ s-wl18xx_r8.a9.14.bb
> @@ -0,0 +1,57 @@
> +# 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/"
[Franklin] Is there a better homepage for this that can be used here? Gforge is pretty old and the code is now on git.
> +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"
> +
> +PV = "r8.a9.14"
> +inherit module
> +
> +PR = "${MACHINE_KERNEL_PR}"
> +PR_append = "b+gitr${SRCPV}"
> +
> +# Tags: ol_r8.a9.14
> +SRCREV_wl18xx = "30048320c30e94d805b9112daca54cb854c1eda4"
> +BRANCH_wl18xx = "ap_dfs_mbss_all"
> +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}"
[Franklin] Any reason you need to change the above lines and not just use EXTRA_OEMAKE = "KLIB_BUILD=${STAGING_KERNEL_DIR} KLIB=${D}" which the older recipe had.
> +
> +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] 12+ messages in thread
* [PATCH 1/2] wl18xx-compat: version update
@ 2014-07-29 20:13 Yaniv Machani
2014-07-30 0:49 ` Cooper Jr., Franklin
0 siblings, 1 reply; 12+ messages in thread
From: Yaniv Machani @ 2014-07-29 20:13 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>
---
.../packagegroup-arago-tisdk-connectivity.bb | 1 +
.../ti-compat-wireless-wl18xx_r8.a8.10.bb | 61 --------------------
.../ti-compat-wireless-wl18xx_r8.a9.14.bb | 57 ++++++++++++++++++
3 files changed, 58 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..bb5e072
--- /dev/null
+++ b/meta-arago-extras/recipes-bsp/ti-compat-wireless/ti-compat-wireless-wl18xx_r8.a9.14.bb
@@ -0,0 +1,57 @@
+# 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"
+
+PV = "r8.a9.14"
+inherit module
+
+PR = "${MACHINE_KERNEL_PR}"
+PR_append = "b+gitr${SRCPV}"
+
+# Tags: ol_r8.a9.14
+SRCREV_wl18xx = "30048320c30e94d805b9112daca54cb854c1eda4"
+BRANCH_wl18xx = "ap_dfs_mbss_all"
+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] 12+ messages in thread
end of thread, other threads:[~2014-08-17 17:14 UTC | newest]
Thread overview: 12+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-08-07 16:29 [PATCH 1/2] wl18xx-compat: version update Yaniv Machani
2014-08-07 19:19 ` Maupin, Chase
2014-08-07 19:48 ` Cooper Jr., Franklin
2014-08-15 21:27 ` Denys Dmytriyenko
2014-08-16 13:17 ` Machani, Yaniv
2014-08-17 17:14 ` Denys Dmytriyenko
-- strict thread matches above, loose matches on Subject: below --
2014-07-29 20:13 Yaniv Machani
2014-07-30 0:49 ` Cooper Jr., Franklin
2014-07-30 10:33 ` Machani, Yaniv
2014-07-30 18:29 ` Maupin, Chase
2014-07-30 18:27 ` Maupin, Chase
2014-07-30 20:43 ` 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.