Votre Nom 2 years ago
parent
commit
bcd752236e
7 changed files with 21 additions and 41 deletions
  1. 3 4
      pack/build-avr-binutils
  2. 4 4
      pack/build-avr-gcc
  3. 2 3
      pack/build-avr-gdb
  4. 4 16
      pack/build-avr-libc
  5. 3 6
      pack/build-avrdude
  6. 3 8
      pack/build-simulavr
  7. 2 0
      prerequise.sh

+ 3 - 4
pack/build-avr-binutils

@@ -4,7 +4,6 @@
 
 # Stop on errors
 set -e
-if [ ! -f .prereq ];then ./prerequise.sh;fi
 
 source avr-file-names
 
@@ -43,7 +42,7 @@ makeDir()
 echo "Downloading sources..."
 
 if [ ! -f $NAME_BINUTILS.tar.xz ]; then
-    wget http://wareck.free.fr/cross_compilation/avr_toolchain/$NAME_BINUTILS.tar.xz
+    wget https://ftp.mirrorservice.org/sites/ftp.gnu.org/gnu/binutils/$NAME_BINUTILS.tar.xz
 fi
 
 
@@ -52,11 +51,11 @@ NAME_BINUTILS_BLD=${NAME_BINUTILS}_bld
 echo "Making Binutils in $NAME_BINUTILS_BLD..."
 echo "Extracting..."
 rm -rf $NAME_BINUTILS/
-tar xJf $NAME_BINUTILS.tar.xz
+tar xf $NAME_BINUTILS.tar.xz
 
 # Patch the size function
 cd $NAME_BINUTILS/binutils
-patch -p 1 < ../../pack/$NAME_BINUTILS_SIZE_PATCH
+patch -p 1 < ../../$NAME_BINUTILS_SIZE_PATCH
 cd ../..
 
 makeDir $NAME_BINUTILS_BLD

+ 4 - 4
pack/build-avr-gcc

@@ -4,7 +4,6 @@
 
 # Stop on errors
 set -e
-if [ ! -f .prereq ];then ./prerequise.sh;fi
 
 source avr-file-names
 
@@ -20,7 +19,7 @@ makeDir()
 echo "Downloading sources..."
 
 if [ ! -f $NAME_GCC.tar.xz ]; then
-    wget http://wareck.free.fr/cross_compilation/avr_toolchain/$NAME_GCC.tar.xz
+    wget https://ftp.mirrorservice.org/sites/sourceware.org/pub/gcc/releases/$NAME_GCC/$NAME_GCC.tar.xz
 fi
 
 
@@ -29,7 +28,7 @@ NAME_GCC_BLD=${NAME_GCC}_bld
 echo "Making GCC in $NAME_GCC_BLD..."
 echo "Extracting..."
 rm -rf $NAME_GCC/
-tar xJf $NAME_GCC.tar.xz
+tar xf $NAME_GCC.tar.xz
 
 # Patch the download_prerequisites script
 cd $NAME_GCC
@@ -39,7 +38,8 @@ cd ..
 
 makeDir $NAME_GCC_BLD
 cd $NAME_GCC_BLD
-../$NAME_GCC/configure --prefix=$PREFIX --target=avr --enable-languages=c,c++ --disable-nls --disable-libssp --disable-libada --with-dwarf2 --disable-shared --enable-static
+../$NAME_GCC/configure --prefix=$PREFIX --target=avr --enable-languages=c,c++ --disable-nls --disable-libssp --disable-libada \
+--with-dwarf2 --disable-shared --enable-static
 make -j $JOBCOUNT
 sudo make install-strip
 cd ..

+ 2 - 3
pack/build-avr-gdb

@@ -4,7 +4,6 @@
 
 # Stop on errors
 set -e
-if [ ! -f .prereq ];then ./prerequise.sh;fi
 
 source avr-file-names
 
@@ -20,7 +19,7 @@ makeDir()
 echo "Downloading sources..."
 
 if [ ! -f $NAME_GDB.tar.xz ]; then
-    wget http://wareck.free.fr/cross_compilation/avr_toolchain/$NAME_GDB.tar.xz
+    wget https://ftp.mirrorservice.org/sites/sourceware.org/pub/gdb/releases/$NAME_GDB.tar.xz
 fi
 
 
@@ -29,7 +28,7 @@ NAME_GDB_BLD=${NAME_GDB}_bld
 echo "Making AVR-GDB in $NAME_GDB_BLD..."
 echo "Extracting..."
 rm -rf $NAME_GDB/
-tar xJf $NAME_GDB.tar.xz
+tar xf $NAME_GDB.tar.xz
 
 makeDir $NAME_GDB_BLD
 cd $NAME_GDB_BLD

+ 4 - 16
pack/build-avr-libc

