From 96287e4b8feaca9f0bdf9d20b9e750fddc708ba2 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel@debian.org>
Date: Sat, 1 Dec 2012 01:44:29 +0100
Subject: Removing some leftovers from stripped and minimal package lists.

---
 functions/defaults.sh | 36 ++++++------------------------------
 1 file changed, 6 insertions(+), 30 deletions(-)

(limited to 'functions/defaults.sh')

diff --git a/functions/defaults.sh b/functions/defaults.sh
index afd3c5219..f9489835a 100755
--- a/functions/defaults.sh
+++ b/functions/defaults.sh
@@ -719,21 +719,13 @@ Set_defaults ()
 					;;
 
 				*)
-					case "${LIST}" in
-						stripped|minimal)
-							LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-486}"
+					case "${LB_PARENT_DISTRIBUTION}" in
+						squeeze)
+							LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-486 686}"
 							;;
 
 						*)
-							case "${LB_PARENT_DISTRIBUTION}" in
-								squeeze)
-									LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-486 686}"
-									;;
-
-								*)
-									LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-486 686-pae}"
-									;;
-							esac
+							LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-486 686-pae}"
 							;;
 					esac
 					;;
@@ -761,27 +753,11 @@ Set_defaults ()
 					;;
 
 				ubuntu|kubuntu)
-					case "${LIST}" in
-						stripped|minimal)
-							LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-powerpc-smp}"
-							;;
-
-						*)
-							LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-powerpc-smp powerpc64-smp}"
-							;;
-					esac
+					LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-powerpc-smp powerpc64-smp}"
 					;;
 
 				*)
-					case "${LIST}" in
-						stripped|minimal)
-							LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-powerpc}"
-							;;
-
-						*)
-							LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-powerpc powerpc64}"
-							;;
-					esac
+					LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-powerpc powerpc64}"
 					;;
 			esac
 			;;
-- 
cgit v1.2.3