From patchwork Wed Nov 13 15:17:21 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Korsgaard X-Patchwork-Id: 1194329 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.137; helo=fraxinus.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=korsgaard.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="GImtDts3"; dkim-atps=neutral Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47CpC420r7z9sP6 for ; Thu, 14 Nov 2019 02:17:52 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id C55DE85FDB; Wed, 13 Nov 2019 15:17:50 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id kgWCy18iMAtu; Wed, 13 Nov 2019 15:17:50 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id C1C50860C1; Wed, 13 Nov 2019 15:17:49 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 57D851BF2B4 for ; Wed, 13 Nov 2019 15:17:43 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 4BF7B86A26 for ; Wed, 13 Nov 2019 15:17:43 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 195Hh4lM0k61 for ; Wed, 13 Nov 2019 15:17:42 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) by whitealder.osuosl.org (Postfix) with ESMTPS id 5942A869BF for ; Wed, 13 Nov 2019 15:17:42 +0000 (UTC) Received: by mail-wr1-f67.google.com with SMTP id b18so1318217wrj.8 for ; Wed, 13 Nov 2019 07:17:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=a2LH9f30FfAr/R9Qqnbms0im1KyrTRnEuU/PQ6FgIss=; b=GImtDts3Qq79aiIvvHDdCw4ZMQJoHo5a/A5EpQnHlbPaTsX9CIHmeaDgVF6A3WiOEG 62NQ0nXFyJOnQs87QxL/pmSrA59F45SuRMMoDt3w6SJgz4prJaCfMLHTlBhQuikOCSHU E2j1WC2PYRPpUkfzpQtQXv+at1YxTWwNWcziwe/vSYcPL2roT6bwiikBHkWp7Kw4IrKM TdVHTbnH4gUnZlo5XlVa7YzVvjknRsI5b73id1oE+sAM+B3ui2UoC5osMmpXgVywse+i 0t8zGHccs3MmVN0SxO9fNpMt9n9Brzha9L+afNK2kwQ3izA+OiCwpgxKF5QeRHxL+4mJ J2zw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=a2LH9f30FfAr/R9Qqnbms0im1KyrTRnEuU/PQ6FgIss=; b=rA7mS3TFbn+LXItEYfpDbk+Dl1KenArH1DYfuG8jkFIlfBxoAME1p/mXXNgPml+ftx nS80OONDxzQ/JzjlKte5u7ZwumMTDEOY8bwZZLHiYVeZ0bFFadueWbwxcR/146hpFmIg PbWpxE+XGGwJceyIUtNCoTzNXohRtIhLRCrvBMCIEQG3aAFNizI/I1AtAN4BqjO22EYQ JKg8NDDC8SmarJ0TA0jIlXBsrsxexVbdIkPDGVTxYMwr8tm902HGVVhsYU7YI9tLrdM0 kg2juxJ0YV5IyoAnx0aytbA8uTdG2C8tBiX88sbmKs506PQjHH/J3+Pm+xKzMQpVneCn W8YQ== X-Gm-Message-State: APjAAAUS9QmOXXInp2hLVStznsKtoTJCiOVZ9urdGLTUhKh30/E9hKq+ MXiCKqjfT9DpFOJuvFM0mp5JzrVC X-Google-Smtp-Source: APXvYqzDDQlO4XnvZt2JNXXdhv3tvmQSWjvX6IgLMEoJra1Fyk/QOTieaN68PLTB5E9gCbbwFZnrdg== X-Received: by 2002:adf:fb0b:: with SMTP id c11mr3469752wrr.50.1573658260406; Wed, 13 Nov 2019 07:17:40 -0800 (PST) Received: from dell.be.48ers.dk (d528f5fe4.static.telenet.be. [82.143.95.228]) by smtp.gmail.com with ESMTPSA id t185sm3022279wmf.45.2019.11.13.07.17.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Nov 2019 07:17:39 -0800 (PST) Received: from peko by dell.be.48ers.dk with local (Exim 4.92) (envelope-from ) id 1iUuOn-0003CN-MW; Wed, 13 Nov 2019 16:17:37 +0100 From: Peter Korsgaard To: buildroot@buildroot.org Date: Wed, 13 Nov 2019 16:17:21 +0100 Message-Id: <20191113151724.12155-9-peter@korsgaard.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191113151724.12155-1-peter@korsgaard.com> References: <20191113151724.12155-1-peter@korsgaard.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH 08/11] package/mariadb: use bundled GPL-2.0+ libreadline X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Korsgaard , Ryan Coe Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" 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 --- 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