patches/ata-rump.diff: Fix computing the devnumber

according to i386/amd64

2 files changed, 52 insertions, 75 deletions

diff --git a/debian/changelog b/debian/changelog
index 06f9d36a..389be70c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,9 @@
-rumpkernel (0~20211031+repack-2) UNRELEASED; urgency=medium
+rumpkernel (0~20211031+repack-2) unreleased; urgency=medium
 
   * rules: Fix make clean. set MKDTRACE and MKZFS to no to avoid cross-build
     failure.
+  * patches/ata-rump.diff: Fix computing the devnumber according to
+    i386/amd64.
 
  -- Samuel Thibault <sthibault@debian.org>  Sun, 09 Jul 2023 13:45:32 +0200
 
diff --git a/debian/patches/ata-rump.diff b/debian/patches/ata-rump.diff
index f525a181..8301932e 100644
--- a/debian/patches/ata-rump.diff
+++ b/debian/patches/ata-rump.diff
@@ -1,7 +1,19 @@
-Index: rumpkernel/buildrump.sh/src/sys/rump/dev/lib/libata/ATA.ioconf
-===================================================================
+---
+ buildrump.sh/src/sys/rump/dev/Makefile.rumpdevcomp       |    2 
+ buildrump.sh/src/sys/rump/dev/lib/libata/ATA.ioconf      |   29 +++
+ buildrump.sh/src/sys/rump/dev/lib/libata/Makefile        |   20 ++
+ buildrump.sh/src/sys/rump/dev/lib/libata/ata_component.c |   50 ++++++
+ buildrump.sh/src/sys/rump/dev/lib/libata/ataraid.h       |    1 
+ buildrump.sh/src/sys/rump/dev/lib/libata/locators.h      |  119 +++++++++++++++
+ buildrump.sh/src/sys/rump/dev/lib/libata/opt_ata.h       |    1 
+ buildrump.sh/src/sys/rump/dev/lib/libata/opt_wd.h        |    1 
+ buildrump.sh/src/sys/rump/dev/lib/libata/opt_wdc.h       |    3 
+ buildrump.sh/src/sys/rump/dev/lib/libata/sata.h          |    1 
+ buildrump.sh/src/sys/rump/dev/lib/libata/sata_pmp.h      |    1 
+ 11 files changed, 227 insertions(+), 1 deletion(-)
+
 --- /dev/null
-+++ rumpkernel/buildrump.sh/src/sys/rump/dev/lib/libata/ATA.ioconf
++++ b/buildrump.sh/src/sys/rump/dev/lib/libata/ATA.ioconf
 @@ -0,0 +1,29 @@
 +ioconf ata
 +
@@ -25,17 +37,15 @@ Index: rumpkernel/buildrump.sh/src/sys/rump/dev/lib/libata/ATA.ioconf
 +
 +# ATAPI devices
 +# flags have the same meanig as for IDE drives.
-+atapibus*	at atapi? channel? 
-+atapibus*	at ahcisata? channel? 
-+atapibus*	at piixide? channel? 
++atapibus*	at atapi? channel?
++atapibus*	at ahcisata? channel?
++atapibus*	at piixide? channel?
 +cd*		at atapibus? drive ? flags 0x0000  #ATAPI CD-ROM drives
 +sd*		at atapibus? drive ? flags 0x0000  #ATAPI disk drives
 +st*		at atapibus? drive ? flags 0x0000  #ATAPI tape drives
 +uk*		at atapibus? drive ? flags 0x0000  #ATAPI unkown
-Index: rumpkernel/buildrump.sh/src/sys/rump/dev/lib/libata/Makefile
-===================================================================
 --- /dev/null
-+++ rumpkernel/buildrump.sh/src/sys/rump/dev/lib/libata/Makefile
++++ b/buildrump.sh/src/sys/rump/dev/lib/libata/Makefile
 @@ -0,0 +1,20 @@
 +RUMPTOP=${TOPRUMP}
 +
@@ -57,16 +67,15 @@ Index: rumpkernel/buildrump.sh/src/sys/rump/dev/lib/libata/Makefile
 +.include "${RUMPTOP}/Makefile.rump"
 +.include <bsd.lib.mk>
 +.include <bsd.klinks.mk>
-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,67 @@
++++ b/buildrump.sh/src/sys/rump/dev/lib/libata/ata_component.c
+@@ -0,0 +1,50 @@
 +#include <sys/param.h>
 +#include <sys/conf.h>
 +#include <sys/device.h>
 +#include <sys/kmem.h>
 +#include <sys/stat.h>
