ci: Update make_zephyr_sdk and deploy to take OS and MACHINE

Signed-off-by: Kumar Gala <[email protected]>

Author: galak

.buildkite/deploy.yml

@@ -26,7 +26,7 @@ steps:
       - chmod a+x *.sh
       - cd ..
       - tree -H '.' -L 1 --noreport --charset utf-8 toolchains > index.html
-      - ./make_zephyr_sdk.sh $${MACHINE}
+      - ./make_zephyr_sdk.sh $${OS} $${MACHINE}
       - ls -F
       - sdk_filename=$(ls -1 zephyr-sdk*)
       - toolchain_files=$(ls -1 zephyr-toolchain-*)

scripts/make_zephyr_sdk.sh

@@ -13,33 +13,21 @@
 
 product_name="zephyr-sdk"
 
-if [ $# != "1" ]; then
-	echo "usage: $0 <MACHINE>"
+if [ $# != "2" ]; then
+	echo "usage: $0 <OS> <MACHINE>"
 	exit 1
 fi
 
 root_dir=$(dirname $0)/..
 sdk_version=$(cat $root_dir/VERSION)
-machine=$1
-
-case "$(uname -s)" in
-   Darwin)
-     os=macos
-     ;;
-   Linux)
-     os=linux
-     ;;
-   *)
-     echo 'Unsupported OS'
-     exit 1
-     ;;
-esac
+os=$1
+machine=$2
 
 arch_list="arm arm64 arc arc64 nios2 riscv64 sparc mips x86_64 xtensa_sample_controller \
            xtensa_intel_apl_adsp xtensa_intel_s1000 xtensa_intel_bdw_adsp \
 	   xtensa_intel_byt_adsp xtensa_nxp_imx_adsp xtensa_nxp_imx8m_adsp"
 
-echo "Creating ${product_name}-${sdk_version}-${machine}-${os}-setup.run"
+echo "Creating ${product_name}-${sdk_version}-${os}-${machine}-setup.run"
 
 # Create ./setup.sh