Merge lp://qastaging/~fginther/livecd-rootfs/xenial-proposed-minimal-update into lp://qastaging/~ubuntu-core-dev/livecd-rootfs/xenial-proposed

Proposed by Francis Ginther
Status: Merged
Merged at revision: 1462
Proposed branch: lp://qastaging/~fginther/livecd-rootfs/xenial-proposed-minimal-update
Merge into: lp://qastaging/~ubuntu-core-dev/livecd-rootfs/xenial-proposed
Diff against target: 27 lines (+9/-0)
2 files modified
debian/changelog (+6/-0)
live-build/ubuntu-cpc/hooks/999-cpc-fixes.chroot (+3/-0)
To merge this branch: bzr merge lp://qastaging/~fginther/livecd-rootfs/xenial-proposed-minimal-update
Reviewer Review Type Date Requested Status
Robert C Jennings (community) post-hoc Approve
Steve Langasek Approve
Review via email: mp+348777@code.qastaging.launchpad.net

Commit message

Restore pollinate in the minimal image.

Description of the change

Pollinate was being removed from the minimal images due to xenial's pollinate having a dependency on vim-common and vim-common being in the remove for minimal list.

This change adds back pollinate (and vim-common via its dependency) to the image. The '--no-install-recommends' option is used here to prevent pulling vim back into the image.

If we are able to update pollinate to depend on xxb instead of vim-common (see rcj's comment), this change would have no impact as pollinate would not be removed and we could remove it at our leisure)

Please see build logs and manifest files here:
[rebuild in progress]

To post a comment you must log in.
Revision history for this message
Robert C Jennings (rcj) wrote :

Short of breaking xxd out of vim-common in xenial I don't see an alternative.... But I tested installation of vim-common on a recent xenial minimal lxd image. Installing vim-common (and friends) use 35MB of additional disk space. :-(

# apt-get install vim-common
Reading package lists... Done
Building dependency tree
Reading state information... Done
The following additional packages will be installed:
  libpython3.5 vim vim-runtime
Suggested packages:
  ctags vim-doc vim-scripts vim-gnome-py2 | vim-gtk-py2 | vim-gtk3-py2 | vim-athena-py2 | vim-nox-py2
The following NEW packages will be installed:
  libpython3.5 vim vim-common vim-runtime
0 upgraded, 4 newly installed, 0 to remove and 0 not upgraded.
Need to get 7663 kB of archives.
After this operation, 35.0 MB of additional disk space will be used.

Pollinate only adds 54.3Kb to the installation on top of this.

I think 35MB is a lot to add AND I think that users will see vim on xenial and believe that it is a regression on bionic to have it gone. But I don't like the lack of pollinate so I'm going to abstain.

review: Abstain
Revision history for this message
Robert C Jennings (rcj) wrote :

xxd is used in the hash_and_write function which is used in a single place in pollinate. Can xxd usage be replaced?

review: Needs Information
Revision history for this message
Francis Ginther (fginther) wrote :

@rcj, in this case, the size delta is not that high. We're not actually installing vim-common into the image, we're just not removing it. vim is still being removed. As a result the difference is really the same as installing pollinate and vim-common into the current xenial minimal image with --no-install-recommends. In which case the image grows by 431K:

root@xenial-minimal:~# apt-get install --no-install-recommends pollinate
Reading package lists... Done
Building dependency tree
Reading state information... Done
The following packages were automatically installed and are no longer required:
  gettext-base libasprintf0v5 libfreetype6 libpng12-0
Use 'apt autoremove' to remove them.
The following additional packages will be installed:
  vim-common
Suggested packages:
  vim-gnome-py2 | vim-gtk-py2 | vim-gtk3-py2 | vim-athena-py2 | vim-nox-py2
Recommended packages:
  vim | vim-gnome | vim-gtk | vim-gtk3 | vim-athena | vim-nox | vim-tiny
The following NEW packages will be installed:
  pollinate vim-common
0 upgraded, 2 newly installed, 0 to remove and 0 not upgraded.
Need to get 116 kB of archives.
After this operation, 431 kB of additional disk space will be used.

Revision history for this message
Robert C Jennings (rcj) wrote :

Francis, would you change your patch to keep the purge lines as they are but add pollinate and vim-common back with --no-recommends after these lines? I'd like it to be clear that we don't want vim-common but just want pollinate and have to pull in only vim-common. And it keeps the purge common across releases for any other SRUs.

review: Needs Fixing
1463. By Francis Ginther

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.

1464. By Francis Ginther

Update changelog entry

Revision history for this message
Steve Langasek (vorlon) wrote :

I was going to suggest that we still do 'apt-mark auto vim-common' so that if anyone dist-upgrades between releases, vim-common could be marked for removal. However, it still won't be autoremoved by apt because newer pollinate depends xxd | vim-common, which would be enough to hold vim-common on the system, so it doesn't matter.

review: Approve
Revision history for this message
Steve Langasek (vorlon) wrote :

also, now that this is pollinate being reinstalled with apt, vim-common will be marked auto anyway.

review: Approve
1465. By Francis Ginther

Indicate this is 'for minimal' in the change log

Revision history for this message
Robert C Jennings (rcj) :
review: Approve (post-hoc)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches