From 1ff3ca8540441de8174604443601939f3dcc689c Mon Sep 17 00:00:00 2001 From: Peter Kjellerstedt Date: Sat, 12 Nov 2022 13:59:38 +0100 Subject: 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 Signed-off-by: Khem Raj --- meta-networking/recipes-support/chrony/chrony_4.3.bb | 9 --------- 1 file changed, 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}', ' USERADD_PARAM:${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'privdrop', '--system -d / -M --shell /bin/nologin chronyd;', '', d)}" # Configuration options: -# - For command line editing support in chronyc, you may specify either -# 'editline' or 'readline' but not both. editline is smaller, but -# many systems already have readline for other purposes so you might want -# to choose that instead. However, beware license incompatibility -# since chrony is GPLv2 and readline versions after 6.0 are GPLv3+. -# You can of course choose neither, but if you're that tight on space -# consider dropping chronyc entirely (you can use it remotely with -# appropriate chrony.conf options). # - Security-related: # - 'sechash' is omitted by default because it pulls in nss which is huge. # - '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 PACKAGECONFIG ??= "editline \ ${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)} \ " -PACKAGECONFIG[readline] = "--without-editline,--disable-readline,readline" PACKAGECONFIG[editline] = ",--without-editline,libedit" PACKAGECONFIG[sechash] = "--without-tomcrypt,--disable-sechash,nss" PACKAGECONFIG[privdrop] = "--with-libcap,--disable-privdrop --without-libcap,libcap" -- cgit v1.2.3-54-g00ecf