Changeset 1030 in ProjectBuilder for devel/pb/bin/pb

Timestamp:

May 22, 2010, 3:24:20 AM (14 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

File:

• devel/pb/bin/pb (modified) (4 diffs)

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" ) {