Applied, thanks!
Etienne Brateau, le sam. 24 sept. 2022 02:02:52 +0200, a ecrit:
> With this commit, rumpdisk needs to be build with "rumpdev_ahcisata
> rumpdev_piixide rumpdev_ata".
> ---
> debian/librumpdev-disk-dev.install | 3 +
> debian/librumpdev-disk0.install| 1 +
> debian/patches/ahcisata-atapi.diff | 26 ---
> debian/patches/ahcisata-rump.diff | 108 +--
> debian/patches/ata-rump.diff | 290 +
> debian/patches/piixide-rump.diff | 115 +---
> debian/patches/series | 2 +-
> 7 files changed, 310 insertions(+), 235 deletions(-)
> delete mode 100644 debian/patches/ahcisata-atapi.diff
> create mode 100644 debian/patches/ata-rump.diff
>
> diff --git a/debian/librumpdev-disk-dev.install
> b/debian/librumpdev-disk-dev.install
> index a00818347..e6d638eac 100644
> --- a/debian/librumpdev-disk-dev.install
> +++ b/debian/librumpdev-disk-dev.install
> @@ -1,6 +1,9 @@
> usr/lib/librumpdev_disk.a
> usr/lib/librumpdev_disk_pic.a
> usr/lib/librumpdev_disk.so
> +usr/lib/librumpdev_ata.a
> +usr/lib/librumpdev_ata_pic.a
> +usr/lib/librumpdev_ata.so
> usr/lib/librumpdev_umass.a
> usr/lib/librumpdev_umass_pic.a
> usr/lib/librumpdev_umass.so
> diff --git a/debian/librumpdev-disk0.install b/debian/librumpdev-disk0.install
> index 96eb3560b..85f6df971 100644
> --- a/debian/librumpdev-disk0.install
> +++ b/debian/librumpdev-disk0.install
> @@ -1,5 +1,6 @@
> usr/lib/librumpdev_disk.so.*
> usr/lib/librumpdev_umass.so.*
> +usr/lib/librumpdev_ata.so.*
> usr/lib/librumpdev_ahcisata.so.*
> usr/lib/librumpdev_piixide.so.*
> usr/lib/librumpdev_scsipi.so.*
> diff --git a/debian/patches/ahcisata-atapi.diff
> b/debian/patches/ahcisata-atapi.diff
> deleted file mode 100644
> index 48d892402..0
> --- a/debian/patches/ahcisata-atapi.diff
> +++ /dev/null
> @@ -1,26 +0,0 @@
> -TODO: merge with ahcisata-rump.diff?
> -
> -Index:
> rumpkernel/buildrump.sh/src/sys/rump/dev/lib/libpci_ahcisata/AHCISATA.ioconf
> -===
>
> rumpkernel.orig/buildrump.sh/src/sys/rump/dev/lib/libpci_ahcisata/AHCISATA.ioconf
> -+++
> rumpkernel/buildrump.sh/src/sys/rump/dev/lib/libpci_ahcisata/AHCISATA.ioconf
> -@@ -16,4 +16,5 @@ ata_hl*at atabus? drive ?
> - wd* at ata_hl?
> -
> - # ATAPI support
> --atapi* at ahcisata?
> -+atapibus* at ahcisata?
> -+cd* at atapibus? drive ? flags 0x
> -Index: rumpkernel/buildrump.sh/src/sys/rump/dev/lib/libpci_ahcisata/Makefile
> -===
>
> rumpkernel.orig/buildrump.sh/src/sys/rump/dev/lib/libpci_ahcisata/Makefile
> -+++ rumpkernel/buildrump.sh/src/sys/rump/dev/lib/libpci_ahcisata/Makefile
> -@@ -11,7 +11,7 @@ IOCONF=AHCISATA.ioconf
> - SRCS+= ahcisata_pci.c
> - SRCS+= sata_subr.c satafis_subr.c
> - SRCS+= ahcisata_core.c
> --SRCS+= atapi_wdc.c atapi_base.c
> -+SRCS+= atapi_wdc.c atapi_base.c cd.c
> - SRCS+= wd.c ata.c ata_wdc.c ata_subr.c ata_recovery.c
> - SRCS+= wdc.c
> -
> diff --git a/debian/patches/ahcisata-rump.diff
> b/debian/patches/ahcisata-rump.diff
> index 03266c290..6a5a6aa68 100644
> --- a/debian/patches/ahcisata-rump.diff
> +++ b/debian/patches/ahcisata-rump.diff
> @@ -43,31 +43,25 @@ Index:
> rumpkernel/buildrump.sh/src/sys/rump/dev/lib/libpci_ahcisata/AHCISATA.ioc
> ===
> --- /dev/null
> +++
> rumpkernel/buildrump.sh/src/sys/rump/dev/lib/libpci_ahcisata/AHCISATA.ioconf
> -@@ -0,0 +1,19 @@
> +@@ -0,0 +1,11 @@
> +ioconf ahcisata
> +
> +include "conf/files"
> -+include "dev/ata/files.ata"
> ++#include "dev/ata/files.ata"
> +include "dev/pci/files.pci"
> +include "rump/dev/files.rump"
> +
> +pseudo-root pci*
> +
> +# AHCI support
> -+ahcisata* at pci? dev ? function ?
> -+atabus* at ahcisata? channel ?
> -+ata_hl* at atabus? drive ?
> -+
> -+# Disks
> -+wd* at ata_hl?
> -+
> -+# ATAPI support
> -+atapi* at ahcisata?
> ++ahcisata* at pci? dev ? function ? flags 0x
> Index: rumpkernel/buildrump.sh/src/sys/rump/dev/lib/libpci_ahcisata/Makefile
> ===
> --- /dev/null
> +++ rumpkernel/buildrump.sh/src/sys/rump/dev/lib/libpci_ahcisata/Makefile
> -@@ -0,0 +1,21 @@
> +@@ -0,0 +1,20 @@
> ++RUMPTOP=${TOPRUMP}
> ++
> +.PATH: ${.CURDIR}/../../../../dev/pci \
> +${.CURDIR}/../../../../dev/ata \
> +${.CURDIR}/../../../../dev/scsipi \
> @@ -77,98 +71,12 @@ Index:
> rumpkernel/buildrump.sh/src/sys/rump/dev/lib/libpci_ahcisata/Makefile
> +COMMENT=AHCI support with SATA && ATAPI
> +
> +IOCONF= AHCISATA.ioconf
> ++RUMP_COMPONENT=ioconf
> +
> +SRCS+= ahcisata_pci.c
> +SRCS+= sata_subr.c satafis_subr.c
> +SRCS+= ahcisata_core.c
> -+SRCS+= atapi_wdc.c atapi_base.c
>
