Browse Source

Fix GCC on Jessie servers (missing occurence of 4.7 from ee61519617bec8240a6a048164c19724205aabc5)

Sebastien Badia 9 years ago
parent
commit
595e42d0c4
2 changed files with 4 additions and 5 deletions
  1. 3 4
      Dockerfile
  2. 1 1
      olinux/create_sunxi_boot_files.sh

+ 3 - 4
Dockerfile

@@ -1,5 +1,4 @@
-FROM debian:wheezy
-#FROM emile/wheezy
+FROM debian:jessie
 MAINTAINER Émile Morel
 
 # U-boot part
@@ -14,9 +13,9 @@ RUN apt-get install --force-yes -y emdebian-archive-keyring
 RUN apt-get update
 
 # Install packages for kernel and u-boot compilation
-RUN apt-get install --force-yes -y gcc-4.7-arm-linux-gnueabihf ncurses-dev uboot-mkimage build-essential git vim libusb-1.0-0-dev pkg-config bc netpbm wget tar bzip2
+RUN apt-get install --force-yes -y gcc-4.9-arm-linux-gnueabihf ncurses-dev uboot-mkimage build-essential git vim libusb-1.0-0-dev pkg-config bc netpbm wget tar bzip2
 
-RUN ln -s /usr/bin/arm-linux-gnueabihf-gcc-4.7 /usr/bin/arm-linux-gnueabihf-gcc
+RUN ln -s /usr/bin/arm-linux-gnueabihf-gcc-4.9 /usr/bin/arm-linux-gnueabihf-gcc
 
 # Install packages for debootstrap
 RUN apt-get install --force-yes -y debootstrap dpkg-dev qemu binfmt-support qemu-user-static dpkg-cross

+ 1 - 1
olinux/create_sunxi_boot_files.sh

@@ -150,7 +150,7 @@ rm -f ${TARGET}/*.deb
 if [ ${CROSS} ] ; then
   make -j1 deb-pkg KBUILD_DEBARCH=armhf ARCH=arm DEBFULLNAME="$MAINTAINER" DEBEMAIL="$MAINTAINERMAIL" CROSS_COMPILE=arm-linux-gnueabihf-
 else
-  make -j1 deb-pkg KBUILD_DEBARCH=armhf DEBFULLNAME="$MAINTAINER" DEBEMAIL="$MAINTAINERMAIL" CC=/usr/bin/gcc-4.7
+  make -j1 deb-pkg KBUILD_DEBARCH=armhf DEBFULLNAME="$MAINTAINER" DEBEMAIL="$MAINTAINERMAIL" CC=/usr/bin/gcc-4.9
 fi
 
 rm -rf ${TARGET}/config/boot.scr