Changeset 2350 in /cluster/svnroot


Ignore:
Timestamp:
Apr 17, 2010 3:40:34 PM (11 years ago)
Author:
skylar
Message:

architecture specific stuff (#427)

Location:
bccd-ng/branches/skylar-64test
Files:
14 added
2 edited
1 moved

Legend:

Unmodified
Added
Removed
  • bccd-ng/branches/skylar-64test/bin/build_livecd.pl

    r2348 r2350  
    1919my($debmirror,$websvn,$rc,$out,$ft,$tmpdir,$cwd,$svnrev,
    2020   $Bccd,$allout,$rpkgs,$nouid,$nogid,$debmirror_host,
    21    $debmirror_name,$debsecmirror,$dir);
     21   $debmirror_name,$debsecmirror,$dir,$arch);
    2222my(@lsof,@pids,@rd);
    2323
     
    120120}
    121121
     122$arch = $Bccd->run_test(
     123        "get_arch",
     124        "",
     125        "Got architecure of system.",
     126        );
     127
    122128$Bccd->run_test(
    123129    "chdir",
     
    10981104
    10991105$Bccd->run_test(
     1106    "recrevfetch",
     1107    "",
     1108    "Fetched architecure-specific items for $arch.",
     1109    $svnrev,
     1110    "$websvn/trees/arch/$arch",
     1111    );
     1112
     1113$Bccd->run_test(
    11001114    "chdir",
    11011115    "",
  • bccd-ng/branches/skylar-64test/trees/usr/local/lib/site_perl/5.10.0/Bccd.pm

    r2348 r2350  
    406406}
    407407
     408sub test_get_arch {
     409        my($self,$type,$okrc,$msg) = @_;
     410        my $sub = 'test_get_arch';
     411        my $rc;
     412        if($okrc eq '') {
     413                $okrc = 1;
     414        }
     415
     416        my $arch = (POSIX::uname())[5];
     417        if(defined($arch)) {
     418                $rc = 1;
     419                $self->ok_msg($msg);
     420        }
     421        else {
     422                $rc = 0;
     423                $self->fail_msg($msg);
     424        }
     425
     426        return ($arch,$msg);
     427}
     428
    408429sub test_regexsub_file( $$$$$$$ ) {
    409430    my($self,$type,$okrc,$msg,$file,$regex1,$regex2) = @_;
     
    13001321        $rc = $self->test_regexsub_file($type,$okrc,$msg,$cmds[0],$cmds[1],$cmds[2]);
    13011322    }
     1323        elsif($type =~ m/^get_arch$/) {
     1324                ($rc,$out) = $self->test_get_arch($type,type,$okrc,$msg);
     1325        }
    13021326    else {
    13031327        $self->log_and_die("ERROR",$sub,"This is an undefined test: $type!");
Note: See TracChangeset for help on using the changeset viewer.