From patchwork Wed Nov 13 15:17:23 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Korsgaard X-Patchwork-Id: 1194331 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="gbp+imHs"; 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 47CpC767YXz9sQp for ; Thu, 14 Nov 2019 02:17:55 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 1D81F860C1; Wed, 13 Nov 2019 15:17:54 +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 0Ldw3zbW9QXg; Wed, 13 Nov 2019 15:17:51 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 6CD5F860F0; Wed, 13 Nov 2019 15:17:51 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 9F76D1BF2B4 for ; Wed, 13 Nov 2019 15:17:43 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 7CE8C87B84 for ; Wed, 13 Nov 2019 15:17:43 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 1FvMXUtVvoEM for ; Wed, 13 Nov 2019 15:17:42 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm1-f48.google.com (mail-wm1-f48.google.com [209.85.128.48]) by hemlock.osuosl.org (Postfix) with ESMTPS id A40EB87B60 for ; Wed, 13 Nov 2019 15:17:42 +0000 (UTC) Received: by mail-wm1-f48.google.com with SMTP id b11so2399446wmb.5 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=q5cOM+SF5lx8b2F7SVbcKDhq6kSbI3yX0pF29VVRS1M=; b=gbp+imHsJsFRB7MrXb9ze2lMYmv2wqpbuzEcCgxdF//erwuj1/c6pVaBbLsEM+FKPM 5kTuEvoRkqS/bnLsGJOx3/07QVPITMT/lhWmIklAJC/ECuxIwy+/pAu9Zc/TrVcbeqNC hRxGvTAR3mm64sS3As7dFBUoovoxybYCOHfhG68vZbApbwOHNL3XGs1HtStEdzl/aqWS RBuYvXEwzdBKhvBEnBwqZpi4Z2ZI8L1NeZoGBJH1g1S2I21z1uaezHgSER3xhlNrmk73 Yoxcey5x+e16pfkpLybozamIRBBvqTvjPVQi1BLzxm8s2NY/h3K4xbzzl0fBbNYUL2li Rs4A== 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=q5cOM+SF5lx8b2F7SVbcKDhq6kSbI3yX0pF29VVRS1M=; b=px3/jX1igG2x03/Bi+Iae7NOZCVsEyvxuCvdRaynSf+QXCA3PiCSepgEULYLygrWhb 6hFuzAfVItAJvpXNxdrAYLabjBQ9Y0Op7cqSOyuPSXfL7k6iafCtqjM227p12Y359Tb4 lY3vMbbiCG3O1uGcp8WTH96py5Fv5yPa139JjDzISjh1BZN5w7MJ8saxU/LI3rZ3qOwj xCCx+BA+++Kol74J7ZzTsBdNXIhr/ES6smERPWYRUdS7txfh6p7AUPT99H+6zA5PBaUn b7BJ1OOn4VlTHqzFIlvUMHVGqpWv7hVc7mxgXv72Rg5luAVmJDoFDutUMoGdfL4XjjvT WjbA== X-Gm-Message-State: APjAAAWKTnJllGTFhDD8AI4iAEuyGmA65+PlX8H+Rwbk5TKRdN3rtHMh EzaCJhyVbqcUXsde1wmfrAAkirEO X-Google-Smtp-Source: APXvYqzpK8p75TsT3l4ttRv03nBfQWDZP1ht5wdDaufX7kV3TtfJwsszqGt+UqL7bRtKi6JzUZiK4w== X-Received: by 2002:a1c:5415:: with SMTP id i21mr3398700wmb.120.1573658260815; 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 j2sm3213616wrt.61.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 1iUuOo-0003CX-G5; Wed, 13 Nov 2019 16:17:38 +0100 From: Peter Korsgaard To: buildroot@buildroot.org Date: Wed, 13 Nov 2019 16:17:23 +0100 Message-Id: <20191113151724.12155-11-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 10/11] package/oracle-mysql: 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 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" oracle-mysql 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/mysql/Config.in | 1 - package/oracle-mysql/oracle-mysql.mk | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/package/mysql/Config.in b/package/mysql/Config.in index d3f9f1f00d..ef4a9531a7 100644 --- a/package/mysql/Config.in +++ b/package/mysql/Config.in @@ -37,7 +37,6 @@ comment "mariadb needs a toolchain w/ dynamic library" config BR2_PACKAGE_ORACLE_MYSQL bool "oracle mysql" select BR2_PACKAGE_NCURSES - select BR2_PACKAGE_READLINE select BR2_PACKAGE_HAS_MYSQL help The MySQL Open Source Database System diff --git a/package/oracle-mysql/oracle-mysql.mk b/package/oracle-mysql/oracle-mysql.mk index 0275a8428f..326fbcc040 100644 --- a/package/oracle-mysql/oracle-mysql.mk +++ b/package/oracle-mysql/oracle-mysql.mk @@ -9,7 +9,7 @@ ORACLE_MYSQL_VERSION = $(ORACLE_MYSQL_VERSION_MAJOR).73 ORACLE_MYSQL_SOURCE = mysql-$(ORACLE_MYSQL_VERSION).tar.gz ORACLE_MYSQL_SITE = http://dev.mysql.com/get/Downloads/MySQL-$(ORACLE_MYSQL_VERSION_MAJOR) ORACLE_MYSQL_INSTALL_STAGING = YES -ORACLE_MYSQL_DEPENDENCIES = readline ncurses +ORACLE_MYSQL_DEPENDENCIES = ncurses ORACLE_MYSQL_AUTORECONF = YES ORACLE_MYSQL_LICENSE = GPL-2.0 ORACLE_MYSQL_LICENSE_FILES = README COPYING @@ -33,7 +33,7 @@ ORACLE_MYSQL_CONF_OPTS = \ --without-docs \ --without-man \ --without-libedit \ - --without-readline \ + --with-readline \ --with-low-memory \ --enable-thread-safe-client \ --with-unix-socket-path=$(MYSQL_SOCKET) \