Changeset 1402 in ProjectBuilder

Timestamp:

Feb 3, 2012, 12:17:04 AM (12 years ago)

Author:

Bruno Cornec

Message:

r4487@cabanilles: bruno | 2012-02-01 16:21:48 +0100

• Fix the -t option without param for pb
• add a function to analyze busybox countent and create appropriate structure for pbmkbm

Location:

devel

Files:

• pb-modules/etc/pb.conf (modified) (3 diffs)
• pb-modules/lib/ProjectBuilder/Base.pm (modified) (2 diffs)
• pb-modules/lib/ProjectBuilder/Distribution.pm (modified) (2 diffs)
• pb/bin/pb (modified) (2 diffs)
• pbmkbm/bin/pbmkbm (modified) (6 diffs)
• pbmkbm/etc/pbmkbm.conf (modified) (1 diff)
• rpmbootstrap/bin/rpmbootstrap (modified) (1 diff)

devel/pb-modules/etc/pb.conf

@@ -343 +343 @@
 
 # Where to store packages downloaded temporarily by rpmbootstrap
-rbscachedir default = /var/cache/rpmbootstrap
+cachedir rpmbootstrap = /var/cache/rpmbootstrap
+cachedir pbmkbm = /var/cache/rpmbootstrap
 
 # Options to pass to rpmbootstrap command. By default keep downloaded packages
@@ -377 +378 @@
 verpmtype pbmkbm = rpmbootstrap
 vedebtype pbmkbm = debbootstrap
+
+# Log command to use to have a sufficient understanding of the environment in which we oprate
+logcmd pbmkbm = internal
+# internal or sos, or cfg2html, or ...
+logopt pbmkbm = --options
+logfiles pbmkbm = /etc/raidtab,/proc/cmdline,/proc/swaps,/proc/partitions,/proc/filesystems,/proc/lvm,/dev/mapper
+logcommands pbmkbm = mount,lsmod,esxcfg-module -l,df -T
+
+# Directories to create on the target media
+targetdir pbmkbm = /bin,/usr/bin,/tmp
+# Files to embed on the target media
+mandatoryfiles pbmkbm = 
+optionalfiles pbmkbm = 
+
+# Where are the ISO bootloader for this OS
+mkbmisobl linux = /usr/lib/syslinux/isolinux.bin,/usr/lib64/syslinux/isolinux.bin
+mkbmkbd mageia = /usr/lib/kbd
 
 # pb install dependencies per distro
@@ -502 +520 @@
 oscmd rpmbootstrap = rpm,rpm2cpio,wget
 #oscmdopt rpmbootstrap = 
-#
+oscmd pbmkbm = 
+oscmdopt pbmkbm = 
+#
+# If busybox, which one is used (from mindi, or native, ...)
+ospathcmd-busybox default = /usr/lib/mindi/rootfs/bin/busybox
 
 # Some path for commands may defer from one system to another

devel/pb-modules/lib/ProjectBuilder/Base.pm

@@ -393 +393 @@
 
 # On linux can also use /proc/sys/kernel/osrelease
-return(chomp(`uname -r`));
+my $rel = `uname -m`;
+chomp($rel);
+return($rel);
 }
 
@@ -480 +482 @@
 } else {
     pb_log(2,"OK\n");
-    return($found);
-}
+}
+return($found);
 }
 

devel/pb-modules/lib/ProjectBuilder/Distribution.pm

@@ -560 +560 @@
 
 This function gets the OS context passed as parameter and return the corresponding distribution hash
+If passed undef or "" then auto-detects
 
 =cut
@@ -569 +570 @@
 my $pbos;
 
