[SCM] live-build branch, debian, updated. debian/3.0_a46-1-21-g4b333fb

[Daniel Baumann]

The following commit has been merged in the debian branch:
commit 53898caf1f43a6dc6cd67e7feb001890bb7b5c47
Author: Daniel Baumann <daniel at debian.org>
Date:   Thu Apr 26 23:02:50 2012 +0200

    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.

diff --git a/scripts/build/lb_binary_debian-installer b/scripts/build/lb_binary_debian-installer
index 3687b18..13ed574 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 ad094c5..573d32d 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

-- 
live-build