diff options
| author | Clayton Casciato <majortomtosourcecontrol@gmail.com> | 2025-05-22 21:16:14 -0600 |
|---|---|---|
| committer | Armin Kuster <akuster808@gmail.com> | 2025-06-23 16:57:53 -0400 |
| commit | 40c9f33ad292e3b418a56132582c3970381fcecb (patch) | |
| tree | e0e78289ba245872eff98618947f278a8a91e109 | |
| parent | 154b5010be669527f850b3b3f3162ccd97f639f9 (diff) | |
| download | meta-openembedded-40c9f33ad292e3b418a56132582c3970381fcecb.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.5.bb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta-networking/recipes-support/chrony/chrony_4.5.bb b/meta-networking/recipes-support/chrony/chrony_4.5.bb index ae46ef1fd4..dbea406233 100644 --- a/meta-networking/recipes-support/chrony/chrony_4.5.bb +++ b/meta-networking/recipes-support/chrony/chrony_4.5.bb | |||
| @@ -48,7 +48,7 @@ DEPENDS = "pps-tools" | |||
| 48 | inherit update-rc.d systemd pkgconfig | 48 | inherit 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 |
| 51 | inherit ${@bb.utils.contains('PACKAGECONFIG', 'privdrop', 'useradd', '', d)} | 51 | inherit_defer ${@bb.utils.contains('PACKAGECONFIG', 'privdrop', 'useradd', '', d)} |
| 52 | USERADD_PACKAGES = "${@bb.utils.contains('PACKAGECONFIG', 'privdrop', '${PN}', '', d)}" | 52 | USERADD_PACKAGES = "${@bb.utils.contains('PACKAGECONFIG', 'privdrop', '${PN}', '', d)}" |
| 53 | USERADD_PARAM:${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'privdrop', '--system -d / -M --shell /bin/nologin chronyd;', '', d)}" | 53 | USERADD_PARAM:${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'privdrop', '--system -d / -M --shell /bin/nologin chronyd;', '', d)}" |
| 54 | 54 | ||