Skip to content

Commit

Permalink
Bumping standards versions and fixing minor lint errors
Browse files Browse the repository at this point in the history
  • Loading branch information
@byteit101
byteit101 committed Sep 13, 2015
1 parent b01c308 commit 5356311
Show file tree
Hide file tree
Showing 12 changed files with 25 additions and 23 deletions.
1 change: 1 addition & 0 deletions .hgignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,4 @@ mac/makes/pkg/build/
*.ipk
repack/
frcmake-*/
deb/frcmake_*
10 changes: 5 additions & 5 deletions deb/Makefile
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
include ../versions.sh
DEBUILD_FLAGS ?= -us -uc

all: flags
@echo "please specify which you want. binutils must be installed before gcc"
all: flags sysroot binutils gcc gdb gcc-defaults frcmake frc-toolchain


flags:
echo "Using DEBUILG_FLAGS=$(DEBUILD_FLAGS)"
Expand Down Expand Up @@ -64,9 +64,9 @@ gdb:

frc-toolchain:
rm -rf frc-toolchain*
mkdir frc-toolchain
cp debians/frc-toolchain frc-toolchain/debian -r
cd frc-toolchain && debuild $(DEBUILD_FLAGS)
mkdir frc-toolchain-1
cp debians/frc-toolchain frc-toolchain-1/debian -r
cd frc-toolchain-1 && debuild $(DEBUILD_FLAGS)

clean:
find . -maxdepth 1 ! -name Makefile ! -name debians -type f -delete
Expand Down
2 changes: 1 addition & 1 deletion deb/debians/binutils/control
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Section: devel
Priority: optional
Maintainer: WPILib Developers <[email protected]>
Build-Depends: debhelper (>= 9.0.0), autotools-dev, bison, flex, gettext, texinfo, dejagnu, quilt, file, xz-utils, lsb-release
Standards-Version: 3.9.4
Standards-Version: 3.9.6
Homepage: http://www.gnu.org/software/binutils/

Package: binutils-arm-frc-linux-gnueabi
Expand Down
4 changes: 2 additions & 2 deletions deb/debians/frc-toolchain/control
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ Section: devel
Priority: optional
Maintainer: WPILib Developers <[email protected]>
Build-Depends: debhelper (>= 7)
Standards-Version: 3.9.5
Standards-Version: 3.9.6

Package: frc-toolchain
Architecture: all
Depends: g++-arm-frc-linux-gnueabi (>= 4.9), gdb-arm-frc-linux-gnueabi (>= 7.10), libc6-frc-armel-cross, libc6-dev-frc-armel-cross, linux-libc-dev-frc-armel-cross, ${misc:Depends}
Conflicts: g++-arm-frc-linux-gnueabi (>= 5.0)
Recommends: frcmake
Description: FRC Toolchain
Description: FRC Toolchain for 2016+ (Metapackage)
This metapackage depends on all the components of the FRC toolchain.
2 changes: 1 addition & 1 deletion deb/debians/frcmake/control
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Section: devel
Priority: optional
Maintainer: WPILib Developers <[email protected]>
Build-Depends: debhelper (>= 9.0.0), docbook-xsl, docbook-xml, xsltproc
Standards-Version: 3.9.4
Standards-Version: 3.9.6

Package: frcmake
Architecture: all
Expand Down
4 changes: 2 additions & 2 deletions deb/debians/gcc-versions/control
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Source: gcc-defaults-frc-armel-cross
Maintainer: WPILib Developers <[email protected]>
Section: devel
Priority: extra
Standards-Version: 3.9.4
Standards-Version: 3.9.6
Build-Depends: debhelper (>= 9)

