Changeset 986 in ProjectBuilder

Timestamp:

Feb 21, 2010, 7:16:55 PM (14 years ago)

Author:

Bruno Cornec

Message:

r3700@localhost: bruno | 2010-02-20 16:35:59 +0100

• Continue to improve pb.conf documentation
• veconf renamed as rbsconf
• ve4pi renamed rbs4pi
• new pb_get_postinstall generic function for rinse and rpmbootstrap
• ventp/vmntp is now optional
• licom_err needed by fedora 12
• make rpmbootstrap work for i386 distros

Location:

devel

Files:

• pb-doc/pb.conf.pod (modified) (3 diffs)
• pb-modules/etc/pb.conf (modified) (1 diff)
• pb/bin/pb (modified) (8 diffs)
• pb/lib/ProjectBuilder/Env.pm (modified) (1 diff)
• rpmbootstrap/bin/rpmbootstrap (modified) (2 diffs)
• rpmbootstrap/etc (added)
• rpmbootstrap/etc/.pbrc (added)

devel/pb-doc/pb.conf.pod

@@ -17 +17 @@
 The key could be also default, in which case it will be used as a default value if no more precise content is given for the key.
 
-Each value is detailed below giving the nature of its use (Mandatory or Optional - only used for certain feature), the value of the key (could be the project, a distribution name, default, ...), the value of the parameter field and its format, the default configuration file in which it should be defined and an example of use.
+Each value is detailed below giving the nature of its use (Mandatory or Optional - only used for certain feature), the value of the key (could be the project, an OS name, default, ...), the value of the parameter field and its format, the default configuration file in which it should be defined (home $HOME/.pbrc, conf /etc/pb/pb.conf or /usr/local/etc/pb/pb.conf, VE vepath/.pbrc, VM vmpath/.pbrc,  or project project.pb) and an example of use.
 
 =head1 OPTIONS
@@ -261 +261 @@
 Nature: Optional
 Key: package (as provided in defpkgdir or extpkgdir)
-Value: Tag that needs to be used in package name (on rpm: name-ver-tag.arch.rpm). Useful when republishing a package due to package build modification (not code).
+Value: Tag that needs to be used in package name (on rpm: name-ver-tag.arch.rpm).  Useful when different from the project version B<projtag> and when republishing a package due to package build modification (not code).
 Conffile: project
 Example: pkgtag mindi-busybox = 2
@@ -269 +269 @@
 Nature: Optional
 Key: package (as provided in defpkgdir or extpkgdir)
-Value: Version that needs to be used in package name (on rpm: name-ver-tag.arch.rpm).
-Conffile: project
-Example: 
+Value: Version that needs to be used in package name (on rpm: name-ver-tag.arch.rpm). Useful when different from the project version B<projver>.
+Conffile: project
+Example: pkgver mindi-busybox = 1.7.3
 
 =item B<projtag>
+
+Nature: Mandatory
+Key: project (as defined in the -p option or PBPROJ environment variable)
+Value: tag that will be used for all packages names (on rpm: name-ver-tag.arch.rpm) in the project. Each package can overwrite it using B<pkgtag>.
+Conffile: project
+Example: projtag mondorescue = 1
+
 =item B<projver>
+
+Nature: Mandatory
+Key: project (as defined in the -p option or PBPROJ environment variable)
+Value: version that will be used for all packages names (on rpm: name-ver-tag.arch.rpm) in the project. Each package can overwrite it using B<pkgver>.
+Conffile: project
+Example: projver mondorescue = 2.2.9
+
+=item B<rbsconf>
+
+Nature: Optional
+Key: project (as defined in the -p option or PBPROJ environment variable)
+Value: for mock it's the configuration directory. For rinse it's its configuration file. For rpmbootstrap it's not used yet.
+Conffile: ve
+Example: rbsconf default = /etc/mock, rbsconf default = /etc/pb/pb-rinse.conf
+
+=item B<rbsb4pi>
+
+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: for mock it's not used. For rinse it's the script to call before doing installation (in order change the mirror location). For rpmbootstrap it's not used yet.
+Conffile: ve
+Example: rbsb4pi centos = /home/rinse/bin/before-post-install.sh
+
 =item B<supfiles>
+
+Not used yet.
+
 =item B<testver>
-=item B<veb4pi>
-=item B<veconf>
+
+Nature: Optional
+Key: project (as defined in the -p option or PBPROJ environment variable)
+Value: true (meaning this is a test version, whose tag will be generated automatically, based on 0+date in order to allow regular updates, and still be inferior to tag 1 of the official version, and delivered under the test subdirectory of the ftp server). By default false.
+Conffile: project
+Example: testver mondorescue = true
+
 =item B<vedebtype>
