From fdf50abfa807705b285fdc5454ecfc881b19d4ff Mon Sep 17 00:00:00 2001 From: Lei Maohui Date: Tue, 18 Aug 2015 09:52:29 +0800 Subject: 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 Signed-off-by: Bruce Ashfield --- .../0001-fix-build-error-of-cross-build.patch | 30 ++++++++++++ .../open-iscsi/files/user.patch | 11 ----- .../open-iscsi/open-iscsi-user_2.0-871.bb | 55 ---------------------- .../open-iscsi/open-iscsi-user_2.0-873.bb | 55 ++++++++++++++++++++++ 4 files changed, 85 insertions(+), 66 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 delete mode 100644 meta-openstack/recipes-connectivity/open-iscsi/open-iscsi-user_2.0-871.bb create mode 100644 meta-openstack/recipes-connectivity/open-iscsi/open-iscsi-user_2.0-873.bb (limited to 'meta-openstack') 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 +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 +--- + 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 - #include - #include -+#include - - #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-871.bb deleted file mode 100644 index 5b3a257..0000000 --- a/meta-openstack/recipes-connectivity/open-iscsi/open-iscsi-user_2.0-871.bb +++ /dev/null @@ -1,55 +0,0 @@ -DESCRIPTION = "Open-iSCSI project is a high performance, transport independent, multi-platform implementation of RFC3720." -HOMEPAGE = "http://www.open-iscsi.org/" -LICENSE = "GPLv2" -PR = "r1" - -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://open-iscsi \ - file://initiatorname.iscsi \ - " - - -S = "${WORKDIR}/open-iscsi-${PV}" -TARGET_CC_ARCH += "${LDFLAGS}" - - -do_compile () { - oe_runmake user -} - -do_install () { - oe_runmake DESTDIR="${D}" install_user - cp -f "${WORKDIR}/open-iscsi" "${D}/etc/init.d/" - install -m 0644 ${WORKDIR}/initiatorname.iscsi ${D}/etc/iscsi/initiatorname.iscsi -} - - -SRC_URI[md5sum] = "0c403e8c9ad41607571ba0e6e8ff196e" -SRC_URI[sha256sum] = "bcea8746ae82f2ada7bc05d2aa59bcda1ca0d5197f05f2e16744aae59f0a7dcb" - -# systemd support -PACKAGES =+ "${PN}-systemd" -SRC_URI_append = " file://iscsi-initiator \ - file://iscsi-initiator.service \ - file://iscsi-initiator-targets.service \ - " -RDEPENDS_${PN} += "bash" -RDEPENDS_${PN}-systemd += "${PN}" -FILES_${PN}-systemd += " ${base_libdir}/systemd \ - ${sysconfdir}/default/iscsi-initiator \ - " -SYSTEMD_PACKAGES = "${PN}-systemd" -SYSTEMD_SERVICE_${PN}-systemd = "iscsi-initiator.service iscsi-initiator-targets.service" - -do_install_append () { - install -d ${D}${sysconfdir}/default/ - install -m 0644 ${WORKDIR}/iscsi-initiator ${D}${sysconfdir}/default/ - install -d ${D}${systemd_unitdir}/system - install -m 0644 ${WORKDIR}/iscsi-initiator.service ${D}${systemd_unitdir}/system/ - install -m 0644 ${WORKDIR}/iscsi-initiator-targets.service ${D}${systemd_unitdir}/system/ -} diff --git a/meta-openstack/recipes-connectivity/open-iscsi/open-iscsi-user_2.0-873.bb b/meta-openstack/recipes-connectivity/open-iscsi/open-iscsi-user_2.0-873.bb new file mode 100644 index 0000000..4c9326e --- /dev/null +++ b/meta-openstack/recipes-connectivity/open-iscsi/open-iscsi-user_2.0-873.bb @@ -0,0 +1,55 @@ +DESCRIPTION = "Open-iSCSI project is a high performance, transport independent, multi-platform implementation of RFC3720." +HOMEPAGE = "http://www.open-iscsi.org/" +LICENSE = "GPLv2" +PR = "r1" + +inherit systemd + +LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833" + +SRC_URI = "http://www.open-iscsi.org/bits/open-iscsi-${PV}.tar.gz \ + file://0001-fix-build-error-of-cross-build.patch \ + file://open-iscsi \ + file://initiatorname.iscsi \ + " + + +S = "${WORKDIR}/open-iscsi-${PV}" +TARGET_CC_ARCH += "${LDFLAGS}" +EXTRA_OEMAKE += "CONFIGURE_ARGS='--host=${HOST_SYS}'" + +do_compile () { + oe_runmake user +} + +do_install () { + oe_runmake DESTDIR="${D}" install_user + cp -f "${WORKDIR}/open-iscsi" "${D}/etc/init.d/" + install -m 0644 ${WORKDIR}/initiatorname.iscsi ${D}/etc/iscsi/initiatorname.iscsi +} + + +SRC_URI[md5sum] = "8b8316d7c9469149a6cc6234478347f7" +SRC_URI[sha256sum] = "7dd9f2f97da417560349a8da44ea4fcfe98bfd5ef284240a2cc4ff8e88ac7cd9" + +# systemd support +PACKAGES =+ "${PN}-systemd" +SRC_URI_append = " file://iscsi-initiator \ + file://iscsi-initiator.service \ + file://iscsi-initiator-targets.service \ + " +RDEPENDS_${PN} += "bash" +RDEPENDS_${PN}-systemd += "${PN}" +FILES_${PN}-systemd += " ${base_libdir}/systemd \ + ${sysconfdir}/default/iscsi-initiator \ + " +SYSTEMD_PACKAGES = "${PN}-systemd" +SYSTEMD_SERVICE_${PN}-systemd = "iscsi-initiator.service iscsi-initiator-targets.service" + +do_install_append () { + install -d ${D}${sysconfdir}/default/ + install -m 0644 ${WORKDIR}/iscsi-initiator ${D}${sysconfdir}/default/ + install -d ${D}${systemd_unitdir}/system + install -m 0644 ${WORKDIR}/iscsi-initiator.service ${D}${systemd_unitdir}/system/ + install -m 0644 ${WORKDIR}/iscsi-initiator-targets.service ${D}${systemd_unitdir}/system/ +} -- cgit v1.2.3-54-g00ecf