dvb/linuxtv-dvb/debian/patches 10_Makefile_fix.dpatch

Thomas Schmidt pkg-vdr-dvb-changes@lists.alioth.debian.org
Mon, 31 May 2004 13:09:38 +0000


Update of /cvsroot/pkg-vdr-dvb/dvb/linuxtv-dvb/debian/patches
In directory haydn:/tmp/cvs-serv8897/dvb/linuxtv-dvb/debian/patches

Modified Files:
	10_Makefile_fix.dpatch 
Log Message:
this one should now work, even if the building host is running linux 2.6 ;-)

Index: 10_Makefile_fix.dpatch
===================================================================
RCS file: /cvsroot/pkg-vdr-dvb/dvb/linuxtv-dvb/debian/patches/10_Makefile_fix.dpatch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- 10_Makefile_fix.dpatch	30 May 2004 22:37:38 -0000	1.5
+++ 10_Makefile_fix.dpatch	31 May 2004 13:09:35 -0000	1.6
@@ -23,9 +23,21 @@
 exit 0
 
 @DPATCH@
-diff -urNad /home/chelli/vdr/cvs-buildpackage/linuxtv-dvb/linuxtv-dvb-1.1.1/build-2.4/Makefile linuxtv-dvb-1.1.1/build-2.4/Makefile
---- /home/chelli/vdr/cvs-buildpackage/linuxtv-dvb/linuxtv-dvb-1.1.1/build-2.4/Makefile	2004-05-31 00:34:07.000000000 +0200
-+++ linuxtv-dvb-1.1.1/build-2.4/Makefile	2004-05-31 00:34:54.000000000 +0200
+diff -urNad /home/chelli/vdr/cvs/dvb/linuxtv-dvb/build-2.4/getlinks linuxtv-dvb/build-2.4/getlinks
+--- /home/chelli/vdr/cvs/dvb/linuxtv-dvb/build-2.4/getlinks	2004-05-23 11:09:03.000000000 +0200
++++ linuxtv-dvb/build-2.4/getlinks	2004-05-31 15:07:46.000000000 +0200
+@@ -5,7 +5,7 @@
+ echo "getting links from kernel-cvs driver"
+ 
+ 
+-KERNELRELEASE=`cat .version 2>/dev/null || uname -r`
++KERNELRELEASE=`cat .version 2>/dev/null || echo $(KVERS)`
+ make clean
+ echo "$KERNELRELEASE" > .version
+ 
+diff -urNad /home/chelli/vdr/cvs/dvb/linuxtv-dvb/build-2.4/Makefile linuxtv-dvb/build-2.4/Makefile
+--- /home/chelli/vdr/cvs/dvb/linuxtv-dvb/build-2.4/Makefile	2004-02-14 22:00:53.000000000 +0100
++++ linuxtv-dvb/build-2.4/Makefile	2004-05-31 15:07:57.000000000 +0200
 @@ -60,20 +60,24 @@
  
  multi-m		:= $(filter $(list-multi), $(obj-m))
@@ -38,7 +50,8 @@
  
  else
  # take version info from last module build if available
- KERNELRELEASE	:= $(shell cat $(obj)/.version 2>/dev/null || uname -r)
+-KERNELRELEASE	:= $(shell cat $(obj)/.version 2>/dev/null || uname -r)
++KERNELRELEASE	:= $(shell cat $(obj)/.version 2>/dev/null || echo $(KVERS))
  endif
  
 -KDIR		:= /lib/modules/$(KERNELRELEASE)/build
@@ -56,9 +69,9 @@
  build:
  	[ -L saa7146_video.c ] || ./getlinks
  	$(MAKE) -C $(KDIR) CC="gcc -I$(PWD)/include" SUBDIRS=$(PWD) modules
-diff -urNad /home/chelli/vdr/cvs-buildpackage/linuxtv-dvb/linuxtv-dvb-1.1.1/Makefile linuxtv-dvb-1.1.1/Makefile
---- /home/chelli/vdr/cvs-buildpackage/linuxtv-dvb/linuxtv-dvb-1.1.1/Makefile	2004-05-31 00:34:07.000000000 +0200
-+++ linuxtv-dvb-1.1.1/Makefile	2004-05-31 00:34:08.000000000 +0200
+diff -urNad /home/chelli/vdr/cvs/dvb/linuxtv-dvb/Makefile linuxtv-dvb/Makefile
+--- /home/chelli/vdr/cvs/dvb/linuxtv-dvb/Makefile	2004-05-23 10:56:26.000000000 +0200
++++ linuxtv-dvb/Makefile	2004-05-31 15:07:27.000000000 +0200
 @@ -3,7 +3,7 @@
  CVSROOT     := $(shell cat CVS/Root)
  RELEASE_TAG := LINUXTV-DVB-$(subst .,_,$(subst -,_,$(VERSION)))