Changeset 964


Ignore:
Timestamp:
Feb 8, 2010, 3:47:40 AM (10 years ago)
Author:
bruno
Message:

r3659@localhost: bruno | 2010-02-07 02:02:22 +0100

  • Now we have debootstrap working (on Mandriva) for VE.
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • devel/pb-modules/lib/ProjectBuilder/Distribution.pm

    r963 r964  
    138138#   $opt="--exclude=*.i?86";
    139139#   }
     140pb_log(2,"DEBUG: pb_distro_init: $ddir, $dver, $dfam, $dtype, $dsuf, $dupd, $darch\n");
    140141
    141142return($ddir, $dver, $dfam, $dtype, $dsuf, $dupd, $darch);
     
    441442    $param = "";
    442443}
     444pb_log(2,"DEBUG: pb_distro_get_param on ",Dumper($opt)," returns $param\n");
    443445return($param);
    444446
  • devel/pb/bin/pb

    r963 r964  
    17441744                if ($dtype eq "rpm") {
    17451745
    1746                     my $verpmstyle = pb_distro_get_param($ddir,$dver,$darch,$verpmtype);
     1746                    my $verpmstyle = $verpmtype->{$ENV{'PBPROJ'}};
    17471747                    if ($verpmstyle eq "rinse") {
    17481748                        # Need to reshape the mirrors generated with local before-post-install script
     
    17891789                        # Once setup we need to install some packages, the pb account, ...
    17901790                        pb_system("sudo /usr/sbin/mock --install --configdir=\"$veconf->{$ENV{'PBPROJ'}}\" -r $v su","Configuring the mock VE");
     1791                    } else {
     1792                        die "Unknown verpmtype type $verpmstyle. Report to dev team";
    17911793                    }
    17921794                } elsif ($dtype eq "deb") {
    1793                     my $vedebstyle = pb_distro_get_param($ddir,$dver,$darch,$vedebtype);
     1795                    my $vedebstyle = $vedebtype->{$ENV{'PBPROJ'}};
    17941796                    my $codename = pb_distro_get_param($ddir,$dver,$darch,$oscodename);
    17951797                    my $postparam = "";
     
    18071809                    $darch = "amd64" if ($darch eq "x86_64");
    18081810                    if ($vedebstyle eq "debootstrap") {
    1809                         pb_system("sudo /usr/sbin/debootstrap --arch=$darch $codename \"$vepath->{$ENV{'PBPROJ'}}/$ddir/$dver/$darch\" $addpkgs","Creating the debootstrap VE for $ddir-$dver ($darch)", "verbose");
     1811                        my $dbsverb = "";
     1812                        $dbsverb = "--verbose" if ($pbdebug gt 0);
     1813
     1814                        pb_system("sudo /usr/sbin/debootstrap $dbsverb --arch=$darch $addpkgs $codename \"$vepath->{$ENV{'PBPROJ'}}/$ddir/$dver/$darch\"","Creating the debootstrap VE for $ddir-$dver ($darch)", "verbose");
     1815                    } else {
     1816                        die "Unknown vedebtype type $vedebstyle. Report to dev team";
    18101817                    }
    18111818                } elsif ($dtype eq "ebuild") {
     
    22022209    } elsif ($vtype eq "ve") {
    22032210        # We need to finish the setup of packages needed in the VE if needed
    2204         # rinse/deboostrap at least needs it
     2211        # rinse/debootstrap at least needs it
    22052212        my ($vepkglist,$osmindep) = pb_conf_get_if("vepkglist","osmindep");
    22062213
  • projects/rinse/pbconf/devel/conf/.pbrc

    r947 r964  
    66verpmtype default = rinse
    77# Possible value is debootstrap
    8 vedebtype default = deboostrap
     8vedebtype default = debootstrap
    99# Path to store the VE
    1010vepath default = /home/rinse
Note: See TracChangeset for help on using the changeset viewer.