[meta-virtualization][PATCH v2] irqbalance: Fix QA error when sysvinit is used

Liu Yiding <[email protected]>
Newsgroups org.yoctoproject.lists.meta-virtualization
Message-ID <[email protected]>
irqbalance: correct to install /etc/default for sysvinit

1. This commit uses option --with-pkgconfdir to correct to install /etc/default when sysvinit is used.
   Without this fix, there will show do_package QA Issue
   ERROR: irqbalance-1.9.4+git-r0 do_package: QA Issue: irqbalance: Files/directories were installed but not shipped in any package:
     /usr/etc
     /usr/etc/default
     /usr/etc/default/irqbalance.env

  Previous PACKAGECONFIG[systemd] only works when systemd is used. When using sysvinit, --with-pkgconfdir=${sysconfdir} can't work, so making this patch to fix it.

2. Merge DEPENDS for systemd into PACKAGECONFIG[systemd]

Signed-off-by: Liu Yiding <[email protected]>
---
 recipes-extended/irqbalance/irqbalance.inc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/recipes-extended/irqbalance/irqbalance.inc b/recipes-extended/irqbalance/irqbalance.inc
index 35b6388e..b7b34a0b 100644
--- a/recipes-extended/irqbalance/irqbalance.inc
+++ b/recipes-extended/irqbalance/irqbalance.inc
@@ -14,7 +14,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
 		   "
 
 DEPENDS = "glib-2.0"
-DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}"
 
 INITSCRIPT_NAME = "irqbalanced"
 INITSCRIPT_PARAMS = "defaults"
@@ -25,6 +24,7 @@ SYSTEMD_PACKAGES = "irqbalance"
 SYSTEMD_SERVICE:irqbalance = "irqbalance.service"
 
 EXTRA_OECONF = "--program-transform-name= \
+                --with-pkgconfdir=${sysconfdir} \
 	       "
 
 # let the recipes or appends define options
@@ -34,7 +34,7 @@ PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd',
 #
 PACKAGECONFIG[numa] = "--enable-numa,--disable-numa,numactl,"
 PACKAGECONFIG[libcap-ng] = "--with-libcap-ng,--without-libcap-ng,libcap-ng,"
-PACKAGECONFIG[systemd] = "--with-systemd --with-pkgconfdir=${sysconfdir},,,"
+PACKAGECONFIG[systemd] = "--with-systemd,,systemd"
 
 do_install () {
         oe_runmake 'DESTDIR=${D}' install
-- 
2.43.0
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.