From cb221772870057fe4cd3cb427b9a373fd105a19e Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Fri, 27 Apr 2018 16:07:44 +0100 Subject: [PATCH 01/12] Add a buildd subproject. --- debian/changelog | 6 ++ live-build/auto/build | 9 +++ live-build/auto/config | 56 +++++++++++++++++++ live-build/buildd/hooks/apt.chroot | 14 +++++ live-build/buildd/hooks/fstab.chroot | 5 ++ live-build/buildd/hooks/kernel-img.chroot | 5 ++ .../buildd/hooks/pkgbinarymangler.chroot | 10 ++++ live-build/buildd/hooks/policy-rc.d.chroot | 20 +++++++ live-build/buildd/hooks/user.chroot | 9 +++ .../buildd/includes.chroot/etc/hostname | 1 + live-build/buildd/includes.chroot/etc/hosts | 9 +++ live-build/buildd/preseed/debconf.preseed | 2 + live-build/buildd/preseed/man-db.preseed | 3 + live-build/buildd/preseed/sun-java6.preseed | 3 + 14 files changed, 152 insertions(+) create mode 100644 live-build/buildd/hooks/apt.chroot create mode 100644 live-build/buildd/hooks/fstab.chroot create mode 100644 live-build/buildd/hooks/kernel-img.chroot create mode 100644 live-build/buildd/hooks/pkgbinarymangler.chroot create mode 100644 live-build/buildd/hooks/policy-rc.d.chroot create mode 100644 live-build/buildd/hooks/user.chroot 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/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 817e0429..523937c4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +livecd-rootfs (2.525+lp1) UNRELEASED; urgency=medium + + * Add a buildd subproject. + + -- Colin Watson Thu, 26 Apr 2018 14:22:27 +0100 + livecd-rootfs (2.525) bionic; urgency=medium * Don't fail to build CPC images if /lib/modules already exists in the diff --git a/live-build/auto/build b/live-build/auto/build index 01dcc182..735dd2e9 100755 --- a/live-build/auto/build +++ b/live-build/auto/build @@ -460,6 +460,15 @@ 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,' \ + -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 e07aeb85..4fd845ff 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -668,6 +668,56 @@ case $PROJECT in ;; 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" + INITRAMFS_COMPRESSION=none + OPTS="${OPTS:+$OPTS }--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" + + 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 @@ -977,6 +1027,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/apt.chroot b/live-build/buildd/hooks/apt.chroot new file mode 100644 index 00000000..6f0d828d --- /dev/null +++ b/live-build/buildd/hooks/apt.chroot @@ -0,0 +1,14 @@ +#! /bin/sh +set -e + +# Configure APT. +cat >/etc/apt/apt.conf.d/99buildd </etc/apt/preferences.d/backports </etc/fstab diff --git a/live-build/buildd/hooks/kernel-img.chroot b/live-build/buildd/hooks/kernel-img.chroot new file mode 100644 index 00000000..3517b443 --- /dev/null +++ b/live-build/buildd/hooks/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/pkgbinarymangler.chroot b/live-build/buildd/hooks/pkgbinarymangler.chroot new file mode 100644 index 00000000..ab901957 --- /dev/null +++ b/live-build/buildd/hooks/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/policy-rc.d.chroot b/live-build/buildd/hooks/policy-rc.d.chroot new file mode 100644 index 00000000..4f8980ec --- /dev/null +++ b/live-build/buildd/hooks/policy-rc.d.chroot @@ -0,0 +1,20 @@ +#! /bin/sh +set -e + +# Configure policy-rc.d. +cat >/usr/local/sbin/policy-rc.d <<'EOF' +#!/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 +EOF +chmod 755 /usr/local/sbin/policy-rc.d diff --git a/live-build/buildd/hooks/user.chroot b/live-build/buildd/hooks/user.chroot new file mode 100644 index 00000000..86000bf2 --- /dev/null +++ b/live-build/buildd/hooks/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/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/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 From 0bd2526ac511177bf483748d2d9fe3d691de0afa Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Sun, 29 Apr 2018 21:41:58 +0100 Subject: [PATCH 02/12] Use a more generic version number. --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 523937c4..0c88811d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -livecd-rootfs (2.525+lp1) UNRELEASED; urgency=medium +livecd-rootfs (2.526) UNRELEASED; urgency=medium * Add a buildd subproject. From 416093beece6a60e24d65b5bf4e984c812ab7a9a Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Sun, 29 Apr 2018 21:42:41 +0100 Subject: [PATCH 03/12] Use a public-facing mirror URL in the final buildd /etc/apt/sources.list. --- live-build/auto/config | 2 +- live-build/buildd/hooks/mirror.binary | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) create mode 100755 live-build/buildd/hooks/mirror.binary diff --git a/live-build/auto/config b/live-build/auto/config index 4fd845ff..d6fbf531 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -677,7 +677,7 @@ case $SUBPROJECT in OPTS="${OPTS:+$OPTS }--apt-secure false" OPTS="${OPTS:+$OPTS }--linux-packages=none --initramfs=none" INITRAMFS_COMPRESSION=none - OPTS="${OPTS:+$OPTS }--mirror-binary ${MIRROR}" + 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 diff --git a/live-build/buildd/hooks/mirror.binary b/live-build/buildd/hooks/mirror.binary new file mode 100755 index 00000000..5aea13d0 --- /dev/null +++ b/live-build/buildd/hooks/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 "s,${LB_PARENT_MIRROR_BINARY},${LB_MIRROR_BINARY},g" \ + binary/etc/apt/sources.list From 07487675b6da199cc5f069e3d717553f27dd1355 Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Sun, 29 Apr 2018 21:43:46 +0100 Subject: [PATCH 04/12] Sort buildd tarballs by name and use numeric user and group IDs. --- live-build/auto/build | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/live-build/auto/build b/live-build/auto/build index 735dd2e9..405802c5 100755 --- a/live-build/auto/build +++ b/live-build/auto/build @@ -467,7 +467,8 @@ elif [ "$SUBPROJECT" = buildd ]; then # 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,' \ + tar --transform='s,^binary,chroot-autobuild,' \ + --sort=name --numeric-owner \ -czf "$PREFIX.rootfs.tar.gz" binary fi From 9e99d9f1cf16ce8d237ef5e7a9f00f455c73d2de Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Sun, 29 Apr 2018 22:54:24 +0100 Subject: [PATCH 05/12] Fix sedding of /etc/apt/sources.list. --- live-build/buildd/hooks/mirror.binary | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/live-build/buildd/hooks/mirror.binary b/live-build/buildd/hooks/mirror.binary index 5aea13d0..7f3cdba4 100755 --- a/live-build/buildd/hooks/mirror.binary +++ b/live-build/buildd/hooks/mirror.binary @@ -8,5 +8,5 @@ set -e # 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 "s,${LB_PARENT_MIRROR_BINARY},${LB_MIRROR_BINARY},g" \ +sed -i "s,${LB_PARENT_MIRROR_BINARY},${LB_MIRROR_BINARY},g" \ binary/etc/apt/sources.list From b77de06bfda78cc689fef7644813df9a715ed266 Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Mon, 30 Apr 2018 09:54:28 +0100 Subject: [PATCH 06/12] Remove some unnecessary buildd configuration. --- live-build/auto/config | 4 ---- 1 file changed, 4 deletions(-) diff --git a/live-build/auto/config b/live-build/auto/config index d6fbf531..a0c99db7 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -672,11 +672,8 @@ 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" - INITRAMFS_COMPRESSION=none 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 @@ -685,7 +682,6 @@ case $SUBPROJECT in # 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" add_package install adduser add_package install policyrcd-script-zg2 From 2a9efb44a6fcd52af14fc41da3cdb5bee02ea1e4 Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Mon, 30 Apr 2018 09:57:12 +0100 Subject: [PATCH 07/12] Move some buildd hooks to includes.chroot. --- live-build/buildd/hooks/apt.chroot | 14 -------------- live-build/buildd/hooks/fstab.chroot | 5 ----- .../includes.chroot/etc/apt/apt.conf.d/99buildd | 2 ++ .../etc/apt/preferences.d/backports | 3 +++ live-build/buildd/includes.chroot/etc/fstab | 1 + .../usr/local/sbin/policy-rc.d} | 7 ------- 6 files changed, 6 insertions(+), 26 deletions(-) delete mode 100644 live-build/buildd/hooks/apt.chroot delete mode 100644 live-build/buildd/hooks/fstab.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 rename live-build/buildd/{hooks/policy-rc.d.chroot => includes.chroot/usr/local/sbin/policy-rc.d} (70%) mode change 100644 => 100755 diff --git a/live-build/buildd/hooks/apt.chroot b/live-build/buildd/hooks/apt.chroot deleted file mode 100644 index 6f0d828d..00000000 --- a/live-build/buildd/hooks/apt.chroot +++ /dev/null @@ -1,14 +0,0 @@ -#! /bin/sh -set -e - -# Configure APT. -cat >/etc/apt/apt.conf.d/99buildd </etc/apt/preferences.d/backports </etc/fstab 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/hooks/policy-rc.d.chroot b/live-build/buildd/includes.chroot/usr/local/sbin/policy-rc.d old mode 100644 new mode 100755 similarity index 70% rename from live-build/buildd/hooks/policy-rc.d.chroot rename to live-build/buildd/includes.chroot/usr/local/sbin/policy-rc.d index 4f8980ec..cf2290b6 --- a/live-build/buildd/hooks/policy-rc.d.chroot +++ b/live-build/buildd/includes.chroot/usr/local/sbin/policy-rc.d @@ -1,8 +1,3 @@ -#! /bin/sh -set -e - -# Configure policy-rc.d. -cat >/usr/local/sbin/policy-rc.d <<'EOF' #!/bin/sh # policy-rc.d script for chroots. @@ -16,5 +11,3 @@ while true; do *) echo "Not running services in chroot."; exit 101 ;; esac done -EOF -chmod 755 /usr/local/sbin/policy-rc.d From 9bd386caa1d132de81aedf4c0693e32dcc05af89 Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Mon, 30 Apr 2018 09:57:54 +0100 Subject: [PATCH 08/12] Explicitly order remaining buildd hooks. --- .../buildd/hooks/{kernel-img.chroot => 00-kernel-img.chroot} | 0 live-build/buildd/hooks/{mirror.binary => 00-mirror.binary} | 0 .../hooks/{pkgbinarymangler.chroot => 01-pkgbinarymangler.chroot} | 0 live-build/buildd/hooks/{user.chroot => 02-user.chroot} | 0 4 files changed, 0 insertions(+), 0 deletions(-) rename live-build/buildd/hooks/{kernel-img.chroot => 00-kernel-img.chroot} (100%) mode change 100644 => 100755 rename live-build/buildd/hooks/{mirror.binary => 00-mirror.binary} (100%) rename live-build/buildd/hooks/{pkgbinarymangler.chroot => 01-pkgbinarymangler.chroot} (100%) mode change 100644 => 100755 rename live-build/buildd/hooks/{user.chroot => 02-user.chroot} (100%) mode change 100644 => 100755 diff --git a/live-build/buildd/hooks/kernel-img.chroot b/live-build/buildd/hooks/00-kernel-img.chroot old mode 100644 new mode 100755 similarity index 100% rename from live-build/buildd/hooks/kernel-img.chroot rename to live-build/buildd/hooks/00-kernel-img.chroot diff --git a/live-build/buildd/hooks/mirror.binary b/live-build/buildd/hooks/00-mirror.binary similarity index 100% rename from live-build/buildd/hooks/mirror.binary rename to live-build/buildd/hooks/00-mirror.binary diff --git a/live-build/buildd/hooks/pkgbinarymangler.chroot b/live-build/buildd/hooks/01-pkgbinarymangler.chroot old mode 100644 new mode 100755 similarity index 100% rename from live-build/buildd/hooks/pkgbinarymangler.chroot rename to live-build/buildd/hooks/01-pkgbinarymangler.chroot diff --git a/live-build/buildd/hooks/user.chroot b/live-build/buildd/hooks/02-user.chroot old mode 100644 new mode 100755 similarity index 100% rename from live-build/buildd/hooks/user.chroot rename to live-build/buildd/hooks/02-user.chroot From 1fab544a84d6660de52e83d49dd7004f3ccb3dbd Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Mon, 30 Apr 2018 16:39:01 +0100 Subject: [PATCH 09/12] Add init to buildd chroots, since it's needed for LXD-based builds. --- live-build/auto/config | 2 ++ 1 file changed, 2 insertions(+) diff --git a/live-build/auto/config b/live-build/auto/config index a0c99db7..ee846c53 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -711,6 +711,8 @@ case $SUBPROJECT in esac add_package install fakeroot add_package install build-essential + # Needed for LXD-based builds. + add_package install init ;; esac From 2c782e076c0bbc52b0ca410b6bb7dc4dff64b054 Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Tue, 1 May 2018 11:30:51 +0100 Subject: [PATCH 10/12] Add an empty /etc/resolv.conf to buildd chroots. We don't want the symlink to /run/systemd/resolve/stub-resolv.conf, and launchpad-buildd will inject its own version if it doesn't get confused by a symlink. --- live-build/buildd/includes.chroot/etc/resolv.conf | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 live-build/buildd/includes.chroot/etc/resolv.conf 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 From baee4ed403498b7b2e8f5e57f2fadea2a24b705a Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Fri, 29 Jun 2018 21:57:15 +0100 Subject: [PATCH 11/12] We know cosmic's name now. --- live-build/auto/config | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/live-build/auto/config b/live-build/auto/config index ee846c53..1bcb9772 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -695,17 +695,17 @@ case $SUBPROJECT in add_package install pkg-create-dbgsym # no longer needed in >= bionic add_package install apt-transport-https - # no longer needed in >= CC + # 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 >= CC + # no longer needed in >= cosmic add_package install tzdata ;; bionic) - # no longer needed in >= CC + # no longer needed in >= cosmic add_package install tzdata ;; esac From c4c5c1f3495c27b0d08479cace7082ea41c3fc0d Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Wed, 19 Sep 2018 16:19:17 +0200 Subject: [PATCH 12/12] Generate tar file with --xattrs. --- live-build/auto/build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/live-build/auto/build b/live-build/auto/build index 74e0bdcf..9b5b5548 100755 --- a/live-build/auto/build +++ b/live-build/auto/build @@ -499,7 +499,7 @@ elif [ "$SUBPROJECT" = buildd ]; then # 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 \ + --sort=name --numeric-owner --xattrs \ -czf "$PREFIX.rootfs.tar.gz" binary fi