Merge branch 'current' into equuleus

* current:
  wireless: T1627: migrate to vyos-1x
  T1804: add python3-psutil to docker image
  Kernel: T1800: update to Linux 4.19.84
  add api option to the ovf template
  hooks: fix installation of linux firmware files
  Kernel: T1791: update to Linux 4.19.82
  Revert "docker: set always pull to use always latest container"
  docker: set always pull to use always latest container
  vyos-qat: adding pkg dependency
  Revert "Docker: always use libvyosconfig HEAD revision"
  do not add the serial option for vep4600
  add build option for vep4600
  Docker: always use libvyosconfig HEAD revision
  T1773: update Dockerfile for changes to libvyosconfig
  Firmware: bail out when there is a download error
  Kernel: T1728: update to Linux 4.19.79
  T1726: update Linux Firmware to a more recent version (2019-10-07)

13 files changed, 67 insertions, 1 deletions

diff --git a/Makefile b/Makefile
index c42766a4..7b319251 100644
--- a/Makefile
+++ b/Makefile
@@ -190,6 +190,19 @@ PACKET-debug: clean prepare
 	cd ..
 	@scripts/copy-image
 
+.PHONY: vep4600
+.ONESHELL:
+vep4600: check_build_config clean prepare
+	@set -e
+	@echo "It's not like I'm building this specially for you or anything!"
+	mkdir -p build/config/includes.chroot/etc/systemd/network
+	cp tools/vep4600/90-vep4600.chroot build/config/hooks/live/
+	cp tools/vep4600/*.link build/config/includes.chroot/etc/systemd/network
+	cd $(build_dir)
+	lb build 2>&1 | tee build.log
+	cd ..
+	@scripts/copy-image
+
 .PHONY: clean
 .ONESHELL:
 clean:
diff --git a/docker/Dockerfile b/docker/Dockerfile
index d4c9a627..94b30725 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -65,6 +65,7 @@ RUN apt-get update && apt-get install -y \
       python3-pystache \
       python3-git \
       python3-pip \
+      python3-psutil \
       pkg-config \
       debhelper \
       gosu \
diff --git a/scripts/build-packages b/scripts/build-packages
index 8d1447dd..0d81ef91 100755
--- a/scripts/build-packages
+++ b/scripts/build-packages
@@ -166,7 +166,6 @@ vyos_packages = ['vyatta-bash',
                  'vyatta-webproxy',
                  'vyatta-cfg-quagga',
                  'vyatta-op-quagga',
-                 'vyatta-wireless',
                  'vyatta-wirelessmodem',
                  'vyatta-wanloadbalance',
                  'vyatta-netflow',
diff --git a/scripts/template.ovf b/scripts/template.ovf
index 88ea5562..b0952c8c 100644
--- a/scripts/template.ovf
+++ b/scripts/template.ovf
@@ -78,6 +78,10 @@
         <Label>Domain Time Servers</Label>
         <Description>NTP servers for this VM (comma separated). Leave blank if DHCP is desired.</Description>
       </Property>
+      <Property ovf:key="APIKEY" ovf:type="string" ovf:userConfigurable="true">
+        <Label>HTTP API configuration key</Label>
+        <Description>API configuration key. Leave blank to not enable the API.</Description>
+      </Property>
     </ProductSection>
     <ProductSection ovf:class="vm" ovf:required="false">
       <Info>VM specific properties</Info>
diff --git a/tools/vep4600/10-eth0.link b/tools/vep4600/10-eth0.link
new file mode 100644
index 00000000..0885fd8b
--- /dev/null
+++ b/tools/vep4600/10-eth0.link
@@ -0,0 +1,5 @@
+[Match]
+Path=pci-0000:04:*
+
+[Link]
+Name=eth0
diff --git a/tools/vep4600/10-eth1.link b/tools/vep4600/10-eth1.link
new file mode 100644
index 00000000..9d33db13
--- /dev/null
+++ b/tools/vep4600/10-eth1.link
@@ -0,0 +1,5 @@
+[Match]
+Path=0000:b8:00.0
+
+[Link]
+Name=eth1
diff --git a/tools/vep4600/10-eth2.link b/tools/vep4600/10-eth2.link
new file mode 100644
index 00000000..60b88f83
--- /dev/null
+++ b/tools/vep4600/10-eth2.link
@@ -0,0 +1,5 @@
+[Match]
+Path=0000:b8:00.1
+
+[Link]
+Name=eth2
diff --git a/tools/vep4600/10-eth3.link b/tools/vep4600/10-eth3.link
new file mode 100644
index 00000000..0c37c8d4
--- /dev/null
+++ b/tools/vep4600/10-eth3.link
@@ -0,0 +1,5 @@
+[Match]
+Path=pci-0000:02:00.1
+
+[Link]
+Name=eth3
diff --git a/tools/vep4600/10-eth4.link b/tools/vep4600/10-eth4.link
new file mode 100644
index 00000000..7762187a
--- /dev/null
+++ b/tools/vep4600/10-eth4.link
@@ -0,0 +1,5 @@
+[Match]
+Path=pci-0000:02:00.0
+
+[Link]
+Name=eth4
diff --git a/tools/vep4600/10-eth5.link b/tools/vep4600/10-eth5.link
new file mode 100644
index 00000000..10099488
--- /dev/null
+++ b/tools/vep4600/10-eth5.link
@@ -0,0 +1,5 @@
+[Match]
+Path=pci-0000:02:00.3
+
+[Link]
+Name=eth5
diff --git a/tools/vep4600/10-eth6.link b/tools/vep4600/10-eth6.link
new file mode 100644
index 00000000..f3a6fe00
--- /dev/null
+++ b/tools/vep4600/10-eth6.link
@@ -0,0 +1,5 @@
+[Match]
+Path=pci-0000:02:00.2
+
+[Link]
+Name=eth6
diff --git a/tools/vep4600/90-vep4600.chroot b/tools/vep4600/90-vep4600.chroot
new file mode 100755
index 00000000..c4bb7496
--- /dev/null
+++ b/tools/vep4600/90-vep4600.chroot
@@ -0,0 +1,14 @@
+#!/bin/sh
+echo I: Change the default serial baud rate.
+sed -i 's/9600/115200/g' /opt/vyatta/etc/config-migrate/migrate/system/3-to-4
+
+echo "ShowStatus=yes" >> /etc/systemd/system.conf
+
+echo I: Disable default link rule.
+rm /lib/systemd/network/99-default.link
+touch /lib/systemd/network/99-default.link
+rm /lib/udev/rules.d/65-vyatta-net.rules
+touch /lib/udev/rules.d/65-vyatta-net.rules
+
+echo I: Update initramfs.
+update-initramfs -u
diff --git a/tools/vep4600/99-default.link b/tools/vep4600/99-default.link
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/tools/vep4600/99-default.link