From 809028f2390cdac3b17c5c140639d2486503366c Mon Sep 17 00:00:00 2001 From: Francis Ginther Date: Fri, 29 Jun 2018 10:44:49 -0500 Subject: [PATCH 1/4] Keep vim-common in the minimal images for pollinate --- debian/changelog | 6 ++++++ live-build/ubuntu-cpc/hooks/999-cpc-fixes.chroot | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 9a7debea..a1e1de4a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +livecd-rootfs (2.408.34) xenial; urgency=medium + + * Keep vim-common in the minimal images for pollinate + + -- Francis Ginther Fri, 29 Jun 2018 10:42:06 -0500 + livecd-rootfs (2.408.33) xenial; urgency=medium * Zero fill space in UEFI partitions, too diff --git a/live-build/ubuntu-cpc/hooks/999-cpc-fixes.chroot b/live-build/ubuntu-cpc/hooks/999-cpc-fixes.chroot index 88905ca5..c79cc2a5 100755 --- a/live-build/ubuntu-cpc/hooks/999-cpc-fixes.chroot +++ b/live-build/ubuntu-cpc/hooks/999-cpc-fixes.chroot @@ -173,7 +173,7 @@ if [ "${SUBPROJECT:-}" = minimized ]; then # FIXME: iso-codes is a dep of software-properties and shouldn't be _xchroot "${rootd}" env DEBIAN_FRONTEND=noninteractive \ apt-get -y autoremove --purge iso-codes xauth pastebinit \ - plymouth open-vm-tools git shared-mime-info vim vim-common \ + plymouth open-vm-tools git shared-mime-info vim \ console-setup ncurses-term tmux screen policykit-1 \ xdg-user-dirs less run-one apport-symptoms \ ubuntu-cloudimage-keyring file From 67d979da0da648ac3b3fdf86c9dda238b67a54ff Mon Sep 17 00:00:00 2001 From: Francis Ginther Date: Fri, 29 Jun 2018 14:52:52 -0500 Subject: [PATCH 2/4] Instead of not removing vim-common, explictily add back pollinate. This is a more explicit version of what is needed and would require no changes if pollinate is updated to drop the dependency on vim-common. --- live-build/ubuntu-cpc/hooks/999-cpc-fixes.chroot | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/live-build/ubuntu-cpc/hooks/999-cpc-fixes.chroot b/live-build/ubuntu-cpc/hooks/999-cpc-fixes.chroot index c79cc2a5..d5b71f4c 100755 --- a/live-build/ubuntu-cpc/hooks/999-cpc-fixes.chroot +++ b/live-build/ubuntu-cpc/hooks/999-cpc-fixes.chroot @@ -173,10 +173,13 @@ if [ "${SUBPROJECT:-}" = minimized ]; then # FIXME: iso-codes is a dep of software-properties and shouldn't be _xchroot "${rootd}" env DEBIAN_FRONTEND=noninteractive \ apt-get -y autoremove --purge iso-codes xauth pastebinit \ - plymouth open-vm-tools git shared-mime-info vim \ + plymouth open-vm-tools git shared-mime-info vim vim-common \ console-setup ncurses-term tmux screen policykit-1 \ xdg-user-dirs less run-one apport-symptoms \ ubuntu-cloudimage-keyring file + # Add back pollinate, which gets removed due to a dependency on vim-common + _xchroot "${rootd}" env DEBIAN_FRONTEND=noninteractive \ + apt-get install --no-install-recommends pollinate _xchroot "${rootd}" apt clean fi From 6a8dcc2bfe10140c4781b227a2cad22b2e45ceac Mon Sep 17 00:00:00 2001 From: Francis Ginther Date: Fri, 29 Jun 2018 14:56:02 -0500 Subject: [PATCH 3/4] Update changelog entry --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index a1e1de4a..3f389152 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,6 @@ livecd-rootfs (2.408.34) xenial; urgency=medium - * Keep vim-common in the minimal images for pollinate + * Add back pollinate after it is removed due to a dependency on vim-common -- Francis Ginther Fri, 29 Jun 2018 10:42:06 -0500 From 4a759235a8f9b345d6b268699ab9e4ad059e0f94 Mon Sep 17 00:00:00 2001 From: Francis Ginther Date: Fri, 29 Jun 2018 17:15:09 -0500 Subject: [PATCH 4/4] Indicate this is 'for minimal' in the change log --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 3f389152..ab253215 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,6 @@ livecd-rootfs (2.408.34) xenial; urgency=medium - * Add back pollinate after it is removed due to a dependency on vim-common + * Add back pollinate for minimal after it is removed due to a dependency on vim-common -- Francis Ginther Fri, 29 Jun 2018 10:42:06 -0500