From 8de6879654175d33730d50372c6ceb5b40928eb0 Mon Sep 17 00:00:00 2001 From: Clayton Casciato Date: Thu, 22 May 2025 21:18:50 -0600 Subject: chrony: use inherit_defer for conditional inherit of useradd [ Upstream commit 63df976d8eec0fa714e8da30f4333f8af23c57d3 ] conditionnal inherit is missed when PACKAGECONFIG privdrop is activated after this inherit, eg in .bbappend. Signed-off-by: Andreas Fenkart Signed-off-by: Khem Raj Signed-off-by: Clayton Casciato Signed-off-by: Armin Kuster --- meta-networking/recipes-support/chrony/chrony_4.6.1.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-networking/recipes-support/chrony/chrony_4.6.1.bb b/meta-networking/recipes-support/chrony/chrony_4.6.1.bb index 83dee9143b..d21a1c6216 100644 --- a/meta-networking/recipes-support/chrony/chrony_4.6.1.bb +++ b/meta-networking/recipes-support/chrony/chrony_4.6.1.bb @@ -48,7 +48,7 @@ DEPENDS = "pps-tools" inherit update-rc.d systemd pkgconfig # Add chronyd user if privdrop packageconfig is selected -inherit ${@bb.utils.contains('PACKAGECONFIG', 'privdrop', 'useradd', '', d)} +inherit_defer ${@bb.utils.contains('PACKAGECONFIG', 'privdrop', 'useradd', '', d)} USERADD_PACKAGES = "${@bb.utils.contains('PACKAGECONFIG', 'privdrop', '${PN}', '', d)}" USERADD_PARAM:${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'privdrop', '--system -d / -M --shell /bin/nologin chronyd;', '', d)}" -- cgit v1.2.3-54-g00ecf