Merge branch 'source-build' of https://github.com/c-po/vyos-build into current

* 'source-build' of https://github.com/c-po/vyos-build:
  Docker: fix pmacct build dependencies
  Packages: support --blacklist option to not build individual packages
  Packages: fix missing bytes stuck in the output buffer
  Docker: add package requirements to build keepalived
  Docker: Use close sections when working with jessie-backports
  README: adjust chapters to new VyOS package build script
  Packages: extract kernel version from defaults.json
  Packages: use 'make kernelversion' instead of grep magic
  Packages: add bgpq3 (debian/0.1.33-1) package to build procedure
  Jenkins: archive ISO and build.log artifacts
  Makefile: proper handle 'make iso' error codes
  Packages: remove vyatta-quagga
  Packages: add ethtool (debian/1%4.19-1) package to build procedure
  Packages: define custom command for vyos-strongswan
  intel: adjust URL for ixgbevf 4.5.2
  Replace build-submodules with Python based package builder
  Remove outdated/unmaintained submodules

2 files changed, 43 insertions, 19 deletions

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 36895335..beb88053 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -21,12 +21,6 @@ LABEL authors="VyOS Maintainers <maintainers@vyos.io>"
 
 ENV DEBIAN_FRONTEND noninteractive
 
-COPY sources.list /etc/apt/sources.list
-COPY no--check-valid-until /etc/apt/apt.conf.d/
-COPY vyos-dev.key /tmp/vyos-dev.key
-
-RUN apt-key add /tmp/vyos-dev.key
-
 # Standard shell should be bash not dash
 RUN echo "dash dash/sh boolean false" | debconf-set-selections && \
     dpkg-reconfigure dash
@@ -70,13 +64,31 @@ RUN apt-get update && apt-get install -y \
       python3-sphinx \
       python3-pystache \
       pkg-config \
-      debhelper
+      debhelper \
+      jq
+
+#
+# Setup Debian Jessie Backports repository
+#
+COPY no--check-valid-until /etc/apt/apt.conf.d/
+RUN echo "deb http://archive.debian.org/debian/ jessie-backports main" \
+      > /etc/apt/sources.list.d/jessie-backports.list
 
 RUN apt-get update && apt-get install -y -t jessie-backports \
       python3-git \
       python3-pip \
       gosu
 
+# Package needed for mdns-repeater
+RUN apt-get update && apt-get install -y -t jessie-backports \
+      dh-systemd
+
+#
+# Remove Debian Jessie Backports repository
+#
+RUN rm -f /etc/apt/sources.list.d/jessie-backports.list \
+          /etc/apt/apt.conf.d/no--check-valid-until
+
 #
 # Building libvyosconf requires a full configured OPAM/OCaml setup
 #
@@ -123,10 +135,6 @@ RUN eval $(opam env --root=/opt/opam --set-root) && \
     dpkg-buildpackage -uc -us -tc -b && \
     dpkg -i ../libvyosconfig0_*_amd64.deb
 
-# Package needed for mdns-repeater
-RUN apt-get update && apt-get install -y -t jessie-backports \
-      dh-systemd
-
 # Packages needed for vyatta-cfg
 RUN apt-get update && apt-get install -y \
       libglib2.0-dev \
@@ -148,7 +156,7 @@ RUN apt-get update && apt-get install -y \
 RUN apt-get update && apt-get install -y \
       libpcap-dev \
       libpq-dev \
-      default-libmysqlclient-dev \
+      libmysqlclient-dev \
       libgeoip-dev \
       librabbitmq-dev \
       libjansson-dev \
@@ -187,6 +195,14 @@ RUN export RTRLIB_VERSION="0.6.3" && \
     cd /tmp/rtrlib-${RTRLIB_VERSION} && dpkg-buildpackage -uc -us -tc -b && \
     dpkg -i ../librtr*_amd64.deb ../librtr*_all.deb
 
+#
+# Setup VyOS Debian repository
+#
+COPY vyos-dev.key /tmp/vyos-dev.key
+RUN apt-key add /tmp/vyos-dev.key
+RUN echo "deb http://dev.packages.vyos.net/repositories/current/debian/ current main" \
+      > /etc/apt/sources.list.d/vyos.list
+
 # Packages needed to build frr itself
 # libyang-dev packages are hsoted on dev.packages.vyos.net see
 # https://github.com/FRRouting/frr/blob/master/doc/developer/building-libyang.rst
@@ -202,6 +218,11 @@ RUN apt-get update && apt-get install -y \
       python3-pytest \
       texinfo
 
+#
+# Cleanup VyOS Debian Repository
+#
+RUN rm -f /etc/apt/sources.list.d/vyos.list
+
 # Packages needed for conntrack-tools
 RUN apt-get update && apt-get install -y \
       libnetfilter-conntrack-dev \
@@ -259,7 +280,9 @@ RUN apt-get update && apt-get install -y \
       libsqlite3-dev \
       dh-apparmor \
       gperf \
-      libsystemd-dev
+      libsystemd-dev \
+      python3-stdeb \
+      python-setuptools
 
 # Packages needed for vyos-opennhrp
 RUN apt-get update && apt-get install -y \
@@ -269,6 +292,13 @@ RUN apt-get update && apt-get install -y \
 RUN apt-get update && apt-get install -y \
       xmlto
 
+# Packages needed for keepalived
+RUN apt-get update && apt-get install -y \
+      libnl-3-200 \
+      libnl-3-dev \
+      libnl-genl-3-200 \
+      libnl-genl-3-dev
+
 # Update live-build
 RUN echo 'deb http://ftp.debian.org/debian stretch main' | tee -a /etc/apt/sources.list.d/stretch.list && \
     apt-get update && apt-get install -y -t stretch \
@@ -278,8 +308,6 @@ RUN echo 'deb http://ftp.debian.org/debian stretch main' | tee -a /etc/apt/sourc
     rm -rf /var/lib/apt/lists/*
 
 # Install packer
-RUN apt-get update && apt-get install -y \
-      jq
 RUN export LATEST="$(curl -s https://checkpoint-api.hashicorp.com/v1/check/packer | \
     jq -r -M '.current_version')"; \
     echo "url https://releases.hashicorp.com/packer/"$LATEST"/packer_"$LATEST"_linux_amd64.zip" |\
diff --git a/docker/sources.list b/docker/sources.list
deleted file mode 100644
index ec827988..00000000
--- a/docker/sources.list
+++ /dev/null
@@ -1,4 +0,0 @@
-deb http://deb.debian.org/debian/ jessie main
-deb http://deb.debian.org/debian-security/ jessie/updates main
-deb http://archive.debian.org/debian/ jessie-backports main
-deb http://dev.packages.vyos.net/repositories/current/debian/ current main