From 983dd84d53436d3e73f589e83f7412c226e2236b Mon Sep 17 00:00:00 2001
From: "Maupin, Chase" <chase.maupin@ti.com>
Date: Tue, 20 May 2014 01:19:40 +0000
Subject: ti-ipc: Consolidate include file and old recipe

* The ti-ipc.inc file was for the legacy 1.24.00.16 version of
  ti-ipc.  So consolidate these files together since there is
  only one version of the ti-ipc recipe that needs that .inc
  file and there are no updates planned for it.

Signed-off-by: Chase Maupin <Chase.Maupin@ti.com>
Signed-off-by: Denys Dmytriyenko <denys@ti.com>
---
 recipes-ti/ipc/ti-ipc.inc           | 36 ------------------------------------
 recipes-ti/ipc/ti-ipc_1.24.00.16.bb | 37 +++++++++++++++++++++++++++++++++++--
 2 files changed, 35 insertions(+), 38 deletions(-)
 delete mode 100644 recipes-ti/ipc/ti-ipc.inc

diff --git a/recipes-ti/ipc/ti-ipc.inc b/recipes-ti/ipc/ti-ipc.inc
deleted file mode 100644
index 7f4b919b..00000000
--- a/recipes-ti/ipc/ti-ipc.inc
+++ /dev/null
@@ -1,36 +0,0 @@
-DESCRIPTION = "TI Inter Process Ccommunication (IPC) Mechanisms (for Uni- and Multi- Processor Configurations)"
-HOMEPAGE = "http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/ipc/index.html"
-
-SECTION = "devel"
-LICENSE = "BSD" 
-
-require ../includes/ti-paths.inc
-require ../includes/ti-staging.inc
-require ../includes/ti-eula-unpack.inc
-
-S = "${WORKDIR}/ipc_${PV}"
-
-SRC_URI = "http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/ipc/${PV}/exports/ipc_setuplinux_${PV}.bin;name=ipcbin"
-
-SRC_URI =+ "file://ipc.pc"
-
-DEPENDS = "ti-sysbios ti-cgt6x ti-xdctools"
-
-BINFILE="ipc_setuplinux_${PV}.bin"
-TI_BIN_UNPK_CMDS="Y: q:workdir:Y"
-
-do_configure() {
-    sed -i -e s:@VERSION@:${PV}:g ${WORKDIR}/ipc.pc
-    
-    cp ${WORKDIR}/ipc.pc ${S}
-}
-
-do_install() {
-    install -d ${D}${IPC_INSTALL_DIR_RECIPE}
-    cp -pPrf ${S}/* ${D}${IPC_INSTALL_DIR_RECIPE}
-   
-    install -d ${D}/${libdir}/pkgconfig
-    install ${S}/ipc.pc ${D}/${libdir}/pkgconfig/
-}
-
-FILES_${PN}-dev = "${libdir}/*"
diff --git a/recipes-ti/ipc/ti-ipc_1.24.00.16.bb b/recipes-ti/ipc/ti-ipc_1.24.00.16.bb
index e7ae7ef1..420d0f7d 100644
--- a/recipes-ti/ipc/ti-ipc_1.24.00.16.bb
+++ b/recipes-ti/ipc/ti-ipc_1.24.00.16.bb
@@ -1,8 +1,41 @@
-require ti-ipc.inc
+DESCRIPTION = "TI Inter Process Ccommunication (IPC) Mechanisms (for Uni- and Multi- Processor Configurations)"
+HOMEPAGE = "http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/ipc/index.html"
+SECTION = "devel"
+LICENSE = "BSD" 
+LIC_FILES_CHKSUM = "file://ipc_${PV}_manifest.html;md5=573f5a5c0448d28bf8db35f438244d7f"
+
+
+require ../includes/ti-paths.inc
+require ../includes/ti-staging.inc
+require ../includes/ti-eula-unpack.inc
 
 PV = "1_24_00_16"
 
-LIC_FILES_CHKSUM = "file://ipc_${PV}_manifest.html;md5=573f5a5c0448d28bf8db35f438244d7f"
+S = "${WORKDIR}/ipc_${PV}"
+
+SRC_URI = "http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/ipc/${PV}/exports/ipc_setuplinux_${PV}.bin;name=ipcbin \
+           file://ipc.pc"
+
+DEPENDS = "ti-sysbios ti-cgt6x ti-xdctools"
+
+BINFILE="ipc_setuplinux_${PV}.bin"
+TI_BIN_UNPK_CMDS="Y: q:workdir:Y"
+
+do_configure() {
+    sed -i -e s:@VERSION@:${PV}:g ${WORKDIR}/ipc.pc
+    
+    cp ${WORKDIR}/ipc.pc ${S}
+}
+
+do_install() {
+    install -d ${D}${IPC_INSTALL_DIR_RECIPE}
+    cp -pPrf ${S}/* ${D}${IPC_INSTALL_DIR_RECIPE}
+   
+    install -d ${D}/${libdir}/pkgconfig
+    install ${S}/ipc.pc ${D}/${libdir}/pkgconfig/
+}
+
+FILES_${PN}-dev = "${libdir}/*"
 
 SRC_URI[ipcbin.md5sum] = "d2f7cc82310d555ca039dcd353bd94c5"
 SRC_URI[ipcbin.sha256sum] = "96df7835e920c7dabcd63d30ec8bc2aea7cd0c6197c9fb9ca0f8a9b681aa5396"
-- 
cgit v1.2.3-54-g00ecf