lms7: reorganize the lms recipe

Preparations for upcoming lms8 recipe. Rename the lms recipe as lms7.
This will allow BSPs to choose either lms7 or lms8 package to suite
the version 7 or 8 firmware available on the board.

Also the lms binary & script is renamed to lms7 to avoid runtime clash
with lms8 packages.

Simplified the dounpack2 function.

And this build time warning is muted:

WARNING: lms7: No generic license file exists for: Modified in any
provider

Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>

lms7 : tail conexist

Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>

4 files changed, 41 insertions, 16 deletions

diff --git a/common/custom-licenses/BSD_LMS b/common/custom-licenses/BSD_LMS
new file mode 100755
index 00000000..2ea28ff4
--- /dev/null
+++ b/common/custom-licenses/BSD_LMS
@@ -0,0 +1,30 @@
+Copyright (C) 2004-2012 Intel Corporation. All rights reserved.
+
+•       This license covers the sources of the Local Manageability Service (LMS). 
+For licensing information for the LMS build scripts, please refer to the file build_script_license.txt.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+  - Redistributions of source code must retain the above copyright notice,
+    this list of conditions and the following disclaimer.
+
+  - Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+  - Neither the name of Intel Corporation. nor the names of its
+    contributors may be used to endorse or promote products derived from this
+    software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS IS''
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL Intel Corporation. OR THE CONTRIBUTORS
+BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
diff --git a/common/recipes-bsp/amt/lms/atnetworktool-printf-fix.patch b/common/recipes-bsp/amt/files/atnetworktool-printf-fix.patch
index 6bb03e3a..6bb03e3a 100644
--- a/common/recipes-bsp/amt/lms/atnetworktool-printf-fix.patch
+++ b/common/recipes-bsp/amt/files/atnetworktool-printf-fix.patch
diff --git a/common/recipes-bsp/amt/lms/readlink-declaration.patch b/common/recipes-bsp/amt/files/readlink-declaration.patch
index 0246d501..0246d501 100644
--- a/common/recipes-bsp/amt/lms/readlink-declaration.patch
+++ b/common/recipes-bsp/amt/files/readlink-declaration.patch
diff --git a/common/recipes-bsp/amt/lms_7.1.20.bb b/common/recipes-bsp/amt/lms7_7.1.20.bb
index 1a901f7b..2c6a29e1 100644
--- a/common/recipes-bsp/amt/lms_7.1.20.bb
+++ b/common/recipes-bsp/amt/lms7_7.1.20.bb
@@ -3,10 +3,12 @@ to access the Intel Active Management Technology (AMT) firmware via \
 the Intel Management Engine Interface (MEI)."
 HOMEPAGE = "http://software.intel.com/en-us/articles/download-the-latest-intel-amt-open-source-drivers"
 
-LICENSE = "Modified BSD"
+LICENSE = "BSD_LMS"
 
 PR = "r0"
-SRC_URI = "http://software.intel.com/file/37962 \
+BPN="lms"
+PV_SUB = "25"
+SRC_URI = "http://software.intel.com/file/37962;downloadfilename=${BPN}+${PV}.${PV_SUB}.zip \
            file://atnetworktool-printf-fix.patch \
            file://readlink-declaration.patch"
 
@@ -19,27 +21,20 @@ SRC_URI[sha256sum] = "cc0457f0044e924794bb1aeae9a72c28666a525cd8a963d0d929702229
 
 inherit autotools update-rc.d
 
-INITSCRIPT_NAME = "lms"
+INITSCRIPT_NAME = "lms7"
 INITSCRIPT_PARAMS = "defaults"
 
-PV_SUB = "25"
-
 do_unpack2() {
-        # The downloaded 37962 filename is actually lms+7.1.20.25.zip.
-        # It contains lms-7.1.20-25.tar.gz.
-        # It contains lms-7.1.20-25.tar.gz untars to lms-7.1.20
-        if [ -e "${WORKDIR}/37962" ]; then
-                mv ${WORKDIR}/37962 ${WORKDIR}/${PN}+${PV}.${PV_SUB}.zip
-                unzip -o ${WORKDIR}/${PN}+${PV}.${PV_SUB}.zip
-                mv ${WORKDIR}/${PN}-${PV}/outputdir/${PN}-${PV}-${PV_SUB}.tar.gz ${WORKDIR}/
-                cd ${WORKDIR}
-                tar -xvzf ${PN}-${PV}-${PV_SUB}.tar.gz
-        fi
+        cd ${WORKDIR}
+        tar -xvzf ${WORKDIR}/outputdir/lms-${PV}-${PV_SUB}.tar.gz
 }
 
 addtask unpack2 after do_unpack before do_patch
 
 do_install_append () {
+        mv ${D}/${sbindir}/lms ${D}/${sbindir}/lms7
         install -d ${D}${sysconfdir}/init.d
-        install -m 0755 ${WORKDIR}/${PN}-${PV}/scripts/lms ${D}${sysconfdir}/init.d/${INITSCRIPT_NAME}
+        mv ${D}${sysconfdir}/rc.d/init.d/lms ${D}${sysconfdir}/init.d/${INITSCRIPT_NAME}
+        sed -i 's/^NAME=lms/NAME=lms7/' ${D}${sysconfdir}/init.d/${INITSCRIPT_NAME}
+        rmdir ${D}${datadir} || :
 }