mirror of
https://github.com/fspc/gbootroot.git
synced 2026-09-11 06:11:38 -04:00
This adds jffs/jffs2 construction, expect_uml will have to be changed a little
bit more, but have tested this with an initrd, and it works pretty nicely even with large fs assuming mem is set high enough. Mtdram was chosen over blkmtd for now.
This commit is contained in:
+19
-3
@@ -1489,12 +1489,28 @@ sub create_expect_uml {
|
||||
}
|
||||
|
||||
|
||||
if ( $fs_type eq "mkcramfs" || $fs_type eq "genromfs" ) {
|
||||
if ( $fs_type eq "mkcramfs" || $fs_type eq "genromfs" ||
|
||||
$fs_type eq "mkfs.jffs" || $fs_type eq "mkfs.jffs2") {
|
||||
# Will just keep appending _cramfs .. leaving it to the
|
||||
# user to realize this is happening, that way the user
|
||||
# has control over the dd file.
|
||||
$fs_type eq "mkcramfs" ? ($device = $device . "_cramfs") :
|
||||
($device = $device . "_romfs");
|
||||
## $fs_type eq "mkcramfs" ? ($device = $device . "_cramfs") :
|
||||
## ($device = $device . "_romfs");
|
||||
|
||||
if ( $fs_type eq "mkcramfs" ) {
|
||||
$device = $device . "_cramfs";
|
||||
}
|
||||
elsif ( $fs_type eq "genromfs" ) {
|
||||
$device = $device . "_romfs";
|
||||
}
|
||||
# These guys just get written over, but that is o.k.
|
||||
elsif ( $fs_type eq "mkfs.jffs" ) {
|
||||
$device = $device . "_jffs";
|
||||
}
|
||||
elsif ( $fs_type eq "mkfs.jffs2" ) {
|
||||
$device = $device . "_jffs2";
|
||||
}
|
||||
|
||||
my $cramfs_name = basename($device);
|
||||
# If somebody closes ARS, this won't get updated,
|
||||
# but that is a minor matter.
|
||||
|
||||
+5
-3
@@ -490,15 +490,17 @@ sub file_system {
|
||||
# usinng uml_exlusively
|
||||
else {
|
||||
my %uml_helper_fs_types = qw(mke2fs 1 mkcramfs 1 genromfs 1
|
||||
mkfs.minix 1 mkminix 1
|
||||
mkreiserfs 1);
|
||||
mkfs.minix 1 mkminix 1
|
||||
mkreiserfs 1 mkfs.jffs 1
|
||||
mkfs.jffs2 1);
|
||||
|
||||
if ( !$uml_helper_fs_types{$executable} ) {
|
||||
|
||||
error_window("ROOT_FS_HELPER ERROR: " .
|
||||
"These are supported " .
|
||||
"make fs commands:\n\nmke2fs mkcramfs" .
|
||||
" genromfs mkfs.minix mkminix mkreiserfs");
|
||||
" genromfs mkfs.minix mkminix mkreiserfs" .
|
||||
" mkfs.jffs mkfs.jffs2");
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user