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, master has been updated via 8bb35e212c9870806f3111b1ba5e3795302cc606 (commit) via f8177749ef29d993a30674dd10a204bdd343c3f4 (commit) from 20c2b559121a4cc220f68b0ef8846adbe739cb00 (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 8bb35e212c9870806f3111b1ba5e3795302cc606 Merge: f817774 20c2b55 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Sat Dec 4 17:55:24 2010 +0100
Merge branch 'master' of ssh://arne_f@git.ipfire.org/pub/git/ipfire-2.x
commit f8177749ef29d993a30674dd10a204bdd343c3f4 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Sat Dec 4 17:54:34 2010 +0100
v4l-dvb: removed backport warning.
-----------------------------------------------------------------------
Summary of changes: lfs/v4l-dvb | 4 +++- src/patches/v4l-dvb_remove_backport_warning.patch | 12 ++++++++++++ 2 files changed, 15 insertions(+), 1 deletions(-) create mode 100644 src/patches/v4l-dvb_remove_backport_warning.patch
Difference in files: diff --git a/lfs/v4l-dvb b/lfs/v4l-dvb index 50c116a..e8f2e54 100644 --- a/lfs/v4l-dvb +++ b/lfs/v4l-dvb @@ -84,7 +84,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) && make release VER=$(KVER)-$(VERSUFIX) + # Remove backported warning... + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/v4l-dvb_remove_backport_warning.patch + cd $(DIR_APP) && make release VER=$(KVER)-$(VERSUFIX) cd $(DIR_APP) && make $(MAKETUNING) all cd $(DIR_APP) && make install ln -sf $(DIR_APP)/ /usr/src/v4l-dvb diff --git a/src/patches/v4l-dvb_remove_backport_warning.patch b/src/patches/v4l-dvb_remove_backport_warning.patch new file mode 100644 index 0000000..7f57822 --- /dev/null +++ b/src/patches/v4l-dvb_remove_backport_warning.patch @@ -0,0 +1,12 @@ +diff -Naur v4l-dvb-abd3aac6644e.org/v4l/compat.h v4l-dvb-abd3aac6644e/v4l/compat.h +--- v4l-dvb-abd3aac6644e.org/v4l/compat.h 2010-07-02 05:38:54.000000000 +0200 ++++ v4l-dvb-abd3aac6644e/v4l/compat.h 2010-12-04 12:19:09.531056981 +0100 +@@ -14,8 +14,6 @@ + #define INIT_DELAYED_WORK(a,b,c) INIT_WORK(a,b,c) + #endif + +-#define EXPERIMENTAL_TREE +- + #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 35) + #define usb_buffer_alloc(dev, size, mem_flags, dma) usb_alloc_coherent(dev, size, mem_flags, dma) + #define usb_buffer_free(dev, size, addr, dma) usb_free_coherent(dev, size, addr, dma)
hooks/post-receive -- IPFire 2.x development tree