Skip to content

Commit 9669d67

Browse files
cmagliecmaglie
committed
Revert to avrdude 6.0.1
This reverts commits: 385edd2 (Removed "macosx-fix-bundled-toolchain-missing-symlinks" build task) f5fd642 (Updated avrdude to 6.3-arduino2) 5a01929 (avrdude 6.3: fixed IDE build for macosx) And part of this commit: 05b6477 (Update avr-gcc to 4.9.2 and avrdude to 6.3)
1 parent 629b662 commit 9669d67

11 files changed

+30
-16
lines changed

Diff for: ‎build/build.xml

+23-12
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,6 @@
9292
<property name="ARDUINO-BUILDER-VERSION" value="1.3.20" />
9393
<property name="LIBLISTSERIAL-VERSION" value="1.1.4" />
9494
<property name="AVRGCC-VERSION" value="4.9.2-atmel3.5.3-arduino2" />
95-
<property name="AVRDUDE-VERSION" value="6.3.0-arduino2" />
9695

9796
<!-- Libraries required for running arduino -->
9897
<fileset dir=".." id="runtime.jars">
@@ -494,8 +493,8 @@
494493
<param name="unpack_target" value="untar"/>
495494
<param name="gcc_archive_file" value="avr-gcc-${AVRGCC-VERSION}-i386-apple-darwin11.tar.bz2"/>
496495
<param name="gcc_version" value="${AVRGCC-VERSION}"/>
497-
<param name="avrdude_archive_file" value="avrdude-${AVRDUDE-VERSION}-i386-apple-darwin11.tar.bz2"/>
498-
<param name="avrdude_version" value="${AVRDUDE-VERSION}"/>
496+
<param name="avrdude_archive_file" value="avrdude-6.0.1-arduino5-r2-i386-apple-darwin11.tar.bz2"/>
497+
<param name="avrdude_version" value="6.0.1-arduino5"/>
499498
</antcall>
500499

501500
<chmod perm="+x">
@@ -719,8 +718,8 @@
719718
<param name="unpack_target" value="untar"/>
720719
<param name="gcc_archive_file" value="avr-gcc-${AVRGCC-VERSION}-armhf-pc-linux-gnu.tar.bz2"/>
721720
<param name="gcc_version" value="${AVRGCC-VERSION}"/>
722-
<param name="avrdude_archive_file" value="avrdude-${AVRDUDE-VERSION}-armhf-pc-linux-gnu.tar.bz2"/>
723-
<param name="avrdude_version" value="${AVRDUDE-VERSION}"/>
721+
<param name="avrdude_archive_file" value="avrdude-6.0.1-arduino5-armhf-pc-linux-gnu-glibc2.13.tar.bz2"/>
722+
<param name="avrdude_version" value="6.0.1-arduino5"/>
724723
</antcall>
725724

726725
<antcall target="package-library-index-json-bundle"/>
@@ -751,8 +750,8 @@
751750
<param name="unpack_target" value="untar"/>
752751
<param name="gcc_archive_file" value="avr-gcc-${AVRGCC-VERSION}-i686-pc-linux-gnu.tar.bz2"/>
753752
<param name="gcc_version" value="${AVRGCC-VERSION}"/>
754-
<param name="avrdude_archive_file" value="avrdude-${AVRDUDE-VERSION}-i686-pc-linux-gnu.tar.bz2"/>
755-
<param name="avrdude_version" value="${AVRDUDE-VERSION}"/>
753+
<param name="avrdude_archive_file" value="avrdude-6.0.1-arduino5-i686-pc-linux-gnu.tar.bz2"/>
754+
<param name="avrdude_version" value="6.0.1-arduino5"/>
756755
</antcall>
757756

758757
<antcall target="package-library-index-json-bundle"/>
@@ -783,8 +782,8 @@
783782
<param name="unpack_target" value="untar"/>
784783
<param name="gcc_archive_file" value="avr-gcc-${AVRGCC-VERSION}-x86_64-pc-linux-gnu.tar.bz2"/>
785784
<param name="gcc_version" value="${AVRGCC-VERSION}"/>
786-
<param name="avrdude_archive_file" value="avrdude-${AVRDUDE-VERSION}-x86_64-pc-linux-gnu.tar.bz2"/>
787-
<param name="avrdude_version" value="${AVRDUDE-VERSION}"/>
785+
<param name="avrdude_archive_file" value="avrdude-6.0.1-arduino5-x86_64-pc-linux-gnu.tar.bz2"/>
786+
<param name="avrdude_version" value="6.0.1-arduino5"/>
788787
</antcall>
789788

790789
<antcall target="package-library-index-json-bundle"/>
@@ -1071,8 +1070,8 @@
10711070
<param name="unpack_target" value="unzip"/>
10721071
<param name="gcc_archive_file" value="avr-gcc-${AVRGCC-VERSION}-i686-mingw32.zip"/>
10731072
<param name="gcc_version" value="${AVRGCC-VERSION}"/>
1074-
<param name="avrdude_archive_file" value="avrdude-${AVRDUDE-VERSION}-i686-w64-mingw32.zip"/>
1075-
<param name="avrdude_version" value="${AVRDUDE-VERSION}"/>
1073+
<param name="avrdude_archive_file" value="avrdude-6.0.1-arduino5-i686-mingw32.zip"/>
1074+
<param name="avrdude_version" value="6.0.1-arduino5"/>
10761075
</antcall>
10771076

