From d1047e809a90daa0e88329efc0db21931be0b919 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <mail@daniel-baumann.ch>
Date: Mon, 6 May 2013 14:48:46 +0200
Subject: Adding debian version 4.0~a1-1.

---
 scripts/build/chroot_linux-image | 35 +++--------------------------------
 1 file changed, 3 insertions(+), 32 deletions(-)

(limited to 'scripts/build/chroot_linux-image')

diff --git a/scripts/build/chroot_linux-image b/scripts/build/chroot_linux-image
index 58c15fd12..8ab9e6e30 100755
--- a/scripts/build/chroot_linux-image
+++ b/scripts/build/chroot_linux-image
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 ## live-build(7) - System Build Scripts
-## Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2012 Daniel Baumann <daniel@debian.org>
 ##
 ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
 ## This is free software, and you are welcome to redistribute it
@@ -63,7 +63,7 @@ then
 
 		FIRMWARE_PACKAGES=""
 
-		if [ "${LB_PARENT_DISTRIBUTION}" = "squeeze" ]
+		if [ "${LB_MODE}" = "ubuntu" ] || [ "${LB_MODE}" = "kubuntu" ]
 		then
 			_CONTENTS="${LB_PARENT_MIRROR_CHROOT}/dists/${LB_PARENT_DISTRIBUTION}/Contents-${LB_ARCHITECTURES}.gz"
 		else
@@ -90,7 +90,7 @@ then
 		then
 			# FIXME: account for the fact that PARENT_DISTRIBUTION and DISTRIBUTION might be the same (to not have overlapping cache files for contents).
 
-			if [ "${_PARENT_DISTRIBUTION}" = "squeeze" ]
+			if [ "${LB_MODE}" = "ubuntu" ] || [ "${LB_MODE}" = "kubuntu" ]
 			then
 				_CONTENTS="${LB_MIRROR_CHROOT}/dists/${LB_DISTRIBUTION}/Contents-${LB_ARCHITECTURES}.gz"
 			else
@@ -107,35 +107,6 @@ 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