fix update-neutrino und update-svn

diff --git a/Makefile b/Makefile
index 5742c253ad4086a85da53d1e9404238206a010fd..7aadeb2e9fd6a2590e7ccc7e94144a50f4348afe 100755 (executable)
--- a/Makefile
+++ b/Makefile
@@ -96,7 +96,7 @@ update-self:
        git pull
 
 update-neutrino:
-       $(MAKE) $(SOURCE_DIR)/neutrino-hd && git svn rebase
+       $(MAKE) $(SOURCE_DIR)/neutrino-hd && git pull
 
 update-svn:
        cd $(SVN_COOLSTREAM) && $(SVN) up *
@@ -104,16 +104,16 @@ update-svn:
        cd $(SVN_THIRDPARTY)/applications/tools/busybox-1.2.0 && $(SVN) up *
        cd $(SVN_THIRDPARTY)/applications/tools/hotplug && $(SVN) up *
        cd $(SVN_THIRDPARTY)/applications/plugins/lbreakout2-2.6 && $(SVN) up *
-       cd $(SVN_THIRDPARTY)/applications/plugins/links-2.2 && $(SVN) up *
+       cd $(SVN_THIRDPARTY)/applications/plugins/links && $(SVN) up *
        cd $(SVN_THIRDPARTY)/applications/plugins/ltris-1.0.13 && $(SVN) up *
        cd $(SVN_THIRDPARTY)/libraries && $(SVN) up *
        cd $(SVN_THIRDPARTY)/lib && $(SVN) up *
        cd $(SVN_THIRDPARTY)/kernel && $(SVN) up *
        cd $(SVN_THIRDPARTY)/drivers && $(SVN) up *
        cd $(SVN_THIRDPARTY)/bootloader && $(SVN) up *
-       $(MAKE) $(GIT_LIBRARIES)/dvbsi && git svn rebase
-       $(MAKE) $(GIT_LIBRARIES)/ffmpeg && git svn rebase
-       $(MAKE) $(GIT_DRIVERS) && git svn rebase
+       $(MAKE) $(GIT_LIBRARIES)/dvbsi && git pull
+       $(MAKE) $(GIT_LIBRARIES)/ffmpeg && git pull
+       $(MAKE) $(GIT_DRIVERS) && git pull
 
 update-svn-target:
        $(MAKE) modules includes-and-libs