From 4739f47e9358ec8cb82a72f3e185003c5ce40b2c Mon Sep 17 00:00:00 2001
From: Saul Wold <sgw@linux.intel.com>
Date: Wed, 15 Apr 2015 12:17:46 -0700
Subject: lms7: re-write do_unpack to fix warning

Since the primary tarball unpacks into a non-standard directory create
a do_unpack that sets and resets  to first unpack the primary tarball
and then unpacks the actual src tarball into the correct directory.

This is similar to lsof which has a dual tarball also.

Fixes this WARNING:
WARNING: /srv/hdd/intel/test/tmp/work/corei7-64-poky-linux/lms7/7.1.20-r0/lms-7.1.20 ('S') doesn't exist, please set 'S' to a proper value

[YOCTO #7551]

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Darren Hart <dvhart@linux.intel.com>
---
 common/recipes-bsp/amt/lms7_7.1.20.bb | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

(limited to 'common/recipes-bsp')

diff --git a/common/recipes-bsp/amt/lms7_7.1.20.bb b/common/recipes-bsp/amt/lms7_7.1.20.bb
index acc08c1e..1e8376e5 100644
--- a/common/recipes-bsp/amt/lms7_7.1.20.bb
+++ b/common/recipes-bsp/amt/lms7_7.1.20.bb
@@ -12,6 +12,8 @@ SRC_URI = "http://software.intel.com/sites/default/files/m/4/e/a/9/b/37962-${BPN
            file://atnetworktool-printf-fix.patch \
            file://readlink-declaration.patch"
 
+LOCALSRC = "file://${WORKDIR}/outputdir/${BPN}-${PV}-${PV_SUB}.tar.gz"
+
 COMPATIBLE_HOST = '(i.86|x86_64).*-linux'
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=7264184cf88d9f27b719a9656255b47b"
@@ -24,12 +26,18 @@ inherit autotools update-rc.d
 INITSCRIPT_NAME = "lms7"
 INITSCRIPT_PARAMS = "defaults"
 
-do_unpack2() {
-	cd ${WORKDIR}
-	tar -xvzf ${WORKDIR}/outputdir/${BPN}-${PV}-${PV_SUB}.tar.gz
+python do_unpack() {
+    s = d.getVar('S', True)
+    d.setVar('S', '${WORKDIR}/outputdir')
+    bb.build.exec_func('base_do_unpack', d)
+    # temorarily change SRC_URI for unpack
+    src_uri = d.getVar('SRC_URI')
+    d.setVar('SRC_URI', '${LOCALSRC}')
+    d.setVar('S', s)
+    bb.build.exec_func('base_do_unpack', d)
+    d.setVar('SRC_URI', src_uri)
 }
 
-addtask unpack2 after do_unpack before do_patch
 
 do_install_append () {
 	mv ${D}/${sbindir}/lms ${D}/${sbindir}/lms7
-- 
cgit v1.2.3-54-g00ecf