Simplifying exit check in chroot_linux-image.

This commit is contained in:
Daniel Baumann 2012-12-30 13:07:15 +01:00
parent 1c5b4985dc
commit ae2bee55ed
1 changed files with 55 additions and 53 deletions

View File

@ -24,6 +24,11 @@ Arguments "${@}"
Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
Set_defaults
if [ "${LB_LINUX_PACKAGES}" = "none" ]
then
exit 0
fi
# Requiring stage file
Require_stagefile .build/config .build/bootstrap
@ -43,19 +48,17 @@ Create_lockfile .lock
# ;;
#esac
if [ "${LB_LINUX_PACKAGES}" != "none" ]
then
for FLAVOUR in ${LB_LINUX_FLAVOURS}
do
for FLAVOUR in ${LB_LINUX_FLAVOURS}
do
for PACKAGE in ${LB_LINUX_PACKAGES}
do
echo ${PACKAGE}-${FLAVOUR} >> chroot/root/packages.chroot
done
done
done
# Include firmware packages
if [ "${LB_FIRMWARE_CHROOT}" = "true" ]
then
# Include firmware packages
if [ "${LB_FIRMWARE_CHROOT}" = "true" ]
then
# Assumption: firmware packages install files into /lib/firmware
# Get all firmware packages names
@ -113,8 +116,7 @@ firmware-ipw2x00 firmware-ipw2x00/license/accepted boolean true
EOF
fi
fi
# Creating stage file
Create_stagefile .build/chroot_linux-image
fi
# Creating stage file
Create_stagefile .build/chroot_linux-image