From patchwork Wed Nov 13 15:17:22 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Korsgaard X-Patchwork-Id: 1194334 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.133; helo=hemlock.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="iz1vzQsO"; dkim-atps=neutral Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47CpCJ3pFFz9sP6 for ; Thu, 14 Nov 2019 02:18:04 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id B6E9C87B84; Wed, 13 Nov 2019 15:18:02 +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 xLKlieZukJKm; Wed, 13 Nov 2019 15:18:02 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id AD83187B2E; Wed, 13 Nov 2019 15:18:01 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 1CFF61BF2B4 for ; Wed, 13 Nov 2019 15:17:46 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 193DE2214F for ; Wed, 13 Nov 2019 15:17:46 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id qal9AcadQORM for ; Wed, 13 Nov 2019 15:17:44 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm1-f67.google.com (mail-wm1-f67.google.com [209.85.128.67]) by silver.osuosl.org (Postfix) with ESMTPS id BE1B522219 for ; Wed, 13 Nov 2019 15:17:43 +0000 (UTC) Received: by mail-wm1-f67.google.com with SMTP id z19so2438864wmk.3 for ; Wed, 13 Nov 2019 07:17:43 -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=1wAwT+F08yQ7vehOKtVrDTktJ6lE7YYvNVlwBh0jkbo=; b=iz1vzQsOiQuQLewCFhJEAAjrw0MYzJQ/dJ3i9HAAWR40nWU3EFemA94yVOtVWBmWkE jcE+g+mA2c+swaC8pXs/RX6DbOitidNTylPSzV/PlsUJP8kBr+CoYeZOGyHvLdbSa7oO yw1XVmQ/+l+0PJJMalMlDUP8jIxBT9GKxfHNJicdzztgQCdkNKDzVc7FgKYpxLabLMhU OqEJ8cfhuHQ1iXIPincjbmL4l6UpG9/hiXIcQKTGWxfXsb6E7Gj7aljRoZCdf1wM3o3n ut7WMIxNFUnlJI0K3mze1ZJKcc1BYXFjRWhOTCiYZzO8VMllegGBgjS6U47uCY7UygqW 32IQ== 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=1wAwT+F08yQ7vehOKtVrDTktJ6lE7YYvNVlwBh0jkbo=; b=XFqaDehZdcV6ktoa8guciiGRb1qkvrGJknOPitwZoYtLq4he4G4LSiWfL336cQTBh6 cRtJzpb8ppccAqc/2lk84y6Zq7hZcaYw4QBfoUzn7LbM1aXTlxI1eWk7bOEwciBBxPM4 KxfYSooDGpdMcyUvjcHPN3EnSP/toCBk1QEsUSobcO1FirhM5r2taL/trtmKC321Qo9H V829yCzWyqnYMXzV9NDdvHSyAfL1xFB8w/vb5e/4Apgs3579H4aB4g4Rk8Q3sJuyqLKL kkH/g+5oqMc7qmIZAk5cW5UlVJj79flTXTz/xx4sfE6uQGw1cFYycmHD4AbiaGLVfF7J uxqg== X-Gm-Message-State: APjAAAU40b5qKs4jcJqZWs8xXR6d8DO8K/RmIMvlvqTLpQnEluqnYy0i IG64Vh5zF8G+into4F0YIykZyzmz X-Google-Smtp-Source: APXvYqx/dKZRF+/uB4rSdkDS4dH4o4SL6frkkpYL/YAZR/QpwKNZ7Ol4mHS7UXzojZZniwnTKA4FKg== X-Received: by 2002:a1c:f705:: with SMTP id v5mr3130829wmh.82.1573658261892; Wed, 13 Nov 2019 07:17:41 -0800 (PST) Received: from dell.be.48ers.dk (d528f5fe4.static.telenet.be. [82.143.95.228]) by smtp.gmail.com with ESMTPSA id m3sm3682420wrb.67.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-0003CS-3D; Wed, 13 Nov 2019 16:17:38 +0100 From: Peter Korsgaard To: buildroot@buildroot.org Date: Wed, 13 Nov 2019 16:17:22 +0100 Message-Id: <20191113151724.12155-10-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 09/11] package/neardal: unconditionally use libedit 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 , Simon Dawson Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" neardal is licensed under GPL-2.0, which is not license compatible with readline (GPL-3.0+), so always use the libedit backend. Signed-off-by: Peter Korsgaard --- package/neardal/Config.in | 2 +- package/neardal/neardal.mk | 10 +--------- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/package/neardal/Config.in b/package/neardal/Config.in index c729283380..5f33ae4953 100644 --- a/package/neardal/Config.in +++ b/package/neardal/Config.in @@ -5,7 +5,7 @@ config BR2_PACKAGE_NEARDAL depends on BR2_USE_MMU # dbus select BR2_PACKAGE_DBUS select BR2_PACKAGE_DBUS_GLIB - select BR2_PACKAGE_READLINE if !BR2_PACKAGE_LIBEDIT + select BR2_PACKAGE_LIBEDIT help Provides a simple C API to exchange data with the neard NFC manager daemon. diff --git a/package/neardal/neardal.mk b/package/neardal/neardal.mk index ea9643244e..cc82e7f20f 100644 --- a/package/neardal/neardal.mk +++ b/package/neardal/neardal.mk @@ -10,17 +10,9 @@ NEARDAL_INSTALL_STAGING = YES NEARDAL_LICENSE = GPL-2.0 NEARDAL_LICENSE_FILES = COPYING -NEARDAL_DEPENDENCIES = host-pkgconf dbus dbus-glib +NEARDAL_DEPENDENCIES = host-pkgconf dbus dbus-glib libedit NEARDAL_AUTORECONF = YES -# Either readline or libedit are needed, and the Config.in file -# guarantees at least one of them is enabled -ifeq ($(BR2_PACKAGE_READLINE),y) -NEARDAL_DEPENDENCIES += readline -else ifeq ($(BR2_PACKAGE_LIBEDIT),y) -NEARDAL_DEPENDENCIES += libedit -endif - define NEARDAL_INSTALL_NCL $(INSTALL) -m 0755 -D $(@D)/ncl/ncl $(TARGET_DIR)/usr/bin/ncl endef