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.
This commit is contained in:
Adam Conrad 2018-07-24 21:55:49 -06:00 committed by usd-importer
parent 93bebae114
commit bf2af1ece2
2 changed files with 12 additions and 1 deletions

6
debian/changelog vendored
View File

@ -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

View File

@ -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
}