summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Kjellerstedt <pkj@axis.com>2022-11-12 13:59:38 +0100
committerKhem Raj <raj.khem@gmail.com>2022-11-12 16:52:33 -0800
commit1ff3ca8540441de8174604443601939f3dcc689c (patch)
treed562822805f785e8cbf59e237bd0377bb3580b20
parent1e625fbfc5fcd5aebd086df725ddc3d29e46b10e (diff)
downloadmeta-openembedded-1ff3ca8540441de8174604443601939f3dcc689c.tar.gz
chrony: Make it possible to enable editline support again
Support for readline was dropped in Chrony 4.2. However, the --disable-readline option still remains (it is used to completely ignore all forms of command line editing, even though the only remaining variant is editline). So keeping the readline PACKAGECONFIG and making it pass --disable-readline when it is not enabled disabled support for editline, and if it was enabled it instead passed --without-editline, which also disabled support for editline. Thus there was no way to enable editline support. Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r--meta-networking/recipes-support/chrony/chrony_4.3.bb9
1 files changed, 0 insertions, 9 deletions
diff --git a/meta-networking/recipes-support/chrony/chrony_4.3.bb b/meta-networking/recipes-support/chrony/chrony_4.3.bb
index d0e2c4b540..b09a58b086 100644
--- a/meta-networking/recipes-support/chrony/chrony_4.3.bb
+++ b/meta-networking/recipes-support/chrony/chrony_4.3.bb
@@ -53,14 +53,6 @@ USERADD_PACKAGES = "${@bb.utils.contains('PACKAGECONFIG', 'privdrop', '${PN}', '
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
55# Configuration options: 55# Configuration options:
56# - For command line editing support in chronyc, you may specify either
57# 'editline' or 'readline' but not both. editline is smaller, but
58# many systems already have readline for other purposes so you might want
59# to choose that instead. However, beware license incompatibility
60# since chrony is GPLv2 and readline versions after 6.0 are GPLv3+.
61# You can of course choose neither, but if you're that tight on space
62# consider dropping chronyc entirely (you can use it remotely with
63# appropriate chrony.conf options).
64# - Security-related: 56# - Security-related:
65# - 'sechash' is omitted by default because it pulls in nss which is huge. 57# - 'sechash' is omitted by default because it pulls in nss which is huge.
66# - 'privdrop' allows chronyd to run as non-root; would need changes to 58# - 'privdrop' allows chronyd to run as non-root; would need changes to
@@ -70,7 +62,6 @@ USERADD_PARAM:${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'privdrop', '--sys
70PACKAGECONFIG ??= "editline \ 62PACKAGECONFIG ??= "editline \
71 ${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)} \ 63 ${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)} \
72" 64"
73PACKAGECONFIG[readline] = "--without-editline,--disable-readline,readline"
74PACKAGECONFIG[editline] = ",--without-editline,libedit" 65PACKAGECONFIG[editline] = ",--without-editline,libedit"
75PACKAGECONFIG[sechash] = "--without-tomcrypt,--disable-sechash,nss" 66PACKAGECONFIG[sechash] = "--without-tomcrypt,--disable-sechash,nss"
76PACKAGECONFIG[privdrop] = "--with-libcap,--disable-privdrop --without-libcap,libcap" 67PACKAGECONFIG[privdrop] = "--with-libcap,--disable-privdrop --without-libcap,libcap"