Changeset 991 in ProjectBuilder

Timestamp:

Mar 1, 2010, 9:27:20 AM (14 years ago)

Author:

Bruno Cornec

Message:

r3711@localhost: bruno | 2010-03-01 07:29:29 +0100

• veconf => rbsconf
• Adds option -a to rpmbootstrap in order for pb to automatically install the packages it needs
• Check CentOS4 VE OK
• Adds pb.conf man page to spec build

Files:

• devel/pb-modules/etc/pb.conf (modified) (2 diffs)
• devel/pb/bin/pb (modified) (2 diffs)
• devel/rpmbootstrap/bin/rpmbootstrap (modified) (6 diffs)
• pbconf/devel/ProjectBuilder/rpm/perl-ProjectBuilder.spec (modified) (2 diffs)
• projects/CDDBeditor/pbconf/devel/CDDBeditor.pb (modified) (1 diff)
• projects/buffer/pbconf/1.19/buffer.pb (modified) (1 diff)
• projects/collectl/pbconf/devel/collectl.pb (modified) (2 diffs)
• projects/fossology/pbconf/tags/1.1.0-rc2/fossology.pb (modified) (1 diff)
• projects/fossology/pbconf/tags/1.1.0-rc4/fossology.pb (modified) (1 diff)
• projects/fossology/pbconf/tags/1.1.0-rc5/fossology.pb (modified) (1 diff)
• projects/fossology/pbconf/tags/1.1.0/fossology.pb (modified) (1 diff)
• projects/fossology/pbconf/trunk/fossology.pb (modified) (1 diff)
• projects/rinse/pbconf/devel/conf/.pbrc (modified) (1 diff)

devel/pb-modules/etc/pb.conf

@@ -249 +249 @@
 rbsmindep fedora-12 = MAKEDEV,ConsoleKit-libs,audit-libs,basesystem,bash,bzip2-libs,chkconfig,coreutils,cpio,cracklib,cracklib-dicts,crontabs,cyrus-sasl-lib,db4,dbus,dbus-libs,device-mapper,device-mapper-libs,dhclient,dirmngr,e2fsprogs,e2fsprogs-libs,elfutils-libelf,ethtool,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,libksba,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 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++,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,rpm,rpm-libs,rpm-python,sed,setup,shadow-utils,sqlite,sysklogd,termcap,tzdata,udev,util-linux,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
 #
 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
@@ -313 +313 @@
 ospkgdep tgz = wget,make,ntp,patch
 # RHEL
+osperldep rhel-4 = Module-Build,File-MimeInfo,File-BaseDir,Mail-Sendmail
+ospkgdep rhel-4 = wget,make,ntp,patch,perl-DateManip,rpm-build
+# Tested
+osperldep centos-4 = Module-Build,File-MimeInfo,File-BaseDir,Mail-Sendmail
+ospkgdep centos-4 = wget,make,ntp,patch,perl-DateManip,rpm-build
+# Tested
 osperldep rhel-5 = Module-Build,File-MimeInfo,File-BaseDir,Mail-Sendmail
-ospkgdep rhel-5 = wget,make,ntp,patch,perl-DateManip
+ospkgdep rhel-5 = wget,make,ntp,patch,perl-DateManip,rpm-build
 osperldep centos-5 = Module-Build,File-MimeInfo,File-BaseDir,Mail-Sendmail
-ospkgdep centos-5 = wget,make,ntp,patch,perl-DateManip
-osperldep rhel-4 = Module-Build,File-MimeInfo,File-BaseDir,Mail-Sendmail
-ospkgdep rhel-4 = wget,make,ntp,patch,perl-DateManip
-osperldep centos-4 = Module-Build,File-MimeInfo,File-BaseDir,Mail-Sendmail
-ospkgdep centos-4 = wget,make,ntp,patch,perl-DateManip
+ospkgdep centos-5 = wget,make,ntp,patch,perl-DateManip,rpm-build
 osperldep rhel-3 = Module-Build,File-MimeInfo,File-BaseDir,Mail-Sendmail
 ospkgdep rhel-3 = wget,make,ntp,patch,perl-DateManip

devel/pb/bin/pb

@@ -1791 +1791 @@
                         my $rbsverb = "";
                         $rbsverb = "--verbose" if ($pbdebug gt 0);