Package: cpp-arm-frc-linux-gnueabi
Expand Down Expand Up @@ -37,7 +37,7 @@ Priority: optional
Architecture: all
Depends: cpp-arm-frc-linux-gnueabi (>= 4.9), gcc-4.9-arm-frc-linux-gnueabi, ${misc:Depends}
Recommends: libc6-dev-frc-armel-cross
Suggests: make, manpages-dev, autoconf, automake1.9, libtool, flex, bison, gdb-arm-frc-linux-gnueabi, gcc-doc
Suggests: make, manpages-dev, autoconf, automake, libtool, flex, bison, gdb-arm-frc-linux-gnueabi, gcc-doc
Description: The GNU C compiler for frc-armel architecture
This is the GNU C compiler, a fairly portable optimizing compiler for C.
.
Expand Down
14 changes: 7 additions & 7 deletions deb/debians/gcc/control
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ Source: gcc-frc-armel-cross
Section: contrib/devel
Priority: extra
Maintainer: WPILib Developers <[email protected]>
Build-Depends: debhelper (>= 9.0.0), autotools-dev, libmpfr-dev (>= 3.1.0), libgmp-dev (>= 2:5.0.2), libmpc-dev (>= 0.9), libcloog-isl-dev (>= 0.17.0), flex, texinfo, zlib1g-dev, bison, binutils-arm-frc-linux-gnueabi (>= 2.24), libc6-dev-frc-armel-cross (>= 2.20-r0.62-0)
Standards-Version: 3.9.4
Build-Depends: debhelper (>= 9.0.0), autotools-dev, libmpfr-dev (>= 3.1.0), libgmp-dev (>= 2:5.0.2), libmpc-dev (>= 0.9), libcloog-isl-dev (>= 0.17.0), flex, texinfo, zlib1g-dev, bison, binutils-arm-frc-linux-gnueabi (>= 2.24), libc6-dev-frc-armel-cross (>= 2.17)
Standards-Version: 3.9.6
Homepage: http://gcc.gnu.org/

