From: Ming Liu Date: Mon, 26 Jan 2026 12:36:15 +0000 (+0100) Subject: busybox: fix a incomplete condition check X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9316834803c93a8024c6cab709c7a957546776a6;p=thirdparty%2Fopenembedded%2Fopenembedded-core.git busybox: fix a incomplete condition check When deleting syslog sysvinit related config files, also check if 'systemd' is being enabled, after the change, it behaves same with the check logic in rm_sysvinit_initddir. ${sysconfdir}/syslog.conf is also a sysvinit related config file, also delete it. Signed-off-by: Ming Liu Signed-off-by: Mathieu Dubois-Briand --- diff --git a/meta/recipes-core/busybox/busybox.inc b/meta/recipes-core/busybox/busybox.inc index 22972baaae..c85117efc8 100644 --- a/meta/recipes-core/busybox/busybox.inc +++ b/meta/recipes-core/busybox/busybox.inc @@ -358,8 +358,10 @@ do_install () { fi # Remove the sysvinit specific configuration file for systemd systems to avoid confusion - if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'false', 'true', d)}; then + if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'false', 'true', d)} && + ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then rm -f ${D}${sysconfdir}/syslog-startup.conf + rm -f ${D}${sysconfdir}/syslog.conf fi }