Skip to content
New issue

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

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

Already on GitHub? Sign in to your account

Merge flatcar-master to flatcar-master-edge 2019-12-03 #34

Merged

Conversation

@dongsupark
Copy link
Member

dongsupark commented Dec 3, 2019

Merge flatcar-master to flatcar-master-edge, to include fixes for cross-builds.

@dongsupark dongsupark added the edge label Dec 3, 2019
@dongsupark dongsupark force-pushed the dongsu/merge-flatcar-master-edge-2019-12-03 branch from d112394 to ed87d93 Dec 4, 2019
dongsupark and others added 2 commits Nov 29, 2019
To make packages-matrix build rust sources for arm64-usr,
we need to make toolchain include the rust target for arm.
Unfortunately, catalyst does not support the cross-build rust target
by default. We also cannot add `dev-lang/rust` to `$TOOLCHAIN_PKGS`,
because then catalyst would tries to build a `cross-*/rust` package,
which does not exist.

So we need to manually run emerge for rust, without `--newuse -u`
options. If the `--newuse -u` options are given, the rust will not
be installed at all.
@dongsupark dongsupark force-pushed the dongsu/merge-flatcar-master-edge-2019-12-03 branch from ed87d93 to e9565ef Dec 9, 2019
@dongsupark

This comment has been minimized.

Copy link
Member Author

dongsupark commented Dec 9, 2019

Excluded GPT-related commits, to avoid conflicts.
So this PR includes only cross-builds fixes.

@dongsupark dongsupark merged commit 84ff847 into flatcar-master-edge Dec 9, 2019
@dongsupark dongsupark deleted the dongsu/merge-flatcar-master-edge-2019-12-03 branch Dec 9, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
2 participants
You can’t perform that action at this time.