[linux-dvb] [PATCH] build-2.6 w/ separate objdir

[Olaf Titz <olaf@bigred.inka.de>]

The following patch enables dvb-kernel to be built against a kernel
which was compiled in a separate object directory, as is possible with
Linux 2.6. E.g.

make KERNELSRCDIR=/usr/src/linux-2.6.5 KERNELBUILDDIR=/var/obj/linux-2.6.5

Also included a small fix to make sure crc32 is loaded, if it is a module.

Olaf

Index: dvb-kernel/build-2.6/Makefile
===================================================================
RCS file: /cvs/linuxtv/dvb-kernel/build-2.6/Makefile,v
retrieving revision 1.15
diff -u -r1.15 Makefile
--- dvb-kernel/build-2.6/Makefile	5 Apr 2004 12:17:33 -0000	1.15
+++ dvb-kernel/build-2.6/Makefile	8 May 2004 10:11:24 -0000
@@ -2,10 +2,11 @@

 KERNELRELEASE := $(shell uname -r)
 KERNELSRCDIR := /lib/modules/$(KERNELRELEASE)/build
+KERNELBUILDDIR := $(KERNELSRCDIR)
 BUILD_DIR := $(shell pwd)
 export DVB_SRC_DIR := $(shell cd ..; pwd)

-include $(KERNELSRCDIR)/.config
+include $(KERNELBUILDDIR)/.config

 # if no DVB drivers are selected in the kernel config,
 # we check if an av7110 driver firmware is available
@@ -33,7 +34,7 @@
 all: makelinks $(DVB_FIRMWARE) $(VIDEO_BUF)
 	rm -rf bt848.h
 	ln -s $(KERNELSRCDIR)/drivers/media/video/bt848.h bt848.h
-	$(MAKE) -C $(KERNELSRCDIR) SUBDIRS=$(BUILD_DIR) AV7110_FIRMWARE=$(CONFIG_DVB_AV7110_FIRMWARE_FILE) AV7110_OSD=$(CONFIG_DVB_AV7110_OSD)
+	$(MAKE) -C $(KERNELSRCDIR) O=$(KERNELBUILDDIR) SUBDIRS=$(BUILD_DIR) AV7110_FIRMWARE=$(CONFIG_DVB_AV7110_FIRMWARE_FILE) AV7110_OSD=$(CONFIG_DVB_AV7110_OSD)

 video-buf.c:
 	rm -rf video-buf.c
Index: dvb-kernel/build-2.6/insmod.sh
===================================================================
RCS file: /cvs/linuxtv/dvb-kernel/build-2.6/insmod.sh,v
retrieving revision 1.7
diff -u -r1.7 insmod.sh
--- dvb-kernel/build-2.6/insmod.sh	11 Mar 2004 11:51:07 -0000	1.7
+++ dvb-kernel/build-2.6/insmod.sh	8 May 2004 10:11:24 -0000
@@ -5,6 +5,7 @@

 case "$1" in
     load)
+	modprobe crc32
 	echo "Inserting DVB modules into kernel"
 	# make sure input stuff is there for IR remote controls
 	modprobe evdev

=== end of patch ===



-- 
Info:
To unsubscribe send a mail to ecartis@linuxtv.org with "unsubscribe linux-dvb" as subject.