Skip to content

Commit 7da7eaf

Browse files
committed
Use untar-bz2 for toolchain and builder on UNIX platforms
1 parent a0135e2 commit 7da7eaf

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

build/build.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -496,7 +496,7 @@
496496
<!-- Unzip AVR tools -->
497497
<target name="macosx-build-avr-toolchain" unless="light_bundle">
498498
<antcall target="avr-toolchain-bundle">
499-
<param name="unpack_target" value="untar"/>
499+
<param name="unpack_target" value="untar-bz2"/>
500500
<param name="gcc_archive_file" value="avr-gcc-${AVRGCC-VERSION}-i386-apple-darwin11.tar.bz2"/>
501501
<param name="gcc_version" value="${AVRGCC-VERSION}"/>
502502
<param name="avrdude_archive_file" value="avrdude-${AVRDUDE-VERSION}-i386-apple-darwin11.tar.bz2"/>
@@ -709,7 +709,7 @@
709709
<antcall target="build-arduino-builder" />
710710

711711
<antcall target="avr-toolchain-bundle">
712-
<param name="unpack_target" value="untar"/>
712+
<param name="unpack_target" value="untar-bz2"/>
713713
<param name="gcc_archive_file" value="avr-gcc-${AVRGCC-VERSION}-armhf-pc-linux-gnu.tar.bz2"/>
714714
<param name="gcc_version" value="${AVRGCC-VERSION}"/>
715715
<param name="avrdude_archive_file" value="avrdude-${AVRDUDE-VERSION}-armhf-pc-linux-gnu.tar.bz2"/>
@@ -751,7 +751,7 @@
751751
<antcall target="build-arduino-builder" />
752752

753753
<antcall target="avr-toolchain-bundle">
754-
<param name="unpack_target" value="untar"/>
754+
<param name="unpack_target" value="untar-bz2"/>
755755
<param name="gcc_archive_file" value="avr-gcc-${AVRGCC-VERSION}-aarch64-pc-linux-gnu.tar.bz2"/>
756756
<param name="gcc_version" value="${AVRGCC-VERSION}"/>
757757
<param name="avrdude_archive_file" value="avrdude-${AVRDUDE-VERSION}-aarch64-pc-linux-gnu.tar.bz2"/>
@@ -769,7 +769,7 @@
769769
<antcall target="build-arduino-builder" />
770770

771771
<antcall target="avr-toolchain-bundle">
772-
<param name="unpack_target" value="untar"/>
772+
<param name="unpack_target" value="untar-bz2"/>
773773
<param name="gcc_archive_file" value="avr-gcc-${AVRGCC-VERSION}-i686-pc-linux-gnu.tar.bz2"/>
774774
<param name="gcc_version" value="${AVRGCC-VERSION}"/>
775775
<param name="avrdude_archive_file" value="avrdude-${AVRDUDE-VERSION}-i686-pc-linux-gnu.tar.bz2"/>
@@ -787,7 +787,7 @@
787787
<antcall target="build-arduino-builder" />
788788

789789
<antcall target="avr-toolchain-bundle">
790-
<param name="unpack_target" value="untar"/>
790+
<param name="unpack_target" value="untar-bz2"/>
791791
<param name="gcc_archive_file" value="avr-gcc-${AVRGCC-VERSION}-x86_64-pc-linux-gnu.tar.bz2"/>
792792
<param name="gcc_version" value="${AVRGCC-VERSION}"/>
793793
<param name="avrdude_archive_file" value="avrdude-${AVRDUDE-VERSION}-x86_64-pc-linux-gnu.tar.bz2"/>
@@ -836,7 +836,7 @@
836836
<target name="build-arduino-builder" unless="no_arduino_builder">
837837
<delete dir="${staging_folder}/arduino-builder-${platform}" includeemptydirs="true"/>
838838
<mkdir dir="${staging_folder}/arduino-builder-${platform}"/>
839-
<antcall target="untar">
839+
<antcall target="untar-bz2">
840840
<param name="archive_file" value="./arduino-builder-${platform}-${ARDUINO-BUILDER-VERSION}.tar.bz2" />
841841
<param name="archive_url" value="https://downloads.arduino.cc/tools/arduino-builder-${platform}-${ARDUINO-BUILDER-VERSION}.tar.bz2" />
842842
<param name="final_folder" value="${staging_folder}/arduino-builder-${platform}/arduino-builder" />

0 commit comments

Comments
 (0)