build: remove use of submodule for dvb-scan data

Revert back to manually fetching, though now its a git report its somewhat
simpler and we'll avoid using a separate script.

diff --git a/.gitignore b/.gitignore
index 846be4e05eadbbaf6dbc613c748510f47b8d822c..d7e34f72216ea25db604dd26e814ca723531e0e3 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,8 @@ build.*
 
 src/version.c
 
+data/dvb-scan
+
 .cproject
 .project
 .settings

diff --git a/.gitmodules b/.gitmodules
index c5d345faa6e3c4fc17b40e27fa92140f8ed44bf0..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 (file)
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +0,0 @@
-[submodule "data/dvb-scan"]
-       path = data/dvb-scan
-       url = git://linuxtv.org/dtv-scan-tables.git

diff --git a/configure b/configure
index 075e5348e50c76b81ecc438e1138e2501b96a9f7..0445170d52ef223deec2e764e1cbb34dbdd6aaf8 100755 (executable)
--- a/configure
+++ b/configure
@@ -174,10 +174,17 @@ fi
 # DVB scan
 #
 if enabled linuxdvb && enabled dvbscan; then
-  [ ! -d ${ROOTDIR}/data/dvb-scan/.git ] && rm -rf $ROOTDIR/data/dvb-scan/*
   printf "${TAB}" "fetching dvb-scan files ..."
-  git submodule update --init &> /dev/null\
-    || die "failed (use --disable-dvbscan)"
+  if [ -d ${ROOTDIR}/data/dvb-scan/.git ]; then
+    (cd ${ROOTDIR}/data/dvb-scan; git pull) &> /dev/null
+  else
+    URL=git://linuxtv.org/dtv-scan-tables.git
+    git clone $URL ${ROOTDIR}/data/dvb-scan &> /dev/null
+    if [ $? -ne 0 ]; then
+      echo "fail"
+      die "Failed to fetch dvb-scan data (use --disable-dvbscan)"
+    fi
+  fi
   echo "ok"
 fi
 

diff --git a/data/dvb-scan b/data/dvb-scan
deleted file mode 160000 (submodule)
index c57839a..0000000
--- a/data/dvb-scan
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit c57839aad2260306e6adecc0058fb683a8b34bc4

diff --git a/support/getmuxlist b/support/getmuxlist
deleted file mode 100755 (executable)
index c2b1b7a..0000000
--- a/support/getmuxlist
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/bash
-#
-# Retrieve the latest dvb-apps scan files
-#
-
-URL=http://linuxtv.org/hg/dvb-apps/archive/tip.tar.bz2
-TMP=/tmp/getmuxlist.$$
-TVH=$(cd $(dirname $0)/..; pwd)/data/dvb-scan
-
-function die
-{
-  [ ! -z "$1" ] && echo $1 || echo
-  rm -rf $TMP
-  rm -rf $TVH
-  exit 1
-}
-
-# Get files
-rm -rf $TMP
-mkdir -p $TMP
-cd $TMP
-echo -n "fetching scan files ... "
-(wget -O - -q $URL | tar xj) 2> /dev/null ||\
-(curl $URL | tar xj) 2> /dev/null
-cd dvb-apps* 2> /dev/null || die "failed"
-echo "done"
-
-# Copy to TVH
-echo -n "moving into tvh data/ directory ... "
-rm -rf $TVH
-mkdir -p $TVH
-mv ./util/scan/* $TVH
-echo "done"
-
-# Cleanup
-echo -n "cleaning up ... "
-for f in $TVH/*; do
-  [ -f $f ] && rm -f $f
-done
-rm -rf $TMP
-echo "done"

diff --git a/support/mkbundle b/support/mkbundle
index 8818c5928405795bc09b79fed29aaa4663205d10..7e32d65706ca664d08fdb9ef98d5aa6dabfe6bf6 100755 (executable)
--- a/support/mkbundle
+++ b/support/mkbundle
@@ -46,11 +46,15 @@ for path in args:
     t = ents
     while True:
       (d,n) = rsplit(n)
+      if d.startswith('.'):
+        fs = []
+        break
       if d not in t:
         t[d] = {}
       t = t[d]
       if not n: break
     for f in fs:
+      if f.startswith('.'): continue
       t[f] = None
 
 # Output a file

diff --git a/support/posix.mk b/support/posix.mk
index 62819206ca5992f734a1cb56b5c5d8e52a646726..2994fc5a8f29af6569ae32b48c9800e97085c0b3 100644 (file)
--- a/support/posix.mk
+++ b/support/posix.mk
@@ -13,6 +13,7 @@ install: ${PROG} ${MAN}
                cp -r $$bundle/*  ${DESTDIR}${datadir}/tvheadend/$$bundle ;\
        done
 
+       find ${DESTDIR} -name .git -exec rm -rf {} \;
 
 uninstall:
        rm -f ${DESTDIR}${bindir)/tvheadend