From 46588a418c473061392e52aded3f30c0f95f3219 Mon Sep 17 00:00:00 2001 From: bunnie Date: Fri, 22 Dec 2023 22:04:07 +0800 Subject: [PATCH] pin smoltcp to a local fork we need to tag out a release, so we're temporarily forking `smoltcp` at its current head, testing it, and holding it there until a full release is tagged out that captures all of the good stuff that has been going on in that repo since June. --- Cargo.lock | 2 +- services/net/Cargo.toml | 18 +++++------------- 2 files changed, 6 insertions(+), 14 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index c32d92c5d..480e62f7e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4576,7 +4576,7 @@ checksum = "f2dd574626839106c320a323308629dcb1acfc96e32a8cba364ddc61ac23ee83" [[package]] name = "smoltcp" version = "0.10.0" -source = "git+https://github.com/smoltcp-rs/smoltcp.git?branch=main#8b59d57d9e392d704fdeb5029d691b9155a3687a" +source = "git+https://github.com/betrusted-io/smoltcp.git?rev=8b59d57d9e392d704fdeb5029d691b9155a3687a#8b59d57d9e392d704fdeb5029d691b9155a3687a" dependencies = [ "bitflags 1.3.2", "byteorder", diff --git a/services/net/Cargo.toml b/services/net/Cargo.toml index e5eda9517..04f451306 100644 --- a/services/net/Cargo.toml +++ b/services/net/Cargo.toml @@ -33,14 +33,12 @@ pddb = {path = "../pddb"} xous-semver = "0.1.2" [dependencies.smoltcp] -# some historical notes for development on branches in the future +# smoltcp is pinned to a fork on betrusted-io until a new release is available. # path = "../../../smoltcp" -git = "https://github.com/smoltcp-rs/smoltcp.git" -branch = "main" -#git = "https://github.com/betrusted-io/smoltcp.git" -#rev = "35c8ec3d30c846442a1faae01fb0537641aef898" -# 0.8.1 drops the rand_core dep and doesn't have the breaking IPv4 change (see issue #613) -# version = "0.8.1" +git = "https://github.com/betrusted-io/smoltcp.git" +rev = "8b59d57d9e392d704fdeb5029d691b9155a3687a" +# branch = "main" + default-features = false features = [ "std", "log", # needed for `cargo test --no-default-features --features default` :/ @@ -49,12 +47,6 @@ features = [ "proto-ipv4", "proto-ipv6", "socket-raw", "socket-icmp", "socket-udp", "socket-tcp", ] -# tracking main branch changes: -# works with: -# - edfdb23243a973d458397a2b4e76f527bacb1fd6 -# broken at: -# - e893a17fc761a9c1b34647ff09102993336cc341 (can't get past the first ping) -# - 9624adf20cbeaf627e907a87b4fdf74e8f3154fb (broken after the third attempt to ping?) [features] precursor = ["utralib/precursor"]