Acked-by: Franklin Cooper Jr. <[email protected]>
> -----Original Message----- > From: [email protected] [mailto:meta-arago- > [email protected]] On Behalf Of Machani, Yaniv > Sent: Thursday, November 28, 2013 5:37 AM > To: [email protected] > Subject: [meta-arago] [PATCH 07/14] ti-wifi-utils-wl18xx: Update recipe to > ol_r8.a8.08 version. > > From: Yaniv Machani <[email protected]> > > - Updated firmware name. > - Added required makefile parameter to support libnl3 compilation. > > Signed-off-by: Yaniv Machani <[email protected]> > --- > ...8.a6.01.bb => ti-wifi-utils-wl18xx_r8.a8.08.bb} | 13 ++++++++----- > .../ti-wifi-utils/ti-wifi-utils.inc | 6 +++--- > 2 files changed, 11 insertions(+), 8 deletions(-) copy meta-arago- > extras/recipes-devtools/ti-wifi-utils/{ti-wifi-utils-wl18xx_r8.a6.01.bb => > ti-wifi- > utils-wl18xx_r8.a8.08.bb} (68%) > > diff --git a/meta-arago-extras/recipes-devtools/ti-wifi-utils/ti-wifi-utils- > wl18xx_r8.a6.01.bb b/meta-arago-extras/recipes-devtools/ti-wifi-utils/ti-wifi- > utils-wl18xx_r8.a8.08.bb > similarity index 68% > copy from meta-arago-extras/recipes-devtools/ti-wifi-utils/ti-wifi-utils- > wl18xx_r8.a6.01.bb > copy to meta-arago-extras/recipes-devtools/ti-wifi-utils/ti-wifi-utils- > wl18xx_r8.a8.08.bb > index eab94fa..601b203 100644 > --- a/meta-arago-extras/recipes-devtools/ti-wifi-utils/ti-wifi-utils- > wl18xx_r8.a6.01.bb > +++ b/meta-arago-extras/recipes-devtools/ti-wifi-utils/ti-wifi-utils-wl1 > +++ 8xx_r8.a8.08.bb > @@ -3,12 +3,12 @@ LICENSE = "BSD" > LIC_FILES_CHKSUM = > "file://COPYING;md5=4725015cb0be7be389cf06deeae3683d" > > DEPENDS = "libnl" > -RDEPENDS_${PN} = "ti-compat-wireless-wl12xx wl12xx-firmware" > +RDEPENDS_${PN} = "wl18xx-firmware" [Franklin] So this is a bit tricky since we use PREFERRED_PROVIDER for wl12xx-firmware. Via the WILINK_VERSION variable the PREFERRED_PROVIDER is set to wl12xx-firmware if Wilink 6 is used and if Wilink 8 is used then we use wl18xx-firmware. So technically you could of still used wl12xx-firmware and wl18xx-firmware would have been properly chosen but it is probably better to not depend on PREFERRED_PROVIDER when it doesn't make sense so this should be fine. > > -PR ="r3+gitr${SRCPV}" > +PR ="r0+gitr${SRCPV}" > > -# Tag: ol_r8.a6.01 > -SRCREV = "214dfbdf97cc390b0020c4ea9331a1cf82240a64" > +#Tag: ol_r8.a8.08 > +SRCREV = "9627cb09b9de32b8ffcc32d3ce3e275b7c56d8e4" > SRC_URI = "git://github.com/TI-OpenLink/18xx-ti-utils.git \ " > > @@ -20,7 +20,10 @@ RCONFLICTS_${PN} += "ti-wifi-utils" > S = "${WORKDIR}/git" > > export CROSS_COMPILE = "${TARGET_PREFIX}" > -CFLAGS += " -DCONFIG_LIBNL20" > + > +EXTRA_OEMAKE = 'CFLAGS="${CFLAGS} -I${STAGING_INCDIR}/libnl3/ - > DCONFIG_LIBNL32 " \ > + LDFLAGS="${LDFLAGS} -L${STAGING_LIBDIR}" \ > + NLVER=3' > > do_install() { > install -d ${D}${bindir} > diff --git > a/meta-arago-extras/recipes-devtools/ti-wifi-utils/ti-wifi-utils.inc > b/meta-arago-extras/recipes-devtools/ti-wifi-utils/ti-wifi-utils.inc > index cdb3746..1f3ddba 100644 > --- a/meta-arago-extras/recipes-devtools/ti-wifi-utils/ti-wifi-utils.inc > +++ b/meta-arago-extras/recipes-devtools/ti-wifi-utils/ti-wifi-utils.inc > @@ -2,16 +2,16 @@ DESCRIPTION = "The calibrator and other useful utilities > for TI wireless solutio LICENSE = "BSD" > > DEPENDS = "libnl" > -RDEPENDS_${PN} = "ti-compat-wireless-wl12xx wl12xx-firmware" > +RDEPENDS_${PN} = "wl18xx-firmware" > > -PR ="r1" > +PR ="r2" > > SRC_URI = "git://github.com/TI-OpenLink/ti-utils.git;protocol=git" > > S = "${WORKDIR}/git" > > export CROSS_COMPILE = "${TARGET_PREFIX}" > -CFLAGS += " -DCONFIG_LIBNL20" > +CFLAGS+="-DCONFIG_LIBNL32" > > do_install() { > install -d ${D}${bindir} > -- > 1.7.9 > > _______________________________________________ > meta-arago mailing list > [email protected] > http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago _______________________________________________ meta-arago mailing list [email protected] http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
