diff options
Diffstat (limited to 'v4l')
| -rw-r--r-- | v4l/ChangeLog | 7 | ||||
| -rw-r--r-- | v4l/scripts/merge-pvrusb2.sh | 9 |
2 files changed, 16 insertions, 0 deletions
diff --git a/v4l/ChangeLog b/v4l/ChangeLog index 569bc66c7..9d26b7ac7 100644 --- a/v4l/ChangeLog +++ b/v4l/ChangeLog @@ -1,3 +1,10 @@ +2006-01-15 01:05 mkrufky + + * v4l/scripts/merge-pvrusb2.sh: + - prevent 'make pvrusb2' from running twice in a row. + + Signed-off-by: Michael Krufky <mkrufky@m1k.net> + 2006-01-15 00:43 mkrufky * v4l/Make.config: diff --git a/v4l/scripts/merge-pvrusb2.sh b/v4l/scripts/merge-pvrusb2.sh index 2852feefd..a428a9d8f 100644 --- a/v4l/scripts/merge-pvrusb2.sh +++ b/v4l/scripts/merge-pvrusb2.sh @@ -27,6 +27,15 @@ patch -p1 <<'DIFF' --- v4l.orig/Makefile +++ v4l/Makefile +@@ -318,7 +318,7 @@ + $(MAKE) -C $(KDIR) SUBDIRS=$(PWD) $(MYCFLAGS) modules + + pvrusb2:: +- @scripts/merge-pvrusb2.sh ++# @scripts/merge-pvrusb2.sh + + links:: + @echo creating symbolic links... @@ -464,6 +464,7 @@ @find . -name '*.c' -type l -exec rm '{}' \; @find . -name '*.h' -type l -exec rm '{}' \; |