dsl: Use different spectrum binary for different builds

gnuton · Apr 6, 2021 · 6ba4dc0 · 6ba4dc0
1 parent 53041b7
commit 6ba4dc0
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 2 deletions.
diff --git a/release/src/router/spectrum/Makefile b/release/src/router/spectrum/Makefile
@@ -23,7 +23,7 @@ endif
 
 ifeq ($(wildcard $(TOP)/spectrum/*.c),)
 all:
-	-cp -f $(TOP)/spectrum/prebuild/spectrum spectrum
+	-cp -f $(TOP)/spectrum/prebuild/$(BUILD_NAME)/spectrum spectrum
 else
 all: spectrum
 endif

diff --git a/...ase/src/router/spectrum/prebuild/spectrum → ...uter/spectrum/prebuild/DSL-AC68U/spectrum b/...ase/src/router/spectrum/prebuild/spectrum → ...uter/spectrum/prebuild/DSL-AC68U/spectrum
diff --git a/release/src/router/spectrum/prebuild/DSL-AX82U/spectrum b/release/src/router/spectrum/prebuild/DSL-AX82U/spectrum
diff --git a/tools/add-prebuilds-to-git b/tools/add-prebuilds-to-git
@@ -92,6 +92,7 @@ then
     git add -f $REPO/release/src/router/dsl_autodet/
     git add -f $REPO/release/src/router/dsl_diag/
     git add -f $REPO/release/src/router/tr069/
+    git add -f $REPO/release/src/router/spectrum/*
 else
     echo "Unrecognized BUILD_NAME!"
     exit

diff --git a/tools/copy-prebuilt b/tools/copy-prebuilt
@@ -159,7 +159,7 @@ then
 	# DSL specific files
 	cp -a release/src-rt-6.x.4708/tc_fw/* $REPO/release/src-rt-6.x.4708/tc_fw/
 	cp -a release/src/router/dsl_drv_tool/* $REPO/release/src/router/dsl_drv_tool
-	cp -a release/src/router/spectrum/* $REPO/release/src/router/spectrum
+	cp -a release/src/router/spectrum/prebuild/* $REPO/release/src/router/spectrum/prebuild/$BUILD_NAME/
 
 elif [ "$BUILD_NAME" == "RT-AX86U" ] || [ "$BUILD_NAME" == "RT-AX68U" ]
 then
@@ -278,6 +278,7 @@ then
         cp -a release/src/router/dsl_autodet/* $REPO/release/src/router/dsl_autodet
 	cp -a release/src/router/dsl_diag/* $REPO/release/src/router/dsl_diag
 	cp -a release/src/router/tr069/* $REPO/release/src/router/tr069
+	cp -a release/src/router/spectrum/prebuild/* $REPO/release/src/router/spectrum/prebuild/$BUILD_NAME/
 fi
 
 # Cleanup