diff options
Diffstat (limited to 'v4l/scripts')
| -rw-r--r-- | v4l/scripts/merge-pvrusb2.sh | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/v4l/scripts/merge-pvrusb2.sh b/v4l/scripts/merge-pvrusb2.sh index a428a9d8f..e12d79a3f 100644 --- a/v4l/scripts/merge-pvrusb2.sh +++ b/v4l/scripts/merge-pvrusb2.sh @@ -27,20 +27,25 @@ patch -p1 <<'DIFF' --- v4l.orig/Makefile +++ v4l/Makefile -@@ -318,7 +318,7 @@ +@@ -319,10 +319,10 @@ $(MAKE) -C $(KDIR) SUBDIRS=$(PWD) $(MYCFLAGS) modules pvrusb2:: - @scripts/merge-pvrusb2.sh +# @scripts/merge-pvrusb2.sh + pvrusb2-unmerge:: +-# patch -R -p1 < scripts/merge-pvrusb2.sh ++ patch -R -p1 < scripts/merge-pvrusb2.sh + links:: @echo creating symbolic links... -@@ -464,6 +464,7 @@ +@@ -464,7 +467,7 @@ dvb-rminstall:: + rmmodules:: + rmmod -w $(shell echo "$(v4l_modules)"|sed s,' ','\n',g|sed s,'-','_',g|sort|uniq -d) + +-clean:: ++clean:: pvrusb2-unmerge @find . -name '*.c' -type l -exec rm '{}' \; @find . -name '*.h' -type l -exec rm '{}' \; -rm -f *~ *.o *.ko .*.o.cmd .*.ko.cmd *.mod.c av7110_firm.h fdump -+ patch -R -p1 < scripts/merge-pvrusb2.sh - - distclean:: clean - -rm -f .version .*.o.flags .*.o.d |