summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2012-04-26 23:02:50 +0200
committerDaniel Baumann <daniel@debian.org>2012-04-26 23:02:53 +0200
commit53898caf1f43a6dc6cd67e7feb001890bb7b5c47 (patch)
treef3553ede94015fafc941558f9d8360ef16df99c8
parent4a182167c787e167ddc616954d29d01d087e26c6 (diff)
downloadvyos-live-build-53898caf1f43a6dc6cd67e7feb001890bb7b5c47.tar.gz
vyos-live-build-53898caf1f43a6dc6cd67e7feb001890bb7b5c47.zip
Also include firmware-linux meta package if non-free is enabled.
While the actual firmware packages are automatically detected, it is handy to have the firmware-linux meta package included if non-free is enabled. That way, future upgrades to newer kernels will keep having all available firmware packages pulled in too.
-rwxr-xr-xscripts/build/lb_binary_debian-installer4
-rwxr-xr-xscripts/build/lb_chroot_linux-image3
2 files changed, 7 insertions, 0 deletions
diff --git a/scripts/build/lb_binary_debian-installer b/scripts/build/lb_binary_debian-installer
index 3687b18c6..13ed57440 100755
--- a/scripts/build/lb_binary_debian-installer
+++ b/scripts/build/lb_binary_debian-installer
@@ -445,6 +445,10 @@ then
done
FIRMWARE_PACKAGES="${_FIRMWARE_PACKAGES}"
+
+ else
+ # Manually add firmware-linux/non-free meta package
+ FIRMWARE_PACKAGES="${FIRMWARE_PACKAGES} firmware-linux"
fi
# Drop section and keep package names only
diff --git a/scripts/build/lb_chroot_linux-image b/scripts/build/lb_chroot_linux-image
index ad094c521..573d32dbb 100755
--- a/scripts/build/lb_chroot_linux-image
+++ b/scripts/build/lb_chroot_linux-image
@@ -85,6 +85,9 @@ then
done
FIRMWARE_PACKAGES="${_FIRMWARE_PACKAGES}"
+ else
+ # Manually add firmware-linux/non-free meta package
+ FIRMWARE_PACKAGES="${FIRMWARE_PACKAGES} firmware-linux"
fi
# Drop section and keep package names only