Skip to content

Commit

Permalink
Fix tar expansion with older version of tar
Browse files Browse the repository at this point in the history
Need to explicit pass flags to tar as older versions don't auto handle
the compression.

Fixes: #61

Signed-off-by: Kumar Gala <[email protected]>
  • Loading branch information
galak committed May 1, 2019
1 parent 4bc5f9f commit 342a162
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions scripts/make_zephyr_sdk.sh
Original file line number Diff line number Diff line change
Expand Up @@ -74,56 +74,56 @@ echo "SDK_VERSION=${sdk_version}" >> $setup
cat template_dir >>$setup

if [ -n "$file_gcc_x86" ]; then
echo "tar -C \$target_sdk_dir -xf ./$file_gcc_x86 > /dev/null &" >> $setup
echo "tar -C \$target_sdk_dir -jxf ./$file_gcc_x86 > /dev/null &" >> $setup
echo "spinner \$! \"Installing x86 tools...\"" >> $setup
echo "[ \$? -ne 0 ] && echo \"Error(s) encountered during installation.\" && exit 1" >>$setup
echo "echo \"\"" >>$setup
fi

if [ -n "$file_gcc_arm" ]; then
echo "tar -C \$target_sdk_dir -xf ./$file_gcc_arm > /dev/null &" >> $setup
echo "tar -C \$target_sdk_dir -jxf ./$file_gcc_arm > /dev/null &" >> $setup
echo "spinner \$! \"Installing arm tools...\"" >> $setup
echo "[ \$? -ne 0 ] && echo \"Error(s) encountered during installation.\" && exit 1" >>$setup
echo "echo \"\"" >>$setup
fi

if [ -n "$file_gcc_arc" ]; then
echo "tar -C \$target_sdk_dir -xf ./$file_gcc_arc > /dev/null &" >> $setup
echo "tar -C \$target_sdk_dir -jxf ./$file_gcc_arc > /dev/null &" >> $setup
echo "spinner \$! \"Installing arc tools...\"" >> $setup
echo "[ \$? -ne 0 ] && echo \"Error(s) encountered during installation.\" && exit 1" >>$setup
echo "echo \"\"" >>$setup
fi

if [ -n "$file_gcc_iamcu" ]; then
echo "tar -C \$target_sdk_dir -xf ./$file_gcc_iamcu > /dev/null &" >> $setup
echo "tar -C \$target_sdk_dir -jxf ./$file_gcc_iamcu > /dev/null &" >> $setup
echo "spinner \$! \"Installing iamcu tools...\"" >> $setup
echo "[ \$? -ne 0 ] && echo \"Error(s) encountered during installation.\" && exit 1" >>$setup
echo "echo \"\"" >>$setup
fi

if [ -n "$file_gcc_mips" ]; then
echo "tar -C \$target_sdk_dir -xf ./$file_gcc_mips > /dev/null &" >> $setup
echo "tar -C \$target_sdk_dir -jxf ./$file_gcc_mips > /dev/null &" >> $setup
echo "spinner \$! \"Installing mips tools...\"" >> $setup
echo "[ \$? -ne 0 ] && echo \"Error(s) encountered during installation.\" && exit 1" >>$setup
echo "echo \"\"" >>$setup
fi

if [ -n "$file_gcc_nios2" ]; then
echo "tar -C \$target_sdk_dir -xf ./$file_gcc_nios2 > /dev/null &" >> $setup
echo "tar -C \$target_sdk_dir -jxf ./$file_gcc_nios2 > /dev/null &" >> $setup
echo "spinner \$! \"Installing nios2 tools...\"" >> $setup
echo "[ \$? -ne 0 ] && echo \"Error(s) encountered during installation.\" && exit 1" >>$setup
echo "echo \"\"" >>$setup
fi

if [ -n "$file_gcc_xtensa" ]; then
echo "tar -C \$target_sdk_dir -xf ./$file_gcc_xtensa > /dev/null &" >> $setup
echo "tar -C \$target_sdk_dir -jxf ./$file_gcc_xtensa > /dev/null &" >> $setup
echo "spinner \$! \"Installing xtensa tools...\"" >> $setup
echo "[ \$? -ne 0 ] && echo \"Error(s) encountered during installation.\" && exit 1" >>$setup
echo "echo \"\"" >>$setup
fi

if [ -n "$file_gcc_riscv32" ]; then
echo "tar -C \$target_sdk_dir -xf ./$file_gcc_riscv32 > /dev/null &" >> $setup
echo "tar -C \$target_sdk_dir -jxf ./$file_gcc_riscv32 > /dev/null &" >> $setup
echo "spinner \$! \"Installing riscv32 tools...\"" >> $setup
echo "[ \$? -ne 0 ] && echo \"Error(s) encountered during installation.\" && exit 1" >>$setup
echo "echo \"\"" >>$setup
Expand Down

0 comments on commit 342a162

Please sign in to comment.