|
|
@ -5,7 +5,7 @@ case $ARCH:$SUBARCH in
|
|
|
|
amd64:|amd64:generic|amd64:intel-iot|\
|
|
|
|
amd64:|amd64:generic|amd64:intel-iot|\
|
|
|
|
arm64:|arm64:generic|arm64:raspi|arm64:snapdragon|\
|
|
|
|
arm64:|arm64:generic|arm64:raspi|arm64:snapdragon|\
|
|
|
|
arm64:tegra|arm64:tegra-igx|arm64:x13s|\
|
|
|
|
arm64:tegra|arm64:tegra-igx|arm64:x13s|\
|
|
|
|
armhf:|armhf:raspi|\
|
|
|
|
armhf:|\
|
|
|
|
i386:|\
|
|
|
|
i386:|\
|
|
|
|
ppc64el:|\
|
|
|
|
ppc64el:|\
|
|
|
|
riscv64:|riscv64:generic|riscv64:icicle|riscv64:licheerv|\
|
|
|
|
riscv64:|riscv64:generic|riscv64:icicle|riscv64:licheerv|\
|
|
|
@ -342,7 +342,7 @@ if [ -z "${IMAGEFORMAT:-}" ]; then
|
|
|
|
case $PROJECT:${SUBPROJECT:-} in
|
|
|
|
case $PROJECT:${SUBPROJECT:-} in
|
|
|
|
ubuntu-cpc:*|ubuntu:desktop-preinstalled|ubuntu-wsl:*)
|
|
|
|
ubuntu-cpc:*|ubuntu:desktop-preinstalled|ubuntu-wsl:*)
|
|
|
|
case $ARCH+${SUBARCH:-} in
|
|
|
|
case $ARCH+${SUBARCH:-} in
|
|
|
|
*+raspi)
|
|
|
|
arm64+raspi)
|
|
|
|
# All raspi images use ubuntu-image.
|
|
|
|
# All raspi images use ubuntu-image.
|
|
|
|
IMAGEFORMAT=ubuntu-image
|
|
|
|
IMAGEFORMAT=ubuntu-image
|
|
|
|
;;
|
|
|
|
;;
|
|
|
@ -366,7 +366,6 @@ fi
|
|
|
|
# one also must request disk1-img-xz image format
|
|
|
|
# one also must request disk1-img-xz image format
|
|
|
|
if [ "$IMAGEFORMAT" = "ext4" ] && [ "$PROJECT" = "ubuntu-cpc" ]; then
|
|
|
|
if [ "$IMAGEFORMAT" = "ext4" ] && [ "$PROJECT" = "ubuntu-cpc" ]; then
|
|
|
|
case $ARCH:$SUBARCH in
|
|
|
|
case $ARCH:$SUBARCH in
|
|
|
|
armhf:raspi2 | \
|
|
|
|
|
|
|
|
riscv64:icicle | \
|
|
|
|
riscv64:icicle | \
|
|
|
|
riscv64:nezha | \
|
|
|
|
riscv64:nezha | \
|
|
|
|
riscv64:licheerv | \
|
|
|
|
riscv64:licheerv | \
|
|
|
@ -416,18 +415,10 @@ case $IMAGEFORMAT in
|
|
|
|
MODEL=pc-amd64 ;;
|
|
|
|
MODEL=pc-amd64 ;;
|
|
|
|
arm64+snapdragon)
|
|
|
|
arm64+snapdragon)
|
|
|
|
MODEL=dragonboard ;;
|
|
|
|
MODEL=dragonboard ;;
|
|
|
|
armhf+raspi)
|
|
|
|
|
|
|
|
MODEL=pi ;;
|
|
|
|
|
|
|
|
armhf+raspi2)
|
|
|
|
|
|
|
|
MODEL=pi2 ;;
|
|
|
|
|
|
|
|
armhf+raspi3)
|
|
|
|
|
|
|
|
MODEL=pi3 ;;
|
|
|
|
|
|
|
|
arm64+raspi)
|
|
|
|
arm64+raspi)
|
|
|
|
MODEL=pi-arm64 ;;
|
|
|
|
MODEL=pi-arm64 ;;
|
|
|
|
arm64+raspi3)
|
|
|
|
arm64+raspi3)
|
|
|
|
MODEL=pi3-arm64 ;;
|
|
|
|
MODEL=pi3-arm64 ;;
|
|
|
|
armhf+cm3)
|
|
|
|
|
|
|
|
MODEL=cm3 ;;
|
|
|
|
|
|
|
|
arm64+tegra)
|
|
|
|
arm64+tegra)
|
|
|
|
MODEL=tegra ;;
|
|
|
|
MODEL=tegra ;;
|
|
|
|
arm64+tegra-igx)
|
|
|
|
arm64+tegra-igx)
|
|
|
@ -476,9 +467,6 @@ case $IMAGEFORMAT in
|
|
|
|
else
|
|
|
|
else
|
|
|
|
CORE_MAJOR=22
|
|
|
|
CORE_MAJOR=22
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
if [ "${MODEL}" = "pi" ]; then
|
|
|
|
|
|
|
|
MODEL=pi-armhf
|
|
|
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
# Ubuntu Core 2x
|
|
|
|
# Ubuntu Core 2x
|
|
|
|
# Currently uc2x assertions do not support global
|
|
|
|
# Currently uc2x assertions do not support global
|
|
|
|
# channel overrides, instead we have per-channel models
|
|
|
|
# channel overrides, instead we have per-channel models
|
|
|
@ -1053,7 +1041,7 @@ case $PROJECT in
|
|
|
|
BINARY_REMOVE_LINUX=false
|
|
|
|
BINARY_REMOVE_LINUX=false
|
|
|
|
OPTS="${OPTS:+$OPTS }--initramfs=none"
|
|
|
|
OPTS="${OPTS:+$OPTS }--initramfs=none"
|
|
|
|
case "$ARCH+${SUBARCH:-}" in
|
|
|
|
case "$ARCH+${SUBARCH:-}" in
|
|
|
|
*+raspi)
|
|
|
|
arm64+raspi)
|
|
|
|
add_task install ubuntu-server-raspi
|
|
|
|
add_task install ubuntu-server-raspi
|
|
|
|
;;
|
|
|
|
;;
|
|
|
|
arm64*)
|
|
|
|
arm64*)
|
|
|
@ -1192,7 +1180,7 @@ if [ "$PREINSTALLED" != "true" ] && [ "$PASSES_TO_LAYERS" != "true" ] && [ "$LIV
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
|
|
case "$ARCH${SUBARCH:++$SUBARCH}" in
|
|
|
|
case "$ARCH${SUBARCH:++$SUBARCH}" in
|
|
|
|
arm*+raspi)
|
|
|
|
arm64+raspi)
|
|
|
|
# Common configuration for all Raspberry Pi image variants (server,
|
|
|
|
# Common configuration for all Raspberry Pi image variants (server,
|
|
|
|
# desktop etc.)
|
|
|
|
# desktop etc.)
|
|
|
|
KERNEL_FLAVOURS="$SUBARCH"
|
|
|
|
KERNEL_FLAVOURS="$SUBARCH"
|
|
|
@ -1329,7 +1317,7 @@ EOF
|
|
|
|
esac
|
|
|
|
esac
|
|
|
|
|
|
|
|
|
|
|
|
case "$ARCH+${SUBARCH:-}" in
|
|
|
|
case "$ARCH+${SUBARCH:-}" in
|
|
|
|
*+raspi)
|
|
|
|
arm64+raspi)
|
|
|
|
cat > config/hooks/01-firmware-directory.chroot_early <<EOF
|
|
|
|
cat > config/hooks/01-firmware-directory.chroot_early <<EOF
|
|
|
|
#!/bin/sh -ex
|
|
|
|
#!/bin/sh -ex
|
|
|
|
mkdir -p /boot/firmware
|
|
|
|
mkdir -p /boot/firmware
|
|
|
|