[git.ipfire.org] IPFire 2.x development tree branch, thirteen, updated. 22a3f77293cf469932811130f4ce73143065b741

[git.ipfire.org] IPFire 2.x development tree branch, thirteen, updated. 22a3f77293cf469932811130f4ce73143065b741

[git]

[-- Attachment #1: Type: text/plain, Size: 2408 bytes --]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, thirteen has been updated
       via  22a3f77293cf469932811130f4ce73143065b741 (commit)
      from  5e0a1a503b90c5c80016399308bb2585edba219b (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 22a3f77293cf469932811130f4ce73143065b741
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Sun Sep 23 07:06:50 2012 -0400

    v4ldvb: fix and enable build for omap.

-----------------------------------------------------------------------

Summary of changes:
 lfs/v4l-dvb |    9 +++++++++
 make.sh     |    2 +-
 2 files changed, 10 insertions(+), 1 deletions(-)

Difference in files:
diff --git a/lfs/v4l-dvb b/lfs/v4l-dvb
index 5f2751a..7b0b335 100644
--- a/lfs/v4l-dvb
+++ b/lfs/v4l-dvb
@@ -79,6 +79,15 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar Jxf $(DIR_DL)/$(DL_FILE)
 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/v4l-dvb_rtl28xx_add_usb_ids.patch
 	cd $(DIR_APP) && make allyesconfig KERNELRELEASE=$(KVER)-$(VERSUFIX) VER=$(XVER)
+ifeq "$(KCFG)" "-omap"
+	# Disable failing OMAP2 Video Out and IR RX51 driver
+	cd $(DIR_APP) && sed -i -e \
+		"s|^CONFIG_VIDEO_OMAP2_VOUT=m|# CONFIG_VIDEO_OMAP2_VOUT is not set|g" \
+		v4l/.config
+	cd $(DIR_APP) && sed -i -e \
+		"s|^CONFIG_IR_RX51=m|# CONFIG_IR_RX51 is not set|g" \
+		v4l/.config
+endif
 	cd $(DIR_APP) && make all KERNELRELEASE=$(KVER)-$(VERSUFIX) VER=$(XVER)
 	cd $(DIR_APP) && make install KERNELRELEASE=$(KVER)-$(VERSUFIX) VER=$(XVER)
 	ln -sf $(DIR_APP)/ /usr/src/v4l-dvb
diff --git a/make.sh b/make.sh
index c139bf5..92e5762 100755
--- a/make.sh
+++ b/make.sh
@@ -435,7 +435,7 @@ buildipfire() {
 #    ipfiremake igb			KCFG="-rpi"
 
     ipfiremake linux			KCFG="-omap"
-#    ipfiremake v4l-dvb			KCFG="-omap"
+    ipfiremake v4l-dvb			KCFG="-omap"
 #    ipfiremake kvm-kmod			KCFG="-omap"
 #    ipfiremake mISDN			KCFG="-omap"
     ipfiremake cryptodev		KCFG="-omap"


hooks/post-receive
--
IPFire 2.x development tree