Changeset 873


Ignore:
Timestamp:
Oct 21, 2009, 7:59:55 PM (10 years ago)
Author:
bruno
Message:

First round of Solaris fixes

Location:
devel
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • devel/pb-modules/lib/ProjectBuilder/Base.pm

    r749 r873  
    383383chomp($arch);
    384384$arch =~ s/i.86/i386/;
     385# For Solaris
     386$arch =~ s/i86pc/i386/;
    385387
    386388return($arch);
  • devel/pb/bin/pb

    r872 r873  
    10281028                pb_system("sudo /sbin/makepkg -p -l y -c y $pbpkg","Packaging $pbpkg","verbose");
    10291029            }
    1030         } elsif ($dtype eq "sol") {
     1030        } elsif ($dtype eq "pkg") {
    10311031            # Solaris
    10321032            $made="$made $dtype/";
    1033             my $soldestdir="/usr/pb/$pbpkg";
     1033            my $pkgdestdir="$ENV{'PBBUILDDIR'}/install";
    10341034
    10351035            chdir "$ENV{'PBBUILDDIR'}" || die "Unable to chdir to $ENV{'PBBUILDDIR'}";
    10361036            # Will host resulting packages
    10371037            pb_mkdir_p("$dtype");
    1038             pb_system("tar xfz $src","Extracting sources");
    1039             pb_system("tar xfz $src2","Extracting pbconf");
     1038            pb_mkdir_p("$pkgdestdir");
     1039            pb_system("tar xfz $src","Extracting sources under $ENV{'PBBUILDDIR'}");
     1040            pb_system("tar xfz $src2","Extracting pbconf under $ENV{'PBBUILDDIR'}");
    10401041            chdir "$pbpkg-$pbver" || die "Unable to chdir to $pbpkg-$pbver";
    10411042            symlink "pbconf/$ddir-$dver-$arch","install" || die "Unable to symlink to pbconf/$ddir-$dver-$arch";
     
    10441045                die "Unable to find pkginfo file in pbconf/$ddir-$dver-$arch" if (! -f "install/pkginfo");
    10451046                # Build
    1046                 pb_system("install/pbbuild $soldestdir","Building software");
     1047                pb_system("install/pbbuild $pkgdestdir","Building software");
    10471048                # Copy complementary files
    10481049                if (-f "install/prototype") {
    1049                     copy("install/prototype", $soldestdir)
     1050                    copy("install/prototype", $pkgdestdir)
    10501051                } else {
    10511052                    # No prototype provided, calculating it
     
    10531054                    print PROTO "i pkginfo\n";
    10541055                    print PROTO "i depend\n" if (-f "install/depend");
    1055                     find(\&create_solaris_prototype, $soldestdir);
     1056                    find(\&create_solaris_prototype, $pkgdestdir);
    10561057                }
    1057                 copy("install/depend", $soldestdir) if (-f "install/depend");
    1058                 copy("install/pkginfo", $soldestdir);
    1059                 pb_system("pkgmk -o -r $soldestdir -d $ENV{'PBBUILDDIR'}/$dtype","Packaging $pbpkg","verbose");
     1058                copy("install/depend", $pkgdestdir) if (-f "install/depend");
     1059                copy("install/pkginfo", $pkgdestdir);
     1060                pb_system("pkgmk -o -r $pkgdestdir -d $ENV{'PBBUILDDIR'}/$dtype","Packaging $pbpkg","verbose");
    10601061                pb_system("pkgtrans -s $ENV{'PBBUILDDIR'}/$dtype $pbpkg-$pbver.pkg $pbpkg","Transformaing $pbpkg","verbose");
    10611062                pb_system("rm -rf $ENV{'PBBUILDDIR'}/$dtype");
     
    10951096sub create_solaris_protype {
    10961097
    1097     my $uiggid = "bin bin";
     1098    my $uidgid = "bin bin";
    10981099
    10991100    print PROTO "d none $_ 0755 $uidgid\n" if (-d $_);
  • devel/pb/lib/ProjectBuilder/CMS.pm

    r822 r873  
    600600        } elsif ($dtype eq "ebuild") {
    601601            $pbpkgreal = $pbpkg;
     602        } elsif ($dtype eq "pkg") {
     603            $pbpkgreal = "PB$pbpkg";
    602604        } else {
    603605            die "pb_cms_get_real_pkg not implemented for $dtype yet";
Note: See TracChangeset for help on using the changeset viewer.