Skip to content

Commit

Permalink
Merge pull request #297 from hermit-os/rm-nasm
Browse files Browse the repository at this point in the history
feat: remove NASM
  • Loading branch information
stlankes authored Feb 9, 2024
2 parents af1768f + 73d7287 commit 2f3dc89
Show file tree
Hide file tree
Showing 10 changed files with 399 additions and 449 deletions.
16 changes: 5 additions & 11 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,6 @@ jobs:
name: Clippy
runs-on: ubuntu-latest
steps:
- name: Install NASM
run: |
sudo apt-get update
sudo apt-get install nasm
- uses: actions/checkout@v4
- name: Install Rust toolchain
uses: dtolnay/rust-toolchain@stable
Expand Down Expand Up @@ -54,23 +50,21 @@ jobs:
os: windows-latest
runs-on: ${{ matrix.os }}
steps:
- name: Install QEMU, NASM (ubuntu)
- name: Install QEMU (ubuntu)
if: matrix.os == 'ubuntu-latest'
run: |
sudo apt-get update
sudo apt-get install qemu-system-x86 qemu-system-arm qemu-system-misc ovmf nasm
- name: Install QEMU, NASM (macos)
sudo apt-get install qemu-system-x86 qemu-system-arm qemu-system-misc ovmf
- name: Install QEMU (macos)
if: matrix.os == 'macos-latest'
run: |
brew update
brew install qemu nasm
- name: Install QEMU, NASM (windows)
brew install qemu
- name: Install QEMU (windows)
if: matrix.os == 'windows-latest'
run: |
choco install qemu
echo "C:\Program Files\qemu" >> $GITHUB_PATH
choco install nasm
echo "C:\Program Files\NASM" >> $GITHUB_PATH
- uses: actions/checkout@v4
with:
lfs: true
Expand Down
17 changes: 0 additions & 17 deletions Cargo.lock

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

4 changes: 0 additions & 4 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,6 @@ riscv = "0.11"
sbi = "0.2"
sptr = "0.3"

[build-dependencies]
cc = "1.0"
nasm-rs = "0.2"

[profile.release]
strip = "debuginfo"
lto = true
Expand Down
1 change: 0 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ This project is a loader to run the [Hermit kernel](https://github.com/hermitcor
## Requirements

* [`rustup`](https://www.rust-lang.org/tools/install)
* [NASM](https://nasm.us/) (only for x86_64)

## Building

Expand Down
29 changes: 0 additions & 29 deletions build.rs

This file was deleted.

223 changes: 0 additions & 223 deletions src/arch/x86_64/entry.asm

This file was deleted.

Loading

0 comments on commit 2f3dc89

Please sign in to comment.