Message ID | 1266438176-470-2-git-send-email-apw@canonical.com |
---|---|
State | Accepted |
Delegated to: | Andy Whitcroft |
Headers | show |
diff --git a/debian.master/d-i/exclude-modules.armel b/debian.master/d-i/exclude-modules.armel new file mode 100644 index 0000000..df63c66 --- /dev/null +++ b/debian.master/d-i/exclude-modules.armel @@ -0,0 +1,20 @@ +crypto-modules +fb-modules +fs-core-modules +fs-secondary-modules +nic-modules +nic-pcmcia-modules +nic-usb-modules +scsi-modules +storage-core-modules +nfs-modules +pcmcia-modules +parport-modules +serial-modules +plip-modules +pcmcia-storage-modules +mouse-modules +irda-modules +floppy-modules +char-modules +virtio-modules diff --git a/debian.master/d-i/exclude-modules.armel-versatile b/debian.master/d-i/exclude-modules.armel-versatile deleted file mode 100644 index 4920c34..0000000 --- a/debian.master/d-i/exclude-modules.armel-versatile +++ /dev/null @@ -1,10 +0,0 @@ -crypto-modules -fb-modules -fs-core-modules -fs-secondary-modules -nic-modules -nic-pcmcia-modules -nic-usb-modules -scsi-modules -storage-core-modules -nfs-modules diff --git a/debian.master/d-i/kernel-versions.in b/debian.master/d-i/kernel-versions.in index 39194a8..7d45431 100644 --- a/debian.master/d-i/kernel-versions.in +++ b/debian.master/d-i/kernel-versions.in @@ -5,6 +5,8 @@ i386 PKGVER-ABINUM generic PKGVER-ABINUM-generic - lpia PKGVER-ABINUM lpia PKGVER-ABINUM-lpia +armel PKGVER-ABINUM versatile PKGVER-ABINUM-versatile - + # Ports # arch version flavour installedname suffix bdep ia64 PKGVER-ABINUM ia64 PKGVER-ABINUM-ia64 - diff --git a/debian.master/d-i/modules/block-modules b/debian.master/d-i/modules/block-modules index 63173fc..4bb70f9 100644 --- a/debian.master/d-i/modules/block-modules +++ b/debian.master/d-i/modules/block-modules @@ -1,29 +1,29 @@ aoe -aten -bpck +aten ? +bpck ? bpck6 ? cciss -comm +comm ? cpqarray DAC960 -dstr -epat -epia -fit2 -fit3 -friq -frpw -kbic -ktti +dstr ? +epat ? +epia ? +fit2 ? +fit3 ? +friq ? +frpw ? +kbic ? +ktti ? nbd -on20 -on26 -paride -pcd -pd -pf -pg -pt +on20 ? +on26 ? +paride ? +pcd ? +pd ? +pf ? +pg ? +pt ? sx8 umem virtio_blk ? diff --git a/debian.master/d-i/modules/nic-shared-modules b/debian.master/d-i/modules/nic-shared-modules index ccc1107..87bf126 100644 --- a/debian.master/d-i/modules/nic-shared-modules +++ b/debian.master/d-i/modules/nic-shared-modules @@ -1,6 +1,6 @@ # PHY 8390 -mii +mii ? # CRC modules crc-ccitt diff --git a/debian.master/d-i/modules/usb-modules b/debian.master/d-i/modules/usb-modules index 68ed43a..5b353d5 100644 --- a/debian.master/d-i/modules/usb-modules +++ b/debian.master/d-i/modules/usb-modules @@ -3,7 +3,7 @@ isp116x-hcd isp1760 ohci-hcd ? r8a66597-hcd -sl811_cs +sl811_cs ? sl811-hcd u132-hcd uhci-hcd ? diff --git a/debian.master/d-i/modules/virtio-modules b/debian.master/d-i/modules/virtio-modules index c5cc1d1..270e6ab 100644 --- a/debian.master/d-i/modules/virtio-modules +++ b/debian.master/d-i/modules/virtio-modules @@ -1,4 +1,4 @@ -virtio_balloon -virtio_pci +virtio_balloon ? +virtio_pci ? virtio_ring ? -virtio-rng +virtio-rng ?
BugLink: http://bugs.launchpad.net/bugs/522515 Signed-off-by: Andy Whitcroft <apw@canonical.com> --- debian.master/d-i/exclude-modules.armel | 20 ++++++++++ debian.master/d-i/exclude-modules.armel-versatile | 10 ----- debian.master/d-i/kernel-versions.in | 2 + debian.master/d-i/modules/block-modules | 40 ++++++++++---------- debian.master/d-i/modules/nic-shared-modules | 2 +- debian.master/d-i/modules/usb-modules | 2 +- debian.master/d-i/modules/virtio-modules | 6 ++-- 7 files changed, 47 insertions(+), 35 deletions(-) create mode 100644 debian.master/d-i/exclude-modules.armel delete mode 100644 debian.master/d-i/exclude-modules.armel-versatile