From b46eefce941d38c6f9bf445c6b1df782acdcd1bc Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel@debian.org>
Date: Thu, 6 Dec 2012 20:59:35 +0100
Subject: Adding back legacy filtering for firmware packages on squeeze when
 contrib or non-free is not enabled.

---
 scripts/build/binary_debian-installer | 29 +++++++++++++++++++++++++++++
 scripts/build/chroot_linux-image      | 29 +++++++++++++++++++++++++++++
 2 files changed, 58 insertions(+)

(limited to 'scripts')

diff --git a/scripts/build/binary_debian-installer b/scripts/build/binary_debian-installer
index 7b49c83ec..c72122f88 100755
--- a/scripts/build/binary_debian-installer
+++ b/scripts/build/binary_debian-installer
@@ -463,6 +463,35 @@ then
 			done
 		fi
 
+		if [ "${LB_PARENT_DISTRIBUTION}" = "squeeze" ]
+		then
+			# Filter out contrib packages if contrib is not enabled
+			if ! echo ${LB_ARCHIVE_AREAS} | grep -qs contrib
+			then
+				_FIRMWARE_PACKAGES=""
+
+				for _PACKAGE in ${FIRMWARE_PACKAGES}
+				do
+					_FIRMWARE_PACKAGES="${_FIRMWARE_PACKAGES} $(echo ${_PACKAGE} | sed -e 's|^contrib/.*$||')"
+				done
+
+				FIRMWARE_PACKAGES="${_FIRMWARE_PACKAGES}"
+			fi
+
+			# Filter out non-free packages if non-free is not enabled
+			if ! echo ${LB_ARCHIVE_AREAS} | grep -qs non-free
+			then
+				_FIRMWARE_PACKAGES=""
+
+				for _PACKAGE in ${FIRMWARE_PACKAGES}
+				do
+					_FIRMWARE_PACKAGES="${_FIRMWARE_PACKAGES} $(echo ${_PACKAGE} | sed -e 's|^non-free/.*$||')"
+				done
+
+				FIRMWARE_PACKAGES="${_FIRMWARE_PACKAGES}"
+			fi
+		fi
+
 		# Drop section and keep package names only
 		for _PACKAGE in ${FIRMWARE_PACKAGES}
 		do
diff --git a/scripts/build/chroot_linux-image b/scripts/build/chroot_linux-image
index 7e6461c96..10b3fd928 100755
--- a/scripts/build/chroot_linux-image
+++ b/scripts/build/chroot_linux-image
@@ -107,6 +107,35 @@ then
 			done
 		fi
 
+		if [ "${LB_PARENT_DISTRIBUTION}" = "squeeze" ]
+		then
+			# Filter out contrib packages if contrib is not enabled
+			if ! echo ${LB_ARCHIVE_AREAS} | grep -qs contrib
+			then
+				_FIRMWARE_PACKAGES=""
+
+				for _PACKAGE in ${FIRMWARE_PACKAGES}
+				do
+					_FIRMWARE_PACKAGES="${_FIRMWARE_PACKAGES} $(echo ${_PACKAGE} | sed -e 's|^contrib/.*$||')"
+				done
+
+				FIRMWARE_PACKAGES="${_FIRMWARE_PACKAGES}"
+			fi
+
+			# Filter out non-free packages if non-free is not enabled
+			if ! echo ${LB_ARCHIVE_AREAS} | grep -qs non-free
+			then
+				_FIRMWARE_PACKAGES=""
+
+				for _PACKAGE in ${FIRMWARE_PACKAGES}
+				do
+					_FIRMWARE_PACKAGES="${_FIRMWARE_PACKAGES} $(echo ${_PACKAGE} | sed -e 's|^non-free/.*$||')"
+				done
+
+				FIRMWARE_PACKAGES="${_FIRMWARE_PACKAGES}"
+			fi
+		fi
+
 		# Drop section and keep package names only
 		for _PACKAGE in ${FIRMWARE_PACKAGES}
 		do
-- 
cgit v1.2.3