diff options
Diffstat (limited to 'v4l/scripts')
| -rw-r--r-- | v4l/scripts/merge-trees.sh | 6 | ||||
| -rw-r--r-- | v4l/scripts/unmerge-trees.sh | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/v4l/scripts/merge-trees.sh b/v4l/scripts/merge-trees.sh index 0fc294416..e5c699a8c 100644 --- a/v4l/scripts/merge-trees.sh +++ b/v4l/scripts/merge-trees.sh @@ -93,8 +93,8 @@ diff -up v4l-kernel.orig/v4l/Makefile v4l-kernel/v4l/Makefile @echo -e "\nInstalling new V4L modules at corresponding Kernel dir..." @strip --strip-debug $(inst-m) -@@ -375,7 +376,7 @@ dvb-rminstall:: - $(addprefix $(KDIR26)/dvb/dvb-core/, $(addsuffix .gz,$(inst_dvb-core))) 2>/dev/null +@@ -389,7 +390,7 @@ dvb-rminstall:: + $(addprefix $(KDIR26)/dvb/ttusb-dec/, $(addsuffix .gz,$(inst_ttusb-dec))) 2>/dev/null @echo -rminstall:: @@ -102,7 +102,7 @@ diff -up v4l-kernel.orig/v4l/Makefile v4l-kernel/v4l/Makefile @echo -e "\nEliminating old V4L modules (errors on this step is not a problem).." -@rm -r $(DEST) \ -@@ -396,7 +397,7 @@ rminstall:: +@@ -410,7 +411,7 @@ rminstall:: rmmodules:: rmmod -w $(shell echo "$(v4l_modules)"|sed s,' ','\n',g|sed s,'-','_',g|sort|uniq -d) diff --git a/v4l/scripts/unmerge-trees.sh b/v4l/scripts/unmerge-trees.sh index aa4fd1974..e01390a10 100644 --- a/v4l/scripts/unmerge-trees.sh +++ b/v4l/scripts/unmerge-trees.sh @@ -74,8 +74,8 @@ diff -up v4l-kernel/v4l/Makefile v4l-kernel.orig/v4l/Makefile @echo -e "\nInstalling new V4L modules at corresponding Kernel dir..." @strip --strip-debug $(inst-m) -@@ -376,7 +375,7 @@ dvb-rminstall:: - $(addprefix $(KDIR26)/dvb/dvb-core/, $(addsuffix .gz,$(inst_dvb-core))) 2>/dev/null +@@ -390,7 +389,7 @@ dvb-rminstall:: + $(addprefix $(KDIR26)/dvb/ttusb-dec/, $(addsuffix .gz,$(inst_ttusb-dec))) 2>/dev/null @echo -rminstall:: dvb-rminstall @@ -83,7 +83,7 @@ diff -up v4l-kernel/v4l/Makefile v4l-kernel.orig/v4l/Makefile @echo -e "\nEliminating old V4L modules (errors on this step is not a problem).." -@rm -r $(DEST) \ -@@ -397,7 +398,7 @@ rminstall:: dvb-rminstall +@@ -411,7 +412,7 @@ rminstall:: dvb-rminstall rmmodules:: rmmod -w $(shell echo "$(v4l_modules)"|sed s,' ','\n',g|sed s,'-','_',g|sort|uniq -d) |