Changeset 1672 in ProjectBuilder for devel

Timestamp:

Nov 10, 2012, 6:10:54 AM (11 years ago)

Author:

Bruno Cornec

Message:

r5007@localhost: bruno | 2012-10-09 23:15:57 +0200

• Continue pbmkbm dev

Location:

devel

Files:

• pb-modules/etc/pb.conf (modified) (1 diff)
• pbmkbm/bin/pbmkbm (modified) (14 diffs)

devel/pb-modules/etc/pb.conf

@@ -632 +632 @@
 ospathcmd-termdir default = /usr/share/terminfo
 
+#ospathcmd-lsmod linux = lsmod|
+# get list of modules in first column
+ospathcmd-lsmod linux = /proc/modules
+# get all modules filenames with dependencies in 2nd column
+ospathcmd-depmod linux = modprobe --show-depends
+
 # Some path for commands may defer from one system to another
 ospathcmd-halt solaris = /usr/sbin/halt

devel/pbmkbm/bin/pbmkbm

@@ -237 +237 @@
 }
 if (defined $opts{'l'}) {
-    open(pbLOG,"> $opts{'l'}") || die "Unable to log to $opts{'l'}: $!";
+    open(pbLOG,"> $opts{'l'}") || confess "ERROR: Unable to log to $opts{'l'}: $!";
     $pbLOG = \*pbLOG;
     $pbdebug = 0  if ($pbdebug == -1);
@@ -276 +276 @@
 
 # After that we will need root access
-die "$appname needs to be run as root" if ($EFFECTIVE_USER_ID != 0);
+confess "ERROR: $appname needs to be run as root" if ($EFFECTIVE_USER_ID != 0);
 
 #
@@ -412 +412 @@
     pb_mkbm_create_busybox_ve(\%targettree);
 } else {
-    die "Unknown method $opts{'b'} used to create the media content";
+    confess "ERROR: Unknown method $opts{'b'} used to create the media content";
 }
 
@@ -422 +422 @@
 }
 # And copy dirs for those
-foreach my $d (split(/,/,$bdirs)) {
-    if (-d $d) {
-        $targettree{$d} = "recurdir";
-    } elsif (-l $d) {
-        $targettree{$d} = "link:$d";
-    } else {
-        pb_log(1,"INFO: Directory $d doesn't exist\n");
-    }
-}
-foreach my $f (split(/,/,$bfiles)) {
-    $targettree{$f} = "file";
-}
+foreach my $d (split(/,/,$bfiles),split(/,/,$bdirs)) {
+    pb_mkbm_store_in_tree($d,\%targettree);
+}
+pb_log(2,"INFO: Target Tree is now: ".Dumper(%targettree)."\n");
 # Once the environment is made, add what is needed for this boot media to it.
 # Keyboard
@@ -445 +437 @@
 my %tkernel;
 pb_mkbm_find_kernel(\%rkernel);
+pb_mkbm_find_modules($rkernel{"release"},\%targettree,\%rkernel);
 # Initrd
 # init 
@@ -462 +455 @@
 
 my $busycmd = pb_distro_get_param($pbos,pb_conf_get("ospathcmd-busybox"));
