From 2d3755be1b16d62db8d68249ee7bf57bed8ca7b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Kr=C3=B6ning?= Date: Tue, 17 Sep 2024 11:40:44 +0200 Subject: [PATCH 1/3] chore(build.rs): sort features MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Martin Kröning --- hermit/build.rs | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/hermit/build.rs b/hermit/build.rs index f650a14f2..b4d29bfa5 100644 --- a/hermit/build.rs +++ b/hermit/build.rs @@ -96,20 +96,20 @@ impl KernelSrc { [ "acpi", "dhcpv4", + "dns", + "fs", "fsgsbase", + "idle-poll", + "mmap", "pci", "pci-ids", + "rtl8139", + "shell", "smp", "tcp", - "udp", "trace", + "udp", "vga", - "rtl8139", - "fs", - "shell", - "dns", - "mmap", - "idle-poll", "vsock", ] .into_iter(), From 4cfb3974d37f4cac6aaded20cdf74ec0aa24022f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Kr=C3=B6ning?= Date: Tue, 17 Sep 2024 11:46:24 +0200 Subject: [PATCH 2/3] chore(Cargo.toml): sort features MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Martin Kröning --- hermit/Cargo.toml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/hermit/Cargo.toml b/hermit/Cargo.toml index 221e399ed..9d5a6df89 100644 --- a/hermit/Cargo.toml +++ b/hermit/Cargo.toml @@ -29,12 +29,15 @@ default = [ acpi = [] dhcpv4 = [] +dns = [] fs = [] fsgsbase = [] +idle-poll = [] # Build the kernel with function instrument code for mcount-based tracing instrument = [] +mmap = [] pci = [] pci-ids = ["pci"] @@ -44,15 +47,12 @@ randomize-layout = [] # if this feature isn't set, the Virtio interface will be used rtl8139 = ["pci"] +shell = [] smp = [] tcp = [] -udp = [] -dns = [] trace = [] +udp = [] vga = [] -shell = [] -idle-poll = [] -mmap = [] vsock = [] [build-dependencies] From 7933f2bbd62d8836555eee32cd627e8a88344120 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Kr=C3=B6ning?= Date: Tue, 17 Sep 2024 11:46:56 +0200 Subject: [PATCH 3/3] feat: add strace feature MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Martin Kröning --- hermit/Cargo.toml | 1 + hermit/build.rs | 1 + 2 files changed, 2 insertions(+) diff --git a/hermit/Cargo.toml b/hermit/Cargo.toml index 9d5a6df89..383a3d26a 100644 --- a/hermit/Cargo.toml +++ b/hermit/Cargo.toml @@ -49,6 +49,7 @@ rtl8139 = ["pci"] shell = [] smp = [] +strace = [] tcp = [] trace = [] udp = [] diff --git a/hermit/build.rs b/hermit/build.rs index b4d29bfa5..6a028ee28 100644 --- a/hermit/build.rs +++ b/hermit/build.rs @@ -106,6 +106,7 @@ impl KernelSrc { "rtl8139", "shell", "smp", + "strace", "tcp", "trace", "udp",