Merge pull request #34 from idavis/bugfix/cti-build

Fix CTI Flashing Builds
idavis · Feb 6, 2020 · e41f868 · e41f868
2 parents 271de5a + fe1b084
commit e41f868
Show file tree

Hide file tree

Showing 36 changed files with 285 additions and 259 deletions.
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -825,25 +825,25 @@
                 "cti-tx2-4gb-deps",
                 "cti-tx2i-deps",
 
-                "cti-32.1-jax-bsp-V203-deps",
-                "cti-32.2.0-jax-bsp-V204-deps",
-                "cti-32.2.1-jax-bsp-AGX-32.2.1-V002-deps",
+                "cti-32.1-jax-bsp-v203-deps",
+                "cti-32.2.0-jax-bsp-v204-deps",
+                "cti-32.2.1-jax-bsp-agx-32.2.1-v002-deps",
 
-                "cti-32.2.1-jax-8gb-bsp-AGX-32.2.1-V002-deps",
+                "cti-32.2.1-jax-8gb-bsp-agx-32.2.1-v002-deps",
 
-                "cti-32.2.1-nano-bsp-NANO-32.2.1-V001-deps",
+                "cti-32.2.1-nano-bsp-nano-32.2.1-v001-deps",
 
-                "cti-32.2.1-tx1-bsp-TX1-32.2.1-V001-deps",
+                "cti-32.2.1-tx1-bsp-tx1-32.2.1-v001-deps",
 
-                "cti-32.1-tx2-bsp-V125-deps",
-                "cti-32.2.0-tx2-bsp-V126-1-deps",
-                "cti-32.2.1-tx2-bsp-TX2-32.2.1-V004-deps",
+                "cti-32.1-tx2-bsp-v125-deps",
+                "cti-32.2.0-tx2-bsp-v126-1-deps",
+                "cti-32.2.1-tx2-bsp-tx2-32.2.1-v004-deps",
 
-                "cti-32.2.1-tx2-4gb-bsp-TX2-32.2.1-V004-deps",
+                "cti-32.2.1-tx2-4gb-bsp-tx2-32.2.1-v004-deps",
 
