Changeset 1031


Ignore:
Timestamp:
May 22, 2010, 8:40:29 PM (9 years ago)
Author:
bruno
Message:
  • the repodata dir is now search in the parents dir of the mirror given as it depends on yum version. CentOS 4 & 5, Fedora 12 OK.
  • Update perl modules versions (Date-Manip is now in 6.x, still using 5.x at the moment)
Location:
devel
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • devel/pb-modules/etc/pb.conf

    r1030 r1031  
    287287rbsmirrorsrv fedora = http://mirrors.kernel.org/fedora/releases/$dver/Fedora/$darch/os/Packages
    288288rbsmirrorsrv centos-4 = http://mirrors.kernel.org/centos/4.8/os/$darch/CentOS/RPMS
    289 rbsmirrorsrv centos-5 = http://mirrors.kernel.org/centos/5.4/os/$darch/CentOS
     289rbsmirrorsrv centos-5 = http://mirrors.kernel.org/centos/5.5/os/$darch/CentOS
    290290rbsmirrorsrv centos-5-ia64 = http://dev.centos.org/~z00dax/ia64/c5-wip/ia64/RPMS/
    291291#rbsmirrorsrv rhel =
     
    303303ospkgdep asianux = wget,make,perl-Date-Manip,perl-ExtUtils-MakeMaker,rpm-build,patch,ntp,diffutils
    304304# Fedora - Module-Build first for processing as needed by others
    305 osperldep fedora-4 = Module-Build,File-MimeInfo,File-BaseDir,Mail-Sendmail
    306 ospkgdep fedora-4 = wget,make,perl-Date-Manip,perl-ExtUtils-MakeMaker,rpm-build,patch,ntp,diffutils
    307 osperldep fedora =
    308 ospkgdep fedora-5 = wget,make,perl-Date-Manip,perl-ExtUtils-MakeMaker,rpm-build,patch,ntp,perl-File-MimeInfo,perl-Mail-Sendmail,diffutils
    309 ospkgdep fedora-6 = wget,make,perl-Date-Manip,perl-ExtUtils-MakeMaker,rpm-build,patch,ntp,perl-File-MimeInfo,perl-Mail-Sendmail,diffutils
    310 ospkgdep fedora-7 = wget,make,perl-Date-Manip,perl-ExtUtils-MakeMaker,rpm-build,patch,ntp,perl-File-MimeInfo,perl-Mail-Sendmail,diffutils
    311 ospkgdep fedora-8 = wget,make,perl-Date-Manip,perl-ExtUtils-MakeMaker,rpm-build,patch,ntp,perl-File-MimeInfo,perl-Mail-Sendmail,diffutils
    312 ospkgdep fedora-9 = wget,make,perl-Date-Manip,perl-ExtUtils-MakeMaker,rpm-build,patch,ntp,perl-File-MimeInfo,perl-Mail-Sendmail,diffutils
    313 ospkgdep fedora-10 = wget,make,perl-Date-Manip,perl-ExtUtils-MakeMaker,rpm-build,patch,ntp,perl-File-MimeInfo,perl-Mail-Sendmail,diffutils
    314 ospkgdep fedora = wget,make,fprintd-pam,perl-Date-Manip,perl-ExtUtils-MakeMaker,rpm-build,patch,ntp,perl-File-MimeInfo,perl-Mail-Sendmail,diffutils
     305osperldep fedora = Module-Build,File-MimeInfo,File-BaseDir,Mail-Sendmail,Date-Manip
     306ospkgdep fedora = wget,make,perl-ExtUtils-MakeMaker,rpm-build,patch,ntp,diffutils
    315307# fprintd-pam
    316308# Slack - Module-Build first for processing as needed by others
     
    365357# Version of the perl module as found on CPAN
    366358# http://search.cpan.org/CPAN/modules/by-module
    367 osperlver Date-Manip = 5.54
    368 osperlver Module-Build = 0.35
     359osperlver Date-Manip = 5.56
     360osperlver Module-Build = 0.3607
    369361osperlver File-MimeInfo = 0.15
    370362osperlver File-BaseDir = 0.03
  • devel/rpmbootstrap/bin/rpmbootstrap

    r1029 r1031  
    261261}
    262262pb_log(3,"Mirror $mirror gave answer: ".Dumper($response->dump(maxlength => 0))."\n");
     263
     264# Try to find where the repodata structure is for later usage
     265my $repo = $mirror;
     266my $found = 0;
     267if ($pbupd =~ /yum/) {
     268    my $response1;
     269    while ($found == 0) {
     270        $response1 = $ua->get("$repo/repodata");
     271        if (! $response1->is_success) {
     272            $repo = dirname($repo);
     273
     274            pb_log(2,"REPO analyzed: $repo\n");
     275            # There is a limit to the loop, when / is reached and nothing found
     276            my ($scheme, $account, $host, $port, $path) = pb_get_uri($repo);
     277            die "Unable to find the repodata structure of the mirror $mirror\nPlease check the URL or warn the dev team.\n" if ($path =~ /^[\/]+$/);
     278           
     279            # / not reached, so looping
     280            next;
     281        } else {
     282            # repodata found $repo is correct
     283            $found = 1;
     284            last;
     285        }
     286    }
     287}
    263288
    264289# Manages architectures specificities
     
    433458        pb_system("sed -i -e 's/^mirrorlist/#mirrorlist/' $i","","quiet");
    434459        # rather use neutral separators here
    435         pb_system("sed -i -e 's|^#baseurl.*\$|baseurl=$mirror|' $i","","quiet");
     460        pb_system("sed -i -e 's|^#baseurl.*\$|baseurl=$repo|' $i","","quiet");
    436461    }
    437462    $minipkglist = "ldconfig yum passwd vim-minimal dhclient authconfig";
Note: See TracChangeset for help on using the changeset viewer.