public inbox for openembedded-core@lists.openembedded.org
 help / color / mirror / Atom feed
From: Ming Liu <liu.ming50@gmail.com>
To: openembedded-core@lists.openembedded.org
Cc: Ming Liu <liu.ming50@gmail.com>
Subject: [OE-core] [PATCH] busybox: fix a incomplete condition check
Date: Mon, 26 Jan 2026 13:36:15 +0100	[thread overview]
Message-ID: <20260126123615.66340-1-liu.ming50@gmail.com> (raw)

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 <liu.ming50@gmail.com>
---
 meta/recipes-core/busybox/busybox.inc | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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
 }
 
-- 
2.43.0



                 reply	other threads:[~2026-01-26 12:36 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20260126123615.66340-1-liu.ming50@gmail.com \
    --to=liu.ming50@gmail.com \
    --cc=openembedded-core@lists.openembedded.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox