From b5016b941c497135b0c90a09b6847435ea451b3c Mon Sep 17 00:00:00 2001 From: Markham Date: Sat, 25 Dec 2021 20:34:41 +0100 Subject: [PATCH] bump version uClibc-ng-1.0.39 --- archive-patches/ct-ng/ct-ng-git-5659366-gcc-9.2.0-hd2.config | 2 +- .../{ct-ng-uClibc-1.0.37.config => ct-ng-uClibc-1.0.39.config} | 2 +- make/crosstool.mk | 2 +- make/prerequisites.mk | 2 +- make/versions.mk | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) rename archive-patches/ct-ng/{ct-ng-uClibc-1.0.37.config => ct-ng-uClibc-1.0.39.config} (99%) diff --git a/archive-patches/ct-ng/ct-ng-git-5659366-gcc-9.2.0-hd2.config b/archive-patches/ct-ng/ct-ng-git-5659366-gcc-9.2.0-hd2.config index 79ceed3..d1960dd 100644 --- a/archive-patches/ct-ng/ct-ng-git-5659366-gcc-9.2.0-hd2.config +++ b/archive-patches/ct-ng/ct-ng-git-5659366-gcc-9.2.0-hd2.config @@ -462,7 +462,7 @@ CT_UCLIBC_NG_PKG_NAME="uClibc-ng" # CT_UCLIBC_NG_SRC_RELEASE is not set # CT_UCLIBC_NG_SRC_DEVEL is not set CT_UCLIBC_NG_SRC_CUSTOM=y -CT_UCLIBC_NG_CUSTOM_LOCATION="${CST_BASE_DIR}/build_tmp/uClibc-ng-1.0.37" +CT_UCLIBC_NG_CUSTOM_LOCATION="${CST_BASE_DIR}/build_tmp/uClibc-ng-${CST_UCLIBC_VER}" CT_UCLIBC_NG_PATCH_GLOBAL=y # CT_UCLIBC_NG_PATCH_BUNDLED is not set # CT_UCLIBC_NG_PATCH_LOCAL is not set diff --git a/archive-patches/ct-ng/ct-ng-uClibc-1.0.37.config b/archive-patches/ct-ng/ct-ng-uClibc-1.0.39.config similarity index 99% rename from archive-patches/ct-ng/ct-ng-uClibc-1.0.37.config rename to archive-patches/ct-ng/ct-ng-uClibc-1.0.39.config index 3a07a62..8f70673 100644 --- a/archive-patches/ct-ng/ct-ng-uClibc-1.0.37.config +++ b/archive-patches/ct-ng/ct-ng-uClibc-1.0.39.config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# uClibc-ng 1.0.37 C Library Configuration +# uClibc-ng 1.0.39 C Library Configuration # # TARGET_aarch64 is not set # TARGET_alpha is not set diff --git a/make/crosstool.mk b/make/crosstool.mk index 1891d28..22a9fe8 100755 --- a/make/crosstool.mk +++ b/make/crosstool.mk @@ -63,8 +63,8 @@ crosstool-ng: prerequisites | $(ARCHIVE)/uClibc-ng-$(UCLIBC_VER).tar.xz $(ARCHIV sed -i "s@^CT_PARALLEL_JOBS=.*@CT_PARALLEL_JOBS=$$NUM_CPUS@" .config; \ \ export CST_UCLIBC_CONFIG="$(PATCHES)/ct-ng/ct-ng-uClibc-$(UCLIBC_VER).config"; \ + export CST_UCLIBC_VER=$(UCLIBC_VER); \ export CST_BASE_DIR=$(BASE_DIR); \ - export KERNEL_VER=$(CST_KERNEL_VERSION); \ export CUSTOM_GCC_VER=$(GCC_VER_HD2); \ \ test -f ./configure || ./bootstrap && \ diff --git a/make/prerequisites.mk b/make/prerequisites.mk index 4086246..c6345b4 100755 --- a/make/prerequisites.mk +++ b/make/prerequisites.mk @@ -122,7 +122,7 @@ $(GIT_KERNEL): cd $(GIT_KERNEL)/linux-$(KBRANCH) && \ git checkout $(KBRANCH); \ fi; \ - ln -sf $(GIT_KERNEL)/linux-$(KBRANCH) $(SOURCE_DIR)/linux; \ + #ln -sf $(GIT_KERNEL)/linux-$(KBRANCH) $(SOURCE_DIR)/linux; \ if [ "$(BOXSERIES)" = "hd2" ]; then \ cp -a $(PATCHES)/kernel-config/compiler-gcc6.h $(SOURCE_DIR)/linux/include/linux; \ fi diff --git a/make/versions.mk b/make/versions.mk index a3c1f55..dd396cb 100644 --- a/make/versions.mk +++ b/make/versions.mk @@ -253,7 +253,7 @@ TZ_VER=2017b U-BOOT_VER=2014.04 # uClibc-ng; a C library for developing embedded Linux systems -UCLIBC_VER=1.0.37 +UCLIBC_VER=1.0.39 # NFS Server UNFS3_VER=0.9.22 -- 2.39.5