debianpkg: Add support for Ubuntu 18.04

Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>

diff --git a/debianpkg/Makefile.am b/debianpkg/Makefile.am
index 06e5bda3d42252f1ec615d0b076d1ca5e3f3d9e5..e7ae4bb58dedc783a0d45552fd1f8df9ef7936b8 100644 (file)
--- a/debianpkg/Makefile.am
+++ b/debianpkg/Makefile.am
@@ -33,6 +33,10 @@ EXTRA_DIST = README.Debian README.Maintainer \
        backports/ubuntu17.10/debian/source/format \
        backports/ubuntu17.10/exclude \
        backports/ubuntu17.10/versionext \
+       backports/ubuntu18.04/debian/control \
+       backports/ubuntu18.04/debian/source/format \
+       backports/ubuntu18.04/exclude \
+       backports/ubuntu18.04/versionext \
        frr-doc.docs frr-doc.info frr-doc.install \
        frr-doc.lintian-overrides frr.conf \
        frr-dbg.lintian-overrides \

diff --git a/debianpkg/README.deb_build.md b/debianpkg/README.deb_build.md
index 8ccce93f5530aeefe5310b833c836e7568a42f59..1536698bad7ea97ac2084a6d143d92913be2c906 100644 (file)
--- a/debianpkg/README.deb_build.md
+++ b/debianpkg/README.deb_build.md
@@ -1,6 +1,6 @@
 Building your own FRRouting Debian Package
 ==========================================
-(Tested on Ubuntu 12.04, 14.04, 16.04, 17.10, Debian 8 and 9)
+(Tested on Ubuntu 12.04, 14.04, 16.04, 17.10, 18.04, Debian 8 and 9)
 
 **Note:**  If you try to build for a different distro, then it will most likely
 fail because of the missing backport. See debianpkg/backports/README about
@@ -102,7 +102,7 @@ allowed.
 
             sudo update-rc.d frr defaults
 
-    - On `systemd` based systems (Debian 8, 9, Ubuntu 14.04, 16.04, 17.10)
+    - On `systemd` based systems (Debian 8 and later, Ubuntu 14.04 and later)
 
             sudo systemctl enable frr
 
@@ -112,7 +112,7 @@ allowed.
 
             sudo invoke-rc.d frr start
 
-    - on `systemd` based systems (Debian 8, 9, Ubuntu 14.04, 16.04, 17.10)
+    - on `systemd` based systems (Debian 8 and later, Ubuntu 14.04 and later)
 
             sudo systemctl start frr
 

