add libcool target

diff --git a/Makefile b/Makefile
index 375faa05fbb7977b491b9b594b80d4ea146130c4..c2ca45f9caf995e2dbab4d50807f5156b2a63595 100755 (executable)
--- a/Makefile
+++ b/Makefile
@@ -29,6 +29,7 @@ endif
 include make/plugins-lua.mk
 include make/multimedia.mk
 include make/rootfs.mk
+include make/libcoolstream.mk
 include make/bootloader.mk
 include make/flashimage.mk
 include make/cleantargets.mk
@@ -113,6 +114,7 @@ update-neutrino:
        $(MAKE) $(SOURCE_DIR)/neutrino-hd
 
 update-git-coolstream:
+       $(MAKE) $(GIT_LIBCOOLSTREAM)
        $(MAKE) $(GIT_BOOTLOADER)
        $(MAKE) $(GIT_DRIVERS_THIRDPARTY)
        $(MAKE) $(GIT_DRIVERS)
@@ -122,9 +124,6 @@ update-git-coolstream:
 update-git-armbox:
        $(MAKE) $(GIT_LIBSTB_HAL)
        $(MAKE) $(GIT_LIBSTB_HAL_DDT)
-#      $(MAKE) $(GIT_BOOTLOADER)
-#      $(MAKE) $(GIT_DRIVERS)
-#      $(MAKE) $(GIT_KERNEL_HD51)
        $(MAKE) $(GIT_PLUGINS)
 
 update-git: update-git-$(BOXTYPE)
@@ -192,6 +191,7 @@ neutrino-all:
 # prerequisites.mk
 prerequisites-coolstream:
        $(MAKE) $(SOURCE_DIR)/neutrino-hd
+       $(MAKE) $(GIT_LIBCOOLSTREAM)
        $(MAKE) $(GIT_BOOTLOADER)
        $(MAKE) $(GIT_DRIVERS_THIRDPARTY)
        $(MAKE) $(GIT_DRIVERS)
@@ -202,10 +202,6 @@ prerequisites-armbox:
        $(MAKE) $(SOURCE_DIR)/neutrino-hd
        $(MAKE) $(GIT_LIBSTB_HAL)
        $(MAKE) $(GIT_LIBSTB_HAL_DDT)
-#      $(MAKE) $(GIT_BOOTLOADER)
-#      $(MAKE) $(GIT_DRIVERS_THIRDPARTY)
-#      $(MAKE) $(GIT_DRIVERS)
-#      $(MAKE) $(GIT_KERNEL)
        $(MAKE) $(GIT_PLUGINS)
 
 prerequisites: prerequisites-$(BOXTYPE)

diff --git a/make/environment.mk b/make/environment.mk
index 621c700b3b09d79f741faa1bbf30e7e29aedf021..5b57b2692c7db149bfdc4fc1884114877cc1f702 100755 (executable)
--- a/make/environment.mk
+++ b/make/environment.mk
@@ -303,13 +303,14 @@ CMAKE = \
 SVN   ?= svn
 SVNCO ?= $(SVN) co http://tuxcode.svn.sourceforge.net/svnroot/tuxcode
 
-#CSGIT ?= git://git.coolstreamtech.de
-CSGIT ?= git://github.com/tuxbox-neutrino
+CSGIT  ?= git://github.com/tuxbox-neutrino
+SSHGIT ?= git@github.com:/tuxbox-neutrino
 DDTGIT ?= git://github.com/Duckbox-Developers
 
 NTGIT ?= git://novatux.git.sourceforge.net/gitroot/novatux
 
 # 28 Repositories
+REPO_LIBCOOLSTREAM = libcoolstream.git
 REPO_BOOTLOADER_UBOOT = bootloader-uboot-cst.git
 REPO_DRIVERS_BIN_CST = drivers-bin-cst.git
 REPO_DRIVERS_THIRD_PARTY_CST = drivers-third-party-cst.git
@@ -339,6 +340,7 @@ REPO_PLUGIN_TUXWETTER = plugin-tuxwetter.git
 REPO_PLUGINS = plugins.git # (Enthält Submodules)
 
 # some usefull folders
+GIT_LIBCOOLSTREAM      = $(SOURCE_DIR)/library-coolstream
 GIT_LIBSTB_HAL         = $(SOURCE_DIR)/git/LIBSTB_HAL
 GIT_LIBSTB_HAL_DDT     = $(SOURCE_DIR)/git/LIBSTB_HAL_DDT
 GIT_BOOTLOADER         = $(SOURCE_DIR)/git/BOOTLOADER

