Merge remote-tracking branch 'origin/next' into thirteen

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

diff --git a/lfs/v4l-dvb b/lfs/v4l-dvb
index 89fe1ab37f5b3b95a500e058f832acbe616c1ae6..3b3d22b2c041df2d21441e83511342ccde6da6a8 100644 (file)
--- a/lfs/v4l-dvb
+++ b/lfs/v4l-dvb
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2010  IPFire Team <info@ipfire.org>                           #
+# Copyright (C) 2007-2012  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,34 +24,26 @@
 
 include Config
 
-ifeq "$(PAE)" "1"
-       VERSUFIX=ipfire-pae
-else
-ifeq "$(XEN)" "1"
-       VERSUFIX=ipfire-xen
-else
-       VERSUFIX=ipfire
-endif
-endif
-
-VER        = 990bbeaeb761
+VERSUFIX=ipfire$(KCFG)
 
+VER        = 20111225
 THISAPP    = v4l-dvb-$(VER)
-DL_FILE    = $(THISAPP).tar.bz2
+DL_FILE    = $(THISAPP).tar.xz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
-PAK_VER    = 2
 TARGET     = $(DIR_INFO)/$(THISAPP)-kmod-$(KVER)-$(VERSUFIX)
 
 ###############################################################################
 # Top-level Rules
 ###############################################################################
 
-objects = $(DL_FILE)
+objects = $(DL_FILE) v4l-dvb_update_it913x_1_25.patch.gz
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+v4l-dvb_update_it913x_1_25.patch.gz = $(DL_FROM)/v4l-dvb_update_it913x_1_25.patch.gz
 
-$(DL_FILE)_MD5 = 5510e0bf0525f0e964c05357cdb95936
+$(DL_FILE)_MD5 = 264c5f4ad7aad8dd2960799c80a7908c
+v4l-dvb_update_it913x_1_25.patch.gz_MD5 = c3e397bd64f618edbfcaa56466cdbf14
 
 install : $(TARGET)
 
@@ -61,9 +53,6 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects))
 
 md5 : $(subst %,%_MD5,$(objects))
 
-dist: 
-       $(PAK)
-
 ###############################################################################
 # Downloading, checking, md5sum
 ###############################################################################
@@ -83,10 +72,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) && make release VER=$(KVER)-$(VERSUFIX)
-       cd $(DIR_APP) && make $(MAKETUNING) all
-       cd $(DIR_APP) && make install
+       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar Jxf $(DIR_DL)/$(DL_FILE)
+       cd $(DIR_APP)/linux && zcat $(DIR_DL)/v4l-dvb_update_it913x_1_25.patch.gz | \
+                                       patch -Np1 
+       cd $(DIR_APP) && make allyesconfig KERNELRELEASE=$(KVER)-$(VERSUFIX) VER=2.6.32
+       cd $(DIR_APP) && make all KERNELRELEASE=$(KVER)-$(VERSUFIX) VER=2.6.32
+       cd $(DIR_APP) && make install KERNELRELEASE=$(KVER)-$(VERSUFIX) VER=2.6.32
        ln -sf $(DIR_APP)/ /usr/src/v4l-dvb
-#      @rm -rf $(DIR_APP)
        @$(POSTBUILD)