|
|
|
@ -572,7 +572,7 @@ case $PROJECT:${SUBPROJECT:-} in
|
|
|
|
|
if [ "$PROJECT:$SUBPROJECT" = "ubuntu-core:system-image" ]; then
|
|
|
|
|
case $ARCH in
|
|
|
|
|
armhf)
|
|
|
|
|
subarches="generic raspi2"
|
|
|
|
|
subarches="generic raspi2 raspi3"
|
|
|
|
|
;;
|
|
|
|
|
arm64)
|
|
|
|
|
subarches="generic dragonboard"
|
|
|
|
@ -610,6 +610,8 @@ case $PROJECT:${SUBPROJECT:-} in
|
|
|
|
|
armhf)
|
|
|
|
|
if [ "$devarch" = "raspi2" ]; then
|
|
|
|
|
linux_package="linux-image-raspi2"
|
|
|
|
|
elif [ "$devarch" = "raspi3" ]; then
|
|
|
|
|
linux_package="linux-image-raspi2"
|
|
|
|
|
fi
|
|
|
|
|
;;
|
|
|
|
|
ppc64el|s390x)
|
|
|
|
@ -677,7 +679,7 @@ case $PROJECT:${SUBPROJECT:-} in
|
|
|
|
|
if [ -n "$dtbs" ]; then
|
|
|
|
|
mv "$dtbs" $TMPDIR/assets/dtbs
|
|
|
|
|
case $devarch in
|
|
|
|
|
raspi2)
|
|
|
|
|
raspi2|raspi3)
|
|
|
|
|
# ubuntu-device-flash does not like subdirs here, we need to tar it up
|
|
|
|
|
if [ -e $TMPDIR/assets/dtbs/overlays ]; then
|
|
|
|
|
tar -C $TMPDIR/assets/dtbs -f $TMPDIR/assets/dtbs/overlays.tgz -czv overlays
|
|
|
|
@ -724,6 +726,9 @@ EOF
|
|
|
|
|
if [ "$devarch" = "raspi2" ];then
|
|
|
|
|
tarname="raspi2.$tarname"
|
|
|
|
|
manifestname="$devarch.$manifestname"
|
|
|
|
|
elif [ "$devarch" = "raspi3" ];then
|
|
|
|
|
tarname="raspi3.$tarname"
|
|
|
|
|
manifestname="$devarch.$manifestname"
|
|
|
|
|
elif [ "$devarch" = "dragonboard" ];then
|
|
|
|
|
tarname="$devarch.$tarname"
|
|
|
|
|
manifestname="$devarch.$manifestname"
|
|
|
|
@ -753,6 +758,9 @@ EOF
|
|
|
|
|
if [ "$devarch" = "raspi2" ];then
|
|
|
|
|
metaname=canonical-pi2-linux
|
|
|
|
|
snapname="$devarch.kernel.snap"
|
|
|
|
|
elif [ "$devarch" = "raspi3" ];then
|
|
|
|
|
metaname=canonical-pi3-linux
|
|
|
|
|
snapname="$devarch.kernel.snap"
|
|
|
|
|
elif [ "$devarch" = "generic" ] && [ "$ARCH" = "armhf" ];then
|
|
|
|
|
metaname=canonical-bbb-linux
|
|
|
|
|
elif [ "$devarch" = "dragonboard" ] && [ "$ARCH" = "arm64" ];then
|
|
|
|
@ -862,7 +870,8 @@ if [ "$NUMFLAVOURS" = 1 ] && [ "$LB_LINUX_FLAVOURS" != "none" ]; then
|
|
|
|
|
fi
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
if [ "$SUBARCH" = "ac100" ]; then
|
|
|
|
|
case $SUBARCH in
|
|
|
|
|
ac100)
|
|
|
|
|
# create the md5sum and size files for which we are actually doing all this
|
|
|
|
|
md5sum $PREFIX.rootfs.tar.gz >chroot/installer.md5
|
|
|
|
|
wc -c $PREFIX.rootfs.tar.gz >chroot/installer.size
|
|
|
|
@ -890,8 +899,17 @@ if [ "$SUBARCH" = "ac100" ]; then
|
|
|
|
|
|
|
|
|
|
cp "chroot/boot/installer-${KVERS}.img" "$PREFIX.bootimg-$FLAVOUR"
|
|
|
|
|
ln -sf "$PREFIX.bootimg-$FLAVOUR" "$PREFIX.bootimg"
|
|
|
|
|
;;
|
|
|
|
|
|
|
|
|
|
fi
|
|
|
|
|
raspi2|raspi3)
|
|
|
|
|
UBOOT_BOOT="image/boot/uboot"
|
|
|
|
|
|
|
|
|
|
mkdir -p $UBOOT_BOOT
|
|
|
|
|
|
|
|
|
|
cp $PREFIX.initrd $UBOOT_BOOT/initrd.img || true
|
|
|
|
|
cp $PREFIX.kernel $UBOOT_BOOT/vmlinuz || true
|
|
|
|
|
;;
|
|
|
|
|
esac
|
|
|
|
|
|
|
|
|
|
if [ "$PROJECT" = "ubuntu-touch" ] || [ "$PROJECT" = "ubuntu-touch-custom" ]; then
|
|
|
|
|
sourceslist="chroot/etc/apt/sources.list"
|
|
|
|
|