10781077
<antcall target="package-library-index-json-bundle"/>
@@ -1161,7 +1160,8 @@
11611160
</antcall>
11621161

11631162
<move file="${staging_folder}/work/${staging_hardware_folder}/tmp/gcc/avr" tofile="${staging_folder}/work/${staging_hardware_folder}/tools/avr"/>
1164-
<move file="${staging_folder}/work/${staging_hardware_folder}/tmp/avrdude/avrdude" tofile="${staging_folder}/work/${staging_hardware_folder}/tools/avr"/>
1163+
<move file="${staging_folder}/work/${staging_hardware_folder}/tmp/avrdude/avrdude-6.0.1" tofile="${staging_folder}/work/${staging_hardware_folder}/tools/avr"/>
1164+
<antcall target="macosx-fix-bundled-toolchain-missing-symlinks"/>
11651165

11661166
<echo append="true" file="${staging_folder}/work/${staging_hardware_folder}/tools/avr/builtin_tools_versions.txt" message="arduino.avrdude=${avrdude_version}${line.separator}"/>
11671167
<echo append="true" file="${staging_folder}/work/${staging_hardware_folder}/tools/avr/builtin_tools_versions.txt" message="arduino.avr-gcc=${gcc_version}${line.separator}"/>
@@ -1191,6 +1191,17 @@
11911191
<delete dir="${staging_folder}/work/${staging_hardware_folder}/tmp"/>
11921192
</target>
11931193

1194+
<target name="macosx-fix-bundled-toolchain-missing-symlinks" if="macosx">
1195+
<exec executable="mv" failonerror="true">
1196+
<arg value="${staging_folder}/work/${staging_hardware_folder}/tmp/avrdude/avrdude-6.0.1/lib/libusb.dylib"/>
1197+
<arg value="${staging_folder}/work/${staging_hardware_folder}/tools/avr/lib/"/>
1198+
</exec>
1199+
<exec executable="mv" failonerror="true">
1200+
<arg value="${staging_folder}/work/${staging_hardware_folder}/tmp/avrdude/avrdude-6.0.1/lib/libusb-1.0.dylib"/>
1201+
<arg value="${staging_folder}/work/${staging_hardware_folder}/tools/avr/lib/"/>
1202+
</exec>
1203+
</target>
1204+
11941205
<target name="generate-hourly-build-txt" if="hourly">
11951206
<echo file="${staging_folder}/work/${staging_hardware_folder}/../lib/hourlyBuild.txt">${BUILD_DATE}</echo>
11961207
</target>

Diff for: ‎build/linux/avrdude-6.0.1-arduino5-armhf-pc-linux-gnu-glibc2.13.tar.bz2.sha

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
b5968416647e79f5c395bf2a9ba000127dacc9da

Diff for: ‎build/linux/avrdude-6.0.1-arduino5-i686-pc-linux-gnu.tar.bz2.sha

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
cf859c679713cae2f1b9089d797d211dd84fe658

Diff for: ‎build/linux/avrdude-6.0.1-arduino5-x86_64-pc-linux-gnu.tar.bz2.sha

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
cfc52036f532c3a7050f6d4ec7645d060800aa39

Diff for: ‎build/linux/avrdude-6.3.0-arduino2-armhf-pc-linux-gnu.tar.bz2.sha

-1
This file was deleted.

Diff for: ‎build/linux/avrdude-6.3.0-arduino2-i686-pc-linux-gnu.tar.bz2.sha

-1
This file was deleted.

Diff for: ‎build/linux/avrdude-6.3.0-arduino2-x86_64-pc-linux-gnu.tar.bz2.sha

-1
This file was deleted.

Diff for: ‎build/macosx/avrdude-6.0.1-arduino5-r2-i386-apple-darwin11.tar.bz2.sha

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
52afce6cbe1cc1021bca1234cf25b298350f97dd

Diff for: ‎build/macosx/avrdude-6.3.0-arduino2-i386-apple-darwin11.tar.bz2.sha

-1
This file was deleted.

Diff for: ‎build/shared/revisions.txt

+2
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ ARDUINO 1.6.11
44
* Fixed a serious bug that prevented some 3rd party boards, installed through external index.json URL, to work correctly.
55
* builder: fixed regression about inclusion of files in subfolders of the sketch
66
(see https://github.com/arduino/Arduino/issues/5186 for details)
7+
* avrdude: reverted to version 6.0.1, until all discovered regressions are solved
8+
(see https://github.com/arduino/Arduino/issues?q=is%3Aissue+is%3Aopen+label%3A%22Component%3A+Avrdude+6.3%22 for details)
79

810
ARDUINO 1.6.10 - 2016.07.26
911

Diff for: ‎build/windows/avrdude-6.0.1-arduino5-i686-mingw32.zip.sha

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
bad246afeb0b9bcbe623a29cb204127f901102cf

0 commit comments

Comments
 (0)