X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Fv4l-dvb;h=e8f2e54f156eaf7f354fc59218fc082fa0720a7d;hb=f3557f76cf7524341b078d1003f0ef60e0e50433;hp=d2b0cd47f02f8a59bcabf8eb70171b0e90f33efa;hpb=66df69bc2d9eec1072ec0bf9e1d82e45b8e3aa75;p=people%2Fpmueller%2Fipfire-2.x.git

diff --git a/lfs/v4l-dvb b/lfs/v4l-dvb
index d2b0cd47f0..e8f2e54f15 100644
--- 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        = d87638488880
+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 = 40b605d279d79d044b9a361f1b677006
+$(DL_FILE)_MD5 = fca89ad531c5d04dadbbc65997c92aac
 
 install : $(TARGET)
 
@@ -78,15 +84,11 @@ $(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-kernel2.6.16-disabledvideodev.patch
-	cp -f $(DIR_SRC)/config/v4l-dvb/config $(DIR_APP)/v4l/.config
-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
+	# Remove backported warning...
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/v4l-dvb_remove_backport_warning.patch
+		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)