+
+Nature: Mandatory
+Key: project (as defined in the -p option or PBPROJ environment variable)
+Value: debootstrap (no other tool to create deb distro based chroot)
+Conffile: ve
+Example: vedebtype default = debootstrap
+
 =item B<velist>
+
+Nature: Mandatory
+Key: project (as defined in the -p option or PBPROJ environment variable)
+Value: list of coma separated OS (under the form of os-ver-arch).
+Conffile: ve
+Example: velist default = centos-4-i386,centos-5-i386,centos-4-x86_64,centos-5-x86_64,debian-5.0-i386,debian-5.0-x86_64,lsb-4.0.1-i386,lsb-4.0.1-x86_64
+
 =item B<velogin>
+
+Nature: Mandatory
+Key: project (as defined in the -p option or PBPROJ environment variable)
+Value: account name to use in the VE to build packages.
+Conffile: ve
+Example: velogin default = pb
+
 =item B<ventp>
+
+Nature: Optional
+Key: project (as defined in the -p option or PBPROJ environment variable)
+Value: NTP server to contact for time accuracy with B<ventpcmd> before building.
+Conffile: ve
+Example: ventp default = 1.pool.ntp.org
+
 =item B<ventpcmd>
+
+Nature: Optional
+Key: project (as defined in the -p option or PBPROJ environment variable)
+Value: NTP command to use to perform time synchronization with the B<ventp> server.
+Conffile: ve
+Example: ventpcmd default = /usr/sbin/ntpdate
+
 =item B<vepath>
+
+Nature: Optional
+Key: project (as defined in the -p option or PBPROJ environment variable)
+Value: path where to find VEs. Ve will be created and used under that path. For each VE os-ver-arch, it will create a subdirectory tree os/ver/arch below that point.
+Conffile: ve
+Example: vepath default = /home/rpmbootstrap
+
 =item B<vepi>
 =item B<vepkglist>
 =item B<verebuild>
 =item B<verpmtype>
-=item B<version>
 =item B<vesnap>
 =item B<vetmout>
 =item B<vetype>
+
 =item B<vmhost>
 =item B<vmlist>
+
+Nature: Mandatory
+Key: project (as defined in the -p option or PBPROJ environment variable)
+Value: list of coma separated OS (under the form of os-ver-arch).
+Conffile: vm
+Example: vmlist default = asianux-2-i386,asianux-3-i386,mandrake-10.1-i386,mandrake-10.2-i386,mandriva-2006.0-i386,mandriva-2007.0-i386,mandriva-2007.1-i386,mandriva-2008.0-i386,mandriva-2008.1-i386,mandriva-2009.0-i386,mandriva-2009.1-i386,mandriva-2010.0-i386,redhat-7.3-i386,redhat-9-i386,fedora-4-i386,fedora-5-i386,fedora-6-i386,fedora-7-i386,fedora-8-i386,fedora-9-i386,fedora-10-i386,fedora-11-i386,fedora-12-i386,rhel-2.1-i386,rhel-3-i386,rhel-4-i386,rhel-5-i386,suse-10.0-i386,suse-10.1-i386,suse-10.2-i386,opensuse-10.3-i386,opensuse-11.0-i386,opensuse-11.1-i386,opensuse-11.2-i386,sles-9-i386,sles-10-i386,sles-11-i386,gentoo-nover-i386,debian-3.1-i386,debian-4.0-i386,debian-5.0-i386,ubuntu-6.06-i386,ubuntu-7.04-i386,ubuntu-7.10-i386,ubuntu-8.04-i386,ubuntu-8.10-i386,ubuntu-9.04-i386,ubuntu-9.10-i386,solaris-10-i386,asianux-2-x86_64,asianux-3-x86_64,mandriva-2007.0-x86_64,mandriva-2007.1-x86_64,mandriva-2008.0-x86_64,mandriva-2008.1-x86_64,mandriva-2009.0-x86_64,mandriva-2009.1-x86_64,mandriva-2010.0-x86_64,fedora-6-x86_64,fedora-7-x86_64,fedora-8-x86_64,fedora-9-x86_64,fedora-10-x86_64,fedora-11-x86_64,fedora-12-x86_64,rhel-3-x86_64,rhel-4-x86_64,rhel-5-x86_64,suse-10.2-x86_64,opensuse-10.3-x86_64,opensuse-11.0-x86_64,opensuse-11.1-x86_64,opensuse-11.2-x86_64,sles-10-x86_64,sles-11-x86_64,gentoo-nover-x86_64,debian-4.0-x86_64,debian-5.0-x86_64,ubuntu-7.04-x86_64,ubuntu-7.10-x86_64,ubuntu-8.04-x86_64,ubuntu-8.10-x86_64,ubuntu-9.04-x86_64,ubuntu-9.10-x86_64,solaris-10-x86_64
+
 =item B<vmlogin>
 =item B<vmmonport>

