diff options
author | Olivier Blin <oblin@mandriva.com> | 2007-12-13 16:05:31 +0000 |
---|---|---|
committer | Olivier Blin <oblin@mandriva.com> | 2007-12-13 16:05:31 +0000 |
commit | 75d88bbdc0ff86c275852afdd513872e35ee58ce (patch) | |
tree | 634f8fe47b7125d731f93c5e3fd383cbe56ad7e1 | |
parent | e083d6ef0b2a22e9e9405c6e887e60e6a1abc019 (diff) | |
download | draklive-75d88bbdc0ff86c275852afdd513872e35ee58ce.tar draklive-75d88bbdc0ff86c275852afdd513872e35ee58ce.tar.gz draklive-75d88bbdc0ff86c275852afdd513872e35ee58ce.tar.bz2 draklive-75d88bbdc0ff86c275852afdd513872e35ee58ce.tar.xz draklive-75d88bbdc0ff86c275852afdd513872e35ee58ce.zip |
add inst_initrd_bin helper to copy binaries and their library dependencies
-rwxr-xr-x | draklive | 16 |
1 files changed, 12 insertions, 4 deletions
@@ -381,6 +381,16 @@ sub create_initrd { cp_f(get_builddir($live) . $live->{prefix}{build}{boot} . get_initrd_path($live->{media}), $live->{copy_initrd}) if $live->{copy_initrd}; } +sub inst_initrd_bin { + my ($root, $initrd_tree, $bin) = @_; + cp_f($root . $bin, $initrd_tree . '/bin/'); + foreach my $file (`chroot $root ldd $bin | awk '/\\// {if(\$2 == "=>") {print \$3} else {print \$1}}'`) { + my ($lib_prefix, $filename) = chomp_($file) =~ m|/(lib[^/]*).*/([^/]+)$| or next; + my $dest = $initrd_tree . '/' . $lib_prefix . '/' . $filename; + mkdir_p($initrd_tree . '/' . $lib_prefix); + cp_f($root . $file, $dest) if !-f $dest; + } +} sub create_initrd_for_media { my ($live, $media) = @_; @@ -442,10 +452,8 @@ sub create_initrd_for_media { } } - if (exists $storage_fs{$fs}{files}) { - cp_f(get_system_root($live) . $_, $initrd_tree . '/bin/') - foreach @{$storage_fs{$fs}{files} || []}; - } + inst_initrd_bin(get_system_root($live), $initrd_tree, $_) foreach + @{$storage_fs{$fs} && $storage_fs{$fs}{files} || []}; if ($live->{debug}) { $need_libs = 1; |