summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorent Villard <warly@mandriva.com>2005-08-03 08:44:45 +0000
committerFlorent Villard <warly@mandriva.com>2005-08-03 08:44:45 +0000
commitbdf4bc857319259bc45034cab0bdde789d1c060c (patch)
treef1f427d94885802abf6f3924d017a71d5831d2e6
parente3118defcdf0e9cd2acb9a594a055cf543545190 (diff)
downloaddrakx-backup-do-not-use-bdf4bc857319259bc45034cab0bdde789d1c060c.tar
drakx-backup-do-not-use-bdf4bc857319259bc45034cab0bdde789d1c060c.tar.gz
drakx-backup-do-not-use-bdf4bc857319259bc45034cab0bdde789d1c060c.tar.bz2
drakx-backup-do-not-use-bdf4bc857319259bc45034cab0bdde789d1c060c.tar.xz
drakx-backup-do-not-use-bdf4bc857319259bc45034cab0bdde789d1c060c.zip
revert changes
-rw-r--r--kernel/list_modules.pm8
-rw-r--r--kernel/modules.pl4
-rw-r--r--perl-install/share/list.xml15
3 files changed, 6 insertions, 21 deletions
diff --git a/kernel/list_modules.pm b/kernel/list_modules.pm
index 0efa935fc..abfde8000 100644
--- a/kernel/list_modules.pm
+++ b/kernel/list_modules.pm
@@ -95,11 +95,11 @@ our %l = (
'53c7,8xx',
qw(AM53C974 BusLogic NCR53c406a a100u2w advansys aha152x aha1542 aha1740),
qw(atp870u dc395x dc395x_trm dmx3191d dtc g_NCR5380 in2000 initio pas16 pci2220i psi240i fdomain),
- qw(qla1280 qla2x00 qlogicfas qlogicfc),
+ qw(qla1280 qla2x00 qla2xxx qlogicfas qlogicfc),
qw(seagate wd7000 sim710 sym53c416 t128 tmscsim u14-34f ultrastor),
qw(eata eata_pio eata_dma nsp32),
),
- qw(aic7xxx aic7xxx_old aic79xx pci2000 qlogicisp lpfcdd), # ncr53c8xx
+ qw(aic7xxx aic7xxx_old aic79xx pci2000 qlogicisp sym53c8xx lpfc lpfcdd), # ncr53c8xx
],
sata => [
# note that ata_piix manage RAID devices on ICH6R
@@ -118,7 +118,7 @@ our %l = (
),
),
],
- pcmcia => [ qw(aha152x_cs nsp_cs ide-cs) ], #ide_cs
+ pcmcia => [ qw(aha152x_cs fdomain_cs nsp_cs qlogic_cs ide-cs) ], #ide_cs
raw => [ qw(sd_mod) ],
usb => [ qw(usb-storage) ],
firewire => [ qw(sbp2) ],
@@ -138,7 +138,7 @@ our %l = (
if_(arch() !~ /^ppc/, qw(i2c-hydra i2c-ibm_iic i2c-mpc)),
],
pcmcia => [
- if_(arch() !~ /^sparc/, qw(au1x00_ss i82365 i82092 tcic vrc4171_card vrc4173_cardu yenta_socket)), # cb_enabler
+ if_(arch() !~ /^sparc/, qw(au1x00_ss i82365 i82092 pd6729 tcic vrc4171_card vrc4173_cardu yenta_socket)), # cb_enabler
],
usb_keyboard => [ qw(usbkbd keybdev) ],
#serial_cs
diff --git a/kernel/modules.pl b/kernel/modules.pl
index 1188fe8f7..22f71e048 100644
--- a/kernel/modules.pl
+++ b/kernel/modules.pl
@@ -26,7 +26,7 @@ my %modules_only_for_all_img = (
'disk/scsi' => [
# ISA cards:
- qw(NCR53c406a aha152x psi240i qlogicfc wd7000 sim710 t128 ultrastor), '53c7,8xx',
+ qw(NCR53c406a aha152x psi240i qlogicfas qlogicfc wd7000 sim710 t128 ultrastor), '53c7,8xx',
qw(qla2x00 in2000 pas16 a100u2w seagate g_NCR5380),
if_(arch() =~ /x86_64/, qw(53c7,8xx nsp32 initio advansys atp870u)), #- old
qw(AM53C974), # deprecated by tmscsim
@@ -92,7 +92,7 @@ my @modules_removed_from_stage1 = flatten_and_check(\%modules_removed_from_stage
my %images = (
pcmcia => 'fs/cdrom|loopback disk/cdrom|raw|pcmcia bus/pcmcia',
cdrom => 'fs/cdrom|loopback disk/cdrom|raw|scsi',
- network => '',
+ network => 'bus/usb|usb_keyboard|pcmcia disk/raw|usb',
network_drivers => 'fs/network|loopback network/main|pcmcia|usb|raw|gigabit',
all => 'fs/cdrom disk/cdrom|raw bus/usb|usb_keyboard disk/usb|scsi fs/loopback|local bus/pcmcia disk/ide|pcmcia|sata|hardware_raid fs/network network/main|pcmcia|usb|raw|gigabit|wireless|tokenring bus/firewire disk/firewire',
);
diff --git a/perl-install/share/list.xml b/perl-install/share/list.xml
index 7fed3e857..2ffde5fdd 100644
--- a/perl-install/share/list.xml
+++ b/perl-install/share/list.xml
@@ -117,17 +117,6 @@
/usr/share/themes/Galaxy/gtk-2.0/gtkrc
/bin/brltty
- /lib64/tls/libc-2.3.5.so
- /lib64/tls/libc.so.6
- /lib64/tls/libm-2.3.5.so
- /lib64/tls/libm.so.6
- /lib64/tls/libpthread-0.10.so
- /lib64/tls/libpthread.so.0
- /lib64/tls/librt-2.3.5.so
- /lib64/tls/librt.so.1
- /lib64/tls/libthread_db-1.0.so
- /lib64/tls/libthread_db.so.1
-
<from expand="glob">
/etc/gtk-2.0/gdk-pixbuf.loaders.*
/etc/gtk-2.0/gtk.immodules.*
@@ -247,10 +236,6 @@
ARCH-linux/Socket.pm
ARCH-linux/_h2ph_pre.ph
ARCH-linux/asm/unistd.ph
- <if ARCH="x86_64">
- ARCH-linux/asm-i386/unistd.ph
- ARCH-linux/asm-x86_64/unistd.ph
- </if>
<if ARCH="ia64">
ARCH-linux/asm-i386/unistd.ph
ARCH-linux/asm-x86_64/unistd.ph