[meta-virtualization] [m-c-s][PATCH] open-iscsi-user: upgrade 2.0-871->2.0-873

[Bruce Ashfield]

On Mon, Aug 17, 2015 at 9:52 PM, Lei Maohui <leimaohui at cn.fujitsu.com> wrote:
> -deleted patch not used any more
> -add new patch for new version

merged.

Bruce

>
> Signed-off-by: Lei Maohui <leimaohui at cn.fujitsu.com>
> ---
>  .../0001-fix-build-error-of-cross-build.patch      | 30 ++++++++++++++++++++++
>  .../open-iscsi/files/user.patch                    | 11 --------
>  ...-user_2.0-871.bb => open-iscsi-user_2.0-873.bb} |  8 +++---
>  3 files changed, 34 insertions(+), 15 deletions(-)
>  create mode 100644 meta-openstack/recipes-connectivity/open-iscsi/files/0001-fix-build-error-of-cross-build.patch
>  delete mode 100644 meta-openstack/recipes-connectivity/open-iscsi/files/user.patch
>  rename meta-openstack/recipes-connectivity/open-iscsi/{open-iscsi-user_2.0-871.bb => open-iscsi-user_2.0-873.bb} (87%)
>
> 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 at 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 at 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"
> 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
> similarity index 87%
> rename from meta-openstack/recipes-connectivity/open-iscsi/open-iscsi-user_2.0-871.bb
> rename to 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
>  LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833"
>
>  SRC_URI = "http://www.open-iscsi.org/bits/open-iscsi-${PV}.tar.gz   \
> -           file://user.patch                                        \
> +           file://0001-fix-build-error-of-cross-build.patch         \
>             file://open-iscsi                                        \
>             file://initiatorname.iscsi                               \
>             "
> @@ -16,7 +16,7 @@ SRC_URI = "http://www.open-iscsi.org/bits/open-iscsi-${PV}.tar.gz   \
>
>  S = "${WORKDIR}/open-iscsi-${PV}"
>  TARGET_CC_ARCH += "${LDFLAGS}"
> -
> +EXTRA_OEMAKE += "CONFIGURE_ARGS='--host=${HOST_SYS}'"
>
>  do_compile () {
>          oe_runmake user
> @@ -29,8 +29,8 @@ do_install () {
>  }
>
>
> -SRC_URI[md5sum] = "0c403e8c9ad41607571ba0e6e8ff196e"
> -SRC_URI[sha256sum] = "bcea8746ae82f2ada7bc05d2aa59bcda1ca0d5197f05f2e16744aae59f0a7dcb"
> +SRC_URI[md5sum] = "8b8316d7c9469149a6cc6234478347f7"
> +SRC_URI[sha256sum] = "7dd9f2f97da417560349a8da44ea4fcfe98bfd5ef284240a2cc4ff8e88ac7cd9"
>
>  # systemd support
>  PACKAGES =+ "${PN}-systemd"
> --
> 1.8.4.2
>
> --
> _______________________________________________
> meta-virtualization mailing list
> meta-virtualization at yoctoproject.org
> https://lists.yoctoproject.org/listinfo/meta-virtualization



-- 
"Thou shalt not follow the NULL pointer, for chaos and madness await
thee at its end"