From 3722d2ee58fdcc9b252faa97f32c84d6a1e240c0 Mon Sep 17 00:00:00 2001
From: Steve Langasek <steve.langasek@canonical.com>
Date: Wed, 21 Sep 2022 13:35:08 -0700
Subject: [PATCH] Drop override of components for raspi images

---
 debian/changelog       | 9 +++++++++
 live-build/auto/config | 5 -----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 53cf3ba3..92013548 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -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
diff --git a/live-build/auto/config b/live-build/auto/config
index 78f73086..da0e1199 100755
--- a/live-build/auto/config
+++ b/live-build/auto/config
@@ -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..."