Changeset 1030

Timestamp:

05/22/10 03:24:20 (3 years ago)

Author:

bruno

Message:

• Add support for Ubuntu 10.04 with debootstrap (universe repo needed)
• Add support of option rbsopt for deb based distro

Location:

devel

Files:

• pb-modules/etc/pb.conf (modified) (2 diffs)
• pb/bin/pb (modified) (4 diffs)
• rpmbootstrap/etc/.pbrc (modified) (1 diff)

devel/pb-modules/etc/pb.conf

@@ -278 +278 @@
 # Options to pass to rpmbootstrap command. By default keep downloaded packages
 rbsopt rpmbootstrap = -k
+rbsopt devbootstrap = --keep-debootstrap-dir
 
 # URL of the directory containing the packages mentioned in rbsmindep. 
@@ -385 +386 @@
 oscodename ubuntu-9.10 = karmic
 oscodename ubuntu-10.04 = lucid
+oscodename ubuntu-10.10 = maverick
 
 # Commands needed on the underlying system

devel/pb/bin/pb

@@ -1759 +1759 @@
             my ($verpmtype,$vedebtype) = pb_conf_get("verpmtype","vedebtype");
             if (($create != 0) || ((defined $verebuild) && ($verebuild->{$ENV{'PBPROJ'}} =~ /true/i)) || ($pbforce == 1)) {
+                my ($rbsopt1) = pb_conf_get_if("rbsopt");
+
                 # We have to rebuild the chroot
                 if ($dtype eq "rpm") {
@@ -1766 +1768 @@
 
                     # Get potential rbs option
-                    my ($rbsopt1) = pb_conf_get_if("rbsopt");
                     my $rbsopt = "";
                     if (defined $rbsopt1) {
@@ -1842 +1843 @@
                     }
 
+                    # Get potential rbs option
+                    my $rbsopt = "";
+                    if (defined $rbsopt1) {
+                        if (defined $rbsopt1->{$vedebstyle}) {
+                            $rbsopt = $rbsopt1->{$vedebstyle};
+                        } elsif (defined $rbsopt1->{$ENV{'PBPROJ'}}) {
+                            $rbsopt = $rbsopt1->{$ENV{'PBPROJ'}};
+                        } else {
+                            $rbsopt = "";
+                        }
+                    }
+    
                     # debootstrap works with amd64 not x86_64
                     my $debarch = $darch;
@@ -1849 +1862 @@
                         $dbsverb = "--verbose" if ($pbdebug gt 0);
 
-                        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");
+                        # Some perl modules are in Universe on Ubuntu
+                        $rbsopt .= " --components=main,universe" if ($ddir eq "ubuntu");
+
+                        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");
                         # debootstrap doesn't create an /etc/hosts file
                         if (! -f "$vepath->{$ENV{'PBPROJ'}}/$ddir/$dver/$darch/etc/hosts" ) {

devel/rpmbootstrap/etc/.pbrc

@@ -43 +43 @@
 #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
 #velist default = centos-4-i386,centos-5-i386,centos-4-x86_64,centos-5-x86_64
-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
+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,ubuntu-10.04-x86_64