From 3c487d922f6b24f226f2c81c8921c3b428811fee Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Wed, 13 Nov 2019 16:17:14 +0100 Subject: [PATCH] package/chrony: use libedit for command line editing chrony is licensed under GPL-2.0, which is not license compatible with readline (GPL-3.0+), so remove the optional readline handling and replace with libedit instead. While we are at it, also explicitly disable the libedit backend when not available. Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN (cherry picked from commit baadfbcc02298d03b7d532cb37eb31b26322d68b) Signed-off-by: Peter Korsgaard --- package/chrony/chrony.mk | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/package/chrony/chrony.mk b/package/chrony/chrony.mk index b5821b238d..00709e6f83 100644 --- a/package/chrony/chrony.mk +++ b/package/chrony/chrony.mk @@ -13,6 +13,7 @@ CHRONY_CONF_OPTS = \ --host-system=Linux \ --host-machine=$(BR2_ARCH) \ --prefix=/usr \ + --without-readline \ --without-tomcrypt ifeq ($(BR2_PACKAGE_LIBCAP),y) @@ -34,10 +35,10 @@ else CHRONY_CONF_OPTS += --without-seccomp endif -ifeq ($(BR2_PACKAGE_READLINE),y) -CHRONY_DEPENDENCIES += readline +ifeq ($(BR2_PACKAGE_LIBEDIT),y) +CHRONY_DEPENDENCIES += libedit else -CHRONY_CONF_OPTS += --disable-readline +CHRONY_CONF_OPTS += --without-editline --disable-readline endif # If pps-tools is available, build it before so the package can use it