From 77d17425b50997b0b356bcfc811a87472e5f4c47 Mon Sep 17 00:00:00 2001 From: Li xin Date: Fri, 7 Aug 2015 14:55:07 +0800 Subject: netcf: upgrade 0.2.3 -> 0.2.8 add systemd support for netcf Signed-off-by: Li Xin Signed-off-by: Joe MacDonald --- meta-networking/recipes-support/netcf/netcf_git.bb | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) (limited to 'meta-networking/recipes-support/netcf') diff --git a/meta-networking/recipes-support/netcf/netcf_git.bb b/meta-networking/recipes-support/netcf/netcf_git.bb index 0e88b304aa..d47bb3b03b 100644 --- a/meta-networking/recipes-support/netcf/netcf_git.bb +++ b/meta-networking/recipes-support/netcf/netcf_git.bb @@ -6,8 +6,8 @@ LICENSE = "LGPLv2.1" LIC_FILES_CHKSUM = "file://COPYING;md5=bbb461211a33b134d42ed5ee802b37ff" -SRCREV = "b8a19dc860b38c97c42115d8a559b78853452a4b" -PV = "0.2.3+git${SRCPV}" +SRCREV = "9158278ad35b46ce9a49b2e887483c6d8c287994" +PV = "0.2.8+git${SRCPV}" SRC_URI = "git://git.fedorahosted.org/netcf.git;protocol=git \ " @@ -16,9 +16,13 @@ DEPENDS += "augeas libnl libxslt libxml2 gnulib" S = "${WORKDIR}/git" -inherit gettext autotools-brokensep pkgconfig +inherit gettext autotools-brokensep pkgconfig systemd EXTRA_OECONF_append_class-target = " --with-driver=redhat" + +PACKAGECONFIG ??= "${@bb.utils.contains("DISTRO_FEATURES", "systemd", "systemd", "", d)}" +PACKAGECONFIG[systemd] = "--with-sysinit=systemd,--with-sysinit=initscripts," + do_configure_prepend() { cd ${S} rm -f .gitmodules @@ -26,6 +30,14 @@ do_configure_prepend() { } do_install_append() { - mv ${D}${sysconfdir}/rc.d/init.d/ ${D}${sysconfdir} - rm -rf ${D}${sysconfdir}/rc.d/ + if ${@base_contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then + install -d ${D}${systemd_unitdir}/system + mv ${D}${libdir}/systemd/system/* ${D}${systemd_unitdir}/system/ + rm -rf ${D}${libdir}/systemd/ + else + mv ${D}${sysconfdir}/rc.d/init.d/ ${D}${sysconfdir} + rm -rf ${D}${sysconfdir}/rc.d/ + fi } + +SYSTEMD_SERVICE_${PN} = "netcf-transaction.service" -- cgit 1.2.3-korg