From 7cf7d116a06031e6a08a3a0a1d7a48c955768b20 Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Wed, 19 Sep 2018 16:35:54 +0200 Subject: [PATCH] Import patches-unapplied version 2.538 to ubuntu/cosmic-proposed Imported using git-ubuntu import. Changelog parent: d36578f6bb4a1f182044af709ccd3e2ded1f5aec New changelog entries: * Add a buildd subproject. --- debian/changelog | 6 +++ live-build/auto/build | 10 ++++ live-build/auto/config | 54 +++++++++++++++++++ live-build/buildd/hooks/00-kernel-img.chroot | 5 ++ live-build/buildd/hooks/00-mirror.binary | 12 +++++ .../buildd/hooks/01-pkgbinarymangler.chroot | 10 ++++ live-build/buildd/hooks/02-user.chroot | 9 ++++ .../etc/apt/apt.conf.d/99buildd | 2 + .../etc/apt/preferences.d/backports | 3 ++ live-build/buildd/includes.chroot/etc/fstab | 1 + .../buildd/includes.chroot/etc/hostname | 1 + live-build/buildd/includes.chroot/etc/hosts | 9 ++++ .../buildd/includes.chroot/etc/resolv.conf | 0 .../usr/local/sbin/policy-rc.d | 13 +++++ live-build/buildd/preseed/debconf.preseed | 2 + live-build/buildd/preseed/man-db.preseed | 3 ++ live-build/buildd/preseed/sun-java6.preseed | 3 ++ 17 files changed, 143 insertions(+) create mode 100755 live-build/buildd/hooks/00-kernel-img.chroot create mode 100755 live-build/buildd/hooks/00-mirror.binary create mode 100755 live-build/buildd/hooks/01-pkgbinarymangler.chroot create mode 100755 live-build/buildd/hooks/02-user.chroot create mode 100644 live-build/buildd/includes.chroot/etc/apt/apt.conf.d/99buildd create mode 100644 live-build/buildd/includes.chroot/etc/apt/preferences.d/backports create mode 100644 live-build/buildd/includes.chroot/etc/fstab create mode 100644 live-build/buildd/includes.chroot/etc/hostname create mode 100644 live-build/buildd/includes.chroot/etc/hosts create mode 100644 live-build/buildd/includes.chroot/etc/resolv.conf create mode 100755 live-build/buildd/includes.chroot/usr/local/sbin/policy-rc.d create mode 100644 live-build/buildd/preseed/debconf.preseed create mode 100644 live-build/buildd/preseed/man-db.preseed create mode 100644 live-build/buildd/preseed/sun-java6.preseed diff --git a/debian/changelog b/debian/changelog index 9c7360a7..8ae7b4a1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +livecd-rootfs (2.538) cosmic; urgency=medium + + * Add a buildd subproject. + + -- Colin Watson Wed, 19 Sep 2018 16:35:54 +0200 + livecd-rootfs (2.537) cosmic; urgency=medium * Minimize the number of manually installed packages in images by marking diff --git a/live-build/auto/build b/live-build/auto/build index ec3d61bc..9d901bc7 100755 --- a/live-build/auto/build +++ b/live-build/auto/build @@ -497,6 +497,16 @@ if [ -e "binary/$INITFS/filesystem.dir" ]; then chmod 644 "$PREFIX.rootfs.tar.gz" elif [ -e binary-tar.tar.gz ]; then cp -a binary-tar.tar.gz "$PREFIX.rootfs.tar.gz" +elif [ "$SUBPROJECT" = buildd ]; then + # A few things (launchpad-buildd, sbuild-launchpad-chroot) rely on + # the top-level directory being "chroot-autobuild", so we have to do + # this ourselves. + # gzip was chosen for fastest decompression speed: it decompresses + # buildd chroots about twice as fast as xz and about five times as + # fast as bzip2. + tar --transform='s,^binary,chroot-autobuild,' \ + --sort=name --numeric-owner --xattrs \ + -czf "$PREFIX.rootfs.tar.gz" binary fi if [ "$PROJECT:${SUBPROJECT:-}" = "ubuntu-core:system-image" ]; then diff --git a/live-build/auto/config b/live-build/auto/config index 4d492d31..fd2ce64d 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -642,6 +642,54 @@ 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 + 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 >= 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 + # 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 @@ -946,6 +994,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 \ diff --git a/live-build/buildd/hooks/00-kernel-img.chroot b/live-build/buildd/hooks/00-kernel-img.chroot new file mode 100755 index 00000000..3517b443 --- /dev/null +++ b/live-build/buildd/hooks/00-kernel-img.chroot @@ -0,0 +1,5 @@ +#! /bin/sh +set -e + +# At one point, kernel builds needed this. +echo do_initrd = Yes >>/etc/kernel-img.conf diff --git a/live-build/buildd/hooks/00-mirror.binary b/live-build/buildd/hooks/00-mirror.binary new file mode 100755 index 00000000..7f3cdba4 --- /dev/null +++ b/live-build/buildd/hooks/00-mirror.binary @@ -0,0 +1,12 @@ +#! /bin/sh +set -e + +. config/bootstrap + +# Use a public-facing mirror URL, for the benefit of +# sbuild-launchpad-chroot. We deliberately do this only after live-build +# has run "apt-get update" for the last time, in order that +# /var/lib/apt/lists/ has suitable cached Packages files; this speeds up +# builds on buildds. +sed -i "s,${LB_PARENT_MIRROR_BINARY},${LB_MIRROR_BINARY},g" \ + binary/etc/apt/sources.list diff --git a/live-build/buildd/hooks/01-pkgbinarymangler.chroot b/live-build/buildd/hooks/01-pkgbinarymangler.chroot new file mode 100755 index 00000000..ab901957 --- /dev/null +++ b/live-build/buildd/hooks/01-pkgbinarymangler.chroot @@ -0,0 +1,10 @@ +#! /bin/sh +set -e + +# Configure pkgbinarymangler. +sed -i /^enable/s/false/true/ \ + /etc/pkgbinarymangler/maintainermangler.conf \ + /etc/pkgbinarymangler/striptranslations.conf || true +sed -i /^invalid_current/s/ignore/fail/ \ + /etc/pkgbinarymangler/maintainermangler.conf \ + /etc/pkgbinarymangler/striptranslations.conf || true diff --git a/live-build/buildd/hooks/02-user.chroot b/live-build/buildd/hooks/02-user.chroot new file mode 100755 index 00000000..86000bf2 --- /dev/null +++ b/live-build/buildd/hooks/02-user.chroot @@ -0,0 +1,9 @@ +#! /bin/sh +set -e + +# Create the buildd user and group. +addgroup --gid 2501 buildd +adduser --system --disabled-password --gecos 'Build Daemon user' \ + --ingroup buildd --uid 2001 --shell /bin/bash buildd +mkdir -p /build/buildd +chown buildd:buildd /build/buildd diff --git a/live-build/buildd/includes.chroot/etc/apt/apt.conf.d/99buildd b/live-build/buildd/includes.chroot/etc/apt/apt.conf.d/99buildd new file mode 100644 index 00000000..0fd77978 --- /dev/null +++ b/live-build/buildd/includes.chroot/etc/apt/apt.conf.d/99buildd @@ -0,0 +1,2 @@ +DPkg::Options {"--force-unsafe-io";}; +DPkg::Use-Pty "false"; diff --git a/live-build/buildd/includes.chroot/etc/apt/preferences.d/backports b/live-build/buildd/includes.chroot/etc/apt/preferences.d/backports new file mode 100644 index 00000000..605907ec --- /dev/null +++ b/live-build/buildd/includes.chroot/etc/apt/preferences.d/backports @@ -0,0 +1,3 @@ +Package: * +Pin: release a=*-backports +Pin-Priority: 500 diff --git a/live-build/buildd/includes.chroot/etc/fstab b/live-build/buildd/includes.chroot/etc/fstab new file mode 100644 index 00000000..b67dd265 --- /dev/null +++ b/live-build/buildd/includes.chroot/etc/fstab @@ -0,0 +1 @@ +/dev/root / ext2 noatime,errors=remount-ro 0 1 diff --git a/live-build/buildd/includes.chroot/etc/hostname b/live-build/buildd/includes.chroot/etc/hostname new file mode 100644 index 00000000..e420fe4d --- /dev/null +++ b/live-build/buildd/includes.chroot/etc/hostname @@ -0,0 +1 @@ +INVALID diff --git a/live-build/buildd/includes.chroot/etc/hosts b/live-build/buildd/includes.chroot/etc/hosts new file mode 100644 index 00000000..7a0cb5d4 --- /dev/null +++ b/live-build/buildd/includes.chroot/etc/hosts @@ -0,0 +1,9 @@ +127.0.0.1 localhost.localdomain localhost + +# The following lines are desirable for IPv6 capable hosts +::1 ip6-localhost ip6-loopback +fe00::0 ip6-localnet +ff00::0 ip6-mcastprefix +ff02::1 ip6-allnodes +ff02::2 ip6-allrouters +ff02::3 ip6-allhosts diff --git a/live-build/buildd/includes.chroot/etc/resolv.conf b/live-build/buildd/includes.chroot/etc/resolv.conf new file mode 100644 index 00000000..e69de29b diff --git a/live-build/buildd/includes.chroot/usr/local/sbin/policy-rc.d b/live-build/buildd/includes.chroot/usr/local/sbin/policy-rc.d new file mode 100755 index 00000000..cf2290b6 --- /dev/null +++ b/live-build/buildd/includes.chroot/usr/local/sbin/policy-rc.d @@ -0,0 +1,13 @@ +#!/bin/sh + +# policy-rc.d script for chroots. +# Copyright (c) 2007 Peter Palfrader +# License: MIT, if you want one. + +while true; do + case "$1" in + -*) shift ;; + makedev) exit 0;; + *) echo "Not running services in chroot."; exit 101 ;; + esac +done diff --git a/live-build/buildd/preseed/debconf.preseed b/live-build/buildd/preseed/debconf.preseed new file mode 100644 index 00000000..4e8c607b --- /dev/null +++ b/live-build/buildd/preseed/debconf.preseed @@ -0,0 +1,2 @@ +# We never want debconf interaction. +debconf debconf/frontend select Noninteractive diff --git a/live-build/buildd/preseed/man-db.preseed b/live-build/buildd/preseed/man-db.preseed new file mode 100644 index 00000000..7281ae4d --- /dev/null +++ b/live-build/buildd/preseed/man-db.preseed @@ -0,0 +1,3 @@ +# Avoid unnecessary manual page database builds (see +# https://bugs.debian.org/554914). +man-db man-db/auto-update boolean false diff --git a/live-build/buildd/preseed/sun-java6.preseed b/live-build/buildd/preseed/sun-java6.preseed new file mode 100644 index 00000000..53011956 --- /dev/null +++ b/live-build/buildd/preseed/sun-java6.preseed @@ -0,0 +1,3 @@ +# Pre-accept interactive EULA prompts. +sun-java6-bin shared/accepted-sun-dlj-v1-1 boolean true +sun-java6-jre shared/accepted-sun-dlj-v1-1 boolean true