++#include <sys/disklabel.h>
 +
 +#include "ioconf.c"
 +
@@ -87,58 +96,36 @@ Index: rumpkernel/buildrump.sh/src/sys/rump/dev/lib/libata/ata_component.c
 +	int err = devsw_attach("wd", &wd_bdevsw, &bmaj, &wd_cdevsw, &cmaj);
 +	if (err != 0) { panic("devsw_attach failed with error %i", err);}
 +
-+	FLAWLESSCALL(rump_vfs_makedevnodes(S_IFBLK, "/dev/wd0", 'a',
-+	    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, 8, 4));
-+	FLAWLESSCALL(rump_vfs_makedevnodes(S_IFCHR, "/dev/rwd1", 'a',
-+	    cmaj, 8, 4));
-+	FLAWLESSCALL(rump_vfs_makedevnodes(S_IFBLK, "/dev/wd2", 'a',
-+	    bmaj, 16, 4));
-+	FLAWLESSCALL(rump_vfs_makedevnodes(S_IFCHR, "/dev/rwd2", 'a',
-+	    cmaj, 16, 4));
-+	FLAWLESSCALL(rump_vfs_makedevnodes(S_IFBLK, "/dev/wd3", 'a',
-+	    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));
++	FLAWLESSCALL(rump_vfs_makedevnodes(S_IFBLK, "/dev/wd0", 'a', bmaj, DISKMINOR(0, 0), 4));
++	FLAWLESSCALL(rump_vfs_makedevnodes(S_IFCHR, "/dev/rwd0", 'a', cmaj, DISKMINOR(0, 0), 4));
++	FLAWLESSCALL(rump_vfs_makedevnodes(S_IFBLK, "/dev/wd1", 'a', bmaj, DISKMINOR(1, 0), 4));
++	FLAWLESSCALL(rump_vfs_makedevnodes(S_IFCHR, "/dev/rwd1", 'a', cmaj, DISKMINOR(1, 0), 4));
++	FLAWLESSCALL(rump_vfs_makedevnodes(S_IFBLK, "/dev/wd2", 'a', bmaj, DISKMINOR(2, 0), 4));
++	FLAWLESSCALL(rump_vfs_makedevnodes(S_IFCHR, "/dev/rwd2", 'a', cmaj, DISKMINOR(2, 0), 4));
++	FLAWLESSCALL(rump_vfs_makedevnodes(S_IFBLK, "/dev/wd3", 'a', bmaj, DISKMINOR(3, 0), 4));
++	FLAWLESSCALL(rump_vfs_makedevnodes(S_IFCHR, "/dev/rwd3", 'a', cmaj, DISKMINOR(3, 0), 4));
++	FLAWLESSCALL(rump_vfs_makedevnodes(S_IFBLK, "/dev/wd4", 'a', bmaj, DISKMINOR(4, 0), 4));
++	FLAWLESSCALL(rump_vfs_makedevnodes(S_IFCHR, "/dev/rwd4", 'a', cmaj, DISKMINOR(4, 0), 4));
++	FLAWLESSCALL(rump_vfs_makedevnodes(S_IFBLK, "/dev/wd5", 'a', bmaj, DISKMINOR(5, 0), 4));
++	FLAWLESSCALL(rump_vfs_makedevnodes(S_IFCHR, "/dev/rwd5", 'a', cmaj, DISKMINOR(5, 0), 4));
++	FLAWLESSCALL(rump_vfs_makedevnodes(S_IFBLK, "/dev/wd6", 'a', bmaj, DISKMINOR(6, 0), 4));
++	FLAWLESSCALL(rump_vfs_makedevnodes(S_IFCHR, "/dev/rwd6", 'a', cmaj, DISKMINOR(6, 0), 4));
++	FLAWLESSCALL(rump_vfs_makedevnodes(S_IFBLK, "/dev/wd7", 'a', bmaj, DISKMINOR(7, 0), 4));
++	FLAWLESSCALL(rump_vfs_makedevnodes(S_IFCHR, "/dev/rwd7", 'a', cmaj, DISKMINOR(7, 0), 4));
 +/* Borked
 +	bmaj = cmaj = -1;
 +	FLAWLESSCALL(devsw_attach("cd", &cd_bdevsw, &bmaj, &cd_cdevsw, &cmaj));
 +
-+	FLAWLESSCALL(rump_vfs_makedevnodes(S_IFBLK, "/dev/cd0", 'a',
-+	    bmaj, 0, 1));
-+	FLAWLESSCALL(rump_vfs_makedevnodes(S_IFCHR, "/dev/rcd0", 'a',
-+	    cmaj, 0, 1));
++	FLAWLESSCALL(rump_vfs_makedevnodes(S_IFBLK, "/dev/cd0", 'a', bmaj, 0, 1));
++	FLAWLESSCALL(rump_vfs_makedevnodes(S_IFCHR, "/dev/rcd0", 'a', cmaj, 0, 1));
 +*/
 +}
