firmware: T1958: only include firmware for compiled Kernel drivers

In the past when building the VyOS ISO we have simply pulle din the entire
linux-firmware Git repository and just deleted some arbitrary files manually
selected. Now all is shipped via vyos-linux-firmware.

2 files changed, 1 insertions, 46 deletions

diff --git a/data/live-build-config/hooks/live/40-linux-firmware.chroot b/data/live-build-config/hooks/live/40-linux-firmware.chroot
deleted file mode 100755
index d3f34dec..00000000
--- a/data/live-build-config/hooks/live/40-linux-firmware.chroot
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/bin/sh
-
-# To get the possibility of reproducible builds we pin to a specific commit
-# of the linux-firmware repository
-COMMIT="aa95e90b2c638f1ca6647d12b2d1b18284428f9c"
-
-echo "I: Retrieving Linux Firmware - commit ${COMMIT}"
-
-ret=$(curl -w "%{http_code}" -o /tmp/linux-firmware-${COMMIT}.tar.gz \
-    https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/snapshot/linux-firmware-${COMMIT}.tar.gz)
-
-if [ "${ret}" != "200" ]; then
-    echo E: Received HTTP error code \"${ret}\" when downloading Linux Firmware ...
-    exit 1
-fi
-
-tar xf /tmp/linux-firmware-${COMMIT}.tar.gz -C /tmp
-mkdir -p /lib/firmware
-mv /tmp/linux-firmware-${COMMIT}/* /lib/firmware
-rm -rf /tmp/linux-firmware-${COMMIT}*
-
-# We do not need all firmware blobs .. cleanup
-RM_FIRMWARE=" \
-    v4l-cx* \
-    s5p-mfc* \
-    nvidia \
-    amdgpu \
-    i915 \
-    radeon \
-    matrox \
-    mediatek \
-    sb16 \
-    ti-connectivity \
-    ueagle-atm \
-    dvb-* \
-    v4l-* \
-    i915 \
-    qcom \
-    ctfw-* \
-    ct2fw-* \
-    "
-
-for dir in ${RM_FIRMWARE}
-do
-    rm -rf /lib/firmware/${dir}
-done
diff --git a/data/package-lists/vyos-x86.list.chroot b/data/package-lists/vyos-x86.list.chroot
index cc9a41e5..4b92dd14 100644
--- a/data/package-lists/vyos-x86.list.chroot
+++ b/data/package-lists/vyos-x86.list.chroot
@@ -6,6 +6,7 @@ vyos-netplug
 vyos-smoketest
 vyos-xe-guest-utilities
 vyos-1x-vmware
+vyos-firmware
 vyos-intel-i40e
 vyos-intel-i40evf
 vyos-intel-igb