diff --git a/debian/changelog b/debian/changelog index 432a206b..03bba9e8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,15 @@ +livecd-rootfs (2.709) hirsute; urgency=medium + + [ Sebastien Bacher ] + * Desktop is using the hwe kernel, do the same on canary + + [ Iain Lane ] + * auto/config: Install pi-bluetooth for raspi images. + These are in restricted, and so cannot be depended on by the + metapackages which are in main. + + -- Iain Lane Mon, 04 Jan 2021 10:38:15 +0000 + livecd-rootfs (2.708) hirsute; urgency=medium * disk-image-uefi: fix riscv64 subarch user-data. diff --git a/live-build/auto/config b/live-build/auto/config index a051be23..b8c6e7ab 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -587,6 +587,7 @@ case $PROJECT in case ${SUBPROJECT:-} in canary) PASSES_TO_LAYERS="true" + KERNEL_FLAVOURS='generic-hwe-20.04' add_task minimal minimal standard ubuntu-desktop-minimal ubuntu-desktop-minimal-default-languages add_task minimal.standard ubuntu-desktop ubuntu-desktop-default-languages add_task minimal.standard.live ubuntu-live @@ -946,7 +947,7 @@ case $ARCH in raspi) # Generic Raspberry Pi images COMPONENTS='main restricted universe multiverse' - add_package install linux-firmware-raspi2 u-boot-rpi flash-kernel u-boot-tools wpasupplicant + add_package install linux-firmware-raspi2 pi-bluetooth u-boot-rpi flash-kernel u-boot-tools wpasupplicant BINARY_REMOVE_LINUX=false ;; imx6)