mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-06-14 05:49:57 +00:00
chrony: Remove the readline PACKAGECONFIG
Support for readline was dropped in Chrony 4.2. Enabling the readline PACKAGECONFIG would result in no suppport for command line editing as only editline is supported and it would be disabled. Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com> Signed-off-by: Armin Kuster <akuster808@gmail.com>
This commit is contained in:
committed by
Armin Kuster
parent
5910870977
commit
2a9e9f919e
@@ -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,--without-readline,readline"
|
||||
PACKAGECONFIG[editline] = ",--without-editline,libedit"
|
||||
PACKAGECONFIG[sechash] = "--without-tomcrypt,--disable-sechash,nss"
|
||||
PACKAGECONFIG[privdrop] = "--with-libcap,--disable-privdrop --without-libcap,libcap"
|
||||
@@ -79,6 +70,10 @@ PACKAGECONFIG[ipv6] = ",--disable-ipv6,"
|
||||
PACKAGECONFIG[nss] = "--with-nss,--without-nss,nss"
|
||||
PACKAGECONFIG[libcap] = "--with-libcap,--without-libcap,libcap"
|
||||
|
||||
# This is left for backwards compatibility, to avoid breaking existing
|
||||
# configurations.
|
||||
PACKAGECONFIG[readline] = ""
|
||||
|
||||
# --disable-static isn't supported by chrony's configure script.
|
||||
DISABLE_STATIC = ""
|
||||
|
||||
|
||||
Reference in New Issue
Block a user