Changeset 1523 in ProjectBuilder for devel

Timestamp:

May 12, 2012, 2:22:11 AM (13 years ago)

Author:

Bruno Cornec

Message:

• pb.conf: Add scilinux to list of OS's. Add case where centos versioning include minor since centos makes major changes in minor releases. Fix typo in oracle linux regex. Proposes min dependencies separately for centos-5.2, 5.6 others just match that set. Add next ubuntu codename. (Eric Anderson)
• Distribution.pm: Add new pb_pbos_to_keylist function that generates the keys that should be used for looking up filter filenames or keys into the hash-maps. New function will generate 5.m, for all m in [0,n] for version 5.n of some OS. Useful because minor versions are usually similar. Use it in distro_get_param, simplifying the function and making it more powerful. Fix comment to be correct, you can check for scalar/list context if you want, but that's not what this code does.

Location:

devel/pb-modules

Files:

• etc/pb.conf (modified) (8 diffs)
• lib/ProjectBuilder/Distribution.pm (modified) (4 diffs)

devel/pb-modules/etc/pb.conf

@@ -119 +119 @@
 osambiguous debian = debian,ubuntu
 osambiguous suse = suse,sles,opensuse
-osambiguous redhat = redhat,rhel,centos,mandrake,mandriva,vmware,oel
+osambiguous redhat = redhat,rhel,centos,mandrake,mandriva,vmware,oel,scilinux
 osambiguous lsb = ubuntu,lsb
 osambiguous os-release = opensuse,fedora,arch