-if (defined $os) {
+if ((defined $os) && ($os ne "")) {
     my ($name,$ver,$darch) = split(/-/,$os);
     pb_log(0,"Bad format for $os") if ((not defined $name) || (not defined $ver) || (not defined $darch)) ;

devel/pb/bin/pb

@@ -544 +544 @@
 if (defined $opts{'t'}) {
     $pbtarget = $opts{'t'};
-    # GetOptions may create an empty string, we use internally undef for that type of target
-    if ($pbtarget eq "") {
-        $pbtarget = undef;
-    }
 }
 
@@ -3999 +3995 @@
 
 # Get list of distributions for which we need to generate build files if no target
-if (not defined ($pbtarget)) {
+if (not defined $pbtarget) {
     my @pt = pb_conf_get_if("vmlist","velist","rmlist");
     if (defined $pt[0]->{$ENV{'PBPROJ'}}) {

devel/pbmkbm/bin/pbmkbm

@@ -16 +16 @@
 use File::Basename;
 use File::Copy;
+use POSIX qw(strftime);
+
 use ProjectBuilder::Version;
 use ProjectBuilder::Base;
@@ -235 +237 @@
 }
 pb_log_init($pbdebug, $pbLOG);
+pb_log(1,"$appname Version $projectbuilderver-$projectbuilderrev\n");
+my @date = pb_get_date();
+my $pbdate = strftime("%Y-%m-%d %H:%M:%S", @date);
+
+pb_log(1,"Start: $pbdate\n");
 
 # Get VE name
@@ -256 +263 @@
 # Check for command requirements
 #
-my ($req,$opt) = pb_conf_get_if("mkbmcmd","mkbmcmdopt");
+my ($req,$opt) = pb_conf_get_if("oscmd","oscmdopt");
 pb_check_requirements($req,$opt,$appname);
 
@@ -265 +272 @@
 # Where is our build target directory
 #
-
 if (not defined $targetdir) {
     $targetdir = "/var/cache/pbmkbm";
     my ($vestdpath) = pb_conf_get("mkbmpath");
     $targetdir = "$vestdpath->{'default'}/$pbos->{'name'}/$pbos->{'version'}/$pbos->{'arch'}" if (defined $vestdpath->{'default'});
-}
-
-die pb_log(0,"No target-dir specified and no default mkbmpath found in $ENV{'PBETC'}\n") if (not defined $targetdir);
+    pb_log(1,"No target-dir specified, using $targetdir\n");
+}
 
 # Point to the right subdir and create it if needed
 pb_mkdir_p($targetdir) if (! -d $targetdir);
 
+# Log information on our system
+# TODO: this should be put in a subfunction
+my ($logcmd) = pb_conf_get("logcmd");
+my ($logopt) = pb_conf_get_if("logopt");
+# check that the command is there first and then use it.
+if ($logcmd->{$appname} ne "internal") {
+    $logcmd = pb_check_req($logcmd->{$appname},1);
+    if (not defined $logcmd) {
+        pb_log(1,"INFO: command $logcmd->{$appname} doesn't exist. No log report is available\n");
+    } else {
+        my $c = $logcmd->{$appname};
+        $c .= " $logopt->{$appname}" if (defined $logopt->{$appname});
+        pb_system("$c","Creating a log report of your system");
+    }
+} else {
+    # We provide our own internal log reporter as a std one isn't found
+    my ($lcmds,$lfiles) = pb_conf_get_if("logcommands","logfiles");
+    pb_log(1,"------------------\n");
+    if (defined $lcmds->{$appname}) {
+        foreach my $c (split(/,/,$lcmds->{$appname})) {
+            my $lcmd = $c;
+            $lcmd =~ s/ .*$//;
+            $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,"------------------\n");
+                next;
+            }
+            pb_log(1,"Execution of $c\n");
+            pb_log(1,"------------------\n");
+            pb_system($c,"",1);
+            pb_log(1,"------------------\n");
+        }
+    }
+    if (defined $lfiles->{$appname}) {
+        foreach my $f (split(/,/,$lfiles->{$appname})) {
+            if (! -e $f) {
+                pb_log(1,"INFO: $f doesn't exist\n");
+                pb_log(1,"------------------\n");
+                next;
+            }
+            if (! -r $f) {
+                pb_log(1,"INFO: $f isn't readable\n");
+                pb_log(1,"------------------\n");
+                next;
+            }
+            if ((-f $f) || (-l $f)) {
+                if (! open(FILE,$f)) {
+                    pb_log(1,"INFO: Unable to open $f\n");
+                    pb_log(1,"------------------\n");
+                    next;
+                }
+                pb_log(1,"Content of $f\n");
+                pb_log(1,"------------------\n");
+                while (<FILE>) {
+                    pb_log(1,$_);
+                }
+                close(FILE);
+                pb_log(1,"------------------\n");
+            } elsif (-d $f) {
+                my $dh;
+                if (! opendir($dh,$f)) {
+                    pb_log(1,"INFO: Unable to opendir $f\n");
+                    pb_log(1,"------------------\n");
+                    next;
+                }
+                pb_log(1,"Content of directory $f\n");
+                pb_log(1,"----------------------------\n");
+                while (readdir $dh) {
+                    my ($dev,$ino,$mode,$nlink,$uid,$gid,$rdev,$size,$atime,$mtime,$ctime,$blksize,$blocks) = stat("$f/$_");
+                    my $str = sprintf("%10s %2s %5s %5s %10s %14s %s",$mode,$ino,$uid,$gid,$size,$mtime,$_);
+                    pb_log(1,"$str\n");
+                }
+                closedir($dh);
+                pb_log(1,"------------------\n");
+            } else {
+                pb_log(1,"INFO: $f is special\n");
+                pb_log(1,"------------------\n");
+            }
+        }
+    }
+}
 
 # Now the preparation is over, we need to do something useful :-)
@@ -287 +374 @@
 pb_mkbm_create_media();
 
+@date = pb_get_date();
+$pbdate = strftime("%Y-%m-%d %H:%M:%S", @date);
+
+pb_log(1,"End: $pbdate\n");
+
 sub pb_mkbm_create_content {
 
@@ -294 +386 @@
 $opts{'b'} = "ve" if (not defined $opts{'b'});
 
+# Hash of target content
+# atribute could be, copy, remove, link, dir
+my %targettree;
+
 if ($opts{'b'} eq "ve") {
-    # Use existing tools to create a good VE !
+    # Use project-builder VE mecanism to create a good VE !
     pb_ve_launch($ENV{'PBV'},1);
 } elsif ($opts{'b'} eq "native") {
     # Use native tools to create a good VE !
+} elsif ($opts{'b'} eq "drakut") {
+    # Use drakut to create a good VE !
+} elsif ($opts{'b'} eq "busybox") {
+    # Use busybox to create a good VE !
+    pb_mkbm_create_busybox_ve(\%targettree);
 } else {
     die "Unknown method $opts{'b'} used to create the media content";
 }
 
+# Create the directory structure needed on the target dir
+$targettree->{"/bin"} = "dir";
+
 # Once the environment is made, add what is needed for this boot media to it.
+# Keyboard
+# Terminfo
+# List of commands
+# List of dependencies
+# Kernel
+# Initrd
+# init 
+# BootLoader and its configuration
+# Additional data files coming from a potential caller (MondoRescue e.g. with fstab, LVM, mountlist, ...)
+}
+
+sub pb_mkbm_create_busybox_ve {
+
+my $tgtree = shift;
+
+# First, check which are the supported command in that version of busybox
+# and create the links for it in the target VE
+
+my $busycmd = pb_distro_get_param($pbos,pb_conf_get("ospathcmd-busybox"));
+open(BUSY,"$busycmd |") || die "Unable to execute $busycmd";
+my $cmdlist = 0;
+while (<BUSY>) {
+    pb_log(3,"busybox line : $_");
+    chomp($_);
+    # After these words, we have the list of functions, so trigger their analysis
+    if ($_ =~ /defined functions:/) {
+        $cmdlist = 1;
+        next;
+    }
+    # Analyse the list of commands provided by that busybox (, separated)
+    if ($cmdlist == 1) {
+        pb_log(3,"Analyzing that busybox line\n");
+        foreach my $c (split(/,/,$_)) {
+            $c =~ s/\s*//g;
+            # skip empty strings
+            next if ($c =~ /^$/);
+            my $c1 = pb_check_req($c,0);
+            if (defined $c1) {
+                $tgtree->{$c1} = "link:$busycmd";
+            } else {
+                # When not found on the system, create the link under /usr/bin by default
+                $tgtree->{"/usr/bin/$c"} = "link:$busycmd";
+            }
+        }
+    }
+}
+pb_log(2,"Target Tree is now: ".Dumper($tgtree)."\n");
+close(BUSY);
 }
 

devel/pbmkbm/etc/pbmkbm.conf

@@ -12 +12 @@
 mkbmmindep fedora-4 = MAKEDEV,SysVinit,audit-libs,basesystem,bash,beecrypt,bzip2-libs,chkconfig,coreutils,cracklib,cracklib-dicts,db4,device-mapper,e2fsprogs,elfutils-libelf,ethtool,expat,filesystem,findutils,gawk,gdbm,glib2,glibc,glibc-common,grep,info,initscripts,iproute,iputils,krb5-libs,libacl,libattr,libcap,libgcc,libidn,libselinux,libsepol,libstdc++,libtermcap,libxml2,libxml2-python,mingetty,mktemp,module-init-tools,ncurses,neon,net-tools,openssl,pam,pcre,popt,procps,psmisc,python,python-elementtree,python-sqlite,python-urlgrabber,readline,rpm,rpm-libs,rpm-python,sed,setup,shadow-utils,sqlite,sysklogd,termcap,tzdata,udev,util-linux,yum,zlib
 
-# Where to store packages downloaded temporarily by rpmbootstrap
-mkbmcachedir default = /var/cache/rpmbootstrap
+# Commands needed on the underlying system
+mkbmcmd pbmkbm = #tar,chmod,ls
+mkbmcmdopt pbmkbm = #,cfghtml,wget,sudo,mv,gzip,rm,chroot,schroot,cp,chown,mkdir,cat,bash,
+#
 
-# Commands needed on the underlying system
-mkbmcmd pb = tar,chmod,ls
-mkbmcmdopt pb = rpmbuild,dpkg-buildpackage,rpm,dpkg,wget,sudo,apt-get,mv,gzip,ebuild,makepkg,pkgmk,pkgtrans,rm,rpmlint,lintian,chroot,schroot,cp,chown,debsign,qemu-img,qemu,kvm,rpmbootstrap,rinse,mock,debootstrap,mkdir,cat,ssh,scp,yum,bash,make,vi,ssh-keygen,svn,hg,cvs,git,svk,svn2cl,cvs2cl,urpmi
-mkbmcmd rpmbootstrap = rpm,rpm2cpio,wget
-#mkbmcmdopt rpmbootstrap = 
-#
+# Directories to create on the target media
+mkbmtargetdir pbmkbm = /bin,/usr/bin,/tmp
+# Files to embed on the target media
+mkbmtargetfiles pbmkbm = 
+
+# Where are the ISO bootloader for this OS
+mkbmisobl linux = /usr/lib/syslinux/isolinux.bin,/usr/lib64/syslinux/isolinux.bin
+mkbmkbd mageia = /usr/lib/kbd
 
 # How do you want to install content in your VE (pkg or file)

devel/rpmbootstrap/bin/rpmbootstrap

@@ -257 +257 @@
 # Get the package list to download, store them in a cache directory
 #
-my ($rbscachedir) = pb_conf_get_if("rbscachedir");
+my ($rbscachedir) = pb_conf_get_if("cachedir");
 my ($pkgs,$mirror) = pb_distro_get_param($pbos,pb_conf_get("rbsmindep","rbsmirrorsrv"));
 
 my $cachedir = "/var/cache/rpmbootstrap";
 $cachedir = $rbscachedir->{'default'} if (defined $rbscachedir->{'default'});
+$cachedir = $rbscachedir->{$appname} if (defined $rbscachedir->{$appname});
 
 # Point to the right subdir and create it if needed