X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Fv4l-dvb;h=9e3d405415021e278d1cbfb167598d8cb15833c7;hb=bdc84c9f9221a31d11e364bdf28013ffc30d31a6;hp=502b851660fa4c8a982812271eac34bf5fbfff3c;hpb=2a8c4fcb50413264310848b81ffb3a04a171a41a;p=people%2Fpmueller%2Fipfire-2.x.git

diff --git a/lfs/v4l-dvb b/lfs/v4l-dvb
index 502b851660..9e3d405415 100644
--- a/lfs/v4l-dvb
+++ b/lfs/v4l-dvb
@@ -24,18 +24,20 @@
 
 include Config
 
-VER        = 6292
+ifeq "$(XEN)" "1"
+	VERSUFIX=ipfire-xen
+else
+	VERSUFIX=ipfire
+endif
+
+VER        = b576509ea6d2
 
 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 +47,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 1af6a0f3795f9a9b4c691f19f3badcb4
+$(DL_FILE)_MD5 = f81cc6a324ab53f04f70084f676276ec
 
 install : $(TARGET)
 
@@ -78,13 +80,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)