Skip to content

Move constants from linux/magic.h out of gnu and uclibc - #2633

Closed
jirutka wants to merge 1 commit into
rust-lang:masterfrom
jirutka:linux-magic
Closed

jirutka wants to merge 1 commit into
rust-lang:masterfrom
jirutka:linux-magic

Conversation

@jirutka

@jirutka jirutka commented Jan 18, 2022

Copy link
Copy Markdown

These constants are provided by Linux (linux/magic.h), not libc.

/cc @kaniini

These constants are provided by Linux, not libc.
@rust-highfive

Copy link
Copy Markdown

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @Amanieu (or someone else) soon.

Please see the contribution instructions for more information.

@Amanieu

Amanieu commented Jan 19, 2022

Copy link
Copy Markdown
Member

@bors r+

@bors

bors commented Jan 19, 2022

Copy link
Copy Markdown
Contributor

📌 Commit 50156f8 has been approved by Amanieu

@bors

bors commented Jan 19, 2022

Copy link
Copy Markdown
Contributor

⌛ Testing commit 50156f8 with merge d0fc74d...

bors added a commit that referenced this pull request Jan 19, 2022
Move constants from linux/magic.h out of gnu and uclibc

These constants are provided by Linux (`linux/magic.h`), not libc.

/cc `@kaniini`
@bors

bors commented Jan 19, 2022

Copy link
Copy Markdown
Contributor

💔 Test failed - checks-actions

@jirutka

jirutka commented Jan 19, 2022 •

Copy link
Copy Markdown
Author

Why don’t you test musl targets on Alpine Linux (musl based distro) instead of Ubuntu (glibc based distro)? It would be much simpler and easier to troubleshoot.

@Amanieu

Amanieu commented Jan 19, 2022

Copy link
Copy Markdown
Member

Alpine doesn't help in this case since we need a cross-toolchain for a different arch.

If you look at ci/docker/mips-unknown-linux-musl/Dockerfile you will see that we are actually using a MIPS musl toolchain from openwrt for the specific CI builder that is failing. The kernel headers in that toolchain seem to predate binderfs support in the kernel.

You could try updating the toolchain used in CI, which should resolve this failure.

sunfishcode added a commit to sunfishcode/libc that referenced this pull request Jan 24, 2022
Update the mips-unknown-linux-musl CI toolchain to openwrt-sdk-21.02.1,
as suggested [here]. This also switches from ar71xx to ath79, since
[ar71xx is now deprecated] and ath79 is the replacement.

[here]: rust-lang#2633 (comment)
[ar71xx is now deprecated]: https://openwrt.org/docs/techref/targets/ar71xx
@bors

bors commented Jan 25, 2022

Copy link
Copy Markdown
Contributor

☔ The latest upstream changes (presumably #2639) made this pull request unmergeable. Please resolve the merge conflicts.

@Amanieu

Amanieu commented Jan 25, 2022

Copy link
Copy Markdown
Member

Superseded by #2639.

@Amanieu Amanieu closed this Jan 25, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants