fix prerequisites.mk

diff --git a/make/prerequisites.mk b/make/prerequisites.mk
index 7d60292410cdf622548aaab12d2382d5ced8254b..4086246d51f1d88bf1d3421a5548de31b86f7c4c 100755 (executable)
--- a/make/prerequisites.mk
+++ b/make/prerequisites.mk
@@ -22,20 +22,6 @@ $(SOURCE_DIR)/neutrino-hd:
                                cd $(SOURCE_DIR) && \
                                ln -sf neutrino-hd-master neutrino-hd; \
                        fi; \
-               elif [ $(NEUTRINO_HD_PORT) = "neutrino-hd-pumoviebouquets" ]; then \
-                       if [ -d $(SOURCE_DIR)/neutrino-hd-pumoviebouquets/ ]; then \
-                               cd $(SOURCE_DIR)/neutrino-hd-pumoviebouquets && \
-                               git pull origin pu/moviebouquets && \
-                               rm -rf $(SOURCE_DIR)/neutrino-hd; \
-                               cd $(SOURCE_DIR) && \
-                               ln -sf neutrino-hd-pumoviebouquets neutrino-hd; \
-                       else \
-                               git clone $(CSGIT)/$(REPO_GUI_NEUTRINO) neutrino-hd-pumoviebouquets; \
-                               cd $(SOURCE_DIR)/neutrino-hd-pumoviebouquets && \
-                               rm -rf $(SOURCE_DIR)/neutrino-hd; \
-                               cd $(SOURCE_DIR) && \
-                               ln -sf neutrino-hd-pumoviebouquets neutrino-hd; \
-                       fi; \
                fi
 
 $(GIT_LIBSTB_HAL):
@@ -147,8 +133,7 @@ $(GIT_PLUGINS):
                if [ -d $(GIT_PLUGINS) ]; then \
                        cd $(GIT_PLUGINS) && \
                        git pull origin master; \
-                       git submodule foreach --recursive git fetch; \
-                       git submodule foreach git merge origin master; \
+                       git submodule update --init --remote; \
                else \
                        git clone --recursive $(CSGIT)/$(REPO_PLUGINS) PLUGINS; \
                fi