-                        pb_system("sudo /usr/bin/rpmbootstrap $postinstall $ddir-$dver-$darch $rbsverb","Creating the rpmbootstrap VE for $ddir-$dver ($darch)", "verbose");
+                        my $addpkgs = "";
+                        my $postparam = "";
+                        $postparam .= pb_distro_get_param($ddir,$dver,$darch,$osmindep);
+                        if ($postparam eq "") {
+                            $addpkgs = "";
+                        } else {
+                            $addpkgs = "-a $postparam";
+                        }
+                        pb_system("sudo /usr/bin/rpmbootstrap $postinstall $addpkgs $ddir-$dver-$darch $rbsverb","Creating the rpmbootstrap VE for $ddir-$dver ($darch)", "verbose");
                     } elsif ($verpmstyle eq "mock") {
                         pb_system("sudo /usr/sbin/mock --init --resultdir=\"/tmp\" --configdir=\"$rbsconf->{$ENV{'PBPROJ'}}\" -r $v","Creating the mock VE for $ddir-$dver ($darch)");
@@ -2306 +2314 @@
     print SCRIPT << "EOF";
 pb_system("groupadd $pbac->{$ENV{'PBPROJ'}}","Adding group $pbac->{$ENV{'PBPROJ'}}");
-pb_system("useradd -g $pbac->{$ENV{'PBPROJ'}} -m -d $home/$pbac->{$ENV{'PBPROJ'}} $pbac->{$ENV{'PBPROJ'}}","Adding user $pbac->{$ENV{'PBPROJ'}} (group $pbac->{$ENV{'PBPROJ'}} - home $home/$pbac->{$ENV{'PBPROJ'}}");
+pb_system("useradd -g $pbac->{$ENV{'PBPROJ'}} -m -d $home/$pbac->{$ENV{'PBPROJ'}} $pbac->{$ENV{'PBPROJ'}}","Adding user $pbac->{$ENV{'PBPROJ'}} (group $pbac->{$ENV{'PBPROJ'}} - home $home/$pbac->{$ENV{'PBPROJ'}})");
 }
 EOF

devel/rpmbootstrap/bin/rpmbootstrap

@@ -43 +43 @@
 =head1 SYNOPSIS
 
-rpmbootstrap [-vhmqpdk][-s script][-i iso] distribution-version-arch [target-dir] [mirror [script]]
-
-pb [--verbose][--help][--man][--quiet][--print-rpms][--download-only][--keep][--include pkg1, pkg2, ...][--script script][--iso iso] distribution-version-arch [target-dir] [mirror [script]]
+rpmbootstrap [-vhmqpdk][-s script][-i iso][-a pkg1[,pkg2,...]] distribution-version-arch [target-dir] [mirror [script]]
+
+pb [--verbose][--help][--man][--quiet][--print-rpms][--download-only][--keep][--add pkg1,[pkg2,...]][--script script][--iso iso] distribution-version-arch [target-dir] [mirror [script]]
 
 =head1 OPTIONS
@@ -88 +88 @@
 
 Name of the ISO image of the distribution you want to install on the related VE.
+
+=item B<-a|--add pkg1[,pkg2,...]>
+
+Additional packages to add from the distribution you want to install on the related VE at the end of the chroot build.
 
 =back 
@@ -152 +156 @@
         "keep|k" => \$opts{'k'},
         "iso|i=s" => \$opts{'i'},
+        "add|a=s" => \$opts{'a'},
         "version|V=s" => \$opts{'V'},
 ) || pb_syntax(-1,0);
@@ -279 +284 @@
 my $osupdname = "";
 
-pb_log(1,"Setting up $osupdname cache in VE\n");
 if ($pbupd =~ /yum/) {
     $oscachedir = "$vepath/var/cache/yum/core/packages/";
@@ -291 +295 @@
     }
 } elsif ($pbupd =~ /zypper/) {
-    pb_log(1,"Setting up Zypper cache in VE\n");
     $oscachedir = "$vepath/var/cache/zypp/packages/opensuse/suse/$darch";
     $osupdname = "Zypper";
-}
+} elsif ($pbupd =~ /urpmi/) {
+    $oscachedir = "$vepath/var/cache/zypp/packages/opensuse/suse/$darch";
+    $osupdname = "Zypper";
+}
+pb_log(1,"Setting up $osupdname cache in VE\n");
 pb_mkdir_p($oscachedir);
 pb_mkdir_p($osupdcachedir) if (defined $osupdcachedir);
