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

[Daniel Baumann]

The following commit has been merged in the debian-next branch:
commit b803dd5e203116ba8064088e1e313873004bbd52
Author: Daniel Baumann <daniel at debian.org>
Date:   Fri Apr 27 10:17:26 2012 +0200

    Adding temporary upgrade hack for squeeze based images with backports for libertas-firmware transition.

diff --git a/scripts/build/lb_binary_debian-installer b/scripts/build/lb_binary_debian-installer
index 003051b..78a7807 100755
--- a/scripts/build/lb_binary_debian-installer
+++ b/scripts/build/lb_binary_debian-installer
@@ -451,6 +451,13 @@ then
 		do
 			DI_FIRMWARE_PACKAGES="${DI_FIRMWARE_PACKAGES} $(echo ${_PACKAGE} | awk -F/ '{ print $NF }')"
 		done
+
+		# Temporary upgrade hack for squeeze based images with backports
+		if echo ${DI_FIRMWARE_PACKAGES} | grep -qs libertas-firmware && \
+		   echo ${DI_FIRMWARE_PACKAGES} | grep -qs firmware-libertas
+		then
+			DI_FIRMWARE_PACKAGES="$(echo ${DI_FIRMWARE_PACKAGES} | sed -e 's|libertas-firmware||')"
+		fi
 	fi
 
 	# Set apt command prefix
diff --git a/scripts/build/lb_chroot_linux-image b/scripts/build/lb_chroot_linux-image
index 573d32d..dbcb51c 100755
--- a/scripts/build/lb_chroot_linux-image
+++ b/scripts/build/lb_chroot_linux-image
@@ -96,6 +96,13 @@ then
 			echo $(echo ${_PACKAGE} | awk -F/ '{ print $NF }') >> chroot/root/packages.chroot
 		done
 
+		# Temporary upgrade hack for squeeze based images with backports
+		if grep -qs libertas-firmware chroot/root/packages.chroot && \
+		   grep -qs firmware-libertas chroot/root/packages.chroot
+		then
+			sed -i -e 's|libertas-firmware||' chroot/root/packages.chroot
+		fi
+
 # Some known licenses required to be accepted
 cat >> chroot/root/packages.chroot.cfg << EOF
 firmware-ivtv firmware-ivtv/license/accepted boolean true

-- 
live-build