summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>1999-11-07 13:51:08 +0000
committerPascal Rigaux <pixel@mandriva.com>1999-11-07 13:51:08 +0000
commitfe9d92c84e2888c470a72d903b78f74288c84a9b (patch)
tree423459c1c64bc8bc92c71f799b58814717f91d17
parent66f14d5895e94e97d100acece1b7df23a28cafc6 (diff)
downloaddrakx-fe9d92c84e2888c470a72d903b78f74288c84a9b.tar
drakx-fe9d92c84e2888c470a72d903b78f74288c84a9b.tar.gz
drakx-fe9d92c84e2888c470a72d903b78f74288c84a9b.tar.bz2
drakx-fe9d92c84e2888c470a72d903b78f74288c84a9b.tar.xz
drakx-fe9d92c84e2888c470a72d903b78f74288c84a9b.zip
no_comment
-rw-r--r--Makefile33
-rw-r--r--perl-install/devices.pm11
-rw-r--r--perl-install/install_steps_interactive.pm3
-rw-r--r--perl-install/pkgs.pm2
4 files changed, 24 insertions, 25 deletions
diff --git a/Makefile b/Makefile
index 86b3f77cd..ff30ac19b 100644
--- a/Makefile
+++ b/Makefile
@@ -1,39 +1,38 @@
BOOT_IMG = gi_hd.img gi_cdrom.img gi_network.img gi_network_ks.img gi_pcmcia.img gi_pcmcia_ks.img
BINS = install/install install/local-install install/installinit/init
-DIRS = install install/installinit mouseconfig perl-install ddcprobe
+DIRS = install install/installinit mouseconfig perl-install ddcprobe lnx4win
-.PHONY: $(DIRS) $(BOOT_IMG) $(FLOPPY_IMG) $(BINS) update_kernel
+.PHONY: dirs $(FLOPPY_IMG)
-all: $(DIRS) $(BOOT_IMG)
+install: build
mkdir /export/images 2>/dev/null ; true
cp -f $(BOOT_IMG) /export/images
+ make -C perl-install full_stage2
-clean:
- rm -rf $(BOOT_IMG) $(BINS) modules install_pcmcia_modules vmlinuz System.map
- rm -rf install/*/sbin/install install/*/sbin/init
- for i in $(DIRS); do make -C $$i clean; done
- find . -name "*~" -o -name ".#*" | xargs rm -f
+build: dirs $(BOOT_IMG)
-$(DIRS):
- make -C $@
+dirs:
+ for i in $(DIRS); do make -C $$i; done
-$(BOOT_IMG): $(BINS)
- if [ ! -e modules ]; then $(MAKE) update_kernel; fi
+$(BOOT_IMG): modules
+ make dirs
./make_boot_img $@ $(@:gi_%.img=%)
-$(BINS):
- $(MAKE) -C `dirname $@`
-
tar: clean
cd .. ; tar cfy gi.tar.bz2 gi
-update_kernel:
- cd install ; ln -sf ../kernel/cardmgr/* .
+modules: kernel/lib/modules
./update_kernel
$(BOOT_IMG:%=%f): %f: %
dd if=$< of=/dev/fd0
xmessage "Floppy done"
+clean:
+ rm -rf $(BOOT_IMG) $(BINS) modules install_pcmcia_modules vmlinuz System.map
+ rm -rf install/*/sbin/install install/*/sbin/init
+ for i in $(DIRS); do make -C $$i clean; done
+ find . -name "*~" -o -name ".#*" | xargs rm -f
+
# mkisofs -R -b images/gi_cdrom.img -c images/.catalog /tmp/r /mnt/disk/ | cdrecord -v -eject speed=6 dev=1,0 -
diff --git a/perl-install/devices.pm b/perl-install/devices.pm
index 6e1b7ccf4..ffc1aeaef 100644
--- a/perl-install/devices.pm
+++ b/perl-install/devices.pm
@@ -77,12 +77,12 @@ sub make($) {
} elsif (/(.*)(\d+)$/) {
($type, $major, $minor) =
@{ ${{"fd" => [ c::S_IFBLK(), 2, 0 ],
- "md" => [ c::S_IFBLK(), 9, 0 ],
+ "hidbp-mse-" => [ c::S_IFCHR(), 10, 32 ],
"lp" => [ c::S_IFCHR(), 6, 0 ],
- "scd" => [ c::S_IFBLK(), 11, 0 ],
+ "md" => [ c::S_IFBLK(), 9, 0 ],
"nst" => [ c::S_IFCHR(), 9, 128],
+ "scd" => [ c::S_IFBLK(), 11, 0 ],
"ttyS" => [ c::S_IFCHR(), 4, 64 ],
- "hidbp-mse-" => [ c::S_IFCHR(), 10, 32 ],
}}{$1}};
$minor += $2;
}
@@ -93,17 +93,16 @@ sub make($) {
"cdu31a" => [ c::S_IFBLK(), 15, 0 ],
"cdu535" => [ c::S_IFBLK(), 24, 0 ],
"cm206cd" => [ c::S_IFBLK(), 32, 0 ],
- "tty" => [ c::S_IFCHR(), 5, 0 ],
"gscd" => [ c::S_IFBLK(), 16, 0 ],
"mcd" => [ c::S_IFBLK(), 23, 0 ],
"mcdx" => [ c::S_IFBLK(), 20, 0 ],
"mem" => [ c::S_IFCHR(), 1, 1 ],
+ "optcd" => [ c::S_IFBLK(), 17, 0 ],
"psaux" => [ c::S_IFCHR(), 10, 1 ],
"random" => [ c::S_IFCHR(), 1, 8 ],
- "optcd" => [ c::S_IFBLK(), 17, 0 ],
"sbpcd" => [ c::S_IFBLK(), 25, 0 ],
"sjcd" => [ c::S_IFBLK(), 18, 0 ],
- "psaux" => [ c::S_IFCHR(), 10, 1 ],
+ "tty" => [ c::S_IFCHR(), 5, 0 ],
"usbmouse"=> [ c::S_IFCHR(), 10, 32], #- aka hidbp-mse-0
"zero" => [ c::S_IFCHR(), 1, 5 ],
}}{$_} or die "unknown device $_" };
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index 533926784..782a8f3cc 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -969,7 +969,8 @@ sub setup_thiskind {
my @r = $o->load_module($type) or return;
push @l, \@r;
} else {
- $o->ask_warn('', [ pci_probing::main::list() ]);
+ eval { commands::modprobe("isapnp") };
+ $o->ask_warn('', [ pci_probing::main::list(), cat_("/proc/isapnp") ]);
}
}
}
diff --git a/perl-install/pkgs.pm b/perl-install/pkgs.pm
index 53fca5a99..bb83ab3ca 100644
--- a/perl-install/pkgs.pm
+++ b/perl-install/pkgs.pm
@@ -270,7 +270,7 @@ sub setSelectedFromCompssList($$$$$$) {
my ($compssListLevels, $packages, $size, $install_class, $lang, $isUpgrade) = @_;
my ($level, $ind) = 100;
- my @packages = values %$packages;
+ my @packages = allpackages($packages);
my @places = do {
map_index { $ind = $::i if $_ eq $install_class } @{$compssListLevels};
defined $ind or log::l("unknown install class $install_class in compssList"), return;