From d3ff7a36e312dabb6f5ef48749c9316e68c97430 Mon Sep 17 00:00:00 2001 From: Markham Date: Sun, 15 Apr 2018 20:17:31 +0200 Subject: [PATCH] rootfs.mk: fix target symlinks for hd2 --- make/crosstool.mk | 12 ------------ make/rootfs.mk | 20 ++++++++++---------- make/versions.mk | 8 ++------ 3 files changed, 12 insertions(+), 28 deletions(-) diff --git a/make/crosstool.mk b/make/crosstool.mk index 0f9f98c..545985f 100755 --- a/make/crosstool.mk +++ b/make/crosstool.mk @@ -51,23 +51,11 @@ crosstool: prerequisites | $(ARCHIVE)/crosstool-ng-git-$(CROSSTOOL_NG_VER).tar.g else ifeq ($(BOXSERIES), hd2) ## apollo / kronos crosstool ############################################### -#ifeq ($(UCLIBC_BUILD), 1) -#ifeq ($(USE_UCLIBC_NG), 1) -## build apollo/kronos uClibc-ng -#CT_NG_CONFIG = $(PATCHES)/ct-ng/ct-ng-1.20.0-3.config -#else -## build apollo/kronos uClibc CT_NG_CONFIG = $(PATCHES)/ct-ng/ct-ng-coolstream_hd2.config -#endif ## ($(USE_UCLIBC_NG), 1) -#else -## build apollo/kronos eglibc -#CT_NG_CONFIG = $(PATCHES)/ct-ng/ct-ng-1.20.0-1-glibc.config -#endif ## ifeq ($(UCLIBC_BUILD), 1) crosstool: make MAKEFLAGS=--no-print-directory crosstool-ng -UCLIBC_VER=1.0.24 crosstool-ng: prerequisites | $(ARCHIVE)/crosstool-ng-git-$(CROSSTOOL_NG_VER).tar.gz $(START_BUILD) mkdir -p $(BUILD_TMP) diff --git a/make/rootfs.mk b/make/rootfs.mk index 217709e..b17937a 100755 --- a/make/rootfs.mk +++ b/make/rootfs.mk @@ -2,10 +2,7 @@ BOX = $(BUILD_TMP)/rootfs -ifeq ($(BOXSERIES), hd2) -SYMLINKS_DEPS = symlinks -endif -$(D)/rootfs: $(SYMLINKS_DEPS) +$(D)/rootfs: $(START_BUILD) rm -rf $(BOX) cp -a $(TARGETPREFIX) $(BOX) @@ -29,12 +26,15 @@ $(D)/rootfs: $(SYMLINKS_DEPS) find $(BOX)/var/bin -type f -print0 | xargs -0 $(TARGET)-strip 2>/dev/null || true find $(BOX)/var/sbin -type f -print0 | xargs -0 $(TARGET)-strip 2>/dev/null || true du -sh $(BOX) + if [ "$(BOXSERIES)" = hd2 ]; then \ + $(MAKE) symlinks; \ + fi symlinks: $(START_BUILD) - pushd $(BOX)/lib && \ - ln -sf libuClibc-1.0.24.so libcrypt.so.0 - ln -sf libuClibc-1.0.24.so libdl.so.0 - ln -sf libuClibc-1.0.24.so libpthread.so.0 - ln -sf libuClibc-1.0.24.so libm.so.0 - ln -sf libuClibc-1.0.24.so librt.so.0 + pushd $(BOX)/lib; \ + ln -sf libuClibc-$(UCLIBC_VER).so libcrypt.so.0; \ + ln -sf libuClibc-$(UCLIBC_VER).so libdl.so.0; \ + ln -sf libuClibc-$(UCLIBC_VER).so libpthread.so.0; \ + ln -sf libuClibc-$(UCLIBC_VER).so libm.so.0; \ + ln -sf libuClibc-$(UCLIBC_VER).so librt.so.0; diff --git a/make/versions.mk b/make/versions.mk index 8dc5fca..c12e8ad 100644 --- a/make/versions.mk +++ b/make/versions.mk @@ -26,10 +26,6 @@ ETHTOOL_VER = 4.15 GCC_VER_HD1 = linaro-4.9-2017.01 GCC_VER_HD2 = linaro-6.3-2017.02 - -UCLIBC_BUILD = 1 -USE_UCLIBC_NG = 0 - # Dropbear is a relatively small SSH server and client DROPBEAR_VER=2018.76 @@ -190,8 +186,8 @@ TZ_VER=2017b # u-boot; an universal boot loader U-BOOT_VER=2014.04 -# uClibc; a C library for developing embedded Linux systems -UCLIBC_VER=0.9.33.2 +# uClibc-ng; a C library for developing embedded Linux systems +UCLIBC_VER=1.0.24 # NFS Server UNFS3_VER=0.9.22 -- 2.39.5