From: Peter Korsgaard <peter@korsgaard.com>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH 01/11] package/chrony: use libedit for command line editing
Date: Wed, 13 Nov 2019 16:17:14 +0100 [thread overview]
Message-ID: <20191113151724.12155-2-peter@korsgaard.com> (raw)
In-Reply-To: <20191113151724.12155-1-peter@korsgaard.com>
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 <peter@korsgaard.com>
---
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 f6dcb11794..379745022c 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 \
$(if $(BR2_PACKAGE_CHRONY_DEBUG_LOGGING),--enable-debug,--disable-debug)
@@ -35,10 +36,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
--
2.20.1
next prev parent reply other threads:[~2019-11-13 15:17 UTC|newest]
Thread overview: 43+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-13 15:17 [Buildroot] [PATCH 00/11] Fix license incompatibility with readline Peter Korsgaard
2019-11-13 15:17 ` Peter Korsgaard [this message]
2019-11-13 18:53 ` [Buildroot] [PATCH 01/11] package/chrony: use libedit for command line editing Yann E. MORIN
2019-11-13 19:14 ` Peter Korsgaard
2019-11-13 20:10 ` Yann E. MORIN
2019-11-18 13:17 ` Peter Korsgaard
2019-11-13 15:17 ` [Buildroot] [PATCH 02/11] package/connman: clarify license of client code Peter Korsgaard
2019-11-13 18:56 ` Yann E. MORIN
2019-11-17 16:03 ` Arnout Vandecappelle
2019-11-18 13:02 ` Peter Korsgaard
2019-11-13 15:17 ` [Buildroot] [PATCH 03/11] package/dropwatch: license is GPL-2.0+ Peter Korsgaard
2019-11-13 16:19 ` Baruch Siach
2019-11-13 19:15 ` Peter Korsgaard
2019-11-13 19:00 ` Yann E. MORIN
2019-11-18 13:08 ` Peter Korsgaard
2019-11-13 15:17 ` [Buildroot] [PATCH 04/11] package/ipsec-tools: add license information Peter Korsgaard
2019-11-13 21:27 ` Yann E. MORIN
2019-11-19 7:39 ` Peter Korsgaard
2019-11-13 15:17 ` [Buildroot] [PATCH 05/11] package/kodi: drop readline dependency Peter Korsgaard
2019-11-13 21:26 ` Yann E. MORIN
2019-11-14 17:37 ` Yann E. MORIN
2019-11-14 5:44 ` Bernd Kuhls
2019-11-19 7:57 ` Peter Korsgaard
2019-11-13 15:17 ` [Buildroot] [PATCH 06/11] package/kodi: add hash for license file Peter Korsgaard
2019-11-13 20:39 ` Yann E. MORIN
2019-11-19 7:39 ` Peter Korsgaard
2019-11-13 15:17 ` [Buildroot] [PATCH 07/11] package/lvm2: drop optional readline dependency Peter Korsgaard
2019-11-13 21:00 ` Yann E. MORIN
2019-11-19 7:39 ` Peter Korsgaard
2019-11-13 15:17 ` [Buildroot] [PATCH 08/11] package/mariadb: use bundled GPL-2.0+ libreadline Peter Korsgaard
2019-11-13 21:00 ` Yann E. MORIN
2019-11-19 7:39 ` Peter Korsgaard
2019-11-13 15:17 ` [Buildroot] [PATCH 09/11] package/neardal: unconditionally use libedit Peter Korsgaard
2019-11-13 20:58 ` Yann E. MORIN
2019-11-14 8:23 ` Peter Korsgaard
2019-11-13 15:17 ` [Buildroot] [PATCH 10/11] package/oracle-mysql: use bundled GPL-2.0+ libreadline Peter Korsgaard
2019-11-13 21:08 ` Yann E. MORIN
2019-11-19 7:54 ` Peter Korsgaard
2019-11-13 15:17 ` [Buildroot] [PATCH 11/11] package/socat: drop optional readline dependency Peter Korsgaard
2019-11-13 16:15 ` Baruch Siach
2019-11-13 21:02 ` Yann E. MORIN
2019-11-19 7:39 ` Peter Korsgaard
2019-11-13 21:13 ` [Buildroot] [PATCH 00/11] Fix license incompatibility with readline Yann E. MORIN
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191113151724.12155-2-peter@korsgaard.com \
--to=peter@korsgaard.com \
--cc=buildroot@busybox.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox