bike
/
gbootroot
mirror of https://github.com/fspc/gbootroot.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

* continuous and user-defined are working. 

* fixed logic of copy_strip_file.
* made strip_all and strip_deb true booleans.
master
freesource 24 years ago
parent
9c47087234
commit
808215a667
2 changed files with 125 additions and 59 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 98
      Yard.pm
  2. 56
      YardBox.pm

98
Yard.pm
View File

@ -57,6 +57,7 @@ my($Warnings) = 0;
my $verbosity;
my ($text_insert,$red,$blue);
my $logadj;
my $mount_point;
# This solves an annoying problem with the new Perl-5.6 built in glob,
# allowing earlier versions of Perl to run.
@ -281,7 +282,7 @@ sub extra_links {
my ($contents_file) = @_;
info(0, "\n\nPASS 2: Picking up extra files from links...\n");
info(0, "PASS 2: Picking up extra files from links...\n");
for (keys %Included) {
# watch for "" - GBteam
@ -747,18 +748,19 @@ sub create_filesystem {
$strip_bin, $strip_module, $obj_count) = @_;
my $device = "$mnt/$filename";
my $mount_point = "$mnt/loopback";
$mount_point = "$mnt/loopback";
my $file;
my $error;
info(0, "Creating root filesystem.\n");
info(0, "Description: $fs_size K ext2 file system\n");
info(0, "Where: $device\n");
sync();
sys("dd if=/dev/zero of=$device bs=1k count=$fs_size");
sync();
info(0, "Creating $fs_size K ext2 file system on $device\n");
if (-f $device) {
##### If device is a plain file, it means we're using some loopback
##### device. Use -F switch in mke2fs so it won't complain.
@ -912,9 +914,10 @@ sub create_filesystem {
}
## Probably will want to umount here
return "ERROR" if errum(sys("umount $mount_point")) == 2;
info(0, "\nDone with $PROGRAM_NAME. $Warnings warnings.\n",
"$device is still mounted on $mount_point\n\n");
info(0, "\nDone making the root filesystem. $Warnings warnings.\n",
"$device is now umounted from $mount_point\n\n");
} # end sub create_filesystem
@ -1002,11 +1005,11 @@ sub copy_strip_file {
$strip_lib, $strip_bin, $strip_module) = @_;
my $error;
if ($strip_objfiles and defined($objcopy) and $strippable{$from}) {
if ($strippable{$from}) {
# Copy it stripped
if (defined($lib_needed_by{$from}) && $strip_lib) {
if ($strip_lib) {
if (defined($lib_needed_by{$from})) {
# It's a library
if ($strip_objfiles == 1) {
info(1, "Copy/stripping library $from to $to\n");
@ -1016,28 +1019,60 @@ sub copy_strip_file {
info(1, "Copy/stripping library $from to $to\n");
sys("$objcopy --strip-debug $from $to");
}
} elsif (defined($is_module{$from}) && $strip_module) {
}
# Copy file perms and owner
my($mode, $uid, $gid);
(undef, undef, $mode, undef, $uid, $gid) = stat $from;
my $from_base = basename($from);
chown($uid, $gid, $to) or ($error =
error("chown: $! \($from_base\)\n"));
return "ERROR"if $error && $error eq "ERROR";
chmod($mode, $to) or ($error =
error("chmod: $! \($from_base\)\n"));
return "ERROR"if $error && $error eq "ERROR";
}
elsif ($strip_module) {
info(1, "Copy/stripping module $from to $to\n");
sys("$objcopy --strip-debug $from $to");
# Copy file perms and owner
my($mode, $uid, $gid);
(undef, undef, $mode, undef, $uid, $gid) = stat $from;
my $from_base = basename($from);
chown($uid, $gid, $to) or ($error =
error("chown: $! \($from_base\)\n"));
return "ERROR"if $error && $error eq "ERROR";
chmod($mode, $to) or ($error =
error("chmod: $! \($from_base\)\n"));
return "ERROR"if $error && $error eq "ERROR";
} elsif ($strip_bin) {
# It's a binary executable
info(1, "Copy/stripping binary executable $from to $to\n");
sys("$objcopy --strip-all $from $to");
}
# Copy file perms and owner
my($mode, $uid, $gid);
(undef, undef, $mode, undef, $uid, $gid) = stat $from;
chown($uid, $gid, $to) or ($error = error("chown: $!"));
my $from_base = basename($from);
chown($uid, $gid, $to) or ($error =
error("chown: $! \($from_base\)\n"));
return "ERROR"if $error && $error eq "ERROR";
chmod($mode, $to) or ($error = error("chmod: $!"));
chmod($mode, $to) or ($error =
error("chmod: $! \($from_base\)\n"));
return "ERROR"if $error && $error eq "ERROR";
} else {
}
else {
# Normal copy, no strip
sys("cp $from $to");
}
}
else {
# Normal copy, no strip
sys("cp $from $to");
}
}
##### End of make_root_fs
@ -1114,7 +1149,8 @@ sub sys {
0; # like system()
}
## history
# Maybe history but @mount_device_if_necessary() uses it.
# Just need to add error_window.
sub load_mount_info {
undef %::mounted;
undef %::fs_type;
@ -1578,23 +1614,15 @@ __END__
##
##############################################################################
#BEGIN { require "yard_utils.pl" }
#require "Config.pl";
### GLOBAL VARIABLES
my(%Termcap); # Defs from /etc/termcap
my($checked_for_getty_files); # Scalar -- have we checked getty files yet?
my(%checked); # Hash table of files we've already checked
# This is a little crude. Technically we should read /etc/conf.getty
# to make sure we're not supposed to be using a different login binary.
my($login_binary) = "$::mount_point/bin/login";
my($login_binary) = "$mount_point/bin/login";
STDOUT->autoflush(1);
# Won't have to do this.
##@ start_logging_output();
#info(0, "check_root_fs @yard_version@\n");
## Maybe this
##@mount_device_if_necessary();
# This goes first so we define %Termcap for use in children
@ -1609,16 +1637,18 @@ check_passwd();
check_pam();
check_nss();
info(0, "All done.\n");
info(0, "If this is acceptable, continue with write_rescue_disk\n");
exit;
info(0, "All done!\n");
info(0, "You can run more tests with the UML kernel,\n
or construct a distribution by using this root\n
filesystem with a boot method.");
##############################################################################
sub warning {
info(0, "\n", @_);
##########################
# I think we will just add all warnings together
#sub warning {
# info(0, "\n", @_);
# $Warnings++;
}
#}
# This takes a procedure call, forks off a subprocess, chroots to

56
YardBox.pm
View File

@ -243,11 +243,11 @@ sub file_system {
my $lib_strip_all;
my $lib_strip_debug;
my $strip_bool = "strip-all";
my $strip_bool = 1;
sub strip_all {
$lib_strip_debug->active(0);
$strip_bool = "strip-all";
$strip_bool = 1;
print "$strip_bool\n";
}
@ -255,7 +255,7 @@ sub strip_all {
sub strip_debug {
$lib_strip_all->active(0);
$strip_bool = "strip-debug";
$strip_bool = 0;
print "$strip_bool\n";
}
@ -384,14 +384,11 @@ sub which_stage {
}
}
} # end if one-by-one or continuous
elsif ($stages_bool eq "user-defined") {
for (keys %$continue) { print $_, "=>", $continue->{$_}, "\n"; }
}
} # end if one-by-one or continuous
for (keys %$continue) { print $_, "=>", $continue->{$_}, "\n"; }
}
@ -453,10 +450,50 @@ sub continue {
$continue->{create} = 1;
return if $stages_bool eq "one-by-one";
}
if ( $continue->{test} == 0 ) {
test();
foreach $thing (@check_boxes) {
$thing->hide();
$thing->active($false);
$thing->show();
}
$continue->{test} = 1;
return if $stages_bool eq "one-by-one";
}
}
elsif ($stages_bool eq "user-defined") {
if ($check->get_active()) {
check();
$check->hide();
$check->active($false);
$check->show();
}
if ($dep->get_active()) {
links_deps();
$dep->hide();
$dep->active($false);
$dep->show();
}
if ($space->get_active()) {
space_left();
$space->hide();
$space->active($false);
$space->show();
}
if ($create->get_active()) {
create();
$create->hide();
$create->active($false);
$create->show();
}
if ($test->get_active()) {
test();
$test->hide();
$test->active($false);
$test->show();
}
}
@ -487,7 +524,6 @@ sub space_left {
$lib_bool = "" if $lib_bool eq 0;
$bin_bool = "" if $bin_bool eq 0;
$mod_bool = "" if $mod_bool eq 0;
$strip_bool eq "strip-all" ? ($strip_bool = 1) : ($strip_bool = 0);
$error = space_check($filesystem_size,
$lib_bool, $bin_bool, $mod_bool,
@ -501,7 +537,7 @@ sub create {
$lib_bool = "" if $lib_bool eq 0;
$bin_bool = "" if $bin_bool eq 0;
$mod_bool = "" if $mod_bool eq 0;
$strip_bool eq "strip-all" ? ($strip_bool = 1) : ($strip_bool = 0);
$error = create_filesystem($filename,$filesystem_size,$filesystem_type,
$inode_size,$mnt,$lib_bool,$bin_bool,
$mod_bool,$strip_bool);

Write Preview
Loading…
Cancel
Save