open-iscsi-user: upgrade 2.0-871->2.0-873

-deleted patch not used any more
-add new patch for new version

Signed-off-by: Lei Maohui <leimaohui@cn.fujitsu.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>

2 files changed, 30 insertions, 11 deletions

diff --git a/meta-openstack/recipes-connectivity/open-iscsi/files/0001-fix-build-error-of-cross-build.patch b/meta-openstack/recipes-connectivity/open-iscsi/files/0001-fix-build-error-of-cross-build.patch
new file mode 100644
index 0000000..206da48
--- /dev/null
+++ b/meta-openstack/recipes-connectivity/open-iscsi/files/0001-fix-build-error-of-cross-build.patch
@@ -0,0 +1,30 @@
+From 943a321104a5b2c4ac25bdb2ae81b5b208e3973c Mon Sep 17 00:00:00 2001
+From: Lei Maohui <leimaohui@cn.fujitsu.com>
+Date: Tue, 18 Aug 2015 10:29:35 +0900
+Subject: [PATCH] fix build error of cross build
+
+The error likes as following
+| configure: error: cannot run C compiled programs.
+| If you meant to cross compile, use `--host'.
+
+Signed-off-by: Lei Maohui <leimaohui@cn.fujitsu.com>
+---
+ Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index c5d9700..1f31e43 100644
+--- a/Makefile
++++ b/Makefile
+@@ -42,7 +42,7 @@ user: utils/open-isns/Makefile
+        @echo "Read README file for detailed information."
+ 
+ utils/open-isns/Makefile: utils/open-isns/configure utils/open-isns/Makefile.in
+-       cd utils/open-isns; ./configure CFLAGS="$(OPTFLAGS)" --with-security=no
++       cd utils/open-isns; ./configure CFLAGS="$(OPTFLAGS)" --with-security=no ${CONFIGURE_ARGS}
+ 
+ kernel: force
+        $(MAKE) -C kernel
+-- 
+1.8.4.2
+
diff --git a/meta-openstack/recipes-connectivity/open-iscsi/files/user.patch b/meta-openstack/recipes-connectivity/open-iscsi/files/user.patch
deleted file mode 100644
index 767c508..0000000
--- a/meta-openstack/recipes-connectivity/open-iscsi/files/user.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Nurd a/usr/iscsi_sysfs.c b/usr/iscsi_sysfs.c
---- a/usr/iscsi_sysfs.c 2012-08-06 12:32:21.098233792 +0200
-+++ b/usr/iscsi_sysfs.c 2012-08-06 12:33:09.534233952 +0200
-@@ -22,6 +22,7 @@
- #include <string.h>
- #include <errno.h>
- #include <dirent.h>
-+#include <sys/stat.h>
- 
- #include "log.h"
- #include "initiator.h"