@@ -450 +457 @@
 pb_system("chroot $vepath /bin/bash -c \"if [ -x /usr/bin/authconfig ]; then /usr/bin/authconfig --enableshadow --update; fi\"","Calling authconfig");
 
+# Installed additional packages we were asked to
+if (defined $opts{'a'}) {
+    $opts{'a'} =~ s/,/ /g;
+    pb_system("chroot $vepath /bin/bash -c \"$pbupd $opts{'a'} \"","Adding packages to OS by running $pbupd $opts{'a'}");
+}
+
 #
 # Clean up

pbconf/devel/ProjectBuilder/rpm/perl-ProjectBuilder.spec

@@ -30 +30 @@
 
 %build
-%{__perl} Makefile.PL INSTALLDIRS=vendor PBKEYWORD=${RPM_BUILD_ROOT}/PBFINALDIR CONFDIR=%{_sysconfdir}/pb
+%{__perl} Makefile.PL INSTALLDIRS=vendor PBKEYWORD=${RPM_BUILD_ROOT}/PBFINALDIR CONFDIR=%{_sysconfdir}/pb MANDIR=%{_mandir}
 make
 
@@ -55 +55 @@
 %{_mandir}/man1/*
 %{_mandir}/man3/*
+%{_mandir}/man5/*
 
 %changelog

projects/CDDBeditor/pbconf/devel/CDDBeditor.pb

@@ -87 +87 @@
 #velogin CDDBeditor = pb
 #vepath CDDBeditor = /var/lib/mock
-#veconf CDDBeditor = /etc/mock
+#rbsconf CDDBeditor = /etc/mock
 #verebuild CDDBeditor = false
 

projects/buffer/pbconf/1.19/buffer.pb

@@ -90 +90 @@
 #velogin buffer = pb
 #vepath buffer = /var/lib/mock
-#veconf buffer = /etc/mock
+#rbsconf buffer = /etc/mock
 #verebuild buffer = false
 

projects/collectl/pbconf/devel/collectl.pb

@@ -53 +53 @@
 ventp default = pool.ntp.org
 
-# Timeout to wait when VE is launched/stopped
-vetmout default = 120
-
 # per VEs needed paramaters
 velogin collectl = pb
@@ -61 +58 @@
 vepath collectl = /var/lib/mock
 # Usage of URI ?
-veconf collectl = /etc/mock
+#rbsconf collectl = /etc/mock
 # Do not rebuild the VE by default (can be forced with -f option of pb)
 verebuild collectl = false

projects/fossology/pbconf/tags/1.1.0-rc2/fossology.pb

@@ -87 +87 @@
 #velogin fossology = pb
 #vepath fossology = /var/lib/mock
-#veconf fossology = /etc/mock
+#rbsconf fossology = /etc/mock
 #verebuild fossology = false
 

projects/fossology/pbconf/tags/1.1.0-rc4/fossology.pb

@@ -87 +87 @@
 #velogin fossology = pb
 #vepath fossology = /var/lib/mock
-#veconf fossology = /etc/mock
+#rbsconf fossology = /etc/mock
 #verebuild fossology = false
 

projects/fossology/pbconf/tags/1.1.0-rc5/fossology.pb

@@ -87 +87 @@
 #velogin fossology = pb
 #vepath fossology = /var/lib/mock
-#veconf fossology = /etc/mock
+#rbsconf fossology = /etc/mock
 #verebuild fossology = false
 

projects/fossology/pbconf/tags/1.1.0/fossology.pb

@@ -87 +87 @@
 #velogin fossology = pb
 #vepath fossology = /var/lib/mock
-#veconf fossology = /etc/mock
+#rbsconf fossology = /etc/mock
 #verebuild fossology = false
 

projects/fossology/pbconf/trunk/fossology.pb

@@ -87 +87 @@
 #velogin fossology = pb
 #vepath fossology = /var/lib/mock
-#veconf fossology = /etc/mock
+#rbsconf fossology = /etc/mock
 #verebuild fossology = false
 

projects/rinse/pbconf/devel/conf/.pbrc

@@ -10 +10 @@
 vepath default = /home/rinse
 # Conf file for the appli chosen
-veconf default = /etc/rinse/rinse-dploy.conf
+rbsconf default = /etc/rinse/rinse-dploy.conf
 # Special for rinse: script to launch before popultaing the VE
 veb4pi centos = /home/rinse/bin/before-post-install.sh