Changeset 1519 in ProjectBuilder for devel/pb-modules/lib

Timestamp:

May 12, 2012, 1:02:34 AM (12 years ago)

Author:

Bruno Cornec

Message:

• pb.conf: Add support for centos-6: new osrelfile, add initial dependencies, add perl and package dependencies (Eric Anderson)
• Distribution.pm: Require that we have a functional install command. The old protection code was wrong since without a valid value it defaults to , and if it had been correct would cause installs to silently fail. (Eric Anderson)
• VE.pm: Run bootstrapping under linux32 (Bruno changed that to setarch) if arch is i386 and host is x86_64/amd64 so that it gets the architecture right. (Eric Anderson)

Location:

devel/pb-modules/lib/ProjectBuilder

Files:

• Distribution.pm (modified) (1 diff)
• VE.pm (modified) (1 diff)

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

@@ -317 +317 @@
 my $deps = shift || undef;
 
+# Protection
+die "Missing install command for $pbos->{name}-$pbos->{version}-$pbos->{arch}" unless (defined $pbos->{install} && $pbos->{install} =~ /\w/);
 pb_apply_conf_proxy($pbos);
-# Protection
-return if (not defined $pbos->{'install'});
 
 # Get dependencies in the build file if not forced

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

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