From dcfe2bae47281261204de3f23e4fb686f3d750ce Mon Sep 17 00:00:00 2001
From: wittinobi <wittinobi@wittinobi.de>
Date: Tue, 22 May 2012 13:54:21 +0200
Subject: [PATCH] tune dvbsi, ffmpeg, git checkout and git pull

---
 make/libraries.mk     |  8 ++++----
 make/prerequisites.mk | 16 ++++++++--------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/make/libraries.mk b/make/libraries.mk
index 3cc06f7..fe2964e 100755
--- a/make/libraries.mk
+++ b/make/libraries.mk
@@ -421,8 +421,8 @@ $(D)/ffmpeg-new: $(ARCHIVE)/ffmpeg-0.8.6.tar.gz | $(TARGETPREFIX)
 	$(REMOVE)/ffmpeg-0.8.6
 	touch $@
 
-$(D)/ffmpeg: $(GIT_LIBRARIES)/ffmpeg | $(TARGETPREFIX)
-	tar -C $(GIT_LIBRARIES) -cp ffmpeg --exclude=.svn | tar -C $(BUILD_TMP) -x
+$(D)/ffmpeg: | $(TARGETPREFIX)
+	tar -C $(SOURCE_DIR)/git/LIBRARIES -cp ffmpeg --exclude=.svn | tar -C $(BUILD_TMP) -x
 	pushd $(BUILD_TMP)/ffmpeg && \
 		CFLAGS=-march=armv6 \
 		./configure \
@@ -497,8 +497,8 @@ $(D)/ffmpeg: $(GIT_LIBRARIES)/ffmpeg | $(TARGETPREFIX)
 	$(REMOVE)/ffmpeg
 	touch $@
 
-$(D)/dvbsi: $(GIT_LIBRARIES)/dvbsi | $(TARGETPREFIX)
-	tar -C $(GIT_LIBRARIES) -cp dvbsi --exclude=.svn | tar -C $(BUILD_TMP) -x
+$(D)/dvbsi: | $(TARGETPREFIX)
+	tar -C $(SOURCE_DIR)/git/LIBRARIES -cp dvbsi --exclude=.svn | tar -C $(BUILD_TMP) -x
 	pushd $(BUILD_TMP)/dvbsi && \
 		./autogen.sh && \
 		CCPATH=	\
diff --git a/make/prerequisites.mk b/make/prerequisites.mk
index cd14035..627bba6 100755
--- a/make/prerequisites.mk
+++ b/make/prerequisites.mk
@@ -6,7 +6,7 @@ $(SOURCE_DIR)/neutrino-hd:
 		if [ $(NEUTRINO_HD_PORT) = "neutrino-hd-novatux" ]; then \
 			if [ -d $(SOURCE_DIR)/neutrino-hd-novatux/ ]; then \
 				cd $(SOURCE_DIR)/neutrino-hd-novatux && \
-				git pull && \
+				git pull origin tuxbox-port && \
 				rm -rf $(SOURCE_DIR)/neutrino-hd; \
 				cd $(SOURCE_DIR) && \
 				ln -sf neutrino-hd-novatux neutrino-hd; \
@@ -21,7 +21,7 @@ $(SOURCE_DIR)/neutrino-hd:
 		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 && \
+				git pull origin neutrino-experimental && \
 				rm -rf $(SOURCE_DIR)/neutrino-hd; \
 				cd $(SOURCE_DIR) && \
 				ln -sf neutrino-hd-single-old neutrino-hd; \
@@ -36,7 +36,7 @@ $(SOURCE_DIR)/neutrino-hd:
 		elif [ $(NEUTRINO_HD_PORT) = "neutrino-hd-single" ]; then \
 			if [ -d $(SOURCE_DIR)/neutrino-hd-single/ ]; then \
 				cd $(SOURCE_DIR)/neutrino-hd-single && \
-				git pull && \
+				git pull origin single && \
 				rm -rf $(SOURCE_DIR)/neutrino-hd; \
 				cd $(SOURCE_DIR) && \
 				ln -sf neutrino-hd-single neutrino-hd; \
@@ -51,7 +51,7 @@ $(SOURCE_DIR)/neutrino-hd:
 		elif [ $(NEUTRINO_HD_PORT) = "neutrino-hd-twin" ]; then \
 			if [ -d $(SOURCE_DIR)/neutrino-hd-twin/ ]; then \
 				cd $(SOURCE_DIR)/neutrino-hd-twin && \
-				git pull && \
+				git pull origin dvbsi++ && \
 				rm -rf $(SOURCE_DIR)/neutrino-hd; \
 				cd $(SOURCE_DIR) && \
 				ln -sf neutrino-hd-twin neutrino-hd; \
@@ -66,7 +66,7 @@ $(SOURCE_DIR)/neutrino-hd:
 		else \
 			if [ -d $(SOURCE_DIR)/neutrino-hd-single/ ]; then \
 				cd $(SOURCE_DIR)/neutrino-hd-single && \
-				git pull && \
+				git pull origin single && \
 				rm -rf $(SOURCE_DIR)/neutrino-hd; \
 				cd $(SOURCE_DIR) && \
 				ln -sf neutrino-hd-single neutrino-hd; \
@@ -137,7 +137,7 @@ $(GIT_LIBRARIES)/dvbsi:
 		else \
 			git clone $(CSGIT)/cst-public-libraries-dvbsi.git/ dvbsi; \
 			cd $(GIT_LIBRARIES)/dvbsi && \
-			git checkout origin/master; \
+			git checkout --track master origin/master; \
 		fi
 
 $(GIT_LIBRARIES)/ffmpeg:
@@ -149,7 +149,7 @@ $(GIT_LIBRARIES)/ffmpeg:
 		else \
 			git clone $(CSGIT)/cst-public-libraries-ffmpeg.git/ ffmpeg; \
 			cd $(GIT_LIBRARIES)/ffmpeg && \
-			git checkout origin/master; \
+			git checkout --track master origin/master; \
 		fi
 
 $(GIT_DRIVERS):
@@ -162,7 +162,7 @@ $(GIT_DRIVERS):
 			cd $(SOURCE_DIR)/git; \
 			git clone $(CSGIT)/cst-public-drivers.git/ DRIVERS; \
 			cd $(GIT_DRIVERS) && \
-			git checkout origin/master; \
+			git checkout --track master origin/master; \
 		fi
 
 # hack to make sure they are always copied
-- 
2.39.5