diff options
author | Lei Maohui <leimaohui@cn.fujitsu.com> | 2015-08-18 09:52:29 +0800 |
---|---|---|
committer | Bruce Ashfield <bruce.ashfield@windriver.com> | 2015-08-18 13:11:05 -0400 |
commit | fdf50abfa807705b285fdc5454ecfc881b19d4ff (patch) | |
tree | e29374e497f671f8eacc57c69cb5269e9a0b2e15 | |
parent | 96820c94622f5f6ca495a0a642ae8e428b025819 (diff) | |
download | meta-cloud-services-fdf50abfa807705b285fdc5454ecfc881b19d4ff.tar.gz |
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>
-rw-r--r-- | meta-openstack/recipes-connectivity/open-iscsi/files/0001-fix-build-error-of-cross-build.patch | 30 | ||||
-rw-r--r-- | meta-openstack/recipes-connectivity/open-iscsi/files/user.patch | 11 | ||||
-rw-r--r-- | meta-openstack/recipes-connectivity/open-iscsi/open-iscsi-user_2.0-873.bb (renamed from meta-openstack/recipes-connectivity/open-iscsi/open-iscsi-user_2.0-871.bb) | 8 |
3 files changed, 34 insertions, 15 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 @@ | |||
1 | From 943a321104a5b2c4ac25bdb2ae81b5b208e3973c Mon Sep 17 00:00:00 2001 | ||
2 | From: Lei Maohui <leimaohui@cn.fujitsu.com> | ||
3 | Date: Tue, 18 Aug 2015 10:29:35 +0900 | ||
4 | Subject: [PATCH] fix build error of cross build | ||
5 | |||
6 | The error likes as following | ||
7 | | configure: error: cannot run C compiled programs. | ||
8 | | If you meant to cross compile, use `--host'. | ||
9 | |||
10 | Signed-off-by: Lei Maohui <leimaohui@cn.fujitsu.com> | ||
11 | --- | ||
12 | Makefile | 2 +- | ||
13 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
14 | |||
15 | diff --git a/Makefile b/Makefile | ||
16 | index c5d9700..1f31e43 100644 | ||
17 | --- a/Makefile | ||
18 | +++ b/Makefile | ||
19 | @@ -42,7 +42,7 @@ user: utils/open-isns/Makefile | ||
20 | @echo "Read README file for detailed information." | ||
21 | |||
22 | utils/open-isns/Makefile: utils/open-isns/configure utils/open-isns/Makefile.in | ||
23 | - cd utils/open-isns; ./configure CFLAGS="$(OPTFLAGS)" --with-security=no | ||
24 | + cd utils/open-isns; ./configure CFLAGS="$(OPTFLAGS)" --with-security=no ${CONFIGURE_ARGS} | ||
25 | |||
26 | kernel: force | ||
27 | $(MAKE) -C kernel | ||
28 | -- | ||
29 | 1.8.4.2 | ||
30 | |||
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 @@ | |||
1 | diff -Nurd a/usr/iscsi_sysfs.c b/usr/iscsi_sysfs.c | ||
2 | --- a/usr/iscsi_sysfs.c 2012-08-06 12:32:21.098233792 +0200 | ||
3 | +++ b/usr/iscsi_sysfs.c 2012-08-06 12:33:09.534233952 +0200 | ||
4 | @@ -22,6 +22,7 @@ | ||
5 | #include <string.h> | ||
6 | #include <errno.h> | ||
7 | #include <dirent.h> | ||
8 | +#include <sys/stat.h> | ||
9 | |||
10 | #include "log.h" | ||
11 | #include "initiator.h" | ||
diff --git a/meta-openstack/recipes-connectivity/open-iscsi/open-iscsi-user_2.0-871.bb b/meta-openstack/recipes-connectivity/open-iscsi/open-iscsi-user_2.0-873.bb index 5b3a257..4c9326e 100644 --- a/meta-openstack/recipes-connectivity/open-iscsi/open-iscsi-user_2.0-871.bb +++ b/meta-openstack/recipes-connectivity/open-iscsi/open-iscsi-user_2.0-873.bb | |||
@@ -8,7 +8,7 @@ inherit systemd | |||
8 | LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833" | 8 | LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833" |
9 | 9 | ||
10 | SRC_URI = "http://www.open-iscsi.org/bits/open-iscsi-${PV}.tar.gz \ | 10 | SRC_URI = "http://www.open-iscsi.org/bits/open-iscsi-${PV}.tar.gz \ |
11 | file://user.patch \ | 11 | file://0001-fix-build-error-of-cross-build.patch \ |
12 | file://open-iscsi \ | 12 | file://open-iscsi \ |
13 | file://initiatorname.iscsi \ | 13 | file://initiatorname.iscsi \ |
14 | " | 14 | " |
@@ -16,7 +16,7 @@ SRC_URI = "http://www.open-iscsi.org/bits/open-iscsi-${PV}.tar.gz \ | |||
16 | 16 | ||
17 | S = "${WORKDIR}/open-iscsi-${PV}" | 17 | S = "${WORKDIR}/open-iscsi-${PV}" |
18 | TARGET_CC_ARCH += "${LDFLAGS}" | 18 | TARGET_CC_ARCH += "${LDFLAGS}" |
19 | 19 | EXTRA_OEMAKE += "CONFIGURE_ARGS='--host=${HOST_SYS}'" | |
20 | 20 | ||
21 | do_compile () { | 21 | do_compile () { |
22 | oe_runmake user | 22 | oe_runmake user |
@@ -29,8 +29,8 @@ do_install () { | |||
29 | } | 29 | } |
30 | 30 | ||
31 | 31 | ||
32 | SRC_URI[md5sum] = "0c403e8c9ad41607571ba0e6e8ff196e" | 32 | SRC_URI[md5sum] = "8b8316d7c9469149a6cc6234478347f7" |
33 | SRC_URI[sha256sum] = "bcea8746ae82f2ada7bc05d2aa59bcda1ca0d5197f05f2e16744aae59f0a7dcb" | 33 | SRC_URI[sha256sum] = "7dd9f2f97da417560349a8da44ea4fcfe98bfd5ef284240a2cc4ff8e88ac7cd9" |
34 | 34 | ||
35 | # systemd support | 35 | # systemd support |
36 | PACKAGES =+ "${PN}-systemd" | 36 | PACKAGES =+ "${PN}-systemd" |