summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorClayton Casciato <majortomtosourcecontrol@gmail.com>2025-05-22 21:18:50 -0600
committerArmin Kuster <akuster808@gmail.com>2025-06-20 10:46:49 -0400
commit8de6879654175d33730d50372c6ceb5b40928eb0 (patch)
treef9a0b06c195095986e8ca31aa5b9862d52857e5d
parent9e4e5951fa267b2b51a3c59de8ee6591a13af861 (diff)
downloadmeta-openembedded-8de6879654175d33730d50372c6ceb5b40928eb0.tar.gz
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 <afenkart@gmail.com> Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Clayton Casciato <majortomtosourcecontrol@gmail.com> Signed-off-by: Armin Kuster <akuster808@gmail.com>
-rw-r--r--meta-networking/recipes-support/chrony/chrony_4.6.1.bb2
1 files changed, 1 insertions, 1 deletions
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"
48inherit update-rc.d systemd pkgconfig 48inherit update-rc.d systemd pkgconfig
49 49
50# Add chronyd user if privdrop packageconfig is selected 50# Add chronyd user if privdrop packageconfig is selected
51inherit ${@bb.utils.contains('PACKAGECONFIG', 'privdrop', 'useradd', '', d)} 51inherit_defer ${@bb.utils.contains('PACKAGECONFIG', 'privdrop', 'useradd', '', d)}
52USERADD_PACKAGES = "${@bb.utils.contains('PACKAGECONFIG', 'privdrop', '${PN}', '', d)}" 52USERADD_PACKAGES = "${@bb.utils.contains('PACKAGECONFIG', 'privdrop', '${PN}', '', d)}"
53USERADD_PARAM:${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'privdrop', '--system -d / -M --shell /bin/nologin chronyd;', '', d)}" 53USERADD_PARAM:${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'privdrop', '--system -d / -M --shell /bin/nologin chronyd;', '', d)}"
54 54