Commit Graph

20 Commits

Author SHA1 Message Date
David Lamparter
e94eec84f3 debianpkg: use better dependency for pythontools
As described in https://wiki.debian.org/binNMU, arch-indep packages
should have an "almost identical" dependency so "+..." changes can be
made to arch-dep packages without breaking the arch-indep pkgs.

Signed-off-by: David Lamparter <equinox@diac24.net>
2019-02-19 21:30:50 +01:00
David Lamparter
6397fb8809 debianpkg: kill backports
The debianpkg/backports system is rather complicated and actually slows
down Debian package building quite a lot since the backports/rules file
is evaluated a zillion times during a normal build.

This just folds up everything into a single Debian package build that
works on all OSes.  The only real difference that the backports stuff
was used for is switching between systemd and init.d, the latter for
Ubuntu 12.04 and 14.04.

With this, that switch is controlled by the pkg.frr.nosystemd
Build-Profile instead.  Package builds for Ubuntu 14.04 need to supply
the -Ppkg.frr.nosystemd option to dpkg-buildpackage.  (12.04 isn't
supported anymore anyway.)

Note that the update-rc.d step that was previously coded into
postinst/postrm is now handled by the dh_installinit magic.

Other than this, there were some minor build dependency differences, all
of which are now just handled as | in the central deps.

Signed-off-by: David Lamparter <equinox@diac24.net>
2019-02-19 21:30:50 +01:00
David Lamparter
008f758b8e debianpkg: wrap & sort dependency lines in control
Muuuuch more readable...

Signed-off-by: David Lamparter <equinox@diac24.net>
2019-02-19 21:30:50 +01:00
David Lamparter
64537bc4d0 build: rewrite readline/curses check
We don't need termcap/tinfo/curses, those are just for libreadline.  On
most modern systems, libreadline will pull in the appropriate libs it
needs on its own, so unconditionally adding them adds an extra unneeded
dependency for us.

Still need to try with curses/... for some systems, but only after bare
readline fails.

Signed-off-by: David Lamparter <equinox@diac24.net>
2018-10-19 13:14:10 +02:00
David Lamparter
563fbfb307 debianpkg: clean up dependencies
- accept either python2 or python3 packages for everything
- drop texlive-latex-base, texlive-generic-recommended (only needed for
  PDF docs)
- python-ipaddr is not a build time requirement, only runtime

Signed-off-by: David Lamparter <equinox@diac24.net>
2018-10-19 13:13:42 +02:00
Quentin Young
0ac8ec3dac debian: remove trailing whitespace from control
Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
2018-08-06 20:23:03 +00:00
Quentin Young
9788628a7e debian: add install-info to build deps
Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
2018-08-06 20:22:48 +00:00
Christoph Dwertmann
18b652bc23 debianpkg: add libpython-dev to 16.04 build dependencies
Signed-off-by: Christoph Dwertmann <cdwertmann@gmail.com>
2018-04-06 14:27:45 +10:00
Quentin Young
72a475e87c
debianpkg: update packaging for new docs
Incidentally this was all broken before anyway.

* Correctly ship all documents in frr-doc
* Ship manpages for all daemons in frr
* Update rules to build docs via Sphinx
* Use packaging install files correctly
2018-02-16 15:44:59 -05:00
Quentin Young
1a52a8c142
debianpkg: add sphinx as build dep
Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
2018-02-07 12:36:56 -05:00
Martin Winter
0d14a9ef65 debianpkg: Add Debian 9 Package support
Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>

Conflicts:
	debianpkg/changelog.in
2017-11-17 17:55:33 -08:00
Martin Winter
4c2db6ed68 debian-pkg: Remove hardening-wrapper and replace with dpkg-buildflags
* hardening-wrapper is obsolete
* Fixes Issue #967

Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
2017-11-17 17:55:33 -08:00
Martin Winter
dd8fdd6524 debianpkg: Add missing XSBC-Original-Maintainer field (fixes merge error)
Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
2017-11-17 17:55:33 -08:00
Martin Winter
f35aefae62 debianpkg: Fix some old references to freerangerouting instead of frrouting 2017-11-17 17:55:33 -08:00
smccroskey
3ea411bc80 deb-based-distros: clean up leftover debconf references
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-11-17 17:55:32 -08:00
Martin Winter
f3dbd03c7f debianpkg: Move frr-reload.py to frr-pythontools subpackage
- avoids python dependency on main frr package

Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
2017-11-17 17:55:32 -08:00
Martin Winter
e27971ebf8 debianpkg: Fix description (make shorter - max 80 chars)
- Fixes lintian error 'description-too-long'

Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
2017-11-17 17:55:32 -08:00
Martin Winter
1a18bcf812 debianpkg: Update control to fix maintainer email
Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
2017-11-17 17:55:31 -08:00
Martin Winter
6e6f32769d debianpkg: Update Build-Depends to use libjson-c-dev / libjson-c2 instead of libjson0 on newer debian systems
Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
2017-11-17 17:55:31 -08:00
Martin Winter
495feb8a41 debian->debianpkg: Move debian files from debian dir to debianpkg dir.
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-11-17 17:55:30 -08:00