From f9001515b0ccc5a19699b814063f421d6f60ac7b Mon Sep 17 00:00:00 2001 From: CloudBuilder Date: Mon, 21 Jan 2019 13:26:07 +0000 Subject: [PATCH] Imported 2.558 No reason for CPC update specified. --- debian/changelog | 8 ++++++++ live-build/auto/config | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 7de5604c..37a8ed1a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +livecd-rootfs (2.558) disco; urgency=medium + + * Use the new linux-firmware-raspi2 for pi3 boot binary blobs as + raspi3-firmware includes upgrade hooks that conflict with our image + configuration. + + -- Łukasz 'sil2100' Zemczak Fri, 18 Jan 2019 17:09:26 +0100 + livecd-rootfs (2.557) disco; urgency=medium * Don't install gpg or gpg-agent when building buildd images for series diff --git a/live-build/auto/config b/live-build/auto/config index e81eb948..65f5df56 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -834,7 +834,7 @@ case $ARCH in raspi3) COMPONENTS='main restricted universe multiverse' KERNEL_FLAVOURS=raspi2 - add_package install raspi3-firmware u-boot-rpi flash-kernel u-boot-tools wpasupplicant + add_package install linux-firmware-raspi2 u-boot-rpi flash-kernel u-boot-tools wpasupplicant BINARY_REMOVE_LINUX=false ;;