diff --git a/debian/changelog b/debian/changelog index 355509683..62ba0a8ba 100644 --- a/debian/changelog +++ b/debian/changelog @@ -126,6 +126,26 @@ linux (3.15~rc5-1~exp1) experimental; urgency=medium -- maximilian attems Fri, 16 May 2014 14:33:57 +0200 +linux (3.14.13-2) unstable; urgency=medium + + [ Aurelien Jarno ] + * [mips64,mips64el] Really enable mips64 and mips64el architectures. + * [mips64,mips64el] Build udebs for 5kc-malta flavour. + * [mipsel,mips64el/loongson-3] Disable not built modules in nic-modules, + scsi-common-modules, scsi-extra-modules, scsi-modules (fixes FTBFS). + * Add scsi_transport_sas and scsi_transport_spi to scsi-core-modules udeb + as optional so that these modules do not end up in two different udebs + as dependencies. Remove them from the i386, ia64, powerpc and sparc + definition. + * [mipsel,mips64el/loongson-2e,2f] Enable CONFIG_RTC_DRV_CMOS as built-in. + * [mips*] Add few new udebs and use standard udebs configuration when + possible. + * [s390,s390x] ptrace: fix PSW mask check (CVE-2014-3534). + * [mipsel,mips64el/loongson-3] Enable PREEMPT instead of PREEMPT_VOLUNTARY + as it workarounds SMP issues. + + -- Aurelien Jarno Thu, 24 Jul 2014 21:05:08 +0200 + linux (3.14.13-1) unstable; urgency=medium * New upstream stable update: diff --git a/debian/config/kernelarch-mips/config.loongson-2e b/debian/config/kernelarch-mips/config.loongson-2e index 843d667b5..2d436950f 100644 --- a/debian/config/kernelarch-mips/config.loongson-2e +++ b/debian/config/kernelarch-mips/config.loongson-2e @@ -63,6 +63,11 @@ CONFIG_8139TOO_TUNE_TWISTER=y ## # CONFIG_PCIEPORTBUS is not set +## +## file: drivers/rtc/Kconfig +## +CONFIG_RTC_DRV_CMOS=y + ## ## file: drivers/scsi/Kconfig ## diff --git a/debian/config/kernelarch-mips/config.loongson-2f b/debian/config/kernelarch-mips/config.loongson-2f index 6dd2ae361..58e3353d5 100644 --- a/debian/config/kernelarch-mips/config.loongson-2f +++ b/debian/config/kernelarch-mips/config.loongson-2f @@ -65,6 +65,11 @@ CONFIG_8139TOO_TUNE_TWISTER=y ## # CONFIG_PCIEPORTBUS is not set +## +## file: drivers/rtc/Kconfig +## +CONFIG_RTC_DRV_CMOS=y + ## ## file: drivers/scsi/Kconfig ## diff --git a/debian/config/kernelarch-mips/config.loongson-3 b/debian/config/kernelarch-mips/config.loongson-3 index 5e943e72d..ce63a5d88 100644 --- a/debian/config/kernelarch-mips/config.loongson-3 +++ b/debian/config/kernelarch-mips/config.loongson-3 @@ -104,6 +104,15 @@ CONFIG_FB_RADEON=y ## CONFIG_FRAMEBUFFER_CONSOLE=y +## +## file: kernel/Kconfig.preempt +## +## choice: Preemption Model +# CONFIG_PREEMPT_NONE is not set +# CONFIG_PREEMPT_VOLUNTARY is not set +CONFIG_PREEMPT=y +## end choice + ## ## file: mm/Kconfig ## diff --git a/debian/installer/i386/modules/i386/scsi-core-modules b/debian/installer/i386/modules/i386/scsi-core-modules index 4684cabbe..dd65d6614 100644 --- a/debian/installer/i386/modules/i386/scsi-core-modules +++ b/debian/installer/i386/modules/i386/scsi-core-modules @@ -1,2 +1 @@ #include -scsi_transport_spi diff --git a/debian/installer/ia64/modules/ia64/scsi-core-modules b/debian/installer/ia64/modules/ia64/scsi-core-modules index 4684cabbe..dd65d6614 100644 --- a/debian/installer/ia64/modules/ia64/scsi-core-modules +++ b/debian/installer/ia64/modules/ia64/scsi-core-modules @@ -1,2 +1 @@ #include -scsi_transport_spi diff --git a/debian/installer/mips/modules/mips-4kc-malta/affs-modules b/debian/installer/mips/modules/mips-4kc-malta/affs-modules new file mode 100644 index 000000000..21d616a1c --- /dev/null +++ b/debian/installer/mips/modules/mips-4kc-malta/affs-modules @@ -0,0 +1 @@ +#include diff --git a/debian/installer/mips/modules/mips-4kc-malta/cdrom-core-modules b/debian/installer/mips/modules/mips-4kc-malta/cdrom-core-modules index e264d7aa3..3ff69b48f 100644 --- a/debian/installer/mips/modules/mips-4kc-malta/cdrom-core-modules +++ b/debian/installer/mips/modules/mips-4kc-malta/cdrom-core-modules @@ -1,2 +1 @@ #include - diff --git a/debian/installer/mips/modules/mips-4kc-malta/event-modules b/debian/installer/mips/modules/mips-4kc-malta/event-modules new file mode 100644 index 000000000..f8819afd3 --- /dev/null +++ b/debian/installer/mips/modules/mips-4kc-malta/event-modules @@ -0,0 +1 @@ +#include diff --git a/debian/installer/mips/modules/mips-4kc-malta/fat-modules b/debian/installer/mips/modules/mips-4kc-malta/fat-modules index cce8fd30c..274584eb6 100644 --- a/debian/installer/mips/modules/mips-4kc-malta/fat-modules +++ b/debian/installer/mips/modules/mips-4kc-malta/fat-modules @@ -1,2 +1 @@ #include - diff --git a/debian/installer/mips/modules/mips-4kc-malta/hfs-modules b/debian/installer/mips/modules/mips-4kc-malta/hfs-modules new file mode 100644 index 000000000..57d12f649 --- /dev/null +++ b/debian/installer/mips/modules/mips-4kc-malta/hfs-modules @@ -0,0 +1 @@ +#include diff --git a/debian/installer/mips/modules/mips-4kc-malta/i2c-modules b/debian/installer/mips/modules/mips-4kc-malta/i2c-modules new file mode 100644 index 000000000..203a607e7 --- /dev/null +++ b/debian/installer/mips/modules/mips-4kc-malta/i2c-modules @@ -0,0 +1 @@ +#include diff --git a/debian/installer/mips/modules/mips-4kc-malta/jfs-modules b/debian/installer/mips/modules/mips-4kc-malta/jfs-modules index 925a43a9e..7e4d912b9 100644 --- a/debian/installer/mips/modules/mips-4kc-malta/jfs-modules +++ b/debian/installer/mips/modules/mips-4kc-malta/jfs-modules @@ -1,2 +1 @@ #include - diff --git a/debian/installer/mips/modules/mips-4kc-malta/loop-modules b/debian/installer/mips/modules/mips-4kc-malta/loop-modules index 164467713..c1c948fa3 100644 --- a/debian/installer/mips/modules/mips-4kc-malta/loop-modules +++ b/debian/installer/mips/modules/mips-4kc-malta/loop-modules @@ -1,2 +1 @@ #include - diff --git a/debian/installer/mips/modules/mips-4kc-malta/md-modules b/debian/installer/mips/modules/mips-4kc-malta/md-modules index ade088ddb..26115e10b 100644 --- a/debian/installer/mips/modules/mips-4kc-malta/md-modules +++ b/debian/installer/mips/modules/mips-4kc-malta/md-modules @@ -1,2 +1 @@ #include - diff --git a/debian/installer/mips/modules/mips-4kc-malta/minix-modules b/debian/installer/mips/modules/mips-4kc-malta/minix-modules new file mode 100644 index 000000000..82b984372 --- /dev/null +++ b/debian/installer/mips/modules/mips-4kc-malta/minix-modules @@ -0,0 +1 @@ +#include diff --git a/debian/installer/mips/modules/mips-4kc-malta/mmc-core-modules b/debian/installer/mips/modules/mips-4kc-malta/mmc-core-modules new file mode 100644 index 000000000..7bf38465c --- /dev/null +++ b/debian/installer/mips/modules/mips-4kc-malta/mmc-core-modules @@ -0,0 +1 @@ +#include diff --git a/debian/installer/mips/modules/mips-4kc-malta/mmc-modules b/debian/installer/mips/modules/mips-4kc-malta/mmc-modules new file mode 100644 index 000000000..dadfd5334 --- /dev/null +++ b/debian/installer/mips/modules/mips-4kc-malta/mmc-modules @@ -0,0 +1 @@ +#include diff --git a/debian/installer/mips/modules/mips-4kc-malta/mouse-modules b/debian/installer/mips/modules/mips-4kc-malta/mouse-modules new file mode 100644 index 000000000..15fcb00ea --- /dev/null +++ b/debian/installer/mips/modules/mips-4kc-malta/mouse-modules @@ -0,0 +1 @@ +#include diff --git a/debian/installer/mips/modules/mips-4kc-malta/nic-modules b/debian/installer/mips/modules/mips-4kc-malta/nic-modules new file mode 100644 index 000000000..44a607e90 --- /dev/null +++ b/debian/installer/mips/modules/mips-4kc-malta/nic-modules @@ -0,0 +1,4 @@ +#include +skfp - +starfire - +winbond-840 - diff --git a/debian/installer/mips/modules/mips-4kc-malta/nic-shared-modules b/debian/installer/mips/modules/mips-4kc-malta/nic-shared-modules new file mode 100644 index 000000000..cc84b14dc --- /dev/null +++ b/debian/installer/mips/modules/mips-4kc-malta/nic-shared-modules @@ -0,0 +1 @@ +#include diff --git a/debian/installer/mips/modules/mips-4kc-malta/nic-usb-modules b/debian/installer/mips/modules/mips-4kc-malta/nic-usb-modules new file mode 100644 index 000000000..c479669b4 --- /dev/null +++ b/debian/installer/mips/modules/mips-4kc-malta/nic-usb-modules @@ -0,0 +1 @@ +#include diff --git a/debian/installer/mips/modules/mips-4kc-malta/nic-wireless-modules b/debian/installer/mips/modules/mips-4kc-malta/nic-wireless-modules new file mode 100644 index 000000000..53fd18d7f --- /dev/null +++ b/debian/installer/mips/modules/mips-4kc-malta/nic-wireless-modules @@ -0,0 +1 @@ +#include diff --git a/debian/installer/mips/modules/mips-4kc-malta/ntfs-modules b/debian/installer/mips/modules/mips-4kc-malta/ntfs-modules new file mode 100644 index 000000000..ac1bc6a96 --- /dev/null +++ b/debian/installer/mips/modules/mips-4kc-malta/ntfs-modules @@ -0,0 +1 @@ +ntfs diff --git a/debian/installer/mips/modules/mips-4kc-malta/pata-modules b/debian/installer/mips/modules/mips-4kc-malta/pata-modules new file mode 100644 index 000000000..b0cd6337a --- /dev/null +++ b/debian/installer/mips/modules/mips-4kc-malta/pata-modules @@ -0,0 +1 @@ +#include diff --git a/debian/installer/mips/modules/mips-4kc-malta/ppp-modules b/debian/installer/mips/modules/mips-4kc-malta/ppp-modules index f1ae9b3d1..1f26aa1ee 100644 --- a/debian/installer/mips/modules/mips-4kc-malta/ppp-modules +++ b/debian/installer/mips/modules/mips-4kc-malta/ppp-modules @@ -1,2 +1 @@ #include - diff --git a/debian/installer/mips/modules/mips-4kc-malta/qnx4-modules b/debian/installer/mips/modules/mips-4kc-malta/qnx4-modules new file mode 100644 index 000000000..cd0c96d41 --- /dev/null +++ b/debian/installer/mips/modules/mips-4kc-malta/qnx4-modules @@ -0,0 +1 @@ +#include diff --git a/debian/installer/mips/modules/mips-4kc-malta/sata-modules b/debian/installer/mips/modules/mips-4kc-malta/sata-modules index 071cb860b..01318c258 100644 --- a/debian/installer/mips/modules/mips-4kc-malta/sata-modules +++ b/debian/installer/mips/modules/mips-4kc-malta/sata-modules @@ -1,2 +1 @@ #include - diff --git a/debian/installer/mips/modules/mips-4kc-malta/scsi-common-modules b/debian/installer/mips/modules/mips-4kc-malta/scsi-common-modules new file mode 100644 index 000000000..71103dd60 --- /dev/null +++ b/debian/installer/mips/modules/mips-4kc-malta/scsi-common-modules @@ -0,0 +1 @@ +#include diff --git a/debian/installer/mips/modules/mips-4kc-malta/scsi-core-modules b/debian/installer/mips/modules/mips-4kc-malta/scsi-core-modules new file mode 100644 index 000000000..dd65d6614 --- /dev/null +++ b/debian/installer/mips/modules/mips-4kc-malta/scsi-core-modules @@ -0,0 +1 @@ +#include diff --git a/debian/installer/mips/modules/mips-4kc-malta/scsi-extra-modules b/debian/installer/mips/modules/mips-4kc-malta/scsi-extra-modules new file mode 100644 index 000000000..cd13edec5 --- /dev/null +++ b/debian/installer/mips/modules/mips-4kc-malta/scsi-extra-modules @@ -0,0 +1 @@ +#include diff --git a/debian/installer/mips/modules/mips-4kc-malta/scsi-modules b/debian/installer/mips/modules/mips-4kc-malta/scsi-modules new file mode 100644 index 000000000..8909dfb79 --- /dev/null +++ b/debian/installer/mips/modules/mips-4kc-malta/scsi-modules @@ -0,0 +1 @@ +#include diff --git a/debian/installer/mips/modules/mips-4kc-malta/sound-modules b/debian/installer/mips/modules/mips-4kc-malta/sound-modules new file mode 100644 index 000000000..68395ab3d --- /dev/null +++ b/debian/installer/mips/modules/mips-4kc-malta/sound-modules @@ -0,0 +1 @@ +#include diff --git a/debian/installer/mips/modules/mips-4kc-malta/usb-modules b/debian/installer/mips/modules/mips-4kc-malta/usb-modules index 2a947a6d8..c598dedd8 100644 --- a/debian/installer/mips/modules/mips-4kc-malta/usb-modules +++ b/debian/installer/mips/modules/mips-4kc-malta/usb-modules @@ -1,2 +1 @@ #include - diff --git a/debian/installer/mips/modules/mips-4kc-malta/usb-serial-modules b/debian/installer/mips/modules/mips-4kc-malta/usb-serial-modules new file mode 100644 index 000000000..c0a0dc3bd --- /dev/null +++ b/debian/installer/mips/modules/mips-4kc-malta/usb-serial-modules @@ -0,0 +1 @@ +#include diff --git a/debian/installer/mips/modules/mips-4kc-malta/usb-storage b/debian/installer/mips/modules/mips-4kc-malta/usb-storage deleted file mode 100644 index 2a947a6d8..000000000 --- a/debian/installer/mips/modules/mips-4kc-malta/usb-storage +++ /dev/null @@ -1,2 +0,0 @@ -#include - diff --git a/debian/installer/mips/modules/mips-4kc-malta/usb-storage-modules b/debian/installer/mips/modules/mips-4kc-malta/usb-storage-modules index 272d95e2e..8c5e81b55 100644 --- a/debian/installer/mips/modules/mips-4kc-malta/usb-storage-modules +++ b/debian/installer/mips/modules/mips-4kc-malta/usb-storage-modules @@ -1,2 +1 @@ #include - diff --git a/debian/installer/mips/modules/mips-4kc-malta/xfs-modules b/debian/installer/mips/modules/mips-4kc-malta/xfs-modules index c020b5d39..98374e2bb 100644 --- a/debian/installer/mips/modules/mips-4kc-malta/xfs-modules +++ b/debian/installer/mips/modules/mips-4kc-malta/xfs-modules @@ -1,2 +1 @@ #include - diff --git a/debian/installer/mips/modules/mips-octeon/affs-modules b/debian/installer/mips/modules/mips-octeon/affs-modules new file mode 100644 index 000000000..21d616a1c --- /dev/null +++ b/debian/installer/mips/modules/mips-octeon/affs-modules @@ -0,0 +1 @@ +#include diff --git a/debian/installer/mips/modules/mips-octeon/event-modules b/debian/installer/mips/modules/mips-octeon/event-modules new file mode 100644 index 000000000..f8819afd3 --- /dev/null +++ b/debian/installer/mips/modules/mips-octeon/event-modules @@ -0,0 +1 @@ +#include diff --git a/debian/installer/mips/modules/mips-octeon/hfs-modules b/debian/installer/mips/modules/mips-octeon/hfs-modules new file mode 100644 index 000000000..57d12f649 --- /dev/null +++ b/debian/installer/mips/modules/mips-octeon/hfs-modules @@ -0,0 +1 @@ +#include diff --git a/debian/installer/mips/modules/mips-octeon/lzo-modules b/debian/installer/mips/modules/mips-octeon/lzo-modules new file mode 100644 index 000000000..8e50b5ab7 --- /dev/null +++ b/debian/installer/mips/modules/mips-octeon/lzo-modules @@ -0,0 +1 @@ +#include diff --git a/debian/installer/mips/modules/mips-octeon/minix-modules b/debian/installer/mips/modules/mips-octeon/minix-modules new file mode 100644 index 000000000..82b984372 --- /dev/null +++ b/debian/installer/mips/modules/mips-octeon/minix-modules @@ -0,0 +1 @@ +#include diff --git a/debian/installer/mips/modules/mips-octeon/nic-modules b/debian/installer/mips/modules/mips-octeon/nic-modules new file mode 100644 index 000000000..3a2814f9e --- /dev/null +++ b/debian/installer/mips/modules/mips-octeon/nic-modules @@ -0,0 +1,15 @@ +#include +8139cp - +8139too - +dmfe - +e100 - +epic100 - +fealnx - +natsemi - +ne2k-pci - +skfp - +sundance - +starfire - +tulip - +typhoon - +winbond-840 - diff --git a/debian/installer/mips/modules/mips-octeon/nic-usb-modules b/debian/installer/mips/modules/mips-octeon/nic-usb-modules new file mode 100644 index 000000000..c479669b4 --- /dev/null +++ b/debian/installer/mips/modules/mips-octeon/nic-usb-modules @@ -0,0 +1 @@ +#include diff --git a/debian/installer/mips/modules/mips-octeon/nic-wireless-modules b/debian/installer/mips/modules/mips-octeon/nic-wireless-modules new file mode 100644 index 000000000..53fd18d7f --- /dev/null +++ b/debian/installer/mips/modules/mips-octeon/nic-wireless-modules @@ -0,0 +1 @@ +#include diff --git a/debian/installer/mips/modules/mips-octeon/ntfs-modules b/debian/installer/mips/modules/mips-octeon/ntfs-modules new file mode 100644 index 000000000..ac1bc6a96 --- /dev/null +++ b/debian/installer/mips/modules/mips-octeon/ntfs-modules @@ -0,0 +1 @@ +ntfs diff --git a/debian/installer/mips/modules/mips-octeon/pata-modules b/debian/installer/mips/modules/mips-octeon/pata-modules new file mode 100644 index 000000000..b0cd6337a --- /dev/null +++ b/debian/installer/mips/modules/mips-octeon/pata-modules @@ -0,0 +1 @@ +#include diff --git a/debian/installer/mips/modules/mips-octeon/qnx4-modules b/debian/installer/mips/modules/mips-octeon/qnx4-modules new file mode 100644 index 000000000..cd0c96d41 --- /dev/null +++ b/debian/installer/mips/modules/mips-octeon/qnx4-modules @@ -0,0 +1 @@ +#include diff --git a/debian/installer/mips/modules/mips-octeon/scsi-common-modules b/debian/installer/mips/modules/mips-octeon/scsi-common-modules index 609f0f620..748049f2e 100644 --- a/debian/installer/mips/modules/mips-octeon/scsi-common-modules +++ b/debian/installer/mips/modules/mips-octeon/scsi-common-modules @@ -1,4 +1,2 @@ -aic79xx -BusLogic ? -sym53c8xx ? -sym53c8xx_2 ? +#include +sym53c8xx - diff --git a/debian/installer/mips/modules/mips-octeon/scsi-core-modules b/debian/installer/mips/modules/mips-octeon/scsi-core-modules index 1fde8eedc..dd65d6614 100644 --- a/debian/installer/mips/modules/mips-octeon/scsi-core-modules +++ b/debian/installer/mips/modules/mips-octeon/scsi-core-modules @@ -1 +1 @@ -scsi_dh +#include diff --git a/debian/installer/mips/modules/mips-octeon/scsi-extra-modules b/debian/installer/mips/modules/mips-octeon/scsi-extra-modules new file mode 100644 index 000000000..3a9aad711 --- /dev/null +++ b/debian/installer/mips/modules/mips-octeon/scsi-extra-modules @@ -0,0 +1,4 @@ +#include +cciss - +DAC960 - +ips - diff --git a/debian/installer/mips/modules/mips-octeon/scsi-modules b/debian/installer/mips/modules/mips-octeon/scsi-modules index 8e5723c14..752805752 100644 --- a/debian/installer/mips/modules/mips-octeon/scsi-modules +++ b/debian/installer/mips/modules/mips-octeon/scsi-modules @@ -1,9 +1,3 @@ -3w-9xxx -3w-xxxx -aacraid -atp870u ? -ch -iscsi_tcp -lpfc -qla2xxx -sg +#include +dmx3191d - +tmscsim - diff --git a/debian/installer/mips/modules/mips-octeon/sound-modules b/debian/installer/mips/modules/mips-octeon/sound-modules new file mode 100644 index 000000000..68395ab3d --- /dev/null +++ b/debian/installer/mips/modules/mips-octeon/sound-modules @@ -0,0 +1 @@ +#include diff --git a/debian/installer/mips/modules/mips-octeon/usb-serial-modules b/debian/installer/mips/modules/mips-octeon/usb-serial-modules new file mode 100644 index 000000000..c0a0dc3bd --- /dev/null +++ b/debian/installer/mips/modules/mips-octeon/usb-serial-modules @@ -0,0 +1 @@ +#include diff --git a/debian/installer/mips/modules/mips-octeon/usb-storage b/debian/installer/mips/modules/mips-octeon/usb-storage deleted file mode 100644 index c598dedd8..000000000 --- a/debian/installer/mips/modules/mips-octeon/usb-storage +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/debian/installer/mips/modules/mips-octeon/virtio-modules b/debian/installer/mips/modules/mips-octeon/virtio-modules new file mode 100644 index 000000000..61da39659 --- /dev/null +++ b/debian/installer/mips/modules/mips-octeon/virtio-modules @@ -0,0 +1 @@ +#include diff --git a/debian/installer/mips/modules/mips-sb1-bcm91250a/affs-modules b/debian/installer/mips/modules/mips-sb1-bcm91250a/affs-modules new file mode 100644 index 000000000..21d616a1c --- /dev/null +++ b/debian/installer/mips/modules/mips-sb1-bcm91250a/affs-modules @@ -0,0 +1 @@ +#include diff --git a/debian/installer/mips/modules/mips-sb1-bcm91250a/ata-modules b/debian/installer/mips/modules/mips-sb1-bcm91250a/ata-modules new file mode 100644 index 000000000..b81c0f38b --- /dev/null +++ b/debian/installer/mips/modules/mips-sb1-bcm91250a/ata-modules @@ -0,0 +1 @@ +#include diff --git a/debian/installer/mips/modules/mips-sb1-bcm91250a/cdrom-core-modules b/debian/installer/mips/modules/mips-sb1-bcm91250a/cdrom-core-modules index e264d7aa3..3ff69b48f 100644 --- a/debian/installer/mips/modules/mips-sb1-bcm91250a/cdrom-core-modules +++ b/debian/installer/mips/modules/mips-sb1-bcm91250a/cdrom-core-modules @@ -1,2 +1 @@ #include - diff --git a/debian/installer/mips/modules/mips-sb1-bcm91250a/event-modules b/debian/installer/mips/modules/mips-sb1-bcm91250a/event-modules new file mode 100644 index 000000000..f8819afd3 --- /dev/null +++ b/debian/installer/mips/modules/mips-sb1-bcm91250a/event-modules @@ -0,0 +1 @@ +#include diff --git a/debian/installer/mips/modules/mips-sb1-bcm91250a/fat-modules b/debian/installer/mips/modules/mips-sb1-bcm91250a/fat-modules index cce8fd30c..274584eb6 100644 --- a/debian/installer/mips/modules/mips-sb1-bcm91250a/fat-modules +++ b/debian/installer/mips/modules/mips-sb1-bcm91250a/fat-modules @@ -1,2 +1 @@ #include - diff --git a/debian/installer/mips/modules/mips-sb1-bcm91250a/fb-modules b/debian/installer/mips/modules/mips-sb1-bcm91250a/fb-modules deleted file mode 100644 index 8c86defd0..000000000 --- a/debian/installer/mips/modules/mips-sb1-bcm91250a/fb-modules +++ /dev/null @@ -1,24 +0,0 @@ -aty128fb -atyfb -radeonfb -cfbcopyarea -cfbfillrect -cfbimgblt -cyber2000fb -kyrofb -macmodes -g450_pll -matroxfb_DAC1064 -matroxfb_Ti3026 -matroxfb_accel -matroxfb_base -matroxfb_crtc2 -matroxfb_g450 -matroxfb_misc -neofb -pm2fb -savagefb -sisfb -sstfb -tdfxfb -tridentfb diff --git a/debian/installer/mips/modules/mips-sb1-bcm91250a/hfs-modules b/debian/installer/mips/modules/mips-sb1-bcm91250a/hfs-modules new file mode 100644 index 000000000..57d12f649 --- /dev/null +++ b/debian/installer/mips/modules/mips-sb1-bcm91250a/hfs-modules @@ -0,0 +1 @@ +#include diff --git a/debian/installer/mips/modules/mips-sb1-bcm91250a/i2c-modules b/debian/installer/mips/modules/mips-sb1-bcm91250a/i2c-modules new file mode 100644 index 000000000..203a607e7 --- /dev/null +++ b/debian/installer/mips/modules/mips-sb1-bcm91250a/i2c-modules @@ -0,0 +1 @@ +#include diff --git a/debian/installer/mips/modules/mips-sb1-bcm91250a/jfs-modules b/debian/installer/mips/modules/mips-sb1-bcm91250a/jfs-modules index 925a43a9e..7e4d912b9 100644 --- a/debian/installer/mips/modules/mips-sb1-bcm91250a/jfs-modules +++ b/debian/installer/mips/modules/mips-sb1-bcm91250a/jfs-modules @@ -1,2 +1 @@ #include - diff --git a/debian/installer/mips/modules/mips-sb1-bcm91250a/loop-modules b/debian/installer/mips/modules/mips-sb1-bcm91250a/loop-modules index 164467713..c1c948fa3 100644 --- a/debian/installer/mips/modules/mips-sb1-bcm91250a/loop-modules +++ b/debian/installer/mips/modules/mips-sb1-bcm91250a/loop-modules @@ -1,2 +1 @@ #include - diff --git a/debian/installer/mips/modules/mips-sb1-bcm91250a/lzo-modules b/debian/installer/mips/modules/mips-sb1-bcm91250a/lzo-modules new file mode 100644 index 000000000..8e50b5ab7 --- /dev/null +++ b/debian/installer/mips/modules/mips-sb1-bcm91250a/lzo-modules @@ -0,0 +1 @@ +#include diff --git a/debian/installer/mips/modules/mips-sb1-bcm91250a/md-modules b/debian/installer/mips/modules/mips-sb1-bcm91250a/md-modules index ade088ddb..26115e10b 100644 --- a/debian/installer/mips/modules/mips-sb1-bcm91250a/md-modules +++ b/debian/installer/mips/modules/mips-sb1-bcm91250a/md-modules @@ -1,2 +1 @@ #include - diff --git a/debian/installer/mips/modules/mips-sb1-bcm91250a/minix-modules b/debian/installer/mips/modules/mips-sb1-bcm91250a/minix-modules new file mode 100644 index 000000000..82b984372 --- /dev/null +++ b/debian/installer/mips/modules/mips-sb1-bcm91250a/minix-modules @@ -0,0 +1 @@ +#include diff --git a/debian/installer/mips/modules/mips-sb1-bcm91250a/nic-modules b/debian/installer/mips/modules/mips-sb1-bcm91250a/nic-modules new file mode 100644 index 000000000..a2feefcfc --- /dev/null +++ b/debian/installer/mips/modules/mips-sb1-bcm91250a/nic-modules @@ -0,0 +1,11 @@ +#include +dmfe - +epic100 - +fealnx - +natsemi - +skfp - +starfire - +sundance - +tulip - +typhoon - +winbond-840 - diff --git a/debian/installer/mips/modules/mips-sb1-bcm91250a/nic-usb-modules b/debian/installer/mips/modules/mips-sb1-bcm91250a/nic-usb-modules new file mode 100644 index 000000000..c479669b4 --- /dev/null +++ b/debian/installer/mips/modules/mips-sb1-bcm91250a/nic-usb-modules @@ -0,0 +1 @@ +#include diff --git a/debian/installer/mips/modules/mips-sb1-bcm91250a/nic-wireless-modules b/debian/installer/mips/modules/mips-sb1-bcm91250a/nic-wireless-modules new file mode 100644 index 000000000..53fd18d7f --- /dev/null +++ b/debian/installer/mips/modules/mips-sb1-bcm91250a/nic-wireless-modules @@ -0,0 +1 @@ +#include diff --git a/debian/installer/mips/modules/mips-sb1-bcm91250a/ntfs-modules b/debian/installer/mips/modules/mips-sb1-bcm91250a/ntfs-modules new file mode 100644 index 000000000..ac1bc6a96 --- /dev/null +++ b/debian/installer/mips/modules/mips-sb1-bcm91250a/ntfs-modules @@ -0,0 +1 @@ +ntfs diff --git a/debian/installer/mips/modules/mips-sb1-bcm91250a/pata-modules b/debian/installer/mips/modules/mips-sb1-bcm91250a/pata-modules new file mode 100644 index 000000000..b0cd6337a --- /dev/null +++ b/debian/installer/mips/modules/mips-sb1-bcm91250a/pata-modules @@ -0,0 +1 @@ +#include diff --git a/debian/installer/mips/modules/mips-sb1-bcm91250a/ppp-modules b/debian/installer/mips/modules/mips-sb1-bcm91250a/ppp-modules index f1ae9b3d1..1f26aa1ee 100644 --- a/debian/installer/mips/modules/mips-sb1-bcm91250a/ppp-modules +++ b/debian/installer/mips/modules/mips-sb1-bcm91250a/ppp-modules @@ -1,2 +1 @@ #include - diff --git a/debian/installer/mips/modules/mips-sb1-bcm91250a/qnx4-modules b/debian/installer/mips/modules/mips-sb1-bcm91250a/qnx4-modules new file mode 100644 index 000000000..cd0c96d41 --- /dev/null +++ b/debian/installer/mips/modules/mips-sb1-bcm91250a/qnx4-modules @@ -0,0 +1 @@ +#include diff --git a/debian/installer/mips/modules/mips-sb1-bcm91250a/sata-modules b/debian/installer/mips/modules/mips-sb1-bcm91250a/sata-modules index 071cb860b..01318c258 100644 --- a/debian/installer/mips/modules/mips-sb1-bcm91250a/sata-modules +++ b/debian/installer/mips/modules/mips-sb1-bcm91250a/sata-modules @@ -1,2 +1 @@ #include - diff --git a/debian/installer/mips/modules/mips-sb1-bcm91250a/scsi-common-modules b/debian/installer/mips/modules/mips-sb1-bcm91250a/scsi-common-modules index 1f1985aa3..748049f2e 100644 --- a/debian/installer/mips/modules/mips-sb1-bcm91250a/scsi-common-modules +++ b/debian/installer/mips/modules/mips-sb1-bcm91250a/scsi-common-modules @@ -1,5 +1,2 @@ -aic79xx -BusLogic ? -sym53c8xx -sym53c8xx_2 ? - +#include +sym53c8xx - diff --git a/debian/installer/mips/modules/mips-sb1-bcm91250a/scsi-core-modules b/debian/installer/mips/modules/mips-sb1-bcm91250a/scsi-core-modules index 1fde8eedc..dd65d6614 100644 --- a/debian/installer/mips/modules/mips-sb1-bcm91250a/scsi-core-modules +++ b/debian/installer/mips/modules/mips-sb1-bcm91250a/scsi-core-modules @@ -1 +1 @@ -scsi_dh +#include diff --git a/debian/installer/mips/modules/mips-sb1-bcm91250a/scsi-extra-modules b/debian/installer/mips/modules/mips-sb1-bcm91250a/scsi-extra-modules new file mode 100644 index 000000000..3a9aad711 --- /dev/null +++ b/debian/installer/mips/modules/mips-sb1-bcm91250a/scsi-extra-modules @@ -0,0 +1,4 @@ +#include +cciss - +DAC960 - +ips - diff --git a/debian/installer/mips/modules/mips-sb1-bcm91250a/scsi-modules b/debian/installer/mips/modules/mips-sb1-bcm91250a/scsi-modules index c49d25053..8909dfb79 100644 --- a/debian/installer/mips/modules/mips-sb1-bcm91250a/scsi-modules +++ b/debian/installer/mips/modules/mips-sb1-bcm91250a/scsi-modules @@ -1,15 +1 @@ -3w-9xxx -3w-xxxx -a100u2w -aacraid -atp870u ? -ch -dc395x -fdomain -iscsi_tcp -lpfc -qla1280 -qla2xxx -qlogicfc ? -sg -tmscsim +#include diff --git a/debian/installer/mips/modules/mips-sb1-bcm91250a/sound-modules b/debian/installer/mips/modules/mips-sb1-bcm91250a/sound-modules new file mode 100644 index 000000000..68395ab3d --- /dev/null +++ b/debian/installer/mips/modules/mips-sb1-bcm91250a/sound-modules @@ -0,0 +1 @@ +#include diff --git a/debian/installer/mips/modules/mips-sb1-bcm91250a/usb-modules b/debian/installer/mips/modules/mips-sb1-bcm91250a/usb-modules index 2a947a6d8..c598dedd8 100644 --- a/debian/installer/mips/modules/mips-sb1-bcm91250a/usb-modules +++ b/debian/installer/mips/modules/mips-sb1-bcm91250a/usb-modules @@ -1,2 +1 @@ #include - diff --git a/debian/installer/mips/modules/mips-sb1-bcm91250a/usb-serial-modules b/debian/installer/mips/modules/mips-sb1-bcm91250a/usb-serial-modules new file mode 100644 index 000000000..c0a0dc3bd --- /dev/null +++ b/debian/installer/mips/modules/mips-sb1-bcm91250a/usb-serial-modules @@ -0,0 +1 @@ +#include diff --git a/debian/installer/mips/modules/mips-sb1-bcm91250a/usb-storage b/debian/installer/mips/modules/mips-sb1-bcm91250a/usb-storage deleted file mode 100644 index 2a947a6d8..000000000 --- a/debian/installer/mips/modules/mips-sb1-bcm91250a/usb-storage +++ /dev/null @@ -1,2 +0,0 @@ -#include - diff --git a/debian/installer/mips/modules/mips-sb1-bcm91250a/usb-storage-modules b/debian/installer/mips/modules/mips-sb1-bcm91250a/usb-storage-modules index 272d95e2e..8c5e81b55 100644 --- a/debian/installer/mips/modules/mips-sb1-bcm91250a/usb-storage-modules +++ b/debian/installer/mips/modules/mips-sb1-bcm91250a/usb-storage-modules @@ -1,2 +1 @@ #include - diff --git a/debian/installer/mips/modules/mips-sb1-bcm91250a/virtio-modules b/debian/installer/mips/modules/mips-sb1-bcm91250a/virtio-modules new file mode 100644 index 000000000..61da39659 --- /dev/null +++ b/debian/installer/mips/modules/mips-sb1-bcm91250a/virtio-modules @@ -0,0 +1 @@ +#include diff --git a/debian/installer/mips/modules/mips-sb1-bcm91250a/xfs-modules b/debian/installer/mips/modules/mips-sb1-bcm91250a/xfs-modules index c020b5d39..98374e2bb 100644 --- a/debian/installer/mips/modules/mips-sb1-bcm91250a/xfs-modules +++ b/debian/installer/mips/modules/mips-sb1-bcm91250a/xfs-modules @@ -1,2 +1 @@ #include - diff --git a/debian/installer/mips64/modules/mips64-5kc-malta b/debian/installer/mips64/modules/mips64-5kc-malta new file mode 120000 index 000000000..84b512ec4 --- /dev/null +++ b/debian/installer/mips64/modules/mips64-5kc-malta @@ -0,0 +1 @@ +../../mips/modules/mips-4kc-malta \ No newline at end of file diff --git a/debian/installer/mips64el/modules/mips64el-5kc-malta b/debian/installer/mips64el/modules/mips64el-5kc-malta new file mode 120000 index 000000000..84b512ec4 --- /dev/null +++ b/debian/installer/mips64el/modules/mips64el-5kc-malta @@ -0,0 +1 @@ +../../mips/modules/mips-4kc-malta \ No newline at end of file diff --git a/debian/installer/mipsel/modules/mipsel-loongson-2e/affs-modules b/debian/installer/mipsel/modules/mipsel-loongson-2e/affs-modules new file mode 100644 index 000000000..21d616a1c --- /dev/null +++ b/debian/installer/mipsel/modules/mipsel-loongson-2e/affs-modules @@ -0,0 +1 @@ +#include diff --git a/debian/installer/mipsel/modules/mipsel-loongson-2e/ata-modules b/debian/installer/mipsel/modules/mipsel-loongson-2e/ata-modules new file mode 100644 index 000000000..b81c0f38b --- /dev/null +++ b/debian/installer/mipsel/modules/mipsel-loongson-2e/ata-modules @@ -0,0 +1 @@ +#include diff --git a/debian/installer/mipsel/modules/mipsel-loongson-2e/event-modules b/debian/installer/mipsel/modules/mipsel-loongson-2e/event-modules new file mode 100644 index 000000000..f8819afd3 --- /dev/null +++ b/debian/installer/mipsel/modules/mipsel-loongson-2e/event-modules @@ -0,0 +1 @@ +#include diff --git a/debian/installer/mipsel/modules/mipsel-loongson-2e/firewire-core-modules b/debian/installer/mipsel/modules/mipsel-loongson-2e/firewire-core-modules new file mode 100644 index 000000000..dcac80af9 --- /dev/null +++ b/debian/installer/mipsel/modules/mipsel-loongson-2e/firewire-core-modules @@ -0,0 +1 @@ +#include diff --git a/debian/installer/mipsel/modules/mipsel-loongson-2e/hfs-modules b/debian/installer/mipsel/modules/mipsel-loongson-2e/hfs-modules new file mode 100644 index 000000000..57d12f649 --- /dev/null +++ b/debian/installer/mipsel/modules/mipsel-loongson-2e/hfs-modules @@ -0,0 +1 @@ +#include diff --git a/debian/installer/mipsel/modules/mipsel-loongson-2e/minix-modules b/debian/installer/mipsel/modules/mipsel-loongson-2e/minix-modules new file mode 100644 index 000000000..82b984372 --- /dev/null +++ b/debian/installer/mipsel/modules/mipsel-loongson-2e/minix-modules @@ -0,0 +1 @@ +#include diff --git a/debian/installer/mipsel/modules/mipsel-loongson-2e/nfs-modules b/debian/installer/mipsel/modules/mipsel-loongson-2e/nfs-modules new file mode 100644 index 000000000..946fb8e44 --- /dev/null +++ b/debian/installer/mipsel/modules/mipsel-loongson-2e/nfs-modules @@ -0,0 +1 @@ +#include diff --git a/debian/installer/mipsel/modules/mipsel-loongson-2e/nic-modules b/debian/installer/mipsel/modules/mipsel-loongson-2e/nic-modules index 361c75a24..5d1474eba 100644 --- a/debian/installer/mipsel/modules/mipsel-loongson-2e/nic-modules +++ b/debian/installer/mipsel/modules/mipsel-loongson-2e/nic-modules @@ -1,2 +1,14 @@ -8139too -r8169 +#include +8139cp - +dmfe - +e100 - +epic100 - +fealnx - +natsemi - +ne2k-pci - +skfp - +starfire - +sundance - +tulip - +typhoon - +winbond-840 - diff --git a/debian/installer/mipsel/modules/mipsel-loongson-2e/nic-wireless-modules b/debian/installer/mipsel/modules/mipsel-loongson-2e/nic-wireless-modules new file mode 100644 index 000000000..53fd18d7f --- /dev/null +++ b/debian/installer/mipsel/modules/mipsel-loongson-2e/nic-wireless-modules @@ -0,0 +1 @@ +#include diff --git a/debian/installer/mipsel/modules/mipsel-loongson-2e/ntfs-modules b/debian/installer/mipsel/modules/mipsel-loongson-2e/ntfs-modules new file mode 100644 index 000000000..ac1bc6a96 --- /dev/null +++ b/debian/installer/mipsel/modules/mipsel-loongson-2e/ntfs-modules @@ -0,0 +1 @@ +ntfs diff --git a/debian/installer/mipsel/modules/mipsel-loongson-2e/pata-modules b/debian/installer/mipsel/modules/mipsel-loongson-2e/pata-modules new file mode 100644 index 000000000..b0cd6337a --- /dev/null +++ b/debian/installer/mipsel/modules/mipsel-loongson-2e/pata-modules @@ -0,0 +1 @@ +#include diff --git a/debian/installer/mipsel/modules/mipsel-loongson-2e/qnx4-modules b/debian/installer/mipsel/modules/mipsel-loongson-2e/qnx4-modules new file mode 100644 index 000000000..cd0c96d41 --- /dev/null +++ b/debian/installer/mipsel/modules/mipsel-loongson-2e/qnx4-modules @@ -0,0 +1 @@ +#include diff --git a/debian/installer/mipsel/modules/mipsel-loongson-2e/scsi-common-modules b/debian/installer/mipsel/modules/mipsel-loongson-2e/scsi-common-modules new file mode 100644 index 000000000..748049f2e --- /dev/null +++ b/debian/installer/mipsel/modules/mipsel-loongson-2e/scsi-common-modules @@ -0,0 +1,2 @@ +#include +sym53c8xx - diff --git a/debian/installer/mipsel/modules/mipsel-loongson-2e/scsi-core-modules b/debian/installer/mipsel/modules/mipsel-loongson-2e/scsi-core-modules new file mode 100644 index 000000000..dd65d6614 --- /dev/null +++ b/debian/installer/mipsel/modules/mipsel-loongson-2e/scsi-core-modules @@ -0,0 +1 @@ +#include diff --git a/debian/installer/mipsel/modules/mipsel-loongson-2e/scsi-extra-modules b/debian/installer/mipsel/modules/mipsel-loongson-2e/scsi-extra-modules new file mode 100644 index 000000000..3a9aad711 --- /dev/null +++ b/debian/installer/mipsel/modules/mipsel-loongson-2e/scsi-extra-modules @@ -0,0 +1,4 @@ +#include +cciss - +DAC960 - +ips - diff --git a/debian/installer/mipsel/modules/mipsel-loongson-2e/scsi-modules b/debian/installer/mipsel/modules/mipsel-loongson-2e/scsi-modules new file mode 100644 index 000000000..752805752 --- /dev/null +++ b/debian/installer/mipsel/modules/mipsel-loongson-2e/scsi-modules @@ -0,0 +1,3 @@ +#include +dmx3191d - +tmscsim - diff --git a/debian/installer/mipsel/modules/mipsel-loongson-2e/sound-modules b/debian/installer/mipsel/modules/mipsel-loongson-2e/sound-modules new file mode 100644 index 000000000..68395ab3d --- /dev/null +++ b/debian/installer/mipsel/modules/mipsel-loongson-2e/sound-modules @@ -0,0 +1 @@ +#include diff --git a/debian/installer/mipsel/modules/mipsel-loongson-2e/speakup-modules b/debian/installer/mipsel/modules/mipsel-loongson-2e/speakup-modules new file mode 100644 index 000000000..29592721a --- /dev/null +++ b/debian/installer/mipsel/modules/mipsel-loongson-2e/speakup-modules @@ -0,0 +1 @@ +#include diff --git a/debian/installer/mipsel/modules/mipsel-loongson-2e/usb-serial-modules b/debian/installer/mipsel/modules/mipsel-loongson-2e/usb-serial-modules new file mode 100644 index 000000000..c0a0dc3bd --- /dev/null +++ b/debian/installer/mipsel/modules/mipsel-loongson-2e/usb-serial-modules @@ -0,0 +1 @@ +#include diff --git a/debian/installer/mipsel/modules/mipsel-loongson-2f/affs-modules b/debian/installer/mipsel/modules/mipsel-loongson-2f/affs-modules new file mode 100644 index 000000000..21d616a1c --- /dev/null +++ b/debian/installer/mipsel/modules/mipsel-loongson-2f/affs-modules @@ -0,0 +1 @@ +#include diff --git a/debian/installer/mipsel/modules/mipsel-loongson-2f/ata-modules b/debian/installer/mipsel/modules/mipsel-loongson-2f/ata-modules new file mode 100644 index 000000000..b81c0f38b --- /dev/null +++ b/debian/installer/mipsel/modules/mipsel-loongson-2f/ata-modules @@ -0,0 +1 @@ +#include diff --git a/debian/installer/mipsel/modules/mipsel-loongson-2f/event-modules b/debian/installer/mipsel/modules/mipsel-loongson-2f/event-modules new file mode 100644 index 000000000..f8819afd3 --- /dev/null +++ b/debian/installer/mipsel/modules/mipsel-loongson-2f/event-modules @@ -0,0 +1 @@ +#include diff --git a/debian/installer/mipsel/modules/mipsel-loongson-2f/firewire-core-modules b/debian/installer/mipsel/modules/mipsel-loongson-2f/firewire-core-modules new file mode 100644 index 000000000..dcac80af9 --- /dev/null +++ b/debian/installer/mipsel/modules/mipsel-loongson-2f/firewire-core-modules @@ -0,0 +1 @@ +#include diff --git a/debian/installer/mipsel/modules/mipsel-loongson-2f/hfs-modules b/debian/installer/mipsel/modules/mipsel-loongson-2f/hfs-modules new file mode 100644 index 000000000..57d12f649 --- /dev/null +++ b/debian/installer/mipsel/modules/mipsel-loongson-2f/hfs-modules @@ -0,0 +1 @@ +#include diff --git a/debian/installer/mipsel/modules/mipsel-loongson-2f/minix-modules b/debian/installer/mipsel/modules/mipsel-loongson-2f/minix-modules new file mode 100644 index 000000000..82b984372 --- /dev/null +++ b/debian/installer/mipsel/modules/mipsel-loongson-2f/minix-modules @@ -0,0 +1 @@ +#include diff --git a/debian/installer/mipsel/modules/mipsel-loongson-2f/nfs-modules b/debian/installer/mipsel/modules/mipsel-loongson-2f/nfs-modules new file mode 100644 index 000000000..946fb8e44 --- /dev/null +++ b/debian/installer/mipsel/modules/mipsel-loongson-2f/nfs-modules @@ -0,0 +1 @@ +#include diff --git a/debian/installer/mipsel/modules/mipsel-loongson-2f/nic-modules b/debian/installer/mipsel/modules/mipsel-loongson-2f/nic-modules index 361c75a24..5d1474eba 100644 --- a/debian/installer/mipsel/modules/mipsel-loongson-2f/nic-modules +++ b/debian/installer/mipsel/modules/mipsel-loongson-2f/nic-modules @@ -1,2 +1,14 @@ -8139too -r8169 +#include +8139cp - +dmfe - +e100 - +epic100 - +fealnx - +natsemi - +ne2k-pci - +skfp - +starfire - +sundance - +tulip - +typhoon - +winbond-840 - diff --git a/debian/installer/mipsel/modules/mipsel-loongson-2f/nic-wireless-modules b/debian/installer/mipsel/modules/mipsel-loongson-2f/nic-wireless-modules new file mode 100644 index 000000000..53fd18d7f --- /dev/null +++ b/debian/installer/mipsel/modules/mipsel-loongson-2f/nic-wireless-modules @@ -0,0 +1 @@ +#include diff --git a/debian/installer/mipsel/modules/mipsel-loongson-2f/ntfs-modules b/debian/installer/mipsel/modules/mipsel-loongson-2f/ntfs-modules new file mode 100644 index 000000000..ac1bc6a96 --- /dev/null +++ b/debian/installer/mipsel/modules/mipsel-loongson-2f/ntfs-modules @@ -0,0 +1 @@ +ntfs diff --git a/debian/installer/mipsel/modules/mipsel-loongson-2f/pata-modules b/debian/installer/mipsel/modules/mipsel-loongson-2f/pata-modules new file mode 100644 index 000000000..b0cd6337a --- /dev/null +++ b/debian/installer/mipsel/modules/mipsel-loongson-2f/pata-modules @@ -0,0 +1 @@ +#include diff --git a/debian/installer/mipsel/modules/mipsel-loongson-2f/qnx4-modules b/debian/installer/mipsel/modules/mipsel-loongson-2f/qnx4-modules new file mode 100644 index 000000000..cd0c96d41 --- /dev/null +++ b/debian/installer/mipsel/modules/mipsel-loongson-2f/qnx4-modules @@ -0,0 +1 @@ +#include diff --git a/debian/installer/mipsel/modules/mipsel-loongson-2f/scsi-common-modules b/debian/installer/mipsel/modules/mipsel-loongson-2f/scsi-common-modules new file mode 100644 index 000000000..748049f2e --- /dev/null +++ b/debian/installer/mipsel/modules/mipsel-loongson-2f/scsi-common-modules @@ -0,0 +1,2 @@ +#include +sym53c8xx - diff --git a/debian/installer/mipsel/modules/mipsel-loongson-2f/scsi-core-modules b/debian/installer/mipsel/modules/mipsel-loongson-2f/scsi-core-modules new file mode 100644 index 000000000..dd65d6614 --- /dev/null +++ b/debian/installer/mipsel/modules/mipsel-loongson-2f/scsi-core-modules @@ -0,0 +1 @@ +#include diff --git a/debian/installer/mipsel/modules/mipsel-loongson-2f/scsi-extra-modules b/debian/installer/mipsel/modules/mipsel-loongson-2f/scsi-extra-modules new file mode 100644 index 000000000..3a9aad711 --- /dev/null +++ b/debian/installer/mipsel/modules/mipsel-loongson-2f/scsi-extra-modules @@ -0,0 +1,4 @@ +#include +cciss - +DAC960 - +ips - diff --git a/debian/installer/mipsel/modules/mipsel-loongson-2f/scsi-modules b/debian/installer/mipsel/modules/mipsel-loongson-2f/scsi-modules new file mode 100644 index 000000000..752805752 --- /dev/null +++ b/debian/installer/mipsel/modules/mipsel-loongson-2f/scsi-modules @@ -0,0 +1,3 @@ +#include +dmx3191d - +tmscsim - diff --git a/debian/installer/mipsel/modules/mipsel-loongson-2f/sound-modules b/debian/installer/mipsel/modules/mipsel-loongson-2f/sound-modules new file mode 100644 index 000000000..68395ab3d --- /dev/null +++ b/debian/installer/mipsel/modules/mipsel-loongson-2f/sound-modules @@ -0,0 +1 @@ +#include diff --git a/debian/installer/mipsel/modules/mipsel-loongson-2f/speakup-modules b/debian/installer/mipsel/modules/mipsel-loongson-2f/speakup-modules new file mode 100644 index 000000000..29592721a --- /dev/null +++ b/debian/installer/mipsel/modules/mipsel-loongson-2f/speakup-modules @@ -0,0 +1 @@ +#include diff --git a/debian/installer/mipsel/modules/mipsel-loongson-2f/usb-serial-modules b/debian/installer/mipsel/modules/mipsel-loongson-2f/usb-serial-modules new file mode 100644 index 000000000..c0a0dc3bd --- /dev/null +++ b/debian/installer/mipsel/modules/mipsel-loongson-2f/usb-serial-modules @@ -0,0 +1 @@ +#include diff --git a/debian/installer/mipsel/modules/mipsel-loongson-3/affs-modules b/debian/installer/mipsel/modules/mipsel-loongson-3/affs-modules new file mode 100644 index 000000000..21d616a1c --- /dev/null +++ b/debian/installer/mipsel/modules/mipsel-loongson-3/affs-modules @@ -0,0 +1 @@ +#include diff --git a/debian/installer/mipsel/modules/mipsel-loongson-3/ata-modules b/debian/installer/mipsel/modules/mipsel-loongson-3/ata-modules index 9409e7cde..b81c0f38b 100644 --- a/debian/installer/mipsel/modules/mipsel-loongson-3/ata-modules +++ b/debian/installer/mipsel/modules/mipsel-loongson-3/ata-modules @@ -1,2 +1 @@ #include - diff --git a/debian/installer/mipsel/modules/mipsel-loongson-3/hfs-modules b/debian/installer/mipsel/modules/mipsel-loongson-3/hfs-modules new file mode 100644 index 000000000..57d12f649 --- /dev/null +++ b/debian/installer/mipsel/modules/mipsel-loongson-3/hfs-modules @@ -0,0 +1 @@ +#include diff --git a/debian/installer/mipsel/modules/mipsel-loongson-3/minix-modules b/debian/installer/mipsel/modules/mipsel-loongson-3/minix-modules new file mode 100644 index 000000000..82b984372 --- /dev/null +++ b/debian/installer/mipsel/modules/mipsel-loongson-3/minix-modules @@ -0,0 +1 @@ +#include diff --git a/debian/installer/mipsel/modules/mipsel-loongson-3/nfs-modules b/debian/installer/mipsel/modules/mipsel-loongson-3/nfs-modules new file mode 100644 index 000000000..946fb8e44 --- /dev/null +++ b/debian/installer/mipsel/modules/mipsel-loongson-3/nfs-modules @@ -0,0 +1 @@ +#include diff --git a/debian/installer/mipsel/modules/mipsel-loongson-3/nic-modules b/debian/installer/mipsel/modules/mipsel-loongson-3/nic-modules index 2512e8395..a2feefcfc 100644 --- a/debian/installer/mipsel/modules/mipsel-loongson-3/nic-modules +++ b/debian/installer/mipsel/modules/mipsel-loongson-3/nic-modules @@ -1 +1,11 @@ #include +dmfe - +epic100 - +fealnx - +natsemi - +skfp - +starfire - +sundance - +tulip - +typhoon - +winbond-840 - diff --git a/debian/installer/mipsel/modules/mipsel-loongson-3/pata-modules b/debian/installer/mipsel/modules/mipsel-loongson-3/pata-modules index 8c4e514ae..b0cd6337a 100644 --- a/debian/installer/mipsel/modules/mipsel-loongson-3/pata-modules +++ b/debian/installer/mipsel/modules/mipsel-loongson-3/pata-modules @@ -1,2 +1 @@ #include - diff --git a/debian/installer/mipsel/modules/mipsel-loongson-3/qnx4-modules b/debian/installer/mipsel/modules/mipsel-loongson-3/qnx4-modules new file mode 100644 index 000000000..cd0c96d41 --- /dev/null +++ b/debian/installer/mipsel/modules/mipsel-loongson-3/qnx4-modules @@ -0,0 +1 @@ +#include diff --git a/debian/installer/mipsel/modules/mipsel-loongson-3/scsi-common-modules b/debian/installer/mipsel/modules/mipsel-loongson-3/scsi-common-modules index 71103dd60..748049f2e 100644 --- a/debian/installer/mipsel/modules/mipsel-loongson-3/scsi-common-modules +++ b/debian/installer/mipsel/modules/mipsel-loongson-3/scsi-common-modules @@ -1 +1,2 @@ #include +sym53c8xx - diff --git a/debian/installer/mipsel/modules/mipsel-loongson-3/scsi-extra-modules b/debian/installer/mipsel/modules/mipsel-loongson-3/scsi-extra-modules index cd13edec5..3a9aad711 100644 --- a/debian/installer/mipsel/modules/mipsel-loongson-3/scsi-extra-modules +++ b/debian/installer/mipsel/modules/mipsel-loongson-3/scsi-extra-modules @@ -1 +1,4 @@ #include +cciss - +DAC960 - +ips - diff --git a/debian/installer/mipsel/modules/mipsel-loongson-3/scsi-modules b/debian/installer/mipsel/modules/mipsel-loongson-3/scsi-modules index 8909dfb79..752805752 100644 --- a/debian/installer/mipsel/modules/mipsel-loongson-3/scsi-modules +++ b/debian/installer/mipsel/modules/mipsel-loongson-3/scsi-modules @@ -1 +1,3 @@ #include +dmx3191d - +tmscsim - diff --git a/debian/installer/modules/scsi-core-modules b/debian/installer/modules/scsi-core-modules index 372fed5ed..bc3f355bc 100644 --- a/debian/installer/modules/scsi-core-modules +++ b/debian/installer/modules/scsi-core-modules @@ -1,3 +1,5 @@ scsi_dh scsi_mod sd_mod +scsi_transport_sas ? +scsi_transport_spi ? diff --git a/debian/installer/powerpc/modules/powerpc/scsi-core-modules b/debian/installer/powerpc/modules/powerpc/scsi-core-modules index 6ec85bb77..328c8aec4 100644 --- a/debian/installer/powerpc/modules/powerpc/scsi-core-modules +++ b/debian/installer/powerpc/modules/powerpc/scsi-core-modules @@ -1,3 +1,2 @@ #include scsi_mod - -scsi_transport_spi diff --git a/debian/installer/sparc/modules/sparc/scsi-core-modules b/debian/installer/sparc/modules/sparc/scsi-core-modules index d1834e5af..6026fdf46 100644 --- a/debian/installer/sparc/modules/sparc/scsi-core-modules +++ b/debian/installer/sparc/modules/sparc/scsi-core-modules @@ -1,6 +1,4 @@ #include -scsi_transport_spi -scsi_transport_sas # Support for virtual disk devices as a client under Sun Logical Domains. # Does not really belong here, but it's better than adding a new kernel diff --git a/debian/patches/bugfix/s390/s390-ptrace-fix-PSW-mask-check.patch b/debian/patches/bugfix/s390/s390-ptrace-fix-PSW-mask-check.patch new file mode 100644 index 000000000..af6c8fb65 --- /dev/null +++ b/debian/patches/bugfix/s390/s390-ptrace-fix-PSW-mask-check.patch @@ -0,0 +1,56 @@ +From: Martin Schwidefsky +Date: Mon, 23 Jun 2014 15:29:40 +0200 +Subject: s390/ptrace: fix PSW mask check +Origin: https://git.kernel.org/linus/dab6cf55f81a6e16b8147aed9a843e1691dcd318 + +The PSW mask check of the PTRACE_POKEUSR_AREA command is incorrect. +The PSW_MASK_USER define contains the PSW_MASK_ASC bits, the ptrace +interface accepts all combinations for the address-space-control +bits. To protect the kernel space the PSW mask check in ptrace needs +to reject the address-space-control bit combination for home space. + +Fixes CVE-2014-3534 + +Cc: stable@vger.kernel.org +Signed-off-by: Martin Schwidefsky +--- + arch/s390/kernel/ptrace.c | 12 ++++++++++-- + 1 file changed, 10 insertions(+), 2 deletions(-) + +diff --git a/arch/s390/kernel/ptrace.c b/arch/s390/kernel/ptrace.c +index 2d716734..5dc7ad9 100644 +--- a/arch/s390/kernel/ptrace.c ++++ b/arch/s390/kernel/ptrace.c +@@ -334,9 +334,14 @@ static int __poke_user(struct task_struct *child, addr_t addr, addr_t data) + unsigned long mask = PSW_MASK_USER; + + mask |= is_ri_task(child) ? PSW_MASK_RI : 0; +- if ((data & ~mask) != PSW_USER_BITS) ++ if ((data ^ PSW_USER_BITS) & ~mask) ++ /* Invalid psw mask. */ ++ return -EINVAL; ++ if ((data & PSW_MASK_ASC) == PSW_ASC_HOME) ++ /* Invalid address-space-control bits */ + return -EINVAL; + if ((data & PSW_MASK_EA) && !(data & PSW_MASK_BA)) ++ /* Invalid addressing mode bits */ + return -EINVAL; + } + *(addr_t *)((addr_t) &task_pt_regs(child)->psw + addr) = data; +@@ -672,9 +677,12 @@ static int __poke_user_compat(struct task_struct *child, + + mask |= is_ri_task(child) ? PSW32_MASK_RI : 0; + /* Build a 64 bit psw mask from 31 bit mask. */ +- if ((tmp & ~mask) != PSW32_USER_BITS) ++ if ((tmp ^ PSW32_USER_BITS) & ~mask) + /* Invalid psw mask. */ + return -EINVAL; ++ if ((data & PSW32_MASK_ASC) == PSW32_ASC_HOME) ++ /* Invalid address-space-control bits */ ++ return -EINVAL; + regs->psw.mask = (regs->psw.mask & ~PSW_MASK_USER) | + (regs->psw.mask & PSW_MASK_BA) | + (__u64)(tmp & mask) << 32; +-- +2.0.0 + diff --git a/debian/patches/series b/debian/patches/series index f0458737c..f55e392ab 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -59,6 +59,7 @@ bugfix/mips/MIPS-ZBOOT-add-missing-linux-string.h-include.patch bugfix/all/misc-bmp085-Enable-building-as-a-module.patch bugfix/all/kbuild-use-nostdinc-in-compile-tests.patch bugfix/all/disable-some-marvell-phys.patch +bugfix/s390/s390-ptrace-fix-PSW-mask-check.patch # Miscellaneous features features/all/x86-memtest-WARN-if-bad-RAM-found.patch