no_comment

3 files changed, 14 insertions, 37 deletions

diff --git a/perl-install/Makefile b/perl-install/Makefile
index b0e492ccf..3303ecd23 100644
--- a/perl-install/Makefile
+++ b/perl-install/Makefile
@@ -51,8 +51,11 @@ test_pms: verify_c
 verify_c:
 	./verify_c $(PMS)
 
-depslist:
-	./gendepslist > $(ROOTDEST)/Mandrake/base/depslist
+gendepslist: %: %.cc
+	$(CXX) -I/usr/include/rpm $(CFLAGS) $< -lrpm -ldb -lz -o $@
+
+depslist: gendepslist
+	./gendepslist $(ROOTDEST)/Mandrake/base/depslist /tmp/rhimage/Mandrake/RPMS/*.rpm
 
 install_pms: all
 	for i in `perl -ne 's/sub (\w+?)_? {.*/$$1/ and print' commands.pm`; do ln -sf commands $(DEST)/usr/bin/$$i; done
@@ -113,6 +116,7 @@ get_needed_files: $(SO_FILES)
 	cp -a xmodmaps $(DEST)/usr/share
 	cp -a keymaps $(DEST)/usr/share
 	cp -a consolefonts $(DEST)/usr/share
+	cp compss $(ROOTDEST)/Mandrake/base
 
 	ln -s install2 $(DEST)/usr/bin/runinstall2
 #	echo -e "#!/bin/sh\n\nexec '/usr/bin/sh'" > $(DEST)/usr/bin/runinstall2
diff --git a/perl-install/install2.pm b/perl-install/install2.pm
index 8458412dc..bb97fdbcf 100644
--- a/perl-install/install2.pm
+++ b/perl-install/install2.pm
@@ -19,7 +19,7 @@ use pkgs;
 use smp;
 use lang;
 
-$::testing = 1;#$ENV{PERL_INSTALL_TEST};
+$::testing = $ENV{PERL_INSTALL_TEST};
 $INSTALL_VERSION = 0;
 
 my @installStepsFields = qw(text help skipOnCancel skipOnLocal prev next);
@@ -117,7 +117,7 @@ $o = $::o = { default => $default, steps => \%installSteps, orderedSteps => \@or
 sub selectLanguage {
     $o->{lang} = $o->chooseLanguage;
     lang::set($o->{lang});
-    keyboard::setup();
+    $o->{keyboard} = keyboard::setup();
 }
 
 sub selectPath {
@@ -238,7 +238,7 @@ install chapter of the Official Linux Mandrake User's Guide.");
 }
 
 sub main {
-#    $SIG{__DIE__} = sub { chomp $_[0]; log::l("ERROR: $_[0]") };
+    $SIG{__DIE__} = sub { chomp $_[0]; log::l("ERROR: $_[0]") };
 
     #  if this fails, it's okay -- it might help with free space though 
     unlink "/sbin/install";
diff --git a/perl-install/keyboard.pm b/perl-install/keyboard.pm
index 2d147328c..2c6b84858 100644
--- a/perl-install/keyboard.pm
+++ b/perl-install/keyboard.pm
@@ -55,44 +55,17 @@ sub load($) {
 }
 
 sub setup(;$) {
-    my ($defkbd) = @_;
+    my ($keyboard) = @_;
     my $t; 
 
-    $defkbd ||= $defaultKeyboards{$ENV{LANG}} || "us";
+    $keyboard ||= $defaultKeyboards{$ENV{LANG}} || "us";
 
-    my $file = "/usr/share/keymaps/$defkbd.kmap";
+    my $file = "/usr/share/keymaps/$keyboard.kmap";
     if (-e $file) {
-	log::l("loading keymap $defkbd");
+	log::l("loading keymap $keyboard");
 	load(cat_($file));
     }
-
-#    local *F;
-#    open F, "/usr/etc/keymaps" or die "cannot open /usr/etc/keymaps: $!";
-#
-#    my $format = "i2";
-#    read F, $t, psizeof($format) or die "failed to read keymaps header: $!";
-#    my ($magic, $numEntries) = unpack $format, $t;
-#
-#    log::l("%d keymaps are available", $numEntries);
-#
-#    my @infoTable;
-#    my $format2 = "i Z40";
-#    foreach (1..$numEntries) {
-#	 read F, $t, psizeof($format2) or die "failed to read keymap information: $!";
-#	 push @infoTable, [ unpack $format2, $t ];
-#    }
-#
-#    foreach (@infoTable) {
-#	 read F, $t, $_->[0] or die "error reading keymap data: $!";
-#
-#	 if ($defkbd eq $_->[1]) {
-#	     log::l("using keymap $_->[1]");
-#	     load($t);
-#	     &write("/tmp", $_->[1]);
-#	     return;
-#	 }
-#    }
-#    die "keyboard $defkbd not found in /usr/etc/keymaps";
+    $keyboard;
 }
 
 sub write($$) {