Changeset 1029 in ProjectBuilder


Ignore:
Timestamp:
May 21, 2010, 9:59:59 PM (14 years ago)
Author:
Bruno Cornec
Message:
  • Fix umask propagation in VE, fixing issues in directory creation with wrong rights
  • Remove the useless vemindep option and fix ospkgdep accordingly
  • Fix the rights for the dev dir in rpmbootstrap
Location:
devel
Files:
6 edited

Legend:

Unmodified
Added
Removed

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

    r1027 r1029  
    300300# Asianux - Module-Build first for processing as needed by others
    301301osperldep asianux = Module-Build,File-MimeInfo,File-BaseDir,Mail-Sendmail
    302 ospkgdep asianux = wget,make,perl-Date-Manip,perl-ExtUtils-MakeMaker,rpm-build,patch,ntp
     302ospkgdep asianux = wget,make,perl-Date-Manip,perl-ExtUtils-MakeMaker,rpm-build,patch,ntp,diffutils
    303303# Fedora - Module-Build first for processing as needed by others
    304304osperldep fedora-4 = Module-Build,File-MimeInfo,File-BaseDir,Mail-Sendmail
    305 ospkgdep fedora-4 = wget,make,perl-Date-Manip,perl-ExtUtils-MakeMaker,rpm-build,patch,ntp
     305ospkgdep fedora-4 = wget,make,perl-Date-Manip,perl-ExtUtils-MakeMaker,rpm-build,patch,ntp,diffutils
    306306osperldep fedora =
    307 ospkgdep fedora-5 = wget,make,perl-Date-Manip,perl-ExtUtils-MakeMaker,rpm-build,patch,ntp,perl-File-MimeInfo,perl-Mail-Sendmail
    308 ospkgdep fedora-6 = wget,make,perl-Date-Manip,perl-ExtUtils-MakeMaker,rpm-build,patch,ntp,perl-File-MimeInfo,perl-Mail-Sendmail
    309 ospkgdep fedora-7 = wget,make,perl-Date-Manip,perl-ExtUtils-MakeMaker,rpm-build,patch,ntp,perl-File-MimeInfo,perl-Mail-Sendmail
    310 ospkgdep fedora-8 = wget,make,perl-Date-Manip,perl-ExtUtils-MakeMaker,rpm-build,patch,ntp,perl-File-MimeInfo,perl-Mail-Sendmail
    311 ospkgdep fedora-9 = wget,make,perl-Date-Manip,perl-ExtUtils-MakeMaker,rpm-build,patch,ntp,perl-File-MimeInfo,perl-Mail-Sendmail
    312 ospkgdep fedora-10 = wget,make,perl-Date-Manip,perl-ExtUtils-MakeMaker,rpm-build,patch,ntp,perl-File-MimeInfo,perl-Mail-Sendmail
    313 ospkgdep fedora = wget,make,fprintd-pam,perl-Date-Manip,perl-ExtUtils-MakeMaker,rpm-build,patch,ntp,perl-File-MimeInfo,perl-Mail-Sendmail
     307ospkgdep fedora-5 = wget,make,perl-Date-Manip,perl-ExtUtils-MakeMaker,rpm-build,patch,ntp,perl-File-MimeInfo,perl-Mail-Sendmail,diffutils
     308ospkgdep fedora-6 = wget,make,perl-Date-Manip,perl-ExtUtils-MakeMaker,rpm-build,patch,ntp,perl-File-MimeInfo,perl-Mail-Sendmail,diffutils
     309ospkgdep fedora-7 = wget,make,perl-Date-Manip,perl-ExtUtils-MakeMaker,rpm-build,patch,ntp,perl-File-MimeInfo,perl-Mail-Sendmail,diffutils
     310ospkgdep fedora-8 = wget,make,perl-Date-Manip,perl-ExtUtils-MakeMaker,rpm-build,patch,ntp,perl-File-MimeInfo,perl-Mail-Sendmail,diffutils
     311ospkgdep fedora-9 = wget,make,perl-Date-Manip,perl-ExtUtils-MakeMaker,rpm-build,patch,ntp,perl-File-MimeInfo,perl-Mail-Sendmail,diffutils
     312ospkgdep fedora-10 = wget,make,perl-Date-Manip,perl-ExtUtils-MakeMaker,rpm-build,patch,ntp,perl-File-MimeInfo,perl-Mail-Sendmail,diffutils
     313ospkgdep fedora = wget,make,fprintd-pam,perl-Date-Manip,perl-ExtUtils-MakeMaker,rpm-build,patch,ntp,perl-File-MimeInfo,perl-Mail-Sendmail,diffutils
    314314# fprintd-pam
    315315# Slack - Module-Build first for processing as needed by others
    … …  
    318318# RHEL
    319319osperldep rhel-4 = Module-Build,File-MimeInfo,File-BaseDir,Mail-Sendmail
    320 ospkgdep rhel-4 = wget,make,ntp,patch,perl-DateManip,rpm-build
     320ospkgdep rhel-4 = wget,make,ntp,patch,perl-DateManip,rpm-build,diffutils
    321321# Tested
    322322osperldep centos-4 = Module-Build,File-MimeInfo,File-BaseDir,Mail-Sendmail
    323 ospkgdep centos-4 = wget,make,ntp,patch,perl-DateManip,rpm-build
     323ospkgdep centos-4 = wget,make,ntp,patch,perl-DateManip,rpm-build,diffutils
    324324# Tested
    325325osperldep rhel-5 = Module-Build,File-MimeInfo,File-BaseDir,Mail-Sendmail
    326 ospkgdep rhel-5 = wget,make,ntp,patch,perl-DateManip,rpm-build
     326ospkgdep rhel-5 = wget,make,ntp,patch,perl-DateManip,rpm-build,diffutils
    327327osperldep centos-5 = Module-Build,File-MimeInfo,File-BaseDir,Mail-Sendmail
    328 ospkgdep centos-5 = wget,make,ntp,patch,perl-DateManip,rpm-build
     328ospkgdep centos-5 = wget,make,ntp,patch,perl-DateManip,rpm-build,diffutils
    329329osperldep rhel-3 = Module-Build,File-MimeInfo,File-BaseDir,Mail-Sendmail
    330 ospkgdep rhel-3 = wget,make,ntp,patch,perl-DateManip
     330ospkgdep rhel-3 = wget,make,ntp,patch,perl-DateManip,diffutils
    331331osperldep centos-3 = Module-Build,File-MimeInfo,File-BaseDir,Mail-Sendmail
    332 ospkgdep centos-3 = wget,make,ntp,patch,perl-DateManip
     332ospkgdep centos-3 = wget,make,ntp,patch,perl-DateManip,diffutils
    333333# Old RedHat - Module-Build first for processing as needed by others
    334334osperldep redhat = Module-Build,Date-Manip,File-MimeInfo,File-BaseDir,Mail-Sendmail
    335 ospkgdep redhat = wget,make,ntp,patch
     335ospkgdep redhat = wget,make,ntp,patch,diffutils
    336336# Old SuSE - Module-Build first for processing as needed by others
    337337osperldep suse = Module-Build,Date-Manip,File-MimeInfo,File-BaseDir,Mail-Sendmail
    338 ospkgdep suse = wget,make,ntp,patch
     338ospkgdep suse = wget,make,ntp,patch,diffutils
    339339# New OpenSuSE - Module-Build first for processing as needed by others
    340340osperldep opensuse = Module-Build,File-MimeInfo,File-BaseDir,Mail-Sendmail
    341 ospkgdep opensuse = wget,make,ntp,patch,perl-Date-Manip,perl-File-HomeDir
     341ospkgdep opensuse = wget,make,ntp,patch,perl-Date-Manip,perl-File-HomeDir,diffutils
    342342# Mdv
    343343osperldep mandrake-10.1 = Date-Manip
    344 ospkgdep mandrake-10.1 = rpm-build,wget,patch,make,ntp-client,perl-File-MimeInfo,perl-Mail-Sendmail
     344ospkgdep mandrake-10.1 = rpm-build,wget,patch,make,ntp-client,perl-File-MimeInfo,perl-Mail-Sendmail ,diffutils
    345345osperldep md =
    346 ospkgdep md = rpm-build,wget,patch,make,ntp-client,perl-File-MimeInfo,perl-Mail-Sendmail,perl-Date-Manip
     346ospkgdep md = rpm-build,wget,patch,make,ntp-client,perl-File-MimeInfo,perl-File-BaseDir,perl-Mail-Sendmail,perl-Date-Manip,diffutils
    347347# LSB
    348348osperldep lsb = Module-Build,Date-Manip,File-MimeInfo,File-BaseDir,Mail-Sendmail
    … …  
    350350# Debian
    351351osperldep debian-3.1 = File-MimeInfo,File-BaseDir
    352 ospkgdep debian-3.1 = wget,patch,dpkg-dev,make,debian-builder,dh-make,fakeroot,ntpdate,libmodule-build-perl,libdate-manip-perl,libmail-sendmail-perl
     352ospkgdep debian-3.1 = wget,patch,dpkg-dev,make,debian-builder,dh-make,fakeroot,ntpdate,libmodule-build-perl,libdate-manip-perl,libmail-sendmail-perl,diff
    353353osperldep deb =
    354 ospkgdep deb = wget,patch,dpkg-dev,make,debian-builder,dh-make,fakeroot,ntpdate,libfile-mimeinfo-perl,libmodule-build-perl,libdate-manip-perl,libmail-sendmail-perl
     354ospkgdep deb = wget,patch,dpkg-dev,make,debian-builder,dh-make,fakeroot,ntpdate,libfile-mimeinfo-perl,libmodule-build-perl,libdate-manip-perl,libmail-sendmail-perl,diff
    355355# Gentoo
    356356osperldep gen =
    … …  
    391391oscmd rpmbootstrap = rpm,rpm2cpio,wget
    392392#oscmdopt rpmbootstrap =
     393#

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

    r1027 r1029  
    356356 Example: velogin default = pb
    357357
    358 =item B<vemindep>
    359 
    360  Nature: Optional
    361  Key: OS (could be from the most generic up to the most specific from ostype, osfamily, os, os-ver, os-ver-arch). NB: a default value per OS family is interesting here.
    362  Value: coma separated list of packages needed before pb can be run in the VE. Installed automatically in setupve phase.
    363  Conffile: ve
    364  Example: vemindep rpm = rpm-build,diffutils,ntpdate, vemindep deb = diff
    365 
    366358=item B<ventp>
    367359

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

    r1027 r1029  
    169169    if (defined $ambiguous_rel_files->{$d}) {
    170170        print STDERR "The key $d is considered as both unambiguous and ambigous.\n";
    171         print STDERR "Please fix your configuration file.\n";
     171        print STDERR "Please fix your configuration file.\n"
    172172    }
    173173    if (-f "$r" && ! -l "$r") {
    … …  
    449449
    450450# Allow replacement of variables inside the parameter such as ddir, dver, darch for rpmbootstrap
    451 # but not shell variable which ae backslashed
     451# but not shell variable which are backslashed
    452452if ($param =~ /[^\\]\$/) {
    453453    pb_log(3,"Expanding variable on $param\n");

  • devel/pb/bin/pb

    r1027 r1029  
    17481748        my ($rbsb4pi,$rbspi,$vesnap,$oscodename,$osmindep,$verebuild) = pb_conf_get_if("rbsb4pi","rbspi","vesnap","oscodename","osmindep","verebuild");
    17491749
     1750        # We need to avoid umask propagation to the VE
     1751        umask 0022;
     1752
    17501753        if (($vetype eq "chroot") || ($vetype eq "schroot")) {
    17511754            # Architecture consistency
    … …  
    22492252        # once this is done, we can do what we want on the VM remotely
    22502253    } elsif ($vtype eq "ve") {
    2251         # We need to finish the setup of packages needed in the VE
    2252         # rinse/debootstrap at least needs it
    2253         my ($vemindep) = pb_conf_get_if("vemindep");
    2254 
    2255         my $postparam = "";
    2256         if (defined $vemindep) {
    2257             $postparam .= " ".pb_distro_get_param($ddir,$dver,$darch,$vemindep);
    2258         }
    2259         # Change the list of pkg in to a space separated list
    2260         $postparam =~ s/,/ /g;
    2261         # remove potential sudo from the update command for this time,
    2262         # as this will be run as root anyway, and if not we will have
    2263         # a problem with tty
    2264         $pbupd =~ s/sudo //g;
    2265 
    2266             print SCRIPT << "EOF";
     2254        print SCRIPT << "EOF";
    22672255# For VE we need a good null dev
    22682256pb_system("rm -f /dev/null; mknod /dev/null c 1 3; chmod 777 /dev/null");
    22692257EOF
    2270         if ($postparam ne "") {
    2271             print SCRIPT << "EOF";
     2258        print SCRIPT << "EOF";
    22722259# For VE we first need to mount some FS
    22732260pb_system("mount -t proc /proc /proc");
    22742261
    2275 # For VE we need some additional packages that are not there yet
    2276 pb_system("$pbupd $postparam");
    2277 
    2278 EOF
    2279         }
    2280     }
    2281     if ($vtype eq "vm") {
     2262EOF
     2263    }
     2264
     2265if ($vtype eq "vm") {
    22822266        print SCRIPT << 'EOF';
    22832267# Removes duplicate in .ssh/authorized_keys of our key if needed

  • devel/rpmbootstrap/bin/rpmbootstrap

    r1027 r1029  
    411411#
    412412pb_mkdir_p("$vepath/dev");
     413chmod 0755,"$vepath/dev";
    413414pb_system("mknod -m 644 $vepath/dev/random c 1 8","Creating $vepath/dev/random") if (! -c "$vepath/dev/random");
    414415pb_system("mknod -m 644 $vepath/dev/urandom c 1 9","Creating $vepath/dev/urandom") if (! -c "$vepath/dev/urandom");

  • devel/rpmbootstrap/etc/.pbrc

    r1027 r1029  
    1616# Special for rinse: script to launch before populating the VE
    1717rbsb4pi centos = /home/rinse/bin/before-post-install.sh
    18 # Additional packages to install for pb to build packages in VE
    19 vemindep rpm = rpm-build,diffutils,ntpdate
    20 vemindep deb = diff
    2118
    2219verebuild default = false
Note: See TracChangeset for help on using the changeset viewer.