X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=blobdiff_plain;f=lfs%2Fv4l-dvb;h=bdc8ffe7000bd7b3e5bbe3e404f392bd80a58c85;hp=7a83be9a7de265a854a15ba3c46281369ca0871d;hb=9e7b9a87ffb9f96814901cd270f2e5f1a1003796;hpb=824a0f689e6269c178e54feeaba878078bb6a49b

diff --git a/lfs/v4l-dvb b/lfs/v4l-dvb
index 7a83be9a7d..bdc8ffe700 100644
--- a/lfs/v4l-dvb
+++ b/lfs/v4l-dvb
@@ -24,33 +24,30 @@
 
 include Config
 
-VER        = e9a442d3b53a
+ifeq "$(XEN)" "1"
+	VERSUFIX=ipfire-xen
+else
+	VERSUFIX=ipfire
+endif
+
+VER        = 690055993011
 
 THISAPP    = v4l-dvb-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
-DL_FILE1   = v4l-dvb-af9015-820fe3a25cbc.patch.bz2
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 PAK_VER    = 2
-ifeq "$(SMP)" "1"
-	TARGET     = $(DIR_INFO)/$(THISAPP)-smp
-else
-	TARGET     = $(DIR_INFO)/$(THISAPP)-kmod-$(KVER)
-endif
-
+TARGET     = $(DIR_INFO)/$(THISAPP)-kmod-$(KVER)-$(VERSUFIX)
 
 ###############################################################################
 # Top-level Rules
 ###############################################################################
 
-objects = $(DL_FILE) $(DL_FILE1)
+objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE1) = $(DL_FROM)/$(DL_FILE1)
-
-$(DL_FILE)_MD5 = e4d9fccd3e3c242d1dce59bc5ecd2c51
-$(DL_FILE1)_MD5 = e51ca70bf1dc413a50796504f513fdd9
 
+$(DL_FILE)_MD5 = 830f055b637afbb4f131246c313a6e05
 install : $(TARGET)
 
 check : $(patsubst %,$(DIR_CHK)/%,$(objects))
@@ -82,14 +79,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) && bzip2 -d -c $(DIR_DL)/$(DL_FILE1) | patch -p1
-ifeq "$(SMP)" "1"
-	cd $(DIR_APP) && make release VER=$(KVER)-ipfire-smp
-else
-	cd $(DIR_APP) && make release VER=$(KVER)-ipfire
-endif
+	cd $(DIR_APP) && make release VER=$(KVER)-$(VERSUFIX)
 	cd $(DIR_APP) && make $(MAKETUNING) all
 	cd $(DIR_APP) && make install
-	-ln -s $(DIR_APP)/ /usr/src/v4l-dvb
+	ln -sf $(DIR_APP)/ /usr/src/v4l-dvb
 #	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)