Skip to content

Consolodate the Linux *_SUPER_MAGIC constants. - #2639

Merged
bors merged 4 commits into
rust-lang:masterfrom
sunfishcode:sunfishcode/linux-super-magic
Jan 25, 2022
Merged

bors merged 4 commits into
rust-lang:masterfrom
sunfishcode:sunfishcode/linux-super-magic

Conversation

@sunfishcode

Copy link
Copy Markdown
Member

Move the Linux *_SUPER_MAGIC constants out of
android/uclibc/gnu-specific directories and into the common linux_like directory
so that they're available on all Linux-family platforms, and so that that all
Linux-family platforms have all the constants.

Move the Linux `*_SUPER_MAGIC` constants out of
android/uclibc/gnu-specific directories and into the common `linux_like` directory
so that they're available on all Linux-family platforms, and so that that all
Linux-family platforms have all the constants.
@rust-highfive

Copy link
Copy Markdown

r? @Amanieu

(rust-highfive has picked a reviewer for you, use r? to override)

@Amanieu

Amanieu commented Jan 21, 2022

Copy link
Copy Markdown
Member

@bors r+

@bors

bors commented Jan 21, 2022

Copy link
Copy Markdown
Contributor

📌 Commit f7f0656 has been approved by Amanieu

bors added a commit that referenced this pull request Jan 21, 2022
…anieu

Consolodate the Linux `*_SUPER_MAGIC` constants.

Move the Linux `*_SUPER_MAGIC` constants out of
android/uclibc/gnu-specific directories and into the common `linux_like` directory
so that they're available on all Linux-family platforms, and so that that all
Linux-family platforms have all the constants.
@bors

bors commented Jan 21, 2022

Copy link
Copy Markdown
Contributor

⌛ Testing commit f7f0656 with merge df7bb3c...

@bors

bors commented Jan 21, 2022

Copy link
Copy Markdown
Contributor

💔 Test failed - checks-actions

@Amanieu

Amanieu commented Jan 21, 2022

Copy link
Copy Markdown
Member

I think this is the same as #2633: the musl version used in CI doesn't have the BINDERFS magic, which is causing the check to fail.

@Amanieu

Amanieu commented Jan 24, 2022

Copy link
Copy Markdown
Member

@bors r+

@bors

bors commented Jan 24, 2022

Copy link
Copy Markdown
Contributor

📌 Commit d0891d9 has been approved by Amanieu

@bors

bors commented Jan 24, 2022

Copy link
Copy Markdown
Contributor

⌛ Testing commit d0891d9 with merge c0e0bf1...

bors added a commit that referenced this pull request Jan 24, 2022
…anieu

Consolodate the Linux `*_SUPER_MAGIC` constants.

Move the Linux `*_SUPER_MAGIC` constants out of
android/uclibc/gnu-specific directories and into the common `linux_like` directory
so that they're available on all Linux-family platforms, and so that that all
Linux-family platforms have all the constants.
@bors

bors commented Jan 24, 2022

Copy link
Copy Markdown
Contributor

💔 Test failed - checks-actions

@Amanieu

Amanieu commented Jan 24, 2022

Copy link
Copy Markdown
Member

@bors r+

@bors

bors commented Jan 24, 2022

Copy link
Copy Markdown
Contributor

📌 Commit 4875c52 has been approved by Amanieu

@bors

bors commented Jan 24, 2022

Copy link
Copy Markdown
Contributor

⌛ Testing commit 4875c52 with merge 33464a4...

bors added a commit that referenced this pull request Jan 24, 2022
…anieu

Consolodate the Linux `*_SUPER_MAGIC` constants.

Move the Linux `*_SUPER_MAGIC` constants out of
android/uclibc/gnu-specific directories and into the common `linux_like` directory
so that they're available on all Linux-family platforms, and so that that all
Linux-family platforms have all the constants.
@bors

bors commented Jan 24, 2022

Copy link
Copy Markdown
Contributor

💔 Test failed - checks-actions

@Amanieu

Amanieu commented Jan 25, 2022

Copy link
Copy Markdown
Member

@bors r+

@bors

bors commented Jan 25, 2022

Copy link
Copy Markdown
Contributor

📌 Commit 338ac98 has been approved by Amanieu

@bors

bors commented Jan 25, 2022

Copy link
Copy Markdown
Contributor

⌛ Testing commit 338ac98 with merge a769300...

@bors

bors commented Jan 25, 2022

Copy link
Copy Markdown
Contributor

☀️ Test successful - checks-actions, checks-cirrus-freebsd-11, checks-cirrus-freebsd-12, checks-cirrus-freebsd-13
Approved by: Amanieu
Pushing a769300 to master...

@bors
bors merged commit a769300 into rust-lang:master Jan 25, 2022
@sunfishcode
sunfishcode deleted the sunfishcode/linux-super-magic branch January 25, 2022 04:23
@jirutka jirutka mentioned this pull request Feb 5, 2022
bors Bot added a commit to nix-rust/nix that referenced this pull request May 7, 2022
1717: Define FsType constants for musl r=asomers a=jirutka

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

See rust-lang/libc#2639.

Co-authored-by: Jakub Jirutka <jakub@jirutka.cz>
@mati865 mati865 mentioned this pull request Aug 31, 2026
4 tasks
mati865 added a commit to mati865/libc that referenced this pull request Aug 31, 2026
IIUC, they were not added as part of
rust-lang#2639 because Musl kernel headers
were too old.
mati865 added a commit to mati865/libc that referenced this pull request Aug 31, 2026
IIUC, they were not added as part of
rust-lang#2639 because Musl kernel headers
were too old.
renovate-bot pushed a commit to renovate-bot/rust-lang-_-libc that referenced this pull request Aug 31, 2026
IIUC, they were not added as part of
rust-lang#2639 because Musl kernel headers
were too old.
tgross35 pushed a commit to tgross35/rust-libc that referenced this pull request Sep 4, 2026
IIUC, they were not added as part of
rust-lang#2639 because Musl kernel headers
were too old.

(backport <rust-lang#5453>)
(cherry picked from commit 4db6d73)
tgross35 pushed a commit to tgross35/rust-libc that referenced this pull request Sep 4, 2026
IIUC, they were not added as part of
rust-lang#2639 because Musl kernel headers
were too old.

(backport <rust-lang#5453>)
(cherry picked from commit 4db6d73)
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