Changeset 749 in ProjectBuilder
- Timestamp:
- Mar 30, 2009, 2:31:42 AM (15 years ago)
- Location:
- devel
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
devel/pb-modules/lib/ProjectBuilder/Base.pm
r681 r749 37 37 38 38 our @ISA = qw(Exporter); 39 our @EXPORT = qw(pb_mkdir_p pb_system pb_rm_rf pb_get_date pb_log pb_log_init pb_get_uri pb_get_content pb_set_content pb_display_file pb_syntax_init pb_syntax pb_temp_init $pbdebug $pbLOG $pbdisplaytype $pblocale);39 our @EXPORT = qw(pb_mkdir_p pb_system pb_rm_rf pb_get_date pb_log pb_log_init pb_get_uri pb_get_content pb_set_content pb_display_file pb_syntax_init pb_syntax pb_temp_init pb_get_arch $pbdebug $pbLOG $pbdisplaytype $pblocale); 40 40 41 41 =pod … … 371 371 } 372 372 373 =item B<pb_get_arch> 374 375 This function returns the architecture of our local environment and 376 standardize on i386 for those platforms. It also solves issues where a i386 VE on x86_64 returns x86_64 wrongly 377 378 =cut 379 380 sub pb_get_arch { 381 382 my $arch = `uname -m`; 383 chomp($arch); 384 $arch =~ s/i.86/i386/; 385 386 return($arch); 387 } 388 373 389 =back 374 390 -
devel/pb-modules/lib/ProjectBuilder/Distribution.pm
r735 r749 119 119 120 120 # By defaut propose yum 121 my $arch= `uname -m`;121 my $arch=pb_get_arch(); 122 122 my $opt = ""; 123 chomp($arch);124 123 if ($arch eq "x86_64") { 125 124 $opt="--exclude=*.i?86"; … … 570 569 571 570 } 571 572 572 573 =back 573 574 -
devel/pb/bin/pb
r748 r749 1579 1579 # Get VE context 1580 1580 my ($ptr,$vetmout,$vepath,$verebuild,$veconf,$vepostinstall) = pb_conf_get("vetype","vetmout","vepath","verebuild","veconf"); 1581 my ($veb4pi,$vep kglist) = pb_conf_get_if("veb4pi","vepkglist");1581 my ($veb4pi,$vepi,$vepkglist) = pb_conf_get_if("veb4pi","vepi","vepkglist"); 1582 1582 my $vetype = $ptr->{$ENV{'PBPROJ'}}; 1583 1583 … … 1600 1600 my $verpmstyle = pb_distro_get_param($ddir,$dver,$darch,$verpmtype); 1601 1601 if ($verpmstyle eq "rinse") { 1602 # Need to reshape the mirrors generated 1603 my $ post = "--before-post-install ";1602 # Need to reshape the mirrors generated with local before-post-install script 1603 my $b4post = "--before-post-install "; 1604 1604 my $postparam = pb_distro_get_param($ddir,$dver,$darch,$veb4pi); 1605 if ($postparam eq "") { 1606 $b4post = ""; 1607 } else { 1608 $b4post .= $postparam; 1609 } 1610 # Do we have a local post-install script 1611 my $post = "--post-install "; 1612 $postparam = pb_distro_get_param($ddir,$dver,$darch,$vepi); 1605 1613 if ($postparam eq "") { 1606 1614 $post = ""; … … 1626 1634 $rinseverb = "--verbose" if ($pbdebug gt 0); 1627 1635 1628 pb_system("sudo /usr/sbin/rinse --directory \"$vepath->{$ENV{'PBPROJ'}}/$ddir/$dver/$darch\" --arch \"$darch\" --distribution \"$ddir-$dver\" --config \"$veconf->{$ENV{'PBPROJ'}}\" $ post $addpkgs $rinseverb","Creating the rinse VE for $ddir-$dver ($darch)", "verbose");1636 pb_system("sudo /usr/sbin/rinse --directory \"$vepath->{$ENV{'PBPROJ'}}/$ddir/$dver/$darch\" --arch \"$darch\" --distribution \"$ddir-$dver\" --config \"$veconf->{$ENV{'PBPROJ'}}\" $b4post $post $addpkgs $rinseverb","Creating the rinse VE for $ddir-$dver ($darch)", "verbose"); 1629 1637 } elsif ($verpmstyle eq "mock") { 1630 1638 pb_system("sudo /usr/sbin/mock --init --resultdir=\"/tmp\" --configdir=\"$veconf->{$ENV{'PBPROJ'}}\" -r $v","Creating the mock VE for $ddir-$dver ($darch)"); … … 2728 2736 } 2729 2737 2730 # Which is our local arch ? (standardize on i386 for those platforms)2731 sub pb_get_arch {2732 2733 my $arch = `uname -m`;2734 chomp($arch);2735 $arch =~ s/i.86/i386/;2736 return($arch);2737 }2738 2739 2738 1;
Note:
See TracChangeset
for help on using the changeset viewer.