Updated v4l-dvb.

[people/teissler/ipfire-2.x.git] / lfs / v4l-dvb

diff --git a/lfs/v4l-dvb b/lfs/v4l-dvb
index 502b851660fa4c8a982812271eac34bf5fbfff3c..50c116afe6bc5c424d22573765d8bd48e20b7a21 100644 (file)
--- a/lfs/v4l-dvb
+++ b/lfs/v4l-dvb
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2010  IPFire Team <info@ipfire.org>                           #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -24,18 +24,24 @@
 
 include Config
 
-VER        = 6292
+ifeq "$(PAE)" "1"
+       VERSUFIX=ipfire-pae
+else
+ifeq "$(XEN)" "1"
+       VERSUFIX=ipfire-xen
+else
+       VERSUFIX=ipfire
+endif
+endif
+
+VER        = abd3aac6644e
 
 THISAPP    = v4l-dvb-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
-ifeq "$(SMP)" "1"
-       TARGET     = $(DIR_INFO)/$(THISAPP)-smp
-else
-       TARGET     = $(DIR_INFO)/$(THISAPP)
-endif
-
+PAK_VER    = 2
+TARGET     = $(DIR_INFO)/$(THISAPP)-kmod-$(KVER)-$(VERSUFIX)
 
 ###############################################################################
 # Top-level Rules
@@ -45,7 +51,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 1af6a0f3795f9a9b4c691f19f3badcb4
+$(DL_FILE)_MD5 = fca89ad531c5d04dadbbc65997c92aac
 
 install : $(TARGET)
 
@@ -78,13 +84,9 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
-       cd $(DIR_APP) && patch -N -p1 < $(DIR_SRC)/src/patches/v4l-dvb-6310.patch
-ifeq "$(SMP)" "1"
-       cd $(DIR_APP) && make release VER=2.6.16.57-ipfire-smp
-else
-       cd $(DIR_APP) && make release VER=2.6.16.57-ipfire
-endif
+       cd $(DIR_APP) && make release VER=$(KVER)-$(VERSUFIX)
        cd $(DIR_APP) && make $(MAKETUNING) all
        cd $(DIR_APP) && make install
-       @rm -rf $(DIR_APP)
+       ln -sf $(DIR_APP)/ /usr/src/v4l-dvb
+#      @rm -rf $(DIR_APP)
        @$(POSTBUILD)