use tar option '-C'

This commit is contained in:
umarcor 2020-10-10 16:00:11 +02:00
parent b92b5d305e
commit 35b6780deb

View File

@ -77,8 +77,7 @@ case "${ARCH}" in
# Wishbone Tool # Wishbone Tool
wget -O $input/wishbone-tool-${ARCH}.tar.gz $win_wishbone_tool_url wget -O $input/wishbone-tool-${ARCH}.tar.gz $win_wishbone_tool_url
cd $output/bin tar xvzf $input/wishbone-tool-${ARCH}.tar.gz -C $output/bin
tar xvzf $input/wishbone-tool-${ARCH}.tar.gz
# Riscv Toolchain # Riscv Toolchain
# Note that we want to strip the front part of the path. # Note that we want to strip the front part of the path.
@ -105,18 +104,15 @@ case "${ARCH}" in
"macos") "macos")
# Nextpnr # Nextpnr
wget -O $input/nextpnr-${ARCH}.tar.gz $mac_nextpnr_url wget -O $input/nextpnr-${ARCH}.tar.gz $mac_nextpnr_url
cd $output tar xvzf $input/nextpnr-${ARCH}.tar.gz -C $output
tar xvzf $input/nextpnr-${ARCH}.tar.gz
# Yosys, icestorm, and dfu_util # Yosys, icestorm, and dfu_util
wget -O $input/yosys-${ARCH}.tar.gz $mac_yosys_url wget -O $input/yosys-${ARCH}.tar.gz $mac_yosys_url
cd $output tar xvzf $input/yosys-${ARCH}.tar.gz -C $output
tar xvzf $input/yosys-${ARCH}.tar.gz
# Wishbone Tool # Wishbone Tool
wget -O $input/wishbone-tool-${ARCH}.tar.gz $mac_wishbone_tool_url wget -O $input/wishbone-tool-${ARCH}.tar.gz $mac_wishbone_tool_url
cd $output/bin tar xvzf $input/wishbone-tool-${ARCH}.tar.gz -C $output/bin
tar xvzf $input/wishbone-tool-${ARCH}.tar.gz
# Riscv Toolchain # Riscv Toolchain
# Note that we want to strip the front part of the path. # Note that we want to strip the front part of the path.
@ -138,18 +134,15 @@ case "${ARCH}" in
"linux_x86_64") "linux_x86_64")
# Nextpnr # Nextpnr
wget -O $input/nextpnr-${ARCH}.tar.gz $linux_nextpnr_url wget -O $input/nextpnr-${ARCH}.tar.gz $linux_nextpnr_url
cd $output tar xvzf $input/nextpnr-${ARCH}.tar.gz -C $output
tar xvzf $input/nextpnr-${ARCH}.tar.gz
# Yosys, icestorm, and dfu_util # Yosys, icestorm, and dfu_util
wget -O $input/yosys-${ARCH}.tar.gz $linux_yosys_url wget -O $input/yosys-${ARCH}.tar.gz $linux_yosys_url
cd $output tar xvzf $input/yosys-${ARCH}.tar.gz -C $output
tar xvzf $input/yosys-${ARCH}.tar.gz
# Wishbone Tool # Wishbone Tool
wget -O $input/wishbone-tool-${ARCH}.tar.gz $linux_wishbone_tool_url wget -O $input/wishbone-tool-${ARCH}.tar.gz $linux_wishbone_tool_url
cd $output/bin tar xvzf $input/wishbone-tool-${ARCH}.tar.gz -C $output/bin
tar xvzf $input/wishbone-tool-${ARCH}.tar.gz
# Riscv Toolchain # Riscv Toolchain
# Note that we want to strip the front part of the path. # Note that we want to strip the front part of the path.
@ -163,7 +156,7 @@ case "${ARCH}" in
cd .. cd ..
rm -rf re rm -rf re
cd $base/output cd $base/output/
tar cvzf $output_name.tar.gz $output_name tar cvzf $output_name.tar.gz $output_name
checksum_output .tar.gz checksum_output .tar.gz
;; ;;