[Merge] lp:~cjwatson/livecd-rootfs/buildd into lp:livecd-rootfs

[Michael Hudson-Doyle]

This looks OK to me but I don't know if I'm qualified for a full review. A few comments mostly about stuff I think is redundant.

Diff comments:

> 
> === modified file 'live-build/auto/config'
> --- live-build/auto/config	2018-04-11 07:18:47 +0000
> +++ live-build/auto/config	2018-04-29 21:55:19 +0000
> @@ -668,6 +668,56 @@
>  		;;
>  esac
>  
> +case $SUBPROJECT in
> +	buildd)
> +		OPTS="${OPTS:+$OPTS }--archive-areas main"
> +		COMPONENTS='main restricted universe multiverse'
> +		KERNEL_FLAVOURS=none
> +		OPTS="${OPTS:+$OPTS }--apt-recommends false"
> +		OPTS="${OPTS:+$OPTS }--apt-secure false"
> +		OPTS="${OPTS:+$OPTS }--linux-packages=none --initramfs=none"

KERNEL_FLAVOURS=none

and 

OPTS="${OPTS:+$OPTS }--linux-packages=none --initramfs=none"

are already done for all ubuntu-base:* images at line 788.

> +		INITRAMFS_COMPRESSION=none

You don't need this any more.

> +		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"
> +		OPTS="${OPTS:+$OPTS }--binary-images none"

I don't think this line is necessary either.

> +
> +		add_package install adduser
> +		add_package install policyrcd-script-zg2
> +		add_package install pkgbinarymangler
> +		add_package install ca-certificates
> +		add_package install gpg
> +		add_package install gpg-agent
> +		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 >= CC
> +				add_package install tzdata
> +				;;
> +			artful)
> +				# no longer needed in >= bionic
> +				add_package install apt-transport-https
> +				# no longer needed in >= CC
> +				add_package install tzdata
> +				;;
> +			bionic)
> +				# no longer needed in >= CC
> +				add_package install tzdata
> +				;;
> +		esac
> +		add_package install fakeroot
> +		add_package install build-essential
> +		;;
> +esac
> +
>  # we'll expand the base seed given here according to the STRUCTURE file, and
>  # then look in all of the seeds found to see which snaps are seeded
>  case $PROJECT:${SUBPROJECT:-} in
> 
> === added directory 'live-build/buildd'
> === added directory 'live-build/buildd/hooks'
> === added file 'live-build/buildd/hooks/apt.chroot'
> --- live-build/buildd/hooks/apt.chroot	1970-01-01 00:00:00 +0000
> +++ live-build/buildd/hooks/apt.chroot	2018-04-29 21:55:19 +0000

Two points:

1) every other hook dir orders the hooks by using the NN-name.chroot type construction.

2) Can't quite a few of these (apt.chroot, fstab.chroot, policy-rc.d.chroot at least) be replaced by more files in live-build/buildd/includes.chroot?

> @@ -0,0 +1,14 @@
> +#! /bin/sh
> +set -e
> +
> +# Configure APT.
> +cat >/etc/apt/apt.conf.d/99buildd <<EOF
> +DPkg::Options {"--force-unsafe-io";};
> +DPkg::Use-Pty "false";
> +EOF
> +
> +cat >/etc/apt/preferences.d/backports <<EOF
> +Package: *
> +Pin: release a=*-backports
> +Pin-Priority: 500
> +EOF


-- 
https://code.launchpad.net/~cjwatson/livecd-rootfs/buildd/+merge/344767
Your team Ubuntu Core Development Team is requested to review the proposed merge of lp:~cjwatson/livecd-rootfs/buildd into lp:livecd-rootfs.