Changeset 1413 in ProjectBuilder for devel

Timestamp:

Feb 23, 2012, 8:43:53 PM (13 years ago)

Author:

Bruno Cornec

Message:

r4399@localhost: bruno | 2012-02-20 20:47:28 +0100

• Start coding kernel and keyboard detection for pbmkbm

Location:

devel

Files:

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

devel/pb-modules/etc/pb.conf

@@ -551 +551 @@
 ospathcmd-busybox default = /usr/lib/mindi/rootfs/bin/busybox
 
+# Where is the keyboard config file
+ospathcmd-keyfile default = /etc/rc.config
+ospathcmd-keyfile rpm = /etc/sysconfig/keyboard
+ospathcmd-keyfile slackware = /etc/rc.d/rc.keymap
+ospathcmd-keyfile debian = /etc/rc.config,/etc/console/boottime.kmap.gz
+ospathcmd-keyfile ubuntu = /etc/console-setup/boottime.kmap.gz,/etc/console-setup/cached.kmap.gz
+ospathcmd-keyfile arch = /etc/rc.conf
+ospathcmd-keyfile gentoo = /etc/conf.d/keymaps
+# Where is the keyboard directory
+ospathcmd-keymapdir default = /usr/lib/kbd/keymaps
+# ???
+ospathcmd-keymapdir slackware = /usr/share/kbd/keymaps
+
 # Some path for commands may defer from one system to another
 ospathcmd-halt default = /sbin/halt

devel/pbmkbm/bin/pbmkbm

@@ -138 +138 @@
 =item B<-s|--script script>
 
-Name of the script you want to execute on the related boot media at the end o the build.
+Name of the script you want to execute on the related boot media at the end of the build.
 
 =item B<-a|--add pkg1[,pkg2,...]>
@@ -437 +437 @@
 # BootLoader and its configuration
 # Additional data files coming from a potential caller (MondoRescue/Mindi e.g. with fstab, LVM, mountlist, ...)
+pb_log(1,"End of boot media creation\n");
 }
 
@@ -443 +444 @@
 my $tgtree = shift;
 
+pb_log(1,"Analyzing your busybox's configuration\n");
 # First, check which are the supported command in that version of busybox
 # and create the links for it in the target VE
@@ -476 +478 @@
 pb_log(2,"Target Tree is now: ".Dumper($tgtree)."\n");
 close(BUSY);
+pb_log(1,"End of busybox analysis\n");
+}
+
+sub pb_mkbm_find_keyboard {
+
+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 (! -r $keyfile);
+my $keymapdir = pb_distro_get_param($pbos,pb_conf_get("ospathcmd-keymapdir"));
+die "Unable to read the keymapdir $keymapdir" if (! -d $keymapdir);
+
+pb_log(1,"End of keyboard analysis\n");
 }
 
@@ -482 +496 @@
 my $kernel = shift;
 
-$kernel->is_xen = undef;
+pb_log(1,"Analyzing your kernel's configuration\n");
+$kernel->{"is_xen"} = undef;
 # See if we're booted from a Xen kernel
 # From http://wiki.xensource.com/xenwiki/XenCommonProblems#head-26434581604cc8357d9762aaaf040e8d87b37752
@@ -488 +503 @@
     # It's a Xen kernel
     pb_log(2,"INFO: We found a Xen Kernel running\n");
-}
+    $kernel->{"is_xen"} = 1;
+}
+$kernel->{"release"} = pb_get_osrelease();
 
 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;
+    $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();
+    $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\n");
+    $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'})\n" if (! opendir($dh,$kernel->{"dir"}));
+    while (readdir $dh) {
+        pb_log(3,"Potential kernel file: $_\n");
+        # Skip non-files
+        next if (! -f "$kernel->{'dir'}/$_");
+        # Skip files not correpsonding to the RE planned
+        next if ($_ !~ /$kernel->{"namere"}/);
+        # We now have a candidate. Analyze further
+        pb_log(3,"Potential kernel file 2: $_\n");
+        eval
+        {
+            require File::MimeInfo;
+            File::MimeInfo->import();
+        };
+        if ($@) {
+            # File::MimeInfo not found
+            die("ERROR: Install File::MimeInfo to handle kernel file detection\n");
+        }
+        my $mm = mimetype("$kernel->{'dir'}/$_");
+        # Skip symlinks
+        next if ($mm =~ /inode\/symlink/);
+        pb_log(2,"file $_ mimetype: $mm\n");
+        if ($mm =~ /\/x-gzip/) {
+            # on ia64 kernel are gzip compressed
+        }
+        next if (pb_get_content("$kernel->{'dir'}/$_") !~ /$kernel->{"release"}/);
+        pb_log(3,"Potential kernel file 3: $_\n");
+        $kernel->{"file"} = "$kernel->{'dir'}/$_";
+        #my ($dev,$ino,$mode,$nlink,$uid,$gid,$rdev,$size,$atime,$mtime,$ctime,$blksize,$blocks) = stat("$f/$_");
+    }
+    closedir($dh);
+}
+pb_log(1,"INFO: kernel is ".Dumper($kernel)."\n");
+pb_log(1,"End of kernel analysis\n");
 }