summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2017-10-10release: FRR 3.0-rc3frr-3.0-rc3Martin Winter
Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
2017-10-10Merge pull request #1320 from opensourcerouting/Debian-Pkg-3.0Donald Sharp
Debian pkg 3.0
2017-10-10debianpkg: Fix non-empty-dependency_libs-in-la-file for frr modulesMartin Winter
Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
2017-10-10debian-pkg: Remove hardening-wrapper and replace with dpkg-buildflagsMartin Winter
* hardening-wrapper is obsolete * Fixes Issue #967 Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
2017-10-10debianpkg: Always build FPM moduleMartin Winter
- FPM is a module since 3.0. Always build it and allow user choice to enable or disable it Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
2017-10-10debianpkg: Remove -werror from Ubuntu 14.04 and 12.04 build to skip warnings ↵Martin Winter
from flex generated code - Flex is too old on these releases and misses some prototypes in the generated code. Removing the werror allows to build the package anyway Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
2017-10-10debianpkg: Add missing XSBC-Original-Maintainer field (fixes merge error)Martin Winter
Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
2017-10-10debianpkg: Fix leftover marking from mergeMartin Winter
Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
2017-10-10debianpkg: Fix some old references to freerangerouting instead of frroutingMartin Winter
2017-10-10frr.lintian-overrides: update for current list of built libssmccroskey
Because the lintian warning no longer matched exactly due to removal of unused protobuf libraries from the build, the warning wasn't masked. Update it to match the current warning string. Signed-off-by: Silas McCroskey <smccroskey@cumulusnetworks.com>
2017-10-10ubuntu trusty/precise: remove leftover debconf callsmccroskey
Forgot to unstash this when attempting to rebase it into 1e6df754913b4218ec809742fe0fff4eb8461035. Signed-off-by: Silas McCroskey <smccroskey@cumulusnetworks.com>
2017-10-10debianpkg/Makefile.am: remove frr.configsmccroskey
File was removed by 1e6df754913b4218ec809742fe0fff4eb8461035 but missed removing it from the Makefile.am. Signed-off-by: Silas McCroskey <smccroskey@cumulusnetworks.com>
2017-10-10debianpkg/Makefile.am: remove po/ directorysmccroskey
Directory was removed by 1e6df754913b4218ec809742fe0fff4eb8461035 but missed removing it from the Makefile.am. Signed-off-by: Silas McCroskey <smccroskey@cumulusnetworks.com>
2017-10-10frr.service: remove explicit dependency on socket-based syslog.targetsmccroskey
Testing done: built and installed for all ubuntu targets Socket-based services such as syslog need not be specified as dependencies in service files, and doing so may slow down boot by reducing parallelism. All known supported systemd-based platforms have syslog as a socket-based service. Clears the following lintian warnings: W: frr: systemd-service-file-refers-to-obsolete-target lib/systemd/system/frr.service syslog.target Signed-off-by: Silas McCroskey <smccroskey@cumulusnetworks.com>
2017-10-10pb libs: don't build if protobuf support is disabledsmccroskey
Testing done: built and installed for all ubuntu targets These library targets should not be built if protobuf support is disabled, as that is their only functionality. Clears the following lintian warnings: W: frr: non-dev-pkg-with-shlib-symlink usr/lib/libfrr_pb.so.0.0.0 usr/lib/libfrr_pb.so W: frr: non-dev-pkg-with-shlib-symlink usr/lib/libfrrfpm_pb.so.0.0.0 usr/lib/libfrrfpm_pb.so W: frr-dbg: debug-file-with-no-debug-symbols usr/lib/debug/usr/lib/libfrr_pb.so.0.0.0 W: frr-dbg: debug-file-with-no-debug-symbols usr/lib/debug/usr/lib/libfrrfpm_pb.so.0.0.0 Signed-off-by: Silas McCroskey <smccroskey@cumulusnetworks.com>
2017-10-10ubuntu12.04: shorten frr-dbg descriptionsmccroskey
Testing done: built and installed on all ubuntu Fix was applied elsewhere but didn't make it into this file. Clears the following lintian warning: W: frr-dbg: description too long Signed-off-by: Silas McCroskey <smccroskey@cumulusnetworks.com>
2017-10-10deb-based-distros: clean up leftover debconf referencessmccroskey
Testing done: built and installed on all ubuntu Debconf was in use by this packaging a long time ago, and references to it were never fully cleaned up when the one question it asked was deleted. Clears the following lintian warning: W: frr: no-debconf-templates Signed-off-by: Silas McCroskey <smccroskey@cumulusnetworks.com>
2017-10-10backports: don't install frr-reload.py in frr packagesmccroskey
Testing done: built in sbuild with lintian enabled verified frr-reload.py still in frr-pythontools Clean up issues missed when moving the script into a separate package. Clears the following lintian warning: E: frr: python-script-but-no-python-dep usr/lib/frr/frr-reload.py Signed-off-by: Silas McCroskey <smccroskey@cumulusnetworks.com>
2017-10-10debian: install PNG files in /usr/share/infosmccroskey
Testing done: built in sbuild with lintian enabled Clears lintian warnings of the following form: W: frr-doc: info-document-missing-image-file According to the documentation for the lintian warning, certain applications (e.g. emacs) can render images from info files inline, and expect the images to either have their full path defined or be installed in the same directory as the info files themselves. Automake doesn't seem to have a primary for handling this sort of installation (info_DATA is invalid and causes an error), so opted to handle it in the debian install file itself. Installing the images elsewhere (another path installed by frr-doc) and giving a full path to their location in info files might be a better approach. Signed-off-by: Silas McCroskey <smccroskey@cumulusnetworks.com>
2017-10-10debianpkg: Overriding lintian package-name-doesnt-match-sonames warningMartin Winter
Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
2017-10-10debianpkg: Fix 'make backports' warning about autopkgtestSilas McCroskey
Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
2017-10-10debianpkg: Move frr-reload.py to frr-pythontools subpackageMartin Winter
- avoids python dependency on main frr package Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
2017-10-10debianpkg: Register/remove init script on init.d based systemsMartin Winter
- Ubuntu 12.04 and Ubuntu 14.04 need init script registered during install and removed at uninstall Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
2017-10-10debianpkg: Fix description (make shorter - max 80 chars)Martin Winter
- Fixes lintian error 'description-too-long' Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
2017-10-10debianpkg: Support --with-pkg-extra-version and other modifier to build ↵Martin Winter
custom package version Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
2017-10-10debianpkg: Cleanup configure optionsMartin Winter
- Make them configurable (with WANT_xxx env variables) - Adjust defaults to generic package - remove obsolete configure options Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
2017-10-10debianpkg: Do not start package after installationMartin Winter
- Remove auto-start from Ubuntu 12.04 Backport - Update Doc to explain on how to enable startup Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
2017-10-10tools: Rename to FRRouting in frr.service fileMartin Winter
Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
2017-10-10debianpkg/Ubuntu12.04-backport: Remove accidental reference to frr_sudoersMartin Winter
Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
2017-10-10debianpkg: Update control to fix maintainer emailMartin Winter
Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
2017-10-10debianpkg: Fix Date format in changelog and version numbering to make sure ↵Martin Winter
custom build is newer Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
2017-10-10debianpkg: Add backport for Debian 8Martin Winter
Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
2017-10-10debianpkg: debian rules file needs to be executableMartin Winter
Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
2017-10-10debianpkg: Update Build-Depends to use libjson-c-dev / libjson-c2 instead of ↵Martin Winter
libjson0 on newer debian systems Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
2017-10-10debianpkg: Add initial README to document the steps required to build the ↵Martin Winter
debian packages with backports Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
2017-10-10debian->debianpkg: Move debian files from debian dir to debianpkg dir.Martin Winter
Debian build systems use debian subdir for building and having a debian dir in the source package causes issues. Moving it to debianpkg avoids the issue and allows us to ship debian package files in the source distribution Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
2017-10-10backports: minimize diffs with base debian filessmccroskey
minimize diffs between the base debian files and each backport to the changes that actually matter, so that they aren't lost in the noise of capitalization and ordering differences. Signed-off-by: Silas McCroskey <smccroskey@cumulusnetworks.com>
2017-10-10debian: clean up, update base debian/controlsmccroskey
this removes some cruft -- old/outdated/incorrect information, trailing whitespace, etc., and updates the descriptions. Some small changes were made where appropriate to minimize the diff between the base control file and those of the various backports. Signed-off-by: Silas McCroskey <smccroskey@cumulusnetworks.com>
2017-10-10debian: delete unused files out of debian/smccroskey
These are unused and not referenced anywhere. debian/rules.orig: included by mistake debian/watch: no longer applicable; url is not valid debian/patches: stale, unused, misleading Signed-off-by: Silas McCroskey <smccroskey@cumulusnetworks.com>
2017-10-10precise/trusty: don't attempt to install pimd or ldpd manualssmccroskey
Neither of these daemons are installed on 14.04, leading to build failures now that the man pages are excluded from the Makefiles when the daemons aren't enabled for install. Signed-off-by: Silas McCroskey <smccroskey@cumulusnetworks.com>
2017-10-10backports: error out on upstream/downstream version mismatchsmccroskey
The quilt source format expects the upstream tarball's version to correspond roughly to the debian version of the package, and errors will be thrown (at unpack time, in our case) if it doesn't. Do a sanity check when we're building the source package to make sure they match up. Signed-off-by: Silas McCroskey <smccroskey@cumulusnetworks.com>
2017-10-10debian: Fix some incorrect references to Quagga instead of FRRMartin Winter
Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
2017-10-10backports: symlink identical filesSilas McCroskey
Testing-done: built all backports in schroots and VMs made files identical between different backports symlinks to the ones for the more recent distribution, and updated relevant tar invocations to follow symlinks. Signed-off by: Silas McCroskey <smccroskey@cumulusnetworks.com>
2017-10-10debian: add pkg-config to build-dependsSilas McCroskey
Testing-done: `--add-depends pkg-config' sbuild The dependency on pkg-config was introduced recently, and missed because it's in our schroots by default. Need to add it for other build environments (e.g. ubuntu schroots). Signed-off by: Silas McCroskey <smccroskey@cumulusnetworks.com>
2017-10-10debian: move ubuntu 16.04 files into new backports systemSilas McCroskey
Added 'debian/patches' to the exclude file, since the existing patches interfere with the build and are unused by our build. No other changes were necessary. Used '-0~ubuntu16.04+1' as the version extention, to denote: no patches (-0), debian packaging files changed for backport (+1). Signed-off-by: Silas McCroskey <smccroskey@cumulusnetworks.com> Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
2017-10-10debian: move ubuntu 14.04 files into new backports systemSilas McCroskey
`git diff'ed the main (cmaster) branch against the 14.04 branch to determine changed debian files, then pulled them into debian/backports via `git cat-file'. Added 'debian/patches' to the exclude file, since the existing patches interfere with the build and are unused by our build. Used '-0~ubuntu14.04+1' as the version extention, to denote: no patches (-0), debian packaging files changed for backport (+1). Original commit by Silas with updates on fork name by Martin Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
2017-10-10debian: move ubuntu 12.04 files into new backports systemSilas McCroskey
`git diff'ed the main (cmaster) branch against the 12.04 branch to determine changed debian files, then pulled them into debian/backports via `git cat-file'. Added 'debian/patches' to the exclude file, since the existing patches interfere with the build and are unused by our build. Used '-0~ubuntu12.04+1' as the version extention, to denote: no patches (-0), debian packaging files changed for backport (+1). Original commit by Silas with updates on fork name by Martin Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
2017-10-10debian/backports: include in distfile, don't put files in ..Silas McCroskey
Testing-done: ran 'make dist', unpacked elsewhere, built from result Adjusted target to build the .orig.tar.gz accordingly, since it must exclude the debian/ subdirectory. Allows for building any backport from only a tarball. Signed-off-by: Silas McCroskey <smccroskey@cumulusnetworks.com> Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
2017-10-10debian: fix dpkg tool invocations to work on Ubuntu 12.04Silas McCroskey
dpkg-parsechangelog and dpkg-source were both using flags not yet available in the versions available on 12.04. Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
2017-10-10debian: structure for building backports from a single branchSilas McCroskey
Source a makefile (when it exists) in debian/rules to assemble a source package via: * a debian.tar.gz tarball built from combining the contents of debian/ and debian/backports/$backport/debian/ using other details under debian/backports/$backport * an orig.tar.gz file (not generated by this makefile). This can (and should) be the same for all backports. Details in debian/backports/README Signed-off-by: Silas McCroskey <smccroskey@cumulusnetworks.com>