Changeset 1517

Timestamp:

05/10/12 18:07:28 (12 months ago)

Author:

bruno

Message:

r4765@localhost: bruno | 2012-05-10 17:08:00 +0200

• pb.conf: centos-5.6 moved python-libs into a separate package. List it or otherwise we can't run yum. Fix the mirror servers for centos-4,5 to just get the latest, and add mirror servers for 6.
• pb.conf.pod: document addrepo, looked here and didn't find it, accidentally found it in code before adding it myself. Fix pod glitch at the end (missing =over/=back)
• Distribution.pm: move the code to apply ftp_proxy/http_proxy from the conf files to a sub function since it's now needed in two places. Log the proxy and verify that everything we tried to install succeeded since yum will silently tolerate failing to install things, but rpmbuild will complain about missing dependencies. Tolerate an error from testing install of an rpm in pb_distro_setuprepo_gen.
• Env.pm: Give an example of multi-line filters and an example of a transform.
• VE.pm: If the verpmtype isn't defined, error out cleanly. Otherwise we're just going to fail later with lots of noisy output.

Location:

devel/pb-modules

Files:

• etc/pb.conf (modified) (2 diffs)
• etc/pb.conf.pod (modified) (2 diffs)
• lib/ProjectBuilder/Distribution.pm (modified) (6 diffs)
• lib/ProjectBuilder/Env.pm (modified) (2 diffs)
• lib/ProjectBuilder/VE.pm (modified) (1 diff)

devel/pb-modules/etc/pb.conf

@@ -307 +307 @@
 rbsmindep rhel-4 = MAKEDEV,SysVinit,audit-libs,basesystem,bash,beecrypt,bzip2-libs,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++,libsysfs,libtermcap,libxml2,libxml2-python,mcstrans,mingetty,mktemp,module-init-tools,ncurses,neon,net-tools,openssl,pam,pcre,popt,procps,psmisc,python,python-elementtree,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 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-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-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 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
+# 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
+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
+#
+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-libs,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
 #
@@ -365 +367 @@
 #rbsmirrorsrv fedora = http://download.fedora.redhat.com/pub/fedora/linux/releases/$pbos->{'version'}/Everything/$pbos->{'arch'}/os/Packages/
 rbsmirrorsrv fedora = http://mirrors.kernel.org/fedora/releases/$pbos->{'version'}/Fedora/$pbos->{'arch'}/os/Packages
-rbsmirrorsrv centos-4 = http://mirrors.kernel.org/centos/4.8/os/$pbos->{'arch'}/CentOS/RPMS
-rbsmirrorsrv centos-5 = http://mirrors.kernel.org/centos/5.5/os/$pbos->{'arch'}/CentOS
+rbsmirrorsrv centos-4 = http://mirrors.kernel.org/centos/$pbos->{'version'}/os/$pbos->{'arch'}/CentOS/RPMS
+rbsmirrorsrv centos-5 = http://mirrors.kernel.org/centos/$pbos->{'version'}/os/$pbos->{'arch'}/CentOS
 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'}/CentOS
 #rbsmirrorsrv rhel =
 # pbos->{'arch'} == i586 for i386 repo

devel/pb-modules/etc/pb.conf.pod

@@ -22 +22 @@
 
 =over 4
+
+=item B<addrepo>
+
+ 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: comma separated list of URLs that point to repository files, or packages to install. The values may not include substitutions.
+ Conffile: project
+ Example: addrepo centos-5-x86_64 = file:///prj/extras.repo,http://mirror.centos.org/centos/5.8/extras/x86_64/RPMS/chrpath-0.13-3.el5.centos.x86_64.rpm
 
 =item B<checkexclude>
@@ -1006 +1014 @@
 
 =head1 OTHER PARAMETERS
+
+=over 4
+
 =item B<pb_URL>
+
 =item B<pb_directory_desc>
+
 =item B<pb_environment_variables>
+
+=back

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

@@ -290 +290 @@
 }
 
+# Internal function
+
+sub pb_apply_conf_proxy ($) {
+my ($pbos) = @_;
+
+my $ftp_proxy = pb_distro_get_param($pbos,pb_conf_get_if("ftp_proxy"));
+my $http_proxy = pb_distro_get_param($pbos,pb_conf_get_if("http_proxy"));
+
+# We do not overwrite shell settings
+$ENV{ftp_proxy} ||= $ftp_proxy;
+$ENV{http_proxy} ||= $http_proxy;
+}
+
 =item B<pb_distro_installdeps>
 
@@ -304 +317 @@
 my $deps = shift || undef;
 
-my $ftp_proxy = pb_distro_get_param($pbos,pb_conf_get_if("ftp_proxy"));
-my $http_proxy = pb_distro_get_param($pbos,pb_conf_get_if("http_proxy"));
-
-# We do not overwrite shell settings
-$ENV{ftp_proxy} ||= $ftp_proxy;
-$ENV{http_proxy} ||= $http_proxy;
-
+pb_apply_conf_proxy($pbos);
 # Protection
 return if (not defined $pbos->{'install'});
@@ -316 +323 @@
 # Get dependencies in the build file if not forced
 $deps = pb_distro_getdeps($f,$pbos) if (not defined $deps);
+pb_log(1, "ftp_proxy=$ENV{ftp_proxy} http_proxy=$ENV{http_proxy}\n");
 pb_log(2,"deps: $deps\n");
 return if ((not defined $deps) || ($deps =~ /^\s*$/));
@@ -326 +334 @@
     pb_system($cmd, "Re-trying installing dependencies ($cmd)");
 }
+# Check that all deps have been installed correctly
+$deps = pb_distro_getdeps($f, $pbos);
+die "Some dependencies did not install ($deps)" if ((defined $deps) && ($deps =~ /\S/));
 }
 
@@ -520 +531 @@
 return if ($param eq "");
 
+pb_apply_conf_proxy($pbos);
+
 # Loop on the list of additional repo
 foreach my $i (split(/,/,$param)) {
@@ -538 +551 @@
             my $pn = $bn;
             $pn =~ s/\.rpm//;
-            if (pb_system("rpm -q --quiet $pn","","quiet") != 0) {
+            if (pb_system("rpm -q --quiet $pn","","quiet",1) != 0) {
                 pb_system("sudo rpm -Uvh $ENV{'PBTMP'}/$bn","Adding package to setup repository");
             }

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

@@ -611 +611 @@
 
 # PBDESC contains the description of the package
-#filter PBDESC = Bla-Bla
+#filter PBDESC = Bla-Bla                                                 \
+# with a trailing \, the variable can be multi-line.                     \
+# only the trailing \'s will be removed, the leading spaces,             \
+# trailing spaces, and newlines will remain except on the                \
+# last line.  You can use dollar slash as a way to introduce carraige    \
+# return (perl syntax).                                                  \
+# You can use transform e.g. in rpm.pbf to adjust spaces
 
 # PBSUMMARY contains a short single line description of the package
@@ -647 +653 @@
 # PBOBS is replaced by the Obsolete line
 #filter PBOBS =
+
+# transform a variable from the key on the right to the key on the left using the perl expression
+# after the input key name.  Useful for taking multi-line documentation and removing trailing spaces
+# or leading spaces.
+#transform PBDESC = PBDESC_raw s/\s+\n/\n/go;
 
 EOF

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

@@ -104 +104 @@
             # Which tool is used
             my $verpmstyle = $verpmtype->{$ENV{'PBPROJ'}};
+            die "No verpmtype defined for $ENV{PBPROJ}" unless (defined $verpmstyle);
     
             # Get potential rbs option