Changeset 1036 in ProjectBuilder

Timestamp:

Jun 4, 2010, 2:29:43 PM (15 years ago)

Author:

Bruno Cornec

Message:

• Add support for mirror server to debootstrap command

Location:

devel

Files:

• pb-doc/pb-presentation.odp (modified) ( previous)
• pb-modules/etc/pb.conf (modified) (1 diff)
• pb/bin/pb (modified) (3 diffs)
• website/One_Source_for_Multiple_Platforms_Sol_Brief_final.pdf (added)

devel/pb-modules/etc/pb.conf

@@ -296 +296 @@
 # darch == i586 for i386 repo
 rbsmirrorsrv mandriva = http://mirrors.kernel.org/mandriva/Mandrakelinux/official/$dver/$darch/media/main/release/
+#rbsmirrorsrv debian = http://ftp.us.debian.org/debian/
+#rbsmirrorsrv ubuntu = http://us.releases.ubuntu.com/releases/
 
 # pb install dependencies per distro

devel/pb/bin/pb

@@ -1835 +1835 @@
                 } elsif ($dtype eq "deb") {
                     my $vedebstyle = $vedebtype->{$ENV{'PBPROJ'}};
+
                     my $codename = pb_distro_get_param($ddir,$dver,$darch,$oscodename);
                     my $postparam = "";
@@ -1844 +1845 @@
                         $addpkgs = "--include $postparam";
                     }
+                    my $debmir = "";
+                    $debmir .= pb_distro_get_param($ddir,$dver,$darch,$rbsmirrorsrv);
 
                     # Get potential rbs option
@@ -1867 +1870 @@
                         $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");
+                        pb_system("sudo /usr/sbin/debootstrap $dbsverb $rbsopt --arch=$debarch $addpkgs $codename \"$vepath->{$ENV{'PBPROJ'}}/$ddir/$dver/$darch\" $debmir","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" ) {