From: Martin Winter <mwinter@opensourcerouting.org>
Date: Fri, 9 Jun 2017 08:58:31 +0000 (-0700)
Subject: debianpkg: Add backport for Debian 8
X-Git-Tag: frr-4.0-dev~145^2~33
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=f8fc6a0c1b85a7e80c69fd8ab34d0b7fd3752743;p=matthieu%2Ffrr.git

debianpkg: Add backport for Debian 8

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

diff --git a/debianpkg/Makefile.am b/debianpkg/Makefile.am
index 6078b6a1f4..dd301aaf6e 100644
--- a/debianpkg/Makefile.am
+++ b/debianpkg/Makefile.am
@@ -4,6 +4,9 @@ EXTRA_DIST = README.Debian README.Maintainer \
 	rules source/format tests/control \
 	tests/daemons watchfrr.rc \
 	backports/README backports/rules \
+        backports/debian8/debian/source/format \
+        backports/debian8/exclude \
+        backports/debian8/versionext \
 	backports/ubuntu12.04/debian/control \
 	backports/ubuntu12.04/debian/frr.install \
 	backports/ubuntu12.04/debian/frr.postinst \
diff --git a/debianpkg/README.deb_build.md b/debianpkg/README.deb_build.md
index 8ebd22217a..617c2fb37a 100644
--- a/debianpkg/README.deb_build.md
+++ b/debianpkg/README.deb_build.md
@@ -51,7 +51,7 @@ Building your own FRRouting Debian Package
         tar xf ~/frr/frr_*.orig.tar.gz
         cd frr*
         . /etc/os-release
-        tar xf ~/frr/frr_*ubuntu*${VERSION_ID}*.debian.tar.xz
+        tar xf ~/frr/frr_*${ID}${VERSION_ID}*.debian.tar.xz
 
 7. Build Debian Package Dependencies and install them as needed
 
diff --git a/debianpkg/backports/debian8/debian/source/format b/debianpkg/backports/debian8/debian/source/format
new file mode 100644
index 0000000000..163aaf8d82
--- /dev/null
+++ b/debianpkg/backports/debian8/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/debianpkg/backports/debian8/exclude b/debianpkg/backports/debian8/exclude
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/debianpkg/backports/debian8/versionext b/debianpkg/backports/debian8/versionext
new file mode 100644
index 0000000000..cf418ffabf
--- /dev/null
+++ b/debianpkg/backports/debian8/versionext
@@ -0,0 +1 @@
+-0~debian8+1
diff --git a/debianpkg/rules b/debianpkg/rules
index a152b9a175..26005f4b52 100755
--- a/debianpkg/rules
+++ b/debianpkg/rules
@@ -102,7 +102,7 @@ override_dh_systemd_enable:
 
 # backports
 SRCPKG = frr
-KNOWN_BACKPORTS = ubuntu12.04 ubuntu14.04 ubuntu16.04
+KNOWN_BACKPORTS = debian8 ubuntu12.04 ubuntu14.04 ubuntu16.04
 ORIG_VERSION := $(shell dh_testdir && grep -E < configure.ac '^AC_INIT\(.*\)' \
 		| cut -d, -f2 | xargs echo)
 DEBIAN_VERSION := $(shell dh_testdir && \