From 571c89447b539bf9e2e1267b54953108e6177ee2 Mon Sep 17 00:00:00 2001 From: Raphaël Hertzog Date: Tue, 9 Dec 2014 17:30:39 +0100 Subject: 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. --- functions/defaults.sh | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) (limited to 'functions') 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) -- cgit v1.2.3