Package: gcc-4.9-arm-frc-linux-gnueabi-base
Expand All @@ -19,7 +19,7 @@ Package: libgcc1-frc-armel-cross
Architecture: all
Section: devel
Priority: extra
Depends: gcc-4.9-arm-frc-linux-gnueabi-base (= ${binary:Version}), libc6-frc-armel-cross (>= 2.20), ${shlibs:Depends}, ${misc:Depends}
Depends: gcc-4.9-arm-frc-linux-gnueabi-base (= ${binary:Version}), libc6-frc-armel-cross (>= 2.17), ${shlibs:Depends}, ${misc:Depends}
Provides: libgcc1-armel-dcv1
Description: GCC support library
Shared version of the support library, a library of internal subroutines
Expand All @@ -34,7 +34,7 @@ Package: libgcc-4.9-dev-frc-armel-cross
Architecture: any
Section: libdevel
Priority: optional
Recommends: libc6-dev-frc-armel-cross (>= 2.20)
Recommends: libc6-dev-frc-armel-cross (>= 2.17)
Depends: gcc-4.9-arm-frc-linux-gnueabi-base (= ${binary:Version}), libgcc1-frc-armel-cross (>= ${binary:Version}), libgomp1-frc-armel-cross (>= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
Description: GCC support library (development files)
This package contains the headers and static library files necessary for
Expand All @@ -45,7 +45,7 @@ Architecture: any
Section: devel
Priority: extra
Depends: gcc-4.9-arm-frc-linux-gnueabi-base (= ${binary:Version}), cpp-4.9-arm-frc-linux-gnueabi (= ${binary:Version}), binutils-arm-frc-linux-gnueabi (>= ${binutils:Version}), libgcc-4.9-dev-frc-armel-cross (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
Recommends: libc6-dev-frc-armel-cross (>= 2.20)
Recommends: libc6-dev-frc-armel-cross (>= 2.17)
Suggests: gcc-4.9-doc (>= ${gcc:SoftVersion}), gcc-4.9-locales (>= ${gcc:SoftVersion})
Provides: c-compiler-arm-frc-linux-gnueabi
Description: GNU C compiler
Expand Down Expand Up @@ -93,7 +93,7 @@ Package: libstdc++6-frc-armel-cross
Architecture: all
Section: devel
Priority: extra
Depends: gcc-4.9-arm-frc-linux-gnueabi-base (= ${binary:Version}), libc6-frc-armel-cross (>= 2.20), ${shlibs:Depends}, ${misc:Depends}
Depends: gcc-4.9-arm-frc-linux-gnueabi-base (= ${binary:Version}), libc6-frc-armel-cross (>= 2.17), ${shlibs:Depends}, ${misc:Depends}
Provides: libstdc++6-armel-dcv1
Conflicts: scim (<< 1.4.2-1)
Description: GNU Standard C++ Library v3
Expand All @@ -111,7 +111,7 @@ Package: libstdc++6-dev-frc-armel-cross
Architecture: all
Section: devel
Priority: extra
Depends: gcc-4.9-arm-frc-linux-gnueabi-base (= ${binary:Version}), libgcc-4.9-dev-frc-armel-cross (= ${binary:Version}), libstdc++6-frc-armel-cross (>= ${binary:Version}), libc6-dev-frc-armel-cross (>= 2.20), ${misc:Depends}
Depends: gcc-4.9-arm-frc-linux-gnueabi-base (= ${binary:Version}), libgcc-4.9-dev-frc-armel-cross (= ${binary:Version}), libstdc++6-frc-armel-cross (>= ${binary:Version}), libc6-dev-frc-armel-cross (>= 2.17), ${misc:Depends}
Provides: libstdc++-dev-frc-armel-cross, libstdc++-dev-armel-dcv1, libstdc++6-dev-armel-dcv1, libstdc++6-4.9-dev-frc-armel-cross
Conflicts: libstdc++6-4.9-dev-frc-armel-cross
Description: GNU Standard C++ Library v3 (development files)
Expand Down
2 changes: 1 addition & 1 deletion deb/debians/gdb/control
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Section: devel
Priority: optional
Maintainer: WPILib Developers <[email protected]>
Build-Depends: debhelper (>= 9.0.0), autotools-dev, bison, flex, gettext, texinfo, dejagnu, quilt, file, xz-utils, lsb-release, libexpat1-dev, libncurses5-dev, libreadline-dev, zlib1g-dev, libbz2-dev, liblzma-dev, chrpath, libcloog-isl-dev (>= 0.17.0)
Standards-Version: 3.9.4
Standards-Version: 3.9.6
Homepage: https://www.gnu.org/software/gdb/

Package: gdb-arm-frc-linux-gnueabi
Expand Down
4 changes: 2 additions & 2 deletions deb/debians/libc/control
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Source: libc6-frc-armel-cross
Maintainer: WPILib Developers <[email protected]>
Section: devel
Priority: extra
Standards-Version: 3.9.4
Standards-Version: 3.9.6
Build-Depends: debhelper (>= 9)

Package: libc6-frc-armel-cross
Expand All @@ -25,7 +25,7 @@ Depends: libc6-frc-armel-cross (= ${binary:Version}), linux-libc-dev-frc-armel-c
Recommends: roborio-sysroot (>= 1.1)
Conflicts: roborio-sysroot (<< 1.1)
Replaces: roborio-sysroot (<< 1.1)
Description: Embedded GNU C Library: Development Libraries and Header Files (for cross-compiling)
Description: Embedded GNU C Library: Dev Libs and Header Files (for FRC)
Contains the symlinks, headers, and object files needed to compile
and link programs which use the standard C library.
.
Expand Down
1 change: 1 addition & 0 deletions deb/debians/libc/source.lintian-overrides
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
libc6-frc-armel-cross source: source-is-missing
2 changes: 1 addition & 1 deletion deb/debians/linux-libc/control
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Source: linux-libc-dev-frc-armel-cross
Maintainer: WPILib Developers <[email protected]>
Section: devel
Priority: extra
Standards-Version: 3.9.4
Standards-Version: 3.9.6
Build-Depends: debhelper (>= 9)

Package: linux-libc-dev-frc-armel-cross
Expand Down
2 changes: 1 addition & 1 deletion deb/debians/sysroot/control
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Source: roborio-sysroot
Maintainer: WPILib Developers <[email protected]>
Section: devel
Priority: extra
Standards-Version: 3.9.4
Standards-Version: 3.9.6
Build-Depends: debhelper (>= 9)

Package: roborio-sysroot
Expand Down

0 comments on commit 5356311

Please sign in to comment.