Buildroot Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Peter Korsgaard <peter@korsgaard.com>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH 08/11] package/mariadb: use bundled GPL-2.0+ libreadline
Date: Wed, 13 Nov 2019 16:17:21 +0100	[thread overview]
Message-ID: <20191113151724.12155-9-peter@korsgaard.com> (raw)
In-Reply-To: <20191113151724.12155-1-peter@korsgaard.com>

mariadb is licensed under GPL-2.0, which is not license compatible with
modern readline (GPL-3.0+), so instead use the bundled older version
(GPL-2.0+ licensed) of readline instead.

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/mariadb/mariadb.mk | 6 ++++--
 package/mysql/Config.in    | 1 -
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/package/mariadb/mariadb.mk b/package/mariadb/mariadb.mk
index 6a18db48ab..82e3c16daf 100644
--- a/package/mariadb/mariadb.mk
+++ b/package/mariadb/mariadb.mk
@@ -19,8 +19,10 @@ MARIADB_DEPENDENCIES = \
 	openssl \
 	zlib \
 	libaio \
-	libxml2 \
-	readline
+	libxml2
+
+# use bundled GPL-2.0+ licensed readline as package/readline is GPL-3.0+
+MARIADB_CONF_OPTS += -DWITH_READLINE=ON
 
 # We won't need unit tests
 MARIADB_CONF_OPTS += -DWITH_UNIT_TESTS=0
diff --git a/package/mysql/Config.in b/package/mysql/Config.in
index 30a82cc91b..d3f9f1f00d 100644
--- a/package/mysql/Config.in
+++ b/package/mysql/Config.in
@@ -22,7 +22,6 @@ config BR2_PACKAGE_MARIADB
 	select BR2_PACKAGE_LIBXML2
 	select BR2_PACKAGE_NCURSES
 	select BR2_PACKAGE_OPENSSL
-	select BR2_PACKAGE_READLINE
 	select BR2_PACKAGE_HAS_MYSQL
 	help
 	  MariaDB is one of the most popular database servers in the
-- 
2.20.1

  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 ` [Buildroot] [PATCH 01/11] package/chrony: use libedit for command line editing Peter Korsgaard
2019-11-13 18:53   ` 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 ` Peter Korsgaard [this message]
2019-11-13 21:00   ` [Buildroot] [PATCH 08/11] package/mariadb: use bundled GPL-2.0+ libreadline 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-9-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