From e24411e85d38810dac01123d7478643c58aef00f Mon Sep 17 00:00:00 2001 From: Markham Date: Thu, 5 Aug 2021 22:03:58 +0200 Subject: [PATCH] fix prerequisites.mk --- make/prerequisites.mk | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/make/prerequisites.mk b/make/prerequisites.mk index 7d60292..4086246 100755 --- 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 -- 2.39.5