Drop override of components for raspi images

This commit is contained in:
Steve Langasek 2022-09-21 13:35:08 -07:00
parent 97645adca7
commit 3722d2ee58
2 changed files with 9 additions and 5 deletions

9
debian/changelog vendored
View File

@ -1,3 +1,12 @@
livecd-rootfs (2.781) UNRELEASED; urgency=medium
* Drop override of components for raspi images. The reference to
multiverse is historic, all firmware is now in restricted where it
should be; and raspi images should not categorically include universe,
they should follow the per-flavor rules.
-- Steve Langasek <steve.langasek@ubuntu.com> Wed, 21 Sep 2022 13:26:30 -0700
livecd-rootfs (2.780) kinetic; urgency=medium
* live-build/auto/config: set COMPONENTS for all flavors *before* we

View File

@ -669,11 +669,6 @@ case $SUBPROJECT in
COMPONENTS='main restricted universe multiverse'
;;
esac
case "$ARCH${SUBARCH:++$SUBARCH}" in
arm*+raspi)
COMPONENTS='main restricted universe multiverse'
;;
esac
if ! [ -e config/germinate-output/structure ]; then
echo "Running germinate..."