@@ -4,13 +4,6 @@
 
 # Stop on errors
 set -e
-if ! [ -x "$(command -v avr-gcc)" ]
-then
-echo "Need to build avr-gcc first !"
-exit
-fi
-
-if [ ! -f .prereq ];then ./prerequise.sh;fi
 
 source avr-file-names
 
@@ -25,8 +18,8 @@ makeDir()
 
 echo "Downloading sources..."
 
-if [ ! -f $NAME_LIBC.tar.xz ]; then
-    wget http://wareck.free.fr/cross_compilation/avr_toolchain/$NAME_LIBC.tar.xz
+if [ ! -f $NAME_LIBC.tar.bz2 ]; then
+    wget https://ftp.mirrorservice.org/sites/download.savannah.gnu.org/releases/avr-libc/$NAME_LIBC.tar.bz2
 fi
 
 
@@ -35,18 +28,13 @@ NAME_LIBC_BLD=${NAME_LIBC}_bld
 echo "Making AVR-LIBC in $NAME_LIBC_BLD..."
 echo "Extracting..."
 rm -rf $NAME_LIBC/
-tar xJf $NAME_LIBC.tar.xz
+tar xjf $NAME_LIBC.tar.bz2
 
 makeDir $NAME_LIBC_BLD
-AR='avr-ar'
-AS='avr-as'
-CC='avr-gcc'
-CCAS='gcc'
-
 cd $NAME_LIBC_BLD
 ../$NAME_LIBC/configure --prefix=$PREFIX --build=$(../$NAME_LIBC/config.guess) --host=avr
 make -j $JOBCOUNT
-sudo env "PATH=$PATH" make install-strip
+sudo  env "PATH=$PATH" make install-strip
 cd ..
 
 TIME_END=$(date +%s)

+ 3 - 6
pack/build-avrdude

@@ -5,9 +5,6 @@
 # Stop on errors
 set -e
 
-if [ ! -f .prereq ];then ./prerequise.sh;fi
-
-
 source avr-file-names
 
 TIME_START=$(date +%s)
@@ -21,8 +18,8 @@ makeDir()
 
 echo "Downloading sources..."
 
-if [ ! -f $NAME_AVRDUDE.tar.xz ]; then
-    wget http://wareck.free.fr/cross_compilation/avr_toolchain/$NAME_AVRDUDE.tar.xz
+if [ ! -f $NAME_AVRDUDE.tar.gz ]; then
+    wget https://ftp.mirrorservice.org/sites/download.savannah.gnu.org/releases/avrdude/$NAME_AVRDUDE.tar.gz
 fi
 
 
@@ -31,7 +28,7 @@ NAME_AVRDUDE_BLD=${NAME_AVRDUDE}_bld
 echo "Making AVRDUDE in $NAME_AVRDUDE_BLD..."
 echo "Extracting..."
 rm -rf $NAME_AVRDUDE/
-tar xJf $NAME_AVRDUDE.tar.xz
+tar xzf $NAME_AVRDUDE.tar.gz
 
 makeDir $NAME_AVRDUDE_BLD
 cd $NAME_AVRDUDE_BLD

+ 3 - 8
pack/build-simulavr

@@ -5,26 +5,21 @@
 
 # Stop on errors
 set -e
-if [ ! -f .prereq ];then ./prerequise.sh;fi
 
 source avr-file-names
 
 TIME_START=$(date +%s)
 
 echo "Downloading sources..."
-wget -c http://wareck.free.fr/cross_compilation/avr_toolchain/simulavr.tar.xz
-tar xfJ simulavr.tar.xz
+
+rm -rf $NAME_SIMULAVR
+git clone https://github.com/Traumflug/simulavr.git $NAME_SIMULAVR
 
 # Make simulavr
 echo "Making simulavr in $NAME_SIMULAVR..."
 cd $NAME_SIMULAVR/
 git checkout traumflug
 
-cp ../pack/simulavr_patch1.patch .
-cp ../pack/simulavr_patch2.patch .
-patch -p1 < simulavr_patch1.patch
-patch -p1 < simulavr_patch2.patch
-
 ./bootstrap
 ./configure --enable-tcl --prefix=$PREFIX
 make

+ 2 - 0
prerequise.sh

@@ -1,6 +1,8 @@
 #!/bin/bash
 echo -e "$(tput setaf 10)AVR Toolchain builder prerequises install :$(tput setaf 7)\n"
 sudo apt-get install wget bzip2 texinfo flex babeltrace python expat bison tk-dev tcl-dev pixz pv libtool-bin -y
+sudo apt-get install libelf-dev libusb-1.0-0-dev libusb-dev libftdi-dev libftdi1-dev libhidapi-dev -y
+
 if ! [ -x "$(command -v swig)" ]
 then
 	if ! [ -x "$(command -v pcre-config)" ]