summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2012-12-01 01:45:25 +0100
committerDaniel Baumann <mail@daniel-baumann.ch>2013-05-06 14:50:01 +0200
commitd318084e0d34afc7a5590fd2d33c9f6b1f2c4f88 (patch)
tree2c001c6050a16e14f4c3d88857a0ef94ba194d6c
parentd1047e809a90daa0e88329efc0db21931be0b919 (diff)
downloadvyos-live-build-d318084e0d34afc7a5590fd2d33c9f6b1f2c4f88.tar.gz
vyos-live-build-d318084e0d34afc7a5590fd2d33c9f6b1f2c4f88.zip
Removing some leftovers from stripped and minimal package lists.
-rwxr-xr-xfunctions/defaults.sh30
1 files changed, 3 insertions, 27 deletions
diff --git a/functions/defaults.sh b/functions/defaults.sh
index 6357e783b..f227ffb13 100755
--- a/functions/defaults.sh
+++ b/functions/defaults.sh
@@ -690,15 +690,7 @@ Set_defaults ()
;;
*)
- case "${LIST}" in
- stripped|minimal)
- LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-486}"
- ;;
-
- *)
- LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-486 686-pae}"
- ;;
- esac
+ LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-486 686-pae}"
;;
esac
;;
@@ -724,27 +716,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
;;