[PATCH] tisdk-image: Fix issues with manifest generation.

[PATCH] tisdk-image: Fix issues with manifest generation.

[Jacob Stiffler]

* Issue with parsing last entry in package index.
* Issue with substituting for '|' in license field of text manifest.

Signed-off-by: Jacob Stiffler <j-stiffler@ti.com>
---
 meta-arago-distro/classes/tisdk-image.bbclass |   10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/meta-arago-distro/classes/tisdk-image.bbclass b/meta-arago-distro/classes/tisdk-image.bbclass
index 8aebcac..2a4c31a 100644
--- a/meta-arago-distro/classes/tisdk-image.bbclass
+++ b/meta-arago-distro/classes/tisdk-image.bbclass
@@ -501,6 +501,8 @@ EOF
             IFS="
 "
 
+            begin=""
+            end=""
             for pkg in ${package_start}; do
                 end=`echo $pkg | cut -d: -f1`
 
@@ -515,6 +517,12 @@ EOF
                 pkg_name=`echo $pkg | cut -d: -f3`
                 begin=$end
             done
+            if [ ! -z $end ]; then
+                end=`wc -l $pkg_idx | awk '{ print $1 }'`
+                end=$[$end + 1]
+                tail -n $[$end - $begin] $pkg_idx > ${control_dir}/${pkg_name// /}.control
+            fi
+
             IFS=${IFS_OLD}
         done
     fi
@@ -604,7 +612,7 @@ echo "
 " >> ${SW_MANIFEST_FILE}
 
 cat >> ${SW_MANIFEST_TEXT} << EOF
-| ${package} | ${version} | ${license/\|/\&} | ${delivered_as} | ${modified} | ${location} | ${source}
+| ${package} | ${version} | ${license//\|/or} | ${delivered_as} | ${modified} | ${location} | ${source}
 EOF
     done
 
-- 
1.7.9.5