From 010e7ae6aabd94f566b8df5f52623efb3f6dac8f Mon Sep 17 00:00:00 2001 From: "dengke.du@windriver.com" Date: Thu, 21 Sep 2017 12:00:00 +0200 Subject: opensaf: fix QA Issue Move the do_sysvinit_install contents to do_install_append. Signed-off-by: Dengke Du Signed-off-by: Martin Jansa Signed-off-by: Joe MacDonald Signed-off-by: Armin Kuster --- meta-networking/recipes-daemons/opensaf/opensaf_5.0.0.bb | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/meta-networking/recipes-daemons/opensaf/opensaf_5.0.0.bb b/meta-networking/recipes-daemons/opensaf/opensaf_5.0.0.bb index da9c105207..6ceb225e9d 100644 --- a/meta-networking/recipes-daemons/opensaf/opensaf_5.0.0.bb +++ b/meta-networking/recipes-daemons/opensaf/opensaf_5.0.0.bb @@ -53,6 +53,11 @@ do_install_append() { install -m 0644 ${B}/osaf/services/infrastructure/nid/config/opensafd.service \ ${D}${systemd_unitdir}/system install -m 0644 ${B}/contrib/plmc/config/*.service ${D}/${systemd_unitdir}/system + + if [ ! -d "${D}${sysconfdir}/init.d" ]; then + install -d ${D}${sysconfdir}/init.d + install -m 0755 ${B}/osaf/services/infrastructure/nid/scripts/opensafd ${D}${sysconfdir}/init.d/ + fi } FILES_${PN} += "${localstatedir}/run ${systemd_unitdir}/system/*.service" @@ -62,12 +67,3 @@ INSANE_SKIP_${PN} = "dev-so" RDEPENDS_${PN} += "bash python" -do_sysvinit_install() { - if [ ! -d "${D}${sysconfdir}/init.d" ]; then - install -d ${D}${sysconfdir}/init.d - install -m 0755 ${B}/osaf/services/infrastructure/nid/scripts/opensafd ${D}${sysconfdir}/init.d/ - fi -} - -addtask sysvinit_install after do_install before do_package - -- cgit 1.2.3-korg