-open(BUSY,"$busycmd |") || die "Unable to execute $busycmd";
+open(BUSY,"$busycmd |") || confess "ERROR: Unable to execute $busycmd";
 my $cmdlist = 0;
 while (<BUSY>) {
@@ -500 +493 @@
 pb_log(1,"Analyzing your keyboard's configuration\n");
 my $keyfile = pb_distro_get_param($pbos,pb_conf_get("ospathcmd-keyfile"));
-die "Unable to read the keyfile $keyfile" if ((not defined $keyfile) || (! -r $keyfile));
+confess "ERROR: Unable to read the keyfile $keyfile" if ((not defined $keyfile) || (! -r $keyfile));
 my $keymapdir = pb_distro_get_param($pbos,pb_conf_get("ospathcmd-keymapdir"));
-die "Unable to read the keymapdir $keymapdir" if ((not defined $keymapdir) || (! -d $keymapdir));
+confess "ERROR: Unable to read the keymapdir $keymapdir" if ((not defined $keymapdir) || (! -d $keymapdir));
 my $keymapre = pb_distro_get_param($pbos,pb_conf_get("ospathcmd-keymapre"));
-die "Unable to read the keymapre $keymapre" if (not defined $keymapre);
+confess "ERROR: Unable to read the keymapre $keymapre" if (not defined $keymapre);
 
 # if a direct keymap file is given as keyfile, use only the first existing one and return
@@ -511 +504 @@
     next if ($f !~ /\.gz$/);
     $foundkmap = 1;
-    if (-l $f) {
-        $tgtree->{$f} = "link:$f";
-        pb_log(1,"Using Keymap file $f\n");
-        last;
-    } elsif (-r $f) {
-        $tgtree->{$f} = "file";
+    if ((-l $f) || (-r $f)) {
+        pb_mkbm_store_in_tree($f,$tgtree);
         pb_log(1,"Using Keymap file $f\n");
         last;
@@ -527 +516 @@
 pb_log(1,"Using Keyfile $keyfile and Keymap directory $keymapdir\n");
 my $locale="";
-open(KEYMAP,"$keyfile") || die "Unable to read $keyfile";
+open(KEYMAP,"$keyfile") || confess "ERROR: Unable to read $keyfile";
 # Depending on the format of the keymap we look for various strings
 while (<KEYMAP>) {
@@ -544 +533 @@
 pb_log(1,"Analyzing your terminfo's configuration\n");
 my $termdir = pb_distro_get_param($pbos,pb_conf_get("ospathcmd-termdir"));
-die "Unable to read the keymapdir $termdir" if ((not defined $termdir) || (! -d $termdir));
+confess "ERROR: Unable to read the keymapdir $termdir" if ((not defined $termdir) || (! -d $termdir));
 $tgtree->{$termdir} = "recurdir";
 
@@ -571 +560 @@
 } else {
     $kernel->{"dir"} = pb_distro_get_param($pbos,pb_conf_get("mkbmkerneldir"));
-    die "ERROR: The mkbmkerneldir content ($kernel->{'dir'}) doesn't refer to a directory\n" if (! -d $kernel->{"dir"});
+    confess "ERROR: The mkbmkerneldir content ($kernel->{'dir'}) doesn't refer to a directory\n" if (! -d $kernel->{"dir"});
     pb_log(1,"INFO: Analyzing directory $kernel->{'dir'} to find your kernel\n");
     $kernel->{"namere"} = pb_distro_get_param($pbos,pb_conf_get("mkbmkernelnamere"));
@@ -579 +568 @@
     # to have a better guess
     my $dh;
-    die "ERROR: Unable to open the mkbmkerneldir content ($kernel->{'dir'})\n" if (! opendir($dh,$kernel->{"dir"}));
+    confess "ERROR: Unable to open the mkbmkerneldir content ($kernel->{'dir'})\n" if (! opendir($dh,$kernel->{"dir"}));
     while (readdir $dh) {
         pb_log(3,"Potential kernel file: $_\n");
@@ -595 +584 @@
         if ($@) {
             # File::MimeInfo not found
-            die("ERROR: Install File::MimeInfo to handle kernel file detection\n");
+            confess "ERROR: Install File::MimeInfo to handle kernel file detection\n";
         }
         my $mm = mimetype("$kernel->{'dir'}/$_");
@@ -615 +604 @@
 }
 
+sub pb_mkbm_find_modules {
+
+my $krel = shift;
+my $tgtree = shift;
+my $kernel = shift;
+
+my $lsmod = pb_distro_get_param($pbos,pb_conf_get("ospathcmd-lsmod"));
+my $depmod = pb_distro_get_param($pbos,pb_conf_get("ospathcmd-depmod"));
+open(LSMOD,"$lsmod") || confess "ERROR: Unable to read $lsmod: $!";
+while (<LSMOD>) {
+    my ($mod,$void) = split(/\s+/);
+    open(DEPMOD,"$depmod -S $kernel->{'release'} $mod |") || confess "ERROR: Unable to read $depmod -S $kernel->{'release'} $mod: $!";
+    while (<DEPMOD>) {
+        chomp();
+        s/^insmod //;
+        s/\s+$//;
+        pb_mkbm_store_in_tree($_,$tgtree);
+    }
+    close(DEPMOD);
+}
+close(LSMOD);
+}
+
 sub pb_mkbm_create_media {
 
+}
+
+
+sub pb_mkbm_store_in_tree {
+
+my $f = shift;
+my $tgtree = shift;
+
+if (-d $f) {
+    $tgtree->{$f} = "recurdir";
+} elsif (-l $f) {
+    $tgtree->{$f} = "link:$f";
+    pb_log(3,"INFO: Storing link $f in tree\n");
+} elsif (-r $f) {
+    $tgtree->{$f} = "file";
+    pb_log(3,"INFO: Storing file $f in tree\n");
+} else {
+    pb_log(3,"INFO: file $f doesn't exist\n");
+}
 }