Updates the compiler to the NI 2016 feed (FRC 2017 season) (wpilibsui…

…te#2) * Updates all packages to 2016 NI repo * Bumps MSI installer version to 2016 (2017 season) * Updates arch md5 hashes * Updates changelogs * Fixes changelog errors * Fix Lilibc bug * Uses existing versions of libc to build * Fixes LilibC requirements * Fixes Windows builds * Adds a .gitignore * Updates SourceForge expat repo
PeterJohnson · Dec 8, 2016 · f681e1a · f681e1a
1 parent 4b10e2f
commit f681e1a
Show file tree

Hide file tree

Showing 17 changed files with 88 additions and 53 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,13 @@
+*.tar.bz2
+deb/*-*
+*.tar.gz
+windows/*-*
+windows/wix/
+.DS_Store
+mac/*-*
+.vagrant
+mac/makes/pkg/build/
+*.ipk
+repack/
+frcmake-*/
+deb/frcmake_*
diff --git a/arch-linux/pkgbuilds/arm-frc-linux-gnueabi-eglibc/PKGBUILD b/arch-linux/pkgbuilds/arm-frc-linux-gnueabi-eglibc/PKGBUILD
@@ -2,27 +2,27 @@
 
 _target="arm-frc-linux-gnueabi"
 pkgname=${_target}-eglibc
-pkgver=2.20
-_basever=2.20-r0.62
+pkgver=2.21
+_basever=2.21-r0.83
 pkgrel=2
 pkgdesc="Embedded GNU C Library (${_target})"
 arch=(any)
 url="http://www.eglibc.org"
 curl="http://www.eglibc.org"
 license=('GPL')
-groups=('frc-2016')
+groups=('frc-2017')
 depends=("${_target}-linux-api-headers")
 options=(!strip 'staticlibs' '!emptydirs')
-source=("http://download.ni.com/ni-linux-rt/feeds/2015/arm/ipk/cortexa9-vfpv3/libc6_${_basever}_cortexa9-vfpv3.ipk"
-        "http://download.ni.com/ni-linux-rt/feeds/2015/arm/ipk/cortexa9-vfpv3/libc6-dev_${_basever}_cortexa9-vfpv3.ipk"
-	"http://download.ni.com/ni-linux-rt/feeds/2015/arm/ipk/cortexa9-vfpv3/libcidn1_${_basever}_cortexa9-vfpv3.ipk"
-	"http://download.ni.com/ni-linux-rt/feeds/2015/arm/ipk/cortexa9-vfpv3/libc6-thread-db_${_basever}_cortexa9-vfpv3.ipk"
-	"http://download.ni.com/ni-linux-rt/feeds/2015/arm/ipk/cortexa9-vfpv3/libc6-extra-nss_${_basever}_cortexa9-vfpv3.ipk")
-md5sums=('7ef6696ad457445b12978b404db4a925'
-         '5903dbf17303729316bae977bf0ad7d6'
-         '767bf5340ce9807472f4e1275ecf4257'
-         'edaf5b79b28cb554fbd188fc45873531'
-         '91d346538b0c73415ec33aa3d375b850')
+source=("http://download.ni.com/ni-linux-rt/feeds/2016/arm/ipk/cortexa9-vfpv3/libc6_${_basever}_cortexa9-vfpv3.ipk"
+        "http://download.ni.com/ni-linux-rt/feeds/2016/arm/ipk/cortexa9-vfpv3/libc6-dev_${_basever}_cortexa9-vfpv3.ipk"
+	"http://download.ni.com/ni-linux-rt/feeds/2016/arm/ipk/cortexa9-vfpv3/libcidn1_${_basever}_cortexa9-vfpv3.ipk"
+	"http://download.ni.com/ni-linux-rt/feeds/2016/arm/ipk/cortexa9-vfpv3/libc6-thread-db_${_basever}_cortexa9-vfpv3.ipk"
+	"http://download.ni.com/ni-linux-rt/feeds/2016/arm/ipk/cortexa9-vfpv3/libc6-extra-nss_${_basever}_cortexa9-vfpv3.ipk")
+md5sums=('b0ebbf81bf8967e3c4cb4015e377c96c'
+         '1f69e9ef7f61edad53bf325e2a83f6b2'
+         '9e1a5b62312d0dba50a07b79c237e4ac'
+         '49e2138e2d36ba014a891a5a41d628b9'
+         '2fea5da4b5dbfc52dfc387d64935b9e1')
 
 package() {
   cd "${srcdir}"

diff --git a/arch-linux/pkgbuilds/arm-frc-linux-gnueabi-linux-api-headers/PKGBUILD b/arch-linux/pkgbuilds/arm-frc-linux-gnueabi-linux-api-headers/PKGBUILD
@@ -3,20 +3,20 @@
 _target_arch=arm
 _target=${_target_arch}-frc-linux-gnueabi
 pkgname=${_target}-linux-api-headers
-pkgver=3.16
-_basever=3.16-r0.46
+pkgver=3.19
+_basever=3.19-r0.36
 pkgrel=2
 pkgdesc="Kernel headers sanitized for use in userspace (${_target})"
 arch=(any)
 url="http://www.gnu.org/software/libc"
 license=('GPL2')
-groups=('frc-2016')
+groups=('frc-2017')
 provides=("${_target}-linux-api-headers=${pkgver}"
   "${_target}-linux-api-headers30")
 conflicts=("${_target}-linux-api-headers26")
 options=('!emptydirs')
-source=("http://download.ni.com/ni-linux-rt/feeds/2014/arm/ipk/cortexa9-vfp3/linux-libc-headers-dev_${_basever}_cortexa9-vfpv3.ipk")
-sha512sums=('485c576ccbb255c3f5630b820b367fb7c02322b7ab516cf926e5d77adbb3aec1c624bfbb90a1e8647bd471230a9eb7e013c63e47f2f85b0452bc4539977b68f6')
+source=("http://download.ni.com/ni-linux-rt/feeds/2016/arm/ipk/cortexa9-vfp3/linux-libc-headers-dev_${_basever}_cortexa9-vfpv3.ipk")
+sha512sums=('cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e')
 
 package() {
   cd "${srcdir}"

diff --git a/deb/debians/frcmake/frc-cmake-toolchain.1.xml b/deb/debians/frcmake/frc-cmake-toolchain.1.xml
@@ -71,7 +71,7 @@ man(1), man(7), http://www.tldp.org/HOWTO/Man-Page/
       </author>
     </authorgroup>
     <copyright>
-      <year>2015</year>
+      <year>2016</year>
       <holder>&dhusername;</holder>
     </copyright>
     <legalnotice>

diff --git a/deb/debians/frcmake/frcmake.1.xml b/deb/debians/frcmake/frcmake.1.xml
@@ -71,7 +71,7 @@ man(1), man(7), http://www.tldp.org/HOWTO/Man-Page/
       </author>
     </authorgroup>
     <copyright>
-      <year>2015</year>
+      <year>2016</year>
       <holder>&dhusername;</holder>
     </copyright>
     <legalnotice>

diff --git a/deb/debians/gcc/changelog b/deb/debians/gcc/changelog
@@ -1,3 +1,9 @@
+gcc-frc-armel-cross (4.9.3-2) stable; urgency=medium
+
+  * Fix launchpad build failure
+
+ -- WPILib Developers <[email protected]>  Fri, 6 Dec 2016 15:49:12 -0400
+
 gcc-frc-armel-cross (4.9.3-1frc1) stable; urgency=medium
 
   * Fix launchpad build failure

diff --git a/deb/debians/gcc/copyright b/deb/debians/gcc/copyright
@@ -21,7 +21,7 @@ License: GPL-3.0+
    MA 02110-1301, USA.  
 
 Files: debian/*
-Copyright: 2015 WPILib Developers <[email protected]>
+Copyright: 2016 WPILib Developers <[email protected]>
 License: GPL-3.0+
  This program is free software: you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by

diff --git a/deb/debians/libc/changelog b/deb/debians/libc/changelog
@@ -1,3 +1,9 @@
+libc6-frc-armel-cross (2.21-r0.83-1) stable; urgency=low
+
+  * Updating to libc 2.21-r0.83 for 2017 image
+
+ -- WPILib Developers <[email protected]>  Fri, 6 Dec 2016 15:49:12 -0400
+
 libc6-frc-armel-cross (2.20-r0.62-1) stable; urgency=low
 
   * Updating to libc 2.20-r0.62 for 2016 image

diff --git a/deb/debians/libc/libc6-frc-armel-cross.lintian-overrides b/deb/debians/libc/libc6-frc-armel-cross.lintian-overrides
@@ -1,5 +1,5 @@
 libc6-frc-armel-cross: arch-independent-package-contains-binary-or-object
-libc6-frc-armel-cross: shared-lib-without-dependency-information usr/arm-frc-linux-gnueabi/lib/ld-2.20.so
-libc6-frc-armel-cross: embedded-library usr/arm-frc-linux-gnueabi/lib/libm-2.20.so: libm
+libc6-frc-armel-cross: shared-lib-without-dependency-information usr/arm-frc-linux-gnueabi/lib/ld-2.21.so
+libc6-frc-armel-cross: embedded-library usr/arm-frc-linux-gnueabi/lib/libm-2.21.so: libm
 libc6-frc-armel-cross: missing-depends-line
 libc6-frc-armel-cross: non-standard-dir-in-usr usr/arm-frc-linux-gnueabi/
diff --git a/deb/debians/linux-libc/changelog b/deb/debians/linux-libc/changelog
@@ -1,3 +1,9 @@
+linux-libc-dev-frc-armel-cross (3.19-r0.36-1) stable; urgency=low
+
+  * Updating to linux headers 3.19-r0.36 for 2017 image
+
+-- WPILib Developers <[email protected]>  Fri, 6 Dec 2016 15:49:12 -0400
+
 linux-libc-dev-frc-armel-cross (3.16-r0.46-1) stable; urgency=low
 
   * Updating to linux headers 3.16-r0.46 for 2016 image

diff --git a/deb/debians/sysroot/changelog b/deb/debians/sysroot/changelog
@@ -1,3 +1,9 @@
+roborio-sysroot (1.3) stable; urgency=medium
+
+  * Update to 2017 image dependencies
+
+  -- WPILib Developers <[email protected]>  Fri, 6 Dec 2016 15:49:12 -0400
+
 roborio-sysroot (1.2) stable; urgency=medium
 
   * Update to 2016 image dependencies

diff --git a/deb/debians/sysroot/control b/deb/debians/sysroot/control
@@ -7,7 +7,7 @@ Build-Depends: debhelper (>= 9)
 
 Package: roborio-sysroot
 Architecture: all
-Depends: libc6-dev-frc-armel-cross (>= 2.20-r0.62), libc6-frc-armel-cross (>= 2.20-r0.62), linux-libc-dev-frc-armel-cross (>= 3.16-r0.46), ${misc:Depends}
+Depends: libc6-dev-frc-armel-cross (>= 2.21-r0.83), libc6-frc-armel-cross (>= 2.21-r0.83), linux-libc-dev-frc-armel-cross (>= 3.19-r0.36), ${misc:Depends}
 Conflicts: roborio-sysroot (<< 1.1)
 Replaces: roborio-sysroot (<< 1.1)
 Description: System Root for RoboRIO targets (metapackage) 

diff --git a/download.sh b/download.sh
@@ -20,13 +20,13 @@ wget -nc https://ftp.gnu.org/gnu/gmp/gmp-${V_GMP}.tar.bz2
 wget -nc http://www.bastoul.net/cloog/pages/download/cloog-${V_CLOOG}.tar.gz
 wget -nc http://isl.gforge.inria.fr/isl-${V_ISL}.tar.bz2
 wget -nc https://ftp.gnu.org/gnu/gdb/gdb-${V_GDB}.tar.gz
-wget -nc http://iweb.dl.sourceforge.net/project/expat/expat/${Vw_EXPAT}/expat-${Vw_EXPAT}.tar.gz
-wget -nc http://download.ni.com/ni-linux-rt/feeds/2015/arm/ipk/cortexa9-vfpv3/libc6_${Va_LIBC}_cortexa9-vfpv3.ipk
-wget -nc http://download.ni.com/ni-linux-rt/feeds/2015/arm/ipk/cortexa9-vfpv3/libc6-dev_${Va_LIBC}_cortexa9-vfpv3.ipk
-wget -nc http://download.ni.com/ni-linux-rt/feeds/2015/arm/ipk/cortexa9-vfpv3/linux-libc-headers-dev_${Va_LINUX}_cortexa9-vfpv3.ipk
-wget -nc http://download.ni.com/ni-linux-rt/feeds/2015/arm/ipk/cortexa9-vfpv3/libcidn1_${Va_LIBC}_cortexa9-vfpv3.ipk
-wget -nc http://download.ni.com/ni-linux-rt/feeds/2015/arm/ipk/cortexa9-vfpv3/libc6-thread-db_${Va_LIBC}_cortexa9-vfpv3.ipk
-wget -nc http://download.ni.com/ni-linux-rt/feeds/2015/arm/ipk/cortexa9-vfpv3/libc6-extra-nss_${Va_LIBC}_cortexa9-vfpv3.ipk
+wget -nc http://sourceforge.net/project/expat/expat/${Vw_EXPAT}/expat-${Vw_EXPAT}.tar.gz
+wget -nc http://download.ni.com/ni-linux-rt/feeds/2016/arm/ipk/cortexa9-vfpv3/libc6_${Va_LIBC}_cortexa9-vfpv3.ipk
+wget -nc http://download.ni.com/ni-linux-rt/feeds/2016/arm/ipk/cortexa9-vfpv3/libc6-dev_${Va_LIBC}_cortexa9-vfpv3.ipk
+wget -nc http://download.ni.com/ni-linux-rt/feeds/2016/arm/ipk/cortexa9-vfpv3/linux-libc-headers-dev_${Va_LINUX}_cortexa9-vfpv3.ipk
+wget -nc http://download.ni.com/ni-linux-rt/feeds/2016/arm/ipk/cortexa9-vfpv3/libcidn1_${Va_LIBC}_cortexa9-vfpv3.ipk
+wget -nc http://download.ni.com/ni-linux-rt/feeds/2016/arm/ipk/cortexa9-vfpv3/libc6-thread-db_${Va_LIBC}_cortexa9-vfpv3.ipk
+wget -nc http://download.ni.com/ni-linux-rt/feeds/2016/arm/ipk/cortexa9-vfpv3/libc6-extra-nss_${Va_LIBC}_cortexa9-vfpv3.ipk
 
 mkdir -p repack/{libc6,libc6-dev,linux-libc-headers-dev}/out
 mv linux-libc-headers-dev_${Va_LINUX}_cortexa9-vfpv3.ipk repack/linux-libc-headers-dev/

diff --git a/tools/frc-package.rb b/tools/frc-package.rb
@@ -2,7 +2,7 @@
 # usage: no args: list all packags
 # one arg: download package
 
-$repos = 'http://download.ni.com/ni-linux-rt/feeds/2015/arm/ipk/cortexa9-vfpv3/'
+$repos = 'http://download.ni.com/ni-linux-rt/feeds/2016/arm/ipk/cortexa9-vfpv3/'
 $base_img = %w{libc6 libgcc1 libstdc++6}
 
 class Pkg

diff --git a/versions.sh b/versions.sh
@@ -8,9 +8,9 @@ V_GMPf=6.0.0
 V_CLOOG=0.18.1
 V_ISL=0.12.2
 V_GDB=7.10
-V_ROBORIO_SYSROOT=1.2
+V_ROBORIO_SYSROOT=1.3
 V_GCC_DEFAULTS=4.9.3
-Va_LIBC=2.20-r0.62
-Va_LINUX=3.16-r0.46
+Va_LIBC=2.21-r0.83
+Va_LINUX=3.19-r0.36
 Vw_EXPAT=2.1.0
-V_FRCMAKE=1.1
+V_FRCMAKE=1.2
diff --git a/windows/makes/gcc b/windows/makes/gcc
@@ -39,11 +39,6 @@ mv mpfr-${V_MPFR} gcc-${V_GCC}/mpfr
 mv mpc-${V_MPC} gcc-${V_GCC}/mpc
 mv gmp-${V_GMPf} gcc-${V_GCC}/gmp
 
-pushd gcc-${V_GCC}
-# apply the debian so patch
-patch -p1 < ../../deb/debians/gcc/patches/minorSOname
-popd
-
 mkdir gcc-build
 mkdir gcc-install
 cd gcc-build

diff --git a/windows/makes/msi-files/frctoolchain.wxs b/windows/makes/msi-files/frctoolchain.wxs
@@ -1,25 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
 <!-- To Upgrade: generate a new GUID for product id only, then bump the version (currently in format 1.yy.mmr) -->
-    <Product Id="c217724f-3753-4c66-bef8-76b7c6a29d51" Name="FRC Toolchain" Language="1033" Version="1.15.090" Manufacturer="WPI" UpgradeCode="17FA5361-A849-4BC0-8229-9624693117EA">
+    <Product Id="16fd869e-a5fb-4368-8a40-bbb3f6891054" Name="FRC Toolchain" Language="1033" Version="1.16.120" Manufacturer="WPI" UpgradeCode="17FA5361-A849-4BC0-8229-9624693117EA">
         <Package Description="GNU Toolchain for FRC" Comments="FRC Toolchain including Binutils, GCC, and RoboRIO headers" InstallerVersion="405" Compressed="yes" />
         <Media Id="1" Cabinet="simple.cab" EmbedCab="yes" />
         <Directory Id="TARGETDIR" Name="SourceDir">
-            <Directory Id="APPLICATIONFOLDER" Name="frc">
-                <Component Id="PATHENVIRON" Guid="39AD8D16-4319-42F3-891E-CAD370C019CF" KeyPath="yes">
-                    <Environment Id="PATH" Name="PATH" Value="[APPLICATIONFOLDER]bin" System="yes" Action="set" Part="last" Permanent="no" />
-                </Component>
-            </Directory>
-            <Directory Id="ProgramMenuFolder">
-                <Directory Id="ProgramMenuDir" Name="FRC">
-                    <Component Id="StartMenuShortcuts" Guid="7FFF9A36-0D91-4FC2-9FF4-684E8FADB669">
-                        <RemoveFolder Id="ProgramMenuDir" On="uninstall" />
-                        <RegistryValue Root="HKCU" Key="Software\[Manufacturer]\[ProductName]" Type="string" Value="" />
-                        <Shortcut Id="UninstallProduct" Name="Uninstall Toolchain" Description="Uninstalls FRC Toolchain" Target="[System64Folder]msiexec.exe" Arguments="/x [ProductCode]" />
+            <Directory Id="WINDOWSVOLUME" >
+                <Directory Id="APPLICATIONFOLDER" Name="frc">
+                    <Component Id="PATHENVIRON" Guid="39AD8D16-4319-42F3-891E-CAD370C019CF" KeyPath="yes">
+                        <Environment Id="PATH" Name="PATH" Value="[APPLICATIONFOLDER]bin" System="yes" Action="set" Part="last" Permanent="no" />
                     </Component>
                 </Directory>
+                <Directory Id="ProgramMenuFolder">
+                    <Directory Id="ProgramMenuDir" Name="FRC">
+                        <Component Id="StartMenuShortcuts" Guid="7FFF9A36-0D91-4FC2-9FF4-684E8FADB669">
+                            <RemoveFolder Id="ProgramMenuDir" On="uninstall" />
+                            <RegistryValue Root="HKCU" Key="Software\[Manufacturer]\[ProductName]" Type="string" Value="" />
+                            <Shortcut Id="UninstallProduct" Name="Uninstall Toolchain" Description="Uninstalls FRC Toolchain" Target="[System64Folder]msiexec.exe" Arguments="/x [ProductCode]" />
+                        </Component>
+                    </Directory>
+                </Directory>
             </Directory>
         </Directory>
+        <SetDirectory Id="WINDOWSVOLUME" Value="[WindowsVolume]"/>
         <Feature Id="BinutilsFeature" Title="GNU Toolchain" Level="1">
             <ComponentGroupRef Id="BINUTILS" />
         </Feature>