From: Markham Date: Sat, 19 Mar 2016 17:45:20 +0000 (+0100) Subject: update/simplify target crosstool X-Git-Url: https://git.webhop.me/?a=commitdiff_plain;h=ab4df4c51d46651718ea38ee1ceff6b04772709d;p=bs-cst-neutrino-hd.git update/simplify target crosstool --- diff --git a/archive-patches/ct-ng-1.20/ct-ng-1.21.0-2.config b/archive-patches/ct-ng-1.20/ct-ng-1.21.0-2.config index 37eb338..1f8b196 100644 --- a/archive-patches/ct-ng-1.20/ct-ng-1.21.0-2.config +++ b/archive-patches/ct-ng-1.20/ct-ng-1.21.0-2.config @@ -223,14 +223,14 @@ CT_TOOLCHAIN_ENABLE_NLS=y # CT_KERNEL_SUPPORTS_SHARED_LIBS=y CT_KERNEL="linux" -CT_KERNEL_VERSION="${CST_CUSTOM_KERNEL_VER}" +CT_KERNEL_VERSION="custom" # CT_KERNEL_bare_metal is not set CT_KERNEL_linux=y CT_KERNEL_bare_metal_AVAILABLE=y CT_KERNEL_linux_AVAILABLE=y CT_KERNEL_LINUX_CUSTOM=y -CT_KERNEL_LINUX_CUSTOM_LOCATION="${CST_CUSTOM_KERNEL}" -CT_KERNEL_LINUX_CUSTOM_VERSION="${CST_CUSTOM_KERNEL_VER}" +CT_KERNEL_LINUX_CUSTOM_LOCATION="${CST_BASE_DIR}/source/linux/" +CT_KERNEL_LINUX_CUSTOM_VERSION="custom" CT_KERNEL_windows_AVAILABLE=y # diff --git a/archive-patches/ct-ng-1.20/ct-ng-nevis-1.20.0-1.config b/archive-patches/ct-ng-1.20/ct-ng-nevis-1.20.0-1.config index ad7cdee..cdc4fb3 100644 --- a/archive-patches/ct-ng-1.20/ct-ng-nevis-1.20.0-1.config +++ b/archive-patches/ct-ng-1.20/ct-ng-nevis-1.20.0-1.config @@ -258,7 +258,7 @@ CT_KERNEL_linux_AVAILABLE=y # CT_KERNEL_V_2_6_31 is not set # CT_KERNEL_V_2_6_27 is not set CT_KERNEL_LINUX_CUSTOM=y -CT_KERNEL_LINUX_CUSTOM_LOCATION="${CST_CUSTOM_KERNEL}" +CT_KERNEL_LINUX_CUSTOM_LOCATION="${CST_BASE_DIR}/source/linux/" CT_KERNEL_windows_AVAILABLE=y # diff --git a/make/applications.mk b/make/applications.mk index 8b435a3..85be4a6 100755 --- a/make/applications.mk +++ b/make/applications.mk @@ -29,6 +29,7 @@ $(D)/busybox: $(ARCHIVE)/busybox-$(BUSYBOX_VER).tar.bz2 | $(TARGETPREFIX) $(PATCH)/busybox-1.21.1-changing-the-order-sys-tree-is-scanned-with-mdev.diff; \ $(PATCH)/busybox-1.21.1-mdev.diff; \ $(PATCH)/busybox-1.22.1-coolstream.diff; \ + $(PATCH)/busybox-1.24.1-wget.diff; \ cp $(PATCHES)/busybox-1.22.1-hd1.config .config && \ sed -i -e 's#^CONFIG_PREFIX.*#CONFIG_PREFIX="$(TARGETPREFIX)"#' .config && \ $(MAKE) all CROSS_COMPILE=$(TARGET)- CFLAGS_EXTRA="$(TARGET_CFLAGS)" && \ diff --git a/make/crosstool.mk b/make/crosstool.mk index e055b45..1cbcae7 100755 --- a/make/crosstool.mk +++ b/make/crosstool.mk @@ -18,11 +18,9 @@ endif ifeq ($(PLATFORM), nevis) ## Platform nevis CT_NG_CONFIG = $(PATCHES)/ct-ng-1.20/ct-ng-nevis-1.20.0-1.config -CUSTOM_KERNEL = $(ARCHIVE)/linux-$(CST_KERNEL_VERSION)-cnxt.tar.bz2 CUSTOM_GCC = $(ARCHIVE)/gcc-$(CUSTOM_GCC_VER).tar.xz -crosstool: prerequisites | $(CUSTOM_GCC) $(ARCHIVE)/crosstool-$(CROSSTOOL_NG_VER)-downloads.tar.bz2 \ -$(ARCHIVE)/$(CUSTOM_KERNEL_VER).tar.xz $(CUSTOM_GCC) +crosstool: prerequisites | $(CUSTOM_GCC) $(ARCHIVE)/crosstool-$(CROSSTOOL_NG_VER)-downloads.tar.bz2 mkdir -p $(BUILD_TMP); \ $(UNTAR)/crosstool-ng-$(CROSSTOOL_NG_VER).tar.bz2; \ set -e; unset CONFIG_SITE; cd $(BUILD_TMP)/crosstool-ng-$(CROSSTOOL_NG_VER); \ @@ -49,7 +47,6 @@ $(ARCHIVE)/$(CUSTOM_KERNEL_VER).tar.xz $(CUSTOM_GCC) test $$NUM_CPUS = 0 && NUM_CPUS=1; \ sed -i "s@^CT_PARALLEL_JOBS=.*@CT_PARALLEL_JOBS=$$NUM_CPUS@" .config; \ export CST_BASE_DIR=$(BASE_DIR); \ - export CST_CUSTOM_KERNEL=$(CUSTOM_KERNEL); \ export CST_CUSTOM_GCC=$(CUSTOM_GCC); \ test -f ./configure || ./bootstrap && \ ./configure --enable-local; MAKELEVEL=0 make; chmod 0755 ct-ng; \ @@ -79,12 +76,8 @@ else CT_NG_CONFIG = $(PATCHES)/ct-ng-1.20/ct-ng-1.20.0-1-glibc.config endif ## ifeq ($(UCLIBC_BUILD), 1) -CUSTOM_KERNEL_VER = cst-kernel_cst_3.10.93_2015-12-02_0824_c439541 -CUSTOM_KERNEL = $(ARCHIVE)/linux-$(CUSTOM_KERNEL_VER).tar.xz -CUSTOM_GCC = $(ARCHIVE)/gcc-$(CUSTOM_GCC_VER).tar.xz - -crosstool: prerequisites | $(CUSTOM_GCC) $(ARCHIVE)/crosstool-ng-git-$(CROSSTOOL_NG_VER).tar.gz \ -$(ARCHIVE)/$(CUSTOM_KERNEL_VER).tar.xz $(CUSTOM_GCC) +CUSTOM_GCC = $(ARCHIVE)/gcc-$(CUSTOM_GCC_VER).tar.xz +crosstool: prerequisites | $(CUSTOM_GCC) $(ARCHIVE)/crosstool-ng-git-$(CROSSTOOL_NG_VER).tar.gz make -p $(BUILD_TMP) $(UNTAR)/crosstool-ng-git-$(CROSSTOOL_NG_VER).tar.gz mkdir -p $(BUILD_TMP)/crosstool-ng-git-$(CROSSTOOL_NG_VER)/targets/src @@ -102,7 +95,6 @@ $(ARCHIVE)/$(CUSTOM_KERNEL_VER).tar.xz $(CUSTOM_GCC) touch .gcc-$(CUSTOM_GCC_VER).patched set -e; unset CONFIG_SITE; cd $(BUILD_TMP)/crosstool-ng-git-$(CROSSTOOL_NG_VER); \ \ - ln -sf $(CUSTOM_KERNEL_VER).tar.xz $(CUSTOM_KERNEL); \ cp -a $(CT_NG_CONFIG) .config; \ \ NUM_CPUS=$$(expr `getconf _NPROCESSORS_ONLN` \* 2); \ @@ -122,9 +114,6 @@ $(ARCHIVE)/$(CUSTOM_KERNEL_VER).tar.xz $(CUSTOM_GCC) fi; \ \ export CST_BASE_DIR=$(BASE_DIR); \ - export CST_CUSTOM_KERNEL=$(CUSTOM_KERNEL); \ - export CST_CUSTOM_KERNEL_VER=$(CUSTOM_KERNEL_VER); \ - export CST_KERNEL_VERSION=$(CST_KERNEL_VERSION); \ export CST_CUSTOM_GCC=$(CUSTOM_GCC); \ export LD_LIBRARY_PATH=; \ if [ "$(USE_UCLIBC_NG)" = "1" ]; then \ diff --git a/make/environment.mk b/make/environment.mk index f7a6e5f..789fe30 100755 --- a/make/environment.mk +++ b/make/environment.mk @@ -50,14 +50,14 @@ ifeq ($(BOXMODEL), $(filter $(BOXMODEL), zee2 link)) TARGET ?= arm-cortex-linux-uclibcgnueabi PLATFORM = kronos DRIVER_DIR ?= $(PLATFORM)-3.x - CST_KERNEL_VERSION ?= 3.10.93 - KBRANCH ?= cst_3.10.93 + CST_KERNEL_VERSION ?= 3.10.70 + KBRANCH ?= cst_3.10 else ifeq ($(BOXMODEL), $(filter $(BOXMODEL), tank trinity)) TARGET ?= arm-cortex-linux-uclibcgnueabi PLATFORM = apollo DRIVER_DIR ?= $(PLATFORM)-3.x - CST_KERNEL_VERSION ?= 3.10.93 - KBRANCH ?= cst_3.10.93 + CST_KERNEL_VERSION ?= 3.10.70 + KBRANCH ?= cst_3.10 else ifeq ($(BOXMODEL), $(filter $(BOXMODEL), neo zee)) TARGET ?= arm-cx2450x-linux-gnueabi PLATFORM = nevis diff --git a/make/libraries.mk b/make/libraries.mk index 890361a..cc64e43 100755 --- a/make/libraries.mk +++ b/make/libraries.mk @@ -157,6 +157,7 @@ $(D)/openssl: $(ARCHIVE)/openssl-$(OPENSSL_VER)$(OPENSSL_SUBVER).tar.gz | $(TARG $(D)/libcurl: $(ARCHIVE)/curl-$(CURL_VER).tar.bz2 $(D)/openssl $(D)/librtmp $(D)/zlib | $(TARGETPREFIX) $(UNTAR)/curl-$(CURL_VER).tar.bz2 set -e; cd $(BUILD_TMP)/curl-$(CURL_VER); \ + $(PATCH)/libcurl-7.45.0-url.diff; \ $(BUILDENV) LIBS="-lssl -lcrypto -lrtmp -lz" \ ./configure \ --prefix=${PREFIX} \ diff --git a/make/neutrino.mk b/make/neutrino.mk index 5adaf37..e00f9ad 100755 --- a/make/neutrino.mk +++ b/make/neutrino.mk @@ -69,7 +69,7 @@ $(D)/neutrino-hd: $(NEUTRINO_OBJDIR)/config.status $(MAKE) -C $(NEUTRINO_OBJDIR) install DESTDIR=$(TARGETPREFIX) $(MAKE) neutrino-version cp -a $(BUILD_TMP)/neutrino-hd/config.h $(TARGETPREFIX)/include/config.h - touch $@ +# touch $@ $(NEUTRINO_OBJDIR)/config.status: $(NEUTRINO_DEPS) $(D)/neutrino-hd-libs test -d $(NEUTRINO_OBJDIR) || mkdir -p $(NEUTRINO_OBJDIR) diff --git a/make/prerequisites.mk b/make/prerequisites.mk index 0b75c7e..aa9708d 100755 --- a/make/prerequisites.mk +++ b/make/prerequisites.mk @@ -198,6 +198,7 @@ $(GIT_KERNEL): git clone -b $(KBRANCH) $(CSGIT)/cst-public-linux-kernel.git/ linux-$(KBRANCH); \ cd $(GIT_KERNEL)/linux-$(KBRANCH) && \ git checkout $(KBRANCH); \ + ln -s $(GIT_KERNEL)/linux-$(KBRANCH) $(SOURCE_DIR)/linux; \ fi $(GIT_PLUGINS):