浏览代码

Merge pull request #214 from rust-osdev/dev

release
Philipp Schuster 11 月之前
父节点
当前提交
3077c3b607
共有 6 个文件被更改,包括 18 次插入25 次删除
  1. 2 2
      Cargo.lock
  2. 9 20
      integration-test/bins/Cargo.lock
  3. 2 2
      multiboot2-header/Cargo.toml
  4. 2 0
      multiboot2-header/Changelog.md
  5. 1 1
      multiboot2/Cargo.toml
  6. 2 0
      multiboot2/Changelog.md

+ 2 - 2
Cargo.lock

@@ -27,7 +27,7 @@ checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c"
 
 [[package]]
 name = "multiboot2"
-version = "0.19.0"
+version = "0.20.0"
 dependencies = [
  "bitflags",
  "derive_more",
@@ -38,7 +38,7 @@ dependencies = [
 
 [[package]]
 name = "multiboot2-header"
-version = "0.3.2"
+version = "0.4.0"
 dependencies = [
  "derive_more",
  "multiboot2",

+ 9 - 20
integration-test/bins/Cargo.lock

@@ -96,34 +96,34 @@ dependencies = [
 
 [[package]]
 name = "multiboot2"
-version = "0.19.0"
+version = "0.20.0"
 dependencies = [
  "bitflags 2.5.0",
  "derive_more",
  "log",
  "ptr_meta",
- "uefi-raw 0.5.2",
+ "uefi-raw",
 ]
 
 [[package]]
 name = "multiboot2"
-version = "0.19.0"
+version = "0.20.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be7a13d71fc2f7747af3ce60e5eccb638acd687b3a580d0bd579c6d0f7b9d010"
+checksum = "3d67e1b461b49127f2226c78a2b4090f72212c44fa27342bcfef93dd39bd6b86"
 dependencies = [
  "bitflags 2.5.0",
  "derive_more",
  "log",
  "ptr_meta",
- "uefi-raw 0.3.0",
+ "uefi-raw",
 ]
 
 [[package]]
 name = "multiboot2-header"
-version = "0.3.2"
+version = "0.4.0"
 dependencies = [
  "derive_more",
- "multiboot2 0.19.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "multiboot2 0.20.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -135,7 +135,7 @@ dependencies = [
  "good_memory_allocator",
  "log",
  "multiboot",
- "multiboot2 0.19.0",
+ "multiboot2 0.20.0",
  "multiboot2-header",
  "util",
 ]
@@ -147,7 +147,7 @@ dependencies = [
  "anyhow",
  "good_memory_allocator",
  "log",
- "multiboot2 0.19.0",
+ "multiboot2 0.20.0",
  "util",
  "x86",
 ]
@@ -246,17 +246,6 @@ dependencies = [
  "unicode-ident",
 ]
 
-[[package]]
-name = "uefi-raw"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62642516099c6441a5f41b0da8486d5fc3515a0603b0fdaea67b31600e22082e"
-dependencies = [
- "bitflags 2.5.0",
- "ptr_meta",
- "uguid",
-]
-
 [[package]]
 name = "uefi-raw"
 version = "0.5.2"

+ 2 - 2
multiboot2-header/Cargo.toml

@@ -4,7 +4,7 @@ description = """
 Library with type definitions and parsing functions for Multiboot2 headers.
 This library is `no_std` and can be used in bootloaders.
 """
-version = "0.3.2"
+version = "0.4.0"
 authors = [
     "Philipp Schuster <phip1611@gmail.com>"
 ]
@@ -41,7 +41,7 @@ unstable = []
 
 [dependencies]
 derive_more.workspace = true
-multiboot2 = { version = "0.19.0", default-features = false }
+multiboot2 = { version = "0.20.0", default-features = false }
 
 [package.metadata.docs.rs]
 all-features = true

+ 2 - 0
multiboot2-header/Changelog.md

@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 0.4.0 (2024-05-01)
+
 - added `EndHeaderTag::default()`
 - MSRV is 1.70
 - Can add multiple `TagType::Smbios` tags in the builder.

+ 1 - 1
multiboot2/Cargo.toml

@@ -6,7 +6,7 @@ Multiboot2-compliant bootloaders, such as GRUB. It supports all tags from the
 specification including full support for the sections of ELF files. This library
 is `no_std` and can be used in a Multiboot2-kernel.
 """
-version = "0.19.0"
+version = "0.20.0"
 authors = [
     "Philipp Oppermann <dev@phil-opp.com>",
     "Calvin Lee <cyrus296@gmail.com>",

+ 2 - 0
multiboot2/Changelog.md

@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 0.20.0 (2024-05-01)
+
 - added `InformationBuilder::default()`
 - MSRV is 1.70