diff options
| author | Daniel Baumann <daniel@debian.org> | 2012-12-01 01:44:29 +0100 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2012-12-01 01:44:29 +0100 |
| commit | 96287e4b8feaca9f0bdf9d20b9e750fddc708ba2 (patch) | |
| tree | 3be7d8512456178e513875e097d91349c205d4e6 /functions | |
| parent | bbf1634782cfd7e2664b2734b5e24d63216d09c3 (diff) | |
| download | vyos-live-build-96287e4b8feaca9f0bdf9d20b9e750fddc708ba2.tar.gz vyos-live-build-96287e4b8feaca9f0bdf9d20b9e750fddc708ba2.zip | |
Removing some leftovers from stripped and minimal package lists.
Diffstat (limited to 'functions')
| -rwxr-xr-x | functions/defaults.sh | 36 |
1 files changed, 6 insertions, 30 deletions
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 ;; |