summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/ChangeLog8
-rw-r--r--perl-install/Makefile2
-rw-r--r--perl-install/crypto.pm2
-rw-r--r--perl-install/modules.pm2
4 files changed, 12 insertions, 2 deletions
diff --git a/perl-install/ChangeLog b/perl-install/ChangeLog
index 60018e4bc..8d394f12b 100644
--- a/perl-install/ChangeLog
+++ b/perl-install/ChangeLog
@@ -1,3 +1,11 @@
+2000-06-19 François Pons <fpons@mandrakesoft.com>
+
+ * crypto.pm: modified for getting sparc crypto file for sparc*.
+ * modules.pm: make sure to load sd_mod when needed.
+ * pci_probing/main.pm: always use loaw_endian in pci structs.
+ * pci_probing/translate-pcitable.pl: added arch specific module name
+ translation.
+
2000-06-16 Pixel <pixel@mandrakesoft.com>
* modules.pm (write_conf): rename conf.modules to modules.conf if
diff --git a/perl-install/Makefile b/perl-install/Makefile
index 77a3762be..2ddc0ea65 100644
--- a/perl-install/Makefile
+++ b/perl-install/Makefile
@@ -88,6 +88,7 @@ ifeq (sparc,$(ARCH))
endif
for i in `cat /tmp/list`; do \
+ if [ -e $$i ]; then \
if (echo $$i | grep -q "lib/[^/]*\.so"); then \
install -s $$i $(DEST)/lib; \
else \
@@ -103,6 +104,7 @@ endif
cp -f $$i $$d; \
fi; \
fi; \
+ fi; \
done
mv -f $(DEST)/lib/libimlib-png.so $(DEST)/usr/lib
diff --git a/perl-install/crypto.pm b/perl-install/crypto.pm
index 2465c675d..f15c8914f 100644
--- a/perl-install/crypto.pm
+++ b/perl-install/crypto.pm
@@ -30,7 +30,7 @@ sub require2package { $deps{$_[0]} || $_[0] }
sub mirror2text($) { $mirrors{$_[0]} && "$mirrors{$_[0]}[0] ($_[0])" }
sub mirrorstext() { map { mirror2text($_) } keys %mirrors }
sub text2mirror($) { first($_[0] =~ /\((.*)\)$/) }
-sub dir { $mirrors{$_[0]}[1] . '/' . (arch() !~ /i.86/ && arch() . '/') . $::VERSION }
+sub dir { $mirrors{$_[0]}[1] . '/' . (arch() !~ /i.86/ && ((arch() =~ /sparc/ ? "sparc" : arch()). '/')) . $::VERSION }
sub ftp($) { ftp::new($_[0], dir($_[0])) }
sub getFile($$) {
diff --git a/perl-install/modules.pm b/perl-install/modules.pm
index f68e8f726..7456cb462 100644
--- a/perl-install/modules.pm
+++ b/perl-install/modules.pm
@@ -388,7 +388,7 @@ sub load {
if ($type) {
add_alias('usb-interface', $name) if $type =~ /SERIAL_USB/i;
- add_alias('scsi_hostadapter', $name) if $type eq "scsi" || $type eq $type_aliases{scsi};
+ add_alias('scsi_hostadapter', $name), load('sd_mod') if $type eq "scsi" || $type eq $type_aliases{scsi};
}
$conf{$name}{options} = join " ", @options if @options;
}