devel/pb-modules/etc/pb.conf

@@ -246 +246 @@
 rbsmindep fedora-11 = MAKEDEV,ConsoleKit-libs,audit-libs,basesystem,bash,beecrypt,bzip2-libs,chkconfig,compat-db45,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,libblkid,libcap,libcom_err,libcurl,libgcc,libgcrypt,libgpg-error,libidn,libksba,libselinux,libsepol,libstdc++,libusb,libvolume_id,libxml2,linux-atm-libs,logrotate,lua,mingetty,module-init-tools,ncurses,ncurses-base,ncurses-libs,net-tools,nspr,nss,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-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,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 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

devel/pb/bin/pb

@@ -1174 +1174 @@
         # Specific VE
         $path = "vepath";
-        $conf = "veconf";
+        $conf = "rbsconf";
         $rebuild = "verebuild";
     } elsif ($cmt eq "Web") {
@@ -1252 +1252 @@
     my ($sshhost,$sshlogin,$sshdir,$sshport) = pb_conf_get($host,$login,$dir,$port);
     # Not mandatory...
-    my ($vrebuild,$veconf,$testver) = pb_conf_get_if($rebuild,$conf,"testver");
+    my ($vrebuild,$rbsconf,$testver) = pb_conf_get_if($rebuild,$conf,"testver");
     my ($vtmout,$vepath);
     # ...Except those in virtual context
@@ -1261 +1261 @@
         ($vtmout) = pb_conf_get($tmout);
     }
-    pb_log(2,"ssh: ".Dumper(($sshhost,$sshlogin,$sshdir,$sshport,$vtmout,$vrebuild,$vepath,$veconf))."\n");
+    pb_log(2,"ssh: ".Dumper(($sshhost,$sshlogin,$sshdir,$sshport,$vtmout,$vrebuild,$vepath,$rbsconf))."\n");
 
     my $mac;
@@ -1742 +1742 @@
 
         # Get VE context
-        my ($ptr,$vetmout,$vepath,$verebuild,$veconf) = pb_conf_get("vetype","vetmout","vepath","verebuild","veconf");
+        my ($ptr,$vetmout,$vepath,$verebuild,$rbsconf) = pb_conf_get("vetype","vetmout","vepath","verebuild","rbsconf");
         my $vetype = $ptr->{$ENV{'PBPROJ'}};
 
         # We can probably only get those params now we have the distro context
