Changeset 1402 in ProjectBuilder for devel/pb-modules

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/pb-modules

Files:

• etc/pb.conf (modified) (3 diffs)
• lib/ProjectBuilder/Base.pm (modified) (2 diffs)
• lib/ProjectBuilder/Distribution.pm (modified) (2 diffs)

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)) ;