build: Put each build in a single directory

Author: mpe

build/scripts/lib.sh

@@ -33,13 +33,9 @@ function get_output_dir()
     fi
 
     if [[ -n "$CI_OUTPUT" ]]; then
-        d="$CI_OUTPUT/$subarch@$distro"
+        d="$CI_OUTPUT"
     else
-        d="$script_base/../output/$subarch@$distro"
-    fi
-
-    if [[ -n "$version" ]]; then
-        d="$d@$version"
+        d="$script_base/../output"
     fi
 
     case "$task" in
@@ -74,6 +70,12 @@ function get_output_dir()
         fi
     fi
 
+    d="$d@$subarch@$distro"
+
+    if [[ -n "$version" ]]; then
+        d="$d@$version"
+    fi
+
     echo "$d"
 
     return 0