From 8b1970f661648e03ebd274c43c0f7976cfcf3fe9 Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Thu, 14 Jun 2018 12:41:46 +0100 Subject: [PATCH 01/26] live-build/auto/config: Drop "lp-*" hostname filter for Launchpad builders, since LP #1747015 is now fixed; "*.buildd" should be enough. --- debian/changelog | 5 +++++ live-build/auto/config | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 23d888a5..9e4ff90b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,12 @@ livecd-rootfs (2.533) UNRELEASED; urgency=medium + [ Robert C Jennings ] * ubuntu-cpc: Remove git-man for minimized images + [ Colin Watson ] + * live-build/auto/config: Drop "lp-*" hostname filter for Launchpad + builders, since LP #1747015 is now fixed; "*.buildd" should be enough. + -- Robert C Jennings Fri, 08 Jun 2018 10:10:53 -0700 livecd-rootfs (2.532) cosmic; urgency=medium diff --git a/live-build/auto/config b/live-build/auto/config index da99afa1..bd25e49f 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -17,7 +17,7 @@ if [ -z "$MIRROR" ]; then *.ubuntu.com) MIRROR=http://ftpmaster.internal/ubuntu/ SEEDMIRROR=http://archive-team.internal/seeds/ ;; - *.buildd|lp-*) MIRROR=http://ftpmaster.internal/ubuntu/ + *.buildd) MIRROR=http://ftpmaster.internal/ubuntu/ SEEDMIRROR=http://archive-team.internal/seeds/ ;; *.ppa|*.scalingstack) MIRROR=http://ftpmaster.internal/ubuntu/ From c9aaddd56a47ff683746f62732ed5ea6d1945dc5 Mon Sep 17 00:00:00 2001 From: Michael Hudson-Doyle Date: Fri, 15 Jun 2018 14:36:24 +1200 Subject: [PATCH 02/26] Disable journald rate limiting in the live-server live session. (LP: #1776891) --- debian/changelog | 5 +++++ .../overlay/etc/systemd/journald.conf.d/no-rate-limit.conf | 1 + 2 files changed, 6 insertions(+) create mode 100644 live-build/ubuntu-server/includes.binary/overlay/etc/systemd/journald.conf.d/no-rate-limit.conf diff --git a/debian/changelog b/debian/changelog index 23d888a5..3f2c804c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,12 @@ livecd-rootfs (2.533) UNRELEASED; urgency=medium + [ Robert C Jennings ] * ubuntu-cpc: Remove git-man for minimized images + [ Michael Hudson-Doyle ] + * Disable journald rate limiting in the live-server live session. + (LP: #1776891) + -- Robert C Jennings Fri, 08 Jun 2018 10:10:53 -0700 livecd-rootfs (2.532) cosmic; urgency=medium diff --git a/live-build/ubuntu-server/includes.binary/overlay/etc/systemd/journald.conf.d/no-rate-limit.conf b/live-build/ubuntu-server/includes.binary/overlay/etc/systemd/journald.conf.d/no-rate-limit.conf new file mode 100644 index 00000000..1d8af89a --- /dev/null +++ b/live-build/ubuntu-server/includes.binary/overlay/etc/systemd/journald.conf.d/no-rate-limit.conf @@ -0,0 +1 @@ +RateLimitIntervalSec=0 From b7403fabf1b81c8c0b7d7d13d1b403232b5caab1 Mon Sep 17 00:00:00 2001 From: Phil Roche Date: Wed, 4 Jul 2018 16:48:23 +0100 Subject: [PATCH 03/26] Update unminimize script text and install ubuntu-standard when unminimizing a minimal image (LP: #1778777) --- debian/changelog | 8 ++++++++ live-build/auto/build | 10 +++++++--- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 9e4ff90b..b5ee7215 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +livecd-rootfs (2.534) bionic; urgency=medium + + [ Francis Ginther ] + * Update unminimize script text and install ubuntu-standard when + unminimizing a minimal image (LP: #1778777) + +-- Phil Roche Wed, 04 Jul 2018 15:44:15 +0100 + livecd-rootfs (2.533) UNRELEASED; urgency=medium [ Robert C Jennings ] diff --git a/live-build/auto/build b/live-build/auto/build index 374f6b67..519ce1e7 100755 --- a/live-build/auto/build +++ b/live-build/auto/build @@ -109,12 +109,16 @@ set -e echo "This system has been minimized by removing packages and content that are" echo "not required on a system that users do not log into." echo "" -echo "This script restores the content and packages that are found on a default" -echo "Ubuntu server system." +echo "This script restores content and packages that are found on a default" +echo "Ubuntu server system in order to make this system more suitable for" +echo "interactive use." echo "" echo "Reinstallation of packages may fail due to changes to the system" echo "configuration, the presence of third-party packages, or for other" echo "reasons." +echo "" +echo "This operation may take some time." +echo "" read -p "Would you like to continue? [y/N] " REPLY echo # (optional) move to a new line if [ "$REPLY" != "y" ] && [ "$REPLY" != "Y" ] @@ -167,7 +171,7 @@ EOF if ! dpkg-query --show --showformat='${db:Status-Status}\n' ubuntu-minimal 2> /dev/null | grep -q '^installed$'; then echo "Installing ubuntu-minimal package to provide the familiar Ubuntu minimal system..." - DEBIAN_FRONTEND=noninteractive apt-get install -y ubuntu-minimal + DEBIAN_FRONTEND=noninteractive apt-get install -y ubuntu-minimal ubuntu-standard fi if dpkg-query --show --showformat='${db:Status-Status}\n' ubuntu-server 2> /dev/null | grep -q '^installed$' \ From 89c54953d5eba0becab45371201587ae0c87663f Mon Sep 17 00:00:00 2001 From: Phil Roche Date: Wed, 4 Jul 2018 17:13:02 +0100 Subject: [PATCH 04/26] Update changelog to add unminimize change to current UNRELEASED changelog entry --- debian/changelog | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/debian/changelog b/debian/changelog index b5ee7215..3975252a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,3 @@ -livecd-rootfs (2.534) bionic; urgency=medium - - [ Francis Ginther ] - * Update unminimize script text and install ubuntu-standard when - unminimizing a minimal image (LP: #1778777) - --- Phil Roche Wed, 04 Jul 2018 15:44:15 +0100 - livecd-rootfs (2.533) UNRELEASED; urgency=medium [ Robert C Jennings ] @@ -15,6 +7,10 @@ livecd-rootfs (2.533) UNRELEASED; urgency=medium * live-build/auto/config: Drop "lp-*" hostname filter for Launchpad builders, since LP #1747015 is now fixed; "*.buildd" should be enough. + [ Francis Ginther ] + * Update unminimize script text and install ubuntu-standard when + unminimizing a minimal image (LP: #1778777) + -- Robert C Jennings Fri, 08 Jun 2018 10:10:53 -0700 livecd-rootfs (2.532) cosmic; urgency=medium From c3f5ee6716dcdbede2753e308002bbf016890861 Mon Sep 17 00:00:00 2001 From: Robert C Jennings Date: Wed, 11 Jul 2018 15:06:16 -0500 Subject: [PATCH 05/26] Disable checksum generation These checksums are unused, integrity checking in launchpad is performed separately. --- debian/changelog | 1 + live-build/auto/config | 1 + 2 files changed, 2 insertions(+) diff --git a/debian/changelog b/debian/changelog index 3975252a..bcdc9989 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ livecd-rootfs (2.533) UNRELEASED; urgency=medium [ Robert C Jennings ] * ubuntu-cpc: Remove git-man for minimized images + * Disable checksum generation [ Colin Watson ] * live-build/auto/config: Drop "lp-*" hostname filter for Launchpad diff --git a/live-build/auto/config b/live-build/auto/config index bd25e49f..821977df 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -795,6 +795,7 @@ lb config noauto \ --initsystem none \ --bootloader "$BOOTLOADER" \ ${INITRAMFS_COMPRESSION:+--initramfs-compression "$INITRAMFS_COMPRESSION"} \ + --checksums none \ --cache false \ ${BOOTAPPEND_LIVE:+--bootappend-live "$BOOTAPPEND_LIVE"} \ $OPTS \ From dee54ed412d3084a66aa24f0db39b27d0f16cdd7 Mon Sep 17 00:00:00 2001 From: Adam Conrad Date: Wed, 18 Jul 2018 11:07:30 -0600 Subject: [PATCH 06/26] Releasing 2.533 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index bcdc9989..edc5317a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -livecd-rootfs (2.533) UNRELEASED; urgency=medium +livecd-rootfs (2.533) cosmic; urgency=medium [ Robert C Jennings ] * ubuntu-cpc: Remove git-man for minimized images @@ -12,7 +12,7 @@ livecd-rootfs (2.533) UNRELEASED; urgency=medium * Update unminimize script text and install ubuntu-standard when unminimizing a minimal image (LP: #1778777) - -- Robert C Jennings Fri, 08 Jun 2018 10:10:53 -0700 + -- Adam Conrad Wed, 18 Jul 2018 11:06:54 -0600 livecd-rootfs (2.532) cosmic; urgency=medium From 3db2340c545b30788becc596b674b26ec4b03669 Mon Sep 17 00:00:00 2001 From: Steve Langasek Date: Wed, 1 Aug 2018 18:02:13 -0700 Subject: [PATCH 07/26] generate all tar files with --xattrs. LP: #1302192. --- debian/changelog | 6 ++++++ live-build/auto/build | 4 ++-- live-build/ubuntu-cpc/hooks/031-1-root-xz.binary | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index edc5317a..9c3e0dfb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +livecd-rootfs (2.534) UNRELEASED; urgency=medium + + * generate all tar files with --xattrs. LP: #1302192. + + -- Steve Langasek Wed, 01 Aug 2018 17:59:41 -0700 + livecd-rootfs (2.533) cosmic; urgency=medium [ Robert C Jennings ] diff --git a/live-build/auto/build b/live-build/auto/build index 519ce1e7..c71b7b10 100755 --- a/live-build/auto/build +++ b/live-build/auto/build @@ -490,7 +490,7 @@ for ISO in binary.iso binary.hybrid.iso; do done if [ -e "binary/$INITFS/filesystem.dir" ]; then - (cd "binary/$INITFS/filesystem.dir/" && tar -c *) | \ + (cd "binary/$INITFS/filesystem.dir/" && tar -c --xattrs *) | \ gzip -9 --rsyncable > "$PREFIX.rootfs.tar.gz" chmod 644 "$PREFIX.rootfs.tar.gz" elif [ -e binary-tar.tar.gz ]; then @@ -527,7 +527,7 @@ EOF fi if [ "$PROJECT" = "ubuntu-touch" ] || [ "$PROJECT" = "ubuntu-touch-custom" ]; then - (cd "binary/$INITFS/custom.dir/" && tar -c *) | \ + (cd "binary/$INITFS/custom.dir/" && tar -c --xattrs *) | \ gzip -9 --rsyncable > "$PREFIX.custom.tar.gz" chmod 644 "$PREFIX.custom.tar.gz" fi diff --git a/live-build/ubuntu-cpc/hooks/031-1-root-xz.binary b/live-build/ubuntu-cpc/hooks/031-1-root-xz.binary index fab8a834..5695f96d 100755 --- a/live-build/ubuntu-cpc/hooks/031-1-root-xz.binary +++ b/live-build/ubuntu-cpc/hooks/031-1-root-xz.binary @@ -12,4 +12,4 @@ fi rootfs_dir=rootfs.dir cp $rootfs_dir.manifest livecd.ubuntu-cpc.rootfs.manifest -(cd $rootfs_dir/ && tar -c *) | xz > livecd.ubuntu-cpc.rootfs.tar.xz +(cd $rootfs_dir/ && tar -c --xattrs *) | xz > livecd.ubuntu-cpc.rootfs.tar.xz From 67142507ae0034c5f3d230fb316bebd9742b7107 Mon Sep 17 00:00:00 2001 From: Steve Langasek Date: Mon, 6 Aug 2018 13:12:05 -0700 Subject: [PATCH 08/26] releasing package livecd-rootfs version 2.534 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 3c7a8388..6a426743 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -livecd-rootfs (2.534) UNRELEASED; urgency=medium +livecd-rootfs (2.534) cosmic; urgency=medium [ Michael Hudson-Doyle ] * Disable journald rate limiting in the live-server live session. @@ -7,7 +7,7 @@ livecd-rootfs (2.534) UNRELEASED; urgency=medium [ Steve Langasek ] * generate all tar files with --xattrs. LP: #1302192. - -- Steve Langasek Wed, 01 Aug 2018 23:28:47 -0700 + -- Steve Langasek Mon, 06 Aug 2018 13:12:02 -0700 livecd-rootfs (2.533) cosmic; urgency=medium From 00151c5e0bcccfa225281ff181a50ef594b8411f Mon Sep 17 00:00:00 2001 From: Michael Hudson-Doyle Date: Thu, 16 Aug 2018 21:28:52 +1200 Subject: [PATCH 09/26] Set PREINSTALLED=true for live-server so that universe ends up being enabled in the image. --- debian/changelog | 7 +++++++ live-build/auto/config | 1 + 2 files changed, 8 insertions(+) diff --git a/debian/changelog b/debian/changelog index 6a426743..aa7c804b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +livecd-rootfs (2.535~ppa1) cosmic; urgency=medium + + * Set PREINSTALLED=true for live-server so that universe ends up being + enabled in the image. + + -- Michael Hudson-Doyle Thu, 16 Aug 2018 21:28:00 +1200 + livecd-rootfs (2.534) cosmic; urgency=medium [ Michael Hudson-Doyle ] diff --git a/live-build/auto/config b/live-build/auto/config index 821977df..5ea1f6fe 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -151,6 +151,7 @@ case $IMAGEFORMAT in # by skipping lb_chroot_live-packages. skip_lb_stage chroot_live-packages INITRAMFS_TYPE=auto + PREINSTALLED=true ;; *) PREINSTALLED=true From 1aa8b9d882b44e1237b556f552f7c979740a5f95 Mon Sep 17 00:00:00 2001 From: Michael Hudson-Doyle Date: Fri, 17 Aug 2018 10:09:57 +1200 Subject: [PATCH 10/26] ffs --- debian/changelog | 4 ++-- live-build/auto/config | 8 +++++++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index aa7c804b..83ba3237 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,7 @@ -livecd-rootfs (2.535~ppa1) cosmic; urgency=medium +livecd-rootfs (2.535~ppa2) cosmic; urgency=medium * Set PREINSTALLED=true for live-server so that universe ends up being - enabled in the image. + enabled in the image. But make sure PREINSTALLED_POOL_SEEDS is not set. -- Michael Hudson-Doyle Thu, 16 Aug 2018 21:28:00 +1200 diff --git a/live-build/auto/config b/live-build/auto/config index 5ea1f6fe..c4b67e5b 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -495,9 +495,11 @@ case $PROJECT in amd64) add_package live linux-signed-generic ;; esac ;; + *) + PREINSTALL_POOL_SEEDS='server-ship' + ;; esac COMPONENTS='main' - PREINSTALL_POOL_SEEDS='server-ship' ;; ubuntu-core) @@ -695,6 +697,10 @@ export APT_OPTIONS if [ "$PREINSTALLED" != "true" ] && [ "$LIVE_TASK" ]; then add_task live "$LIVE_TASK" fi +if [ -n "$LIVE_TASK" ] && [ "$PROJECT:${SUBPROJECT:-}" = "ubuntu-server:live" ]; then + add_task live "$LIVE_TASK" +fi + case $PROJECT in ubuntu-dvd) From e80459b96755b984b22acc8726cd7292ac732c4e Mon Sep 17 00:00:00 2001 From: Michael Hudson-Doyle Date: Fri, 17 Aug 2018 11:09:37 +1200 Subject: [PATCH 11/26] grumble --- debian/changelog | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 83ba3237..dc3a9177 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,8 @@ -livecd-rootfs (2.535~ppa2) cosmic; urgency=medium +livecd-rootfs (2.535~ppa3) cosmic; urgency=medium * Set PREINSTALLED=true for live-server so that universe ends up being enabled in the image. But make sure PREINSTALLED_POOL_SEEDS is not set. + And that the LIVE_TASK gets installed. -- Michael Hudson-Doyle Thu, 16 Aug 2018 21:28:00 +1200 From a2614719699eb2d72f6ba77f1d25dd5982574be5 Mon Sep 17 00:00:00 2001 From: Michael Hudson-Doyle Date: Fri, 17 Aug 2018 12:00:41 +1200 Subject: [PATCH 12/26] a less hackish approach --- live-build/auto/build | 2 +- live-build/auto/config | 16 +++++----------- 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/live-build/auto/build b/live-build/auto/build index c71b7b10..50831ba2 100755 --- a/live-build/auto/build +++ b/live-build/auto/build @@ -268,7 +268,7 @@ EOF rm -rf chroot/var/lib/apt/lists/* fi - if [ -f config/oem-config-preinstalled ]; then + if [ -f config/universe-enabled ]; then # This is cargo-culted almost verbatim (with some syntax changes for # preinstalled being slightly different in what it doesn't ask) from diff --git a/live-build/auto/config b/live-build/auto/config index c4b67e5b..070d73f3 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -151,7 +151,7 @@ case $IMAGEFORMAT in # by skipping lb_chroot_live-packages. skip_lb_stage chroot_live-packages INITRAMFS_TYPE=auto - PREINSTALLED=true + touch config/universe-enabled ;; *) PREINSTALLED=true @@ -214,9 +214,9 @@ case $IMAGEFORMAT in esac if [ "$PREINSTALLED" = "true" ]; then - # This is an oem-config preinstalled image, touch a random file that - # we can refer back to during build, cause that's wildly hackish - touch config/oem-config-preinstalled + # Touch a random file that we can refer back to during build, + # cause that's wildly hackish + touch config/universe-enabled case $PROJECT in kubuntu*) add_package live oem-config-kde ubiquity-frontend-kde @@ -495,10 +495,8 @@ case $PROJECT in amd64) add_package live linux-signed-generic ;; esac ;; - *) - PREINSTALL_POOL_SEEDS='server-ship' - ;; esac + PREINSTALL_POOL_SEEDS='server-ship' COMPONENTS='main' ;; @@ -697,10 +695,6 @@ export APT_OPTIONS if [ "$PREINSTALLED" != "true" ] && [ "$LIVE_TASK" ]; then add_task live "$LIVE_TASK" fi -if [ -n "$LIVE_TASK" ] && [ "$PROJECT:${SUBPROJECT:-}" = "ubuntu-server:live" ]; then - add_task live "$LIVE_TASK" -fi - case $PROJECT in ubuntu-dvd) From e804cc4e00d53a4d20a822911da11e07fb76a488 Mon Sep 17 00:00:00 2001 From: Michael Hudson-Doyle Date: Fri, 17 Aug 2018 12:01:27 +1200 Subject: [PATCH 13/26] a less hackish approach --- live-build/auto/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/live-build/auto/config b/live-build/auto/config index 070d73f3..4d492d31 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -496,8 +496,8 @@ case $PROJECT in esac ;; esac - PREINSTALL_POOL_SEEDS='server-ship' COMPONENTS='main' + PREINSTALL_POOL_SEEDS='server-ship' ;; ubuntu-core) From 59b8eb76e2d35d004aa6aa47cdc717acb298a043 Mon Sep 17 00:00:00 2001 From: Michael Hudson-Doyle Date: Fri, 17 Aug 2018 12:04:12 +1200 Subject: [PATCH 14/26] Disentangle enabling universe in the final image a little from having PREINSTALLED=true set and enable it for a live-server build. --- debian/changelog | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/debian/changelog b/debian/changelog index dc3a9177..4a95350d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,9 @@ -livecd-rootfs (2.535~ppa3) cosmic; urgency=medium +livecd-rootfs (2.535~ppa4) cosmic; urgency=medium - * Set PREINSTALLED=true for live-server so that universe ends up being - enabled in the image. But make sure PREINSTALLED_POOL_SEEDS is not set. - And that the LIVE_TASK gets installed. + * Disentangle enabling universe in the final image a little from having + PREINSTALLED=true set and enable it for a live-server build. - -- Michael Hudson-Doyle Thu, 16 Aug 2018 21:28:00 +1200 + -- Michael Hudson-Doyle Thu, 16 Aug 2018 21:28:00 +1200 livecd-rootfs (2.534) cosmic; urgency=medium From 15505866a8ad903b3baa1e0e68f1ee4f824540ec Mon Sep 17 00:00:00 2001 From: Michael Hudson-Doyle Date: Fri, 17 Aug 2018 13:51:55 +1200 Subject: [PATCH 15/26] add bug ref to changelog --- debian/changelog | 1 + 1 file changed, 1 insertion(+) diff --git a/debian/changelog b/debian/changelog index 4a95350d..1eca5b5c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ livecd-rootfs (2.535~ppa4) cosmic; urgency=medium * Disentangle enabling universe in the final image a little from having PREINSTALLED=true set and enable it for a live-server build. + (LP: #1783129) -- Michael Hudson-Doyle Thu, 16 Aug 2018 21:28:00 +1200 From 061ea269840dd52dc4fdc0c8603283df91f95dad Mon Sep 17 00:00:00 2001 From: Michael Hudson-Doyle Date: Fri, 17 Aug 2018 16:14:41 +1200 Subject: [PATCH 16/26] fix changelog --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 1eca5b5c..229d6d5b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -livecd-rootfs (2.535~ppa4) cosmic; urgency=medium +livecd-rootfs (2.535) UNRELEASED; urgency=medium * Disentangle enabling universe in the final image a little from having PREINSTALLED=true set and enable it for a live-server build. From 2c76f50499ec0f1336f89ffd793a14da26e382b5 Mon Sep 17 00:00:00 2001 From: Michael Hudson-Doyle Date: Fri, 24 Aug 2018 13:04:56 +1200 Subject: [PATCH 17/26] releasing package livecd-rootfs version 2.535 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 229d6d5b..0442d2b6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,10 @@ -livecd-rootfs (2.535) UNRELEASED; urgency=medium +livecd-rootfs (2.535) cosmic; urgency=medium * Disentangle enabling universe in the final image a little from having PREINSTALLED=true set and enable it for a live-server build. (LP: #1783129) - -- Michael Hudson-Doyle Thu, 16 Aug 2018 21:28:00 +1200 + -- Michael Hudson-Doyle Fri, 24 Aug 2018 13:04:51 +1200 livecd-rootfs (2.534) cosmic; urgency=medium From ae4a760edb605fbab9443abed9159461f8eaa8f3 Mon Sep 17 00:00:00 2001 From: Michael Hudson-Doyle Date: Tue, 28 Aug 2018 10:55:19 +1200 Subject: [PATCH 18/26] Fix live-server journald config snippet to actually disable journald rate limiting. --- debian/changelog | 7 +++++++ .../overlay/etc/systemd/journald.conf.d/no-rate-limit.conf | 1 + 2 files changed, 8 insertions(+) diff --git a/debian/changelog b/debian/changelog index 0442d2b6..66cd1415 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +livecd-rootfs (2.536) UNRELEASED; urgency=medium + + * Fix live-server journald config snippet to actually disable journald rate + limiting. + + -- Michael Hudson-Doyle Tue, 28 Aug 2018 10:54:38 +1200 + livecd-rootfs (2.535) cosmic; urgency=medium * Disentangle enabling universe in the final image a little from having diff --git a/live-build/ubuntu-server/includes.binary/overlay/etc/systemd/journald.conf.d/no-rate-limit.conf b/live-build/ubuntu-server/includes.binary/overlay/etc/systemd/journald.conf.d/no-rate-limit.conf index 1d8af89a..fbaab956 100644 --- a/live-build/ubuntu-server/includes.binary/overlay/etc/systemd/journald.conf.d/no-rate-limit.conf +++ b/live-build/ubuntu-server/includes.binary/overlay/etc/systemd/journald.conf.d/no-rate-limit.conf @@ -1 +1,2 @@ +[Journal] RateLimitIntervalSec=0 From f04caf6104e7d6db7a8ad83049a0e595f5a3ff57 Mon Sep 17 00:00:00 2001 From: Michael Hudson-Doyle Date: Tue, 28 Aug 2018 11:00:43 +1200 Subject: [PATCH 19/26] releasing package livecd-rootfs version 2.536 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 66cd1415..e773ad65 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ -livecd-rootfs (2.536) UNRELEASED; urgency=medium +livecd-rootfs (2.536) cosmic; urgency=medium * Fix live-server journald config snippet to actually disable journald rate limiting. - -- Michael Hudson-Doyle Tue, 28 Aug 2018 10:54:38 +1200 + -- Michael Hudson-Doyle Tue, 28 Aug 2018 11:00:39 +1200 livecd-rootfs (2.535) cosmic; urgency=medium From 9360135b2c2a346ae6b1c309445564ade6daa6b1 Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Tue, 18 Sep 2018 09:01:12 +0200 Subject: [PATCH 20/26] Minimize the number of manually installed packages in images by marking dependencies of metapackages as automatically installed. --- debian/changelog | 7 +++++ debian/control | 1 + live-build/auto/build | 2 ++ live-build/auto/minimize-manual.py | 48 ++++++++++++++++++++++++++++++ 4 files changed, 58 insertions(+) create mode 100644 live-build/auto/minimize-manual.py diff --git a/debian/changelog b/debian/changelog index e773ad65..76e885e8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +livecd-rootfs (2.536ubuntu1) UNRELEASED; urgency=medium + + * Minimize the number of manually installed packages in images by marking + dependencies of metapackages as automatically installed. + + -- Julian Andres Klode Tue, 18 Sep 2018 08:55:04 +0200 + livecd-rootfs (2.536) cosmic; urgency=medium * Fix live-server journald config snippet to actually disable journald rate diff --git a/debian/control b/debian/control index f6468b91..9d47c949 100644 --- a/debian/control +++ b/debian/control @@ -26,6 +26,7 @@ Depends: ${misc:Depends}, parted, procps, python-minimal | python, + python3-apt, python3-software-properties, qemu-utils, rsync, diff --git a/live-build/auto/build b/live-build/auto/build index 50831ba2..160f471a 100755 --- a/live-build/auto/build +++ b/live-build/auto/build @@ -445,6 +445,8 @@ EOF (cd chroot && find usr/share/doc -maxdepth 1 -type d | xargs du -s | sort -nr) echo END docdirs + live-build/auto/minimize-manual.py chroot + lb binary "$@" touch binary.success ) 2>&1 | tee binary.log diff --git a/live-build/auto/minimize-manual.py b/live-build/auto/minimize-manual.py new file mode 100644 index 00000000..712f35a4 --- /dev/null +++ b/live-build/auto/minimize-manual.py @@ -0,0 +1,48 @@ +#!/usr/bin/python3 +"""Minimize the number of manually installed packages in the image. + +Finds all manually meta packages and marks their dependencies as +automatically installed. +""" +import apt +import sys + + +def is_root(pkg): + return (pkg.is_installed and + not pkg.is_auto_installed and + (pkg.section == "metapackages" or + pkg.section.endswith("/metapackages"))) + + +c = apt.Cache(rootdir=sys.argv[1] if len(sys.argv) > 1 else None) + +roots = set(pkg for pkg in c if is_root(pkg)) +workset = set(roots) +seen = set() + +with c.actiongroup(): + while True: + + print("Iteration", file=sys.stderr) + to_proc = workset - seen + if not to_proc: + break + for pkg in sorted(to_proc): + print(" Visiting", pkg, file=sys.stderr) + + # Mark every + if pkg not in roots: + pkg.mark_auto() + + for dep in pkg.installed.dependencies + pkg.installed.recommends: + if dep.rawtype not in ('Depends', 'PreDepends', 'Recommends'): + continue + for bdep in dep.or_dependencies: + for v in bdep.target_versions: + if v.package.is_installed: + workset.add(v.package) + + seen.add(pkg) + + c.commit() From 2e9349c543b970aea09c5a2bed1aad30e830c1eb Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Tue, 18 Sep 2018 09:15:42 +0200 Subject: [PATCH 21/26] minimize-manual.py: Followup with some cleanup, correct permissions --- live-build/auto/minimize-manual.py | 58 ++++++++++++++++-------------- 1 file changed, 31 insertions(+), 27 deletions(-) mode change 100644 => 100755 live-build/auto/minimize-manual.py diff --git a/live-build/auto/minimize-manual.py b/live-build/auto/minimize-manual.py old mode 100644 new mode 100755 index 712f35a4..6bd18780 --- a/live-build/auto/minimize-manual.py +++ b/live-build/auto/minimize-manual.py @@ -1,48 +1,52 @@ #!/usr/bin/python3 """Minimize the number of manually installed packages in the image. -Finds all manually meta packages and marks their dependencies as -automatically installed. +Finds all manually installed meta packages, and marks their dependencies +as automatically installed. """ -import apt import sys +import apt + def is_root(pkg): + """Check if the package is a root package (manually inst. meta)""" return (pkg.is_installed and not pkg.is_auto_installed and (pkg.section == "metapackages" or pkg.section.endswith("/metapackages"))) -c = apt.Cache(rootdir=sys.argv[1] if len(sys.argv) > 1 else None) +def main(): + """Main function""" + cache = apt.Cache(rootdir=sys.argv[1] if len(sys.argv) > 1 else None) + roots = set(pkg for pkg in cache if is_root(pkg)) + workset = set(roots) + seen = set() -roots = set(pkg for pkg in c if is_root(pkg)) -workset = set(roots) -seen = set() + with cache.actiongroup(): + while True: + print("Iteration", file=sys.stderr) + to_proc = workset - seen + if not to_proc: + break + for pkg in sorted(to_proc): + print(" Visiting", pkg, file=sys.stderr) -with c.actiongroup(): - while True: + if pkg not in roots: + pkg.mark_auto() - print("Iteration", file=sys.stderr) - to_proc = workset - seen - if not to_proc: - break - for pkg in sorted(to_proc): - print(" Visiting", pkg, file=sys.stderr) + for dep in (pkg.installed.dependencies + + pkg.installed.recommends): + for bdep in dep.or_dependencies: + for ver in bdep.target_versions: + if ver.package.is_installed: + workset.add(ver.package) - # Mark every - if pkg not in roots: - pkg.mark_auto() + seen.add(pkg) - for dep in pkg.installed.dependencies + pkg.installed.recommends: - if dep.rawtype not in ('Depends', 'PreDepends', 'Recommends'): - continue - for bdep in dep.or_dependencies: - for v in bdep.target_versions: - if v.package.is_installed: - workset.add(v.package) + cache.commit() - seen.add(pkg) - c.commit() +if __name__ == '__main__': + main() From fc6907b701c526bc8030ac7ac6f5dd20955d82a7 Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Tue, 18 Sep 2018 09:27:27 +0200 Subject: [PATCH 22/26] fixup: Do not assume current directory --- 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 160f471a..cd738855 100755 --- a/live-build/auto/build +++ b/live-build/auto/build @@ -445,7 +445,7 @@ EOF (cd chroot && find usr/share/doc -maxdepth 1 -type d | xargs du -s | sort -nr) echo END docdirs - live-build/auto/minimize-manual.py chroot + /usr/share/livecd-rootfs/live-build/auto/minimize-manual.py chroot lb binary "$@" touch binary.success From 08376f8e64c6ed110ad6ed3f08bfd1cd81d271f4 Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Tue, 18 Sep 2018 09:29:58 +0200 Subject: [PATCH 23/26] Fix version number --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 76e885e8..a42e5981 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -livecd-rootfs (2.536ubuntu1) UNRELEASED; urgency=medium +livecd-rootfs (2.537) UNRELEASED; urgency=medium * Minimize the number of manually installed packages in images by marking dependencies of metapackages as automatically installed. From 3bb028c86dcb46f6d7aebec53f5e474314ace152 Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Tue, 18 Sep 2018 10:39:59 +0200 Subject: [PATCH 24/26] Fix debian/rules test for shell scripts to ignore python --- debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/rules b/debian/rules index 5e853009..ed27747b 100755 --- a/debian/rules +++ b/debian/rules @@ -7,7 +7,7 @@ DEB_HOST_MULTIARCH := $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) override_dh_auto_test: dh_auto_test set -e; for x in live-build/auto/*; do \ - sh -n "$$x"; \ + echo "$$x" | grep -q .py || sh -n "$$x"; \ done override_dh_install: From 1746e65953eb9ef9e0c4777804cf90f78dc4a216 Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Tue, 18 Sep 2018 11:44:06 +0200 Subject: [PATCH 25/26] Reorganize minimal-manual file location. This also gets rid of the change to debian/rules --- debian/install | 1 + debian/rules | 2 +- live-build/auto/build | 2 +- live-build/auto/minimize-manual.py => minimize-manual | 0 4 files changed, 3 insertions(+), 2 deletions(-) rename live-build/auto/minimize-manual.py => minimize-manual (100%) diff --git a/debian/install b/debian/install index 91d6ea37..4eb70070 100644 --- a/debian/install +++ b/debian/install @@ -1,2 +1,3 @@ live-build usr/share/livecd-rootfs get-ppa-fingerprint usr/share/livecd-rootfs +minimize-manual usr/share/livecd-rootfs diff --git a/debian/rules b/debian/rules index ed27747b..5e853009 100755 --- a/debian/rules +++ b/debian/rules @@ -7,7 +7,7 @@ DEB_HOST_MULTIARCH := $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) override_dh_auto_test: dh_auto_test set -e; for x in live-build/auto/*; do \ - echo "$$x" | grep -q .py || sh -n "$$x"; \ + sh -n "$$x"; \ done override_dh_install: diff --git a/live-build/auto/build b/live-build/auto/build index cd738855..ec3d61bc 100755 --- a/live-build/auto/build +++ b/live-build/auto/build @@ -445,7 +445,7 @@ EOF (cd chroot && find usr/share/doc -maxdepth 1 -type d | xargs du -s | sort -nr) echo END docdirs - /usr/share/livecd-rootfs/live-build/auto/minimize-manual.py chroot + /usr/share/livecd-rootfs/minimize-manual chroot lb binary "$@" touch binary.success diff --git a/live-build/auto/minimize-manual.py b/minimize-manual similarity index 100% rename from live-build/auto/minimize-manual.py rename to minimize-manual From 1e2e25deb531b11e02447cf9b6916c1947887ce9 Mon Sep 17 00:00:00 2001 From: Adam Conrad Date: Tue, 18 Sep 2018 04:15:23 -0600 Subject: [PATCH 26/26] Releasing version 2.537. --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index a42e5981..9c7360a7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -livecd-rootfs (2.537) UNRELEASED; urgency=medium +livecd-rootfs (2.537) cosmic; urgency=medium * Minimize the number of manually installed packages in images by marking dependencies of metapackages as automatically installed.