Changeset 1564 in ProjectBuilder for devel/pb-modules

Timestamp:

May 22, 2012, 11:46:10 AM (12 years ago)

Author:

Bruno Cornec

Message:

• Fix typo n rpmbootstrap preventing it to run
• Fix the detection of setarch call with a more correct regexp
• New mageia mirror used (similar as mandriva)
• Add a test script to have a full regression suite before publishing a new version

Location:

devel/pb-modules

Files:

• etc/pb.conf (modified) (1 diff)
• lib/ProjectBuilder/Base.pm (modified) (1 diff)
• lib/ProjectBuilder/VE.pm (modified) (1 diff)

devel/pb-modules/etc/pb.conf

@@ -407 +407 @@
 # pbos->{'arch'} == i586 for i386 repo
 rbsmirrorsrv mandriva = http://mirrors.kernel.org/mandriva/Mandrakelinux/official/$pbos->{'version'}/$pbos->{'arch'}/media/main/release/
-rbsmirrorsrv mageia = http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/$pbos->{'version'}/$pbos->{'arch'}/media/core/release/
+rbsmirrorsrv mageia = http://mirrors.kernel.org/mageia/distrib/$pbos->{'version'}/$pbos->{'arch'}/media/core/release/
+#rbsmirrorsrv mageia = http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/$pbos->{'version'}/$pbos->{'arch'}/media/core/release/
 #rbsmirrorsrv debian = http://ftp.us.debian.org/debian/
 #rbsmirrorsrv ubuntu = http://us.releases.ubuntu.com/releases/

devel/pb-modules/lib/ProjectBuilder/Base.pm

@@ -425 +425 @@
 my $arch = `uname -m`;
 chomp($arch);
-$arch =~ s/i.86/i386/;
+$arch =~ s/i[3456]86/i386/;
 # For Solaris
 $arch =~ s/i86pc/i386/;

devel/pb-modules/lib/ProjectBuilder/VE.pm

@@ -108 +108 @@
         }
     }
+
     # Handle cross arch on Intel based platforms
-    $sudocmd = "setarch i386 $sudocmd" if (($pbos->{arch} =~ /i?86/) && ($arch eq 'x86_64'));
+    $sudocmd = "setarch i386 $sudocmd" if (($pbos->{'arch'} =~ /i[3456]86/) && ($arch eq 'x86_64'));
 
     my $root = pb_path_expand($vepath->{$ENV{PBPROJ}});