diff options
Diffstat (limited to 'debian/patches/piixide-rump.diff')
| -rw-r--r-- | debian/patches/piixide-rump.diff | 75 |
1 files changed, 33 insertions, 42 deletions
diff --git a/debian/patches/piixide-rump.diff b/debian/patches/piixide-rump.diff index a6e7304d..716fe19f 100644 --- a/debian/patches/piixide-rump.diff +++ b/debian/patches/piixide-rump.diff @@ -1,20 +1,19 @@ -diff --git a/buildrump.sh/src/sys/rump/dev/Makefile.rumpdevcomp b/buildrump.sh/src/sys/rump/dev/Makefile.rumpdevcomp -index d59783d1..272304e3 100644 ---- a/buildrump.sh/src/sys/rump/dev/Makefile.rumpdevcomp -+++ b/buildrump.sh/src/sys/rump/dev/Makefile.rumpdevcomp -@@ -8,6 +8,7 @@ RUMPDEVCOMP= audio bpf cgd disk dm drvctl fss md netsmb \ - RUMPUSBDEVS= ubt ucom ugenhc ulpt umass usb +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 +@@ -8,6 +8,7 @@ RUMPDEVCOMP= audio bpf cgd disk dm drvct + RUMPUSBDEVS= ualea ubt ucom ugenhc ulpt umass usb RUMPPCIDEVS= pci pci_if_iwn pci_if_pcn pci_if_wm +RUMPPCIDEVS+= pci_piixide RUMPPCIDEVS+= pci_usbhc RUMPPCIDEVS+= pci_virtio virtio_if_vioif virtio_ld virtio_viornd RUMPPCIDEVS+= virtio_vioscsi -diff --git a/buildrump.sh/src/sys/rump/dev/lib/libpci_piixide/Makefile b/buildrump.sh/src/sys/rump/dev/lib/libpci_piixide/Makefile -new file mode 100644 -index 00000000..cc46c8f2 +Index: rumpkernel/buildrump.sh/src/sys/rump/dev/lib/libpci_piixide/Makefile +=================================================================== --- /dev/null -+++ b/buildrump.sh/src/sys/rump/dev/lib/libpci_piixide/Makefile ++++ rumpkernel/buildrump.sh/src/sys/rump/dev/lib/libpci_piixide/Makefile @@ -0,0 +1,19 @@ +.PATH: ${.CURDIR}/../../../../dev/pci \ + ${.CURDIR}/../../../../dev/ata \ @@ -35,11 +34,10 @@ index 00000000..cc46c8f2 + +.include <bsd.lib.mk> +.include <bsd.klinks.mk> -diff --git a/buildrump.sh/src/sys/rump/dev/lib/libpci_piixide/PIIXIDE.ioconf b/buildrump.sh/src/sys/rump/dev/lib/libpci_piixide/PIIXIDE.ioconf -new file mode 100644 -index 00000000..110fc0ce +Index: rumpkernel/buildrump.sh/src/sys/rump/dev/lib/libpci_piixide/PIIXIDE.ioconf +=================================================================== --- /dev/null -+++ b/buildrump.sh/src/sys/rump/dev/lib/libpci_piixide/PIIXIDE.ioconf ++++ rumpkernel/buildrump.sh/src/sys/rump/dev/lib/libpci_piixide/PIIXIDE.ioconf @@ -0,0 +1,20 @@ +ioconf piixide + @@ -61,40 +59,35 @@ index 00000000..110fc0ce +# ATAPI support +atapibus* at piixide? channel ? +cd* at atapibus? drive ? flags 0x0000 -diff --git a/buildrump.sh/src/sys/rump/dev/lib/libpci_piixide/opt_wd.h b/buildrump.sh/src/sys/rump/dev/lib/libpci_piixide/opt_wd.h -new file mode 100644 -index 00000000..e69de29b +Index: rumpkernel/buildrump.sh/src/sys/rump/dev/lib/libpci_piixide/opt_wd.h +=================================================================== --- /dev/null -+++ b/buildrump.sh/src/sys/rump/dev/lib/libpci_piixide/opt_wd.h ++++ rumpkernel/buildrump.sh/src/sys/rump/dev/lib/libpci_piixide/opt_wd.h @@ -0,0 +1 @@ + -diff --git a/buildrump.sh/src/sys/rump/dev/lib/libpci_piixide/ataraid.h b/buildrump.sh/src/sys/rump/dev/lib/libpci_piixide/ataraid.h -new file mode 100644 -index 00000000..e69de29b +Index: rumpkernel/buildrump.sh/src/sys/rump/dev/lib/libpci_piixide/ataraid.h +=================================================================== --- /dev/null -+++ b/buildrump.sh/src/sys/rump/dev/lib/libpci_piixide/ataraid.h ++++ rumpkernel/buildrump.sh/src/sys/rump/dev/lib/libpci_piixide/ataraid.h @@ -0,0 +1 @@ + -diff --git a/buildrump.sh/src/sys/rump/dev/lib/libpci_piixide/opt_ata.h b/buildrump.sh/src/sys/rump/dev/lib/libpci_piixide/opt_ata.h -new file mode 100644 -index 00000000..74ab5ee2 +Index: rumpkernel/buildrump.sh/src/sys/rump/dev/lib/libpci_piixide/opt_ata.h +=================================================================== --- /dev/null -+++ b/buildrump.sh/src/sys/rump/dev/lib/libpci_piixide/opt_ata.h ++++ rumpkernel/buildrump.sh/src/sys/rump/dev/lib/libpci_piixide/opt_ata.h @@ -0,0 +1 @@ +#define ATADEBUG -diff --git a/buildrump.sh/src/sys/rump/dev/lib/libpci_piixide/opt_wdc.h b/buildrump.sh/src/sys/rump/dev/lib/libpci_piixide/opt_wdc.h -new file mode 100644 -index 00000000..8bdf3d5b +Index: rumpkernel/buildrump.sh/src/sys/rump/dev/lib/libpci_piixide/opt_wdc.h +=================================================================== --- /dev/null -+++ b/buildrump.sh/src/sys/rump/dev/lib/libpci_piixide/opt_wdc.h ++++ rumpkernel/buildrump.sh/src/sys/rump/dev/lib/libpci_piixide/opt_wdc.h @@ -0,0 +1,2 @@ +#define NWD 1 +#define WDC_NO_IDS -diff --git a/buildrump.sh/src/sys/rump/dev/lib/libpci_piixide/piixide_component.c b/buildrump.sh/src/sys/rump/dev/lib/libpci_piixide/piixide_component.c -new file mode 100644 -index 00000000..fde63636 +Index: rumpkernel/buildrump.sh/src/sys/rump/dev/lib/libpci_piixide/piixide_component.c +=================================================================== --- /dev/null -+++ b/buildrump.sh/src/sys/rump/dev/lib/libpci_piixide/piixide_component.c ++++ rumpkernel/buildrump.sh/src/sys/rump/dev/lib/libpci_piixide/piixide_component.c @@ -0,0 +1,49 @@ +#include <sys/param.h> +#include <sys/conf.h> @@ -145,17 +138,15 @@ index 00000000..fde63636 + cmaj, 0, 1)); +*/ +} -diff --git a/buildrump.sh/src/sys/rump/dev/lib/libpci_piixide/sata.h b/buildrump.sh/src/sys/rump/dev/lib/libpci_piixide/sata.h -new file mode 100644 -index 00000000..e69de29b +Index: rumpkernel/buildrump.sh/src/sys/rump/dev/lib/libpci_piixide/sata.h +=================================================================== --- /dev/null -+++ b/buildrump.sh/src/sys/rump/dev/lib/libpci_piixide/sata.h ++++ rumpkernel/buildrump.sh/src/sys/rump/dev/lib/libpci_piixide/sata.h @@ -0,0 +1 @@ + -diff --git a/buildrump.sh/src/sys/rump/dev/lib/libpci_piixide/sata_pmp.h b/buildrump.sh/src/sys/rump/dev/lib/libpci_piixide/sata_pmp.h -new file mode 100644 -index 00000000..e69de29b +Index: rumpkernel/buildrump.sh/src/sys/rump/dev/lib/libpci_piixide/sata_pmp.h +=================================================================== --- /dev/null -+++ b/buildrump.sh/src/sys/rump/dev/lib/libpci_piixide/sata_pmp.h ++++ rumpkernel/buildrump.sh/src/sys/rump/dev/lib/libpci_piixide/sata_pmp.h @@ -0,0 +1 @@ + |