From: Ting Liu <b28495@freescale.com>
Date: Sun, 7 Apr 2013 07:39:52 +0000 (+0000)
Subject: lio-utils: remove v4.0 as v4.1 has been added in meta-oe
X-Git-Tag: 2.1~534^2~291
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=9e9c8b08b3f41831abd9138a36be963ca85dfbb7;p=meta-freescale.git

lio-utils: remove v4.0 as v4.1 has been added in meta-oe

Signed-off-by: Ting Liu <b28495@freescale.com>
Acked-by: Otavio Salvador <otavio@ossystems.com.br>
---

diff --git a/meta-fsl-ppc/recipes-tools/lio-utils/files/lio-utils-install-more-modules.patch b/meta-fsl-ppc/recipes-tools/lio-utils/files/lio-utils-install-more-modules.patch
deleted file mode 100644
index 7f9b02dd..00000000
--- a/meta-fsl-ppc/recipes-tools/lio-utils/files/lio-utils-install-more-modules.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Upstream-Status: Pending
-
-install tcm_snap module
-
-Signed-off-by: Zhenhua Luo <b19537@freescale.com>
---- a/tcm-py/setup.py	2012-09-27 04:21:14.984705400 -0500
-+++ b/tcm-py/setup.py	2012-09-27 04:20:18.387604661 -0500
-@@ -12,6 +12,6 @@
-       author_email='nab@linux-iscsi.org',
-       url='http://linux-iscsi.org',
-       license='GPL',
--      py_modules=['tcm_dump', 'tcm_fileio','tcm_iblock','tcm_node','tcm_pscsi','tcm_ramdisk','tcm_loop','tcm_fabric']
-+      py_modules=['tcm_dump', 'tcm_fileio','tcm_iblock','tcm_node','tcm_pscsi','tcm_ramdisk','tcm_loop','tcm_fabric', 'tcm_snap']
- )
- 
diff --git a/meta-fsl-ppc/recipes-tools/lio-utils/lio-utils_4.0.bb b/meta-fsl-ppc/recipes-tools/lio-utils/lio-utils_4.0.bb
deleted file mode 100644
index 98101b3b..00000000
--- a/meta-fsl-ppc/recipes-tools/lio-utils/lio-utils_4.0.bb
+++ /dev/null
@@ -1,61 +0,0 @@
-SUMMARY = "lio-utils"
-DESCRIPTION = "a simple low-level configuration tool set for the Target+iSCSI (LIO)"
-HOMEPAGE = "http://linux-iscsi.org/index.php/Lio-utils"
-LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://debian/copyright;md5=c3ea231a32635cbb5debedf3e88aa3df"
-
-PR = "r2"
-
-SRC_URI = "git://risingtidesystems.com/lio-utils.git;protocal=git \
-    file://lio-utils-install-more-modules.patch "
-SRCREV = "300d9df5e5fa29d7168fb8f0c84a4d9d57436fad"
-S = "${WORKDIR}/git"
-
-inherit distutils
-
-EXTRA_OEMAKE += "-C ${S}/tools PREFIX=${prefix} DESTDIR=${D}"
-
-# pass LDFLAGS to linker to avoid missing GNU_HASH QA errors
-TARGET_CC_ARCH += "${LDFLAGS}"
-do_compile() {
-    cd ${S}/tcm-py
-    distutils_do_compile
-
-    cd ${S}/lio-py
-    distutils_do_compile
-
-    if test -d ${S}/tools; then
-        oe_runmake
-    fi
-}
-
-do_install() {
-    cd ${S}/tcm-py
-    distutils_do_install
-        
-    cd ${S}/lio-py
-    distutils_do_install
-    
-    SITE_PACKAGES=${D}/${PYTHON_SITEPACKAGES_DIR}
-    [ ! -d ${D}/${sbindir} ] && install -d ${D}/${sbindir}
-    for var in tcm_node tcm_dump tcm_loop tcm_fabric lio_dump lio_node; do
-        chmod a+x ${SITE_PACKAGES}/${var}.py
-        [ ! -f ${D}/${sbindir}/${var} ] && ln -s ${PYTHON_SITEPACKAGES_DIR}/${var}.py ${D}/${sbindir}/${var}
-    done
-
-    if test -d ${S}/tools; then
-        oe_runmake install
-    fi
- 
-    install -d ${D}/etc/target/
-    install -d ${D}/etc/init.d/
-    install -m 755 ${S}/scripts/rc.target ${D}/etc/init.d/
-    install -m 755 ${S}/conf/tcm_start.default ${D}/etc/target/tcm_start.sh
-    install -m 755 ${S}/conf/lio_start.default ${D}/etc/target/lio_start.sh
-}
-
-RDEPENDS_${PN} += "python-stringold python-subprocess python-shell \ 
-    python-datetime python-textutils python-crypt python-netclient python-email"
-
-
-FILES_${PN} += "${sbindir}/* /etc/init.d/* /etc/target/*"