no_comment

7 files changed, 33 insertions, 25 deletions

diff --git a/Makefile b/Makefile
index 0de4edf9b..217ef99a1 100644
--- a/Makefile
+++ b/Makefile
@@ -9,7 +9,6 @@ ROOTDEST = /export
 install: build
 	for i in images misc Mandrake Mandrake/base; do install -d $(ROOTDEST)/$$i ; done
 	cp -f $(BOOT_IMG) $(ROOTDEST)/images ; rm $(ROOTDEST)/images/*_ks.img
-	install make_mdkinst_stage2 $(ROOTDEST)/misc
 	make -C perl-install full_stage2
 
 build: dirs $(BOOT_IMG)
@@ -41,9 +40,9 @@ upload: tar install
 	touch /tmp/mdkinst_done
 	cd $(ROOTDEST)/Mandrake ; tar cfz mdkinst.tgz mdkinst
 
-#	lftp -c "open -u devel mandrakesoft.com; cd ~/cooker/cooker/images ; mput $(ROOTDEST)/images/gi_*.img"
-	lftp -c "open -u devel mandrakesoft.com; cd ~/tmp ; put $(ROOTDEST)/Mandrake/mdkinst.tgz ; put /tmp/mdkinst_done ; cd ~/cooker/cooker/Mandrake/base ; put $(ROOTDEST)/Mandrake/base/mdkinst_stage2.gz ; put ~/gi/perl-install/compss ; put ~/gi/perl-install/compssList ; put ~/gi/perl-install/compssUsers ; cd ~/cooker/cooker/misc ; put ~/gi/make_mdkinst_stage2 "
-#	lftp -c "open -u devel mandrakesoft.com; cd ~/cooker/contrib/others/src ; put ~/gi.tar.bz2"
+	lftp -c "open -u devel mandrakesoft.com; cd ~/cooker/cooker/images ; mput $(ROOTDEST)/images/gi_*.img"
+	lftp -c "open -u devel mandrakesoft.com; cd ~/tmp ; put $(ROOTDEST)/Mandrake/mdkinst.tgz ; put /tmp/mdkinst_done ; cd ~/cooker/cooker/Mandrake/base ; put $(ROOTDEST)/Mandrake/base/mdkinst_stage2.gz ; put ~/gi/perl-install/compss ; put ~/gi/perl-install/compssList ; put ~/gi/perl-install/compssUsers ; cd ~/cooker/cooker/misc ; put ~/gi/tools/make_mdkinst_stage2 "
+	lftp -c "open -u devel mandrakesoft.com; cd ~/cooker/contrib/others/src ; put ~/gi.tar.bz2"
 	rm -f $(ROOTDEST)/Mandrake/mdkinst.tgz
 	rm -f /tmp/mdkinst_done
 
diff --git a/docs/TODO b/docs/TODO
index 8d43ab770..78a0053a9 100644
--- a/docs/TODO
+++ b/docs/TODO
@@ -2,6 +2,8 @@ bug: if u choose mouse usb != found mouse, it fails at X config
 
 i18n
 
+diskdrake in text mode
+
 standalone applications for configuration
 
 is configureNetworkNet needed with dhcp/bootp?
@@ -11,6 +13,7 @@ X configuration and bootloader in kickstart
 
 (pix)diskdrake
 auto_partitions
+suggested partition tables must be better foreach installClass
 
 (pix)options in mkfs, progress bar when formatting
 
@@ -19,12 +22,9 @@ auto_partitions
 install postfix in place of sendmail for security levels 4&5
 
 update the list of modules (in update_kernel)
-merge the install(1) of redhat
 
 install ssh
 
-suggested partition tables must be better foreach installClass
-
 (fpons)verify the free space is big enough.
 
 (fpons)pb with dependencies ``missing'': icewm do not require XFree86 and so you can have icewm but no X server
diff --git a/perl-install/Makefile b/perl-install/Makefile
index 056f977de..87df7183b 100644
--- a/perl-install/Makefile
+++ b/perl-install/Makefile
@@ -9,11 +9,10 @@ STAGE2      = $(ROOTDEST)/Mandrake/base/mdkinst_stage2
 BASE        = $(ROOTDEST)/Mandrake/base
 DESTREP4PMS = $(DEST)$(REP4PMS)
 PERL        = perl
-LOCALFILES  = pnp_serial mouseconfig ddcxinfos
+LOCALFILES  = pnp_serial mouseconfig
 LOCALFILES2 = extract_archive
 DIRS        = c Newt po pci_probing resize_fat
 EXCLUDE     = $(LOCALFILES) boot.img keymaps consolefonts install
-RPMS        = $(wildcard $(ROOTDEST)/Mandrake/RPMS/*.rpm)
 CFLAGS	    = -Wall
 override CFLAGS  += -pipe
 
@@ -26,7 +25,7 @@ TAGS: $(PMS)
 
 clean:
 	for i in $(DIRS); do $(MAKE) -C $$i clean; done
-	rm -rf gendepslist auto ../diskdrake*
+	rm -rf auto ../diskdrake*
 	find . -name "*~" -o -name ".#*" -o -name "TAGS" -o -name "*.old" | xargs rm -f
 
 tar: clean
@@ -55,15 +54,6 @@ test_pms: verify_c
 verify_c:
 	./verify_c $(PMS)
 
-gendepslist: %: %.cc 
-	$(CXX) -I/usr/include/rpm $(CFLAGS) $< -lrpm -ldb1 -lz -o $@
-
-$(BASE)/depslist: $(BASE)/hdlist gendepslist
-	./gendepslist -h $@ $<
-
-$(BASE)/hdlist: $(RPMS) 
-	$(ROOTDEST)/misc/genhdlist $(ROOTDEST)
-
 install_pms: $(DIRS)
 	for i in `perl -ne 's/sub (\w+?)_? {.*/$$1/ and print' commands.pm`; do ln -sf commands $(DEST)/usr/bin/$$i; done
 
