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

This allows adds the kernel option for UML in expect_uml, it's amazing

Browse Source 
what you find when you remove the system package.  Getting closer.
This commit is contained in:
freesource 2002-12-11 06:53:24 +00:00
parent 50bbbb674c
commit 29e9e73202
5 changed files with 32 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
BootRoot/BootRoot.pm
View File

@ -68,7 +68,10 @@ my $version = "1.4.0";
my $date = "11.19.2002"; my $date = "11.19.2002";
my $gtk_perl_version = "0.7002"; my $gtk_perl_version = "0.7002";
my $home_rootfs = "$home/root_filesystem/"; my $home_rootfs = "$home/root_filesystem/";
my $home_uml_kernel = "$home/uml_kernel/"; my $home_uml_kernel;
$option{gui_mode} ? ($home_uml_kernel = "$home/user-mode-linux/usr/bin/")
: ($home_uml_kernel = "$home/uml_kernel/");
$option{"uml-kernel"} = $home_uml_kernel . "linux" if !$option{"uml-kernel"};
my $modules_directory = "/lib/modules"; my $modules_directory = "/lib/modules";
my $Initrd; my $Initrd;
$option{gui_mode} ? $option{gui_mode} ?
@ -843,8 +846,8 @@ else {
# Let's read in the ARGV # Let's read in the ARGV
die "specify a template found in $template_dir\nuse --template\n" ### die "specify a template found in $template_dir\nuse --template\n"
if !$option{template}; ### if !$option{template};
start_logging_output($verbosefn,$verbosity); # Yard "tmp dir name" start_logging_output($verbosefn,$verbosity); # Yard "tmp dir name"

3
BootRoot/Yard.pm
View File

@ -1550,7 +1550,8 @@ sub create_expect_uml {
my $x_count = 1; my $x_count = 1;
my $command_line = "$expect_program $ubd0 $ubd1 $options " . my $command_line = "$expect_program $ubd0 $ubd1 $options " .
"$mount_point $preserve_ownership $filesystem"; "$mount_point $preserve_ownership " .
$option{"uml-kernel"} . " $filesystem";
info(0,"\nUsing helper root_fs to $fs_type the filesystem:\n\n"); info(0,"\nUsing helper root_fs to $fs_type the filesystem:\n\n");
info(0,"$command_line\n\n"); info(0,"$command_line\n\n");

12
expect_uml
View File

@ -58,12 +58,13 @@ if ( !$ARGV[0] ) {
my $arguments = "$ARGV[0] $ARGV[1] $ARGV[2]"; my $arguments = "$ARGV[0] $ARGV[1] $ARGV[2]";
my $mount_point = "$ARGV[3]"; my $mount_point = "$ARGV[3]";
my $preserve_ownership = "$ARGV[4]"; my $preserve_ownership = "$ARGV[4]";
my $uml_kernel = "$ARGV[5]";
my $end = 6; my $end = 7;
my $filesystem; my $filesystem;
for ( 5 .. $#ARGV ) { for ( 6 .. $#ARGV ) {
if ( $_ == 5 ) { if ( $_ == 6 ) {
$filesystem = "$ARGV[5]"; $filesystem = "$ARGV[6]";
# What to do with the rieserfs command # What to do with the rieserfs command
if ( $filesystem eq "mkreiserfs" ) { if ( $filesystem eq "mkreiserfs" ) {
$filesystem = $filesystem . " -f -f -q"; $filesystem = $filesystem . " -f -f -q";
@ -82,6 +83,7 @@ for ( 5 .. $#ARGV ) {
my $uml = my $uml =
BootRoot::UML->new( login_prompt => "bootroot login: ", BootRoot::UML->new( login_prompt => "bootroot login: ",
kernel => $uml_kernel,
arguments => $arguments, arguments => $arguments,
login => "root", login => "root",
password_prompt => "Password: ", password_prompt => "Password: ",
@ -153,4 +155,4 @@ elsif ( $filesystem =~ /^mkfs\.jffs/ ) {
} }
$uml->command("umount /mnt1; umount /mnt2"); $uml->command("umount /mnt1; umount /mnt2");
$uml->halt(); $uml->halt()

6
gbootroot
View File

@ -250,8 +250,8 @@ BEGIN {
} }
if ( !%option || $option{gui_mode}) { if ( !%option || $option{gui_mode} ) {
if ( !$::commandline ) { if ( !$::commandline ) {
use Gtk; use Gtk;
@ -262,7 +262,6 @@ BEGIN {
} }
} }
@ -284,3 +283,4 @@ if ( !%option || $option{gui_mode} ) {
} }
} }

14
gbootroot_pkg
View File

@ -53,6 +53,7 @@ my $urgency = "low";
#my $priority = "optional"; #my $priority = "optional";
my $gbootroot_cvs = "$user_home/gbootroot/gbootroot"; my $gbootroot_cvs = "$user_home/gbootroot/gbootroot";
my $packaging_place = "$user_home/gbootroot/PACKAGING"; my $packaging_place = "$user_home/gbootroot/PACKAGING";
my $packaging_place_orig = $packaging_place;
my $packaging_defaults = "$gbootroot_cvs/pkg/dpkg"; my $packaging_defaults = "$gbootroot_cvs/pkg/dpkg";
my $email = "freesource\@users.sourceforge.net"; my $email = "freesource\@users.sourceforge.net";
my $name = "Jonathan Rosenbaum"; my $name = "Jonathan Rosenbaum";
@ -146,6 +147,9 @@ foreach (@make_lines) {
# Stuff not in the Makefile # Stuff not in the Makefile
system "cp -fa $makefile $packaging_place/Makefile"; system "cp -fa $makefile $packaging_place/Makefile";
# Basically this is stuff we want in the source package, but not the normal
# package
system "cp -fa README $packaging_place/README"; system "cp -fa README $packaging_place/README";
system "cp -fa user-mode-linux/usr/lib/uml/cramfs-vfs-order.patch $packaging_place/user-mode-linux/usr/lib/uml/cramfs-vfs-order.patch"; system "cp -fa user-mode-linux/usr/lib/uml/cramfs-vfs-order.patch $packaging_place/user-mode-linux/usr/lib/uml/cramfs-vfs-order.patch";
@ -171,6 +175,16 @@ if (-d $packaging_place) {
} , $packaging_place ; } , $packaging_place ;
} }
# At this point we should make a normal tar.gz source package. This is
# a necessary step for packagers who don't want a pre-conditioned package,
# however there will be sections of the Makefile set-up for my own
# personal automation used by this program.
my $pristine_source_package = "$packaging_place_orig/$prog-$version" .
".tar.gz";
print "$pristine_source_package $packaging_place\n";
system "tar cvfz $pristine_source_package $packaging_place";
exit;
# Now we to the dh_make thing, and setup the time, version, and defaults. # Now we to the dh_make thing, and setup the time, version, and defaults.