Drop code to handle buildd images for <disco

We'll deal with those in stable updates instead.
This commit is contained in:
Colin Watson 2019-02-01 18:07:58 +00:00
parent 36af2769dc
commit 305d5cef50
2 changed files with 4 additions and 29 deletions

2
debian/changelog vendored
View File

@ -1,6 +1,8 @@
livecd-rootfs (2.560) UNRELEASED; urgency=medium
* Disable merged /usr in buildd images.
* Drop code to handle building buildd images for series earlier than
disco; we'll deal with those in stable updates instead.
-- Colin Watson <cjwatson@ubuntu.com> Fri, 01 Feb 2019 18:01:56 +0000

View File

@ -859,35 +859,8 @@ case $SUBPROJECT in
add_package install policyrcd-script-zg2
add_package install pkgbinarymangler
add_package install ca-certificates
case $SUITE in
precise|trusty|xenial)
;;
*)
# only needed in >= bionic
add_package install gpg
add_package install gpg-agent
;;
esac
case $SUITE in
precise|trusty|xenial)
# no longer needed in >= artful
add_package install pkg-create-dbgsym
# no longer needed in >= bionic
add_package install apt-transport-https
# no longer needed in >= cosmic
add_package install tzdata
;;
artful)
# no longer needed in >= bionic
add_package install apt-transport-https
# no longer needed in >= cosmic
add_package install tzdata
;;
bionic)
# no longer needed in >= cosmic
add_package install tzdata
;;
esac
add_package install gpg
add_package install gpg-agent
add_package install fakeroot
add_package install build-essential
# Needed for LXD-based builds.