From patchwork Fri Mar 28 00:00:21 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Yann E. MORIN" X-Patchwork-Id: 334507 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from hemlock.osuosl.org (hemlock.osuosl.org [140.211.166.133]) by ozlabs.org (Postfix) with ESMTP id BA4B41400BA for ; Fri, 28 Mar 2014 11:00:43 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 1003188472; Fri, 28 Mar 2014 00:00: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 drhTnjNedh-o; Fri, 28 Mar 2014 00:00:42 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 723E58848D; Fri, 28 Mar 2014 00:00:42 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (fraxinus.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id F13E61CE78E for ; Fri, 28 Mar 2014 00:00:35 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id EDF058B6E5 for ; Fri, 28 Mar 2014 00:00:35 +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 YhMfuSu6guM8 for ; Fri, 28 Mar 2014 00:00:35 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wi0-f178.google.com (mail-wi0-f178.google.com [209.85.212.178]) by fraxinus.osuosl.org (Postfix) with ESMTPS id ED08D8B79D for ; Fri, 28 Mar 2014 00:00:34 +0000 (UTC) Received: by mail-wi0-f178.google.com with SMTP id bs8so165978wib.17 for ; Thu, 27 Mar 2014 17:00:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=zEIAyOoWDyjxtcVw7yjCOLsxnDApT3sxFe8JRjZATL8=; b=nJrY5Ig1GIuGZSRIpUtrHJ7ehkflMd9OAxXDb6nJZNdceKG9RqgfkqIxPWdz0wSDzT 8oHmET6xYungssUSqZkMgKEvxyjUWmBuF+jADgeyfpAtxuKyeULE8lvGlRw31u+epT0V Py89v6jXjrdPjjS8PEYP8Okou8QOhBDvrqLhC6VqJyr9EiFQKM5EubOOSiScJdNeDpk/ RNizoPrOXlk7S1214ty93aShcyUhNFmka31Ur+oTWK0kNe8f3Zl0H+o6CPoXBdu8M/gG 3zIzC48GJ1Wmtc3gYVt7mRuIpXOK17oDMffLve+PvXpTICM9I364Zzul/UNJS/KEZgj/ klmA== X-Received: by 10.181.13.11 with SMTP id eu11mr43227018wid.30.1395964833567; Thu, 27 Mar 2014 17:00:33 -0700 (PDT) Received: from gourin.bzh.lan (ks3095497.kimsufi.com. [94.23.60.27]) by mx.google.com with ESMTPSA id fs8sm1410915wib.8.2014.03.27.17.00.32 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 27 Mar 2014 17:00:32 -0700 (PDT) From: "Yann E. MORIN" To: buildroot@buildroot.org Date: Fri, 28 Mar 2014 01:00:21 +0100 Message-Id: X-Mailer: git-send-email 1.8.3.2 In-Reply-To: References: Cc: "Yann E. MORIN" Subject: [Buildroot] [PATCH 04/10] package/dvb-apps: rely on dtv-scan-tables to provide transponder data X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.14 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: buildroot-bounces@busybox.net From: "Yann E. MORIN" This is a transitioning solution before switching packages that need the transponders data, to use dtv-scan-tables instead of dvb-apps. Signed-off-by: "Yann E. MORIN" --- package/dtv-scan-tables/Config.in | 2 -- package/dvb-apps/Config.in | 1 + package/dvb-apps/dvb-apps.mk | 23 +++++------------------ 3 files changed, 6 insertions(+), 20 deletions(-) diff --git a/package/dtv-scan-tables/Config.in b/package/dtv-scan-tables/Config.in index 05a3b1c..e102ca7 100644 --- a/package/dtv-scan-tables/Config.in +++ b/package/dtv-scan-tables/Config.in @@ -1,7 +1,5 @@ config BR2_PACKAGE_DTV_SCAN_TABLES bool "dtv-scan-tables" - # dvb-apps installs its own set of transponder data - depends on !BR2_PACKAGE_DVB_APPS help The Digital TV scan tables. diff --git a/package/dvb-apps/Config.in b/package/dvb-apps/Config.in index ea0a12f..76b33aa 100644 --- a/package/dvb-apps/Config.in +++ b/package/dvb-apps/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_DVB_APPS bool "dvb-apps (transponders data)" + select BR2_PACKAGE_DTV_SCAN_TABLES help Install the DVB-C, DVB-S, DVB-T and ATSC transponders data. diff --git a/package/dvb-apps/dvb-apps.mk b/package/dvb-apps/dvb-apps.mk index e351258..5f576e0 100644 --- a/package/dvb-apps/dvb-apps.mk +++ b/package/dvb-apps/dvb-apps.mk @@ -8,21 +8,13 @@ DVB_APPS_VERSION = be76da69f250 DVB_APPS_SITE = http://linuxtv.org/hg/dvb-apps DVB_APPS_SITE_METHOD = hg -# We just install the transponders data. As this is not a 'work' as per -# traditional copyright, but just a collection of 'facts', there's probably -# no license to apply to these data files. -# To be noted however, is that the dvb-apps package bundles a copy of the -# GPLv2 and a copy of the LGPLv2.1, and that some of the source files refer -# to either the GPLv2+ or the LGPLv2.1+. -# But since we do not use any of those source files, their license do not -# apply to us. -DVB_APPS_LICENSE = unknown (probably public domain) +DVB_APPS_DEPENDENCIES = dtv-scan-tables ifeq ($(BR2_PACKAGE_DVB_APPS_UTILS),y) # Utilitiess are selected, build and install everything -DVB_APPS_LICENSE += GPLv2 GPLv2+ LGPLv2.1+ -DVB_APPS_LICENSE_FILES += COPYING COPYING.LGPL +DVB_APPS_LICENSE = GPLv2 GPLv2+ LGPLv2.1+ +DVB_APPS_LICENSE_FILES = COPYING COPYING.LGPL DVB_APPS_LDFLAGS = $(TARGET_LDFLAGS) @@ -47,13 +39,8 @@ define DVB_APPS_INSTALL_TARGET_CMDS endef else -# Utilities are not selected, just install the scan files -define DVB_APPS_INSTALL_TARGET_CMDS - for i in atsc dvb-c dvb-s dvb-t; do \ - mkdir -p $(TARGET_DIR)/usr/share/dvb/$$i; \ - $(INSTALL) $(@D)/util/scan/$$i/* $(TARGET_DIR)/usr/share/dvb/$$i; \ - done -endef +# We do not really install anything, so there's no license +DVB_APPS_LICENSE = none endif $(eval $(generic-package))