Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Prevent pkg-config from being removed in image #424

Merged
merged 1 commit into from
May 16, 2020

Conversation

jmagnuson
Copy link
Contributor

Currently, installing the toolchain for arm-unknown-linux-gnueabihf
uses xz-utils which gets pruned. This also removes pkg-config, so
remove the prune altogether to keep both packages. curl is also kept
as that was originally installed in common.sh as well.

Fixes #422

@jmagnuson jmagnuson requested review from Dylan-DPC-zz and a team as code owners May 13, 2020 22:38
tar --strip-components 1 -xJ && \
apt-get purge --auto-remove -y curl xz-utils
tar --strip-components 1 -xJ
# packages not removed since they were originally installed in common.sh
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe just remove the apt-get install line completely.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done in amended commit 843ad77.

@jmagnuson jmagnuson force-pushed the prevent-pkgconfig-purge branch from 7332551 to 843ad77 Compare May 15, 2020 13:47
Currently, installing the toolchain for `arm-unknown-linux-gnueabihf`
uses `xz-utils` which gets pruned. This also removes `pkg-config`, so
remove the prune to keep both packages, and remove install since this is
handled in `common.sh`. `curl` is similarly left as it was previously
installed as well.
@reitermarkus
Copy link
Member

bors r+

@bors
Copy link
Contributor

bors bot commented May 16, 2020

Build succeeded:

@bors bors bot merged commit 7d09c5e into cross-rs:master May 16, 2020
@reitermarkus
Copy link
Member

Thanks, @jmagnuson!

@jmagnuson jmagnuson deleted the prevent-pkgconfig-purge branch May 16, 2020 05:55
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

pkg-config purged from arm-unknown-linux-gnueabihf
2 participants