fix git checkout

diff --git a/Makefile b/Makefile
index 7af35a736bf824fd492b6ec89b17f4f2c7423342..c778fabe583fe1cebaf2ac32d8fe2df0e1ab8398 100755 (executable)
--- a/Makefile
+++ b/Makefile
@@ -96,7 +96,7 @@ update-self:
        git pull
 
 update-neutrino:
-       cd $(SOURCE_DIR)/neutrino-hd && git pull
+       $(MAKE) $(SOURCE_DIR)/neutrino-hd
 
 update-svn:
        cd $(SVN_COOLSTREAM) && $(SVN) up *
@@ -111,9 +111,9 @@ update-svn:
        cd $(SVN_THIRDPARTY)/kernel && $(SVN) up *
        cd $(SVN_THIRDPARTY)/drivers && $(SVN) up *
        cd $(SVN_THIRDPARTY)/bootloader && $(SVN) up *
-       cd $(GIT_LIBRARIES)/dvbsi && git pull
-       cd $(GIT_LIBRARIES)/ffmpeg && git pull
-       cd $(GIT_DRIVERS) && git pull
+       $(MAKE) $(GIT_LIBRARIES)/dvbsi
+       $(MAKE) $(GIT_LIBRARIES)/ffmpeg
+       $(MAKE) $(GIT_DRIVERS)
 
 update-svn-target:
        $(MAKE) modules includes-and-libs
@@ -133,9 +133,9 @@ wittinobi-init:
        @echo ' ============================================================================== '
 
 wittinobi-neutrino:
-       if [ $(MULTIMEDIA) == no ]; then \
+       if [ $(MULTIMEDIA) = "no" ]; then \
                $(MAKE) neutrino applications-all plugins skeleton rootfs; \
-       elif [ $(MULTIMEDIA) == yes ]; then \
+       elif [ $(MULTIMEDIA) = "yes" ]; then \
                $(MAKE) neutrino applications-all plugins multimedia skeleton rootfs; \
        else \
                $(MAKE) neutrino applications-all plugins skeleton rootfs; \
@@ -146,9 +146,9 @@ wittinobi-neutrino:
        @echo ' ============================================================================== '
 
 wittinobi-neutrino-new:
-       if [ $(MULTIMEDIA) == no ]; then \
+       if [ $(MULTIMEDIA) = "no" ]; then \
                $(MAKE) neutrino-new applications-all-new plugins-new skeleton rootfs; \
-       elif [ $(MULTIMEDIA) == yes ]; then \
+       elif [ $(MULTIMEDIA) = "yes" ]; then \
                $(MAKE) neutrino-new applications-all-new plugins-new multimedia-new skeleton rootfs; \
        else \
                $(MAKE) neutrino-new applications-all-new plugins-new skeleton rootfs; \
@@ -159,9 +159,9 @@ wittinobi-neutrino-new:
        @echo ' ============================================================================== '
 
 wittinobi-neutrino-flash:
-       if [ $(MULTIMEDIA) == no ]; then \
+       if [ $(MULTIMEDIA) = "no" ]; then \
                $(MAKE) neutrino applications-all plugins skeleton rootfs flash; \
-       elif [ $(MULTIMEDIA) == yes ]; then \
+       elif [ $(MULTIMEDIA) = "yes" ]; then \
                $(MAKE) neutrino applications-all plugins multimedia skeleton rootfs flash; \
        else \
                $(MAKE) neutrino applications-all plugins skeleton rootfs flash; \
@@ -172,9 +172,9 @@ wittinobi-neutrino-flash:
        @echo ' ============================================================================== '
 
 wittinobi-neutrino-flash-new:
-       if [ $(MULTIMEDIA) == no ]; then \
+       if [ $(MULTIMEDIA) = "no" ]; then \
                $(MAKE) neutrino-new applications-all-new plugins-new skeleton rootfs flash; \
-       elif [ $(MULTIMEDIA) == yes ]; then \
+       elif [ $(MULTIMEDIA) = "yes" ]; then \
                $(MAKE) neutrino-new applications-all-new plugins-new multimedia-new skeleton rootfs flash; \
        else \
                $(MAKE) neutrino-new applications-all-new plugins-new skeleton rootfs flash; \
@@ -185,9 +185,9 @@ wittinobi-neutrino-flash-new:
        @echo ' ============================================================================== '
 
 wittinobi-all:
-       if [ $(MULTIMEDIA) == no ]; then \
+       if [ $(MULTIMEDIA) = "no" ]; then \
                $(MAKE) neutrino applications-all plugins skeleton bootloader kernel drivers rootfs flash flash-full; \
