summaryrefslogtreecommitdiff
path: root/functions/defaults.sh
diff options
context:
space:
mode:
authorRaphaƫl Hertzog <hertzog@debian.org>2014-12-09 17:30:39 +0100
committerDaniel Baumann <mail@daniel-baumann.ch>2014-12-10 06:19:55 +0100
commit571c89447b539bf9e2e1267b54953108e6177ee2 (patch)
tree4f1cb651e22eec5ed126f31b5b63d61989628f58 /functions/defaults.sh
parente9c15801783f58115a4ad6b019d94a87c6c8233c (diff)
downloadvyos-live-build-571c89447b539bf9e2e1267b54953108e6177ee2.tar.gz
vyos-live-build-571c89447b539bf9e2e1267b54953108e6177ee2.zip
Update linux flavours for armhf/armel.
With linux 3.16 in Debian Jessie, armmp and armmp-lpae are the only armhf flavours availale. On armel, we lost the support of the iop32x flavour.
Diffstat (limited to 'functions/defaults.sh')
-rwxr-xr-xfunctions/defaults.sh20
1 files changed, 17 insertions, 3 deletions
diff --git a/functions/defaults.sh b/functions/defaults.sh
index feebdeef5..aa9c3dd8e 100755
--- a/functions/defaults.sh
+++ b/functions/defaults.sh
@@ -525,15 +525,29 @@ Set_defaults ()
*)
# armel will have special images: one rootfs image and many additional kernel images.
# therefore we default to all available armel flavours
- LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-iop32x ixp4xx kirkwood orion5x versatile}"
+ case "${LB_DISTRIBUTION}" in
+ wheezy)
+ LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-iop32x ixp4xx kirkwood orion5x versatile}"
+ ;;
+ *)
+ LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-ixp4xx kirkwood orion5x versatile}"
+ ;;
+ esac
;;
esac
;;
armhf)
# armhf will have special images: one rootfs image and many additional kernel images.
- # therefore we default to all available armel flavours
- LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-mx5 omap}"
+ # therefore we default to all available armhf flavours
+ case "${LB_DISTRIBUTION}" in
+ wheezy)
+ LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-mx5 omap}"
+ ;;
+ *)
+ LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-armmp armmp-lpae}"
+ ;;
+ esac
;;
amd64)