From 65d907268ab7c92f878840d2631606ec7667b50d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20=27sil2100=27=20Zemczak?= Date: Fri, 23 Nov 2018 15:56:26 +0100 Subject: [PATCH] raspi3 support: be sure to create /boot/firmware during pi3 rootfs builds. Also, for the raspi3 we need to explicitly specify the kernel flavor to raspi2. We also switch to using raspi3-firmware instead of linux-firmware-raspi2 because the latter is not available for arm64. --- live-build/auto/config | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/live-build/auto/config b/live-build/auto/config index a7dcbdf9..83b4c181 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -819,11 +819,18 @@ case $ARCH in add_package live ac100-tarball-installer BINARY_REMOVE_LINUX=false ;; - raspi2|raspi3) + raspi2) COMPONENTS='main restricted universe multiverse' add_package install linux-firmware-raspi2 u-boot-rpi flash-kernel u-boot-tools BINARY_REMOVE_LINUX=false ;; + raspi3) + COMPONENTS='main restricted universe multiverse' + KERNEL_FLAVOURS=raspi2 + add_package install raspi3-firmware u-boot-rpi flash-kernel u-boot-tools + BINARY_REMOVE_LINUX=false + ;; + esac ;; esac @@ -889,7 +896,7 @@ echo "SUBPROJECT=\"${SUBPROJECT:-}\"" >> config/binary echo "LB_DISTRIBUTION=\"$SUITE\"" >> config/binary case $ARCH+$SUBARCH in - armhf+raspi2) + armhf+raspi2|armhf+raspi3) cat > config/hooks/01-firmware-directory.chroot_early <