Skip to content

Commit 77b61b8

Browse files
authored
Merge pull request #17 from oxidecomputer/wc/bump-min-glibc
Update minimum glibc version
2 parents 358ea2b + 5575465 commit 77b61b8

File tree

73 files changed

+134
-68
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

73 files changed

+134
-68
lines changed

β€ŽLICENSE-APACHEβ€Ž

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -187,6 +187,7 @@ APPENDIX: How to apply the Apache License to your work.
187187
identification within third-party archives.
188188

189189
Copyright 2022-2024 Axo Developer Co.
190+
Copyright 2025 Oxide Computer Company
190191

191192
Licensed under the Apache License, Version 2.0 (the "License");
192193
you may not use this file except in compliance with the License.

β€ŽLICENSE-MITβ€Ž

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
Copyright (c) 2022-2024 Axo Developer Co.
2+
Copyright (c) 2025 Oxide Computer Company
23

34
Permission is hereby granted, free of charge, to any
45
person obtaining a copy of this software and associated

β€ŽREADME.mdβ€Ž

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,15 @@
44

55
</div>
66

7-
[![crates.io](https://img.shields.io/crates/v/cargo-dist.svg)](https://crates.io/crates/cargo-dist)
8-
[![docs](https://docs.rs/cargo-dist/badge.svg)](https://docs.rs/cargo-dist)
9-
[![Rust CI](https://github.com/axodotdev/cargo-dist/workflows/Rust%20CI/badge.svg?branch=main)](https://github.com/axodotdev/cargo-dist/actions/workflows/ci.yml)
7+
[![Rust CI](https://github.com/oxidecomputer/cargo-dist/workflows/Rust%20CI/badge.svg?branch=main)](https://github.com/oxidecomputer/cargo-dist/actions/workflows/ci.yml)
8+
9+
## Fork Status
10+
11+
This is a fork of `dist` intended for Oxide's internal use.
12+
13+
Contributions may be accepted, but we do not intend to add any new features or fix any issues that do not directly impact our workflows.
14+
15+
## Dist
1016

1117
*dist distributes your binaries*
1218

β€Žcargo-dist/src/platform.rsβ€Ž

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -319,7 +319,7 @@ impl LibcVersion {
319319
pub fn default_glibc() -> Self {
320320
Self {
321321
major: 2,
322-
series: 31,
322+
series: 35,
323323
}
324324
}
325325

@@ -940,7 +940,7 @@ fn native_glibc_version(system: &SystemInfo, linkage: &Linkage) -> Option<LibcVe
940940
// If there's a system libc, assume that's what it was built against
941941
return Some(LibcVersion::glibc_from_schema(system_glibc));
942942
} else {
943-
// If the system has no known libc version use Ubuntu 20.04's glibc as a guess
943+
// If the system has no known libc version use Ubuntu 22.04's glibc as a guess
944944
return Some(LibcVersion::default_glibc());
945945
}
946946
}

β€Žcargo-dist/templates/ci/github/release.yml.j2β€Ž

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# This file was autogenerated by dist: https://opensource.axo.dev/cargo-dist/
22
#
33
# Copyright 2022-2024, axodotdev
4+
# Copyright 2025, Oxide Computer Company
45
# SPDX-License-Identifier: MIT or Apache-2.0
56
#
67
# CI that:

β€Žcargo-dist/tests/snapshots/akaikatana_basic.snapβ€Ž

Lines changed: 2 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

β€Žcargo-dist/tests/snapshots/akaikatana_musl.snapβ€Ž

Lines changed: 2 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

β€Žcargo-dist/tests/snapshots/akaikatana_one_alias_among_many_binaries.snapβ€Ž

Lines changed: 2 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

β€Žcargo-dist/tests/snapshots/akaikatana_two_bin_aliases.snapβ€Ž

Lines changed: 2 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

β€Žcargo-dist/tests/snapshots/akaikatana_updaters.snapβ€Ž

Lines changed: 2 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
Β (0)