Changeset 1030


Ignore:
Timestamp:
May 22, 2010, 3:24:20 AM (10 years ago)
Author:
Bruno Cornec
Message:
  • Add support for Ubuntu 10.04 with debootstrap (universe repo needed)
  • Add support of option rbsopt for deb based distro
Location:
devel
Files:
3 edited

Legend:

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

    r1029 r1030  
    278278# Options to pass to rpmbootstrap command. By default keep downloaded packages
    279279rbsopt rpmbootstrap = -k
     280rbsopt devbootstrap = --keep-debootstrap-dir
    280281
    281282# URL of the directory containing the packages mentioned in rbsmindep.
     
    385386oscodename ubuntu-9.10 = karmic
    386387oscodename ubuntu-10.04 = lucid
     388oscodename ubuntu-10.10 = maverick
    387389
    388390# Commands needed on the underlying system
  • devel/pb/bin/pb

    r1029 r1030  
    17591759            my ($verpmtype,$vedebtype) = pb_conf_get("verpmtype","vedebtype");
    17601760            if (($create != 0) || ((defined $verebuild) && ($verebuild->{$ENV{'PBPROJ'}} =~ /true/i)) || ($pbforce == 1)) {
     1761                my ($rbsopt1) = pb_conf_get_if("rbsopt");
     1762
    17611763                # We have to rebuild the chroot
    17621764                if ($dtype eq "rpm") {
     
    17661768
    17671769                    # Get potential rbs option
    1768                     my ($rbsopt1) = pb_conf_get_if("rbsopt");
    17691770                    my $rbsopt = "";
    17701771                    if (defined $rbsopt1) {
     
    18421843                    }
    18431844
     1845                    # Get potential rbs option
     1846                    my $rbsopt = "";
     1847                    if (defined $rbsopt1) {
     1848                        if (defined $rbsopt1->{$vedebstyle}) {
     1849                            $rbsopt = $rbsopt1->{$vedebstyle};
     1850                        } elsif (defined $rbsopt1->{$ENV{'PBPROJ'}}) {
     1851                            $rbsopt = $rbsopt1->{$ENV{'PBPROJ'}};
     1852                        } else {
     1853                            $rbsopt = "";
     1854                        }
     1855                    }
     1856   
    18441857                    # debootstrap works with amd64 not x86_64
    18451858                    my $debarch = $darch;
     
    18491862                        $dbsverb = "--verbose" if ($pbdebug gt 0);
    18501863
    1851                         pb_system("sudo /usr/sbin/debootstrap $dbsverb --arch=$debarch $addpkgs $codename \"$vepath->{$ENV{'PBPROJ'}}/$ddir/$dver/$darch\"","Creating the debootstrap VE for $ddir-$dver ($darch)", "verbose");
     1864                        # Some perl modules are in Universe on Ubuntu
     1865                        $rbsopt .= " --components=main,universe" if ($ddir eq "ubuntu");
     1866
     1867                        pb_system("sudo /usr/sbin/debootstrap $dbsverb $rbsopt --arch=$debarch $addpkgs $codename \"$vepath->{$ENV{'PBPROJ'}}/$ddir/$dver/$darch\"","Creating the debootstrap VE for $ddir-$dver ($darch)", "verbose");
    18521868                        # debootstrap doesn't create an /etc/hosts file
    18531869                        if (! -f "$vepath->{$ENV{'PBPROJ'}}/$ddir/$dver/$darch/etc/hosts" ) {
  • devel/rpmbootstrap/etc/.pbrc

    r1029 r1030  
    4343#velist default = 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,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,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,suse-10.3-i386,sles-9-i386,sles-10-i386,gentoo-nover-i386,debian-3.1-i386,debian-4.0-i386,ubuntu-6.06-i386,ubuntu-7.04-i386,ubuntu-7.10-i386,ubuntu-8.04-i386,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,fedora-6-x86_64,fedora-7-x86_64,fedora-8-x86_64,fedora-9-x86_64,fedora-10-x86_64,rhel-4-x86_64,rhel-5-x86_64,suse-10.2-x86_64,suse-10.3-x86_64,sles-10-x86_64,gentoo-nover-x86_64,debian-4.0-x86_64,ubuntu-7.04-x86_64,ubuntu-7.10-x86_64,rhel-3-ia64,centos-4-i386,centos-5-i386,centos-4-x86_64,centos-5-x86_64
    4444#velist default = centos-4-i386,centos-5-i386,centos-4-x86_64,centos-5-x86_64
    45 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,mandriva-2010.0-x86_64
     45velist 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,mandriva-2010.0-x86_64,ubuntu-10.04-x86_64
Note: See TracChangeset for help on using the changeset viewer.