From b4a41340e4bfb1a996ee54b9f513ba3c34de72be Mon Sep 17 00:00:00 2001 From: Oleksandr Kravchuk Date: Sun, 7 Apr 2019 16:49:31 +0200 Subject: open-isns: update to 0.99 Removed patch has been upstreammed. Signed-off-by: Oleksandr Kravchuk Signed-off-by: Khem Raj --- ....h-endian.h-is-available-on-musl-on-linux.patch | 38 -------------------- .../recipes-support/open-isns/open-isns_0.98.bb | 40 ---------------------- .../recipes-support/open-isns/open-isns_0.99.bb | 38 ++++++++++++++++++++ 3 files changed, 38 insertions(+), 78 deletions(-) delete mode 100644 meta-networking/recipes-support/open-isns/open-isns/0001-util.h-endian.h-is-available-on-musl-on-linux.patch delete mode 100644 meta-networking/recipes-support/open-isns/open-isns_0.98.bb create mode 100644 meta-networking/recipes-support/open-isns/open-isns_0.99.bb (limited to 'meta-networking') diff --git a/meta-networking/recipes-support/open-isns/open-isns/0001-util.h-endian.h-is-available-on-musl-on-linux.patch b/meta-networking/recipes-support/open-isns/open-isns/0001-util.h-endian.h-is-available-on-musl-on-linux.patch deleted file mode 100644 index fbdc4e9113..0000000000 --- a/meta-networking/recipes-support/open-isns/open-isns/0001-util.h-endian.h-is-available-on-musl-on-linux.patch +++ /dev/null @@ -1,38 +0,0 @@ -From e0d86318227a23f00cf0f6639a6685bb9f5771a1 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Tue, 12 Dec 2017 09:42:19 -0800 -Subject: [PATCH] util.h: endian.h is available on musl on linux - -just checking for glibc alone is not enough since -it excludes musl, therefore check for platform -being linux as well - -Fixes build issues - -include/libisns/util.h:114:12: fatal error: sys/endian.h: No such file or directory - # include - ^~~~~~~~~~~~~~ - -Upstream-Status: Submitted - -Signed-off-by: Khem Raj ---- - include/libisns/util.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/include/libisns/util.h b/include/libisns/util.h -index 9a2bd13..6cc1a1b 100644 ---- a/include/libisns/util.h -+++ b/include/libisns/util.h -@@ -100,7 +100,7 @@ enum { - * There's no htonll yet - */ - #ifndef htonll --# ifdef __GLIBC__ -+# if defined(__GLIBC__) || defined(__linux__) - # include - # include - # if __BYTE_ORDER == __BIG_ENDIAN --- -2.15.1 - diff --git a/meta-networking/recipes-support/open-isns/open-isns_0.98.bb b/meta-networking/recipes-support/open-isns/open-isns_0.98.bb deleted file mode 100644 index 5e64f893e0..0000000000 --- a/meta-networking/recipes-support/open-isns/open-isns_0.98.bb +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright (C) 2016 Joe MacDonald -# Released under the MIT license (see COPYING.MIT for the terms) - -SUMMARY = "iSNS daemon and utility programs" -DESCRIPTION = "This is a partial implementation of RFC4171, the Internet \ -Storage Name Service (iSNS). The distribution includes the iSNS server, \ -supporting persisten storage of registrations, isnsadm, a command line \ -utility for managing nodes, and isnsdd, a corresponding discovery daemon." -HOMEPAGE = "http://github.com/gonzoleeman/open-isns/" -LICENSE = "GPLv2+ & LGPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=321bf41f280cf805086dd5a720b37785" -SECTION = "net" - -DEPENDS = "openssl" - -SRC_URI = "git://github.com/open-iscsi/open-isns \ - file://0001-util.h-endian.h-is-available-on-musl-on-linux.patch \ - " - -SRCREV = "e84374ce7d1f5fc58a4c0fc751e075b2cc752c34" - -S = "${WORKDIR}/git" - -inherit systemd autotools-brokensep update-rc.d - -EXTRA_OECONF = " --prefix=${prefix} --enable-shared" -EXTRA_OEMAKE += "SYSTEMDDIR=${D}${systemd_unitdir}/system" - -do_install_append () { - oe_runmake INCDIR=${D}${includedir}/libisns/ install_hdrs - oe_runmake LIBDIR=${D}${libdir} install_lib - - install -D -m 755 ${S}/etc/openisns.init ${D}${sysconfdir}/init.d/openisns - sed -i 's|daemon isnsd|start-stop-daemon --start --quiet --oknodo --exec ${sbindir}/isnsd --|' \ - ${D}${sysconfdir}/init.d/openisns -} - -FILES_${PN} += "${libdir} ${systemd_unitdir}" - -INITSCRIPT_NAME = "openisns" diff --git a/meta-networking/recipes-support/open-isns/open-isns_0.99.bb b/meta-networking/recipes-support/open-isns/open-isns_0.99.bb new file mode 100644 index 0000000000..a03b92f5fe --- /dev/null +++ b/meta-networking/recipes-support/open-isns/open-isns_0.99.bb @@ -0,0 +1,38 @@ +# Copyright (C) 2016 Joe MacDonald +# Released under the MIT license (see COPYING.MIT for the terms) + +SUMMARY = "iSNS daemon and utility programs" +DESCRIPTION = "This is a partial implementation of RFC4171, the Internet \ +Storage Name Service (iSNS). The distribution includes the iSNS server, \ +supporting persisten storage of registrations, isnsadm, a command line \ +utility for managing nodes, and isnsdd, a corresponding discovery daemon." +HOMEPAGE = "http://github.com/gonzoleeman/open-isns/" +LICENSE = "GPLv2+ & LGPLv2+" +LIC_FILES_CHKSUM = "file://COPYING;md5=321bf41f280cf805086dd5a720b37785" +SECTION = "net" + +DEPENDS = "openssl" + +SRC_URI = "git://github.com/open-iscsi/open-isns" + +SRCREV = "cfdbcff867ee580a71bc9c18c3a38a6057df0150" + +S = "${WORKDIR}/git" + +inherit systemd autotools-brokensep update-rc.d + +EXTRA_OECONF = " --prefix=${prefix} --enable-shared" +EXTRA_OEMAKE += "SYSTEMDDIR=${D}${systemd_unitdir}/system" + +do_install_append () { + oe_runmake INCDIR=${D}${includedir}/libisns/ install_hdrs + oe_runmake LIBDIR=${D}${libdir} install_lib + + install -D -m 755 ${S}/etc/openisns.init ${D}${sysconfdir}/init.d/openisns + sed -i 's|daemon isnsd|start-stop-daemon --start --quiet --oknodo --exec ${sbindir}/isnsd --|' \ + ${D}${sysconfdir}/init.d/openisns +} + +FILES_${PN} += "${libdir} ${systemd_unitdir}" + +INITSCRIPT_NAME = "openisns" -- cgit v1.2.3-54-g00ecf