@@ -138 +138 @@
 #osrelexpr rhel = Red Hat (?:Enterprise Linux|Linux Advanced Server) .*release ([0-9.]+).* \(
 osrelexpr rhel = Red Hat (?:Enterprise Linux|Linux Advanced Server) .*release ([0-9]+).* \(
+# If you want to differentiate .release for CentOS
+#osrelexpr centos = .*CentOS .*release ([0-9.]+)
 osrelexpr centos = .*CentOS .*release ([0-9]).* 
-osrelexpr oel = Oracle Linux Server) .*release ([0-9]+).* \(
+osrelexpr oel = Oracle Linux Server .*release ([0-9]+).* \(
 osrelexpr redhat = Red Hat Linux release (.+) \(
+# If you want to differentiate .release for Scientific
+#osrelexpr scilinux = Scientific Linux release ([0-9\.]+)\b
+osrelexpr scilinux = Scientific Linux release ([0-9]+).*
 osrelexpr sles = SUSE .* Enterprise Server (\d+) \(
 osrelexpr suse = SUSE LINUX (\d.+) \(
@@ -181 +186 @@
 osfamily asianux = rh
 osfamily centos = rh
+osfamily scilinux = rh
 osfamily mandrake = md
 osfamily mandriva = md
@@ -274 +280 @@
 osremovedotinver redhat = true
 
+# For that OS, we want to consider all previous minor versions
+# for configuration items and not just the precise version.
+# E.g. with t for rhel when dealing with 6.2 we will also look at 6.1 and 6.0
+# Should be in sync wirh regular expressions from osrelexpr upper
+#osuseminorrel rhel = true
+
 # These deps are needed before setupvm|ve can be run. 
 # Install them with your distribution in VM or automatically in VE
@@ -311 +323 @@
 #
 # CentOS-5.6 moved python-libs into a separate package.  List it or otherwise we can't run yum.
-#
 rbsmindep centos-5 = MAKEDEV,SysVinit,audit-libs,basesystem,bash,beecrypt,bzip2-libs,centos-release,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-libs,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
+# If you distinguish versions use the previous one for 5.6+ and that next one for previous
+#rbsmindep centos-5.2 = MAKEDEV,SysVinit,audit-libs,basesystem,bash,beecrypt,bzip2-libs,centos-release,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,keyutils-libs,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,rpm,rpm-libs,rpm-python,sed,setup,shadow-utils,sqlite,sysklogd,termcap,tzdata,udev,util-linux,yum,yum-metadata-parser,zlib
 rbsmindep centos-5-ia64 = MAKEDEV,SysVinit,audit-libs,bash,beecrypt,bzip2-libs,centos-release,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-libs,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
 #
@@ -321 +334 @@
 #
 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 scilinux-6.0 = 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,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,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,sl-release,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
@@ -378 +394 @@
 rbsmirrorsrv centos-5-ia64 = http://dev.centos.org/~z00dax/ia64/c5-wip/ia64/RPMS/
 rbsmirrorsrv centos-6 = http://mirrors.kernel.org/centos/$pbos->{'version'}/os/$pbos->{'arch'}/Packages
+rbsmirrorsrv scilinux = http://ftp.scientificlinux.org/linux/scientific/$pbos->{'version'}/$pbos->{'arch'}/os/Packages
 #rbsmirrorsrv rhel =
 # pbos->{'arch'} == i586 for i386 repo
@@ -561 +578 @@
 oscodename ubuntu-11.04 = natty
 oscodename ubuntu-11.10 = oneiric
+oscodename ubuntu-12.04 = precise
 
 # Commands needed on the underlying system

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

@@ -132 +132 @@
 $pbos->{'family'} = pb_distro_get_param($pbos,pb_conf_get("osfamily"));
 $pbos->{'type'} = pb_distro_get_param($pbos,pb_conf_get("ostype"));
-($pbos->{'os'},$pbos->{'install'},$pbos->{'suffix'},$pbos->{'nover'},$pbos->{'rmdot'},$pbos->{'update'}) = pb_distro_get_param($pbos,pb_conf_get("os","osins","ossuffix","osnover","osremovedotinver","osupd"));
+($pbos->{'os'},$pbos->{'install'},$pbos->{'suffix'},$pbos->{'nover'},$pbos->{'rmdot'},$pbos->{'update'},$pbos->{'useminor'}) = pb_distro_get_param($pbos,pb_conf_get("os","osins","ossuffix","osnover","osremovedotinver","osupd","osuseminorrel"));
 #($pbos->{'family'},$pbos->{'type'},$pbos->{'os'},$pbos->{'install'},$pbos->{'suffix'},$pbos->{'nover'},$pbos->{'rmdot'},$pbos->{'update'}) = pb_distro_get_param($pbos,pb_conf_get("osfamily","ostype","os","osins","ossuffix","osnover","osremovedotinver","osupd"));
 
@@ -594 +594 @@
 }
 
+=item B<pb_pbos_to_keylist>
+
+Given a pbos object and the generic key, get the list of possible keys for looking up variable for
+filter names.  The list will be sorted most-specific to least specific.
+
+=cut
+
+sub pb_pbos_to_keylist ($$) {
+
+my ($pbos, $generic) = @_;
+
+foreach my $key (qw/name version arch family type os/) {
+    confess "missing pbos key $key" unless defined $pbos->{$key};
+}
+
+my @keylist = ("$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}", "$pbos->{'name'}-$pbos->{'version'}");
+
+# Loop to include also previous minor versions
+# if configured so
+if (($pbos{'useminor'} eq "true") && ($pbos->{version} =~ /^(\d+)\.(\d+)$/o)) {
+        my ($major, $minor) = ($1, $2);
+        while ($minor > 0) {
+                $minor--;
+                push (@keylist, "$pbos->{name}-${major}.$minor");
+        }
+        push (@keylist, "$pbos->{name}-$major");
+}
+
+push (@keylist, $pbos->{name}, $pbos->{family}, $pbos->{type}, $pbos->{os}, $generic);
+return @keylist;
+}
+
 =item B<pb_distro_get_param>
 
@@ -603 +635 @@
 
 my @param;
-my $param;
 my $pbos = shift;
 
+my @keylist = pb_pbos_to_keylist($pbos,"default");
 pb_log(2,"DEBUG: pb_distro_get_param on $pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'} for ".Dumper(@_)."\n");
 foreach my $opt (@_) {
-    if (defined $opt->{"$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}"}) {
-        $param = $opt->{"$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}"};
-    } elsif (defined $opt->{"$pbos->{'name'}-$pbos->{'version'}"}) {
-        $param = $opt->{"$pbos->{'name'}-$pbos->{'version'}"};
-    } elsif (defined $opt->{"$pbos->{'name'}"}) {
-        $param = $opt->{"$pbos->{'name'}"};
-    } elsif (defined $opt->{$pbos->{'family'}}) {
-        $param = $opt->{$pbos->{'family'}};
-    } elsif (defined $opt->{$pbos->{'type'}}) {
-        $param = $opt->{$pbos->{'type'}};
-    } elsif (defined $opt->{$pbos->{'os'}}) {
-        $param = $opt->{$pbos->{'os'}};
-    } elsif (defined $opt->{"default"}) {
-        $param = $opt->{"default"};
-    } else {
-        $param = "";
-    }
-
+    my $param = "";
+    foreach my $key (@keylist) {
+        if (defined $opt->{$key}) {
+            $param = $opt->{$key};
+            last;
+        }
+    }
     # Allow replacement of variables inside the parameter such as name, version, arch for rpmbootstrap 
     # but not shell variable which are backslashed
@@ -637 +658 @@
 pb_log(2,"DEBUG: pb_distro_get_param on $pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'} returns ==".Dumper(@param)."==\n");
 
-# Return one param in scalar context, an array if not.
+# Return one param if user only asked for one lookup, an array if not.
 my $nb = @param;
 if ($nb eq 1) {
-    return($param);
+    return($param[0]);
 } else {
     return(@param);