* Split recipe to create a generic .inc file to allow support for multiple
  versions of ti-wifi-utils.
* Rename recipe to use the specific version of ti-wifi-utils.

Signed-off-by: Franklin S. Cooper Jr <[email protected]>
---
Version 2 changes:
Removed SRCREV from .inc
Changed the order of this patch within this patchset.

 .../ti-wifi-utils/ti-wifi-utils.inc                |   29 ++++++++++++++
 .../ti-wifi-utils/ti-wifi-utils/calibrate.sh       |    7 ---
 .../ti-wifi-utils/ti-wifi-utils_git.bb             |   40 --------------------
 .../ti-wifi-utils/ti-wifi-utils_r5.sp3.05.bb       |    9 ++++
 4 files changed, 38 insertions(+), 47 deletions(-)
 create mode 100644 
meta-arago-extras/recipes-devtools/ti-wifi-utils/ti-wifi-utils.inc
 delete mode 100644 
meta-arago-extras/recipes-devtools/ti-wifi-utils/ti-wifi-utils/calibrate.sh
 delete mode 100644 
meta-arago-extras/recipes-devtools/ti-wifi-utils/ti-wifi-utils_git.bb
 create mode 100644 
meta-arago-extras/recipes-devtools/ti-wifi-utils/ti-wifi-utils_r5.sp3.05.bb

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
new file mode 100644
index 0000000..cdb3746
--- /dev/null
+++ b/meta-arago-extras/recipes-devtools/ti-wifi-utils/ti-wifi-utils.inc
@@ -0,0 +1,29 @@
+DESCRIPTION = "The calibrator and other useful utilities for TI wireless 
solution based on wl12xx driver"
+LICENSE = "BSD"
+
+DEPENDS = "libnl"
+RDEPENDS_${PN} = "ti-compat-wireless-wl12xx wl12xx-firmware"
+
+PR ="r1"
+
+SRC_URI = "git://github.com/TI-OpenLink/ti-utils.git;protocol=git"
+
+S = "${WORKDIR}/git"
+
+export CROSS_COMPILE = "${TARGET_PREFIX}"
+CFLAGS += " -DCONFIG_LIBNL20"
+
+do_install() {
+       install -d ${D}${bindir}
+       install -d ${D}${datadir}/ti/wifi-utils/ini_files/127x
+       install -d ${D}${datadir}/ti/wifi-utils/ini_files/128x
+
+       install -m 0755 calibrator ${D}${bindir}/
+       install -m 0755 ${S}/hw/ini_files/127x/* 
${D}${datadir}/ti/wifi-utils/ini_files/127x
+       install -m 0755 ${S}/hw/ini_files/128x/* 
${D}${datadir}/ti/wifi-utils/ini_files/128x
+}
+
+FILES_${PN} += " \
+       ${datadir}/ti/wifi-utils/ini_files/127x \
+       ${datadir}/ti/wifi-utils/ini_files/128x \
+"
diff --git 
a/meta-arago-extras/recipes-devtools/ti-wifi-utils/ti-wifi-utils/calibrate.sh 
b/meta-arago-extras/recipes-devtools/ti-wifi-utils/ti-wifi-utils/calibrate.sh
deleted file mode 100644
index b028435..0000000
--- 
a/meta-arago-extras/recipes-devtools/ti-wifi-utils/ti-wifi-utils/calibrate.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-echo "Performing wifi calibration..."
-rm /lib/firmware/ti-connectivity/wl1271-nvs.bin
-rmmod wl12xx_sdio.ko
-calibrator plt autocalibrate wlan0 /lib/modules/$(uname 
-r)/updates/drivers/net/wireless/wl12xx/wl12xx_sdio.ko 
/usr/share/ti/wifi-utils/ini_files/127x/TQS_S_2.6.ini 
/lib/firmware/ti-connectivity/wl1271-nvs.bin 00:00:00:00:00:00
-modprobe wl12xx_sdio
-
diff --git 
a/meta-arago-extras/recipes-devtools/ti-wifi-utils/ti-wifi-utils_git.bb 
b/meta-arago-extras/recipes-devtools/ti-wifi-utils/ti-wifi-utils_git.bb
deleted file mode 100644
index 142a720..0000000
--- a/meta-arago-extras/recipes-devtools/ti-wifi-utils/ti-wifi-utils_git.bb
+++ /dev/null
@@ -1,40 +0,0 @@
-DESCRIPTION = "The calibrator and other useful utilities for TI wireless 
solution based on wl12xx driver"
-LICENSE = "BSD"
-LIC_FILES_CHKSUM = "file://COPYING;md5=4725015cb0be7be389cf06deeae3683d"
-
-DEPENDS = "libnl"
-RDEPENDS = "ti-compat-wireless-wl12xx wl12xx-firmware"
-
-inherit update-rc.d
-INITSCRIPT_NAME="calibrate.sh"
-INITSCRIPT_PARAMS = "start 20 2 3 4 5 ."
-
-PR ="r2+gitr${SRCPV}"
-PV ="0.0"
-
-SRCREV = "ol_R5.SP3.05"
-SRC_URI = "git://github.com/TI-OpenLink/ti-utils.git;protocol=git \
-           file://calibrate.sh \
-"
-
-S = "${WORKDIR}/git"
-
-export CROSS_COMPILE = "${TARGET_PREFIX}"
-CFLAGS += " -DCONFIG_LIBNL20"
-
-do_install() {
-    install -d ${D}${bindir}
-    install -d ${D}${datadir}/ti/wifi-utils/ini_files/127x
-    install -d ${D}${datadir}/ti/wifi-utils/ini_files/128x
-    install -d ${D}${sysconfdir}/init.d
-
-    install -m 0755 calibrator ${D}${bindir}/
-    install -m 0755 ${S}/hw/ini_files/127x/* 
${D}${datadir}/ti/wifi-utils/ini_files/127x
-    install -m 0755 ${S}/hw/ini_files/128x/* 
${D}${datadir}/ti/wifi-utils/ini_files/128x
-    install -m 0755 ${WORKDIR}/calibrate.sh ${D}${sysconfdir}/init.d
-}
-
-FILES_${PN} += " \
-    ${datadir}/ti/wifi-utils/ini_files/127x \
-    ${datadir}/ti/wifi-utils/ini_files/128x \
-"
diff --git 
a/meta-arago-extras/recipes-devtools/ti-wifi-utils/ti-wifi-utils_r5.sp3.05.bb 
b/meta-arago-extras/recipes-devtools/ti-wifi-utils/ti-wifi-utils_r5.sp3.05.bb
new file mode 100644
index 0000000..2ca13f7
--- /dev/null
+++ 
b/meta-arago-extras/recipes-devtools/ti-wifi-utils/ti-wifi-utils_r5.sp3.05.bb
@@ -0,0 +1,9 @@
+require ti-wifi-utils.inc
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=4725015cb0be7be389cf06deeae3683d"
+
+PR_append ="b+gitr${SRCPV}"
+
+SRCREV = "ol_R5.SP3.05"
+
+RDEPENDS_${PN}_am335x-evm_append = " wilink-calibrate"
-- 
1.7.0.4

_______________________________________________
meta-arago mailing list
[email protected]
http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago

Reply via email to