From 7008c23223377e0096157d3f0e6457c61c030083 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Sun, 28 Oct 2018 22:44:58 +0100 Subject: [PATCH] - move driver/firmware softlink creation to driver/firmware target --- make/bootstrap.mk | 6 ++++++ make/rootfs.mk | 6 ------ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/make/bootstrap.mk b/make/bootstrap.mk index 24889f82..04d3ca00 100644 --- a/make/bootstrap.mk +++ b/make/bootstrap.mk @@ -58,12 +58,18 @@ $(TARGET_LIB_DIR): | $(TARGET_DIR) cp -a $(SOURCE_DIR)/$(NI_DRIVERS-BIN)/$(DRIVERS_DIR)/libs/* $@ ifeq ($(BOXTYPE), coolstream) cp -a $(SOURCE_DIR)/$(NI_DRIVERS-BIN)/$(DRIVERS_DIR)/libcoolstream/$(shell echo -n $(NI_FFMPEG_BRANCH) | sed 's,/,-,g')/* $@ + ifeq ($(BOXSERIES), hd1) + ln -sf libnxp.so $@/libconexant.so + endif endif $(TARGET_LIB_DIR)/firmware: | $(TARGET_DIR) ifeq ($(BOXTYPE), coolstream) mkdir -p $@ cp -a $(SOURCE_DIR)/$(NI_DRIVERS-BIN)/$(DRIVERS_DIR)/firmware/* $@/ + ifeq ($(BOXSERIES), hd1) + ln -sf rt2870.bin $@/rt3070.bin + endif endif $(TARGET_LIB_DIR)/modules: | $(TARGET_DIR) diff --git a/make/rootfs.mk b/make/rootfs.mk index 5f9ff850..5cc6352a 100644 --- a/make/rootfs.mk +++ b/make/rootfs.mk @@ -120,12 +120,6 @@ endif ln -sf crond K55crond && \ ln -sf inetd S53inetd && \ ln -sf inetd K80inetd -ifeq ($(BOXSERIES), hd1) - pushd $(BOX)/lib && \ - ln -sf libnxp.so libconexant.so - pushd $(BOX)/lib/firmware && \ - ln -sf rt2870.bin rt3070.bin -endif ifeq ($(BOXSERIES), hd2) pushd $(BOX)/etc && \ ln -sf /var/etc/exports exports && \