Skip to content

Commit

Permalink
Merge pull request #123 from lhw2002426/lwip
Browse files Browse the repository at this point in the history
porting lwip
  • Loading branch information
ken4647 authored Jun 25, 2024
2 parents 6714011 + b7016c4 commit 24fa3dd
Show file tree
Hide file tree
Showing 58 changed files with 2,203 additions and 85 deletions.
10 changes: 9 additions & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,17 @@ jobs:
fail-fast: false
steps:
- uses: actions/checkout@v3
with:
submodules: recursive
- uses: actions-rs/toolchain@v1
with:
profile: minimal
toolchain: ${{ env.rust-toolchain }}
components: rust-src, clippy, rustfmt
- name: Install gcc multilib
run: sudo apt update && sudo apt install -y gcc-multilib
- name: Clippy for the default target
run: make clippy
run: make clippy
- name: Clippy for x86_64
run: make clippy ARCH=x86_64
- name: Clippy for riscv64
Expand All @@ -37,6 +41,8 @@ jobs:
arch: [x86_64, riscv64, aarch64]
steps:
- uses: actions/checkout@v3
with:
submodules: recursive
- uses: actions-rs/toolchain@v1
with:
profile: minimal
Expand All @@ -47,6 +53,8 @@ jobs:
crate: cargo-binutils
version: latest
use-tool-cache: true
- name: Install gcc multilib
run: sudo apt update && sudo apt install -y gcc-multilib
# musl toolchain is also needed in non-musl apps
# because we need to build opensbi under riscv64
- uses: ./.github/workflows/actions/setup-musl
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,14 @@ jobs:
default-branch: ${{ format('refs/heads/{0}', github.event.repository.default_branch) }}
steps:
- uses: actions/checkout@v3
with:
submodules: recursive
- uses: actions-rs/toolchain@v1
with:
profile: minimal
toolchain: ${{ env.rust-toolchain }}
- name: Install gcc multilib
run: sudo apt update && sudo apt install -y gcc-multilib
- name: Build docs
continue-on-error: ${{ github.ref != env.default-branch && github.event_name != 'pull_request' }}
run: make doc_check_missing
10 changes: 8 additions & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,13 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
with:
submodules: recursive
- uses: actions-rs/toolchain@v1
with:
profile: minimal
toolchain: ${{ env.rust-toolchain }}
components: rust-src
components: rust-src, llvm-tools-preview
- name: Run unit tests
run: make unittest_no_fail_fast

Expand All @@ -28,16 +30,20 @@ jobs:
arch: [x86_64, riscv64, aarch64]
steps:
- uses: actions/checkout@v3
with:
submodules: recursive
- uses: actions-rs/toolchain@v1
with:
profile: minimal
toolchain: ${{ env.rust-toolchain }}
components: rust-src
components: rust-src, llvm-tools-preview
- uses: actions-rs/[email protected]
with:
crate: cargo-binutils
version: latest
use-tool-cache: true
- name: Install gcc multilib
run: sudo apt update && sudo apt install -y gcc-multilib
- uses: ./.github/workflows/actions/setup-qemu
with:
qemu-version: ${{ env.qemu-version }}
Expand Down
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
[submodule "patches/opensbi"]
path = patches/opensbi
url = https://github.com/Sssssaltyfish/opensbi.git
[submodule "crates/lwip_rust/depend/lwip"]
path = crates/lwip_rust/depend/lwip
url = https://github.com/lwip-tcpip/lwip.git
137 changes: 110 additions & 27 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ members = [
"crates/flatten_objects",
"crates/lazy_init",
"crates/linked_list",
"crates/lwip_rust",
"crates/page_table",
"crates/page_table_entry",
"crates/percpu",
Expand All @@ -37,7 +38,7 @@ members = [

"modules/axalloc",
"modules/axlog",
"modules/axnet",
"modules/ruxnet",
"modules/axsync",
"modules/rux9p",
"modules/ruxconfig",
Expand Down
Loading

0 comments on commit 24fa3dd

Please sign in to comment.