no_comment

4 files changed, 15 insertions, 8 deletions

diff --git a/Makefile b/Makefile
index c66a769c5..aaee3d3b0 100644
--- a/Makefile
+++ b/Makefile
@@ -13,7 +13,7 @@ BOOT_IMG += $(RELEASE_BOOT_IMG)
 
 BOOT_RDZ = $(BOOT_IMG:%.img=%.rdz)
 BINS = install/install install/full-install install/local-install install/installinit/init
-DIRS = tools install install/installinit perl-install
+DIRS = tools install install/installinit perl-install rescue
 ifeq (i386,$(ARCH))
 #DIRS += lnx4win
 endif
@@ -90,7 +90,7 @@ upload: tar install
 	cd $(ROOTDEST)/Mandrake ; tar cfz mdkinst.tgz mdkinst
 
 	lftp -c "open -u devel mandrakesoft.com; cd $(UPLOAD_DEST)/images ; mput $(ROOTDEST)/images/*.img"
-	lftp -c "open -u devel mandrakesoft.com; cd ~/tmp ; put $(ROOTDEST)/Mandrake/mdkinst.tgz ; put /tmp/mdkinst_done ; cd $(UPLOAD_DEST)/Mandrake/base ; lcd $(ROOTDEST)/Mandrake/base ; put mdkinst_stage2.gz compss compssList compssUsers hdlists ; cd $(UPLOAD_DEST)/misc ; lcd ~/gi/tools/ ; put make_mdkinst_stage2" #,gendepslist,rpm2header"
+	lftp -c "open -u devel mandrakesoft.com; cd ~/tmp ; put $(ROOTDEST)/Mandrake/mdkinst.tgz ; put /tmp/mdkinst_done ; cd $(UPLOAD_DEST)/Mandrake/base ; lcd $(ROOTDEST)/Mandrake/base ; put mdkinst_stage2.gz rescue_stage2.gz compss compssList compssUsers hdlists ; cd $(UPLOAD_DEST)/misc ; lcd ~/gi/tools/ ; put make_mdkinst_stage2" #,gendepslist,rpm2header"
 	lftp -c "open -u devel mandrakesoft.com; cd $(UPLOAD_DEST)/dosutils/autoboot/mdkinst ; put $(ROOTDEST)/dosutils/autoboot/mdkinst/vmlinuz ; mput $(ROOTDEST)/dosutils/autoboot/mdkinst/initrd.*"
 	lftp -c "open -u devel mandrakesoft.com; cd $(UPLOAD_DEST)/lnx4win ; lcd $(ROOTDEST)/lnx4win ; put initrd.gz vmlinuz"
 	lftp -c "open -u devel mandrakesoft.com; cd $(UPLOAD_DEST_CONTRIB)/others/src ; put ../gi.tar.bz2"
diff --git a/perl-install/Makefile b/perl-install/Makefile
index 1143fbd0b..7e4ebb940 100644
--- a/perl-install/Makefile
+++ b/perl-install/Makefile
@@ -64,7 +64,7 @@ get_needed_files: $(DIRS)
 	find auto -follow -name "*.so" >> /tmp/list
 
 	for i in $(LOCALFILES) `cat /tmp/list` ; do \
-		ldd $$i 2>/dev/null | grep -v "not a dynamic" | sed -e 's/.*=> //' -e 's/ .*//' | uniq | sort >> /tmp/list; \
+		ldd $$i 2>/dev/null | grep "=>" | sed -e 's/.*=> //' -e 's/ .*//' | uniq | sort >> /tmp/list; \
 	done
 
 	install -d $(DEST)/etc
diff --git a/perl-install/keyboard.pm b/perl-install/keyboard.pm
index 61f7c5467..b312fc85a 100644
--- a/perl-install/keyboard.pm
+++ b/perl-install/keyboard.pm
@@ -176,15 +176,19 @@ sub loadkeys_files {
     my $p = "/usr/lib/kbd/keymaps/i386/*";
     my $post = ".kmap.gz";
     my %trans = ("cz-latin2" => "cz-lat2");
-    my @l;
+    my (@l, %l);
     foreach (values %keyboards) {
 	local $_ = $trans{$_->[1]} || $_->[1];
 	my ($l) = glob("$p/$_$post");
 	$l or /(..)/ and ($l) = glob("$p/$1$post");
-	push @l, $l if $l;
-	print STDERR "unknown $_\n" if $_[0] && !$l;
-    }
-    @l;
+	print STDERR "unknown $_\n" if $_[0] && !$l; $l or next;
+	push @l, $l;
+	foreach (`zgrep include $l | grep "^include"`) {
+	    /include\s+"(.*)"/ or die "bad line $_";
+	    @l{glob("$p/$1.inc.gz")} = ();
+	}
+    }        
+    @l, keys %l, map { glob("$p/$_.inc.gz") } qw(compose euro windowkeys linux-keys-bare);
 }
 
 sub lang2keyboard($) {
diff --git a/rescue/make_rescue_img b/rescue/make_rescue_img
index 8b9c823f4..9c8f3f5c9 100755
--- a/rescue/make_rescue_img
+++ b/rescue/make_rescue_img
@@ -36,6 +36,9 @@ _ "$sudo rm -rf $tmp" if -e $tmp;
 _ "mkdir $tmp";
 _ 'find . -name "*~" | xargs rm -f';
 _ "cp -a tree/* $tmp";
+_ "mkdir -p lib tmp modules proc";
+
+
 foreach (keyboard::loadkeys_files) {
     install($_);
     symlink "$2.kmap.gz", "$tmp$1/$3.kmap.gz" if m|(.*)/((..).+)\.kmap\.gz|;