From patchwork Sat Jan 5 21:39:10 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Yann E. MORIN" X-Patchwork-Id: 209700 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from fraxinus.osuosl.org (fraxinus.osuosl.org [140.211.166.137]) by ozlabs.org (Postfix) with ESMTP id 19FFD2C0082 for ; Sun, 6 Jan 2013 08:39:25 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id AE3E1100347; Sat, 5 Jan 2013 21:39:13 +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 93LnAqX8ugdj; Sat, 5 Jan 2013 21:39:11 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 165151009A2; Sat, 5 Jan 2013 21:39:11 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 94A268F753 for ; Sat, 5 Jan 2013 21:39:25 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 7FCD88109D for ; Sat, 5 Jan 2013 21:39:19 +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 04mu+zaB+gbv for ; Sat, 5 Jan 2013 21:39:18 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-we0-f178.google.com (mail-we0-f178.google.com [74.125.82.178]) by whitealder.osuosl.org (Postfix) with ESMTPS id E030581093 for ; Sat, 5 Jan 2013 21:39:17 +0000 (UTC) Received: by mail-we0-f178.google.com with SMTP id x43so9153692wey.9 for ; Sat, 05 Jan 2013 13:39:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:sender:from:to:cc:subject:date:message-id:x-mailer; bh=rRN7zcHxwRKNOx+NcT/Kzm20sAqXVe7ize4RoZ3KcpU=; b=LkAh/u2c5Ba0TzAHZbFdYKKel9Wc2OpR4QGmsbkHd1IO6enl2Dm10ouYxNrUrpP84U 7LM/40BDkS0B5r7O42mZjDiHRsCpUDlQ8J90/XTigbe/HDvMMgVcYVbBV9BlRIrlyZZN EmGTR+HcEuCKkOSobyt6VLtxlDt7EtPeBACcozjFeXYpmUrOcx/uViN6LLb6OnhC27eL 2VlM12n8fzix61a1Mo/ofos8FSGUxzq3/Gkgig943hLhKhDrBY3fqV6KA22r2ATkM7Ya FLal+zMKmww+/fvr6EKecuy83t2ilkdcXANOUw/igU/xa/pqcxpuf3NREPqn4KzzA83E RL1A== X-Received: by 10.180.86.39 with SMTP id m7mr3220958wiz.1.1357421955917; Sat, 05 Jan 2013 13:39:15 -0800 (PST) Received: from localhost.localdomain (ARennes-256-1-70-176.w90-32.abo.wanadoo.fr. [90.32.149.176]) by mx.google.com with ESMTPS id gz3sm5110856wib.2.2013.01.05.13.39.13 (version=TLSv1 cipher=RC4-SHA bits=128/128); Sat, 05 Jan 2013 13:39:14 -0800 (PST) From: "Yann E. MORIN" To: buildroot@busybox.net Date: Sat, 5 Jan 2013 22:39:10 +0100 Message-Id: <1357421950-16251-1-git-send-email-yann.morin.1998@free.fr> X-Mailer: git-send-email 1.7.2.5 Cc: "Yann E. MORIN" Subject: [Buildroot] [PATCH] package/dvb-apps: add option to install utilities 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 Previously, dvb-apps was a 'blind' package that would install only the transponders data files for use by external packages (namely tvheadend). Now, we add an option to also install the DVB utilities. Signed-off-by: "Yann E. MORIN" --- package/Config.in | 1 + package/dvb-apps/Config.in | 17 ++++++++++++++ package/dvb-apps/dvb-apps.mk | 23 ++++++++++++++++++- package/tvheadend/Config.in | 1 + .../tvheadend-no-auto-download-dvbscans.patch | 2 +- 5 files changed, 41 insertions(+), 3 deletions(-) create mode 100644 package/dvb-apps/Config.in diff --git a/package/Config.in b/package/Config.in index 11ff82d..5146553 100644 --- a/package/Config.in +++ b/package/Config.in @@ -215,6 +215,7 @@ source "package/devmem2/Config.in" endif source "package/dmidecode/Config.in" source "package/dmraid/Config.in" +source "package/dvb-apps/Config.in" source "package/eeprog/Config.in" source "package/evtest/Config.in" source "package/flashrom/Config.in" diff --git a/package/dvb-apps/Config.in b/package/dvb-apps/Config.in new file mode 100644 index 0000000..5d0b6f5 --- /dev/null +++ b/package/dvb-apps/Config.in @@ -0,0 +1,17 @@ +config BR2_PACKAGE_DVB_APPS + bool "dvb-apps (transponders data)" + help + Install the DVB-C, DVB-S, DVB-T and ATSC transponders data. + + http://linuxtv.org/projects.php + http://linuxtv.org/hg/dvb-apps + +if BR2_PACKAGE_DVB_APPS + +config BR2_PACKAGE_DVB_APPS_UTILS + bool "dvb-apps utilities" + help + A small number of DVB test and utility programs, + including szap and dvbscan. + +endif diff --git a/package/dvb-apps/dvb-apps.mk b/package/dvb-apps/dvb-apps.mk index 5db8148..f914799 100644 --- a/package/dvb-apps/dvb-apps.mk +++ b/package/dvb-apps/dvb-apps.mk @@ -18,11 +18,30 @@ DVB_APPS_SITE_METHOD = hg # apply to us. DVB_APPS_LICENSE = unknown (probably public domain) +ifeq ($(BR2_PACKAGE_DVB_APPS_UTILS),y) +# Utilitiess are selected, build and install everything +DVB_APPS_INSTALL_STAGING = YES + +define DVB_APPS_BUILD_CMDS + $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) V=1 +endef + +define DVB_APPS_INSTALL_STAGING_CMDS + $(MAKE) -C $(@D) V=1 DESTDIR=$(STAGING_DIR) install +endef + +define DVB_APPS_INSTALL_TARGET_CMDS + $(MAKE) -C $(@D) V=1 DESTDIR=$(TARGET_DIR) install +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-apps/scan/$$i; \ - $(INSTALL) $(@D)/util/scan/$$i/* $(TARGET_DIR)/usr/share/dvb-apps/scan/$$i; \ + mkdir -p $(TARGET_DIR)/usr/share/dvb/$$i; \ + $(INSTALL) $(@D)/util/scan/$$i/* $(TARGET_DIR)/usr/share/dvb/$$i; \ done endef +endif $(eval $(generic-package)) diff --git a/package/tvheadend/Config.in b/package/tvheadend/Config.in index 944e31e..e6dee3a 100644 --- a/package/tvheadend/Config.in +++ b/package/tvheadend/Config.in @@ -4,6 +4,7 @@ comment "tvheadend requires a toolchain with LARGEFILE support" config BR2_PACKAGE_TVHEADEND bool "tvheadend" depends on BR2_LARGEFILE + select BR2_PACKAGE_DVB_APPS select BR2_PACKAGE_OPENSSL help Tvheadend is a TV streaming server for Linux supporting DVB-S, diff --git a/package/tvheadend/tvheadend-no-auto-download-dvbscans.patch b/package/tvheadend/tvheadend-no-auto-download-dvbscans.patch index 50bc4b6..963d4f2 100644 --- a/package/tvheadend/tvheadend-no-auto-download-dvbscans.patch +++ b/package/tvheadend/tvheadend-no-auto-download-dvbscans.patch @@ -54,7 +54,7 @@ diff -durN tvheadend-v3.3.orig//support/posix.mk tvheadend-v3.3/support/posix.mk done - + mkdir -p ${DESTDIR}${datadir}/tvheadend/data -+ ln -s /usr/share/dvb-apps/scan ${DESTDIR}${datadir}/tvheadend/data/dvb-scan ++ ln -sf /usr/share/dvb ${DESTDIR}${datadir}/tvheadend/data/dvb-scan uninstall: rm -f ${DESTDIR}${bindir)/tvheadend