From b4c4d481994756ec3dbd0005a7345a10efaa9584 Mon Sep 17 00:00:00 2001 From: mvoelkel Date: Mon, 14 Dec 2015 19:17:58 +0100 Subject: [PATCH] Moved dddvb out of tree mk.patch: if ../dddvb doesn't exist clone dddvb from github.com/DigitalDevices/dddvb --- .gitmodules | 4 ---- buildroot.octonet/package/octonet/octonet.mk | 2 +- mk | 2 +- mk.patch | 15 +++------------ 4 files changed, 5 insertions(+), 18 deletions(-) diff --git a/.gitmodules b/.gitmodules index 18fa4ce..e69de29 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,4 +0,0 @@ -[submodule "dddvb"] - path = dddvb - url = https://github.com/DigitalDevices/internal_dddvb - branch = internal diff --git a/buildroot.octonet/package/octonet/octonet.mk b/buildroot.octonet/package/octonet/octonet.mk index 563f50c..ea1930b 100644 --- a/buildroot.octonet/package/octonet/octonet.mk +++ b/buildroot.octonet/package/octonet/octonet.mk @@ -1,6 +1,6 @@ OCTONET_VERSION = 0.1 OCTONET_SOURCE = -OCTONET_SITE = ../dddvb/apps/octonet +OCTONET_SITE = ../../dddvb/apps/octonet OCTONET_SITE_METHOD = local OCTONET_INSTALL_TARGET = YES diff --git a/mk b/mk index 937e4ef..335bd2d 100755 --- a/mk +++ b/mk @@ -2,7 +2,7 @@ cd buildroot rm output-octonet/images/octonet* rm output-octonet/build/linux-custom/.stamp_* -DDDVB=../dddvb +DDDVB=../../dddvb LINUX=../linux.octonet #if [ -e /home/rjkm/projects ]; then diff --git a/mk.patch b/mk.patch index 4890dac..172778f 100755 --- a/mk.patch +++ b/mk.patch @@ -19,20 +19,11 @@ if [ ! -e buildroot ]; then fi fi -if [ ! -e buildroot.octonet ]; then - tar xf buildroot.octonet.tar.xz +if [ ! -e ../dddvb ]; then + git clone -b "0.9.20" "https://github.com/DigitalDevices/dddvb.git" ../dddvb fi -if [ ! -e dddvb ]; then - tar xf dddvb.tar.xz -fi - -if [ ! -e octoserve ]; then - tar xf octoserve.tar.xz -fi - - -DDDVB=dddvb +DDDVB=../dddvb LINUX=linux.octonet cp $DDDVB/ddbridge/*.[ch] $LINUX/drivers/media/pci/ddbridge/