-       elif [ $(MULTIMEDIA) == yes ]; then \
+       elif [ $(MULTIMEDIA) = "yes" ]; then \
                $(MAKE) neutrino applications-all plugins multimedia skeleton bootloader kernel drivers rootfs flash flash-full; \
        else \
                $(MAKE) neutrino applications-all plugins skeleton bootloader kernel drivers rootfs flash flash-full; \
@@ -198,9 +198,9 @@ wittinobi-all:
        @echo ' ============================================================================== '
 
 wittinobi-all-new:
-       if [ $(MULTIMEDIA) == no ]; then \
+       if [ $(MULTIMEDIA) = "no" ]; then \
                $(MAKE) neutrino-new applications-all-new plugins-new skeleton bootloader kernel-new drivers-new rootfs flash flash-full; \
-       elif [ $(MULTIMEDIA) == yes ]; then \
+       elif [ $(MULTIMEDIA) = "yes" ]; then \
                $(MAKE) neutrino-new applications-all-new plugins-new multimedia-new skeleton bootloader kernel-new drivers-new rootfs flash flash-full; \
        else \
                $(MAKE) neutrino-new applications-all-new plugins-new skeleton bootloader kernel-new drivers-new rootfs flash flash-full; \
@@ -220,11 +220,11 @@ bootstrap:
 includes-and-libs:
        $(MAKE) $(TARGETPREFIX)/lib/libnxp.so $(TARGETPREFIX)/lib/libcoolstream.so $(TARGETPREFIX)/lib/firmware $(TARGETPREFIX)/include/coolstream
 modules:
-       if [ $(CST_KERNEL_VERSION) == 2.6.26.8-nevis ]; then \
+       if [ $(CST_KERNEL_VERSION) = "2.6.26.8-nevis" ]; then \
                $(MAKE) $(TARGETPREFIX)/lib/modules/2.6.26.8-nevis; \
-       elif [ $(CST_KERNEL_VERSION) == beta-2.6.26.8-nevis ]; then \
+       elif [ $(CST_KERNEL_VERSION) = "beta-2.6.26.8-nevis" ]; then \
                $(MAKE) $(TARGETPREFIX)/lib/modules/beta-2.6.26.8-nevis; \
-       elif [ $(CST_KERNEL_VERSION) == 2.6.39.3-nevis+ ]; then \
+       elif [ $(CST_KERNEL_VERSION) = "2.6.39.3-nevis+" ]; then \
                $(MAKE) $(TARGETPREFIX)/lib/modules/2.6.39.3-nevis+; \
        else \
                $(MAKE) $(TARGETPREFIX)/lib/modules/2.6.26.8-nevis; \
@@ -244,17 +244,17 @@ libraries-new:
 
 # applications.mk
 applications-all:
