From aa4bed65e489fcf2eba5d86acba833b9a93aac6a Mon Sep 17 00:00:00 2001 From: Jackie Huang Date: Thu, 9 Nov 2017 19:04:50 +0800 Subject: open-isns: add sysvinit support It's not mandatory to depend on systemd for open-isns, the sysvinit script is also provided in open-isns source code, so add it to support sysvinit and remove the distro_features_check. Signed-off-by: Jackie Huang Signed-off-by: Armin Kuster Signed-off-by: Joe MacDonald --- meta-networking/recipes-support/open-isns/open-isns_0.97.bb | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/meta-networking/recipes-support/open-isns/open-isns_0.97.bb b/meta-networking/recipes-support/open-isns/open-isns_0.97.bb index cc2959e2b5..abfa7510e5 100644 --- a/meta-networking/recipes-support/open-isns/open-isns_0.97.bb +++ b/meta-networking/recipes-support/open-isns/open-isns_0.97.bb @@ -11,7 +11,7 @@ LICENSE = "GPLv2+ & LGPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=321bf41f280cf805086dd5a720b37785" SECTION = "net" -DEPENDS = "openssl systemd" +DEPENDS = "openssl" SRC_URI = "git://github.com/open-iscsi/open-isns \ file://0001-util.h-endian.h-is-available-on-musl-on-linux.patch \ @@ -21,9 +21,7 @@ SRCREV ?= "09954404e948e41eb0fce8e28836018b4ce3d20d" S = "${WORKDIR}/git" -inherit systemd autotools-brokensep distro_features_check -# depends on systemd -REQUIRED_DISTRO_FEATURES = "systemd" +inherit systemd autotools-brokensep update-rc.d EXTRA_OECONF = " --prefix=${prefix} --enable-shared" EXTRA_OEMAKE += "SYSTEMDDIR=${D}${systemd_unitdir}/system" @@ -31,6 +29,12 @@ 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