diff options
| author | Ting Liu <b28495@freescale.com> | 2013-04-07 07:39:52 +0000 |
|---|---|---|
| committer | Zhenhua Luo <zhenhua.luo@freescale.com> | 2013-04-09 11:37:32 +0800 |
| commit | 3312fd5ce9caced68eff577cd0e83ff1471b0612 (patch) | |
| tree | e782c6d03c7b4b96b151af5df237c87fd3676032 | |
| parent | 6e861617d3f61bcddcc944835f331e387e12db46 (diff) | |
| download | meta-fsl-ppc-3312fd5ce9caced68eff577cd0e83ff1471b0612.tar.gz | |
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>
| -rw-r--r-- | recipes-tools/lio-utils/files/lio-utils-install-more-modules.patch | 15 | ||||
| -rw-r--r-- | recipes-tools/lio-utils/lio-utils_4.0.bb | 61 |
2 files changed, 0 insertions, 76 deletions
diff --git a/recipes-tools/lio-utils/files/lio-utils-install-more-modules.patch b/recipes-tools/lio-utils/files/lio-utils-install-more-modules.patch deleted file mode 100644 index 7f9b02d..0000000 --- a/recipes-tools/lio-utils/files/lio-utils-install-more-modules.patch +++ /dev/null | |||
| @@ -1,15 +0,0 @@ | |||
| 1 | Upstream-Status: Pending | ||
| 2 | |||
| 3 | install tcm_snap module | ||
| 4 | |||
| 5 | Signed-off-by: Zhenhua Luo <b19537@freescale.com> | ||
| 6 | --- a/tcm-py/setup.py 2012-09-27 04:21:14.984705400 -0500 | ||
| 7 | +++ b/tcm-py/setup.py 2012-09-27 04:20:18.387604661 -0500 | ||
| 8 | @@ -12,6 +12,6 @@ | ||
| 9 | author_email='nab@linux-iscsi.org', | ||
| 10 | url='http://linux-iscsi.org', | ||
| 11 | license='GPL', | ||
| 12 | - py_modules=['tcm_dump', 'tcm_fileio','tcm_iblock','tcm_node','tcm_pscsi','tcm_ramdisk','tcm_loop','tcm_fabric'] | ||
| 13 | + py_modules=['tcm_dump', 'tcm_fileio','tcm_iblock','tcm_node','tcm_pscsi','tcm_ramdisk','tcm_loop','tcm_fabric', 'tcm_snap'] | ||
| 14 | ) | ||
| 15 | |||
diff --git a/recipes-tools/lio-utils/lio-utils_4.0.bb b/recipes-tools/lio-utils/lio-utils_4.0.bb deleted file mode 100644 index 98101b3..0000000 --- a/recipes-tools/lio-utils/lio-utils_4.0.bb +++ /dev/null | |||
| @@ -1,61 +0,0 @@ | |||
| 1 | SUMMARY = "lio-utils" | ||
| 2 | DESCRIPTION = "a simple low-level configuration tool set for the Target+iSCSI (LIO)" | ||
| 3 | HOMEPAGE = "http://linux-iscsi.org/index.php/Lio-utils" | ||
| 4 | LICENSE = "GPLv2" | ||
| 5 | LIC_FILES_CHKSUM = "file://debian/copyright;md5=c3ea231a32635cbb5debedf3e88aa3df" | ||
| 6 | |||
| 7 | PR = "r2" | ||
| 8 | |||
| 9 | SRC_URI = "git://risingtidesystems.com/lio-utils.git;protocal=git \ | ||
| 10 | file://lio-utils-install-more-modules.patch " | ||
| 11 | SRCREV = "300d9df5e5fa29d7168fb8f0c84a4d9d57436fad" | ||
| 12 | S = "${WORKDIR}/git" | ||
| 13 | |||
| 14 | inherit distutils | ||
| 15 | |||
| 16 | EXTRA_OEMAKE += "-C ${S}/tools PREFIX=${prefix} DESTDIR=${D}" | ||
| 17 | |||
| 18 | # pass LDFLAGS to linker to avoid missing GNU_HASH QA errors | ||
| 19 | TARGET_CC_ARCH += "${LDFLAGS}" | ||
| 20 | do_compile() { | ||
| 21 | cd ${S}/tcm-py | ||
| 22 | distutils_do_compile | ||
| 23 | |||
| 24 | cd ${S}/lio-py | ||
| 25 | distutils_do_compile | ||
| 26 | |||
| 27 | if test -d ${S}/tools; then | ||
| 28 | oe_runmake | ||
| 29 | fi | ||
| 30 | } | ||
| 31 | |||
| 32 | do_install() { | ||
| 33 | cd ${S}/tcm-py | ||
| 34 | distutils_do_install | ||
| 35 | |||
| 36 | cd ${S}/lio-py | ||
| 37 | distutils_do_install | ||
| 38 | |||
| 39 | SITE_PACKAGES=${D}/${PYTHON_SITEPACKAGES_DIR} | ||
| 40 | [ ! -d ${D}/${sbindir} ] && install -d ${D}/${sbindir} | ||
| 41 | for var in tcm_node tcm_dump tcm_loop tcm_fabric lio_dump lio_node; do | ||
| 42 | chmod a+x ${SITE_PACKAGES}/${var}.py | ||
| 43 | [ ! -f ${D}/${sbindir}/${var} ] && ln -s ${PYTHON_SITEPACKAGES_DIR}/${var}.py ${D}/${sbindir}/${var} | ||
| 44 | done | ||
| 45 | |||
| 46 | if test -d ${S}/tools; then | ||
| 47 | oe_runmake install | ||
| 48 | fi | ||
| 49 | |||
| 50 | install -d ${D}/etc/target/ | ||
| 51 | install -d ${D}/etc/init.d/ | ||
| 52 | install -m 755 ${S}/scripts/rc.target ${D}/etc/init.d/ | ||
| 53 | install -m 755 ${S}/conf/tcm_start.default ${D}/etc/target/tcm_start.sh | ||
| 54 | install -m 755 ${S}/conf/lio_start.default ${D}/etc/target/lio_start.sh | ||
| 55 | } | ||
| 56 | |||
| 57 | RDEPENDS_${PN} += "python-stringold python-subprocess python-shell \ | ||
| 58 | python-datetime python-textutils python-crypt python-netclient python-email" | ||
| 59 | |||
| 60 | |||
| 61 | FILES_${PN} += "${sbindir}/* /etc/init.d/* /etc/target/*" | ||
