Adding back legacy filtering for firmware packages on squeeze when contrib or non...

diff --git a/scripts/build/binary_debian-installer b/scripts/build/binary_debian-installer
index 7b49c83..c72122f 100755 (executable)
--- 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 7e6461c..10b3fd9 100755 (executable)
--- 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