summaryrefslogtreecommitdiffstats
path: root/meta-networking
diff options
context:
space:
mode:
authorJoe MacDonald <joe_macdonald@mentor.com>2014-12-02 12:34:08 -0500
committerJoe MacDonald <joe_macdonald@mentor.com>2014-12-02 12:34:08 -0500
commitbb3cacccfbf692ffcfe8c3d5054821e8a771b6a3 (patch)
tree0c76ef34ad9eb50ae842d9635b93fc2fd4fbf3da /meta-networking
parentcdd5287912b956518e71efb925a07a62e3f5488e (diff)
downloadmeta-openembedded-bb3cacccfbf692ffcfe8c3d5054821e8a771b6a3.tar.gz
Revert "open-iscsi: add recipe"
This reverts commit 97cffc1f247be7eedd061a142d9c366b63f691ed. Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
Diffstat (limited to 'meta-networking')
-rw-r--r--meta-networking/recipes-daemons/open-iscsi/open-iscsi/iscsi_sysfs.c-add-include-files.patch26
-rw-r--r--meta-networking/recipes-daemons/open-iscsi/open-iscsi/open-iscsi.service18
-rw-r--r--meta-networking/recipes-daemons/open-iscsi/open-iscsi_2.0-871.bb34
3 files changed, 0 insertions, 78 deletions
diff --git a/meta-networking/recipes-daemons/open-iscsi/open-iscsi/iscsi_sysfs.c-add-include-files.patch b/meta-networking/recipes-daemons/open-iscsi/open-iscsi/iscsi_sysfs.c-add-include-files.patch
deleted file mode 100644
index ba78e8e5a..000000000
--- a/meta-networking/recipes-daemons/open-iscsi/open-iscsi/iscsi_sysfs.c-add-include-files.patch
+++ /dev/null
@@ -1,26 +0,0 @@
1From e8ecb307b6402b39d033e20f4df4f3374e7c0685 Mon Sep 17 00:00:00 2001
2From: Li xin <lixin.fnst@cn.fujitsu.com>
3Date: Fri, 21 Nov 2014 12:02:51 +0900
4Subject: [PATCH] usr/iscsi_sysfs.c : add include files
5
6Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com>
7---
8 usr/iscsi_sysfs.c | 2 ++
9 1 file changed, 2 insertions(+)
10
11diff --git a/usr/iscsi_sysfs.c b/usr/iscsi_sysfs.c
12index cb9a5a1..f6bd78a 100644
13--- a/usr/iscsi_sysfs.c
14+++ b/usr/iscsi_sysfs.c
15@@ -14,6 +14,8 @@
16 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
17 * General Public License for more details.
18 */
19+#include <sys/types.h>
20+#include <sys/stat.h>
21 #include <fcntl.h>
22 #include <unistd.h>
23 #include <stdlib.h>
24--
251.8.4.2
26
diff --git a/meta-networking/recipes-daemons/open-iscsi/open-iscsi/open-iscsi.service b/meta-networking/recipes-daemons/open-iscsi/open-iscsi/open-iscsi.service
deleted file mode 100644
index debb2d69f..000000000
--- a/meta-networking/recipes-daemons/open-iscsi/open-iscsi/open-iscsi.service
+++ /dev/null
@@ -1,18 +0,0 @@
1[Unit]
2Description=Open-iSCSI
3Documentation=man:iscsid(8) man:iscsiadm(8)
4After=network.target
5
6[Service]
7Type=forking
8PIDFile=/var/run/iscsid.pid
9ExecStartPre=-/sbin/modprobe -q iscsi_tcp
10ExecStartPre=-/sbin/modprobe -q ib_iser
11ExecStart=/usr/sbin/iscsid -p /var/run/iscsid.pid
12ExecStartPost=-/usr/sbin/iscsiadm -m node --loginall=automatic
13ExecStopPost=/bin/sync
14ExecStopPost=-/sbin/modprobe -r ib_iser
15ExecStopPost=-/sbin/modprobe -r iscsi_tcp
16
17[Install]
18WantedBy=multi-user.target
diff --git a/meta-networking/recipes-daemons/open-iscsi/open-iscsi_2.0-871.bb b/meta-networking/recipes-daemons/open-iscsi/open-iscsi_2.0-871.bb
deleted file mode 100644
index 99f865706..000000000
--- a/meta-networking/recipes-daemons/open-iscsi/open-iscsi_2.0-871.bb
+++ /dev/null
@@ -1,34 +0,0 @@
1DESCRIPTION = "Open-iSCSI project is a high performance, transport \
2independent, multi-platform implementation of RFC3720."
3HOMEPAGE = "http://www.open-iscsi.org/"
4LICENSE = "GPL-2.0"
5LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833"
6
7SRC_URI = "http://www.open-iscsi.org/bits/${BP}.tar.gz"
8SRC_URI[md5sum] = "0c403e8c9ad41607571ba0e6e8ff196e"
9SRC_URI[sha256sum] = "bcea8746ae82f2ada7bc05d2aa59bcda1ca0d5197f05f2e16744aae59f0a7dcb"
10SRC_URI += "file://iscsi_sysfs.c-add-include-files.patch \
11 file://open-iscsi.service"
12
13TARGET_CC_ARCH += "${LDFLAGS}"
14
15do_compile () {
16 oe_runmake user
17}
18
19do_install_append () {
20 if ${@base_contains('DISTRO_FEATURES','systemd','true','false',d)}; then
21 install -d ${D}${systemd_unitdir}/system
22 install -m 0644 ${WORKDIR}/open-iscsi.service ${D}${systemd_unitdir}/system/
23 fi
24}
25
26do_install () {
27 oe_runmake DESTDIR="${D}" install_user
28}
29
30inherit ${@base_contains('VIRTUAL-RUNTIME_init_manager','systemd','systemd','',d)}
31
32SYSTEMD_PACKAGES = "${PN}"
33SYSTEMD_SERVICE_${PN} = "open-iscsi.service"
34SYSTEMD_AUTO_ENABLE = "enable"