Changeset 1500 in ProjectBuilder for devel

Timestamp:

May 8, 2012, 4:12:21 AM (13 years ago)

Author:

Bruno Cornec

Message:

project-builder-r1426

Location:

devel

Files:

• Makefile.PL (modified) (1 diff)
• etc/pb.conf (modified) (18 diffs)
• etc/pb.conf.pod (modified) (4 diffs)
• lib/ProjectBuilder/Base.pm (modified) (4 diffs)
• lib/ProjectBuilder/Distribution.pm (modified) (2 diffs)
• lib/ProjectBuilder/Env.pm (added)
• lib/ProjectBuilder/VE.pm (added)
• lib/ProjectBuilder/Version.pm (modified) (1 diff)

devel/Makefile.PL

@@ -6 +6 @@
 # the contents of the Makefile that is written.
 WriteMakefile(
-    NAME         => 'ProjectBuilder',
-    DISTNAME     => 'ProjectBuilder',
-    VERSION      => '0.11.3',
+    NAME         => 'PBPKG',
+    DISTNAME     => 'PBPKG',
+    VERSION      => 'PBVER',
     INST_SCRIPT  => 'blib/bin',
     INSTALLDIRS  => 'perl',

devel/etc/pb.conf

@@ -59 +59 @@
 #
 osrelfile knoppix = /etc/knoppix_version
+osrelfile oel = /etc/oracle-release
 osrelfile yellowdog = /etc/yellowdog-release
 osrelfile esmith = /etc/e-smith-release
@@ -112 +113 @@
 osambiguous debian = debian,ubuntu
 osambiguous suse = suse,sles,opensuse
-osambiguous redhat = redhat,rhel,centos,mandrake,mandriva,vmware
+osambiguous redhat = redhat,rhel,centos,mandrake,mandriva,vmware,oel
 osambiguous lsb = ubuntu,lsb
 
@@ -131 +132 @@
 osrelexpr rhel = Red Hat (?:Enterprise Linux|Linux Advanced Server) .*release ([0-9]+).* \(
 osrelexpr centos = .*CentOS .*release ([0-9]).* 
+osrelexpr oel = Oracle Linux Server) .*release ([0-9]+).* \(
 osrelexpr redhat = Red Hat Linux release (.+) \(
 osrelexpr sles = SUSE .* Enterprise Server (\d+) \(
@@ -165 +167 @@
 osfamily sles = novell
 osfamily redhat = rh
+osfamily oel = rh
 osfamily rhel = rh
 osfamily fedora = rh
@@ -210 +213 @@
 osupd rpm = sudo /usr/bin/yum clean all; sudo /usr/bin/yum -y update
 osupd md = sudo /usr/bin/urpmi.update -a ; sudo /usr/sbin/urpmi --auto --auto-select --no-suggests
+osupd opensuse-11.1 = sudo /usr/bin/zypper -n update
 osupd opensuse = sudo /usr/bin/zypper --gpg-auto-import-keys -n update
 osupd sol = /bin/true
@@ -225 +229 @@
 osins novell = export TERM=linux ; export PATH=\$PATH:/sbin:/usr/sbin ; sudo /sbin/yast2 -i 
 osins opensuse-10.2 = yes | sudo /usr/bin/zypper install
+osins opensuse-11.1 = sudo /usr/bin/zypper -n install
 osins opensuse = sudo /usr/bin/zypper --gpg-auto-import-keys -n install
 osins sol = sudo pkgadd -d
@@ -246 +251 @@
 ossuffix lsb = lsb
 ossuffix hpux = sd
+#ossuffix oel = oel
 #ossuffix rhel = rhel
 #ossuffix centos = el
@@ -288 +294 @@
 rbsmindep fedora-14 = ConsoleKit-libs,audit-libs,basesystem,bash,bzip2-libs,c-ares,chkconfig,coreutils,cpio,cracklib,cracklib-dicts,crontabs,cyrus-sasl-lib,db4,dbus,dbus-libs,device-mapper,device-mapper-libs,dhclient,e2fsprogs,e2fsprogs-libs,elfutils-libelf,expat,fedora-release,fedora-release-notes,file,file-libs,filesystem,findutils,gamin,gawk,gdbm,glib2,glibc,glibc-common,gnupg2,gpgme,grep,info,initscripts,iproute,iputils,keyutils-libs,krb5-libs,libacl,libattr,libcap,libcom_err,libcurl,libgcc,libgcrypt,libgpg-error,libidn,libselinux,libsepol,libssh2,libstdc++,libusb,libxml2,linux-atm-libs,logrotate,lua,mingetty,module-init-tools,ncurses,ncurses-base,ncurses-libs,net-tools,nspr,nss,nss-softokn,nss-softokn-freebl,nss-util,openldap,openssl,pam,passwd,pcre,pinentry,popt,procps,psmisc,pth,pygpgme,python,python-iniparse,python-libs,python-pycurl,python-urlgrabber,readline,rpm,rpm-libs,rpm-python,rsyslog,sed,setup,shadow-utils,sqlite,sysvinit-tools,tzdata,udev,upstart,util-linux-ng,vim-minimal,xz-libs,yum,yum-metadata-parser,zlib
 #
+rbsmindep fedora-15 = ConsoleKit-libs,audit-libs,basesystem,bash,bzip2-libs,c-ares,chkconfig,coreutils,cpio,cracklib,cracklib-dicts,crontabs,cyrus-sasl-lib,db4,dbus,dbus-libs,device-mapper,device-mapper-libs,dhclient,e2fsprogs,e2fsprogs-libs,elfutils-libelf,expat,fedora-release,fedora-release-notes,file,file-libs,filesystem,findutils,gamin,gawk,gdbm,glib2,glibc,glibc-common,gnupg2,gpgme,grep,info,initscripts,iproute,iputils,keyutils-libs,krb5-libs,libacl,libattr,libcap,libcom_err,libcurl,libgcc,libgcrypt,libgpg-error,libidn,libselinux,libsepol,libssh2,libstdc++,libusb,libxml2,linux-atm-libs,logrotate,lua,mingetty,module-init-tools,ncurses,ncurses-base,ncurses-libs,net-tools,nspr,nss,nss-softokn,nss-softokn-freebl,nss-util,openldap,openssl,pam,passwd,pcre,pinentry,popt,procps,psmisc,pth,pygpgme,python,python-iniparse,python-libs,python-pycurl,python-urlgrabber,readline,rpm,rpm-libs,rpm-python,rsyslog,sed,setup,shadow-utils,sqlite,sysvinit-tools,tzdata,udev,vim-minimal,xz-libs,yum,yum-metadata-parser,zlib
+#
+rbsmindep fedora-16 = ConsoleKit-libs,audit-libs,basesystem,bash,bzip2-libs,c-ares,chkconfig,coreutils,cpio,cracklib,cracklib-dicts,crontabs,cyrus-sasl-lib,db4,dbus,dbus-libs,device-mapper,device-mapper-libs,dhclient,e2fsprogs,e2fsprogs-libs,elfutils-libelf,expat,fedora-release,fedora-release-notes,file,file-libs,filesystem,findutils,gamin,gawk,gdbm,glib2,glibc,glibc-common,gnupg2,gpgme,grep,info,initscripts,iproute,iputils,keyutils-libs,krb5-libs,libacl,libattr,libcap,libcom_err,libcurl,libgcc,libgcrypt,libgpg-error,libidn,libselinux,libsepol,libssh2,libstdc++,libusb,libxml2,linux-atm-libs,logrotate,lua,mingetty,module-init-tools,ncurses,ncurses-base,ncurses-libs,net-tools,nspr,nss,nss-softokn,nss-softokn-freebl,nss-util,openldap,openssl,pam,passwd,pcre,pinentry,popt,procps,psmisc,pth,pygpgme,python,python-iniparse,python-libs,python-pycurl,python-urlgrabber,readline,rpm,rpm-libs,rpm-python,rsyslog,sed,setup,shadow-utils,sqlite,sysvinit-tools,tzdata,udev,vim-minimal,xz-libs,yum,yum-metadata-parser,zlib
+#
 rbsmindep centos-4 = MAKEDEV,SysVinit,audit-libs,basesystem,bash,beecrypt,bzip2-libs,centos-release,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,yum-metadata-parser,zlib
 #
@@ -296 +306 @@
 #
 rbsmindep rhel-5 = MAKEDEV,SysVinit,audit-libs,basesystem,bash,beecrypt,bzip2-libs,coreutils,cracklib,cracklib-dicts,db4,device-mapper,e2fsprogs,e2fsprogs-libs,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++,libsysfs,libtermcap,libxml2,libxml2-python,mcstrans,mingetty,mktemp,module-init-tools,ncurses,neon,net-tools,nss,nspr,openssl,pam,pcre,popt,procps,psmisc,python,python-elementtree,python-iniparse,python-sqlite,python-urlgrabber,readline,redhat-release,rpm,rpm-libs,rpm-python,sed,setup,shadow-utils,sqlite,sysklogd,termcap,tzdata,udev,util-linux,yum,yum-metadata-parser,zlib
+rbsmindep oel-5 = MAKEDEV,SysVinit,audit-libs,basesystem,bash,beecrypt,bzip2-libs,coreutils,cracklib,cracklib-dicts,db4,device-mapper,e2fsprogs,e2fsprogs-libs,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++,libsysfs,libtermcap,libxml2,libxml2-python,mcstrans,mingetty,mktemp,module-init-tools,ncurses,neon,net-tools,nss,nspr,openssl,pam,pcre,popt,procps,psmisc,python,python-elementtree,python-iniparse,python-sqlite,python-urlgrabber,readline,redhat-release,rpm,rpm-libs,rpm-python,sed,setup,shadow-utils,sqlite,sysklogd,termcap,tzdata,udev,util-linux,yum,yum-metadata-parser,zlib
+#
+rbsmindep rhel-6 = MAKEDEV,ConsoleKit-libs,audit-libs,basesystem,bash,bzip2-libs,c-ares,chkconfig,coreutils,cpio,cracklib,cracklib-dicts,crontabs,cyrus-sasl-lib,db4,dbus,dbus-libs,device-mapper,device-mapper-libs,dhclient,e2fsprogs,e2fsprogs-libs,elfutils-libelf,expat,fedora-release,fedora-release-notes,file,file-libs,filesystem,findutils,gamin,gawk,gdbm,glib2,glibc,glibc-common,gnupg2,gpgme,grep,info,initscripts,iproute,iputils,keyutils-libs,krb5-libs,libacl,libattr,libcap,libcom_err,libcurl,libgcc,libgcrypt,libgpg-error,libidn,libselinux,libsepol,libssh2,libstdc++,libusb,libxml2,linux-atm-libs,logrotate,lua,mingetty,module-init-tools,ncurses,ncurses-base,ncurses-libs,net-tools,nspr,nss,nss-softokn,nss-softokn-freebl,nss-util,openldap,openssl,pam,passwd,pcre,pinentry,popt,procps,psmisc,pth,pygpgme,python,python-iniparse,python-libs,python-pycurl,python-urlgrabber,readline,rpm,rpm-libs,rpm-python,rsyslog,sed,setup,shadow-utils,sqlite,sysvinit-tools,tzdata,udev,upstart,util-linux-ng,vim-minimal,xz-libs,yum,yum-metadata-parser,zlib
+rbsmindep oel-6 = MAKEDEV,ConsoleKit-libs,audit-libs,basesystem,bash,bzip2-libs,c-ares,chkconfig,coreutils,cpio,cracklib,cracklib-dicts,crontabs,cyrus-sasl-lib,db4,dbus,dbus-libs,device-mapper,device-mapper-libs,dhclient,e2fsprogs,e2fsprogs-libs,elfutils-libelf,expat,fedora-release,fedora-release-notes,file,file-libs,filesystem,findutils,gamin,gawk,gdbm,glib2,glibc,glibc-common,gnupg2,gpgme,grep,info,initscripts,iproute,iputils,keyutils-libs,krb5-libs,libacl,libattr,libcap,libcom_err,libcurl,libgcc,libgcrypt,libgpg-error,libidn,libselinux,libsepol,libssh2,libstdc++,libusb,libxml2,linux-atm-libs,logrotate,lua,mingetty,module-init-tools,ncurses,ncurses-base,ncurses-libs,net-tools,nspr,nss,nss-softokn,nss-softokn-freebl,nss-util,openldap,openssl,pam,passwd,pcre,pinentry,popt,procps,psmisc,pth,pygpgme,python,python-iniparse,python-libs,python-pycurl,python-urlgrabber,readline,rpm,rpm-libs,rpm-python,rsyslog,sed,setup,shadow-utils,sqlite,sysvinit-tools,tzdata,udev,upstart,util-linux-ng,vim-minimal,xz-libs,yum,yum-metadata-parser,zlib
 #
 rbsmindep opensuse-10.1 = aaa_base,audit-libs,bash,boost,bzip2,coreutils,cpio,cracklib,curl,cyrus-sasl,db,dbus-1,dbus-1-glib,device-mapper,diffutils,dirmngr,e2fsprogs,ethtool,expat,filesystem,fillup,findutils,gawk,gdbm,glib2,glibc,gpg2,grep,gzip,hal,info,insserv,krb5,libacl,libattr,libcom_err,libicu,libgcc,libgcrypt,libgpg-error,libidn,libksba,libnscd,libreiserfs,libstdc++,libusb,libxcrypt,libxml2,libxml2-python,libzio,libzypp,mingetty,module-init-tools,ncurses,neon,net-tools,openldap2-client,openslp,pam,pam-modules,parted,pciutils,pcre,perl,permissions,pinentry,pmtools,popt,procps,psmisc,pwdutils,python,python-elementtree,python-sqlite,python-urlgrabber,rpm,rpm-python,sed,setserial,sqlite,suse-release,sysvinit,termcap,udev,util-linux,yum,zlib
@@ -312 +326 @@
 #
 rbsmindep opensuse-11.4 = ConsoleKit,cracklib-dict-small,PolicyKit,aaa_base,bash,bzip2,coreutils,cpio,cracklib,cyrus-sasl,dbus-1,dbus-1-glib,device-mapper,diffutils,dirmngr,e2fsprogs,ethtool,expat,filesystem,fillup,findutils,gawk,gdbm,glib2-branding-upstream,glibc,gpg2,grep,gzip,hal,info,insserv,keyutils-libs,krb5,libacl,libassuan0,libattr,libaugeas0,libbz2-1,libcap2,libcom_err2,libcurl4,libdb-4_5,libelf1,libexpat1,libgcc45,libgcrypt11,libglib-2_0-0,libgobject-2_0-0,libgthread-2_0-0,libgpg-error0,libidn,libksba,libldap-2_4-2,liblua5_1,liblzma5,libmodman1,libncurses5,libnscd,libopenssl1_0_0,libpopt0,libproxy1,libreadline6,libreiserfs,libselinux1,libsepol1,libsmbios2,libssh2-1,libstdc++45,libudev0,libusb-0_1-4,libuuid1,libxcrypt,libxml2,libxml2-python,libzio,libzypp,login,mingetty,module-init-tools,ncurses-utils,net-tools,openSUSE-release,openSUSE-release-ftp,openslp,pam,pam-config,pam-modules,parted,pciutils,perl-base,permissions,pinentry,pm-utils,procps,psmisc,pwdutils,python,rpm,rpm-python,satsolver-tools,sed,setserial,sysvinit,termcap,terminfo-base,udev,util-linux,zlib,zypper
+#
+rbsmindep opensuse-12.1 = ConsoleKit,cracklib-dict-small,PolicyKit,aaa_base,bash,bzip2,coreutils,cpio,cracklib,cyrus-sasl,dbus-1,dbus-1-glib,device-mapper,diffutils,dirmngr,e2fsprogs,ethtool,expat,filesystem,fillup,findutils,gawk,gdbm,glibc,gpg2,grep,gzip,info,insserv,krb5,libacl1,libassuan0,libattr1,libaugeas0,libbz2-1,libcap2,libcares2,libcom_err2,libcurl4,libdb-4_5,libelf1,libexpat1,libgcc46,libgcrypt11,libglib-2_0-0,libgobject-2_0-0,libgthread-2_0-0,libgpg-error0,libidn,libkeyutils1,libksba,libldap-2_4-2,liblua5_1,liblzma5,libmodman1,libncurses5,libnscd,libopenssl1_0_0,libpopt0,libproxy1,libreadline6,libreiserfs,libselinux1,libsepol1,libsmbios2,libsolv-tools,libssh2-1,libstdc++46,libudev0,libusb-0_1-4,libuuid1,libxcrypt,libxml2,libxml2-python,libzio,libzypp,login,mingetty,module-init-tools,ncurses-utils,net-tools,openSUSE-release,openSUSE-release-ftp,openslp,pam,pam-config,pam-modules,parted,pciutils,perl-base,permissions,pinentry,pm-utils,procps,psmisc,pwdutils,python,rpm,rpm-python,sed,setserial,sysvinit,termcap,terminfo-base,udev,util-linux,zlib,zypper
 #
 rbsmindep mandriva-2009.1-i386 = makedev,consolekit,basesystem,bash,chkconfig,coreutils,cpio,cracklib,cracklib-dicts,crontabs,dbus,dhcp-client,dirmngr,e2fsprogs,ethtool,expat,file,filesystem,findutils,gamin,gawk,glib2.0-common,glibc,gnupg2,grep,info,initscripts,iproute2,iputils,keyutils,krb5,libacl1,libattr1,libbzip2_1,libdb4.6,libelfutils1,libext2fs2,libidn11,liblua5.1,libmagic1,libncurses5,libnspr4,libnss3,libopenssl0.9.8,libpopt0,libreadline6,librpm4.6,libsqlite3_0,libtermcap2,liblzma2,libgcc1,logrotate,lua,mandriva-release-common,mingetty,module-init-tools,ncurses,net-tools,nss,openldap,openssl,pam,passwd,pcre,perl-base,perl-Config-IniFiles,perl-Locale-gettext,perl-MDV-Distribconf,perl-URPM,procps,psmisc,python,rpm,sed,setup,shadow-utils,udev,urpmi,util-linux-ng,vim-minimal,wget,zlib1
@@ -329 +345 @@
 
 # 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
@@ -348 +365 @@
 #rbsmirrorsrv rhel =
 # pbos->{'arch'} == i586 for i386 repo
-rbsmirrorsrv opensuse = http://mirrors.kernel.org/opensuse/distribution/$pbos->{'version'}/repo/oss/suse/$pbos->{'arch'}/
+# kernel.org is not up to date anymore for opensuse
+#rbsmirrorsrv opensuse = http://mirrors.kernel.org/opensuse/distribution/$pbos->{'version'}/repo/oss/suse/$pbos->{'arch'}/
+rbsmirrorsrv opensuse = http://download.opensuse.org/distribution/$pbos->{'version'}/repo/oss/suse/$pbos->{'arch'}/
 # pbos->{'arch'} == i586 for i386 repo
 rbsmirrorsrv mandriva = http://mirrors.kernel.org/mandriva/Mandrakelinux/official/$pbos->{'version'}/$pbos->{'arch'}/media/main/release/
@@ -354 +373 @@
 #rbsmirrorsrv debian = http://ftp.us.debian.org/debian/
 #rbsmirrorsrv ubuntu = http://us.releases.ubuntu.com/releases/
+#
+
+#
+# pbmkbm configuration parameters
+#
+mkbmpath default = /var/cache/pbmkbm
+vetype pbmkbm = chroot
+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
+
+# What is needed at boot time to have a minimal working environment
+# Directories to create on the target media, even if no file is in it (else it will be created automatically)
+mkbmtargetdirs linux =  /tmp,/dev
+# In term of dirs from the original to copy to the target
+mkbmbootdirs linux =  /etc/modprobe.d/,/etc/ssh,/etc/udev,/etc/hotplug.d,/etc/mdadm,/var/lib/dhcp
+# In term of files from the original to copy to the target
+mkbmbootfiles linux = /etc/init.d/functions,/etc/rc.d/functions,/etc/rpc,/etc/netconf,/usr/lib/libnss_compat.so,/usr/lib64/libnss_compat.so,/usr/lib/libnss_files.so,/usr/lib64/libnss_files.so,/etc/modprobe.conf,/etc/conf.modules,/etc/modules.conf.local,/etc/mdadm.conf,/etc/raidtab
+# In term of commands from the original to copy to the target
+mkbmbootcmds linux = perl,mt,awk,gawk,dd,grep,uname,df,loadkeys,pidof,gzip,klogd,syslogd,rsyslogd,syslog-ng,mount,mount.nfs,mount.nfs4,sshfs,mount.fuse,fusermount,ssh,ulockmgr_server,mount.cifs,mount.cifs3,mount.smb,mount.smb3,mount.smbfs,mount.smbfs3,mount.ntfs,mount.ntfs-3g,MAKEDEV,udev.static,udevsend,udevd,hwup,path_id,scsi_tur,udeadm,udevstart.static,udev_volume_id,start_udev,udevstart,create_static_dev_nodes,scsi_id,insmod,lsmod,modprobe,mdadm,mdassemble,raidstart,multipath,dmsetup,kpartx,dmraid,mpath_prio_alua,mpath_wait,mpath_ctl,mpath_prio_emc,mpath_prio_hds_modular,mpath_prio_netapp,mpath_prio_ontap,mpath_prio_rdac,mpath_prio_tpc,ping,ifconfig,ip,route,dhclient,dhcpcd,
+
+# Where is your kernel file - optional if you want to really be sure of what is used
+#mkbmkerneldir linux = /boot
+# Where is your kernel directory
+mkbmkerneldir linux = /boot
+#mkbmkerneldir linux = /boot/efi
+# What is the regular expression to find the kernel file 
+mkbmkernelnamere linux = ^linu|^vmlinu|^xen
+
+# Files to add on the boot media to support a full working system
+mkbmbasefiles linux = /etc/modules.conf,/etc/fstab,/etc/hosts,/etc/host.conf,/etc/resolv.conf,/etc/hosts.allow,/etc/hosts.deny,/etc/nsswitch.conf,/usr/share/misc/file/magic,/usr/share/file/magic,/usr/share/file/magic.mgc
+#mkbmbasefiles lsb-3.2 = /usr/share/misc/file/magic,/usr/share/misc/magic.mgc
+## Dirs to add
+mkbmbasedirs linux =
+# Commands to add
+mkbmbasecmds linux = file,bzip2,bunzip2,bash,date,ctrlaltdel,wc,xargs,less,ldconfig,tee,efibootmgr,lilo,grub,elilo,fdisk,parted
+#
+# To support debug
+mkbmdbgfiles linux =
+mkbmdbgcmds linux = ldd,strace,valgrind,dmidecode,lsusb,lshw,lspci,ethtool
+mkbmdbgdirs linux = /usr/lib/valgrind,/usr/lib64/valgrind
+
+# 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
@@ -461 +531 @@
 oscodename debian-5.0 = lenny
 oscodename debian-6.0 = squeeze
+oscodename debian-7.0 = wheezy
 oscodename ubuntu-6.06 = dapper
 oscodename ubuntu-7.04 = feisty
@@ -471 +542 @@
 oscodename ubuntu-10.10 = maverick
 oscodename ubuntu-11.04 = natty
+oscodename ubuntu-11.10 = oneiric
 
 # Commands needed on the underlying system
@@ -477 +549 @@
 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
+
+# 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/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
+# 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
@@ -507 +601 @@
 oschkcmd deb = /usr/bin/lintian
 oschkopt deb = 
+ospatchcmd default = /usr/bin/patch
+ospatchopt default = -s -p1
 
 # sha method for yum repo
@@ -524 +620 @@
 ossha fedora-9 = sha1
 ossha fedora-10 = sha1
+
+#
+# CPAN upload info (info from cpanupload)
+#
+cpanpause default = pause.perl.org
+cpandir default = incoming
+cpansubdir default =
+cpanurl default = http://pause.perl.org/pause/authenquery
+#cpanuser default = XXX
+#cpanpasswd default = YYY

devel/etc/pb.conf.pod

@@ -12 +12 @@
 =head1 SYNOPSIS
 
-Those files have the same format, which is near from a a perl hash structure:
+Those files have the same format, which is near from a perl hash structure:
 keyword key = value1[,value2,...]
 
@@ -22 +22 @@
 
 =over 4
+
+=item B<checkexclude>
+
+ Nature: Optional
+ Key: package (as provided in defpkgdir or extpkgdir)
+ Value: coma separated list of OS (could be from the most generic up to the most specific from ostype, osfamily, os, os-ver, os-ver-arch) that are excluded from the checkssh command (no build made for them). The OS name is generaly used here.
+ Conffile: project
+ Example: checkexclude pkg1 = centos,lsb,solaris
+
+=item B<cpandir>
+
+ Nature: Optional
+ Key: project (as defined in the -p option or PBPROJ environment variable)
+ Value: CPAN Pause directory to upload new modules
+ Conffile: pb
+ Example: cpandir default = incoming
+
+=item B<cpanpasswd>
+
+ Nature: Optional
+ Key: project (as defined in the -p option or PBPROJ environment variable)
+ Value: CPAN Pause user's password
+ Conffile: home
+ Example: cpanpasswd default = mycomplicatedpwd
+
+=item B<cpanpause>
+
+ Nature: Optional
+ Key: project (as defined in the -p option or PBPROJ environment variable)
+ Value: CPAN Pause site to upload new modules
+ Conffile: pb
+ Example: cpanpause default = pause.perl.org
+
+=item B<cpansubdir>
+
+ Nature: Optional
+ Key: project (as defined in the -p option or PBPROJ environment variable)
+ Value: CPAN Pause subdirectory in the user's area to upload into
+ Conffile: pb
+ Example: cpansubdir default = mydir
+
+=item B<cpanurl>
+
+ Nature: Optional
+ Key: project (as defined in the -p option or PBPROJ environment variable)
+ Value: CPAN Pause URL to activate the upload mecanism
+ Conffile: pb
+ Example: cpanurl default = http://pause.perl.org/pause/authenquery
+
+=item B<cpanuser>
+
+ Nature: Optional
+ Key: project (as defined in the -p option or PBPROJ environment variable)
+ Value: CPAN Pause user
+ Conffile: home
+ Example: cpanuser default = XXX
 
 =item B<defpkgdir>
@@ -55 +111 @@
  Example: filteredfiles mindi = rootfs/sbin/init,mindi,install.sh,doc/mindi.8
 
+=item B<logcmd>
+
+ Nature: Mandatory
+ Key: project (as defined in the -p option or PBPROJ environment variable)
+ Value: internal (the application then handles the logging of what it finds useful) or the name of an application to launch to log context (e.g. sos, cfg2html, ...).
+ Conffile: pb
+ Example: logcmd pbmkbm = sos
+
+=item B<logcmds>
+
+ Nature: Optional
+ Key: project (as defined in the -p option or PBPROJ environment variable)
+ Value: In case the B<logcmd> command is internal, a coma separated list of the commands whose trace execution is to be captured in order to log context.
+ Conffile: pb
+ Example: logcmds pbmkbm = mount,lsmod,esxcfg-module -l,df -T
+
+=item B<logfiles>
+
+ Nature: Optional
+ Key: project (as defined in the -p option or PBPROJ environment variable)
+ Value: In case the B<logcmd> command is internal, a coma separated list of the files to capture in order to log context.
+ Conffile: pb
+ Example: logfiles pbmkbm = /etc/raidtab,/proc/cmdline,/proc/swaps
+
+=item B<logopt>
+
+ Nature: Optional
+ Key: project (as defined in the -p option or PBPROJ environment variable)
+ Value: In case the B<logcmd> command is not internal, the options of the B<logcmd> application to launch to log context
+ Conffile: pb
+ Example: logcmd pbmkbm = --all
+
+=item B<mkbmbootcmds>
+
+ Nature: Mandatory
+ Key: OS (could be from the most generic up to the most specific from ostype, osfamily, os, os-ver, os-ver-arch). The family name is generaly used here.
+ Value: coma separated list of commands to be copied from the original OS to the target boot media tree (works recursively for directory creation on the target). Their actual path is deduced from the PATH variable.
+ Conffile: pb
+ Example: mkbmbootcmds linux = perl,awk,gawk,dd,grep,uname
+
+=item B<mkbmbootdirs>
+
+ Nature: Mandatory
+ Key: OS (could be from the most generic up to the most specific from ostype, osfamily, os, os-ver, os-ver-arch). The family name is generaly used here.
+ Value: coma separated list of directories to be copied from the original OS to the target boot media tree (works recursively on the target).
+ Conffile: pb
+ Example: mkbmbootdirs linux = /etc/ssh,/etc/udev,/etc/mdadm
+
+=item B<mkbmbootfiles>
+
+ Nature: Mandatory
+ Key: OS (could be from the most generic up to the most specific from ostype, osfamily, os, os-ver, os-ver-arch). The family name is generaly used here.
+ Value: coma separated list of files to be copied from the original OS to the target boot media tree (works recursively for directory creation on the target).
+ Conffile: pb
+ Example: mkbmbootfiles linux = /etc/mdadm.conf,/etc/raidtab,/etc/modprobe.conf
+
+=item B<mkbmkerneldir>
+
+ Nature: Mandatory
+ Key: OS (could be from the most generic up to the most specific from ostype, osfamily, os, os-ver, os-ver-arch). The family name is generaly used here.
+ Value: path of the directory containing your kernel.
+ Conffile: pb
+ Example: mkbmkerneldir linux = /boot
+
+=item B<mkbmkernelfile>
+
+ Nature: Optional
+ Key: OS (could be from the most generic up to the most specific from ostype, osfamily, os, os-ver, os-ver-arch). The family name is generaly used here.
+ Value: full path of the your kernel.
+ Conffile: pb
+ Example: mkbmkernelfile linux = /boot/vmlinuz-specific
+
+=item B<mkbmkernelnamere>
+
+ Nature: Mandatory
+ Key: OS (could be from the most generic up to the most specific from ostype, osfamily, os, os-ver, os-ver-arch). The family name is generaly used here.
+ Value: Perl Regular Expression allowing to find OS kernel names in the B<kerneldir> directory.
+ Conffile: pb
+ Example: mkbmkerneldir linux = ^linu|^vmlinu|^xen
+
+=item B<mkbmpath>
+
+ Nature: Mandatory
+ Key: OS (could be from the most generic up to the most specific from ostype, osfamily, os, os-ver, os-ver-arch). The family name is generaly used here.
+ Value: path of the temporary directory into which the boot media is created.
+ Conffile: pb
+ Example: mkbmpath default = /var/cache/pbmkbm
+
+=item B<mkbmtargetdirs>
+
+ Nature: Mandatory
+ Key: OS (could be from the most generic up to the most specific from ostype, osfamily, os, os-ver, os-ver-arch). The family name is generaly used here.
+ Value: coma separated list of empty directory paths to be created on the target boot media.
+ Conffile: pb
+ Example: mkbmtargetdirs linux = /tmp,/dev
+
 =item B<namingtype>
 
@@ -142 +294 @@
  Conffile: pb
  Example: osnover gentoo = true
+
+=item B<ospatchcmd>
+
+ Nature: Optional
+ Key: OS (could be from the most generic up to the most specific from ostype, osfamily, os, os-ver, os-ver-arch).
+ Value: package patch command. For RPM is implicit.
+ Conffile: pb
+ Example: ospatchcmd deb = /usr/bin/patch
+
+=item B<ospatchopt>
+
+ Nature: Optional
+ Key: OS (could be from the most generic up to the most specific from ostype, osfamily, os, os-ver, os-ver-arch).
+ Value: package patch options.
+ Conffile: pb
+ Example: ospatchcmd deb = -s -p1
 
 =item B<ospathcmd-*>

devel/lib/ProjectBuilder/Base.pm

@@ -39 +39 @@
 
 our @ISA = qw(Exporter);
-our @EXPORT = qw(pb_mkdir_p pb_system pb_rm_rf pb_get_date pb_log pb_log_init pb_get_uri pb_get_content pb_set_content pb_display_file pb_syntax_init pb_syntax pb_temp_init pb_get_arch pb_check_requirements pb_check_req $pbdebug $pbLOG $pbdisplaytype $pblocale);
+our @EXPORT = qw(pb_mkdir_p pb_system pb_rm_rf pb_get_date pb_log pb_log_init pb_get_uri pb_get_content pb_set_content pb_display_file pb_syntax_init pb_syntax pb_temp_init pb_get_arch pb_get_osrelease pb_check_requirements pb_check_req $pbdebug $pbLOG $pbdisplaytype $pblocale);
 ($VERSION,$REVISION) = pb_version_init();
 
@@ -50 +50 @@
 =head1 DESCRIPTION
 
-This modules provides generic functions suitable for perl project development 
+This module provides generic functions suitable for perl project development 
 
 =head1 SYNOPSIS
@@ -384 +384 @@
 }
 
+=item B<pb_get_osrelease>
+
+This function returns the release of our operating system
+
+=cut
+
+sub pb_get_osrelease {
+
+# On linux can also use /proc/sys/kernel/osrelease
+my $rel = `uname -r`;
+chomp($rel);
+return($rel);
+}
+
+
 =item B<pb_get_arch>
 
@@ -467 +482 @@
 } else {
     pb_log(2,"OK\n");
-    return($found);
-}
+}
+return($found);
 }
 

devel/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/lib/ProjectBuilder/Version.pm

@@ -19 +19 @@
 our @EXPORT = qw(pb_version_init);
 
-$VERSION = "0.11.3";
-$REVISION = "1307";
+$VERSION = "PBVER";
+$REVISION = "PBREV";
 
 sub pb_version_init {