-       if [ $(LCD4LINUX) == no ]; then \
+       if [ $(LCD4LINUX) = "no ]; then \
                $(MAKE) $(D)/links $(D)/procps $(D)/busybox $(D)/e2fsprogs $(D)/hotplug $(D)/fbshot $(D)/vsftpd $(D)/flashcp; \
-       elif [ $(LCD4LINUX) == yes ]; then \
+       elif [ $(LCD4LINUX) = "yes" ]; then \
                $(MAKE) $(D)/links $(D)/procps $(D)/busybox $(D)/e2fsprogs $(D)/hotplug $(D)/fbshot $(D)/vsftpd $(D)/flashcp $(D)/lcd4linux; \
        else \
                $(MAKE) $(D)/links $(D)/procps $(D)/busybox $(D)/e2fsprogs $(D)/hotplug $(D)/fbshot $(D)/vsftpd $(D)/flashcp; \
        fi
 applications-all-new:
-       if [ $(LCD4LINUX) == no ]; then \
+       if [ $(LCD4LINUX) = "no" ]; then \
                $(MAKE) $(D)/links-new $(D)/procps-new $(D)/busybox-new $(D)/e2fsprogs-new $(D)/hotplug $(D)/fbshot-new $(D)/vsftpd-new $(D)/flashcp; \
-       elif [ $(LCD4LINUX) == yes ]; then \
+       elif [ $(LCD4LINUX) = "yes" ]; then \
                $(MAKE) $(D)/links-new $(D)/procps-new $(D)/busybox-new $(D)/e2fsprogs-new $(D)/hotplug $(D)/fbshot-new $(D)/vsftpd-new $(D)/flashcp $(D)/lcd4linux-new; \
        else \
                $(MAKE) $(D)/links-new $(D)/procps-new $(D)/busybox-new $(D)/e2fsprogs-new $(D)/hotplug $(D)/fbshot-new $(D)/vsftpd-new $(D)/flashcp; \
@@ -278,21 +278,21 @@ multimedia-new:
 
 # kernel.mk
 kernel:
-       if [ $(CST_KERNEL_VERSION) == 2.6.26.8-nevis ]; then \
+       if [ $(CST_KERNEL_VERSION) = "2.6.26.8-nevis" ]; then \
                $(MAKE) $(D)/coolstream-kernel-2.6.26.8-nevis; \
-       elif [ $(CST_KERNEL_VERSION) == beta-2.6.26.8-nevis ]; then \
+       elif [ $(CST_KERNEL_VERSION) = "beta-2.6.26.8-nevis" ]; then \
                $(MAKE) $(D)/coolstream-kernel-beta-2.6.26.8-nevis; \
-       elif [ $(CST_KERNEL_VERSION) == 2.6.39.3-nevis+ ]; then \
+       elif [ $(CST_KERNEL_VERSION) = "2.6.39.3-nevis+" ]; then \
                $(MAKE) $(D)/coolstream-kernel-2.6.39.3-nevis+; \
        else \
                $(MAKE) $(D)/coolstream-kernel-2.6.26.8-nevis; \
        fi
 kernel-new:
-       if [ $(CST_KERNEL_VERSION) == 2.6.26.8-nevis ]; then \
+       if [ $(CST_KERNEL_VERSION) = "2.6.26.8-nevis" ]; then \
                $(MAKE) $(D)/coolstream-kernel-2.6.26.8-nevis-new; \
-       elif [ $(CST_KERNEL_VERSION) == beta-2.6.26.8-nevis ]; then \
+       elif [ $(CST_KERNEL_VERSION) = "beta-2.6.26.8-nevis" ]; then \
                $(MAKE) $(D)/coolstream-kernel-beta-2.6.26.8-nevis-new; \
-       elif [ $(CST_KERNEL_VERSION) == 2.6.39.3-nevis+ ]; then \
+       elif [ $(CST_KERNEL_VERSION) = "2.6.39.3-nevis+" ]; then \
                $(MAKE) $(D)/coolstream-kernel-2.6.39.3-nevis+-new; \
        else \
                $(MAKE) $(D)/coolstream-kernel-2.6.26.8-nevis-new; \
@@ -304,21 +304,21 @@ bootloader:
 
 # drivers.mk
 drivers:
-       if [ $(CST_KERNEL_VERSION) == 2.6.26.8-nevis ]; then \
+       if [ $(CST_KERNEL_VERSION) = "2.6.26.8-nevis" ]; then \
                $(MAKE) $(D)/realtek-wireless-kernel-2.6.26.8-nevis; \
-       elif [ $(CST_KERNEL_VERSION) == beta-2.6.26.8-nevis ]; then \
+       elif [ $(CST_KERNEL_VERSION) = "beta-2.6.26.8-nevis" ]; then \
                $(MAKE) $(D)/realtek-wireless-kernel-beta-2.6.26.8-nevis; \
-       elif [ $(CST_KERNEL_VERSION) == 2.6.39.3-nevis+ ]; then \
+       elif [ $(CST_KERNEL_VERSION) = "2.6.39.3-nevis+" ]; then \
                $(MAKE) $(D)/realtek-wireless-kernel-2.6.39.3-nevis+; \
        else \
                $(MAKE) $(D)/realtek-wireless-kernel-2.6.26.8-nevis; \
        fi
 drivers-new:
-       if [ $(CST_KERNEL_VERSION) == 2.6.26.8-nevis ]; then \
+       if [ $(CST_KERNEL_VERSION) = "2.6.26.8-nevis" ]; then \
                $(MAKE) $(D)/realtek-wireless-kernel-2.6.26.8-nevis-new; \
-       elif [ $(CST_KERNEL_VERSION) == beta-2.6.26.8-nevis ]; then \
+       elif [ $(CST_KERNEL_VERSION) = "beta-2.6.26.8-nevis" ]; then \
                $(MAKE) $(D)/realtek-wireless-kernel-beta-2.6.26.8-nevis-new; \
-       elif [ $(CST_KERNEL_VERSION) == 2.6.39.3-nevis+ ]; then \
+       elif [ $(CST_KERNEL_VERSION) = "2.6.39.3-nevis+" ]; then \
                $(MAKE) $(D)/realtek-wireless-kernel-2.6.39.3-nevis+-new; \
        else \
                $(MAKE) $(D)/realtek-wireless-kernel-2.6.26.8-nevis-new; \

diff --git a/make/bootstrap.mk b/make/bootstrap.mk
index 747310805fbf4092442aeeb60e80e97be9796594..20f29e1e35215231cd3177db6577f8c3f1b21183 100755 (executable)
--- a/make/bootstrap.mk
+++ b/make/bootstrap.mk
@@ -33,14 +33,14 @@ $(HOSTPREFIX)/bin: $(HOSTPREFIX)
        mkdir $@
 
 $(TARGETPREFIX)/lib/libnxp.so: | $(TARGETPREFIX)
-       if [ $(NEUTRINO_HD_PORT) == neutrino-hd-single-old ]; then \
+       if [ $(NEUTRINO_HD_PORT) = "neutrino-hd-single-old" ]; then \
                cp -a $(SOURCE_DIR)/svn/THIRDPARTY/libraries/libnxp/libnxp.so $@; \
        else \
                cp -a $(SOURCE_DIR)/git/DRIVERS/libs/libnxp.so $@; \
        fi
 
 $(TARGETPREFIX)/lib/libcoolstream.so: | $(TARGETPREFIX)
-       if [ $(NEUTRINO_HD_PORT) == neutrino-hd-single-old ]; then \
+       if [ $(NEUTRINO_HD_PORT) = "neutrino-hd-single-old" ]; then \
                cp -a $(SOURCE_DIR)/svn/THIRDPARTY/libraries/libcs/libcoolstream.so $(TARGETPREFIX)/lib/libcoolstream.so; \
        else \
                cp -a $(SOURCE_DIR)/git/DRIVERS/libs/libcoolstream-mt.so $(TARGETPREFIX)/lib/libcoolstream-mt.so; \
@@ -55,7 +55,7 @@ $(TARGETPREFIX)/include/coolstream: | $(TARGETPREFIX)
        cp -a $(SOURCE_DIR)/svn/CROSSENVIROMENT/coolstream/* $@/
 
 $(TARGETPREFIX)/lib/modules/2.6.26.8-nevis: | $(TARGETPREFIX)
-       if [ $(NEUTRINO_HD_PORT) == neutrino-hd-single-old ]; then \
+       if [ $(NEUTRINO_HD_PORT) = "neutrino-hd-single-old" ]; then \
                mkdir -p $@; \
                cp -a $(SOURCE_DIR)/svn/COOLSTREAM/2.6.26.8-nevis/* $@/; \
        else \

diff --git a/make/prerequisites.mk b/make/prerequisites.mk
index dceaaf5b89450afbcea4b6efafae63d73786e7ff..cd14035f7f8b95fcaf98adf993cf3f6bd716feca 100755 (executable)
--- a/make/prerequisites.mk
+++ b/make/prerequisites.mk
@@ -3,62 +3,62 @@
 $(SOURCE_DIR)/neutrino-hd:
        mkdir -p $(SOURCE_DIR)
        cd $(SOURCE_DIR) && \
-               if [ $(NEUTRINO_HD_PORT) == neutrino-hd-novatux ]; then \
+               if [ $(NEUTRINO_HD_PORT) = "neutrino-hd-novatux" ]; then \
                        if [ -d $(SOURCE_DIR)/neutrino-hd-novatux/ ]; then \
                                cd $(SOURCE_DIR)/neutrino-hd-novatux && \
-                               git pull origin tuxbox-port; \
+                               git pull && \
                                rm -rf $(SOURCE_DIR)/neutrino-hd; \
-                               ln -sf $(SOURCE_DIR)/neutrino-hd-novatux $(SOURCE_DIR)/neutrino-hd; \
+                               cd $(SOURCE_DIR) && \
+                               ln -sf neutrino-hd-novatux neutrino-hd; \
                        else \
                                git clone $(NTGIT)/neutrino-hd/ neutrino-hd-novatux; \
                                cd $(SOURCE_DIR)/neutrino-hd-novatux && \
-                               git checkout origin/tuxbox-port; \
-                               git checkout -b tuxbox-port; \
+                               git checkout --track -b tuxbox-port origin/tuxbox-port && \
                                rm -rf $(SOURCE_DIR)/neutrino-hd; \
                                cd $(SOURCE_DIR) && \
                                ln -sf neutrino-hd-novatux neutrino-hd; \
                        fi; \
-               elif [ $(NEUTRINO_HD_PORT) == neutrino-hd-single-old ]; then \
+               elif [ $(NEUTRINO_HD_PORT) = "neutrino-hd-single-old" ]; then \
                        if [ -d $(SOURCE_DIR)/neutrino-hd-single-old/ ]; then \
                                cd $(SOURCE_DIR)/neutrino-hd-single-old && \
-                               git pull origin neutrino-experimental; \
+                               git pull && \
                                rm -rf $(SOURCE_DIR)/neutrino-hd; \
-                               ln -sf $(SOURCE_DIR)/neutrino-hd-single-old $(SOURCE_DIR)/neutrino-hd; \
+                               cd $(SOURCE_DIR) && \
+                               ln -sf neutrino-hd-single-old neutrino-hd; \
                        else \
                                git clone $(CSGIT)/cst-public-gui-neutrino.git/ neutrino-hd-single-old; \
                                cd $(SOURCE_DIR)/neutrino-hd-single-old && \
-                               git checkout origin/neutrino-experimental; \
-                               git checkout -b neutrino-experimental; \
+                               git checkout --track -b neutrino-experimental origin/neutrino-experimental && \
                                rm -rf $(SOURCE_DIR)/neutrino-hd; \
                                cd $(SOURCE_DIR) && \
                                ln -sf neutrino-hd-single-old neutrino-hd; \
                        fi; \
-               elif [ $(NEUTRINO_HD_PORT) == neutrino-hd-single ]; then \
+               elif [ $(NEUTRINO_HD_PORT) = "neutrino-hd-single" ]; then \
                        if [ -d $(SOURCE_DIR)/neutrino-hd-single/ ]; then \
                                cd $(SOURCE_DIR)/neutrino-hd-single && \
-                               git pull origin single; \
+                               git pull && \
                                rm -rf $(SOURCE_DIR)/neutrino-hd; \
-                               ln -sf $(SOURCE_DIR)/neutrino-hd-single $(SOURCE_DIR)/neutrino-hd; \
+                               cd $(SOURCE_DIR) && \
+                               ln -sf neutrino-hd-single neutrino-hd; \
                        else \
                                git clone $(CSGIT)/cst-public-gui-neutrino.git/ neutrino-hd-single; \
                                cd $(SOURCE_DIR)/neutrino-hd-single && \
-                               git checkout origin/single; \
-                               git checkout -b single; \
+                               git checkout --track -b single origin/single && \
                                rm -rf $(SOURCE_DIR)/neutrino-hd; \
                                cd $(SOURCE_DIR) && \
                                ln -sf neutrino-hd-single neutrino-hd; \
                        fi; \
-               elif [ $(NEUTRINO_HD_PORT) == neutrino-hd-twin ]; then \
+               elif [ $(NEUTRINO_HD_PORT) = "neutrino-hd-twin" ]; then \
                        if [ -d $(SOURCE_DIR)/neutrino-hd-twin/ ]; then \
                                cd $(SOURCE_DIR)/neutrino-hd-twin && \
-                               git pull origin dvbsi++; \
+                               git pull && \
                                rm -rf $(SOURCE_DIR)/neutrino-hd; \
-                               ln -sf $(SOURCE_DIR)/neutrino-hd-twin $(SOURCE_DIR)/neutrino-hd; \
+                               cd $(SOURCE_DIR) && \
+                               ln -sf neutrino-hd-twin neutrino-hd; \
                        else \
                                git clone $(CSGIT)/cst-public-gui-neutrino.git/ neutrino-hd-twin; \
                                cd $(SOURCE_DIR)/neutrino-hd-twin && \
-                               git checkout origin/dvbsi++; \
-                               git checkout -b dvbsi++; \
+                               git checkout --track -b dvbsi++ origin/dvbsi++ && \
                                rm -rf $(SOURCE_DIR)/neutrino-hd; \
                                cd $(SOURCE_DIR) && \
                                ln -sf neutrino-hd-twin neutrino-hd; \
@@ -66,14 +66,14 @@ $(SOURCE_DIR)/neutrino-hd:
                else \
                        if [ -d $(SOURCE_DIR)/neutrino-hd-single/ ]; then \
                                cd $(SOURCE_DIR)/neutrino-hd-single && \
-                               git pull origin single; \
+                               git pull && \
                                rm -rf $(SOURCE_DIR)/neutrino-hd; \
-                               ln -sf $(SOURCE_DIR)/neutrino-hd-single $(SOURCE_DIR)/neutrino-hd; \
+                               cd $(SOURCE_DIR) && \
+                               ln -sf neutrino-hd-single neutrino-hd; \
                        else \
                                git clone $(CSGIT)/cst-public-gui-neutrino.git/ neutrino-hd-single; \
                                cd $(SOURCE_DIR)/neutrino-hd-single && \
-                               git checkout origin/single; \
-                               git checkout -b single; \
+                               git checkout --track -b single origin/single && \
                                rm -rf $(SOURCE_DIR)/neutrino-hd; \
                                cd $(SOURCE_DIR) && \
                                ln -sf neutrino-hd-single neutrino-hd; \