JohnyTheCarrot/ableos
1
0
Fork 0
forked from AbleOS/ableos
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge branch 'master' of ssh://git.ablecorp.us:20/able/ableos

Browse source 
merge conflict
This commit is contained in:
Able 2022-01-26 19:43:40 -06:00
parent 5cba768e85 7b1401f10d
commit 03a30e5109
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
README.md
View file

@ -21,6 +21,6 @@ repbuild can be used to run and build docs for able os
## Testing on real hardware ## Testing on real hardware
I recommend using an old x86_64 computer I recommend using an old x86_64 computer
* `cargo run --release` to generate a binary image that is bootable * `cargo run --release` to generate a binary image that is bootable
* flash it to a USB device via `dd` or belenaEtcher * flash it to a USB device via `dd` or balenaEtcher
* Remove said USB device and plug into test machine * Remove said USB device and plug into test machine
* assure test machine boots from USB devices * assure test machine boots from USB devices

2
ableos/Cargo.lock generated
View file

@ -168,7 +168,7 @@ checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650"
[[package]] [[package]]
name = "externc-libm" name = "externc-libm"
version = "0.1.0" version = "0.1.0"
source = "git+ssh://root@git.ablecorp.us:20/able/externc-libm.git#0781df85c094bcd7e5ef7505e9c5cc6317eeda75" source = "git+https://git.ablecorp.us/able/externc-libm.git#0781df85c094bcd7e5ef7505e9c5cc6317eeda75"
dependencies = [ dependencies = [
"libm", "libm",
] ]

2
ableos/Cargo.toml
View file

@ -96,7 +96,7 @@ features = ["spin_no_std"]
version = "1.0" version = "1.0"
[dependencies.externc-libm] [dependencies.externc-libm]
git = "ssh://root@git.ablecorp.us:20/able/externc-libm.git" git = "https://git.ablecorp.us:443/able/externc-libm.git"
[target.'cfg(target_arch = "x86_64")'.dependencies] [target.'cfg(target_arch = "x86_64")'.dependencies]
bootloader = { version = "0.9.8", features = ["map_physical_memory"] } bootloader = { version = "0.9.8", features = ["map_physical_memory"] }