diff --git a/make/libcoolstream.mk b/make/libcoolstream.mk
new file mode 100644 (file)
index 0000000..c812803
--- /dev/null
+++ b/make/libcoolstream.mk
@@ -0,0 +1,52 @@
+
+LIBCS_DEBUG            = off
+
+LIBCS_BASE             = $(SOURCE_DIR)/library-coolstream
+EXTRA_INCLUDE_PATH     = -I$(TARGETPREFIX)/include
+EXTRA_LIBRARY_PATH     = -L$(TARGETPREFIX)/lib
+LOCAL_CXXFLAGS         =
+LOCAL_LDFLAGS          =
+
+BOXMODEL               = $(PLATFORM)
+#BOXMODEL              = apollo
+#BOXMODEL              = kronos
+#BOXMODEL              = nevis
+
+ifeq ($(BOXMODEL), nevis)
+       BOXSERIES       = hd1
+else
+       BOXSERIES       = hd2
+endif
+
+LIBCS_DIR              = $(LIBCS_BASE)/$(BOXSERIES)
+LIBCS_INSTALL_DIR      = $(TARGETPREFIX)/lib
+LIBCS_BUILD_DIR                = $(BUILD_TMP)/libcoolstream
+LIBNXP_BUILD_DIR       = $(BUILD_TMP)/libnxp
+
+LIBCS_BUILDARGS                = \
+       CROSS_COMPILE=$(TARGET)-                \
+       CNXT_BASE_ROOT=$(LIBCS_DIR)/includes    \
+       BOXMODEL=$(BOXMODEL)                    \
+       LIBCS_DEBUG=$(LIBCS_DEBUG)
+
+libcoolstream:
+       @rm -fr $(BUILD_TMP)/$(LIBCS_BUILD_DIR)
+       set -e; cd $(LIBCS_DIR);                                        \
+               $(MAKE)                                                 \
+                       BUILD_DIR=$(LIBCS_BUILD_DIR)                    \
+                       EXTRA_INCLUDE_PATH="$(EXTRA_INCLUDE_PATH)"      \
+                       EXTRA_LIBRARY_PATH="$(EXTRA_LIBRARY_PATH)"      \
+                       $(LIBCS_BUILDARGS)
+       @echo "INSTALL libcoolstream-mt.* => $(LIBCS_INSTALL_DIR)"
+#      @cp -frd $(BUILD_TMP)/$(LIBCS_BUILD_DIR)/libcoolstream-mt.* $(LIBCS_INSTALL_DIR)
+
+ifeq ($(BOXMODEL), nevis)
+libnxp:
+       @rm -fr $(LIBNXP_BUILD_DIR)
+       set -e; cd $(LIBCS_DIR)-libnxp;                 \
+               $(MAKE)                                 \
+                       BUILD_DIR=$(LIBNXP_BUILD_DIR)   \
+                       $(LIBCS_BUILDARGS)
+       @echo "INSTALL libnxp.* => $(LIBCS_INSTALL_DIR)"
+       #@cp -frd $(LIBNXP_BUILD_DIR)/libnxp.* $(LIBCS_INSTALL_DIR)
+endif

diff --git a/make/prerequisites.mk b/make/prerequisites.mk
index 11b5fff4400b727038a63b8231926e5863150ee9..27028afb72d228e87a7f8a1ceedf72e627585607 100755 (executable)
--- a/make/prerequisites.mk
+++ b/make/prerequisites.mk
@@ -68,6 +68,22 @@ $(GIT_LIBSTB_HAL_DDT):
                        cd $(GIT_LIBSTB_HAL_DDT); \
                fi
 
+$(GIT_LIBCOOLSTREAM):
+       mkdir -p $(SOURCE_DIR)
+       cd $(SOURCE_DIR) && \
+               if [ -d $(GIT_LIBCOOLSTREAM)/ ]; then \
+                       cd $(GIT_LIBCOOLSTREAM) && \
+                       git checkout pu/new-gcc; \
+                       git pull origin pu/new-gcc; \
+                       cd $(BASE_DIR); \
+                       $(MAKE) libcoolstream-clean; \
+               else \
+                       cd $(SOURCE_DIR); \
+                       git clone $(SSHGIT)/$(REPO_LIBCOOLSTREAM) library-coolstream; \
+                       cd $(GIT_LIBCOOLSTREAM) && \
+                       git checkout pu/new-gcc; \
+               fi
+
 $(GIT_BOOTLOADER):
        mkdir -p $(SOURCE_DIR)/git
        cd $(SOURCE_DIR)/git && \