Changeset 991


Ignore:
Timestamp:
Mar 1, 2010, 9:27:20 AM (10 years ago)
Author:
bruno
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:
13 edited

Legend:

Unmodified
Added
Removed
  • devel/pb-modules/etc/pb.conf

    r990 r991  
    249249rbsmindep 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
    250250#
    251 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
     251rbsmindep 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
    252252#
    253253rbsmindep 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
     
    313313ospkgdep tgz = wget,make,ntp,patch
    314314# RHEL
     315osperldep rhel-4 = Module-Build,File-MimeInfo,File-BaseDir,Mail-Sendmail
     316ospkgdep rhel-4 = wget,make,ntp,patch,perl-DateManip,rpm-build
     317# Tested
     318osperldep centos-4 = Module-Build,File-MimeInfo,File-BaseDir,Mail-Sendmail
     319ospkgdep centos-4 = wget,make,ntp,patch,perl-DateManip,rpm-build
     320# Tested
    315321osperldep rhel-5 = Module-Build,File-MimeInfo,File-BaseDir,Mail-Sendmail
    316 ospkgdep rhel-5 = wget,make,ntp,patch,perl-DateManip
     322ospkgdep rhel-5 = wget,make,ntp,patch,perl-DateManip,rpm-build
    317323osperldep centos-5 = Module-Build,File-MimeInfo,File-BaseDir,Mail-Sendmail
    318 ospkgdep centos-5 = wget,make,ntp,patch,perl-DateManip
    319 osperldep rhel-4 = Module-Build,File-MimeInfo,File-BaseDir,Mail-Sendmail
    320 ospkgdep rhel-4 = wget,make,ntp,patch,perl-DateManip
    321 osperldep centos-4 = Module-Build,File-MimeInfo,File-BaseDir,Mail-Sendmail
    322 ospkgdep centos-4 = wget,make,ntp,patch,perl-DateManip
     324ospkgdep centos-5 = wget,make,ntp,patch,perl-DateManip,rpm-build
    323325osperldep rhel-3 = Module-Build,File-MimeInfo,File-BaseDir,Mail-Sendmail
    324326ospkgdep rhel-3 = wget,make,ntp,patch,perl-DateManip
  • devel/pb/bin/pb

    r989 r991  
    17911791                        my $rbsverb = "";
    17921792                        $rbsverb = "--verbose" if ($pbdebug gt 0);
    1793                         pb_system("sudo /usr/bin/rpmbootstrap $postinstall $ddir-$dver-$darch $rbsverb","Creating the rpmbootstrap VE for $ddir-$dver ($darch)", "verbose");
     1793                        my $addpkgs = "";
     1794                        my $postparam = "";
     1795                        $postparam .= pb_distro_get_param($ddir,$dver,$darch,$osmindep);
     1796                        if ($postparam eq "") {
     1797                            $addpkgs = "";
     1798                        } else {
     1799                            $addpkgs = "-a $postparam";
     1800                        }
     1801                        pb_system("sudo /usr/bin/rpmbootstrap $postinstall $addpkgs $ddir-$dver-$darch $rbsverb","Creating the rpmbootstrap VE for $ddir-$dver ($darch)", "verbose");
    17941802                    } elsif ($verpmstyle eq "mock") {
    17951803                        pb_system("sudo /usr/sbin/mock --init --resultdir=\"/tmp\" --configdir=\"$rbsconf->{$ENV{'PBPROJ'}}\" -r $v","Creating the mock VE for $ddir-$dver ($darch)");
     
    23062314    print SCRIPT << "EOF";
    23072315pb_system("groupadd $pbac->{$ENV{'PBPROJ'}}","Adding group $pbac->{$ENV{'PBPROJ'}}");
    2308 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'}}");
     2316pb_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'}})");
    23092317}
    23102318EOF
  • devel/rpmbootstrap/bin/rpmbootstrap

    r990 r991  
    4343=head1 SYNOPSIS
    4444
    45 rpmbootstrap [-vhmqpdk][-s script][-i iso] distribution-version-arch [target-dir] [mirror [script]]
    46 
    47 pb [--verbose][--help][--man][--quiet][--print-rpms][--download-only][--keep][--include pkg1, pkg2, ...][--script script][--iso iso] distribution-version-arch [target-dir] [mirror [script]]
     45rpmbootstrap [-vhmqpdk][-s script][-i iso][-a pkg1[,pkg2,...]] distribution-version-arch [target-dir] [mirror [script]]
     46
     47pb [--verbose][--help][--man][--quiet][--print-rpms][--download-only][--keep][--add pkg1,[pkg2,...]][--script script][--iso iso] distribution-version-arch [target-dir] [mirror [script]]
    4848
    4949=head1 OPTIONS
     
    8888
    8989Name of the ISO image of the distribution you want to install on the related VE.
     90
     91=item B<-a|--add pkg1[,pkg2,...]>
     92
     93Additional packages to add from the distribution you want to install on the related VE at the end of the chroot build.
    9094
    9195=back
     
    152156        "keep|k" => \$opts{'k'},
    153157        "iso|i=s" => \$opts{'i'},
     158        "add|a=s" => \$opts{'a'},
    154159        "version|V=s" => \$opts{'V'},
    155160) || pb_syntax(-1,0);
     
    279284my $osupdname = "";
    280285
    281 pb_log(1,"Setting up $osupdname cache in VE\n");
    282286if ($pbupd =~ /yum/) {
    283287    $oscachedir = "$vepath/var/cache/yum/core/packages/";
     
    291295    }
    292296} elsif ($pbupd =~ /zypper/) {
    293     pb_log(1,"Setting up Zypper cache in VE\n");
    294297    $oscachedir = "$vepath/var/cache/zypp/packages/opensuse/suse/$darch";
    295298    $osupdname = "Zypper";
    296 }
     299} elsif ($pbupd =~ /urpmi/) {
     300    $oscachedir = "$vepath/var/cache/zypp/packages/opensuse/suse/$darch";
     301    $osupdname = "Zypper";
     302}
     303pb_log(1,"Setting up $osupdname cache in VE\n");
    297304pb_mkdir_p($oscachedir);
    298305pb_mkdir_p($osupdcachedir) if (defined $osupdcachedir);
     
    450457pb_system("chroot $vepath /bin/bash -c \"if [ -x /usr/bin/authconfig ]; then /usr/bin/authconfig --enableshadow --update; fi\"","Calling authconfig");
    451458
     459# Installed additional packages we were asked to
     460if (defined $opts{'a'}) {
     461    $opts{'a'} =~ s/,/ /g;
     462    pb_system("chroot $vepath /bin/bash -c \"$pbupd $opts{'a'} \"","Adding packages to OS by running $pbupd $opts{'a'}");
     463}
     464
    452465#
    453466# Clean up
  • pbconf/devel/ProjectBuilder/rpm/perl-ProjectBuilder.spec

    r969 r991  
    3030
    3131%build
    32 %{__perl} Makefile.PL INSTALLDIRS=vendor PBKEYWORD=${RPM_BUILD_ROOT}/PBFINALDIR CONFDIR=%{_sysconfdir}/pb
     32%{__perl} Makefile.PL INSTALLDIRS=vendor PBKEYWORD=${RPM_BUILD_ROOT}/PBFINALDIR CONFDIR=%{_sysconfdir}/pb MANDIR=%{_mandir}
    3333make
    3434
     
    5555%{_mandir}/man1/*
    5656%{_mandir}/man3/*
     57%{_mandir}/man5/*
    5758
    5859%changelog
  • projects/CDDBeditor/pbconf/devel/CDDBeditor.pb

    r862 r991  
    8787#velogin CDDBeditor = pb
    8888#vepath CDDBeditor = /var/lib/mock
    89 #veconf CDDBeditor = /etc/mock
     89#rbsconf CDDBeditor = /etc/mock
    9090#verebuild CDDBeditor = false
    9191
  • projects/buffer/pbconf/1.19/buffer.pb

    r787 r991  
    9090#velogin buffer = pb
    9191#vepath buffer = /var/lib/mock
    92 #veconf buffer = /etc/mock
     92#rbsconf buffer = /etc/mock
    9393#verebuild buffer = false
    9494
  • projects/collectl/pbconf/devel/collectl.pb

    r384 r991  
    5353ventp default = pool.ntp.org
    5454
    55 # Timeout to wait when VE is launched/stopped
    56 vetmout default = 120
    57 
    5855# per VEs needed paramaters
    5956velogin collectl = pb
     
    6158vepath collectl = /var/lib/mock
    6259# Usage of URI ?
    63 veconf collectl = /etc/mock
     60#rbsconf collectl = /etc/mock
    6461# Do not rebuild the VE by default (can be forced with -f option of pb)
    6562verebuild collectl = false
  • projects/fossology/pbconf/tags/1.1.0-rc2/fossology.pb

    r787 r991  
    8787#velogin fossology = pb
    8888#vepath fossology = /var/lib/mock
    89 #veconf fossology = /etc/mock
     89#rbsconf fossology = /etc/mock
    9090#verebuild fossology = false
    9191
  • projects/fossology/pbconf/tags/1.1.0-rc4/fossology.pb

    r868 r991  
    8787#velogin fossology = pb
    8888#vepath fossology = /var/lib/mock
    89 #veconf fossology = /etc/mock
     89#rbsconf fossology = /etc/mock
    9090#verebuild fossology = false
    9191
  • projects/fossology/pbconf/tags/1.1.0-rc5/fossology.pb

    r830 r991  
    8787#velogin fossology = pb
    8888#vepath fossology = /var/lib/mock
    89 #veconf fossology = /etc/mock
     89#rbsconf fossology = /etc/mock
    9090#verebuild fossology = false
    9191
  • projects/fossology/pbconf/tags/1.1.0/fossology.pb

    r894 r991  
    8787#velogin fossology = pb
    8888#vepath fossology = /var/lib/mock
    89 #veconf fossology = /etc/mock
     89#rbsconf fossology = /etc/mock
    9090#verebuild fossology = false
    9191
  • projects/fossology/pbconf/trunk/fossology.pb

    r719 r991  
    8787#velogin fossology = pb
    8888#vepath fossology = /var/lib/mock
    89 #veconf fossology = /etc/mock
     89#rbsconf fossology = /etc/mock
    9090#verebuild fossology = false
    9191
  • projects/rinse/pbconf/devel/conf/.pbrc

    r968 r991  
    1010vepath default = /home/rinse
    1111# Conf file for the appli chosen
    12 veconf default = /etc/rinse/rinse-dploy.conf
     12rbsconf default = /etc/rinse/rinse-dploy.conf
    1313# Special for rinse: script to launch before popultaing the VE
    1414veb4pi centos = /home/rinse/bin/before-post-install.sh
Note: See TracChangeset for help on using the changeset viewer.