-        my ($veb4pi,$vepi,$vesnap,$oscodename,$vepkglist,$osmindep) = pb_conf_get_if("veb4pi","vepi","vesnap","oscodename","vepkglist","osmindep");
+        my ($rbsb4pi,$rbspi,$vesnap,$oscodename,$vepkglist,$osmindep) = pb_conf_get_if("rbsb4pi","rbspi","vesnap","oscodename","vepkglist","osmindep");
 
         if (($vetype eq "chroot") || ($vetype eq "schroot")) {
@@ -1760 +1760 @@
 
                     my $verpmstyle = $verpmtype->{$ENV{'PBPROJ'}};
+                    my $postinstall = pb_get_postinstall($ddir,$dver,$darch,$rbspi,$verpmstyle);
                     if ($verpmstyle eq "rinse") {
                         # Need to reshape the mirrors generated with local before-post-install script
                         my $b4post = "--before-post-install ";
-                        my $postparam = pb_distro_get_param($ddir,$dver,$darch,$veb4pi);
+                        my $postparam = pb_distro_get_param($ddir,$dver,$darch,$rbsb4pi);
                         if ($postparam eq "") {
                             $b4post = "";
                         } else {
                             $b4post .= $postparam;
-                        }
-                        # Do we have a local post-install script
-                        my $post = "--post-install ";
-                        $postparam = pb_distro_get_param($ddir,$dver,$darch,$vepi);
-                        if ($postparam eq "") {
-                            $post = "";
-                        } else {
-                            $post .= $postparam;
                         }
 
@@ -1799 +1792 @@
                         $rinseverb = "--verbose" if ($pbdebug gt 0);
 
-                        pb_system("sudo /usr/sbin/rinse --directory \"$vepath->{$ENV{'PBPROJ'}}/$ddir/$dver/$darch\" --arch \"$darch\" --distribution \"$ddir-$dver\" --config \"$veconf->{$ENV{'PBPROJ'}}\" $b4post $post $addpkgs $rinseverb","Creating the rinse VE for $ddir-$dver ($darch)", "verbose");
+                        pb_system("sudo /usr/sbin/rinse --directory \"$vepath->{$ENV{'PBPROJ'}}/$ddir/$dver/$darch\" --arch \"$darch\" --distribution \"$ddir-$dver\" --config \"$rbsconf->{$ENV{'PBPROJ'}}\" $b4post $postinstall $addpkgs $rinseverb","Creating the rinse VE for $ddir-$dver ($darch)", "verbose");
                     } elsif ($verpmstyle eq "rpmbootstrap") {
                         my $rbsverb = "";
                         $rbsverb = "--verbose" if ($pbdebug gt 0);
-                        pb_system("sudo /usr/bin/rpmbootstrap $ddir-$dver-$darch $rbsverb","Creating the rpmbootstrap VE for $ddir-$dver ($darch)", "verbose");
+                        pb_system("sudo /usr/bin/rpmbootstrap $postinstall $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=\"$veconf->{$ENV{'PBPROJ'}}\" -r $v","Creating the mock VE for $ddir-$dver ($darch)");
+                        pb_system("sudo /usr/sbin/mock --init --resultdir=\"/tmp\" --configdir=\"$rbsconf->{$ENV{'PBPROJ'}}\" -r $v","Creating the mock VE for $ddir-$dver ($darch)");
                         # Once setup we need to install some packages, the pb account, ...
-                        pb_system("sudo /usr/sbin/mock --install --configdir=\"$veconf->{$ENV{'PBPROJ'}}\" -r $v su","Configuring the mock VE");
+                        pb_system("sudo /usr/sbin/mock --install --configdir=\"$rbsconf->{$ENV{'PBPROJ'}}\" -r $v su","Configuring the mock VE");
                     } else {
                         die "Unknown verpmtype type $verpmstyle. Report to dev team";
@@ -1868 +1861 @@
 my $v = shift;
 
-my ($ntp) = pb_conf_get($vtype."ntp");
-my $vntp = $ntp->{$ENV{'PBPROJ'}};
+my ($ntp) = pb_conf_get_if($vtype."ntp");
+my $vntp = $ntp->{$ENV{'PBPROJ'}} if (defined $ntp);
 my $ntpline;
 
@@ -2939 +2932 @@
 }
 
+#
+# Return the postinstall line if needed
+#
+
+sub pb_get_postinstall {
+
+my $ddir = shift
+my $dver = shift
+my $darch = shift
+my $rbspi = shift
+my $vestyle = shift
+my $post = "";
+
+# Do we have a local post-install script
+if ($vestyle eq "rinse") {
+    $post = "--post-install ";
+} elsif ($vestyle eq "rpmbootstrap") {
+    $post = "-s ";
+}
+
+$postparam = pb_distro_get_param($ddir,$dver,$darch,$rbspi);
+if ($postparam eq "") {
+    $post = "";
+} else {
+    $post .= $postparam;
+}
+return($post);
+}
+
 1;

devel/pb/lib/ProjectBuilder/Env.pm

@@ -465 +465 @@
 #ventp default = pool.ntp.org
 #velogin $ENV{'PBPROJ'} = pb
-#vepath $ENV{'PBPROJ'} = /var/lib/mock
-#veconf $ENV{'PBPROJ'} = /etc/mock
+#vepath $ENV{'PBPROJ'} = /var/cache/rpmbootstrap
+#rbsconf $ENV{'PBPROJ'} = /etc/mock
 #verebuild $ENV{'PBPROJ'} = false
 

devel/rpmbootstrap/bin/rpmbootstrap

@@ -251 +251 @@
 # Manages architectures specificities
 my $parch = $darch;
-$parch = "i?86" if ($darch eq "i386");
+$parch = "i[3456]86" if ($darch eq "i386");
 
 # Get the list of packages and their URL in this hash
@@ -313 +313 @@
             if ($pbupd =~ /yum/) {
                 pb_log(1,"Link package into $vepath/var/cache/yum/core/packages\n");
-                link("$cachedir/$p1","$vepath/var/cache/yum/core/packages/");
-                link("$cachedir/$p1","$vepath/var/cache/yum/$darch/$dver/");
-                symlink("$vepath/var/cache/yum/core/packages/$p1","$vepath/var/cache/yum/updates-released/packages/");
+                #link("$cachedir/$p1","$vepath/var/cache/yum/core/packages/");
+                copy("$cachedir/$p1","$vepath/var/cache/yum/$darch/$dver/fedora/packages");
+                symlink("$vepath/var/cache/yum/$darch/$dver/fedora/packages","$vepath/var/cache/yum/$darch/$dver/updates/packages");
             }