-Index: rumpkernel/buildrump.sh/src/sys/rump/dev/lib/libata/ataraid.h
-===================================================================
 --- /dev/null
-+++ rumpkernel/buildrump.sh/src/sys/rump/dev/lib/libata/ataraid.h
++++ b/buildrump.sh/src/sys/rump/dev/lib/libata/ataraid.h
 @@ -0,0 +1 @@
 +
-Index: rumpkernel/buildrump.sh/src/sys/rump/dev/lib/libata/locators.h
-===================================================================
 --- /dev/null
-+++ rumpkernel/buildrump.sh/src/sys/rump/dev/lib/libata/locators.h
++++ b/buildrump.sh/src/sys/rump/dev/lib/libata/locators.h
 @@ -0,0 +1,119 @@
 +#define WSKBDDEVCF_CONSOLE 0
 +#define WSKBDDEVCF_CONSOLE_DEFAULT -1
@@ -259,42 +246,30 @@ Index: rumpkernel/buildrump.sh/src/sys/rump/dev/lib/libata/locators.h
 +#define ATARAIDCF_UNIT 1
 +#define ATARAIDCF_UNIT_DEFAULT -1
 +#define ATARAIDCF_NLOCS 2
-Index: rumpkernel/buildrump.sh/src/sys/rump/dev/lib/libata/opt_ata.h
-===================================================================
 --- /dev/null
-+++ rumpkernel/buildrump.sh/src/sys/rump/dev/lib/libata/opt_ata.h
++++ b/buildrump.sh/src/sys/rump/dev/lib/libata/opt_ata.h
 @@ -0,0 +1 @@
 +
-Index: rumpkernel/buildrump.sh/src/sys/rump/dev/lib/libata/opt_wd.h
-===================================================================
 --- /dev/null
-+++ rumpkernel/buildrump.sh/src/sys/rump/dev/lib/libata/opt_wd.h
++++ b/buildrump.sh/src/sys/rump/dev/lib/libata/opt_wd.h
 @@ -0,0 +1 @@
 +
-Index: rumpkernel/buildrump.sh/src/sys/rump/dev/lib/libata/opt_wdc.h
-===================================================================
 --- /dev/null
-+++ rumpkernel/buildrump.sh/src/sys/rump/dev/lib/libata/opt_wdc.h
++++ b/buildrump.sh/src/sys/rump/dev/lib/libata/opt_wdc.h
 @@ -0,0 +1,3 @@
 +#define NWD	1
 +#define NSATA	1
 +#define WDC_NO_IDS
-Index: rumpkernel/buildrump.sh/src/sys/rump/dev/lib/libata/sata.h
-===================================================================
 --- /dev/null
-+++ rumpkernel/buildrump.sh/src/sys/rump/dev/lib/libata/sata.h
++++ b/buildrump.sh/src/sys/rump/dev/lib/libata/sata.h
 @@ -0,0 +1 @@
 +
-Index: rumpkernel/buildrump.sh/src/sys/rump/dev/lib/libata/sata_pmp.h
-===================================================================
 --- /dev/null
-+++ rumpkernel/buildrump.sh/src/sys/rump/dev/lib/libata/sata_pmp.h
++++ b/buildrump.sh/src/sys/rump/dev/lib/libata/sata_pmp.h
 @@ -0,0 +1 @@
 +
-Index: rumpkernel/buildrump.sh/src/sys/rump/dev/Makefile.rumpdevcomp
-===================================================================
---- rumpkernel.orig/buildrump.sh/src/sys/rump/dev/Makefile.rumpdevcomp
-+++ rumpkernel/buildrump.sh/src/sys/rump/dev/Makefile.rumpdevcomp
+--- a/buildrump.sh/src/sys/rump/dev/Makefile.rumpdevcomp
++++ b/buildrump.sh/src/sys/rump/dev/Makefile.rumpdevcomp
 @@ -1,7 +1,7 @@
  #	$NetBSD: Makefile.rumpdevcomp,v 1.25 2020/04/04 17:20:16 christos Exp $
  #