diff --git a/debianpkg/backports/ubuntu18.04/debian/control b/debianpkg/backports/ubuntu18.04/debian/control
new file mode 100644 (file)
index 0000000..d28f933
--- /dev/null
+++ b/debianpkg/backports/ubuntu18.04/debian/control
@@ -0,0 +1,54 @@
+Source: frr
+Section: net
+Priority: optional
+Maintainer: Nobody <nobody@frrouting.org>
+Uploaders: Nobody <nobody@frrouting.org>
+XSBC-Original-Maintainer: <maintainers@frrouting.org>
+Build-Depends: debhelper (>= 7.0.50~), libncurses5-dev, libreadline-dev, texlive-latex-base, texlive-generic-recommended, libpam0g-dev | libpam-dev, libcap-dev, texinfo (>= 4.7), imagemagick, ghostscript, groff, autotools-dev, libpcre3-dev, gawk, chrpath, libsnmp-dev, git, dh-autoreconf, libjson-c-dev, libjson-c2 | libjson-c3, dh-systemd, libsystemd-dev, bison, flex, libc-ares-dev, pkg-config, python (>= 2.7), python-ipaddr, python-sphinx
+Standards-Version: 3.9.6
+Homepage: http://www.frrouting.org/
+
+Package: frr
+Architecture: any
+Depends: ${shlibs:Depends}, logrotate (>= 3.2-11), iproute2 | iproute, ${misc:Depends}, libc-ares2
+Pre-Depends: adduser
+Conflicts: zebra, zebra-pj, quagga
+Replaces: zebra, zebra-pj
+Suggests: snmpd
+Description: BGP/OSPF/RIP/RIPng/ISIS/PIM/LDP routing daemon forked from Quagga
+ FRR is free software which manages TCP/IP based routing protocols.
+ It supports BGP4, BGP4+, OSPFv2, OSPFv3, IS-IS, RIPv1, RIPv2, RIPng,
+ PIM and LDP as well as the IPv6 versions of these.
+ .
+ FRR is a fork of Quagga with an open community model. The main git
+ lives on https://github.com/frrouting/frr.git
+
+Package: frr-dbg
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, frr (= ${binary:Version})
+Priority: optional
+Section: debug
+Description: BGP/OSPF/RIP/RIPng/ISIS/PIM/LDP routing daemon (debug symbols)
+ This package provides debugging symbols for all binary packages built 
+ from frr source package. It's highly recommended to have this package
+ installed before reporting any FRR crashes to either FRR developers or 
+ Debian package maintainers.
+
+Package: frr-doc
+Section: net
+Architecture: all
+Depends: ${misc:Depends}
+Suggests: frr
+Description: BGP/OSPF/RIP/RIPng/ISIS/PIM/LDP routing daemon (documentation)
+ This package includes info files for frr, a free software which manages
+ TCP/IP based routing protocols.  It supports BGP4, BGP4+, OSPFv2, OSPFv3,
+ IS-IS, RIPv1, RIPv2, RIPng, PIM and LDP as well as the IPv6 versions of these.
+
+Package: frr-pythontools
+Section: net
+Architecture: all
+Depends: ${misc:Depends}, frr (= ${binary:Version}), python (>= 2.7), python-ipaddr
+Description: BGP/OSPF/RIP/RIPng/ISIS/PIM/LDP routing daemon (Python Tools)
+ This package includes info files for frr, a free software which manages
+ TCP/IP based routing protocols.  It supports BGP4, BGP4+, OSPFv2, OSPFv3,
+ IS-IS, RIPv1, RIPv2, RIPng, PIM and LDP as well as the IPv6 versions of these.

diff --git a/debianpkg/backports/ubuntu18.04/debian/source/format b/debianpkg/backports/ubuntu18.04/debian/source/format
new file mode 100644 (file)
index 0000000..163aaf8
--- /dev/null
+++ b/debianpkg/backports/ubuntu18.04/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)

diff --git a/debianpkg/backports/ubuntu18.04/exclude b/debianpkg/backports/ubuntu18.04/exclude
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/debianpkg/backports/ubuntu18.04/versionext b/debianpkg/backports/ubuntu18.04/versionext
new file mode 100644 (file)
index 0000000..832fb4c
--- /dev/null
+++ b/debianpkg/backports/ubuntu18.04/versionext
@@ -0,0 +1 @@
+-1~ubuntu18.04+1

diff --git a/debianpkg/rules b/debianpkg/rules
index 804a3084a17bc0dce1c65298e93be348cc492a66..b66740decfa4c2f3f36a0d28cd80852f71490c44 100755 (executable)
--- a/debianpkg/rules
+++ b/debianpkg/rules
@@ -213,7 +213,7 @@ override_dh_systemd_enable:
 
 # backports
 SRCPKG = frr
-KNOWN_BACKPORTS = debian8 debian9 ubuntu12.04 ubuntu14.04 ubuntu16.04 ubuntu17.10
+KNOWN_BACKPORTS = debian8 debian9 ubuntu12.04 ubuntu14.04 ubuntu16.04 ubuntu17.10 ubuntu18.04
 DEBIAN_VERSION := $(shell dh_testdir && \
                dpkg-parsechangelog -c1 < debian/changelog | \
                sed -rn 's/^Version: ?//p')