Changeset 1408 in ProjectBuilder for devel/pbmkbm

Timestamp:

Feb 6, 2012, 9:37:38 AM (13 years ago)

Author:

Bruno Cornec

Message:

r4511@cabanilles: bruno | 2012-02-06 09:29:48 +0100

• New sync point which brings a start of kernel analysis for pbmkbm

File:

• devel/pbmkbm/bin/pbmkbm (modified) (4 diffs)

devel/pbmkbm/bin/pbmkbm

@@ -306 +306 @@
             $lcmd = pb_check_req($lcmd,1);
             if (not defined $lcmd) {
-                pb_log(1,"INFO: command $lcmd (in $c) doesn't exist\n");
+                pb_log(1,"INFO: command $c doesn't exist\n");
                 pb_log(1,"------------------\n");
                 next;
@@ -405 +405 @@
 
 # Create the directory structure needed on the target dir
-my ($tdirs,$bdirs,$bfiles,$bcmds) = pb_distro_get_param($pbos,pb_conf_get("mkbmtargetdirs","mkbmbootdirs","mkbmbootfiles","mkbmbootcmds");
+my ($tdirs,$bdirs,$bfiles,$bcmds) = pb_distro_get_param($pbos,pb_conf_get("mkbmtargetdirs","mkbmbootdirs","mkbmbootfiles","mkbmbootcmds"));
 # Create empty dirs for these
 foreach my $d (split(/,/,$tdirs)) {
-    $targettree->{$d} = "emptydir";
+    $targettree{$d} = "emptydir";
 }
 # And copy dirs for those
 foreach my $d (split(/,/,$bdirs)) {
     if (-d $d) {
-        $targettree->{$d} = "dir";
+        $targettree{$d} = "dir";
+    } elsif (-l $d) {
+        $targettree{$d} = "link";
     } else {
-        pb_log(
+        pb_log(1,"INFO: Directory $d doesn't exist\n");
+    }
 }
 foreach my $f (split(/,/,$bfiles)) {
-    $targettree->{$d} = "dir";
-}
+    $targettree{$f} = "file";
+}
+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
@@ -425 +429 @@
 # List of commands
 # List of dependencies
-# Kernel
+# Kernel - We use 2 objects, the running kernel and the target kernel which could be different
+my %rkernel;
+my %tkernel;
+pb_mkbm_find_kernel(\%rkernel);
 # Initrd
 # init 
@@ -471 +478 @@
 }
 
+sub pb_mkbm_find_kernel {
+
+my $kernel = shift;
+
+$kernel->is_xen = undef;
+# See if we're booted from a Xen kernel
+# From http://wiki.xensource.com/xenwiki/XenCommonProblems#head-26434581604cc8357d9762aaaf040e8d87b37752
+if ( -f "/proc/xen/capabilities") {
+    # It's a Xen kernel
+    pb_log(2,"INFO: We found a Xen Kernel running\n");
+}
+
+my $kfile = pb_distro_get_param($pbos,pb_conf_get_if("mkbmkernelfile"));
+if ((defined $kfile) && ($kfile ne "")) {
+    pb_log(1,"INFO: You specified your kernel as $kfile, so using it\n");
+    $kernel->file = $kfile;
+} 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);
+    pb_log(1,"INFO: Analyzing directory $kernel->dir to find your kernel");
+    $kernel->namere = pb_distro_get_param($pbos,pb_conf_get("mkbmkernelnamere"));
+}
+
+# TODO: Look at a better way to find the name of the kernel we run
+# look at /proc/sys/kernel/bootloader_type /proc/sys/kernel/bootloader_version
+# to have a better guess
+my $dh;
+die "ERROR: Unable to open the mkbmkerneldir content ($kernel->dir)" if (! opendir($dh,$kernel->dir));
+while (readdir $dh) {
+    # Skip non-files
+    next if ((! -f $_) && (! -l $_));
+    # Skip files not correpsonding to the RE planned
+    next if ($_ !~ /$kernel->namere/);
+    #my ($dev,$ino,$mode,$nlink,$uid,$gid,$rdev,$size,$atime,$mtime,$ctime,$blksize,$blocks) = stat("$f/$_");
+}
+closedir($dh);
+$kernel->release = pb_get_osrelase();
+}
+
 sub pb_mkbm_create_media {