@@ -155,7 +145,7 @@ get_needed_files: $(DIRS)
 
 	tar xyC $(DEST) -f ../install/install1_pcmcia.tar.bz2 ./etc/pcmcia
 
-full_stage2: $(BASE)/depslist $(BASE)/hdlist
+full_stage2:
 	sudo rm -rf $(DEST)
 	mkdir -p $(DEST)
 	$(MAKE) get_needed_files 
diff --git a/perl-install/interactive_newt.pm b/perl-install/interactive_newt.pm
index 63346ed65..4a58dc1a2 100644
--- a/perl-install/interactive_newt.pm
+++ b/perl-install/interactive_newt.pm
@@ -143,7 +143,6 @@ sub ask_from_entries_refW {
 	 my ($w, $ref) = @_;
 	 my $val = ${$ref->{val}};
 	 sub { 
-	     print STDERR "$ref->{type}: ($val)\n";
 	     $ref->{type} eq "bool" ? 
 	       $w->CheckboxSetValue(checkval($val)) :
 	     $ref->{type} eq "list" ?
diff --git a/perl-install/pkgs.pm b/perl-install/pkgs.pm
index 07d04073b..55fcb1caf 100644
--- a/perl-install/pkgs.pm
+++ b/perl-install/pkgs.pm
@@ -21,6 +21,11 @@ hackkernel hackkernel-BOOT hackkernel-fb hackkernel-headers
 hackkernel-pcmcia-cs hackkernel-smp hackkernel-smp-fb
 );
 
+my @preferred = qw(
+
+);
+
+
 my $A = 20471;
 my $B = 16258;
 sub correctSize { ($A - $_[0]) * $_[0] / $B } #- size correction in MB.
@@ -46,7 +51,14 @@ sub select($$;$) {
 	my %l; @l{@{$p->{deps} || die "missing deps file"}} = ();
 	while (do { my %l = %l; while (($n, $v) = each %l) { last if $v != 1; } $n }) {
 	    $l{$n} = 1;
-	    my $i = Package($packages, $n) or next;
+	    my $i = Package($packages, $n);
+	    if (!$i && $n =~ /\|/) {
+		foreach (split '\|', $n) {
+		    print "SSSSSSSSSSSSS $_\n";
+		    $i = Package($packages, $_);
+		    last if $i && $i->{selected};
+		}
+	    }
 	    $i->{base} ||= $base;
 	    $i->{deps} or log::l("missing deps for $n");
 	    unless ($i->{installed}) {
@@ -163,7 +175,7 @@ sub getDeps($) {
     my $f = install_any::getFile("depslist") or die "can't find dependencies list";
     foreach (<$f>) {
 	my ($name, $size, @deps) = split;
-	($name, @deps) = map { chop_version(first(split '\|')) } ($name, @deps); #-TODO better handling of choice
+	($name, @deps) = map { join '|', map { chop_version($_) } split '\|' } ($name, @deps);
 	$packages->{$name} or next;
 	$packages->{$name}{size} = $size;
 	$packages->{$name}{deps} = \@deps;
diff --git a/tools/.cvsignore b/tools/.cvsignore
new file mode 100644
index 000000000..e570b13fa
--- /dev/null
+++ b/tools/.cvsignore
@@ -0,0 +1,2 @@
+rpm2header
+gendepslist
diff --git a/tools/Makefile b/tools/Makefile
index dc31b6b0d..c6c01dca0 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -1,14 +1,17 @@
 ROOTDEST    = /export
+DEST        = $(ROOTDEST)/Mandrake/mdkinst
 RPMS        = $(wildcard $(ROOTDEST)/Mandrake/RPMS/*.rpm)
+LOCALFILES  = ddcprobe/ddcxinfos
 BASE        = $(ROOTDEST)/Mandrake/base
 
 .PHONY: clean install
 
-all: $(BASE)/depslist $(BASE)/hdlist
+all: $(BASE)/depslist $(BASE)/hdlist install
 
 install:
-	$(MAKE) gendepslist rpm2header
+	$(MAKE) gendepslist rpm2header ddcprobe/ddcxinfos
 	install make_mdkinst_stage2 gendepslist rpm2header genhdlist $(ROOTDEST)/misc
+	install -s $(LOCALFILES) $(DEST)/usr/bin
 
 gendepslist: %: %.cc 
 	$(CXX) -I/usr/include/rpm $(CFLAGS) $< -lrpm -ldb1 -lz -o $@
@@ -16,6 +19,9 @@ gendepslist: %: %.cc
 rpm2header: %: %.c
 	$(CC) -I/usr/include/rpm $(CFLAGS) $< -lrpm -ldb1 -lz -o $@
 
+ddcprobe/ddcxinfos:
+	$(MAKE) -C ddcprobe ddcxinfos
+
 $(BASE)/depslist: $(BASE)/hdlist gendepslist
 	./gendepslist -h $@ $<