summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuillaume Cottenceau <gc@mandriva.com>2001-06-01 14:29:22 +0000
committerGuillaume Cottenceau <gc@mandriva.com>2001-06-01 14:29:22 +0000
commita098f4cb4eb055ee7f948f5ae51c82e3403ffdac (patch)
treef9b94a0904a01e529667b88ec2bbb03c98c0a546
parent82d101b415a99d06fb724267d18c3be842ed2b1b (diff)
downloaddrakx-a098f4cb4eb055ee7f948f5ae51c82e3403ffdac.tar
drakx-a098f4cb4eb055ee7f948f5ae51c82e3403ffdac.tar.gz
drakx-a098f4cb4eb055ee7f948f5ae51c82e3403ffdac.tar.bz2
drakx-a098f4cb4eb055ee7f948f5ae51c82e3403ffdac.tar.xz
drakx-a098f4cb4eb055ee7f948f5ae51c82e3403ffdac.zip
minor fix
-rw-r--r--mdk-stage1/stage1.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/mdk-stage1/stage1.c b/mdk-stage1/stage1.c
index 66aa0e3e1..70a3c56b8 100644
--- a/mdk-stage1/stage1.c
+++ b/mdk-stage1/stage1.c
@@ -136,7 +136,7 @@ static void spawn_shell(void)
log_perror("could not set new controlling tty");
execve(shell_name[0], shell_name, grab_env());
- log_message("execl of %s failed: %s", shell_name[0], strerror(errno));
+ log_message("execve of %s failed: %s", shell_name[0], strerror(errno));
}
close(fd);
or crypto, need rpmtools also. my %resolver = ( '/bin/sh' => 'bash', '/bin/bash' => 'bash', '/usr/bin/perl' => 'perl', '/usr/bin/perl5' => 'perl', 'libBrokenLocale.so' => 'glibc', 'libICE.so' => 'XFree86-libs', 'libSM.so' => 'XFree86-libs', 'libX11.so' => 'XFree86-libs', 'libXext.so' => 'XFree86-libs', 'libXmu.so' => 'XFree86-libs', 'libXpm.so' => 'xpm', 'libXt.so' => 'XFree86-libs', 'libc.so.6' => 'glibc', 'libgdbm.so' => 'gdbm', 'libgpm.so' => 'gpm', 'libm.so' => 'glibc', 'libncurses.so' => 'ncurses', 'libnsl.so' => 'glibc', 'libpam.so' => 'pam', 'libpthread.so' => 'glibc', 'libreadline.so' => 'readline', 'libstdc++-libc6.1-2.so' => 'libstdc++', 'libstdc++.so' => 'libstdc++-compat', 'libutil.so' => 'glibc', 'libz.so' => 'zlib', 'smtpdaemon' => 'postfix', ); sub gendepslist_crypto { my ($dir) = @_; my %depslist; #- get information about each rpm. local *DIR; opendir DIR, $dir or die "cannot open directory: $!\n"; while ($_ = readdir DIR) { my ($key) = /(.*)\..*\.rpm$/ or next; my ($name) = /(.*)-[^-]*-[^-]*-/; my $size = `rpm -qp --queryformat="%{SIZE}" $dir/$_`; my @filelist = split "\n", `rpm -qpl $dir/$_`; my @requires = split "\n", `rpm -qpR $dir/$_`; $depslist{$key} = { key => $key, size => $size, filelist => \@filelist, requires => \@requires, deps => [], }; foreach (@filelist) { $resolver{$_} = $name; m|.*/([^/]*)$| and $resolver{$1} = $name; } } close DIR; #- resolve the dependancies. foreach my $pkg (values %depslist) { foreach (@{$pkg->{requires}}) { $resolver{$_} and push(@{$pkg->{deps}}, $resolver{$_}), next; m|^([^\s\(]*)| and $resolver{$1} and push(@{$pkg->{deps}}, $resolver{$1}), next; m|^.*/([^/\s\(]*)| and $resolver{$1} and push(@{$pkg->{deps}}, $resolver{$1}), next; m|^([^\s\(]*\.so)| and $resolver{$1} and push(@{$pkg->{deps}}, $resolver{$1}), next; m|^.*/([^\s\(]*\.so)| and $resolver{$1} and push(@{$pkg->{deps}}, $resolver{$1}), next; m|^([\w-]*)(?:\s+.*)$| and push(@{$pkg->{deps}}, $1); #- last and default to package name. } } #- build depslist-crypto file. local *F; open F, ">$dir/depslist-crypto" or die "cannot open depslist-crypto file for writing: $!\n"; foreach (values %depslist) { my %deps; @deps{@{$_->{deps}}} = (); print F "$_->{key} $_->{size} ", join(" ", keys %deps), "\n"; } close F; } sub main { my ($dir) = @_; -d $dir or die "usage: gencryptofiles <crypto_dir>\n"; -x "/usr/bin/genhdlist_cz2" or die "I need rpmtools to work (ie /usr/bin/genhdlist_cz2)\n"; print `genhdlist_cz2 -o $dir/hdlist-crypto.cz2 $dir`; gendepslist_crypto($dir); } main(@ARGV);