From bf2af1ece2e1761eddfaca9ebcf9dbe7c146853f Mon Sep 17 00:00:00 2001
From: Adam Conrad <adconrad@ubuntu.com>
Date: Tue, 24 Jul 2018 21:55:49 -0600
Subject: [PATCH] Import patches-unapplied version 2.525.4 to
 ubuntu/bionic-proposed

Imported using git-ubuntu import.

Changelog parent: 93bebae1149bac089cf58bc5ef6d8535734b4a27

New changelog entries:
  * live-build/auto/config: Dirty hack to filter linux-tools-aws from budgie.
---
 debian/changelog       | 6 ++++++
 live-build/auto/config | 7 ++++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 42b93b9e..9bc0c832 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+livecd-rootfs (2.525.4) bionic; urgency=medium
+
+  * live-build/auto/config: Dirty hack to filter linux-tools-aws from budgie.
+
+ -- Adam Conrad <adconrad@ubuntu.com>  Tue, 24 Jul 2018 21:55:49 -0600
+
 livecd-rootfs (2.525.3) bionic; urgency=medium
 
   * live-build/auto/config: Add nasty hack to order gtk-common-themese snap
diff --git a/live-build/auto/config b/live-build/auto/config
index 73baef97..795700e6 100755
--- a/live-build/auto/config
+++ b/live-build/auto/config
@@ -59,9 +59,14 @@ add_task ()
 	# failure.
 
 	for task; do
+		if [ "$task" = "ubuntu-budgie-desktop" ]; then
+			filter="| grep -v '^linux.*-aws'"
+		else
+			filter=""
+		fi
 		# We need a ridiculous number of backslashes to protect
 		# parentheses from eval.
-		echo "!chroot chroot apt-cache dumpavail | grep-dctrl -nsPackage \\\\\\( -XFArchitecture $ARCH -o -XFArchitecture all \\\\\\) -a -wFTask $task" >> "config/package-lists/livecd-rootfs.list.chroot_$pass"
+		echo "!chroot chroot apt-cache dumpavail | grep-dctrl -nsPackage \\\\\\( -XFArchitecture $ARCH -o -XFArchitecture all \\\\\\) -a -wFTask $task $filter" >> "config/package-lists/livecd-rootfs.list.chroot_$pass"
 	done
 }