diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2020-11-16 00:20:42 +0000 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2020-11-16 00:50:11 +0000 |
| commit | 780235e5613f9d91f835db4f379a3c0179f25e2d (patch) | |
| tree | 7846e251263de270ff3002b297093a666ba9b0b3 | |
| parent | 7d9d075fd4003931442fe296ada6efde5abfd4ed (diff) | |
patches/{ahcisata,piixide}-rump.diff: Extend to 4 devices
| -rw-r--r-- | debian/changelog | 6 | ||||
| -rw-r--r-- | debian/patches/ahcisata-rump.diff | 14 | ||||
| -rw-r--r-- | debian/patches/piixide-rump.diff | 14 |
3 files changed, 32 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog index d79283aaa..a1c1341e8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +rumpkernel (0~20191130-3) UNRELEASED; urgency=medium + + * patches/{ahcisata,piixide}-rump.diff: Extend to 4 devices. + + -- Samuel Thibault <sthibault@debian.org> Mon, 16 Nov 2020 00:19:55 +0000 + rumpkernel (0~20191130-2) unreleased; urgency=medium [ Damien Zammit ] diff --git a/debian/patches/ahcisata-rump.diff b/debian/patches/ahcisata-rump.diff index 437443cd7..a3e000e85 100644 --- a/debian/patches/ahcisata-rump.diff +++ b/debian/patches/ahcisata-rump.diff @@ -80,7 +80,7 @@ new file mode 100644 index 00000000..0cc9f481 --- /dev/null +++ b/buildrump.sh/src/sys/rump/dev/lib/libpci_ahcisata/ahcisata_component.c -@@ -0,0 +1,28 @@ +@@ -0,0 +1,40 @@ +#include <sys/param.h> +#include <sys/conf.h> +#include <sys/device.h> @@ -108,6 +108,18 @@ index 00000000..0cc9f481 + bmaj, 0, 8)); + FLAWLESSCALL(rump_vfs_makedevnodes(S_IFCHR, "/dev/rwd0", 'a', + cmaj, 0, 8)); ++ FLAWLESSCALL(rump_vfs_makedevnodes(S_IFBLK, "/dev/wd1", 'a', ++ bmaj, 1, 8)); ++ FLAWLESSCALL(rump_vfs_makedevnodes(S_IFCHR, "/dev/rwd1", 'a', ++ cmaj, 1, 8)); ++ FLAWLESSCALL(rump_vfs_makedevnodes(S_IFBLK, "/dev/wd2", 'a', ++ bmaj, 2, 8)); ++ FLAWLESSCALL(rump_vfs_makedevnodes(S_IFCHR, "/dev/rwd2", 'a', ++ cmaj, 2, 8)); ++ FLAWLESSCALL(rump_vfs_makedevnodes(S_IFBLK, "/dev/wd3", 'a', ++ bmaj, 3, 8)); ++ FLAWLESSCALL(rump_vfs_makedevnodes(S_IFCHR, "/dev/rwd3", 'a', ++ cmaj, 3, 8)); +} diff --git a/buildrump.sh/src/sys/rump/dev/lib/libpci_ahcisata/ataraid.h b/buildrump.sh/src/sys/rump/dev/lib/libpci_ahcisata/ataraid.h new file mode 100644 diff --git a/debian/patches/piixide-rump.diff b/debian/patches/piixide-rump.diff index 13d14f59b..f0d30a3bd 100644 --- a/debian/patches/piixide-rump.diff +++ b/debian/patches/piixide-rump.diff @@ -88,7 +88,7 @@ new file mode 100644 index 00000000..fde63636 --- /dev/null +++ b/buildrump.sh/src/sys/rump/dev/lib/libpci_piixide/piixide_component.c -@@ -0,0 +1,37 @@ +@@ -0,0 +1,49 @@ +#include <sys/param.h> +#include <sys/conf.h> +#include <sys/device.h> @@ -116,6 +116,18 @@ index 00000000..fde63636 + bmaj, 0, 4)); + FLAWLESSCALL(rump_vfs_makedevnodes(S_IFCHR, "/dev/rwd0", 'a', + cmaj, 0, 4)); ++ FLAWLESSCALL(rump_vfs_makedevnodes(S_IFBLK, "/dev/wd1", 'a', ++ bmaj, 1, 4)); ++ FLAWLESSCALL(rump_vfs_makedevnodes(S_IFCHR, "/dev/rwd1", 'a', ++ cmaj, 1, 4)); ++ FLAWLESSCALL(rump_vfs_makedevnodes(S_IFBLK, "/dev/wd2", 'a', ++ bmaj, 2, 4)); ++ FLAWLESSCALL(rump_vfs_makedevnodes(S_IFCHR, "/dev/rwd2", 'a', ++ cmaj, 2, 4)); ++ FLAWLESSCALL(rump_vfs_makedevnodes(S_IFBLK, "/dev/wd3", 'a', ++ bmaj, 3, 4)); ++ FLAWLESSCALL(rump_vfs_makedevnodes(S_IFCHR, "/dev/rwd3", 'a', ++ cmaj, 3, 4)); +/* Borked + bmaj = cmaj = -1; + FLAWLESSCALL(devsw_attach("cd", &cd_bdevsw, &bmaj, &cd_cdevsw, &cmaj)); |