Changeset 1414

Timestamp:

02/23/12 20:44:04 (15 months ago)

Author:

bruno

Message:

r4400@localhost: bruno | 2012-02-21 13:15:45 +0100

• Start adding keyboard capture support

Location:

devel

Files:

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

devel/pb-modules/etc/pb.conf

@@ -555 +555 @@
 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 debian = /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
@@ -563 +563 @@
 # ???
 ospathcmd-keymapdir slackware = /usr/share/kbd/keymaps
+# Regular expression to find the locale in the keymap file
+ospathcmd-keymapre rpm = s/^KEYTABLE="([[:alpha:]]+)"/$1/
+ospathcmd-keymapre arch = s/^KEYMAP="([[:alpha:]]+)"/$1/
+ospathcmd-keymapre gentoo = s/^KEYMAP="([[:alpha:]]+)"/$1/
+ospathcmd-keymapre slack = s/\w\s([[:alpha:]]+.map)/$1/
 
 # Some path for commands may defer from one system to another

devel/pbmkbm/bin/pbmkbm

@@ -16 +16 @@
 use File::Basename;
 use File::Copy;
+use File::Find;
 use POSIX qw(strftime);
 
@@ -254 +255 @@
 pb_env_init_pbrc(); # to get content of HOME/.pbrc
 
+# Global hash containing all the configuration information
+my %mkbm;
+
 #
 # Check target dir
 # Create if not existent and use default if none given
 #
-my $targetdir = shift @ARGV;
+$mkbm{'targetdir'} = shift @ARGV;
 
 #
@@ -272 +276 @@
 # Where is our build target directory
 #
-if (not defined $targetdir) {
-    $targetdir = "/var/cache/pbmkbm";
+if (not defined $mkbm{'targetdir'}) {
+    $mkbm{'targetdir'} = "/var/cache/pbmkbm";
     my ($vestdpath) = pb_conf_get("mkbmpath");
-    $targetdir = "$vestdpath->{'default'}/$pbos->{'name'}/$pbos->{'version'}/$pbos->{'arch'}" if (defined $vestdpath->{'default'});
-    pb_log(1,"No target-dir specified, using $targetdir\n");
+    $mkbm{'targetdir'} = "$vestdpath->{'default'}/$pbos->{'name'}/$pbos->{'version'}/$pbos->{'arch'}" if (defined $vestdpath->{'default'});
+    pb_log(1,"No target-dir specified, using $mkbm{'targetdir'}\n");
 }
 
 # Point to the right subdir and create it if needed
-pb_mkdir_p($targetdir) if (! -d $targetdir);
+pb_mkdir_p($mkbm{'targetdir'}) if (! -d $mkbm{'targetdir'});
 
 # Log information on our system
@@ -426 +430 @@
 # Once the environment is made, add what is needed for this boot media to it.
 # Keyboard
+pb_mkbm_find_keyboard(\%targettree);
 # Terminfo
 # List of commands
@@ -476 +481 @@
     }
 }
-pb_log(2,"Target Tree is now: ".Dumper($tgtree)."\n");
+pb_log(1,"Target Tree is now: ".Dumper($tgtree)."\n");
 close(BUSY);
 pb_log(1,"End of busybox analysis\n");
@@ -483 +488 @@
 sub pb_mkbm_find_keyboard {
 
+my $tgtree = shift;
+
 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);
+die "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 (! -d $keymapdir);
+die "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);
+
+# if a direct keymap file is given as keyfile, use only the first existing one it and return
+my $foundkmap = 0;
+foreach my $f (split(/,/,$keyfile)) {
+    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";
+        pb_log(1,"Using Keymap file $f\n");
+        last;
+    } else {
+        next;
+    }
+}
+return() if ($foundkmap eq 1);
+
+pb_log(1,"Using Keyfile $keyfile and Keymap directory $keymapdir\n");
+my $locale="";
+open(KEYMAP,"$keyfile") || die "Unable to read $keyfile";
+# Depending on the format of the keymap we look for various strings
+while (<KEYMAP>) {
+    $locale =~ $keymapre;
+}
+close(KEYMAP);
+pb_log(1,"Found locale $locale\n");
 
 pb_log(1,"End of keyboard analysis\n");