Imported 2.742

No reason for CPC update specified.
This commit is contained in:
CloudBuilder 2021-10-06 03:30:53 +00:00
parent 4e5e3f3f7a
commit 55d390b601
2 changed files with 12 additions and 1 deletions

10
debian/changelog vendored
View File

@ -1,3 +1,13 @@
livecd-rootfs (2.742) impish; urgency=medium
[ Brian Murray ]
* Properly check ARCH when setting the intel-iot model.
[ Sebastien Bacher ]
* Enable universe sources on the desktop canary image. LP: #1945831
-- Steve Langasek <steve.langasek@ubuntu.com> Tue, 05 Oct 2021 13:11:33 -0700
livecd-rootfs (2.741) impish; urgency=medium
[ John Chittum ]

View File

@ -654,6 +654,7 @@ case $PROJECT in
case ${SUBPROJECT:-} in
canary)
touch config/universe-enabled
PASSES_TO_LAYERS="true"
KERNEL_FLAVOURS='generic-hwe-20.04'
add_task minimal minimal standard ubuntu-desktop-minimal ubuntu-desktop-minimal-default-languages
@ -917,7 +918,7 @@ case $PROJECT in
KERNEL_FLAVOURS=generic
fi
;;
amd64)
amd64*)
if [ "${SUBARCH:-}" = "generic" ]; then
KERNEL_FLAVOURS=generic
elif [ "${SUBARCH:-}" = "intel-iot" ]; then