|
|
|
@ -281,7 +281,7 @@ if [ -z "${IMAGEFORMAT:-}" ]; then
|
|
|
|
|
case $PROJECT:${SUBPROJECT:-} in
|
|
|
|
|
ubuntu-cpc:*|ubuntu:desktop-preinstalled)
|
|
|
|
|
case $SUBARCH in
|
|
|
|
|
raspi|imx6)
|
|
|
|
|
raspi)
|
|
|
|
|
IMAGEFORMAT=ubuntu-image
|
|
|
|
|
;;
|
|
|
|
|
*)
|
|
|
|
@ -352,8 +352,6 @@ case $IMAGEFORMAT in
|
|
|
|
|
MODEL=pi3-arm64 ;;
|
|
|
|
|
armhf+cm3)
|
|
|
|
|
MODEL=cm3 ;;
|
|
|
|
|
armhf+imx6)
|
|
|
|
|
MODEL=nitrogen6x ;;
|
|
|
|
|
*)
|
|
|
|
|
echo "Model $ARCH+${SUBARCH:-} unknown to livecd-rootfs" >&2
|
|
|
|
|
exit 1
|
|
|
|
@ -831,12 +829,15 @@ case $PROJECT in
|
|
|
|
|
|
|
|
|
|
BINARY_REMOVE_LINUX=false
|
|
|
|
|
OPTS="${OPTS:+$OPTS }--initramfs=none"
|
|
|
|
|
case $ARCH in
|
|
|
|
|
armhf)
|
|
|
|
|
case "$ARCH+${SUBARCH:-}" in
|
|
|
|
|
*+raspi)
|
|
|
|
|
add_task install ubuntu-server-raspi
|
|
|
|
|
;;
|
|
|
|
|
armhf*)
|
|
|
|
|
KERNEL_FLAVOURS=generic-lpae
|
|
|
|
|
add_package install flash-kernel
|
|
|
|
|
;;
|
|
|
|
|
arm64)
|
|
|
|
|
arm64*)
|
|
|
|
|
add_package install flash-kernel
|
|
|
|
|
if [ "${SUBARCH:-}" = "generic" ]; then
|
|
|
|
|
KERNEL_FLAVOURS=generic
|
|
|
|
@ -847,7 +848,7 @@ case $PROJECT in
|
|
|
|
|
KERNEL_FLAVOURS=generic
|
|
|
|
|
fi
|
|
|
|
|
;;
|
|
|
|
|
riscv64)
|
|
|
|
|
riscv64*)
|
|
|
|
|
if [ -n "$SUBARCH" ]; then
|
|
|
|
|
KERNEL_FLAVOURS=generic
|
|
|
|
|
fi
|
|
|
|
@ -965,25 +966,17 @@ case $PROJECT in
|
|
|
|
|
;;
|
|
|
|
|
esac
|
|
|
|
|
|
|
|
|
|
case $ARCH in
|
|
|
|
|
armhf|arm64)
|
|
|
|
|
KERNEL_FLAVOURS="${SUBARCH:-$KERNEL_FLAVOURS}"
|
|
|
|
|
case $SUBARCH in
|
|
|
|
|
raspi)
|
|
|
|
|
# Generic Raspberry Pi images
|
|
|
|
|
case "$ARCH+${SUBARCH:-}" in
|
|
|
|
|
arm*+raspi)
|
|
|
|
|
# Common configuration for all Raspberry Pi image variants (server,
|
|
|
|
|
# desktop etc.)
|
|
|
|
|
KERNEL_FLAVOURS="$SUBARCH"
|
|
|
|
|
COMPONENTS='main restricted universe multiverse'
|
|
|
|
|
add_package install linux-firmware-raspi2 pi-bluetooth u-boot-rpi flash-kernel u-boot-tools wpasupplicant ubuntu-raspi-settings
|
|
|
|
|
# Most Pi-specific package installation is handled via the seeds in the
|
|
|
|
|
# per-project/subproject cases above
|
|
|
|
|
add_package install linux-firmware-raspi2 pi-bluetooth u-boot-rpi u-boot-tool
|
|
|
|
|
BINARY_REMOVE_LINUX=false
|
|
|
|
|
;;
|
|
|
|
|
imx6)
|
|
|
|
|
COMPONENTS='main restricted universe multiverse'
|
|
|
|
|
KERNEL_FLAVOURS=generic
|
|
|
|
|
add_package install flash-kernel u-boot-tools wpasupplicant
|
|
|
|
|
BINARY_REMOVE_LINUX=false
|
|
|
|
|
;;
|
|
|
|
|
|
|
|
|
|
esac
|
|
|
|
|
;;
|
|
|
|
|
esac
|
|
|
|
|
|
|
|
|
|
case $PROJECT:${SUBPROJECT:-} in
|
|
|
|
|