bike/gbootroot
1
0
Fork 0
mirror of https://github.com/fspc/gbootroot.git synced 2025-02-23 09:03:23 -05:00
Code Issues Projects Releases Wiki Activity

* Preping for space_check() strip file size check.

Browse Source
This commit is contained in:
freesource 2000-11-17 06:17:22 +00:00
parent 77fa2d1966
commit b9b88cd182
1 changed files with 21 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
Yard.pm
View File

@ -491,12 +491,14 @@ sub hard_links {
########################## ##########################
# REQUIRES $fs_size $strip_objfile (0|1) # GBteam added stripped file size check.
# GBteam adds stripped file size check using stripper()
sub space_check { sub space_check {
info(0, "Checking space needed.\n"); info(0, "Checking space needed.\n");
my ($fs_size, $strip_objfiles) = @_;
# For libs [obj_count 1 = "all" 0 = "debug"]
my ($fs_size, $strip_lib, $strip_bin,
$strip_module, $obj_count, $tmp) = @_;
my($total_bytes) = 0; my($total_bytes) = 0;
my(%counted); my(%counted);
@ -510,12 +512,16 @@ sub space_check {
my ($file); my ($file);
foreach $file (keys %Included) { foreach $file (keys %Included) {
my $not_stripped = `file $file`;
my $filename = basename($file);
my($replacement, $devino); my($replacement, $devino);
if ($replacement = $replaced_by{$file}) { if ($replacement = $replaced_by{$file}) {
## strip count for replace ## strip count for replace
## Check for libraries %lib_needed_by, modules %is_module, ## Check for libraries %lib_needed_by, modules %is_module,
## and everything else if strippable, and strip is chosen ## and everything else if strippable, and strip is chosen
## and for lib two states are possible
##### Use the replacement file instead of this one. In the ##### Use the replacement file instead of this one. In the
##### future, improve this so that replacement is resolved WRT ##### future, improve this so that replacement is resolved WRT
##### %links_to ##### %links_to
@ -559,7 +565,8 @@ sub space_check {
## At this point hardlinked, dirs, replaced_by and /proc have ## At this point hardlinked, dirs, replaced_by and /proc have
## been filtered out. If strip is chosen ## been filtered out. If strip is chosen
## check for libraries (%lib_needed_by), modules (%is_module), ## check for libraries (%lib_needed_by), modules (%is_module),
## and everything else if strippable. ## and everything else if strippable. For lib two states are
## posible
##### Count space for plain files ##### Count space for plain files
info(1, "$file size ", -s _, "\n"); info(1, "$file size ", -s _, "\n");
$total_bytes += bytes_allocated($file); $total_bytes += bytes_allocated($file);
@ -573,14 +580,8 @@ sub space_check {
if (bytes_to_K($total_bytes) > $fs_size) { if (bytes_to_K($total_bytes) > $fs_size) {
info(0, "This is more than $fs_size Kbytes allowed.\n"); info(0, "This is more than $fs_size Kbytes allowed.\n");
if ($strip_objfiles) {
info(0, "But since object files will be stripped, more space\n",
"may become available. Continuing...\n");
} else {
print "Not enough room .. but I'll take care of that later\n"; print "Not enough room .. but I'll take care of that later\n";
return; return;
##@error("You need to trim some files out and try again.\n");
}
} }
info(0, "\n"); info(0, "\n");
@ -653,7 +654,7 @@ sub create_filesystem {
info(1, "\tLink\t$floppy_file -> $target\n"); info(1, "\tLink\t$floppy_file -> $target\n");
symlink($target, $floppy_file) or symlink($target, $floppy_file) or
error("symlink($target, $floppy_file): $!\n"); error("symlink($target, $floppy_file): $!\n");
delete $Included{$file}; # Get rid of it so next pass doesn't copy it delete $Included{$file}; # Get rid of it so next pass doesn't copit
} elsif (-d $file) { } elsif (-d $file) {
my($floppy_file) = $::mount_point . $file; my($floppy_file) = $::mount_point . $file;
@ -820,21 +821,25 @@ sub cf_warn {
# is strippable and stripping is desired by the user, and if the # is strippable and stripping is desired by the user, and if the
# objcopy program exists. # objcopy program exists.
sub copy_strip_file { sub copy_strip_file {
my($from, $to) = @_;
# Obviously create_filesytem's @_ will have to be modified 4 the last 4
# check for off or on, not undef
my($from, $to, $strip_objfiles,
$strip_lib, $strip_bin, $strip_module) = @_;
if ($::strip_objfiles and defined($objcopy) and $strippable{$from}) { if ($strip_objfiles and defined($objcopy) and $strippable{$from}) {
# Copy it stripped # Copy it stripped
if (defined($lib_needed_by{$from})) { if (defined($lib_needed_by{$from}) && $strip_lib) {
# It's a library # It's a library
info(1, "Copy/stripping library $from to $to\n"); info(1, "Copy/stripping library $from to $to\n");
sys("$objcopy --strip-all $from $to"); sys("$objcopy --strip-all $from $to");
} elsif (defined($is_module{$from})) { } elsif (defined($is_module{$from}) && $strip_module) {
info(1, "Copy/stripping module $from to $to\n"); info(1, "Copy/stripping module $from to $to\n");
sys("$objcopy --strip-debug $from $to"); sys("$objcopy --strip-debug $from $to");
} else { } elsif ($strip_bin) {
# It's a binary executable # It's a binary executable
info(1, "Copy/stripping binary executable $from to $to\n"); info(1, "Copy/stripping binary executable $from to $to\n");
sys("$objcopy --strip-all $from $to"); sys("$objcopy --strip-all $from $to");