Build a linux devkit Tools.gmk patch

Signed-off-by: Andrew Leonard <[email protected]>
adoptium · Mar 25, 2024 · ad57fd7 · ad57fd7
1 parent 464ef3f
commit ad57fd7
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/pipelines/build/devkit/build_devkit.groovy b/pipelines/build/devkit/build_devkit.groovy
@@ -36,11 +36,11 @@ def build_devkit() {
         // Get gcc version and base OS from devkit.info
         def gcc_ver=sh(script:'grep DEVKIT_NAME pipelines/build/devkit/'+params.VERSION+'/build/devkit/result/'+devkit_target+'-to-'+devkit_target+'/devkit.info | cut -d"=" -f2 | tr -d "\\" \\n"', returnStdout: true)
 
-        def adoptium_devkit_filename = "devkit-${gcc_ver}-${devkit_target}-${params.BUILD}"
-
         // The devkit release tag this build will get published under
         adoptium_devkit_release_tag = "${gcc_ver}-${params.BUILD}"
 
+        def adoptium_devkit_filename = "devkit-${adoptium_devkit_release_tag}-${devkit_target}"
+
         // Store Adoptium metadata within the devkit.info file
         sh(script:"echo ADOPTIUM_DEVKIT_RELEASE=\"${adoptium_devkit_release_tag}\" >> pipelines/build/devkit/${params.VERSION}/build/devkit/result/${devkit_target}-to-${devkit_target}/devkit.info")
         sh(script:"echo ADOPTIUM_DEVKIT_TARGET=\"${devkit_target}\" >> pipelines/build/devkit/${params.VERSION}/build/devkit/result/${devkit_target}-to-${devkit_target}/devkit.info")