|
|
|
|
@ -611,6 +611,61 @@ case $PROJECT in
|
|
|
|
|
;;
|
|
|
|
|
esac
|
|
|
|
|
|
|
|
|
|
case $SUBPROJECT in
|
|
|
|
|
buildd)
|
|
|
|
|
OPTS="${OPTS:+$OPTS }--archive-areas main"
|
|
|
|
|
COMPONENTS='main restricted universe multiverse'
|
|
|
|
|
OPTS="${OPTS:+$OPTS }--apt-recommends false"
|
|
|
|
|
OPTS="${OPTS:+$OPTS }--apt-secure false"
|
|
|
|
|
OPTS="${OPTS:+$OPTS }--parent-mirror-binary ${MIRROR}"
|
|
|
|
|
# XXX cjwatson 2018-04-27: We need to work out how to make
|
|
|
|
|
# this conditional so that we can do things like building
|
|
|
|
|
# buildd chroots with -updates. This probably involves
|
|
|
|
|
# either extending the PROPOSED hack or fixing the strange
|
|
|
|
|
# way that SUITE is in fact a series; in either case it's
|
|
|
|
|
# likely to involve work both here and in launchpad-buildd.
|
|
|
|
|
OPTS="${OPTS:+$OPTS }--security false --volatile false"
|
|
|
|
|
|
|
|
|
|
add_package install adduser
|
|
|
|
|
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 fakeroot
|
|
|
|
|
add_package install build-essential
|
|
|
|
|
# Needed for LXD-based builds.
|
|
|
|
|
add_package install init
|
|
|
|
|
;;
|
|
|
|
|
esac
|
|
|
|
|
|
|
|
|
|
if [ "$PREINSTALLED" != "true" ] && [ "$LIVE_TASK" ]; then
|
|
|
|
|
add_task live "$LIVE_TASK"
|
|
|
|
|
fi
|
|
|
|
|
@ -883,6 +938,12 @@ EOF
|
|
|
|
|
;;
|
|
|
|
|
esac
|
|
|
|
|
|
|
|
|
|
case $SUBPROJECT in
|
|
|
|
|
buildd)
|
|
|
|
|
cp -af /usr/share/livecd-rootfs/live-build/buildd/* config/
|
|
|
|
|
;;
|
|
|
|
|
esac
|
|
|
|
|
|
|
|
|
|
if [ "$EXTRA_PPAS" ]; then
|
|
|
|
|
rm -f config/archives/extra-ppas.list.chroot \
|
|
|
|
|
config/archives/extra-ppas.pref.chroot \
|
|
|
|
|
|
Colin Watson
6 years ago
committed by
Colin Watson