diff options
| -rw-r--r-- | Makefile | 2 | ||||
| -rwxr-xr-x | make_boot_img | 4 | ||||
| -rw-r--r-- | perl-install/ChangeLog | 8 | ||||
| -rw-r--r-- | perl-install/Makefile | 2 | ||||
| -rw-r--r-- | perl-install/crypto.pm | 2 | ||||
| -rw-r--r-- | perl-install/modules.pm | 2 | ||||
| -rwxr-xr-x | tools/syncrpms | 6 |
7 files changed, 18 insertions, 8 deletions
@@ -1,7 +1,7 @@ ARCH := $(patsubst i%86,i386,$(shell uname -m)) ARCH := $(patsubst sparc%,sparc,$(ARCH)) -RELEASE_BOOT_IMG = hd.img cdrom.img network.img blank.img +RELEASE_BOOT_IMG = hd.img cdrom.img network.img ifeq (i386,$(ARCH)) BOOT_IMG = pcmcia_ks.img network_ks.img RELEASE_BOOT_IMG += pcmcia.img diff --git a/make_boot_img b/make_boot_img index 2eb091fa7..58dff887e 100755 --- a/make_boot_img +++ b/make_boot_img @@ -224,7 +224,7 @@ image[sun4u]=/$boot/vmlinux64 output("$dir/$boot/README", " To Build a Bootable CD-ROM, try: - mkisofs -R -o t.iso -S $boot/cd.b -B $boot/second.b -s /$boot/silo.conf /export + mkisofs -R -o t.iso -s /$boot/silo.conf /export "); } elsif ($type =~ /^tftprd(.*)/) { my $dir = "/export"; @@ -260,7 +260,7 @@ read-write image=/vmlinux$I.gz label=linux initrd=/$type.rdz - append=ramdisk_size=32000 $ltype$corporate + append=\"ramdisk_size=32000 $ltype$corporate\" "); _ "genromfs -d $dir -f /dev/ram -A 2048,/.. -a 512 -V \'DrakX boot disk\'"; _ "$sudo mount -t romfs /dev/ram $mnt"; 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; } diff --git a/tools/syncrpms b/tools/syncrpms index d18bdc025..ccb806d6c 100755 --- a/tools/syncrpms +++ b/tools/syncrpms @@ -66,7 +66,7 @@ sub get_rpms { opendir D, $dir or die "cannot open directory $dir\n"; map { - if (/([^\/]*?)-([^-]*)-([^-]*)\.([^-]*)\.rpm$/) { + if (/([^\/]*?)-([^-]*)-([^-]*)\.([^-\.]*)\.rpm$/) { my $key = "$1 $4"; #- get name including architecture. if ($rpms->{$key}) { if (version_compare($2, $rpms->{$key}{version}) > 0 || @@ -255,10 +255,10 @@ sub main { #- parse directory structures. get_rpms($_, \%source, \%flag, 0) foreach @from_rpms; - get_rpms($_, \%target, \%flag, 1) foreach @to_rpms; - print STDERR "reading " . scalar(keys %source) . " packages as source rpms from\n"; print STDERR " $_\n" foreach @from_rpms; + + get_rpms($_, \%target, \%flag, 1) foreach @to_rpms; print STDERR "reading " . scalar(keys %target) . " packages as target rpms from\n"; print STDERR " $_\n" foreach @to_rpms; |