summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuel Thibault <samuel.thibault@ens-lyon.org>2023-05-28 23:39:54 +0200
committerDamien Zammit <damien@zamaudio.com>2023-06-24 00:00:20 +1000
commit81043d42fabda9baed7ac9ca36e3f3f5ed11ba81 (patch)
tree1c0d7007bd2d15876975447e76010dac66bfa513
parent5ee66d6377648ea269f472bb7f1f7c44d888628d (diff)
debian/patches/ata-rump.diff: Add wd[4-7] devices
-rw-r--r--debian/changelog3
-rw-r--r--debian/patches/ata-rump.diff18
2 files changed, 20 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index a037c38f..c857f447 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,9 @@ rumpkernel (0~20211031-4) UNRELEASED; urgency=medium
* debian/patches/non-fhs-shell: Cater for non-FHS shell.
* debian/patches/acpi: Cater for cross-mig.
+ [ Samuel Thibault ]
+ * debian/patches/ata-rump.diff: Add wd[4-7] devices.
+
-- Samuel Thibault <sthibault@debian.org> Tue, 16 May 2023 13:55:58 +0200
rumpkernel (0~20211031-3) unreleased; urgency=medium
diff --git a/debian/patches/ata-rump.diff b/debian/patches/ata-rump.diff
index 2dfa5740..f525a181 100644
--- a/debian/patches/ata-rump.diff
+++ b/debian/patches/ata-rump.diff
@@ -61,7 +61,7 @@ Index: rumpkernel/buildrump.sh/src/sys/rump/dev/lib/libata/ata_component.c
===================================================================
--- /dev/null
+++ rumpkernel/buildrump.sh/src/sys/rump/dev/lib/libata/ata_component.c
-@@ -0,0 +1,51 @@
+@@ -0,0 +1,67 @@
+#include <sys/param.h>
+#include <sys/conf.h>
+#include <sys/device.h>
@@ -103,6 +103,22 @@ Index: rumpkernel/buildrump.sh/src/sys/rump/dev/lib/libata/ata_component.c
+ bmaj, 24, 4));
+ FLAWLESSCALL(rump_vfs_makedevnodes(S_IFCHR, "/dev/rwd3", 'a',
+ cmaj, 24, 4));
++ FLAWLESSCALL(rump_vfs_makedevnodes(S_IFBLK, "/dev/wd4", 'a',
++ bmaj, 32, 4));
++ FLAWLESSCALL(rump_vfs_makedevnodes(S_IFCHR, "/dev/rwd4", 'a',
++ cmaj, 32, 4));
++ FLAWLESSCALL(rump_vfs_makedevnodes(S_IFBLK, "/dev/wd5", 'a',
++ bmaj, 40, 4));
++ FLAWLESSCALL(rump_vfs_makedevnodes(S_IFCHR, "/dev/rwd5", 'a',
++ cmaj, 40, 4));
++ FLAWLESSCALL(rump_vfs_makedevnodes(S_IFBLK, "/dev/wd6", 'a',
++ bmaj, 48, 4));
++ FLAWLESSCALL(rump_vfs_makedevnodes(S_IFCHR, "/dev/rwd6", 'a',
++ cmaj, 48, 4));
++ FLAWLESSCALL(rump_vfs_makedevnodes(S_IFBLK, "/dev/wd7", 'a',
++ bmaj, 56, 4));
++ FLAWLESSCALL(rump_vfs_makedevnodes(S_IFCHR, "/dev/rwd7", 'a',
++ cmaj, 56, 4));
+/* Borked
+ bmaj = cmaj = -1;
+ FLAWLESSCALL(devsw_attach("cd", &cd_bdevsw, &bmaj, &cd_cdevsw, &cmaj));