-                "cti-32.1-tx2i-bsp-V125-deps",
-                "cti-32.2.0-tx2i-bsp-V126-1-deps",
-                "cti-32.2.1-tx2i-bsp-TX2-32.2.1-V004-deps"
+                "cti-32.1-tx2i-bsp-v125-deps",
+                "cti-32.2.0-tx2i-bsp-v126-1-deps",
+                "cti-32.2.1-tx2i-bsp-tx2-32.2.1-v004-deps"
             ]
         },
         {

diff --git a/docker/cti/Makefile b/docker/cti/Makefile
@@ -2,17 +2,17 @@
 
 cti-deps: cti-jax-deps cti-jax-8gb-deps cti-nano-deps cti-tx1-deps cti-tx2-deps cti-tx2-4gb-deps cti-tx2i-deps 
 
-cti-jax-deps: cti-32.1-jax-bsp-V203-deps cti-32.2.0-jax-bsp-V204-deps cti-32.2.1-jax-bsp-AGX-32.2.1-V002-deps 
-cti-jax-8gb-deps: cti-32.2.1-jax-8gb-bsp-AGX-32.2.1-V002-deps 
-cti-nano-deps: cti-32.2.1-nano-bsp-NANO-32.2.1-V001-deps 
-cti-tx1-deps: cti-32.2.1-tx1-bsp-TX1-32.2.1-V001-deps 
-cti-tx2-deps: cti-32.1-tx2-bsp-V125-deps cti-32.2.0-tx2-bsp-V126-1-deps cti-32.2.1-tx2-bsp-TX2-32.2.1-V004-deps 
-cti-tx2-4gb-deps: cti-32.2.1-tx2-4gb-bsp-TX2-32.2.1-V004-deps 
-cti-tx2i-deps: cti-32.1-tx2i-bsp-V125-deps cti-32.2.0-tx2i-bsp-V126-1-deps cti-32.2.1-tx2i-bsp-TX2-32.2.1-V004-deps 
+cti-jax-deps: cti-32.1-jax-bsp-v203-deps cti-32.2.0-jax-bsp-v204-deps cti-32.2.1-jax-bsp-agx-32.2.1-v002-deps 
+cti-jax-8gb-deps: cti-32.2.1-jax-8gb-bsp-agx-32.2.1-v002-deps 
+cti-nano-deps: cti-32.2.1-nano-bsp-nano-32.2.1-v001-deps 
+cti-tx1-deps: cti-32.2.1-tx1-bsp-tx1-32.2.1-v001-deps 
+cti-tx2-deps: cti-32.1-tx2-bsp-v125-deps cti-32.2.0-tx2-bsp-v126-1-deps cti-32.2.1-tx2-bsp-tx2-32.2.1-v004-deps 
+cti-tx2-4gb-deps: cti-32.2.1-tx2-4gb-bsp-tx2-32.2.1-v004-deps 
+cti-tx2i-deps: cti-32.1-tx2i-bsp-v125-deps cti-32.2.0-tx2i-bsp-v126-1-deps cti-32.2.1-tx2i-bsp-tx2-32.2.1-v004-deps 
 
 
 
-cti-32.1-jax-V203-deps:
+cti-32.1-jax-bsp-v203-deps:
 	BSP_VERSION=V203 /bin/bash -c ./download-bsp.sh
 
 	$(DOCKER) build \
@@ -21,7 +21,7 @@ cti-32.1-jax-V203-deps:
 					-f $(CURDIR)/dependencies.Dockerfile \
 					/tmp/CTI-L4T-V203
 
-cti-32.2.0-jax-V204-deps:
+cti-32.2.0-jax-bsp-v204-deps:
 	BSP_VERSION=V204 /bin/bash -c ./download-bsp.sh
 
 	$(DOCKER) build \
@@ -30,7 +30,7 @@ cti-32.2.0-jax-V204-deps:
 					-f $(CURDIR)/dependencies.Dockerfile \
 					/tmp/CTI-L4T-V204
 
-cti-32.2.1-jax-AGX-32.2.1-V002-deps:
+cti-32.2.1-jax-bsp-agx-32.2.1-v002-deps:
 	BSP_VERSION=AGX-32.2.1-V002 /bin/bash -c ./download-bsp.sh
 
 	$(DOCKER) build \
@@ -40,7 +40,7 @@ cti-32.2.1-jax-AGX-32.2.1-V002-deps:
 					/tmp/CTI-L4T-AGX-32.2.1-V002
 
 
-cti-32.2.1-jax-8gb-AGX-32.2.1-V002-deps:
+cti-32.2.1-jax-8gb-bsp-agx-32.2.1-v002-deps:
 	BSP_VERSION=AGX-32.2.1-V002 /bin/bash -c ./download-bsp.sh
 
 	$(DOCKER) build \
@@ -50,7 +50,7 @@ cti-32.2.1-jax-8gb-AGX-32.2.1-V002-deps:
 					/tmp/CTI-L4T-AGX-32.2.1-V002
 
 
-cti-32.2.1-nano-NANO-32.2.1-V001-deps:
+cti-32.2.1-nano-bsp-nano-32.2.1-v001-deps:
 	BSP_VERSION=NANO-32.2.1-V001 /bin/bash -c ./download-bsp.sh
 
 	$(DOCKER) build \
@@ -60,7 +60,7 @@ cti-32.2.1-nano-NANO-32.2.1-V001-deps:
 					/tmp/CTI-L4T-NANO-32.2.1-V001
 
 
-cti-32.2.1-tx1-TX1-32.2.1-V001-deps:
+cti-32.2.1-tx1-bsp-tx1-32.2.1-v001-deps:
 	BSP_VERSION=TX1-32.2.1-V001 /bin/bash -c ./download-bsp.sh
 
 	$(DOCKER) build \
@@ -70,7 +70,7 @@ cti-32.2.1-tx1-TX1-32.2.1-V001-deps:
 					/tmp/CTI-L4T-TX1-32.2.1-V001
 
 
-cti-32.1-tx2-V125-deps:
+cti-32.1-tx2-bsp-v125-deps:
 	BSP_VERSION=V125 /bin/bash -c ./download-bsp.sh
 
 	$(DOCKER) build \
@@ -79,7 +79,7 @@ cti-32.1-tx2-V125-deps:
 					-f $(CURDIR)/dependencies.Dockerfile \
 					/tmp/CTI-L4T-V125
 
-cti-32.2.0-tx2-V126-1-deps:
+cti-32.2.0-tx2-bsp-v126-1-deps:
 	BSP_VERSION=V126-1 /bin/bash -c ./download-bsp.sh
 
 	$(DOCKER) build \
@@ -88,7 +88,7 @@ cti-32.2.0-tx2-V126-1-deps:
 					-f $(CURDIR)/dependencies.Dockerfile \
 					/tmp/CTI-L4T-V126-1
 
-cti-32.2.1-tx2-TX2-32.2.1-V004-deps:
+cti-32.2.1-tx2-bsp-tx2-32.2.1-v004-deps:
 	BSP_VERSION=TX2-32.2.1-V004 /bin/bash -c ./download-bsp.sh
 
 	$(DOCKER) build \
@@ -98,7 +98,7 @@ cti-32.2.1-tx2-TX2-32.2.1-V004-deps:
 					/tmp/CTI-L4T-TX2-32.2.1-V004
 
 
-cti-32.2.1-tx2-4gb-TX2-32.2.1-V004-deps:
+cti-32.2.1-tx2-4gb-bsp-tx2-32.2.1-v004-deps:
 	BSP_VERSION=TX2-32.2.1-V004 /bin/bash -c ./download-bsp.sh
 
 	$(DOCKER) build \
@@ -108,7 +108,7 @@ cti-32.2.1-tx2-4gb-TX2-32.2.1-V004-deps:
 					/tmp/CTI-L4T-TX2-32.2.1-V004
 
 
-cti-32.1-tx2i-V125-deps:
+cti-32.1-tx2i-bsp-v125-deps:
 	BSP_VERSION=V125 /bin/bash -c ./download-bsp.sh
 
 	$(DOCKER) build \
@@ -117,7 +117,7 @@ cti-32.1-tx2i-V125-deps:
 					-f $(CURDIR)/dependencies.Dockerfile \
 					/tmp/CTI-L4T-V125
 
-cti-32.2.0-tx2i-V126-1-deps:
+cti-32.2.0-tx2i-bsp-v126-1-deps:
 	BSP_VERSION=V126-1 /bin/bash -c ./download-bsp.sh
 
 	$(DOCKER) build \
@@ -126,7 +126,7 @@ cti-32.2.0-tx2i-V126-1-deps:
 					-f $(CURDIR)/dependencies.Dockerfile \
 					/tmp/CTI-L4T-V126-1
 
-cti-32.2.1-tx2i-TX2-32.2.1-V004-deps:
+cti-32.2.1-tx2i-bsp-tx2-32.2.1-v004-deps:
 	BSP_VERSION=TX2-32.2.1-V004 /bin/bash -c ./download-bsp.sh
 
 	$(DOCKER) build \

diff --git a/flash/build.sh b/flash/build.sh
@@ -81,7 +81,7 @@ pushd "${DOCKER_BUILD_ROOT}"
     echo "    --build-arg ROOT_FS_MD5=$ROOT_FS_MD5 \\"
     echo "    --build-arg BSP_DEPENDENCIES_IMAGE=$BSP_DEPENDENCIES_IMAGE \\"
     echo "    --build-arg BSP=$BSP \\"
-    echo "    --build-arg BSP_SHA=$BSP_SHA \\"
+    echo "    --build-arg BSP_MD5=$BSP_MD5 \\"
     echo "    --build-arg TARGET_BOARD=$TARGET_BOARD \\"
     echo "    --build-arg ROOT_DEVICE=$ROOT_DEVICE \\"
     echo "    --build-arg VERSION_ID=$VERSION_ID \\"
@@ -97,7 +97,7 @@ pushd "${DOCKER_BUILD_ROOT}"
         --build-arg ROOT_FS_MD5=$ROOT_FS_MD5 \
         --build-arg BSP_DEPENDENCIES_IMAGE=$BSP_DEPENDENCIES_IMAGE \
         --build-arg BSP=$BSP \
-        --build-arg BSP_SHA=$BSP_SHA \
+        --build-arg BSP_MD5=$BSP_MD5 \
         --build-arg TARGET_BOARD=$TARGET_BOARD \
         --build-arg ROOT_DEVICE=$ROOT_DEVICE \
         --build-arg VERSION_ID=$VERSION_ID \