From ad838365fd4803c3703df8e73ccb0b6696fe2b04 Mon Sep 17 00:00:00 2001 From: Philipp Oppermann Date: Wed, 10 Mar 2021 09:19:51 +0100 Subject: [PATCH 01/20] Ci: Don't fail fast --- .github/workflows/build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index fbad28e..27c2a86 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -15,6 +15,7 @@ jobs: name: "Test" strategy: + fail-fast: false matrix: platform: [ ubuntu-latest, From 9ade8cec32067d952f54fa10e2c76a6fc00e09b6 Mon Sep 17 00:00:00 2001 From: Philipp Oppermann Date: Wed, 10 Mar 2021 09:20:39 +0100 Subject: [PATCH 02/20] Run cargo update for bootloader crate --- example-kernels/Cargo.lock | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/example-kernels/Cargo.lock b/example-kernels/Cargo.lock index 72a963b..ed82a74 100644 --- a/example-kernels/Cargo.lock +++ b/example-kernels/Cargo.lock @@ -1,5 +1,7 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. +version = 3 + [[package]] name = "basic" version = "0.1.0" @@ -22,9 +24,9 @@ checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" [[package]] name = "bootloader" -version = "0.9.12" +version = "0.9.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "452bbab4eae8767805ff09386c9e26d42ceb6964916ab3c64425469342473f91" +checksum = "8cb1dc91ba8f16c89133c569bc2516833a632a654d61d228b16ae8d2bad5ed8a" [[package]] name = "rlibc" From 5eea7088149c1f7c6eaa7edb5781dfd66bd89468 Mon Sep 17 00:00:00 2001 From: Philipp Oppermann Date: Thu, 1 Apr 2021 10:31:41 +0200 Subject: [PATCH 03/20] Fix "unnecessary trailing semicolon" warning on Rust 1.51 --- Changelog.md | 2 ++ src/args/build.rs | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Changelog.md b/Changelog.md index 28662b1..0cdb7f2 100644 --- a/Changelog.md +++ b/Changelog.md @@ -1,5 +1,7 @@ # Unreleased +- Fix "unnnecessary trailing semicolon" warning on Rust 1.51 + # 0.10.2 – 2020-12-10 - Fix nightly breakage of doctests in workspaces ([#69](https://github.com/rust-osdev/bootimage/pull/69)) diff --git a/src/args/build.rs b/src/args/build.rs index 02fe739..c3d18a9 100644 --- a/src/args/build.rs +++ b/src/args/build.rs @@ -30,7 +30,7 @@ impl BuildCommand { return Err(anyhow!("multiple arguments of same type provided")); } Ok(()) - }; + } let mut arg_iter = args; while let Some(arg) = arg_iter.next() { From 5139e867e0e8a0b4b6ba15b97e2998f6395d950e Mon Sep 17 00:00:00 2001 From: Philipp Oppermann Date: Thu, 1 Apr 2021 10:32:10 +0200 Subject: [PATCH 04/20] Release version 0.10.3 --- Cargo.lock | 2 +- Cargo.toml | 2 +- Changelog.md | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 73f2cca..ec54604 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -8,7 +8,7 @@ checksum = "6b602bfe940d21c130f3895acd65221e8a61270debe89d628b9cb4e3ccb8569b" [[package]] name = "bootimage" -version = "0.10.2" +version = "0.10.3" dependencies = [ "anyhow", "cargo_metadata", diff --git a/Cargo.toml b/Cargo.toml index 74a655f..f2fbf21 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -3,7 +3,7 @@ authors = ["Philipp Oppermann "] description = "Tool to create a bootable OS image from a kernel binary." license = "MIT/Apache-2.0" name = "bootimage" -version = "0.10.2" +version = "0.10.3" repository = "https://github.com/rust-osdev/bootimage" edition = "2018" diff --git a/Changelog.md b/Changelog.md index 0cdb7f2..63326a4 100644 --- a/Changelog.md +++ b/Changelog.md @@ -1,5 +1,7 @@ # Unreleased +# 0.10.3 – 2021-04-01 + - Fix "unnnecessary trailing semicolon" warning on Rust 1.51 # 0.10.2 – 2020-12-10 From 250346db9573aa2fafddc9e6c6cf4a77908012b7 Mon Sep 17 00:00:00 2001 From: Philipp Oppermann Date: Thu, 6 May 2021 14:30:19 +0200 Subject: [PATCH 05/20] Update `x86_64` to v0.14.1 in example kernels --- example-kernels/Cargo.lock | 11 +++++++++-- example-kernels/basic/Cargo.toml | 2 +- example-kernels/runner-doctest/Cargo.toml | 2 +- example-kernels/runner-fail-reboot/Cargo.toml | 2 +- example-kernels/runner-test/Cargo.toml | 2 +- example-kernels/runner/Cargo.toml | 2 +- 6 files changed, 14 insertions(+), 7 deletions(-) diff --git a/example-kernels/Cargo.lock b/example-kernels/Cargo.lock index ed82a74..c4b8b0d 100644 --- a/example-kernels/Cargo.lock +++ b/example-kernels/Cargo.lock @@ -69,12 +69,19 @@ dependencies = [ "x86_64", ] +[[package]] +name = "volatile" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e4c2dbd44eb8b53973357e6e207e370f0c1059990df850aca1eca8947cf464f0" + [[package]] name = "x86_64" -version = "0.13.2" +version = "0.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b871116e3c83dad0795580b10b2b1dd05cb52ec719af36180371877b09681f7f" +checksum = "e9ce25c8b91769cf3522618360482d4fe8e2abf7056958ae88b1f039d6cf6bc2" dependencies = [ "bit_field", "bitflags", + "volatile", ] diff --git a/example-kernels/basic/Cargo.toml b/example-kernels/basic/Cargo.toml index 00e9825..5a9a509 100644 --- a/example-kernels/basic/Cargo.toml +++ b/example-kernels/basic/Cargo.toml @@ -6,4 +6,4 @@ edition = "2018" [dependencies] bootloader = "0.9.7" -x86_64 = "0.13.2" +x86_64 = "0.14.1" diff --git a/example-kernels/runner-doctest/Cargo.toml b/example-kernels/runner-doctest/Cargo.toml index b04989f..ff240ec 100644 --- a/example-kernels/runner-doctest/Cargo.toml +++ b/example-kernels/runner-doctest/Cargo.toml @@ -6,7 +6,7 @@ edition = "2018" [dependencies] bootloader = "0.9.7" -x86_64 = "0.13.2" +x86_64 = "0.14.1" rlibc = "1.0.0" [package.metadata.bootimage] diff --git a/example-kernels/runner-fail-reboot/Cargo.toml b/example-kernels/runner-fail-reboot/Cargo.toml index 9eeb9cd..c15f396 100644 --- a/example-kernels/runner-fail-reboot/Cargo.toml +++ b/example-kernels/runner-fail-reboot/Cargo.toml @@ -6,7 +6,7 @@ edition = "2018" [dependencies] bootloader = "0.9.7" -x86_64 = "0.13.2" +x86_64 = "0.14.1" rlibc = "1.0.0" [package.metadata.bootimage] diff --git a/example-kernels/runner-test/Cargo.toml b/example-kernels/runner-test/Cargo.toml index 4209b00..83bcb52 100644 --- a/example-kernels/runner-test/Cargo.toml +++ b/example-kernels/runner-test/Cargo.toml @@ -10,7 +10,7 @@ harness = false [dependencies] bootloader = "0.9.7" -x86_64 = "0.13.2" +x86_64 = "0.14.1" rlibc = "1.0.0" [package.metadata.bootimage] diff --git a/example-kernels/runner/Cargo.toml b/example-kernels/runner/Cargo.toml index da7c43c..17d0be9 100644 --- a/example-kernels/runner/Cargo.toml +++ b/example-kernels/runner/Cargo.toml @@ -6,7 +6,7 @@ edition = "2018" [dependencies] bootloader = "0.9.7" -x86_64 = "0.13.2" +x86_64 = "0.14.1" [package.metadata.bootimage] run-args = ["-device", "isa-debug-exit,iobase=0xf4,iosize=0x04", "-display", "none"] From 8f3d6192157a17d9c6078bda9ef49c3b13cb1d1a Mon Sep 17 00:00:00 2001 From: Philipp Oppermann Date: Thu, 6 May 2021 14:39:47 +0200 Subject: [PATCH 06/20] Run cargo update for bootloader crate --- example-kernels/Cargo.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/example-kernels/Cargo.lock b/example-kernels/Cargo.lock index c4b8b0d..f86eaa3 100644 --- a/example-kernels/Cargo.lock +++ b/example-kernels/Cargo.lock @@ -24,9 +24,9 @@ checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" [[package]] name = "bootloader" -version = "0.9.16" +version = "0.9.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cb1dc91ba8f16c89133c569bc2516833a632a654d61d228b16ae8d2bad5ed8a" +checksum = "bfe7a297d22859b1cb0b939cfa0b01288d77804c8544acefd2c1135135587f7d" [[package]] name = "rlibc" From 01d4622a8fff041c9f7efe58e280a6c1c0a7113f Mon Sep 17 00:00:00 2001 From: Paulo Elienay II <48896572+paulo-e@users.noreply.github.com> Date: Sat, 15 May 2021 03:14:18 -0300 Subject: [PATCH 07/20] Updated dependency version Updated `bootloader` dependency version, matching the blog post https://os.phil-opp.com/minimal-rust-kernel/#printing-to-screen --- Readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Readme.md b/Readme.md index 59ee0e3..a569690 100644 --- a/Readme.md +++ b/Readme.md @@ -16,7 +16,7 @@ First you need to add a dependency on the [`bootloader`](https://github.com/rust # in your Cargo.toml [dependencies] -bootloader = "0.6.4" +bootloader = "0.9.8" ``` **Note**: At least bootloader version `0.5.1` is required since `bootimage 0.7.0`. For earlier bootloader versions, use `bootimage 0.6.6`. From ffc53d5d34cfcf0648b5220e9ec61622853fa08a Mon Sep 17 00:00:00 2001 From: Philipp Oppermann Date: Sat, 22 May 2021 15:03:49 +0200 Subject: [PATCH 08/20] Run `cargo update` for bootloader --- example-kernels/Cargo.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/example-kernels/Cargo.lock b/example-kernels/Cargo.lock index f86eaa3..e543632 100644 --- a/example-kernels/Cargo.lock +++ b/example-kernels/Cargo.lock @@ -24,9 +24,9 @@ checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" [[package]] name = "bootloader" -version = "0.9.17" +version = "0.9.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfe7a297d22859b1cb0b939cfa0b01288d77804c8544acefd2c1135135587f7d" +checksum = "7a3c1ceed1cd9e61c7998100cc18c13d413aa40d018992b871ab8e7435ce6372" [[package]] name = "rlibc" From d5900984ee9576882b3b4a40ce29f697f2b9bb7b Mon Sep 17 00:00:00 2001 From: Philipp Oppermann Date: Sun, 22 Aug 2021 14:33:59 +0200 Subject: [PATCH 09/20] CI: Use choco to install QEMU 6.0.0 This should fix our CI build errors. We install a pinned version of QEMU since the latest 6.1 pre-releases appear to have some problems too. --- .github/workflows/build.yml | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 27c2a86..fcf00c2 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -80,14 +80,10 @@ jobs: HOMEBREW_NO_AUTO_UPDATE: 1 HOMEBREW_NO_BOTTLE_SOURCE_FALLBACK: 1 HOMEBREW_NO_INSTALL_CLEANUP: 1 - - name: Install Scoop (Windows) - run: | - Invoke-Expression (New-Object System.Net.WebClient).DownloadString('https://get.scoop.sh') - echo "$HOME\scoop\shims" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append - if: runner.os == 'Windows' - shell: pwsh - name: Install QEMU (Windows) - run: scoop install qemu + run: | + choco install qemu --version 2021.5.5 + echo "$Env:Programfiles\qemu" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append if: runner.os == 'Windows' shell: pwsh From 0f8865d199a267f9bf666ddfd6caaeb004838bef Mon Sep 17 00:00:00 2001 From: Philipp Oppermann Date: Tue, 21 Dec 2021 12:41:20 +0100 Subject: [PATCH 10/20] Run cargo update for bootloader and x86_64 crates --- example-kernels/Cargo.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/example-kernels/Cargo.lock b/example-kernels/Cargo.lock index e543632..bb805a0 100644 --- a/example-kernels/Cargo.lock +++ b/example-kernels/Cargo.lock @@ -12,9 +12,9 @@ dependencies = [ [[package]] name = "bit_field" -version = "0.9.0" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed8765909f9009617974ab6b7d332625b320b33c326b1e9321382ef1999b5d56" +checksum = "dcb6dd1c2376d2e096796e234a70e17e94cc2d5d54ff8ce42b28cef1d0d359a4" [[package]] name = "bitflags" @@ -24,9 +24,9 @@ checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" [[package]] name = "bootloader" -version = "0.9.18" +version = "0.9.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a3c1ceed1cd9e61c7998100cc18c13d413aa40d018992b871ab8e7435ce6372" +checksum = "6b0718f186cd449b21f044683933284ed90fb83f3e13949ff0e03b0b6f02e38e" [[package]] name = "rlibc" @@ -77,9 +77,9 @@ checksum = "e4c2dbd44eb8b53973357e6e207e370f0c1059990df850aca1eca8947cf464f0" [[package]] name = "x86_64" -version = "0.14.1" +version = "0.14.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9ce25c8b91769cf3522618360482d4fe8e2abf7056958ae88b1f039d6cf6bc2" +checksum = "fb611915c917c6296d11e23f71ff1ecfe49c5766daba92cd3df52df6b58285b6" dependencies = [ "bit_field", "bitflags", From dae6e75abfd60dfe66d46a1566840b5595b53b69 Mon Sep 17 00:00:00 2001 From: Philipp Oppermann Date: Tue, 18 Jan 2022 10:09:36 +0100 Subject: [PATCH 11/20] Run cargo update for bootloader crate --- example-kernels/Cargo.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/example-kernels/Cargo.lock b/example-kernels/Cargo.lock index bb805a0..54af36c 100644 --- a/example-kernels/Cargo.lock +++ b/example-kernels/Cargo.lock @@ -24,9 +24,9 @@ checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" [[package]] name = "bootloader" -version = "0.9.20" +version = "0.9.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b0718f186cd449b21f044683933284ed90fb83f3e13949ff0e03b0b6f02e38e" +checksum = "a62c8f6168cd106687ee36a2b71a46c4144d73399f72814104d33094b8092fd2" [[package]] name = "rlibc" From 05ec88494a18b7babcb567629ffdd8d21b67ba6d Mon Sep 17 00:00:00 2001 From: Daniel Vasquez Date: Fri, 22 Jul 2022 20:51:47 -0400 Subject: [PATCH 12/20] Fixed typo --- Readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Readme.md b/Readme.md index a569690..852f25d 100644 --- a/Readme.md +++ b/Readme.md @@ -56,7 +56,7 @@ The `bootimage` has built-in support for running unit and integration tests of y ## Configuration -Configuration is done through a through a `[package.metadata.bootimage]` table in the `Cargo.toml` of your kernel. The following options are available: +Configuration is done through a `[package.metadata.bootimage]` table in the `Cargo.toml` of your kernel. The following options are available: ```toml [package.metadata.bootimage] From 3cd7e17fcf1cd9ce4a7e83e38043c09f4d91d6d6 Mon Sep 17 00:00:00 2001 From: Fractal-Tess Date: Mon, 7 Nov 2022 18:23:23 +0200 Subject: [PATCH 13/20] correct typo --- src/builder/error.rs | 10 +++++----- src/run.rs | 8 ++++---- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/builder/error.rs b/src/builder/error.rs index 5c0cab1..5d091fb 100644 --- a/src/builder/error.rs +++ b/src/builder/error.rs @@ -18,7 +18,7 @@ pub enum BuildKernelError { Io { /// Desciption of the failed I/O operation message: &'static str, - /// The I/O error that occured + /// The I/O error that occurred error: io::Error, }, @@ -49,7 +49,7 @@ pub enum BuildKernelError { #[non_exhaustive] pub enum CreateBootimageError { /// Failed to build the bootloader. - #[error("An error occured while trying to build the bootloader: {0}")] + #[error("An error occurred while trying to build the bootloader: {0}")] Bootloader(#[from] BootloaderError), /// Error while running `cargo metadata` @@ -64,7 +64,7 @@ pub enum CreateBootimageError { }, /// Disk image creation failed - #[error("An error occured while trying to create the disk image: {0}")] + #[error("An error occurred while trying to create the disk image: {0}")] DiskImage(#[from] DiskImageError), /// An unexpected I/O error occurred @@ -72,7 +72,7 @@ pub enum CreateBootimageError { Io { /// Desciption of the failed I/O operation message: &'static str, - /// The I/O error that occured + /// The I/O error that occurred error: io::Error, }, @@ -145,7 +145,7 @@ pub enum DiskImageError { Io { /// Desciption of the failed I/O operation message: &'static str, - /// The I/O error that occured + /// The I/O error that occurred error: io::Error, }, } diff --git a/src/run.rs b/src/run.rs index 562b57d..e77c0f9 100644 --- a/src/run.rs +++ b/src/run.rs @@ -101,17 +101,17 @@ pub enum RunError { #[error("Failed to read QEMU exit code")] NoQemuExitCode, - /// An I/O error occured - #[error("{context}: An I/O error occured: {error}")] + /// An I/O error occurred + #[error("{context}: An I/O error occurred: {error}")] Io { /// The operation that caused the I/O error. context: IoErrorContext, - /// The I/O error that occured. + /// The I/O error that occurred. error: io::Error, }, } -/// An I/O error occured while trying to run the disk image. +/// An I/O error occurred while trying to run the disk image. #[derive(Debug, Error)] pub enum IoErrorContext { /// QEMU command for non-test failed From d954562e99d74e56ea3463d22760f30e3108fdf1 Mon Sep 17 00:00:00 2001 From: Philipp Oppermann Date: Sun, 28 Jan 2024 12:08:47 +0100 Subject: [PATCH 14/20] Update to latest bootloader version --- example-kernels/Cargo.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/example-kernels/Cargo.lock b/example-kernels/Cargo.lock index 54af36c..3939c74 100644 --- a/example-kernels/Cargo.lock +++ b/example-kernels/Cargo.lock @@ -24,9 +24,9 @@ checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" [[package]] name = "bootloader" -version = "0.9.21" +version = "0.9.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a62c8f6168cd106687ee36a2b71a46c4144d73399f72814104d33094b8092fd2" +checksum = "c6f4dd3d0a9b440470ea52afcb5f9f09eeefbe36d1d0c29bae397f493d9fddb1" [[package]] name = "rlibc" From 55a5c4b7cd8d84dd43beb320e8bb937f4d2525b3 Mon Sep 17 00:00:00 2001 From: Philipp Oppermann Date: Sun, 28 Jan 2024 12:15:10 +0100 Subject: [PATCH 15/20] Update data layout in example kernels target --- example-kernels/x86_64-bootimage-example-kernels.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/example-kernels/x86_64-bootimage-example-kernels.json b/example-kernels/x86_64-bootimage-example-kernels.json index 9afe809..bcb4c8b 100644 --- a/example-kernels/x86_64-bootimage-example-kernels.json +++ b/example-kernels/x86_64-bootimage-example-kernels.json @@ -1,6 +1,6 @@ { "llvm-target": "x86_64-unknown-none", - "data-layout": "e-m:e-i64:64-f80:128-n8:16:32:64-S128", + "data-layout": "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128", "arch": "x86_64", "target-endian": "little", "target-pointer-width": "64", From f9640f7f4a62cc577b60f58dfb00c975d86cf4af Mon Sep 17 00:00:00 2001 From: Philipp Oppermann Date: Tue, 27 Feb 2024 07:30:28 +0100 Subject: [PATCH 16/20] Fix data layout for example kernel target --- example-kernels/x86_64-bootimage-example-kernels.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/example-kernels/x86_64-bootimage-example-kernels.json b/example-kernels/x86_64-bootimage-example-kernels.json index bcb4c8b..7a0cd61 100644 --- a/example-kernels/x86_64-bootimage-example-kernels.json +++ b/example-kernels/x86_64-bootimage-example-kernels.json @@ -1,6 +1,6 @@ { "llvm-target": "x86_64-unknown-none", - "data-layout": "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128", + "data-layout": "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-i128:128-f80:128-n8:16:32:64-S128", "arch": "x86_64", "target-endian": "little", "target-pointer-width": "64", From bbb65dad77a17a76970bf1dfad6c45821b86d51f Mon Sep 17 00:00:00 2001 From: Philipp Oppermann Date: Tue, 27 Feb 2024 07:31:23 +0100 Subject: [PATCH 17/20] Update bootloader version to v0.9.27 in Cargo.lock --- example-kernels/Cargo.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/example-kernels/Cargo.lock b/example-kernels/Cargo.lock index 3939c74..96f1c0e 100644 --- a/example-kernels/Cargo.lock +++ b/example-kernels/Cargo.lock @@ -24,9 +24,9 @@ checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" [[package]] name = "bootloader" -version = "0.9.24" +version = "0.9.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6f4dd3d0a9b440470ea52afcb5f9f09eeefbe36d1d0c29bae397f493d9fddb1" +checksum = "ca7c184781ceb5660872f833fc6bd64ec9ae2500f8c65354705af541e4c28f7f" [[package]] name = "rlibc" From 0cce3336bb63c39b7a7cabd64987be66a05f5407 Mon Sep 17 00:00:00 2001 From: Philipp Oppermann Date: Mon, 10 Feb 2025 11:03:50 +0100 Subject: [PATCH 18/20] Run cargo update for bootloader crate --- example-kernels/Cargo.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/example-kernels/Cargo.lock b/example-kernels/Cargo.lock index 96f1c0e..0dd87bc 100644 --- a/example-kernels/Cargo.lock +++ b/example-kernels/Cargo.lock @@ -1,6 +1,6 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. -version = 3 +version = 4 [[package]] name = "basic" @@ -24,9 +24,9 @@ checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" [[package]] name = "bootloader" -version = "0.9.27" +version = "0.9.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca7c184781ceb5660872f833fc6bd64ec9ae2500f8c65354705af541e4c28f7f" +checksum = "8a9c8b93781debeb5bc44a12adc4be812aa9feb659d60eeafcd7e9bedb549561" [[package]] name = "rlibc" From d3428c33627ef1e0aaeba0adc546c3e50c506a2d Mon Sep 17 00:00:00 2001 From: Philipp Oppermann Date: Mon, 10 Feb 2025 12:31:11 +0100 Subject: [PATCH 19/20] Fix target spec JSON for example kernel by adding `rustc-abi` field --- example-kernels/x86_64-bootimage-example-kernels.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/example-kernels/x86_64-bootimage-example-kernels.json b/example-kernels/x86_64-bootimage-example-kernels.json index 7a0cd61..6f5613c 100644 --- a/example-kernels/x86_64-bootimage-example-kernels.json +++ b/example-kernels/x86_64-bootimage-example-kernels.json @@ -11,5 +11,6 @@ "linker": "rust-lld", "panic-strategy": "abort", "disable-redzone": true, - "features": "-mmx,-sse,+soft-float" + "features": "-mmx,-sse,+soft-float", + "rustc-abi": "x86-softfloat" } From ed0150fdec56d194db3925beed4153c82b8bf10d Mon Sep 17 00:00:00 2001 From: Philipp Oppermann Date: Mon, 24 Mar 2025 11:10:32 +0100 Subject: [PATCH 20/20] Delete Cargo.lock for example kernels Ensure that we always use the latest bootloader version. --- example-kernels/Cargo.lock | 87 -------------------------------------- 1 file changed, 87 deletions(-) delete mode 100644 example-kernels/Cargo.lock diff --git a/example-kernels/Cargo.lock b/example-kernels/Cargo.lock deleted file mode 100644 index 0dd87bc..0000000 --- a/example-kernels/Cargo.lock +++ /dev/null @@ -1,87 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 4 - -[[package]] -name = "basic" -version = "0.1.0" -dependencies = [ - "bootloader", - "x86_64", -] - -[[package]] -name = "bit_field" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcb6dd1c2376d2e096796e234a70e17e94cc2d5d54ff8ce42b28cef1d0d359a4" - -[[package]] -name = "bitflags" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" - -[[package]] -name = "bootloader" -version = "0.9.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a9c8b93781debeb5bc44a12adc4be812aa9feb659d60eeafcd7e9bedb549561" - -[[package]] -name = "rlibc" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc874b127765f014d792f16763a81245ab80500e2ad921ed4ee9e82481ee08fe" - -[[package]] -name = "runner" -version = "0.1.0" -dependencies = [ - "bootloader", - "x86_64", -] - -[[package]] -name = "runner-doctest" -version = "0.1.0" -dependencies = [ - "bootloader", - "rlibc", - "x86_64", -] - -[[package]] -name = "runner-fail-reboot" -version = "0.1.0" -dependencies = [ - "bootloader", - "rlibc", - "x86_64", -] - -[[package]] -name = "runner-test" -version = "0.1.0" -dependencies = [ - "bootloader", - "rlibc", - "x86_64", -] - -[[package]] -name = "volatile" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4c2dbd44eb8b53973357e6e207e370f0c1059990df850aca1eca8947cf464f0" - -[[package]] -name = "x86_64" -version = "0.14.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb611915c917c6296d11e23f71ff1ecfe49c5766daba92cd3df52df6b58285b6" -dependencies = [ - "bit_field", - "bitflags", - "volatile", -]